diff --git a/examples/playbook.yml b/examples/playbook.yml
index 25bab8ab..5abca460 100644
--- a/examples/playbook.yml
+++ b/examples/playbook.yml
@@ -5,4 +5,4 @@
     - { role: "os_cinder", tags: [ "os-cinder" ] }
   vars:
     cinder_glance_api_servers: "http://glance_server:9292"
-    cinder_galera_address: "{{ internal_lb_vip_address }}"
\ No newline at end of file
+    cinder_galera_address: "{{ internal_lb_vip_address }}"
diff --git a/releasenotes/notes/package-list-name-changes-6f74fbf336030242.yaml b/releasenotes/notes/package-list-name-changes-6f74fbf336030242.yaml
new file mode 100644
index 00000000..f20a2d89
--- /dev/null
+++ b/releasenotes/notes/package-list-name-changes-6f74fbf336030242.yaml
@@ -0,0 +1,8 @@
+---
+upgrade:
+  - The variable ``cinder_apt_packages`` has been renamed to
+    ``cinder_distro_packages``.
+  - The variable ``cinder_volume_apt_packages`` has been renamed to
+    ``cinder_volume_distro_packages``.
+  - The variable ``cinder_lvm_volume_apt_packages`` has been renamed to
+    ``cinder_lvm_volume_distro_packages``.
diff --git a/tasks/cinder_init_common.yml b/tasks/cinder_init_common.yml
index 384e4418..60196986 100644
--- a/tasks/cinder_init_common.yml
+++ b/tasks/cinder_init_common.yml
@@ -25,4 +25,4 @@
    name: "{{ program_name }}"
    enabled: "yes"
   notify:
-    - Restart cinder services
\ No newline at end of file
+    - Restart cinder services
diff --git a/tasks/cinder_install_apt.yml b/tasks/cinder_install_apt.yml
index 08ee10bd..e89f2c54 100644
--- a/tasks/cinder_install_apt.yml
+++ b/tasks/cinder_install_apt.yml
@@ -34,7 +34,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ cinder_apt_packages }}"
+  with_items: "{{ cinder_distro_packages }}"
 
 - name: Install apt packages common between different backends
   apt:
@@ -44,7 +44,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ cinder_volume_apt_packages }}"
+  with_items: "{{ cinder_volume_distro_packages }}"
   when:
     - inventory_hostname in groups['cinder_volume']
 
@@ -56,7 +56,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ cinder_lvm_volume_apt_packages }}"
+  with_items: "{{ cinder_lvm_volume_distro_packages }}"
   when:
     - inventory_hostname in groups['cinder_volume']
     - cinder_backend_lvm_inuse | bool
diff --git a/vars/ubuntu-14.04.yml b/vars/ubuntu-14.04.yml
index 17b9c1c0..bcc12c0a 100644
--- a/vars/ubuntu-14.04.yml
+++ b/vars/ubuntu-14.04.yml
@@ -17,7 +17,7 @@
 cache_timeout: 600
 
 # Common apt packages
-cinder_apt_packages:
+cinder_distro_packages:
   - libpq-dev
   - libkmod-dev
   - libkmod2
@@ -27,10 +27,10 @@ cinder_apt_packages:
   - zlib1g
   - zlibc
 
-cinder_volume_apt_packages:
+cinder_volume_distro_packages:
   - qemu-utils
 
-cinder_lvm_volume_apt_packages:
+cinder_lvm_volume_distro_packages:
   - dmeventd
   - parted
   - tgt
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index c8cffb30..dc99a17f 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -18,7 +18,7 @@
 cache_timeout: 600
 
 # Common apt packages
-cinder_apt_packages:
+cinder_distro_packages:
  - rpcbind
  - rsync
  - git
@@ -32,10 +32,10 @@ cinder_apt_packages:
  - libffi-dev
  - libssl-dev
 
-cinder_volume_apt_packages:
+cinder_volume_distro_packages:
  - qemu-utils
 
-cinder_lvm_volume_apt_packages:
+cinder_lvm_volume_distro_packages:
  - dmeventd
  - parted
  - tgt