diff --git a/roles/acme/certificate/tasks/main.yml b/roles/acme/certificate/tasks/main.yml
index 48266d6..5864ce8 100644
--- a/roles/acme/certificate/tasks/main.yml
+++ b/roles/acme/certificate/tasks/main.yml
@@ -9,7 +9,7 @@
     --home {{ acme_installation_directory | quote }}
     --config-home {{ acme_configuration_directory | quote }}
     --domain {{ domain | quote }}
-    --webroot {{ nginx_validation_root_directory | quote }}
+    --webroot {{ acme_validation_root_directory | quote }}
     --ocsp-must-staple
   args:
     chdir: "{{ acme_installation_directory }}"
diff --git a/roles/nginx/application/defaults/main.yml b/roles/nginx/application/defaults/main.yml
index ffb1238..95ebac4 100644
--- a/roles/nginx/application/defaults/main.yml
+++ b/roles/nginx/application/defaults/main.yml
@@ -15,5 +15,5 @@ nginx_global_error_log: "{{ nginx_global_log_directory }}/error.log"
 # dhparams_remote_path from misc/dhparams
 
 acme_validation_directory: ".well-known/acme-challenge"
-nginx_validation_root_directory: "/var/www/validation"
-nginx_validation_test_file: "{{ nginx_validation_root_directory }}/{{ acme_validation_directory }}/test"
+acme_validation_root_directory: "/var/www/validation"
+acme_validation_test_file: "{{ acme_validation_root_directory }}/{{ acme_validation_directory }}/test"
diff --git a/roles/nginx/application/tasks/main.yml b/roles/nginx/application/tasks/main.yml
index 0dd22a7..c848a1f 100644
--- a/roles/nginx/application/tasks/main.yml
+++ b/roles/nginx/application/tasks/main.yml
@@ -52,13 +52,13 @@
     group: "{{ acme_system_user }}"
     mode: "u=rwx,g=rwx,o=rx"
   loop:
-    - "{{ nginx_validation_root_directory }}"
-    - "{{ nginx_validation_test_file | dirname }}"
+    - "{{ acme_validation_root_directory }}"
+    - "{{ acme_validation_test_file | dirname }}"
 
 - name: Configure test file for validation directory
   copy:
     content: "{{ inventory_hostname }}"
-    dest: "{{ nginx_validation_test_file }}"
+    dest: "{{ acme_validation_test_file }}"
     owner: root
     group: root
     mode: "u=rw,g=r,o=r"
diff --git a/roles/nginx/application/templates/acme.conf b/roles/nginx/application/templates/acme.conf
index 56d02e5..ef64c20 100644
--- a/roles/nginx/application/templates/acme.conf
+++ b/roles/nginx/application/templates/acme.conf
@@ -1,5 +1,5 @@
 location /{{ acme_validation_directory }} {
-    root {{ nginx_validation_root_directory }};
+    root {{ acme_validation_root_directory }};
     access_log off;
     location = /{{ acme_validation_directory }}/test {
         types {}