diff --git a/tasks/keystone_install_apt.yml b/tasks/keystone_install_apt.yml
index ee5bcf82..6a61f784 100644
--- a/tasks/keystone_install_apt.yml
+++ b/tasks/keystone_install_apt.yml
@@ -90,6 +90,6 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ keystone_developer_distro_packages }}"
+  with_items: "{{ keystone_developer_mode_distro_packages }}"
   when:
     - keystone_developer_mode | bool
diff --git a/tasks/keystone_install_yum.yml b/tasks/keystone_install_yum.yml
index 59c36c2d..5207ca81 100644
--- a/tasks/keystone_install_yum.yml
+++ b/tasks/keystone_install_yum.yml
@@ -125,6 +125,6 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ keystone_developer_distro_packages }}"
+  with_items: "{{ keystone_developer_mode_distro_packages }}"
   when:
     - keystone_developer_mode | bool
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index c4585aee..e8006dfe 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -51,7 +51,7 @@ keystone_idp_distro_packages:
 keystone_sp_distro_packages:
   - shibboleth
 
-keystone_developer_distro_packages:
+keystone_developer_mode_distro_packages:
   - '@Development Tools'
 
 keystone_apache_default_sites:
diff --git a/vars/ubuntu-14.04.yml b/vars/ubuntu-14.04.yml
index 81017573..8023115e 100644
--- a/vars/ubuntu-14.04.yml
+++ b/vars/ubuntu-14.04.yml
@@ -44,7 +44,7 @@ keystone_idp_distro_packages:
 keystone_sp_distro_packages:
   - libapache2-mod-shib2
 
-keystone_developer_distro_packages:
+keystone_developer_mode_distro_packages:
   - build-essential
 
 keystone_apache_default_sites:
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index f48dc613..9f1d01ac 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -44,7 +44,7 @@ keystone_idp_distro_packages:
 keystone_sp_distro_packages:
   - libapache2-mod-shib2
 
-keystone_developer_distro_packages:
+keystone_developer_mode_distro_packages:
   - build-essential
 
 keystone_apache_default_sites: