diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 3f3a0715ec..0b7e4fb8de 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -153,7 +153,7 @@ heat:
       - openstack/python-heatclient
       - openstack/heat-cfntools
       - openstack/heat-templates
-      - openstack/orchestration-specs
+      - openstack/heat-specs
       - openstack-dev/heat-cfnclient
     branches:
       - master
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/orchestration-specs.config b/modules/openstack_project/files/gerrit/acls/openstack/heat-specs.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/orchestration-specs.config
rename to modules/openstack_project/files/gerrit/acls/openstack/heat-specs.config
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index f638c9b35a..dcdf6b1a9b 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -552,7 +552,7 @@
       - translation-jobs
 
 - project:
-    name: orchestration-specs
+    name: heat-specs
     github-org: openstack
     node: bare-precise
     tarball-site: tarballs.openstack.org
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index 56b2f214f7..6b50ef1647 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -238,6 +238,8 @@
 - project: openstack/heat
 - project: openstack/heat-cfntools
   upstream: git://github.com/heat-api/heat-cfntools.git
+- project: openstack/heat-specs
+  group: heat
 - project: openstack/heat-templates
 - project: openstack/horizon
   docimpact-group: openstack-manuals
@@ -300,8 +302,6 @@
   description: OpenStack Operations Guide
   options:
     - direct-release
-- project: openstack/orchestration-specs
-  group: heat
 - project: openstack/os-apply-config
   description: Apply configuration from cloud metadata.
 - project: openstack/os-cloud-config
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index d35f8923d7..9e769b9b5a 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -821,11 +821,11 @@ projects:
     periodic:
       - heat-propose-translation-update
 
-  - name: openstack/orchestration-specs
+  - name: openstack/heat-specs
     check:
-      - gate-orchestration-specs-docs
+      - gate-heat-specs-docs
     gate:
-      - gate-orchestration-specs-docs
+      - gate-heat-specs-docs
 
   - name: openstack/horizon
     template: