diff --git a/keystone/client/service/nova21.yml b/keystone/client/service/nova21.yml
index 0e94f0c..328aefd 100644
--- a/keystone/client/service/nova21.yml
+++ b/keystone/client/service/nova21.yml
@@ -21,13 +21,13 @@
                 public_address: ${_param:cluster_public_host}
                 public_protocol: ${_param:cluster_public_protocol}
                 public_port: 8774
-                public_path: '/v2/$(tenant_id)s'
+                public_path: '/v2/$(project_id)s'
                 internal_address: ${_param:nova_service_host}
                 internal_port: 8774
-                internal_path: '/v2/$(tenant_id)s'
+                internal_path: '/v2/$(project_id)s'
                 admin_address: ${_param:nova_service_host}
                 admin_port: 8774
-                admin_path: '/v2/$(tenant_id)s'
+                admin_path: '/v2/$(project_id)s'
             nova:
               type: compute
               description: OpenStack Compute Service v2.1
@@ -36,10 +36,10 @@
                 public_address: ${_param:cluster_public_host}
                 public_protocol: ${_param:cluster_public_protocol}
                 public_port: 8774
-                public_path: '/v2.1/$(tenant_id)s'
+                public_path: '/v2.1/$(project_id)s'
                 internal_address: ${_param:nova_service_host}
                 internal_port: 8774
-                internal_path: '/v2.1/$(tenant_id)s'
+                internal_path: '/v2.1/$(project_id)s'
                 admin_address: ${_param:nova_service_host}
                 admin_port: 8774
-                admin_path: '/v2.1/$(tenant_id)s'
+                admin_path: '/v2.1/$(project_id)s'