diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 0e9dd33eba..8b644df09b 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -133,8 +133,8 @@ tripleo:
       - x-vrif-minus-2
     projects:
       - stackforge/diskimage-builder
-      - stackforge/os-config-applier
       - stackforge/os-collect-config
+      - stackforge/os-apply-config
       - stackforge/os-refresh-config
       - stackforge/tripleo-image-elements
       - stackforge/tripleo-heat-templates
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/os-apply-config.config b/modules/openstack_project/files/gerrit/acls/stackforge/os-apply-config.config
new file mode 100644
index 0000000000..ebaccb7303
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/acls/stackforge/os-apply-config.config
@@ -0,0 +1,16 @@
+[access "refs/*"]
+   owner = group Administrators
+[receive]
+   requireChangeId = true
+   requireContributorAgreement = true
+[submit]
+   mergeContent = true
+[access "refs/heads/*"]
+   label-Code-Review = -2..+2 group os-apply-config-core
+   label-Approved = +0..+1 group os-apply-config-core
+   workInProgress = group os-apply-config-core
+[access "refs/heads/milestone-proposed"]
+   label-Code-Review = -2..+2 group os-apply-config-core
+   label-Approved = +0..+1 group os-apply-config-core
+[project]
+   state = active
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/os-collect-config.config b/modules/openstack_project/files/gerrit/acls/stackforge/os-collect-config.config
index 62a8084da9..ebaccb7303 100644
--- a/modules/openstack_project/files/gerrit/acls/stackforge/os-collect-config.config
+++ b/modules/openstack_project/files/gerrit/acls/stackforge/os-collect-config.config
@@ -6,11 +6,11 @@
 [submit]
    mergeContent = true
 [access "refs/heads/*"]
-   label-Code-Review = -2..+2 group os-config-applier-core
-   label-Approved = +0..+1 group os-config-applier-core
-   workInProgress = group os-config-applier-core
+   label-Code-Review = -2..+2 group os-apply-config-core
+   label-Approved = +0..+1 group os-apply-config-core
+   workInProgress = group os-apply-config-core
 [access "refs/heads/milestone-proposed"]
-   label-Code-Review = -2..+2 group os-config-applier-core
-   label-Approved = +0..+1 group os-config-applier-core
+   label-Code-Review = -2..+2 group os-apply-config-core
+   label-Approved = +0..+1 group os-apply-config-core
 [project]
    state = active
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/os-config-applier.config b/modules/openstack_project/files/gerrit/acls/stackforge/os-config-applier.config
deleted file mode 100644
index 62a8084da9..0000000000
--- a/modules/openstack_project/files/gerrit/acls/stackforge/os-config-applier.config
+++ /dev/null
@@ -1,16 +0,0 @@
-[access "refs/*"]
-   owner = group Administrators
-[receive]
-   requireChangeId = true
-   requireContributorAgreement = true
-[submit]
-   mergeContent = true
-[access "refs/heads/*"]
-   label-Code-Review = -2..+2 group os-config-applier-core
-   label-Approved = +0..+1 group os-config-applier-core
-   workInProgress = group os-config-applier-core
-[access "refs/heads/milestone-proposed"]
-   label-Code-Review = -2..+2 group os-config-applier-core
-   label-Approved = +0..+1 group os-config-applier-core
-[project]
-   state = active
diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/os-refresh-config.config b/modules/openstack_project/files/gerrit/acls/stackforge/os-refresh-config.config
index 62a8084da9..ebaccb7303 100644
--- a/modules/openstack_project/files/gerrit/acls/stackforge/os-refresh-config.config
+++ b/modules/openstack_project/files/gerrit/acls/stackforge/os-refresh-config.config
@@ -6,11 +6,11 @@
 [submit]
    mergeContent = true
 [access "refs/heads/*"]
-   label-Code-Review = -2..+2 group os-config-applier-core
-   label-Approved = +0..+1 group os-config-applier-core
-   workInProgress = group os-config-applier-core
+   label-Code-Review = -2..+2 group os-apply-config-core
+   label-Approved = +0..+1 group os-apply-config-core
+   workInProgress = group os-apply-config-core
 [access "refs/heads/milestone-proposed"]
-   label-Code-Review = -2..+2 group os-config-applier-core
-   label-Approved = +0..+1 group os-config-applier-core
+   label-Code-Review = -2..+2 group os-apply-config-core
+   label-Approved = +0..+1 group os-apply-config-core
 [project]
    state = active
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 271ce9c582..a3d98d3b92 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -870,7 +870,7 @@
       - python-jobs
 
 - project:
-    name: os-config-applier
+    name: os-apply-config
     github-org: stackforge
     node: precise
     tarball-site: tarballs.openstack.org
diff --git a/modules/openstack_project/files/zuul/layout-dev.yaml b/modules/openstack_project/files/zuul/layout-dev.yaml
index 5b2fdf2633..37284df703 100644
--- a/modules/openstack_project/files/zuul/layout-dev.yaml
+++ b/modules/openstack_project/files/zuul/layout-dev.yaml
@@ -585,11 +585,11 @@ projects:
       - gate-diskimage-builder-python26
       - gate-diskimage-builder-python27
 
-  - name: stackforge/os-config-applier
+  - name: stackforge/os-apply-config
     check:
-      - gate-os-config-applier-pep8
-      - gate-os-config-applier-python26
-      - gate-os-config-applier-python27
+      - gate-os-apply-config-pep8
+      - gate-os-apply-config-python26
+      - gate-os-apply-config-python27
 
   - name: stackforge/os-refresh-config
     check:
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 07d6857a63..f6fd4ab95b 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1515,17 +1515,17 @@ projects:
     post:
       - diskimage-builder-coverage
 
-  - name: stackforge/os-config-applier
+  - name: stackforge/os-apply-config
     check:
-      - gate-os-config-applier-pep8
-      - gate-os-config-applier-python26
-      - gate-os-config-applier-python27
+      - gate-os-apply-config-pep8
+      - gate-os-apply-config-python26
+      - gate-os-apply-config-python27
     gate:
-      - gate-os-config-applier-pep8
-      - gate-os-config-applier-python26
-      - gate-os-config-applier-python27
+      - gate-os-apply-config-pep8
+      - gate-os-apply-config-python26
+      - gate-os-apply-config-python27
     post:
-      - os-config-applier-coverage
+      - os-apply-config-coverage
 
   - name: stackforge/os-collect-config
     check:
diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb
index 4865fc7076..87f147f3c1 100644
--- a/modules/openstack_project/templates/review.projects.yaml.erb
+++ b/modules/openstack_project/templates/review.projects.yaml.erb
@@ -175,7 +175,7 @@
 - project: stackforge/savanna-extra
   description: "Repo for Savanna-related utils."
   acl-config: /home/gerrit2/acls/stackforge/savanna.config
-- project: stackforge/os-config-applier
+- project: stackforge/os-apply-config
   description: "Apply configuration from cloud metadata"
 - project: stackforge/os-collect-config
   description: "Collect and cache metadata, run hooks on changes."