diff --git a/playbooks/vars/repo_packages/openstack_clients.yml b/playbooks/defaults/repo_packages/openstack_clients.yml
similarity index 100%
rename from playbooks/vars/repo_packages/openstack_clients.yml
rename to playbooks/defaults/repo_packages/openstack_clients.yml
diff --git a/playbooks/vars/repo_packages/openstack_other.yml b/playbooks/defaults/repo_packages/openstack_other.yml
similarity index 100%
rename from playbooks/vars/repo_packages/openstack_other.yml
rename to playbooks/defaults/repo_packages/openstack_other.yml
diff --git a/playbooks/vars/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml
similarity index 100%
rename from playbooks/vars/repo_packages/openstack_services.yml
rename to playbooks/defaults/repo_packages/openstack_services.yml
diff --git a/playbooks/vars/repo_packages/python2_lxc.yml b/playbooks/defaults/repo_packages/python2_lxc.yml
similarity index 100%
rename from playbooks/vars/repo_packages/python2_lxc.yml
rename to playbooks/defaults/repo_packages/python2_lxc.yml
diff --git a/playbooks/vars/repo_packages/readme.rst b/playbooks/defaults/repo_packages/readme.rst
similarity index 100%
rename from playbooks/vars/repo_packages/readme.rst
rename to playbooks/defaults/repo_packages/readme.rst
diff --git a/playbooks/lxc-hosts-setup.yml b/playbooks/lxc-hosts-setup.yml
index 0297aacad4..3fc1154429 100644
--- a/playbooks/lxc-hosts-setup.yml
+++ b/playbooks/lxc-hosts-setup.yml
@@ -27,4 +27,4 @@
         - "lxc-rsyslog-client"
         - "rsyslog-client"
   vars_files:
-    - vars/repo_packages/python2_lxc.yml
+    - defaults/repo_packages/python2_lxc.yml
diff --git a/playbooks/os-heat-install.yml b/playbooks/os-heat-install.yml
index fa41d327e0..68a1c38a72 100644
--- a/playbooks/os-heat-install.yml
+++ b/playbooks/os-heat-install.yml
@@ -61,4 +61,4 @@
     ansible_hostname: "{{ container_name }}"
     is_metal: "{{ properties.is_metal|default(false) }}"
   vars_files:
-    - vars/repo_packages/openstack_services.yml
+    - defaults/repo_packages/openstack_services.yml
diff --git a/playbooks/os-tempest-install.yml b/playbooks/os-tempest-install.yml
index 3da57e2a6a..28d897f8fa 100644
--- a/playbooks/os-tempest-install.yml
+++ b/playbooks/os-tempest-install.yml
@@ -26,7 +26,7 @@
         - "tempest-rsyslog-client"
         - "rsyslog-client"
   vars_files:
-    - vars/repo_packages/openstack_services.yml
+    - defaults/repo_packages/openstack_services.yml
   vars:
     # This sets the tempest group to the utility group
     tempest_main_group: utility_all
diff --git a/playbooks/plugins/lookups/py_pkgs.py b/playbooks/plugins/lookups/py_pkgs.py
index 86a43ab6ab..e490d82d98 100644
--- a/playbooks/plugins/lookups/py_pkgs.py
+++ b/playbooks/plugins/lookups/py_pkgs.py
@@ -88,7 +88,7 @@ class DependencyFileProcessor(object):
 
     @staticmethod
     def _get_files(path):
-        """Return a list of all files in the vars/repo_packages directory.
+        """Return a list of all files in the defaults/repo_packages directory.
 
         :type path: ``str``
         :returns: ``list``
diff --git a/playbooks/roles/repo_server/files/openstack-wheel-builder.py b/playbooks/roles/repo_server/files/openstack-wheel-builder.py
index 11461977ab..52b0f8aab0 100755
--- a/playbooks/roles/repo_server/files/openstack-wheel-builder.py
+++ b/playbooks/roles/repo_server/files/openstack-wheel-builder.py
@@ -85,7 +85,7 @@ class DependencyFileProcessor(object):
 
     @staticmethod
     def _get_files(path):
-        """Return a list of all files in the vars/repo_packages directory.
+        """Return a list of all files in the defaults/repo_packages directory.
 
         :type path: ``str``
         :returns: ``list``
diff --git a/scripts/sources-branch-updater.sh b/scripts/sources-branch-updater.sh
index b53bac02b6..c90beb5e37 100755
--- a/scripts/sources-branch-updater.sh
+++ b/scripts/sources-branch-updater.sh
@@ -19,7 +19,7 @@
 # all of the services that we support in an "automated" fashion.
 
 ONLINE_BRANCH=${ONLINE_BRANCH:-"stable/kilo"}
-SERVICE_FILE=${SERVICE_FILE:-"playbooks/vars/repo_packages/openstack_services.yml"}
+SERVICE_FILE=${SERVICE_FILE:-"playbooks/defaults/repo_packages/openstack_services.yml"}
 
 IFS=$'\n'