diff --git a/roles/ansible/defaults/main.yml b/roles/ansible/defaults/main.yml
index b7722c9..bc0cc94 100644
--- a/roles/ansible/defaults/main.yml
+++ b/roles/ansible/defaults/main.yml
@@ -1,7 +1,7 @@
-role_ansible_enabled: true
-linux_role_ansible_manage_local_facts: true
+ansible__role_enabled: true
+ansible__manage_local_facts: true
 
 ansible__local_fact_template: aybarsm_linux.json.fact.j2
 ansible__local_fact_backup: true
-ansible__local_facts_dir: "{{ (not lookup('config', 'DEFAULT_FACT_PATH')) | ternary('/etc/ansible/facts.d', lookup('config', 'DEFAULT_FACT_PATH')) }}"
-ansible__local_fact_file: "{{ ansible__local_facts_dir }}/aybarsm_linux.fact"
+ansible__host_facts_dir: "{{ (not lookup('config', 'DEFAULT_FACT_PATH')) | ternary('/etc/ansible/facts.d', lookup('config', 'DEFAULT_FACT_PATH')) }}"
+ansible__local_fact_file: "{{ ansible__host_facts_dir }}/aybarsm_linux.fact"
diff --git a/roles/ansible/handlers/main.yml b/roles/ansible/handlers/main.yml
index d388bd0..18c9f55 100644
--- a/roles/ansible/handlers/main.yml
+++ b/roles/ansible/handlers/main.yml
@@ -2,10 +2,10 @@
 - name: Re-assign host local facts to ansible facts
   become: true
   ansible.builtin.set_fact:
-    __ansible__local_facts: "{{ ansible__update_local_facts.__ansible__local_facts }}"
-  register: ansible__local_facts_reassign
-  listen: "ansible__local_facts_reassign"
-  notify: ansible__local_facts_settle
+    __ansible__host_facts: "{{ ansible__update_host_facts.__ansible__host_facts }}"
+  register: ansible__host_facts_reassign
+  listen: "ansible__host_facts_reassign"
+  notify: ansible__host_facts_settle
 
 - name: Settle local facts on host if changed
   become: true
@@ -13,14 +13,14 @@
     src: "{{ ansible__local_fact_template }}"
     dest: "{{ ansible__local_fact_file }}"
     backup: "{{ ansible__local_fact_backup | default(omit) | bool }}"
-  register: ansible__local_facts_settle
-  listen: "ansible__local_facts_settle"
-  notify: ansible__local_facts_reread
-  when: (ansible_local.aybarsm_linux | b64encode) != (__ansible__local_facts | b64encode)
+  register: ansible__host_facts_settle
+  listen: "ansible__host_facts_settle"
+  notify: ansible__host_facts_reread
+  when: (ansible_local.aybarsm_linux | b64encode) != (__ansible__host_facts | b64encode)
 
 - name: Re-read local facts
   become: true
   ansible.builtin.setup:
     filter: ansible_local
-  register: ansible__local_facts_reread
-  listen: "ansible__local_facts_reread"
+  register: ansible__host_facts_reread
+  listen: "ansible__host_facts_reread"
diff --git a/roles/ansible/tasks/local_facts.yml b/roles/ansible/tasks/local_facts.yml
index e514e0f..f7d6db8 100644
--- a/roles/ansible/tasks/local_facts.yml
+++ b/roles/ansible/tasks/local_facts.yml
@@ -4,8 +4,10 @@
   ansible.builtin.file:
     state: directory
     recurse: true
-    path: "{{ ansible__local_facts_dir }}"
+    path: "{{ ansible__host_facts_dir }}"
 
 - name: Assign local facts as ansible facts
   ansible.builtin.set_fact:
-    __ansible__local_facts: "{{ ansible_local.aybarsm_linux | default({}) }}"
\ No newline at end of file
+    __ansible__host_facts: "{{ ansible_local[fact_basename] | default({}) }}"
+  vars:
+    fact_basename: "{{ ansible__local_fact_file | basename | regex_replace('\\.fact$', '') }}"
\ No newline at end of file
diff --git a/roles/ansible/tasks/main.yml b/roles/ansible/tasks/main.yml
index e47883d..01d7c2e 100644
--- a/roles/ansible/tasks/main.yml
+++ b/roles/ansible/tasks/main.yml
@@ -3,5 +3,5 @@
   ansible.builtin.import_tasks:
     file: local_facts.yml
   when:
-    - role_ansible_enabled | bool
-    - linux_role_ansible_manage_local_facts | bool
\ No newline at end of file
+    - ansible__role_enabled | bool
+    - ansible__manage_local_facts | bool
\ No newline at end of file
diff --git a/roles/ansible/tasks/update_local_facts.yml b/roles/ansible/tasks/update_local_facts.yml
index 4459ffd..dc1b138 100644
--- a/roles/ansible/tasks/update_local_facts.yml
+++ b/roles/ansible/tasks/update_local_facts.yml
@@ -5,17 +5,17 @@
   vars:
     fact_basename: "{{ ansible__local_fact_file | basename | regex_replace('\\.fact$', '') }}"
     host_fact_updates: "{{ dict((
