diff --git a/elements/os-apply-config/README.md b/elements/os-apply-config/README.md
index f3728d368..d6e85ab23 100644
--- a/elements/os-apply-config/README.md
+++ b/elements/os-apply-config/README.md
@@ -1,6 +1,6 @@
 Install os-apply-config.
 
-The contents of any os-config-applier or os-apply-config subdirectories in
-templates will be installed into the default template directory automatically.
+The contents of os-apply-config subdirectory in templates will be installed
+into the default template directory automatically.
 
 An os-refresh-config hook is created to invoke os-apply-config automatically.
diff --git a/elements/os-apply-config/install.d/99-install-config-templates b/elements/os-apply-config/install.d/99-install-config-templates
index 2ed5a08bd..e2b97afba 100755
--- a/elements/os-apply-config/install.d/99-install-config-templates
+++ b/elements/os-apply-config/install.d/99-install-config-templates
@@ -1,13 +1,10 @@
 #!/bin/bash
 # Note that this relies on the detail that all elements share one dir
 # inside the chroot. This will copy all the files that elements have
-# added to element/os-config-applier or element/os-apply-config into the
-# appropriate location.
+# added to element/os-apply-config into the appropriate location.
 set -eux
 TEMPLATE_ROOT=$(os-apply-config --print-templates)
-TEMPLATE_SOURCE=$(dirname $0)/../os-config-applier
-mkdir -p $TEMPLATE_ROOT
-
-[ -d $TEMPLATE_SOURCE ] && rsync --exclude='.*.swp' -Cr $TEMPLATE_SOURCE/ $TEMPLATE_ROOT/
 TEMPLATE_SOURCE=$(dirname $0)/../os-apply-config
+
+mkdir -p $TEMPLATE_ROOT
 [ -d $TEMPLATE_SOURCE ] && rsync --exclude='.*.swp' -Cr $TEMPLATE_SOURCE/ $TEMPLATE_ROOT/
diff --git a/elements/os-apply-config/install.d/os-apply-config-package-install/10-os-config-applier b/elements/os-apply-config/install.d/os-apply-config-package-install/10-os-apply-config
similarity index 100%
rename from elements/os-apply-config/install.d/os-apply-config-package-install/10-os-config-applier
rename to elements/os-apply-config/install.d/os-apply-config-package-install/10-os-apply-config
diff --git a/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-config-applier b/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config
similarity index 91%
rename from elements/os-apply-config/install.d/os-apply-config-source-install/10-os-config-applier
rename to elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config
index 7e6bc44de..583ab1df5 100755
--- a/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-config-applier
+++ b/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config
@@ -25,7 +25,6 @@ fi
 write-pip-manifest os-apply-config
 
 ln -s /opt/stack/venvs/os-apply-config/bin/os-apply-config /usr/local/bin/os-apply-config
-ln -s /opt/stack/venvs/os-apply-config/bin/os-config-applier /usr/local/bin/os-config-applier
 
 set +u
 deactivate
diff --git a/elements/os-apply-config/os-refresh-config/configure.d/50-os-config-applier b/elements/os-apply-config/os-refresh-config/configure.d/50-os-apply-config
similarity index 100%
rename from elements/os-apply-config/os-refresh-config/configure.d/50-os-config-applier
rename to elements/os-apply-config/os-refresh-config/configure.d/50-os-apply-config