diff --git a/common/clients.py b/common/clients.py
index 58e0fce..d4ccda3 100644
--- a/common/clients.py
+++ b/common/clients.py
@@ -97,10 +97,10 @@
             return self.conf.admin_password
         return self.conf.password
 
-    def _tenant_name(self):
+    def _project_name(self):
         if self.admin_credentials:
-            return self.conf.admin_tenant_name
-        return self.conf.tenant_name
+            return self.conf.admin_project_name
+        return self.conf.project_name
 
     def _get_orchestration_client(self):
         endpoint = os.environ.get('HEAT_URL')
@@ -130,7 +130,7 @@
         kwargs = {
             'username': self._username(),
             'password': self._password(),
-            'tenant_name': self._tenant_name(),
+            'project_name': self._project_name(),
             'auth_url': self.conf.auth_url
         }
         # keystone v2 can't ignore domain details
diff --git a/common/config.py b/common/config.py
index 2236a0c..baf8380 100644
--- a/common/config.py
+++ b/common/config.py
@@ -40,11 +40,15 @@
     cfg.StrOpt('admin_password',
                help="Admin API key to use when authentication.",
                secret=True),
-    cfg.StrOpt('tenant_name',
-               help="Tenant name to use for API requests."),
-    cfg.StrOpt('admin_tenant_name',
+    cfg.StrOpt('project_name',
+               help="Project name to use for API requests.",
+               deprecated_opts=[cfg.DeprecatedOpt('tenant_name',
+                                                  group='heat_plugin')]),
+    cfg.StrOpt('admin_project_name',
                default='admin',
-               help="Admin tenant name to use for admin API requests."),
+               help="Admin project name to use for admin API requests.",
+               deprecated_opts=[cfg.DeprecatedOpt('admin_tenant_name',
+                                                  group='heat_plugin')]),
     cfg.StrOpt('auth_url',
                help="Full URI of the OpenStack Identity API (Keystone)"),
     cfg.StrOpt('user_domain_name',
diff --git a/functional/test_event_sinks.py b/functional/test_event_sinks.py
index ea66b7d..5d9f566 100644
--- a/functional/test_event_sinks.py
+++ b/functional/test_event_sinks.py
@@ -42,7 +42,7 @@
                 'options': {
                     'os_username': self.conf.username,
                     'os_password': self.conf.password,
-                    'os_project_name': self.conf.tenant_name,
+                    'os_project_name': self.conf.project_name,
                     'os_auth_url': self.conf.auth_url,
                     'os_user_domain_id': self.conf.user_domain_id,
                     'os_project_domain_id': self.conf.project_domain_id,