-      ansible_host_fact_updates | map(attribute='path') |
+      ansible__host_fact_updates | map(attribute='path') |
       map('regex_replace', '^ansible_local\\.' + fact_basename + '\\.|^ansible_local\\.', '') |
-      map('regex_replace', '^(?!__ansible__local_facts\\.)(.*)$', '__ansible__local_facts.\\1')) |
-      zip(ansible_host_fact_updates | map(attribute='value'))) |
+      map('regex_replace', '^(?!__ansible__host_facts\\.)(.*)$', '__ansible__host_facts.\\1')) |
+      zip(ansible__host_fact_updates | map(attribute='value'))) |
       dict2items(key_name='path', value_name='value') }}"
-  register: ansible__update_local_facts
+  register: ansible__update_host_facts
 
 - name: Re-assign host local facts to ansible facts
   ansible.builtin.set_fact:
-    __ansible__local_facts: "{{ ansible__update_local_facts.__ansible__local_facts }}"
-  register: ansible__local_facts_reassign
+    __ansible__host_facts: "{{ ansible__update_host_facts.__ansible__host_facts }}"
+  register: ansible__host_facts_reassign
 
 - name: Settle local facts on host if changed
   become: true
@@ -23,19 +23,19 @@
     src: "{{ ansible__local_fact_template }}"
     dest: "{{ ansible__local_fact_file }}"
     backup: "{{ ansible__local_fact_backup | default(omit) | bool }}"
-  register: ansible__local_facts_settle
+  register: ansible__host_facts_settle
   vars:
     fact_basename: "{{ ansible__local_fact_file | basename | regex_replace('\\.fact$', '') }}"
     on_host: "{{ ansible_local[fact_basename] | default({}) | b64encode }}"
-    on_runtime: "{{ __ansible__local_facts | default({}) | b64encode }}"
+    on_runtime: "{{ __ansible__host_facts | default({}) | b64encode }}"
   when: on_host != on_runtime
 
 - name: Re-read local facts
   become: true
   ansible.builtin.setup:
     filter: ansible_local
-  register: ansible__local_facts_reread
-  when: ansible__local_facts_settle.changed
+  register: ansible__host_facts_reread
+  when: ansible__host_facts_settle.changed
 
 # - name: Settle local facts if they have been modified
 #   ansible.builtin.meta: 'flush_handlers'
\ No newline at end of file
diff --git a/roles/ansible/templates/aybarsm_linux.json.fact.j2 b/roles/ansible/templates/aybarsm_linux.json.fact.j2
index 97f5ff3..1b35380 100644
--- a/roles/ansible/templates/aybarsm_linux.json.fact.j2
+++ b/roles/ansible/templates/aybarsm_linux.json.fact.j2
@@ -1,5 +1,5 @@
-{% if __ansible__local_facts is defined %}
-{{ __ansible__local_facts | to_nice_json }}
+{% if __ansible__host_facts is defined %}
+{{ __ansible__host_facts | to_nice_json }}
 {% else %}
 {
 }
diff --git a/roles/grub/defaults/main.yml b/roles/grub/defaults/main.yml
index 7534ebe..682fae6 100644
--- a/roles/grub/defaults/main.yml
+++ b/roles/grub/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-grub_role_enabled: false
+grub__role_enabled: false
 
 grub__dir: /etc/default/grub.d
 grub__file: 50-ansible.cfg
diff --git a/roles/grub/tasks/main.yml b/roles/grub/tasks/main.yml
index d14660b..bb75d1f 100644
--- a/roles/grub/tasks/main.yml
+++ b/roles/grub/tasks/main.yml
@@ -2,4 +2,4 @@
 - name: Import grub tasks
   ansible.builtin.import_tasks:
     file: grub.yml
-  when: grub_role_enabled | bool
+  when: grub__role_enabled | bool
diff --git a/roles/network_interfaces/defaults/main.yml b/roles/network_interfaces/defaults/main.yml
index 7382a7e..8575ba4 100644
--- a/roles/network_interfaces/defaults/main.yml
+++ b/roles/network_interfaces/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-network_interfaces_role_enabled: false
+network_interfaces__role_enabled: false
 
 # Leave empty not to apply changes
 network_interfaces__change_strategy: ''
diff --git a/roles/network_interfaces/tasks/main.yml b/roles/network_interfaces/tasks/main.yml
index 19db08b..e7bee7f 100644
--- a/roles/network_interfaces/tasks/main.yml
+++ b/roles/network_interfaces/tasks/main.yml
@@ -3,4 +3,4 @@
   ansible.builtin.import_tasks:
     file: network_interfaces.yml
   when:
-    - systemd_network_role_enabled | bool
+    - systemd_network__role_enabled | bool
diff --git a/roles/package_manager/defaults/main.yml b/roles/package_manager/defaults/main.yml
index 525d49a..e5a3a40 100644
--- a/roles/package_manager/defaults/main.yml
+++ b/roles/package_manager/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-package_manager_role_enabled: false
+package_manager__role_enabled: false
 
 # Change the package manager strategy to use for the system i.e. ansible.builtin.apt vs ansible.builtin.package
 # Available options: specific, common
diff --git a/roles/package_manager/tasks/main.yml b/roles/package_manager/tasks/main.yml
index 6760b0b..7c47310 100644
--- a/roles/package_manager/tasks/main.yml
+++ b/roles/package_manager/tasks/main.yml
@@ -9,24 +9,24 @@
   ansible.builtin.import_tasks:
     file: deb_initial_upgrade.yml
   when:
-    - package_manager_role_enabled | default(false) | bool
+    - package_manager__role_enabled | default(false) | bool
     - package_manager__initial_upgrade | default(false) | bool
-    - linux_role_ansible_manage_local_facts | default(false) | bool
-    - __ansible__local_facts is defined
+    - ansible__manage_local_facts | default(false) | bool
+    - __ansible__host_facts is defined
     - ansible_os_family | lower == 'debian'
 
 - name: Import DEB repository and repository key tasks (APT)
   ansible.builtin.import_tasks:
     file: deb.yml
   when:
-    - package_manager_role_enabled | default(false) | bool
+    - package_manager__role_enabled | default(false) | bool
     - ansible_os_family | lower == 'debian'
 
 - name: Import DEB package tasks (APT)
   ansible.builtin.import_tasks:
     file: deb_packages.yml
   when:
-    - package_manager_role_enabled | default(false) | bool
+    - package_manager__role_enabled | default(false) | bool
     - package_manager__package_strategy | lower == 'specific'
     - ansible_os_family | lower == 'debian'
 
@@ -34,5 +34,5 @@
   ansible.builtin.import_tasks:
     file: common_packages.yml
   when:
-    - package_manager_role_enabled | default(false) | bool
+    - package_manager__role_enabled | default(false) | bool
     - package_manager__package_strategy | lower == 'common'
diff --git a/roles/posix/defaults/main.yml b/roles/posix/defaults/main.yml
index b4c61c2..a516566 100644
--- a/roles/posix/defaults/main.yml
+++ b/roles/posix/defaults/main.yml
@@ -1,4 +1,4 @@
-posix_sysctl_role_enabled: false
+posix_sysctl__role_enabled: false
 
 posix__sysctl_default: []
 posix__sysctl_group: []
diff --git a/roles/posix/tasks/main.yml b/roles/posix/tasks/main.yml
index 3560c8a..4ce77ab 100644
--- a/roles/posix/tasks/main.yml
+++ b/roles/posix/tasks/main.yml
@@ -2,4 +2,4 @@
 - name: Import posix sysctl tasks
   ansible.builtin.import_tasks:
     file: sysctl.yml
-  when: posix_sysctl_role_enabled | bool
+  when: posix_sysctl__role_enabled | bool
diff --git a/roles/proxmox/defaults/main.yml b/roles/proxmox/defaults/main.yml
index 64c9aa2..20b3aaa 100644
--- a/roles/proxmox/defaults/main.yml
+++ b/roles/proxmox/defaults/main.yml
@@ -1,4 +1,4 @@
-proxmox_role_enabled: false
+proxmox__role_enabled: false
 
 proxmox__clean_os_upgrade: ''
 
diff --git a/roles/systemd/defaults/main.yml b/roles/systemd/defaults/main.yml
index 5e1c4be..80e70d6 100644
--- a/roles/systemd/defaults/main.yml
+++ b/roles/systemd/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 # Ensures system manager is systemd - ansible_service_mgr == "systemd"
 systemd__ensure_service_manager: true
-systemd_network_role_enabled: false
+systemd_network__role_enabled: false
 
 systemd__network_apply_changes: false
 
diff --git a/roles/systemd/tasks/main.yml b/roles/systemd/tasks/main.yml
index 2bda46f..cf2de08 100644
--- a/roles/systemd/tasks/main.yml
+++ b/roles/systemd/tasks/main.yml
@@ -3,5 +3,5 @@
   ansible.builtin.import_tasks:
     file: network.yml
   when:
-    - systemd_network_role_enabled | bool
+    - systemd_network__role_enabled | bool
     - not systemd__ensure_service_manager | bool or ansible_service_mgr == "systemd"