diff --git a/releasenotes/notes/package-list-name-changes-a86f7e7c805c2d81.yaml b/releasenotes/notes/package-list-name-changes-a86f7e7c805c2d81.yaml
new file mode 100644
index 00000000..e7874edb
--- /dev/null
+++ b/releasenotes/notes/package-list-name-changes-a86f7e7c805c2d81.yaml
@@ -0,0 +1,10 @@
+---
+upgrade:
+  - The variable ``neutron_apt_packages`` has been renamed to
+    ``neutron_distro_packages``.
+  - The variable ``neutron_lbaas_apt_packages`` has been renamed to
+    ``neutron_lbaas_distro_packages``.
+  - The variable ``neutron_vpnaas_apt_packages`` has been renamed to
+    ``neutron_vpnaas_distro_packages``.
+  - The variable ``neutron_apt_remove_packages`` has been renamed to
+    ``neutron_remove_distro_packages``.
diff --git a/tasks/neutron_install-apt.yml b/tasks/neutron_install-apt.yml
index 20cecd6c..bdec499c 100644
--- a/tasks/neutron_install-apt.yml
+++ b/tasks/neutron_install-apt.yml
@@ -49,7 +49,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ neutron_apt_packages }}"
+  with_items: "{{ neutron_distro_packages }}"
 
 - name: Install apt packages for LXB
   apt:
@@ -59,7 +59,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ neutron_lxb_apt_packages }}"
+  with_items: "{{ neutron_lxb_distro_packages }}"
   when:
     - neutron_services['neutron-linuxbridge-agent']['group'] in group_names
     - neutron_services['neutron-linuxbridge-agent'].service_en | bool
@@ -72,7 +72,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ ovs_apt_packages }}"
+  with_items: "{{ neutron_ovs_distro_packages }}"
   when:
     - neutron_services['neutron-openvswitch-agent']['group'] in group_names
     - neutron_services['neutron-openvswitch-agent'].service_en | bool
@@ -85,7 +85,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ neutron_lbaas_apt_packages }}"
+  with_items: "{{ neutron_lbaas_distro_packages }}"
   when:
     - neutron_services['neutron-lbaasv2-agent']['group'] in group_names
     - neutron_lbaasv2 | bool
@@ -98,7 +98,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ neutron_vpnaas_apt_packages }}"
+  with_items: "{{ neutron_vpnaas_distro_packages }}"
   when:
     - neutron_services['neutron-vpnaas-agent']['group'] in group_names
     - neutron_vpnaas | bool
@@ -111,4 +111,4 @@
   until: remove_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ neutron_apt_remove_packages }}"
+  with_items: "{{ neutron_remove_distro_packages }}"
diff --git a/tests/ovs_test_vars.yml b/tests/ovs_test_vars.yml
index b94522a0..3555b3e5 100644
--- a/tests/ovs_test_vars.yml
+++ b/tests/ovs_test_vars.yml
@@ -5,4 +5,4 @@ openstack_host_specific_kernel_modules:
     group: "physical_host"
 
 neutron_plugin_type: ml2.ovs
-neutron_local_ip: "{{ ansible_ssh_host }}"
\ No newline at end of file
+neutron_local_ip: "{{ ansible_ssh_host }}"
diff --git a/vars/ubuntu-14.04.yml b/vars/ubuntu-14.04.yml
index c9be8e64..99ab3e7b 100644
--- a/vars/ubuntu-14.04.yml
+++ b/vars/ubuntu-14.04.yml
@@ -20,14 +20,14 @@ uca_openstack_release: mitaka
 uca_repo_dist: "{{ ansible_lsb.codename }}-updates/{{ uca_openstack_release }}"
 uca_repo: "deb {{ uca_apt_repo_url }} {{ uca_repo_dist }} main"
 
-ovs_apt_packages:
+neutron_ovs_distro_packages:
   - openvswitch-common
   - openvswitch-switch
 
 ## APT Cache options
 cache_timeout: 600
 
-neutron_apt_packages:
+neutron_distro_packages:
   - conntrack
   - dnsmasq-base
   - dnsmasq-utils
@@ -38,16 +38,16 @@ neutron_apt_packages:
   - libpq-dev
   - radvd
 
-neutron_lxb_apt_packages:
+neutron_lxb_distro_packages:
   - bridge-utils
 
-neutron_lbaas_apt_packages:
+neutron_lbaas_distro_packages:
   - haproxy
 
-neutron_vpnaas_apt_packages:
+neutron_vpnaas_distro_packages:
   - openswan
 
-neutron_apt_remove_packages:
+neutron_remove_distro_packages:
   - conntrackd
 
 neutron_lbaasv2_initscript_path: "/etc/init/neutron-lbaasv2-agent.conf"
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index ba86b16d..203271f6 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -18,14 +18,14 @@ uca_openstack_release: newton
 uca_repo_dist: "{{ ansible_lsb.codename }}-updates/{{ uca_openstack_release }}"
 uca_repo: "deb {{ uca_apt_repo_url }} {{ uca_repo_dist }} main"
 
-ovs_apt_packages:
+neutron_ovs_distro_packages:
   - openvswitch-common
   - openvswitch-switch
 
 ## APT Cache options
 cache_timeout: 600
 
-neutron_apt_packages:
+neutron_distro_packages:
   - conntrack
   - dnsmasq-base
   - dnsmasq-utils
@@ -36,16 +36,16 @@ neutron_apt_packages:
   - libpq-dev
   - radvd
 
-neutron_lxb_apt_packages:
+neutron_lxb_distro_packages:
   - bridge-utils
 
-neutron_lbaas_apt_packages:
+neutron_lbaas_distro_packages:
   - haproxy
 
-neutron_vpnaas_apt_packages:
+neutron_vpnaas_distro_packages:
   - openswan
 
-neutron_apt_remove_packages:
+neutron_remove_distro_packages:
   - conntrackd
 
 neutron_lbaasv2_initscript_path: "/etc/init/neutron-lbaasv2-agent.conf"