diff --git a/releasenotes/notes/var-deprecations-417d87b9d386466a.yaml b/releasenotes/notes/var-deprecations-417d87b9d386466a.yaml
index 13952a82..b1503d8d 100644
--- a/releasenotes/notes/var-deprecations-417d87b9d386466a.yaml
+++ b/releasenotes/notes/var-deprecations-417d87b9d386466a.yaml
@@ -1,12 +1,11 @@
 ---
-deprecations:
+upgrade:
   - |
     The following variables have been renamed in order to make the variable
     names neutral for multiple operating systems.
 
-      * nova_apt_packages -> nova_packages
-      * nova_spice_apt_packages -> nova_spice_packages
-      * nova_novnc_apt_packages -> nova_novnc_packages
-      * nova_compute_kvm_apt_packages -> nova_compute_kvm_package
+      * nova_apt_packages -> nova_distro_packages
+      * nova_spice_apt_packages -> nova_spice_distro_packages
+      * nova_novnc_apt_packages -> nova_novnc_distro_packages
+      * nova_compute_kvm_apt_packages -> nova_compute_kvm_distro_packages
 
-    The old variable names will be removed in the Ocata cycle.
diff --git a/tasks/nova_compute_powervm_install.yml b/tasks/nova_compute_powervm_install.yml
index 4458ff75..ccf2a4ee 100644
--- a/tasks/nova_compute_powervm_install.yml
+++ b/tasks/nova_compute_powervm_install.yml
@@ -66,7 +66,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ nova_compute_powervm_packages }}"
+  with_items: "{{ nova_compute_powervm_distro_packages }}"
   tags:
     - nova-apt-packages
     - nova-compute-powervm-apt-packages
diff --git a/tasks/nova_install_apt.yml b/tasks/nova_install_apt.yml
index bfba6040..646b8e0e 100644
--- a/tasks/nova_install_apt.yml
+++ b/tasks/nova_install_apt.yml
@@ -61,7 +61,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ nova_packages | deprecated(nova_apt_packages, 'nova_apt_packages', 'nova_packages', 'Ocata') }}"
+  with_items: "{{ nova_distro_packages }}"
   tags:
     - nova-install
     - nova-apt-packages
@@ -74,7 +74,7 @@
   until: remove_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ nova_spice_packages | deprecated(nova_spice_apt_packages, 'nova_spice_apt_packages', 'nova_spice_packages', 'Ocata') }}"
+  with_items: "{{ nova_spice_distro_packages }}"
   when:
     - inventory_hostname in groups['nova_console']
     - nova_console_type == "spice"
@@ -91,7 +91,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ nova_novnc_packages | deprecated(nova_novnc_apt_packages, 'nova_novnc_apt_packages', 'nova_novnc_packages', 'Ocata') }}"
+  with_items: "{{ nova_novnc_distro_packages }}"
   when:
     - inventory_hostname in groups['nova_console']
     - nova_console_type == "novnc"
@@ -108,7 +108,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ nova_compute_kvm_packages | deprecated(nova_compute_kvm_apt_packages, 'nova_compute_kvm_apt_packages', 'nova_compute_kvm_packages', 'Ocata') }}"
+  with_items: "{{ nova_compute_kvm_distro_packages }}"
   when:
     - inventory_hostname in groups['nova_compute']
     - nova_virt_type == 'kvm' or nova_virt_type == 'qemu'
@@ -125,7 +125,7 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ nova_compute_lxd_packages }}"
+  with_items: "{{ nova_compute_lxd_distro_packages }}"
   when:
     - inventory_hostname in groups['nova_compute']
     - nova_virt_type == 'lxd'
diff --git a/vars/ubuntu-14.04.yml b/vars/ubuntu-14.04.yml
index ad4eb2d4..20a6cd6d 100644
--- a/vars/ubuntu-14.04.yml
+++ b/vars/ubuntu-14.04.yml
@@ -17,17 +17,17 @@
 cache_timeout: 600
 
 # Common apt packages
-nova_packages:
+nova_distro_packages:
   - genisoimage
   - git
   - libpq-dev
   - iptables
 
 # Spice console apt packages
-nova_spice_packages:
+nova_spice_distro_packages:
   - spice-html5
 
-nova_novnc_packages:
+nova_novnc_distro_packages:
   - libjs-jquery
   - libjs-sphinxdoc
   - libjs-underscore
@@ -35,7 +35,7 @@ nova_novnc_packages:
   - librabbitmq1
   - libyaml-0-2
 
-nova_compute_kvm_packages:
+nova_compute_kvm_distro_packages:
   - bridge-utils
   - genisoimage
   - kpartx
@@ -52,7 +52,7 @@ nova_compute_kvm_packages:
   - dosfstools-dbg
   - multipath-tools
 
-nova_compute_lxd_packages:
+nova_compute_lxd_distro_packages:
   - bridge-utils
   - dosfstools
   - dosfstools-dbg
@@ -74,7 +74,7 @@ uca_repo_dist: "{{ ansible_lsb.codename }}-updates/{{ uca_openstack_release }}"
 uca_repo: "deb {{ uca_apt_repo_url }} {{ uca_repo_dist }} main"
 
 # nova powervm virt driver
-nova_compute_powervm_packages:
+nova_compute_powervm_distro_packages:
   - bridge-utils
   - genisoimage
   - kpartx
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index 992862d5..e968bb32 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -17,17 +17,17 @@
 cache_timeout: 600
 
 # Common apt packages
-nova_packages:
+nova_distro_packages:
   - genisoimage
   - git
   - libpq-dev
   - iptables
 
 # Spice console apt packages
-nova_spice_packages:
+nova_spice_distro_packages:
   - spice-html5
 
-nova_novnc_packages:
+nova_novnc_distro_packages:
   - libjs-jquery
   - libjs-sphinxdoc
   - libjs-underscore
@@ -35,7 +35,7 @@ nova_novnc_packages:
   - librabbitmq1
   - libyaml-0-2
 
-nova_compute_kvm_packages:
+nova_compute_kvm_distro_packages:
   - bridge-utils
   - genisoimage
   - kpartx
@@ -52,7 +52,7 @@ nova_compute_kvm_packages:
   - dosfstools-dbg
   - multipath-tools
 
-nova_compute_lxd_packages:
+nova_compute_lxd_distro_packages:
   - bridge-utils
   - dosfstools
   - dosfstools-dbg
@@ -73,7 +73,7 @@ uca_repo_dist: "{{ ansible_lsb.codename }}-updates/{{ uca_openstack_release }}"
 uca_repo: "deb {{ uca_apt_repo_url }} {{ uca_repo_dist }} main"
 
 # nova powervm virt driver
-nova_compute_powervm_packages:
+nova_compute_powervm_distro_packages:
   - bridge-utils
   - genisoimage
   - kpartx