diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 5dafd7a80e..d052dd30e6 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -342,8 +342,8 @@ openstack-ironic:
       - change-merged
       - x-vrif-minus-2
     projects:
-      - openstack/baremetal-specs
       - openstack/ironic
+      - openstack/ironic-specs
       - openstack/ironic-python-agent
       - openstack/python-ironicclient
       - stackforge/pyghmi
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/baremetal-specs.config b/modules/openstack_project/files/gerrit/acls/openstack/ironic-specs.config
similarity index 51%
rename from modules/openstack_project/files/gerrit/acls/openstack/baremetal-specs.config
rename to modules/openstack_project/files/gerrit/acls/openstack/ironic-specs.config
index ea39b52f54..781e92bdfe 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/baremetal-specs.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/ironic-specs.config
@@ -1,7 +1,7 @@
 [access "refs/heads/*"]
-        label-Code-Review = -2..+2 group baremetal-specs-core
-        label-Workflow = -1..+1 group baremetal-specs-core
-        abandon = group baremetal-specs-core
+        label-Code-Review = -2..+2 group ironic-specs-core
+        label-Workflow = -1..+1 group ironic-specs-core
+        abandon = group ironic-specs-core
 [project]
         state = active
 [receive]
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 940024db11..a37f3f57ae 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1932,7 +1932,7 @@
       - gate-{name}-chef-unit
 
 - project:
-    name: baremetal-specs
+    name: ironic-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 84b8299526..425c275021 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -209,8 +209,6 @@
 - project: openstack/barbican
   description: Barbican is a ReST API designed for the secure storage, provisioning and management of secrets, including in OpenStack environments.
   upstream: git://github.com/cloudkeep/barbican.git
-- project: openstack/baremetal-specs
-  group: ironic
 - project: openstack/ceilometer
 - project: openstack/cinder
   docimpact-group: openstack-manuals
@@ -260,6 +258,8 @@
   description: A python agent for provisioning and deprovisioning Bare Metal servers.
   upstream: git://github.com/rackerlabs/teeth-agent.git
   group: ironic
+- project: openstack/ironic-specs
+  group: ironic
 - project: openstack/keystone
   docimpact-group: openstack-manuals
 - project: openstack/marconi
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index d3d5a048c4..2100a8eb66 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -881,13 +881,13 @@ projects:
     periodic:
       - ironic-propose-translation-update
 
-  - name: openstack/baremetal-specs
+  - name: openstack/ironic-specs
     check:
-      - gate-baremetal-specs-python27
-      - gate-baremetal-specs-docs
+      - gate-ironic-specs-python27
+      - gate-ironic-specs-docs
     gate:
-      - gate-baremetal-specs-python27
-      - gate-baremetal-specs-docs
+      - gate-ironic-specs-python27
+      - gate-ironic-specs-docs
 
   - name: openstack/keystone
     template: