diff --git a/facts/package.yml b/facts/package.yml
index edabe40..90b0b6b 100644
--- a/facts/package.yml
+++ b/facts/package.yml
@@ -1,7 +1,7 @@
 ---
-# Define what the program name is on each OS so we can use package builtin.
+# Define program names per OS for package builtin.
 
-- name: Set Pop!_OS Package Names
+- name: Set Pop OS Package Names
   ansible.builtin.set_fact:
     firefox: firefox-esr
     thunderbird: thunderbird
@@ -11,13 +11,13 @@
 
 
 # TODO Needs tested
-- name: Set Ubuntu Package Names
+- name: Set Debian and  Ubuntu Package Names
   ansible.builtin.set_fact:
     firefox: firefox-esr
     thunderbird: thunderbird
     evolution: evolution
     sshfs: sshfs
-  when: ansible_distribution == "Ubuntu"
+  when: ansible_distribution in ("Debian","Ubuntu")
 
 
 - name: Set FreeBSD Package Names
diff --git a/facts/service.yml b/facts/service.yml
index e56dfe8..46a43cf 100644
--- a/facts/service.yml
+++ b/facts/service.yml
@@ -1,7 +1,7 @@
 ---
-# Define what the program name is on each OS so we can use service builtin.
+# Define program names per OS for service builtin.
 
-- name: Set Pop!_OS Service Names
+- name: Set Pop OS Service Names
   ansible.builtin.set_fact:
     cups: cups
     cups_pattern: cupsd
@@ -11,13 +11,13 @@
 
 
 # TODO Needs tested
-- name: Set Ubuntu Service Names
+- name: Set Debian and Ubuntu Service Names
   ansible.builtin.set_fact:
     cups: cups
     cups_pattern: cupsd
     cups_browse: cups-browsed
     cups_browse_pattern: cups-browsed
-  when: ansible_distribution == "Ubuntu"
+  when: ansible_distribution in ("Debian","Ubuntu")
 
 
 - name: Set FreeBSD Service Names
diff --git a/facts/system.yml b/facts/system.yml
index 06e31da..0d3ddef 100644
--- a/facts/system.yml
+++ b/facts/system.yml
@@ -1,7 +1,7 @@
 ---
-# Define what the file and folder names should be on each OS.
+# Define file, folder, and other facts per OS.
 
-- name: Set Pop!_OS Desktop Facts
+- name: Set Pop OS Facts
   ansible.builtin.set_fact:
     flatpak_distro: yes
     lynis_install_dir: /usr/local/lynis
@@ -11,8 +11,7 @@
   when: ansible_distribution == "Pop!_OS"
 
 
-# TODO Needs tested
-- name: Set Debian+Ubuntu Server Facts
+- name: Set Debian and Ubuntu Facts
   ansible.builtin.set_fact:
     flatpak_distro: yes
     lynis_install_dir: /usr/local/lynis
diff --git a/facts/user.yml b/facts/user.yml
index 622abf3..8ac5c96 100644
--- a/facts/user.yml
+++ b/facts/user.yml
@@ -1,11 +1,12 @@
 ---
-# Define users and groups for each OS
+# Define users and groups per OS type.
 
 - name: Set Linux User Variables
   ansible.builtin.set_fact:
     root_group: root
   when: ansible_system == "Linux"
 
+
 - name: Set FreeBSD User Variables
   ansible.builtin.set_fact:
     root_group: wheel