diff --git a/roles/dns/application/defaults/main.yml b/roles/dns/application/defaults/main.yml
index 3d74e99..49e6a00 100644
--- a/roles/dns/application/defaults/main.yml
+++ b/roles/dns/application/defaults/main.yml
@@ -1,9 +1,9 @@
 ---
 
 dns_user: "bind"
-dns_configuration_directory: "/etc/bind"
-dns_options_configuration: "{{ dns_configuration_directory }}/named.conf.options"
-dns_zones_configuration: "{{ dns_configuration_directory }}/named.conf.local"
-dns_zones_directory: "{{ dns_configuration_directory }}/zones"
+configuration_directory: "/etc/bind"
+options_configuration: "{{ configuration_directory }}/named.conf.options"
+zones_configuration: "{{ configuration_directory }}/named.conf.local"
+zones_directory: "{{ configuration_directory }}/zones"
 
-dns_zones_configuration_environment_directory: "{{ global_configuration_environment_directory }}/dns-zones"
+zones_configuration_environment_directory: "{{ global_configuration_environment_directory }}/dns-zones"
diff --git a/roles/dns/application/tasks/main.yml b/roles/dns/application/tasks/main.yml
index 4beaadf..bb56d6d 100644
--- a/roles/dns/application/tasks/main.yml
+++ b/roles/dns/application/tasks/main.yml
@@ -14,13 +14,13 @@
     group: "{{ dns_user }}"
     mode: "u=rwx,g=rx"
   loop:
-    - "{{ dns_zones_directory }}"
-    - "{{ dns_zones_configuration_environment_directory }}"
+    - "{{ zones_directory }}"
+    - "{{ zones_configuration_environment_directory }}"
 
 - name: Configure bind9 options
   template:
     src: named.conf.options
-    dest: "{{ dns_options_configuration }}"
+    dest: "{{ options_configuration }}"
     owner: root
     group: "{{ dns_user }}"
     mode: "u=rw,g=r,o=r"
diff --git a/roles/dns/master/defaults/main.yml b/roles/dns/master/defaults/main.yml
index 9d9ef31..683b1e4 100644
--- a/roles/dns/master/defaults/main.yml
+++ b/roles/dns/master/defaults/main.yml
@@ -2,14 +2,14 @@
 
 # domain: "example.com"
 
-domain_directory: "{{ dns_zones_directory }}/{{ domain }}"
+domain_directory: "{{ zones_directory }}/{{ domain }}"
 configuration_file: "{{ domain_directory }}/zone.conf"
 database_file_name: "zone.db"
 database_file: "{{ domain_directory }}/{{ database_file_name }}"
 database_signed_file_name: "{{ database_file_name }}.signed"
 database_signed_file: "{{ domain_directory }}/{{ database_signed_file_name }}"
 
-domain_environment_directory: "{{ dns_zones_configuration_environment_directory }}/{{ domain }}"
+domain_environment_directory: "{{ zones_configuration_environment_directory }}/{{ domain }}"
 domain_environment_link_name: "conf"
 domain_environment_link: "{{ domain_environment_directory }}/{{ domain_environment_link_name }}"
 
diff --git a/roles/dns/master/tasks/main.yml b/roles/dns/master/tasks/main.yml
index f80108c..01ec1ae 100644
--- a/roles/dns/master/tasks/main.yml
+++ b/roles/dns/master/tasks/main.yml
@@ -63,7 +63,7 @@
 
 - name: Include configuration file of zone {{ domain }}
   lineinfile:
-    path: "{{ dns_zones_configuration }}"
+    path: "{{ zones_configuration }}"
     state: present
     line: "include \"{{ configuration_file }}\";"
     validate: "named-checkconf %s"
diff --git a/roles/dns/slave/defaults/main.yml b/roles/dns/slave/defaults/main.yml
index aca27fe..07dfe29 100644
--- a/roles/dns/slave/defaults/main.yml
+++ b/roles/dns/slave/defaults/main.yml
@@ -2,5 +2,5 @@
 
 domain: "example.com"
 
-configuration_file: "{{ dns_zones_directory }}/{{ domain }}.conf"
-database_file: "{{ dns_zones_directory }}/{{ domain }}.db"
+configuration_file: "{{ zones_directory }}/{{ domain }}.conf"
+database_file: "{{ zones_directory }}/{{ domain }}.db"
diff --git a/roles/dns/slave/tasks/main.yml b/roles/dns/slave/tasks/main.yml
index 48d2167..3028624 100644
--- a/roles/dns/slave/tasks/main.yml
+++ b/roles/dns/slave/tasks/main.yml
@@ -12,7 +12,7 @@
 
 - name: Include configuration file of zone {{ domain }}
   lineinfile:
-    path: "{{ dns_zones_configuration }}"
+    path: "{{ zones_configuration }}"
     state: present
     line: "include \"{{ configuration_file }}\";"
     validate: "named-checkconf %s"