diff --git a/_skeleton_role_/defaults/main.yml.j2 b/_skeleton_role_/defaults/main.yml.j2
index 3675ac07b..cfdb14101 100644
--- a/_skeleton_role_/defaults/main.yml.j2
+++ b/_skeleton_role_/defaults/main.yml.j2
@@ -17,6 +17,6 @@
 
 # All variables intended for modification should be placed in this file.
 
-# All variables within this role should have a prefix of "tripleo_{{ role_name | replace('tripleo-', '') | replace('-', '_') }}"
-tripleo_{{ role_name | replace('tripleo-', '') | replace('-', '_') }}_debug: {% raw %}"{{ (ansible_verbosity | int) >= 2 | bool }}"{% endraw %}
-tripleo_{{ role_name | replace('tripleo-', '') | replace('-', '_') }}_hide_sensitive_logs: true
+# All variables within this role should have a prefix of "tripleo_{{ role_name | replace('tripleo_', '') }}"
+tripleo_{{ role_name | replace('tripleo_', '') }}_debug: {% raw %}"{{ (ansible_verbosity | int) >= 2 | bool }}"{% endraw %}
+tripleo_{{ role_name | replace('tripleo_', '') }}_hide_sensitive_logs: true
diff --git a/_skeleton_role_/vars/main.yml b/_skeleton_role_/vars/main.yml.j2
similarity index 92%
rename from _skeleton_role_/vars/main.yml
rename to _skeleton_role_/vars/main.yml.j2
index da98445ab..bb210a2e8 100644
--- a/_skeleton_role_/vars/main.yml
+++ b/_skeleton_role_/vars/main.yml.j2
@@ -19,4 +19,4 @@
 # vars, items within this path are considered part of the role and not
 # intended to be modified.
 
-# All variables within this role should have a prefix of "tripleo_{{ role_name | replace('tripleo-', '') | replace('-', '_') }}"
+# All variables within this role should have a prefix of "tripleo_{{ role_name | replace('tripleo_', '') }}"