diff --git a/.ansible-lint b/.ansible-lint
index 362bdf02..a57a1a54 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -14,7 +14,6 @@ rulesdir:
   - ./.ansible-lint-rules/
 skip_list:
   - galaxy[no-changelog]
-  - var-naming[no-role-prefix]
   - package-latest
 # DO NOT DELETE THE WARNLIST
 warn_list:
diff --git a/molecule/delegated/tests/configuration/git.py b/molecule/delegated/tests/configuration/git.py
index 7a6b4524..3cd8cd80 100644
--- a/molecule/delegated/tests/configuration/git.py
+++ b/molecule/delegated/tests/configuration/git.py
@@ -36,11 +36,11 @@ def test_sshkey(host):
     f = host.file(f"{path}")
     assert f.exists
     assert f.is_file
-    assert f.user == get_variable(host, "operator_user")
-    assert f.group == get_variable(host, "operator_group")
+    assert f.user == get_variable(host, "configuration_operator_user")
+    assert f.group == get_variable(host, "configuration_operator_group")
     assert f.mode == 0o600
 
-    with host.sudo(get_variable(host, "operator_user")):
+    with host.sudo(get_variable(host, "configuration_operator_user")):
         private_key_content = host.check_output(f"cat {path}")
         assert private_key == private_key_content
 
diff --git a/molecule/delegated/tests/configuration/main.py b/molecule/delegated/tests/configuration/main.py
index a262f121..f9fa532c 100644
--- a/molecule/delegated/tests/configuration/main.py
+++ b/molecule/delegated/tests/configuration/main.py
@@ -7,8 +7,8 @@ def check_file_attributes(host, path):
     f = host.file(f"{path}")
     assert f.exists
     assert f.is_directory
-    assert f.user == get_variable(host, "operator_user")
-    assert f.group == get_variable(host, "operator_group")
+    assert f.user == get_variable(host, "configuration_operator_user")
+    assert f.group == get_variable(host, "configuration_operator_group")
     assert f.mode == 0o750
 
 
diff --git a/molecule/delegated/tests/facts.py b/molecule/delegated/tests/facts.py
index 102aad9c..1f56a74b 100644
--- a/molecule/delegated/tests/facts.py
+++ b/molecule/delegated/tests/facts.py
@@ -14,7 +14,7 @@ def test_custom_facts_directory(host):
 
 
 def test_fact_files(host):
-    fact_files = get_variable(host, "fact_files")
+    fact_files = get_variable(host, "facts_files")
 
     assert type(fact_files) is list
 
diff --git a/molecule/delegated/tests/firewall.py b/molecule/delegated/tests/firewall.py
index 70dec4a1..654884fa 100644
--- a/molecule/delegated/tests/firewall.py
+++ b/molecule/delegated/tests/firewall.py
@@ -11,7 +11,7 @@ def test_firewall_config_file(host):
 
 
 def test_firewall_service(host):
-    service_name = get_variable(host, "ufw_service_name")
+    service_name = get_variable(host, "firewall_service_name")
     service = host.service(service_name)
 
     assert service.is_running
diff --git a/molecule/delegated/tests/kernel_modules.py b/molecule/delegated/tests/kernel_modules.py
index 4eb490c8..f582fc8c 100644
--- a/molecule/delegated/tests/kernel_modules.py
+++ b/molecule/delegated/tests/kernel_modules.py
@@ -6,7 +6,7 @@
 def test_kernel_modules_in_etc_modules(host):
     kernel_modules_default = get_variable(host, "kernel_modules_default")
     kernel_modules_extra = get_variable(host, "kernel_modules_extra")
-    kernel_modules = get_variable(host, "kernel_modules")
+    kernel_modules = get_variable(host, "kernel_modules_all")
     kernel_modules = jinja_list_concat(
         kernel_modules, [kernel_modules_default, kernel_modules_extra]
     )
@@ -21,7 +21,7 @@ def test_kernel_modules_in_etc_modules(host):
 def test_loaded_kernel_modules(host):
     kernel_modules_default = get_variable(host, "kernel_modules_default")
     kernel_modules_extra = get_variable(host, "kernel_modules_extra")
-    kernel_modules = get_variable(host, "kernel_modules")
+    kernel_modules = get_variable(host, "kernel_modules_all")
     kernel_modules = jinja_list_concat(
         kernel_modules, [kernel_modules_default, kernel_modules_extra]
     )
diff --git a/molecule/delegated/tests/known_hosts.py b/molecule/delegated/tests/known_hosts.py
index 5fef9472..5c6d8b43 100644
--- a/molecule/delegated/tests/known_hosts.py
+++ b/molecule/delegated/tests/known_hosts.py
@@ -4,12 +4,12 @@
 
 
 def test_known_hosts_file_permissions(host):
-    operator_user = get_variable(host, "operator_user")
-    operator_group = get_variable(host, "operator_group")
+    operator_user = get_variable(host, "known_hosts_operator_user")
+    operator_group = get_variable(host, "known_hosts_operator_group")
 
     known_hosts_destination = get_variable(host, "known_hosts_destination")
     known_hosts_destination = jinja_replacement(
-        known_hosts_destination, {"operator_user": operator_user}
+        known_hosts_destination, {"known_hosts_operator_user": operator_user}
     )
     known_hosts_destination += "/known_hosts"
 
@@ -27,11 +27,11 @@ def test_known_hosts_file_permissions(host):
 
 
 def test_known_hosts_file_content(host):
-    operator_user = get_variable(host, "operator_user")
+    operator_user = get_variable(host, "known_hosts_operator_user")
 
     known_hosts_destination = get_variable(host, "known_hosts_destination")
     known_hosts_destination = jinja_replacement(
-        known_hosts_destination, {"operator_user": operator_user}
+        known_hosts_destination, {"known_hosts_operator_user": operator_user}
     )
     known_hosts_destination += "/known_hosts"
 
diff --git a/molecule/delegated/tests/motd/main.py b/molecule/delegated/tests/motd/main.py
index 7ec536ae..01c1c54a 100644
--- a/molecule/delegated/tests/motd/main.py
+++ b/molecule/delegated/tests/motd/main.py
@@ -17,7 +17,7 @@ def test_motd_content(host):
 
 
 def test_issue_content(host):
-    issue_path = get_variable(host, "issue_path")
+    issue_path = get_variable(host, "motd_issue_path")
     expected_issue_content = get_variable(host, "motd_content")
 
     issue_file = host.file(issue_path)
diff --git a/molecule/delegated/tests/packages/debian.py b/molecule/delegated/tests/packages/debian.py
index 0472c690..832e6933 100644
--- a/molecule/delegated/tests/packages/debian.py
+++ b/molecule/delegated/tests/packages/debian.py
@@ -13,10 +13,10 @@ def check_ansible_os_family(host):
 def test_package_upgrade(host):
     check_ansible_os_family(host)
 
-    upgrade_packages = get_variable(host, "upgrade_packages")
+    upgrade_packages = get_variable(host, "packages_upgrade")
 
     if not upgrade_packages:
-        pytest.skip("upgrade_packages is not True")
+        pytest.skip("packages_upgrade is not True")
 
     upgradable = host.check_output("apt list --upgradable 2>/dev/null | wc -l")
     # subtract 1 to account for the header line
diff --git a/molecule/delegated/tests/packages/main.py b/molecule/delegated/tests/packages/main.py
index e9e702a8..57eb046d 100644
--- a/molecule/delegated/tests/packages/main.py
+++ b/molecule/delegated/tests/packages/main.py
@@ -9,11 +9,11 @@
 
 
 def test_required_packages_installed(host):
