diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo.sphinx.config b/modules/openstack_project/files/gerrit/acls/openstack/oslosphinx.config
similarity index 100%
rename from modules/openstack_project/files/gerrit/acls/openstack/oslo.sphinx.config
rename to modules/openstack_project/files/gerrit/acls/openstack/oslosphinx.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 5376ba8c9a..7291638675 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -673,6 +673,19 @@
       - openstack-doc-jobs
 
 
+- project:
+    name: oslosphinx
+    github-org: openstack
+    node: precise
+    tarball-site: tarballs.openstack.org
+    doc-publisher-site: docs.openstack.org
+
+    jobs:
+      - python-jobs
+      - openstack-publish-jobs
+      - pypi-jobs
+
+
 - project:
     name: oslo.config
     github-org: openstack
@@ -708,18 +721,6 @@
       - python-jobs
       - pypi-jobs
 
-- project:
-    name: oslo.sphinx
-    github-org: openstack
-    node: precise
-    tarball-site: tarballs.openstack.org
-    doc-publisher-site: docs.openstack.org
-
-    jobs:
-      - python-jobs
-      - openstack-publish-jobs
-      - pypi-jobs
-
 
 - project:
     name: oslo.version
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index 1b2a7546bf..397ec17175 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -238,12 +238,12 @@
 - project: openstack/oslo.rootwrap
   docimpact-group: openstack-manuals
   upstream: git://github.com/ttx/oslo.rootwrap.git
-- project: openstack/oslo.sphinx
-  docimpact-group: openstack-manuals
-  description: Theme and utilities for Sphinx documentation tool
 - project: openstack/oslo.version
   docimpact-group: openstack-manuals
   upstream: git://github.com/emonty/oslo.version.git
+- project: openstack/oslosphinx
+  docimpact-group: openstack-manuals
+  description: Theme and utilities for Sphinx documentation tool
 - project: openstack/pycadf
   description: CADF Python module
 - project: openstack/python-ceilometerclient
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 25dd2778cc..57fa2dcb9a 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1704,6 +1704,25 @@ projects:
       - os-refresh-config-tarball:
         - os-refresh-config-pypi-upload
 
+#TODO: add docs
+  - name: openstack/oslosphinx
+    check:
+      - gate-oslosphinx-requirements
+      - gate-oslosphinx-pep8
+    gate:
+      - gate-oslosphinx-requirements
+      - gate-oslosphinx-pep8
+    post:
+      - oslosphinx-branch-tarball
+    pre-release:
+      - oslosphinx-tarball
+    release:
+      - oslosphinx-tarball:
+        - oslosphinx-pypi-upload:
+          - post-mirror-python26
+          - post-mirror-python27
+          - post-mirror-python33
+
   - name: openstack/oslo-incubator
     template:
       - name: python-jobs
@@ -1806,25 +1825,6 @@ projects:
           - post-mirror-python27
           - post-mirror-python33
 
-#TODO: add docs
-  - name: openstack/oslo.sphinx
-    check:
-      - gate-oslo.sphinx-requirements
-      - gate-oslo.sphinx-pep8
-    gate:
-      - gate-oslo.sphinx-requirements
-      - gate-oslo.sphinx-pep8
-    post:
-      - oslo.sphinx-branch-tarball
-    pre-release:
-      - oslo.sphinx-tarball
-    release:
-      - oslo.sphinx-tarball:
-        - oslo.sphinx-pypi-upload:
-          - post-mirror-python26
-          - post-mirror-python27
-          - post-mirror-python33
-
   - name: openstack/oslo.version
     template:
       - name: python-jobs