diff --git a/keystone/client/service/cinder.yml b/keystone/client/service/cinder.yml
index 335985f..ffb5510 100644
--- a/keystone/client/service/cinder.yml
+++ b/keystone/client/service/cinder.yml
@@ -21,10 +21,10 @@
                 public_address: ${_param:cluster_public_host}
                 public_protocol: ${_param:cluster_public_protocol}
                 public_port: 8776
-                public_path: '/v1/$(tenant_id)s'
+                public_path: '/v1/$(project_id)s'
                 internal_address: ${_param:cinder_service_host}
                 internal_port: 8776
-                internal_path: '/v1/$(tenant_id)s'
+                internal_path: '/v1/$(project_id)s'
                 admin_address: ${_param:cinder_service_host}
                 admin_port: 8776
-                admin_path: '/v1/$(tenant_id)s'
+                admin_path: '/v1/$(project_id)s'
diff --git a/keystone/client/service/cinder2.yml b/keystone/client/service/cinder2.yml
index cc150ff..e0e2636 100644
--- a/keystone/client/service/cinder2.yml
+++ b/keystone/client/service/cinder2.yml
@@ -21,10 +21,10 @@
                 public_address: ${_param:cluster_public_host}
                 public_protocol: ${_param:cluster_public_protocol}
                 public_port: 8776
-                public_path: '/v2/$(tenant_id)s'
+                public_path: '/v2/$(project_id)s'
                 internal_address: ${_param:cinder_service_host}
                 internal_port: 8776
-                internal_path: '/v2/$(tenant_id)s'
+                internal_path: '/v2/$(project_id)s'
                 admin_address: ${_param:cinder_service_host}
                 admin_port: 8776
-                admin_path: '/v2/$(tenant_id)s'
+                admin_path: '/v2/$(project_id)s'
diff --git a/keystone/client/service/cinder3.yml b/keystone/client/service/cinder3.yml
index caf24c2..43a805c 100644
--- a/keystone/client/service/cinder3.yml
+++ b/keystone/client/service/cinder3.yml
@@ -21,11 +21,11 @@
                 public_address: ${_param:cluster_public_host}
                 public_protocol: ${_param:cluster_public_protocol}
                 public_port: 8776
-                public_path: '/v3/$(tenant_id)s'
+                public_path: '/v3/$(project_id)s'
                 internal_address: ${_param:cinder_service_host}
                 internal_port: 8776
-                internal_path: '/v3/$(tenant_id)s'
+                internal_path: '/v3/$(project_id)s'
                 admin_address: ${_param:cinder_service_host}
                 admin_port: 8776
-                admin_path: '/v3/$(tenant_id)s'
+                admin_path: '/v3/$(project_id)s'
 
diff --git a/keystone/client/service/heat.yml b/keystone/client/service/heat.yml
index 692ceee..d7eadd5 100644
--- a/keystone/client/service/heat.yml
+++ b/keystone/client/service/heat.yml
@@ -24,10 +24,10 @@
                 public_address: ${_param:cluster_public_host}
                 public_protocol: ${_param:cluster_public_protocol}
                 public_port: 8004
-                public_path: '/v1/%(tenant_id)s'
+                public_path: '/v1/%(project_id)s'
                 internal_address: ${_param:heat_service_host}
                 internal_port: 8004
-                internal_path: '/v1/%(tenant_id)s'
+                internal_path: '/v1/%(project_id)s'
                 admin_address: ${_param:heat_service_host}
                 admin_port: 8004
-                admin_path: '/v1/%(tenant_id)s'
+                admin_path: '/v1/%(project_id)s'
diff --git a/keystone/client/service/nova.yml b/keystone/client/service/nova.yml
index ed703d0..a0d698b 100644
--- a/keystone/client/service/nova.yml
+++ b/keystone/client/service/nova.yml
@@ -21,10 +21,10 @@
                 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'
diff --git a/keystone/client/service/nova21.yml b/keystone/client/service/nova21.yml
index 48767de..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'
+                public_path: '/v2.1/$(project_id)s'
                 internal_address: ${_param:nova_service_host}
                 internal_port: 8774
-                internal_path: '/v2.1'
+                internal_path: '/v2.1/$(project_id)s'
                 admin_address: ${_param:nova_service_host}
                 admin_port: 8774
-                admin_path: '/v2.1'
+                admin_path: '/v2.1/$(project_id)s'
diff --git a/keystone/client/service/radosgw-s3.yml b/keystone/client/service/radosgw-s3.yml
index 6b0b764..00efe1b 100644
--- a/keystone/client/service/radosgw-s3.yml
+++ b/keystone/client/service/radosgw-s3.yml
@@ -21,7 +21,7 @@
                   public_address: ${_param:cluster_public_host}
                   public_protocol: ${_param:cluster_public_protocol}
                   public_port: 8081
-                  public_path: '/' # /$(tenant_id)s
+                  public_path: '/' # /$(project_id)s
                   internal_address: ${_param:radosgw_service_host}
                   internal_port: 8081
                   internal_path: '/'
diff --git a/keystone/client/service/radosgw-swift.yml b/keystone/client/service/radosgw-swift.yml
index 52c911c..9c7547e 100644
--- a/keystone/client/service/radosgw-swift.yml
+++ b/keystone/client/service/radosgw-swift.yml
@@ -21,7 +21,7 @@
                   public_address: ${_param:cluster_public_host}
                   public_protocol: ${_param:cluster_public_protocol}
                   public_port: 8081
-                  public_path: '/swift/v1' # /$(tenant_id)s
+                  public_path: '/swift/v1' # /$(project_id)s
                   internal_address: ${_param:radosgw_service_host}
                   internal_port: 8081
                   internal_path: '/swift/v1'
diff --git a/keystone/client/service/sahara.yml b/keystone/client/service/sahara.yml
index d727049..2cd3260 100644
--- a/keystone/client/service/sahara.yml
+++ b/keystone/client/service/sahara.yml
@@ -21,10 +21,10 @@
                   public_address: ${_param:cluster_public_host}
                   public_protocol: ${_param:cluster_public_protocol}
                   public_port: 8386
-                  public_path: '/v1.1/%(tenant_id)s'
+                  public_path: '/v1.1/%(project_id)s'
                   internal_address: ${_param:sahara_service_host}
                   internal_port: 8386
-                  internal_path: '/v1.1/%(tenant_id)s'
+                  internal_path: '/v1.1/%(project_id)s'
                   admin_address: ${_param:sahara_service_host}
                   admin_port: 8386
-                  admin_path: '/v1.1/%(tenant_id)s'
+                  admin_path: '/v1.1/%(project_id)s'
diff --git a/keystone/client/service/swift-s3.yml b/keystone/client/service/swift-s3.yml
index b909ceb..7bc1373 100644
--- a/keystone/client/service/swift-s3.yml
+++ b/keystone/client/service/swift-s3.yml
@@ -22,10 +22,10 @@
                   public_address: ${_param:cluster_public_host}
                   public_protocol: ${_param:cluster_public_protocol}
                   public_port: 8080
-                  public_path: '/v1/AUTH_%(tenant_id)s'
+                  public_path: '/v1/AUTH_%(project_id)s'
                   internal_address: ${_param:swift_service_host}
                   internal_port: 8080
-                  internal_path: '/v1/AUTH_%(tenant_id)s'
+                  internal_path: '/v1/AUTH_%(project_id)s'
                   admin_address: ${_param:swift_service_host}
                   admin_port: 8080
                   admin_path: '/'
diff --git a/keystone/client/service/swift.yml b/keystone/client/service/swift.yml
index 0fcb555..781fab9 100644
--- a/keystone/client/service/swift.yml
+++ b/keystone/client/service/swift.yml
@@ -21,10 +21,10 @@
                   public_address: ${_param:cluster_public_host}
                   public_protocol: ${_param:cluster_public_protocol}
                   public_port: 8080
-                  public_path: '/v1/AUTH_%(tenant_id)s'
+                  public_path: '/v1/AUTH_%(project_id)s'
                   internal_address: ${_param:swift_service_host}
                   internal_port: 8080
-                  internal_path: '/v1/AUTH_%(tenant_id)s'
+                  internal_path: '/v1/AUTH_%(project_id)s'
                   admin_address: ${_param:swift_service_host}
                   admin_port: 8080
                   admin_path: '/'