-    required_packages = get_variable(host, "required_packages")
-    required_packages_default = get_variable(host, "required_packages_default")
-    required_packages_extra = get_variable(host, "required_packages_extra")
+    required_packages = get_variable(host, "packages_required")
+    required_packages_default = get_variable(host, "packages_required_default")
+    required_packages_extra = get_variable(host, "packages_required_extra")
     required_packages_distribution = get_os_role_variable(
-        host, "required_packages_distribution"
+        host, "packages_required_distribution"
     )
 
     required_packages = jinja_list_concat(
diff --git a/molecule/delegated/tests/packages/redhat.py b/molecule/delegated/tests/packages/redhat.py
index b10a2a1e..306f325b 100644
--- a/molecule/delegated/tests/packages/redhat.py
+++ b/molecule/delegated/tests/packages/redhat.py
@@ -13,10 +13,10 @@ def check_ansible_os_family(host):
 def test_package_upgrade(host):
     check_ansible_os_family(host)
 
-    upgrade_packages = get_variable(host, "upgrade_packages")
+    upgrade_packages = get_variable(host, "packages_upgrade")
 
     if not upgrade_packages:
-        pytest.skip("upgrade_packages is not True")
+        pytest.skip("packages_upgrade is not True")
 
     upgradable = host.check_output("dnf list upgrades --quiet | wc -l")
     num_upgradable = int(upgradable.strip())
diff --git a/molecule/delegated/tests/repository/debian.py b/molecule/delegated/tests/repository/debian.py
index c3af44ca..d6114d6a 100644
--- a/molecule/delegated/tests/repository/debian.py
+++ b/molecule/delegated/tests/repository/debian.py
@@ -78,7 +78,7 @@ def test_sources(host):
     assert f.mode == 0o644
     assert "DO NOT EDIT THIS FILE BY HAND" in f.content_string
 
-    repositories = get_variable(host, "repositories")
+    repositories = get_variable(host, "repository_dictionary")
 
     if len(repositories) <= 0:
         repositories = get_os_role_variable(host, "repository_default", "Ubuntu.yml")
diff --git a/molecule/delegated/tests/sshconfig.py b/molecule/delegated/tests/sshconfig.py
index 6eacc7ae..6c634a51 100644
--- a/molecule/delegated/tests/sshconfig.py
+++ b/molecule/delegated/tests/sshconfig.py
@@ -4,18 +4,18 @@
 
 
 def test_sshconfig_directory(host):
-    operator_user_name = get_variable(host, "operator_user")
+    operator_user_name = get_variable(host, "sshconfig_operator_user")
     operator_user = host.user(operator_user_name)
 
     ssh_config_d = host.file(f"{operator_user.home}/.ssh/config.d")
     assert ssh_config_d.is_directory
     assert ssh_config_d.user == operator_user_name
-    assert ssh_config_d.group == get_variable(host, "operator_group")
+    assert ssh_config_d.group == get_variable(host, "sshconfig_operator_group")
     assert ssh_config_d.mode == 0o700
 
 
 def test_sshconfig_host_files(host):
-    operator_user_name = get_variable(host, "operator_user")
+    operator_user_name = get_variable(host, "sshconfig_operator_user")
     operator_user = host.user(operator_user_name)
     sshconfig_order = get_variable(host, "sshconfig_order")
     inventory_hostname_short = get_variable(host, "inventory_hostname").split(".")[0]
@@ -28,7 +28,8 @@ def test_sshconfig_host_files(host):
 
     with host.sudo(operator_user_name):
         sshconfig_user = jinja_replacement(
-            get_variable(host, "sshconfig_user"), {"operator_user": operator_user_name}
+            get_variable(host, "sshconfig_user"),
+            {"sshconfig_operator_user": operator_user_name},
         )
         config_content = host.check_output(f"cat {config_file_path}")
         assert f"Host {inventory_hostname_short}" in config_content
@@ -41,11 +42,11 @@ def test_sshconfig_host_files(host):
 
 
 def test_sshconfig_assembled(host):
-    operator_user_name = get_variable(host, "operator_user")
+    operator_user_name = get_variable(host, "sshconfig_operator_user")
     operator_user = host.user(operator_user_name)
 
     assembled_config = host.file(f"{operator_user.home}/.ssh/config")
     assert assembled_config.exists
-    assert assembled_config.user == get_variable(host, "operator_user")
-    assert assembled_config.group == get_variable(host, "operator_group")
+    assert assembled_config.user == get_variable(host, "sshconfig_operator_user")
+    assert assembled_config.group == get_variable(host, "sshconfig_operator_group")
     assert assembled_config.mode == 0o600
diff --git a/molecule/delegated/tests/systohc.py b/molecule/delegated/tests/systohc.py
index 8da8ab9a..b462da4c 100644
--- a/molecule/delegated/tests/systohc.py
+++ b/molecule/delegated/tests/systohc.py
@@ -9,7 +9,7 @@
 def test_systohc_sync(host):
     """Check if the system clock is synchronized with the hardware clock."""
     # Use the utility function to retrieve the systohc variable
-    systohc = get_variable(host, "systohc")
+    systohc = get_variable(host, "systohc_system")
 
     # If systohc is true, then verify synchronization
     if not systohc:
diff --git a/molecule/delegated/vars/configuration.yml b/molecule/delegated/vars/configuration.yml
index 512ff174..ccb20a64 100644
--- a/molecule/delegated/vars/configuration.yml
+++ b/molecule/delegated/vars/configuration.yml
@@ -1,6 +1,6 @@
 ---
-operator_user: zuul
-operator_group: zuul
+configuration_operator_user: zuul
+configuration_operator_group: zuul
 
 configuration_git_port: 443
 configuration_git_protocol: https
diff --git a/molecule/delegated/vars/known_hosts.yml b/molecule/delegated/vars/known_hosts.yml
index 47c96330..2bb66cba 100644
--- a/molecule/delegated/vars/known_hosts.yml
+++ b/molecule/delegated/vars/known_hosts.yml
@@ -2,8 +2,8 @@
 ##########################
 # operator user
 
-operator_user: zuul
-operator_group: zuul
+known_hosts_operator_user: zuul
+known_hosts_operator_group: zuul
 
 ##########################
 # known_hosts
diff --git a/molecule/delegated/vars/packages.yml b/molecule/delegated/vars/packages.yml
index ac6ec808..f0161e00 100644
--- a/molecule/delegated/vars/packages.yml
+++ b/molecule/delegated/vars/packages.yml
@@ -1,3 +1,3 @@
 ---
-apt_cache_valid_time: 0
-upgrade_packages: false
+packages_apt_cache_valid_time: 0
+packages_upgrade: false
diff --git a/molecule/delegated/vars/sosreport.yml b/molecule/delegated/vars/sosreport.yml
index 42901e10..27db37f0 100644
--- a/molecule/delegated/vars/sosreport.yml
+++ b/molecule/delegated/vars/sosreport.yml
@@ -1,3 +1,3 @@
 ---
-operator_user: zuul
-operator_group: zuul
+sosreport_operator_user: zuul
+sosreport_operator_group: zuul
diff --git a/molecule/delegated/vars/sshconfig.yml b/molecule/delegated/vars/sshconfig.yml
index 42901e10..50ec48b9 100644
--- a/molecule/delegated/vars/sshconfig.yml
+++ b/molecule/delegated/vars/sshconfig.yml
@@ -1,3 +1,3 @@
 ---
-operator_user: zuul
-operator_group: zuul
+sshconfig_operator_user: zuul
+sshconfig_operator_group: zuul
diff --git a/roles/clevis/tasks/create-tangcrypt.yml b/roles/clevis/tasks/create-tangcrypt.yml
index 62771333..67ef578a 100644
--- a/roles/clevis/tasks/create-tangcrypt.yml
+++ b/roles/clevis/tasks/create-tangcrypt.yml
@@ -3,7 +3,7 @@
 - name: Remove dropbear ssh initramfs packages
   become: true
   ansible.builtin.apt:
-    name: "{{ dropbear_packages }}"
+    name: "{{ clevis_dropbear_packages }}"
     state: absent
     lock_timeout: "{{ apt_lock_timeout | default(300) }}"
   notify:
diff --git a/roles/clevis/vars/Debian.yml b/roles/clevis/vars/Debian.yml
index 204dba1f..4422736b 100644
--- a/roles/clevis/vars/Debian.yml
+++ b/roles/clevis/vars/Debian.yml
@@ -5,6 +5,6 @@ clevis_packages:
   - clevis-initramfs
   - clevis-luks
 
-dropbear_packages:
+clevis_dropbear_packages:
   - dropbear-bin
   - dropbear-initramfs
diff --git a/roles/configuration/README.rst b/roles/configuration/README.rst
index 6d3b4d6a..35047275 100644
--- a/roles/configuration/README.rst
+++ b/roles/configuration/README.rst
@@ -2,13 +2,13 @@ Install the configuration directory.
 
 **Generic Role Variables**
 
-.. zuul:rolevar:: operator_user
+.. zuul:rolevar:: configuration_operator_user
    :default: dragon
 
 The user that will own the configuration directory.
 
-.. zuul:rolevar:: operator_group
-   :default: "{{ operator_user }}"
+.. zuul:rolevar:: configuration_operator_group
+   :default: "{{ configuration_operator_user }}"
 
 The group that will own the configuration directory.
 
diff --git a/roles/configuration/defaults/main.yml b/roles/configuration/defaults/main.yml
index cd24e391..b3fc6f4b 100644
--- a/roles/configuration/defaults/main.yml
+++ b/roles/configuration/defaults/main.yml
@@ -2,8 +2,8 @@
 ##########################
 # generic
 
-operator_user: dragon
-operator_group: "{{ operator_user }}"
+configuration_operator_user: dragon
+configuration_operator_group: "{{ configuration_operator_user }}"
 
 ##########################
 # generic
diff --git a/roles/configuration/tasks/git.yml b/roles/configuration/tasks/git.yml
index e8cb785d..f82f69b6 100644
--- a/roles/configuration/tasks/git.yml
+++ b/roles/configuration/tasks/git.yml
@@ -17,8 +17,8 @@
   ansible.builtin.template:
     src: config-git-private-key.j2
     dest: "{{ configuration_git_private_key_file }}"
-    owner: "{{ operator_user }}"
-    group: "{{ operator_group }}"
+    owner: "{{ configuration_operator_user }}"
+    group: "{{ configuration_operator_group }}"
     mode: 0600
   when: (configuration_git_protocol == 'ssh' and configuration_git_private_key is defined and configuration_git_private_key | length)
   no_log: true
diff --git a/roles/configuration/tasks/main.yml b/roles/configuration/tasks/main.yml
index 7a79cf71..149b8577 100644
--- a/roles/configuration/tasks/main.yml
+++ b/roles/configuration/tasks/main.yml
@@ -3,8 +3,8 @@
   become: true
   ansible.builtin.file:
     path: "{{ item }}"
-    owner: "{{ operator_user }}"
-    group: "{{ operator_group }}"
+    owner: "{{ configuration_operator_user }}"
+    group: "{{ configuration_operator_group }}"
     state: directory
     mode: 0750
   with_items:
diff --git a/roles/facts/README.rst b/roles/facts/README.rst
index bec808d5..d08c3f42 100644
--- a/roles/facts/README.rst
+++ b/roles/facts/README.rst
@@ -2,6 +2,6 @@ Install custom ansible facts.
 
 **Role Variables**
 
-.. zuul:rolevar:: fact_files
+.. zuul:rolevar:: facts_files
 
 List of facts to install.
\ No newline at end of file
diff --git a/roles/facts/defaults/main.yml b/roles/facts/defaults/main.yml
index 1ebc1e1e..3581ee7c 100644
--- a/roles/facts/defaults/main.yml
+++ b/roles/facts/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-fact_files: []
+facts_files: []
diff --git a/roles/facts/tasks/main.yml b/roles/facts/tasks/main.yml
index 8a93a747..bca3ba91 100644
--- a/roles/facts/tasks/main.yml
+++ b/roles/facts/tasks/main.yml
@@ -16,4 +16,4 @@
     owner: root
     group: root
     mode: 0755
-  loop: "{{ fact_files }}"
+  loop: "{{ facts_files }}"
diff --git a/roles/firewall/defaults/main.yml b/roles/firewall/defaults/main.yml
index 2aca6922..d16a7e15 100644
--- a/roles/firewall/defaults/main.yml
+++ b/roles/firewall/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-ufw_service_name: ufw
+firewall_service_name: ufw
diff --git a/roles/firewall/handlers/main.yml b/roles/firewall/handlers/main.yml
index b62a2823..f2541090 100644
--- a/roles/firewall/handlers/main.yml
+++ b/roles/firewall/handlers/main.yml
@@ -1,6 +1,6 @@
 ---
-- name: "Restart service {{ ufw_service_name }}"
+- name: "Restart service {{ firewall_service_name }}"
   become: true
   ansible.builtin.service:
-    name: "{{ ufw_service_name }}"
+    name: "{{ firewall_service_name }}"
     state: restarted
diff --git a/roles/firewall/tasks/main.yml b/roles/firewall/tasks/main.yml
index e52d93df..9449d947 100644
--- a/roles/firewall/tasks/main.yml
+++ b/roles/firewall/tasks/main.yml
@@ -5,11 +5,11 @@
     src: ufw.conf.j2
     dest: /etc/ufw/ufw.conf
     mode: 0644
-  notify: "Restart service {{ ufw_service_name }}"
+  notify: "Restart service {{ firewall_service_name }}"
 
-- name: "Start service {{ ufw_service_name }}"
+- name: "Start service {{ firewall_service_name }}"
   become: true
   ansible.builtin.service:
-    name: "{{ ufw_service_name }}"
+    name: "{{ firewall_service_name }}"
     state: started
     enabled: true
diff --git a/roles/kernel_modules/README.rst b/roles/kernel_modules/README.rst
index 946a9df2..094af679 100644
--- a/roles/kernel_modules/README.rst
+++ b/roles/kernel_modules/README.rst
@@ -14,7 +14,7 @@ Default list of kernel modules to install.
 
 List of extra modules to install.
 
-.. zuul:rolevar:: kernel_modules
+.. zuul:rolevar:: kernel_modules_all
    :default: kernel_modules_default + kernel_modules_extra
 
 All modules which you want to install.
diff --git a/roles/kernel_modules/defaults/main.yml b/roles/kernel_modules/defaults/main.yml
index 9b24fcb6..60447a8f 100644
--- a/roles/kernel_modules/defaults/main.yml
+++ b/roles/kernel_modules/defaults/main.yml
@@ -3,4 +3,4 @@ kernel_modules_default:
   - bonding
   - 8021q
 kernel_modules_extra: []
-kernel_modules: "{{ kernel_modules_default + kernel_modules_extra }}"
+kernel_modules_all: "{{ kernel_modules_default + kernel_modules_extra }}"
diff --git a/roles/kernel_modules/tasks/main.yml b/roles/kernel_modules/tasks/main.yml
index ae6a7d2a..bfd66427 100644
--- a/roles/kernel_modules/tasks/main.yml
+++ b/roles/kernel_modules/tasks/main.yml
@@ -6,11 +6,11 @@
     dest: /etc/modules
     mode: 0644
     state: present
-  loop: "{{ kernel_modules }}"
+  loop: "{{ kernel_modules_all }}"
 
 - name: Load kernel module
   become: true
   community.general.modprobe:
     name: "{{ item }}"
     state: present
-  loop: "{{ kernel_modules }}"
+  loop: "{{ kernel_modules_all }}"
diff --git a/roles/known_hosts/README.rst b/roles/known_hosts/README.rst
index d9babda3..0f0d1bf7 100644
--- a/roles/known_hosts/README.rst
+++ b/roles/known_hosts/README.rst
@@ -3,13 +3,13 @@ to a known_hosts file.
 
 **Role Variables**
 
-.. zuul:rolevar:: operator_user
+.. zuul:rolevar:: known_hosts_operator_user
    :default: dragon
 
 The user that will own the known_hosts file.
 
-.. zuul:rolevar:: operator_group
-   :default: operator_user
+.. zuul:rolevar:: known_hosts_operator_group
+   :default: known_hosts_operator_user
 
 The group that will own the known_hosts file.
 
@@ -19,6 +19,6 @@ The group that will own the known_hosts file.
 Add hosts from this group to known_hosts.
 
 .. zuul:rolevar:: known_hosts_destination
-   :default: /home/{{ operator_user }}/.ssh
+   :default: /home/{{ known_hosts_operator_user }}/.ssh
 
 Destination where the known_hosts file is stored.
\ No newline at end of file
diff --git a/roles/known_hosts/defaults/main.yml b/roles/known_hosts/defaults/main.yml
index 2913fa93..18bc6d8d 100644
--- a/roles/known_hosts/defaults/main.yml
+++ b/roles/known_hosts/defaults/main.yml
@@ -2,12 +2,12 @@
 ##########################
 # operator user
 
-operator_user: dragon
-operator_group: "{{ operator_user }}"
+known_hosts_operator_user: dragon
+known_hosts_operator_group: "{{ known_hosts_operator_user }}"
 
 ##########################
 # known_hosts
 
 known_hosts_group_name: all
 known_hosts_list: "{{ groups[known_hosts_group_name] }}"
-known_hosts_destination: "/home/{{ operator_user }}/.ssh"
+known_hosts_destination: "/home/{{ known_hosts_operator_user }}/.ssh"
diff --git a/roles/known_hosts/tasks/main.yml b/roles/known_hosts/tasks/main.yml
index 8d8cbc0a..6e72ac0a 100644
--- a/roles/known_hosts/tasks/main.yml
+++ b/roles/known_hosts/tasks/main.yml
@@ -13,6 +13,6 @@
 - name: Set file permissions
   ansible.builtin.file:
     path: "{{ known_hosts_destination }}/known_hosts"
-    owner: "{{ operator_user }}"
-    group: "{{ operator_group }}"
+    owner: "{{ known_hosts_operator_user }}"
+    group: "{{ known_hosts_operator_group }}"
     mode: "0600"
diff --git a/roles/motd/README.rst b/roles/motd/README.rst
index 5ff31408..24a2e989 100644
--- a/roles/motd/README.rst
+++ b/roles/motd/README.rst
@@ -6,7 +6,7 @@ prelogin message and identification (/etc/issue) file.
 .. zuul:rolevar:: motd_content
    :default: ""
 
-   Contents to be written to ``motd_path`` and ``issue_path``.
+   Contents to be written to ``motd_path`` and ``motd_issue_path``.
 
    Example:
 
@@ -25,7 +25,7 @@ prelogin message and identification (/etc/issue) file.
 
    The full path to the motd file.
 
-.. zuul:rolevar:: issue_path
+.. zuul:rolevar:: motd_issue_path
    :default: /etc/issue
 
    The full path to the issue file.
diff --git a/roles/motd/defaults/main.yml b/roles/motd/defaults/main.yml
index 64189123..df14eca6 100644
--- a/roles/motd/defaults/main.yml
+++ b/roles/motd/defaults/main.yml
@@ -1,4 +1,4 @@
 ---
-issue_path: /etc/issue
+motd_issue_path: /etc/issue
 motd_path: /etc/motd
 motd_content: ""
diff --git a/roles/motd/tasks/main.yml b/roles/motd/tasks/main.yml
index 83c08e33..cb297a80 100644
--- a/roles/motd/tasks/main.yml
+++ b/roles/motd/tasks/main.yml
@@ -15,7 +15,7 @@
   become: true
   ansible.builtin.template:
     src: motd.j2
-    dest: "{{ issue_path }}"
+    dest: "{{ motd_issue_path }}"
     owner: root
     group: root
     mode: 0644
diff --git a/roles/packages/defaults/main.yml b/roles/packages/defaults/main.yml
index 3b19b4d6..90bd01ab 100644
--- a/roles/packages/defaults/main.yml
+++ b/roles/packages/defaults/main.yml
@@ -1,10 +1,10 @@
 ---
-upgrade_packages: true
+packages_upgrade: true
 
-required_packages_default:
+packages_required_default:
   - ethtool
   - jq
   - rsyslog
 
-required_packages_extra: []
-required_packages: "{{ required_packages_default + required_packages_extra + required_packages_distribution }}"
+packages_required_extra: []
+packages_required: "{{ packages_required_default + packages_required_extra + packages_required_distribution }}"
diff --git a/roles/packages/tasks/package-Debian.yml b/roles/packages/tasks/package-Debian.yml
index 0aa0aee9..7fb0abaf 100644
--- a/roles/packages/tasks/package-Debian.yml
+++ b/roles/packages/tasks/package-Debian.yml
@@ -3,7 +3,7 @@
   become: true
   ansible.builtin.apt:
     update_cache: true
-    cache_valid_time: "{{ apt_cache_valid_time }}"
+    cache_valid_time: "{{ packages_apt_cache_valid_time }}"
     lock_timeout: "{{ apt_lock_timeout | default(300) }}"
 
 - name: Upgrade packages
@@ -11,11 +11,11 @@
   ansible.builtin.apt:
     upgrade: dist
     lock_timeout: "{{ apt_lock_timeout | default(300) }}"
-  when: upgrade_packages | bool
+  when: packages_upgrade | bool
 
 - name: Install required packages
   become: true
   ansible.builtin.apt:
-    name: "{{ required_packages }}"
+    name: "{{ packages_required }}"
     state: present
     lock_timeout: "{{ apt_lock_timeout | default(300) }}"
diff --git a/roles/packages/tasks/package-RedHat.yml b/roles/packages/tasks/package-RedHat.yml
index 4a0c43c4..3f12ea1a 100644
--- a/roles/packages/tasks/package-RedHat.yml
+++ b/roles/packages/tasks/package-RedHat.yml
@@ -11,10 +11,10 @@
   ansible.builtin.dnf:
     name: '*'
     state: latest
-  when: upgrade_packages | bool
+  when: packages_upgrade | bool
 
 - name: Install required packages
   become: true
   ansible.builtin.dnf:
-    name: "{{ required_packages }}"
+    name: "{{ packages_required }}"
     state: present
diff --git a/roles/packages/vars/Debian.yml b/roles/packages/vars/Debian.yml
index e96485ea..7aed0ac8 100644
--- a/roles/packages/vars/Debian.yml
+++ b/roles/packages/vars/Debian.yml
@@ -1,7 +1,7 @@
 ---
-apt_cache_valid_time: 3600
+packages_apt_cache_valid_time: 3600
 
-required_packages_distribution:
+packages_required_distribution:
   - debsums
   - selinux-utils
   - ssh
diff --git a/roles/packages/vars/RedHat.yml b/roles/packages/vars/RedHat.yml
index 00c2516d..c4061aef 100644
--- a/roles/packages/vars/RedHat.yml
+++ b/roles/packages/vars/RedHat.yml
@@ -1,4 +1,4 @@
 ---
-required_packages_distribution:
+packages_required_distribution:
   - libselinux-utils
   - openssh
diff --git a/roles/repository/README.rst b/roles/repository/README.rst
index 2f26e914..1b0f200d 100644
--- a/roles/repository/README.rst
+++ b/roles/repository/README.rst
@@ -2,7 +2,7 @@ Ansible role to configure the default repository sources.
 
 **Role Variables**
 
-.. zuul:rolevar:: repositories
+.. zuul:rolevar:: repository_dictionary
    :default: {}
 
 A dict of ``name:repository`` pairs, these will be used as the
@@ -42,7 +42,7 @@ Only for Debian/Ubuntu:
 Dict of ``ID:keyserver`` pairs, each key ID is fetched from its
 keyserver and added to APT as trusted key.
 
-.. zuul:rolevar:: enable_phased_updates
+.. zuul:rolevar:: repository_enable_phased_updates
    :default: false
 
 Only for Debian/Ubuntu:
diff --git a/roles/repository/defaults/main.yml b/roles/repository/defaults/main.yml
index 9d60a127..f45f992a 100644
--- a/roles/repository/defaults/main.yml
+++ b/roles/repository/defaults/main.yml
@@ -1,11 +1,11 @@
 ---
-repositories: {}
+repository_dictionary: {}
 
 repository_cache_valid_time: 120
 repository_key_files_directory: ""
 repository_keys: []
 repository_key_ids: {}
 
-enable_phased_updates: false
+repository_enable_phased_updates: false
 
 repository_apt_acquire_forceipv4: false
diff --git a/roles/repository/tasks/main.yml b/roles/repository/tasks/main.yml
index 39a6581e..80501883 100644
--- a/roles/repository/tasks/main.yml
+++ b/roles/repository/tasks/main.yml
@@ -4,8 +4,8 @@
 
 - name: Set repositories to default
   ansible.builtin.set_fact:
-    repositories: "{{ repository_default }}"
-  when: repositories | length == 0
+    repository_dictionary: "{{ repository_default }}"
+  when: repository_dictionary | length == 0
 
 - name: Include distribution specific repository tasks
   ansible.builtin.include_tasks: "repository-{{ ansible_os_family }}.yml"
diff --git a/roles/repository/tasks/repository-RedHat.yml b/roles/repository/tasks/repository-RedHat.yml
index e560b4c2..1ceb6065 100644
--- a/roles/repository/tasks/repository-RedHat.yml
+++ b/roles/repository/tasks/repository-RedHat.yml
@@ -9,7 +9,7 @@
     gpgcheck: true
     enabled: true
     file: "{{ item.file }}"
-  loop: "{{ repositories }}"
+  loop: "{{ repository_dictionary }}"
   when: item.mirrorlist is defined
 
 - name: Add metalink repositories
@@ -22,5 +22,5 @@
     gpgcheck: true
     enabled: true
     file: "{{ item.file }}"
-  loop: "{{ repositories }}"
+  loop: "{{ repository_dictionary }}"
   when: item.metalink is defined
diff --git a/roles/repository/templates/99osism.j2 b/roles/repository/templates/99osism.j2
index d086a4b9..e66c982e 100644
--- a/roles/repository/templates/99osism.j2
+++ b/roles/repository/templates/99osism.j2
@@ -1,4 +1,4 @@
-{% if not enable_phased_updates | bool %}
+{% if not repository_enable_phased_updates | bool %}
 Update-Manager::Never-Include-Phased-Updates;
 {% endif %}
 {% if repository_apt_acquire_forceipv4 | bool %}
diff --git a/roles/repository/templates/source.list.j2 b/roles/repository/templates/source.list.j2
index f346402a..c40812eb 100644
--- a/roles/repository/templates/source.list.j2
+++ b/roles/repository/templates/source.list.j2
@@ -1,6 +1,6 @@
 # DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
 
-{% for item in repositories %}
+{% for item in repository_dictionary %}
 # repository: {{ item.name }}
 {{ item.repository }}
 {{ '' if loop.last else '\n' }}
diff --git a/roles/sosreport/defaults/main.yml b/roles/sosreport/defaults/main.yml
index 2dc002a5..3b7d3df4 100644
--- a/roles/sosreport/defaults/main.yml
+++ b/roles/sosreport/defaults/main.yml
@@ -33,5 +33,5 @@ sosreport_plugins:
   - udev
   - usb
   - xfs
-operator_user: dragon
-operator_group: "{{ operator_user }}"
+sosreport_operator_user: dragon
+sosreport_operator_group: "{{ sosreport_operator_user }}"
diff --git a/roles/sosreport/tasks/main.yml b/roles/sosreport/tasks/main.yml
index a691e699..3b51cc11 100644
--- a/roles/sosreport/tasks/main.yml
+++ b/roles/sosreport/tasks/main.yml
@@ -16,8 +16,8 @@
   ansible.builtin.file:
     path: "{{ sosreport_tmpdir }}"
     state: directory
-    owner: "{{ operator_user }}"
-    group: "{{ operator_group }}"
+    owner: "{{ sosreport_operator_user }}"
+    group: "{{ sosreport_operator_group }}"
     mode: 0755
 
 - name: Create local required directories
@@ -25,8 +25,8 @@
   ansible.builtin.file:
     path: "{{ sosreport_archive_directory }}"
     state: directory
-    owner: "{{ operator_user }}"
-    group: "{{ operator_group }}"
+    owner: "{{ sosreport_operator_user }}"
+    group: "{{ sosreport_operator_group }}"
     mode: 0755
     recurse: true
   delegate_to: localhost
@@ -51,8 +51,8 @@
   ansible.builtin.file:
     path: "{{ sosreport_tmpdir }}"
     state: directory
-    owner: "{{ operator_user }}"
-    group: "{{ operator_group }}"
+    owner: "{{ sosreport_operator_user }}"
+    group: "{{ sosreport_operator_group }}"
     mode: 0755
     recurse: true
 
diff --git a/roles/sshconfig/defaults/main.yml b/roles/sshconfig/defaults/main.yml
index f29043bb..a09e26bc 100644
--- a/roles/sshconfig/defaults/main.yml
+++ b/roles/sshconfig/defaults/main.yml
@@ -2,8 +2,8 @@
 ##########################
 # operator user
 
-operator_user: dragon
-operator_group: "{{ operator_user }}"
+sshconfig_operator_user: dragon
+sshconfig_operator_group: "{{ sshconfig_operator_user }}"
 
 ##########################
 # sshconfig
@@ -12,4 +12,4 @@ sshconfig_groupname: all
 sshconfig_order: 20
 sshconfig_port: 22
 sshconfig_private_key_file: /opt/ansible/secrets/id_rsa.operator
-sshconfig_user: "{{ operator_user }}"
+sshconfig_user: "{{ sshconfig_operator_user }}"
diff --git a/roles/sshconfig/tasks/main.yml b/roles/sshconfig/tasks/main.yml
index 52a805e5..d9eed07f 100644
--- a/roles/sshconfig/tasks/main.yml
+++ b/roles/sshconfig/tasks/main.yml
@@ -3,7 +3,7 @@
   become: true
   ansible.builtin.shell: |
     set -o pipefail
-    getent passwd {{ operator_user }} | cut -d: -f6
+    getent passwd {{ sshconfig_operator_user }} | cut -d: -f6
   args:
     executable: /bin/bash
   changed_when: false
@@ -13,8 +13,8 @@
   ansible.builtin.file:
     path: "{{ sshconfig_destination.stdout }}/.ssh/config.d"
     state: directory
-    owner: "{{ operator_user }}"
-    group: "{{ operator_group }}"
+    owner: "{{ sshconfig_operator_user }}"
+    group: "{{ sshconfig_operator_group }}"
     mode: 0700
     recurse: true
 
diff --git a/roles/systohc/defaults/main.yml b/roles/systohc/defaults/main.yml
index 6920e56a..cd0d3df5 100644
--- a/roles/systohc/defaults/main.yml
+++ b/roles/systohc/defaults/main.yml
@@ -1,3 +1,3 @@
 ---
-systohc: true
-systohc_common: "{{ systohc }}"
+systohc_system: true
+systohc_common: "{{ systohc_system }}"
diff --git a/roles/systohc/tasks/main.yml b/roles/systohc/tasks/main.yml
index 37576dd3..dbe64733 100644
--- a/roles/systohc/tasks/main.yml
+++ b/roles/systohc/tasks/main.yml
@@ -3,4 +3,4 @@
   become: true
   ansible.builtin.command: hwclock --systohc
   changed_when: false
-  when: systohc | bool
+  when: systohc_system | bool