diff --git a/roles/matrix-awx/surveys/configure_element_subdomain.json.j2 b/roles/matrix-awx/surveys/configure_element_subdomain.json.j2
index a355af239..8e6aaf282 100644
--- a/roles/matrix-awx/surveys/configure_element_subdomain.json.j2
+++ b/roles/matrix-awx/surveys/configure_element_subdomain.json.j2
@@ -8,10 +8,10 @@
       "required": false,
       "min": 0,
       "max": 2048,
-      "default": "{{ element_subdomain }}",
+      "default": "{{ awx_element_subdomain }}",
       "choices": "",
       "new_question": true,
-      "variable": "element_subdomain",
+      "variable": "awx_element_subdomain",
       "type": "text"
     }
   ]
diff --git a/roles/matrix-awx/surveys/configure_website_access_export.json.j2 b/roles/matrix-awx/surveys/configure_website_access_export.json.j2
index bc805f099..d35fb8399 100755
--- a/roles/matrix-awx/surveys/configure_website_access_export.json.j2
+++ b/roles/matrix-awx/surveys/configure_website_access_export.json.j2
@@ -11,7 +11,7 @@
       "default": "{{ awx_customise_base_domain_website | string | lower }}",
       "choices": "true\nfalse",
       "new_question": true,
-      "variable": "customise_base_domain_website",
+      "variable": "awx_customise_base_domain_website",
       "type": "multiplechoice"
     },
     {