diff --git a/ceilometer/event/converter.py b/ceilometer/event/converter.py
index c33a90e659..677346753f 100644
--- a/ceilometer/event/converter.py
+++ b/ceilometer/event/converter.py
@@ -74,13 +74,13 @@ class EventDefinition(object):
         service=dict(type='text', fields='publisher_id'),
         request_id=dict(type='text', fields='ctxt.request_id'),
         project_id=dict(type='text', fields=['payload.tenant_id',
-                                             'ctxt.tenant']),
+                                             'ctxt.project_id']),
         user_id=dict(type='text', fields=['payload.user_id',
                                           'ctxt.user_id']),
         # TODO(dikonoor):tenant_id is old terminology and should
         # be deprecated
         tenant_id=dict(type='text', fields=['payload.tenant_id',
-                                            'ctxt.tenant']),
+                                            'ctxt.project_id']),
     )
 
     def __init__(self, definition_cfg, trait_plugin_mgr, raw_levels):
diff --git a/ceilometer/meter/notifications.py b/ceilometer/meter/notifications.py
index 72fb7a1f04..3846ac61e4 100644
--- a/ceilometer/meter/notifications.py
+++ b/ceilometer/meter/notifications.py
@@ -70,7 +70,7 @@ class MeterDefinition(object):
         self._fallback_user_id = declarative.Definition(
             'user_id', "ctxt.user_id|ctxt.user", plugin_manager)
         self._fallback_project_id = declarative.Definition(
-            'project_id', "ctxt.tenant_id|ctxt.tenant", plugin_manager)
+            'project_id', "ctxt.project_id|ctxt.tenant_id", plugin_manager)
         self._attributes = {}
         self._metadata_attributes = {}
         self._user_meta = None