diff --git a/README.md b/README.md
index b5108af..e8b2100 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ FreeBSD:
 - `nginx_events_*`: all variables in events block
 - `nginx_http_*`: all variables in http block
 - `nginx_custom_http`: instructions list (will put data in `/etc/nginx/conf.d/custom.conf`)
-- `nginx_dyn_modules`: dynamic module list to load
+- `nginx_module_packages`: package list module to install
 
 About modules
 -------------
diff --git a/defaults/main.yml b/defaults/main.yml
index 68c17bf..f86e57d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -107,7 +107,7 @@ nginx_ssl_pairs: []
 #
 # Dynamic modules
 #
-nginx_dyn_modules: []
+nginx_module_packages: []
 
 #
 # Diffie-Hellman
diff --git a/tasks/install_Debian.yml b/tasks/install_Debian.yml
index 3fa2676..20efe35 100644
--- a/tasks/install_Debian.yml
+++ b/tasks/install_Debian.yml
@@ -29,10 +29,9 @@
 
 - name: APT | Install nginx modules
   apt:
-    pkg: "libnginx-mod-{{ item | replace('_', '-') }}"
+    pkg: "{{ item }}"
     state: present
-  with_items: "{{ nginx_dyn_modules }}"
-  when:  ansible_distribution == 'Debian'
+  with_items: "{{ nginx_module_packages }}"
 
 - name: APT | Install python-passlib
   apt:
diff --git a/tasks/main.yml b/tasks/main.yml
index c951120..9b8b109 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -12,10 +12,6 @@
   include: prepare.yml
   tags: ['nginx::site', 'nginx::ssl']
 
-- name: INCLUDE | Manage dynamic modules
-  include: dyn_modules.yml
-  when: nginx_version.stdout | version_compare('1.9.11', 'ge')
-
 - name: INCLUDE | Install
   include: config.yml
 
diff --git a/tests/test.yml b/tests/test.yml
index 947d00d..30037ea 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -29,7 +29,7 @@
 # Role vars
     nginx_worker_processes: 1 # Ansible+FreeBSD can't detect CPU number
     nginx_apt_package: 'nginx-extras'
-    nginx_dyn_modules: ['http_geoip', 'http_headers_more']
+    nginx_module_packages: ['libnginx-mod-http-headers-more-filter']
     nginx_upstreams:
       - name: 'test'
         servers: