diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6a48f2..352af2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 ### Enhancements
 * Add Stretch-Security repository.
 * Update README.md with example.
+* Rename apt_old_* to apt_unwanted_* vars.
 
 ## v1.0.2
 
diff --git a/README.md b/README.md
index ae57625..a5dae16 100644
--- a/README.md
+++ b/README.md
@@ -31,9 +31,9 @@ Manage APT repos, preferences and configuration for IPR's servers.
 * **apt_tools_list** : The list of additionnals tools to install [default [see below](#tools)].
 * **apt_tools_state** : State of new tools [default : `installed`].
 * **apt_tools_manage** : If those tools should be managed by the role [default : `true`].
-* **apt_old_pkg_list** : The list of totally useless packages for a production server [default [see below](#tools)].
-* **apt_old_pkg_state** : State of old packages [default : `absent`].
-* **apt_old_pkg_manage** : If those old packages should be managed by the role [default : `true`].
+* **apt_unwanted_pkg_list** : The list of totally useless packages for a production server [default [see below](#tools)].
+* **apt_unwanted_pkg_state** : State of old packages [default : `absent`].
+* **apt_unwanted_pkg_manage** : If those old packages should be managed by the role [default : `true`].
 * **apt_unattended_upgrades** : If `unattended-upgrades` should be managed by the role [default : `yes`].
 * **apt_unattended_upgrades_blacklist** : List of packages to not update (regexp are supported) [default : `[]`].
 
@@ -53,7 +53,7 @@ Manage APT repos, preferences and configuration for IPR's servers.
 - hosts: serverXYZ
   roles:
     - role: ipr-cnrs.apt
-      apt_old_pkg_manage: false
+      apt_unwanted_pkg_manage: false
 ```
 
 ## Configuration
diff --git a/defaults/main.yml b/defaults/main.yml
index b31426b..a2d2b94 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -30,11 +30,11 @@ apt_tools_list:
   - aptitude
 apt_tools_state: 'installed'
 apt_tools_manage: true
-apt_old_pkg_list:   # TODO: rename as apt_unwanted_pkg_list as 'old' doesn't seem to be appropriate here
+apt_unwanted_pkg_list:
   - laptop-detect
   - tasksel
-apt_old_pkg_state: 'absent'
-apt_old_pkg_manage: true
+apt_unwanted_pkg_state: 'absent'
+apt_unwanted_pkg_manage: true
 
 # unattended-upgrades
 apt_unattended_upgrades: yes
diff --git a/tasks/packages.yml b/tasks/packages.yml
index 3be6a0c..9752389 100644
--- a/tasks/packages.yml
+++ b/tasks/packages.yml
@@ -20,7 +20,7 @@
 - name: INSTALL purge useless packages
   apt:
     name: '{{ item }}'
-    state: '{{ apt_old_pkg_state }}'
+    state: '{{ apt_unwanted_pkg_state }}'
   with_items:
-    - '{{ apt_old_pkg_list }}'
-  when: apt_old_pkg_manage
+    - '{{ apt_unwanted_pkg_list }}'
+  when: apt_unwanted_pkg_manage