diff --git a/roles/snmpd_conf/defaults/main.yml b/roles/snmpd_conf/defaults/main.yml
index 8a14d4b..3fbb130 100644
--- a/roles/snmpd_conf/defaults/main.yml
+++ b/roles/snmpd_conf/defaults/main.yml
@@ -1,23 +1,23 @@
 ---
-__project_author : Chris Hammer
-__project_email  : chris@thezengarden.net
-__project_repo   : https://github.com/jchristianh-ansible-collections/baseos
+snmpd_conf_project_author : Chris Hammer
+snmpd_conf_project_email  : chris@thezengarden.net
+snmpd_conf_project_repo   : https://github.com/jchristianh-ansible-collections/baseos
 
 
-__template_header : The Zen Garden
+snmpd_conf_template_header : The Zen Garden
 
 
-__snmpd_conf_file        : /etc/snmp/snmpd.conf
-__snmpd_conf_version     : 1.0.1
-__snmpd_conf_revision    : 231210
+snmpd_conf_snmpd_conf_file     : /etc/snmp/snmpd.conf
+snmpd_conf_snmpd_conf_version  : 1.0.1
+snmpd_conf_snmpd_conf_revision : 231210
 
 
-__snmp_pkg : net-snmp
+snmpd_conf_snmp_pkg : net-snmp
 
 
-__snmpd_location      : 'Newport News, VA'
-__snmpd_contact_name  : 'Chris Hammer'
-__snmpd_contact_email : '<chris@thezengarden.net>'
+snmpd_conf_snmpd_location      : 'Newport News, VA'
+snmpd_conf_snmpd_contact_name  : 'Chris Hammer'
+snmpd_conf_snmpd_contact_email : '<chris@thezengarden.net>'
 
 
 ...
diff --git a/roles/snmpd_conf/tasks/main.yml b/roles/snmpd_conf/tasks/main.yml
index 91f6e4c..601d5b1 100644
--- a/roles/snmpd_conf/tasks/main.yml
+++ b/roles/snmpd_conf/tasks/main.yml
@@ -1,40 +1,35 @@
 ---
-- name: Include distribution specific variables or include defaults
-  block:
-    - name: Include distribution specific variables
-      include_vars:
-        file: "{{ ansible_distribution | lower }}_{{ ansible_distribution_major_version }}.yml"
-
-
-  rescue:
-    - name: Non-supported distribution; using default package set
-      include_vars:
-        file: __default_packages.yml
-
-
 - name: Deploy and configure SNMP
   block:
+    - name: Set package name for Debian 12
+      ansible.builtin.set_fact:
+        snmpd_conf_snmp_pkg: snmpd
+      when:
+        - ansible_distribution | lower == 'debian'
+        - ansible_distribution_major_version == '12'
+
     - name: Install SNMP
-      package:
-        name: "{{ __snmp_pkg }}"
+      ansible.builtin.package:
+        name: "{{ snmpd_conf_snmp_pkg }}"
         state: present
 
     - name: Ensure /etc/snmp directory is present
-      file:
+      ansible.builtin.file:
         path: /etc/snmp
         state: directory
+        mode: "0755"
 
     - name: Deploy snmpd.conf
-      template:
+      ansible.builtin.template:
         src: templates/snmpd_conf.j2
-        dest: "{{ __snmpd_conf_file }}"
-        mode: 0644
+        dest: "{{ snmpd_conf_snmpd_conf_file }}"
+        mode: "0644"
       notify: Restart_SNMPd
 
 
   rescue:
     - name: Unable to deploy SNMP
-      debug:
+      ansible.builtin.debug:
         msg: "Unable to deploy SNMP to {{ inventory_hostname }}."
 
 
diff --git a/roles/snmpd_conf/templates/snmpd_conf.j2 b/roles/snmpd_conf/templates/snmpd_conf.j2
index 1d01231..8833dc0 100644
--- a/roles/snmpd_conf/templates/snmpd_conf.j2
+++ b/roles/snmpd_conf/templates/snmpd_conf.j2
@@ -1,11 +1,11 @@
 ###############################################
-# {{ __template_header }}
+# {{ snmpd_conf_template_header }}
 ###############################################
 #
-# Configuration    : {{ __snmpd_conf_file }}
-# Template Version : {{ __snmpd_conf_version}}-{{ __snmpd_conf_revision }}
+# Configuration    : {{ snmpd_conf_snmpd_conf_file }}
+# Template Version : {{ snmpd_conf_snmpd_conf_version }}-{{ snmpd_conf_snmpd_conf_revision }}
 #
-# {{ __project_author }} ({{ __project_email }})
+# {{ snmpd_conf_project_author }} ({{ snmpd_conf_project_email }})
 ###############################################
 
 
@@ -33,6 +33,6 @@ access MyRWGroup ""      any       noauth    exact  all    all    none
 ###############################################################################
 # System contact information
 #
-syslocation {{ __snmpd_location }}
-syscontact {{ __snmpd_contact_name }} {{ __snmpd_contact_email }}
+syslocation {{ snmpd_conf_snmpd_location }}
+syscontact {{ snmpd_conf_snmpd_contact_name }} {{ snmpd_conf_snmpd_contact_email }}
 # -----------------------------------------------------------------------------
diff --git a/roles/snmpd_conf/vars/__default_packages.yml b/roles/snmpd_conf/vars/__default_packages.yml
deleted file mode 100644
index 6666f66..0000000
--- a/roles/snmpd_conf/vars/__default_packages.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-__snmp_pkg: net-snmp
-
-
-...
diff --git a/roles/snmpd_conf/vars/centos_7.yml b/roles/snmpd_conf/vars/centos_7.yml
deleted file mode 100644
index 6666f66..0000000
--- a/roles/snmpd_conf/vars/centos_7.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-__snmp_pkg: net-snmp
-
-
-...
diff --git a/roles/snmpd_conf/vars/centos_8.yml b/roles/snmpd_conf/vars/centos_8.yml
deleted file mode 100644
index 6666f66..0000000
--- a/roles/snmpd_conf/vars/centos_8.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-__snmp_pkg: net-snmp
-
-
-...
diff --git a/roles/snmpd_conf/vars/centos_9.yml b/roles/snmpd_conf/vars/centos_9.yml
deleted file mode 100644
index 6666f66..0000000
--- a/roles/snmpd_conf/vars/centos_9.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-__snmp_pkg: net-snmp
-
-
-...
diff --git a/roles/snmpd_conf/vars/debian_11.yml b/roles/snmpd_conf/vars/debian_11.yml
deleted file mode 100644
index a47b044..0000000
--- a/roles/snmpd_conf/vars/debian_11.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-__snmp_pkg: snmpd
-
-
-...
diff --git a/roles/snmpd_conf/vars/debian_12.yml b/roles/snmpd_conf/vars/debian_12.yml
deleted file mode 100644
index a47b044..0000000
--- a/roles/snmpd_conf/vars/debian_12.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-__snmp_pkg: snmpd
-
-
-...
diff --git a/roles/snmpd_conf/vars/fedora_39.yml b/roles/snmpd_conf/vars/fedora_39.yml
deleted file mode 100644
index 6666f66..0000000
--- a/roles/snmpd_conf/vars/fedora_39.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-__snmp_pkg: net-snmp
-
-
-...