diff --git a/facts/package_names.yml b/facts/package.yml
similarity index 100%
rename from facts/package_names.yml
rename to facts/package.yml
diff --git a/facts/service_names.yml b/facts/service.yml
similarity index 100%
rename from facts/service_names.yml
rename to facts/service.yml
diff --git a/facts/filesystem_names.yml b/facts/system.yml
similarity index 91%
rename from facts/filesystem_names.yml
rename to facts/system.yml
index 606c414..ec75fcf 100644
--- a/facts/filesystem_names.yml
+++ b/facts/system.yml
@@ -3,6 +3,7 @@
 
 - name: Set Pop!_OS FS Names
   ansible.builtin.set_fact:
+    flatpak_distro: yes
     lynis_install_dir: /usr/local/lynis
     lynis_report: /home/ling/lynis.log
     sudoers_install_dir: /etc/sudoers.d/ansible
@@ -12,6 +13,7 @@
 # TODO Needs tested
 - name: Set Ubuntu FS Names
   ansible.builtin.set_fact:
+    flatpak_distro: yes
     lynis_install_dir: /usr/local/lynis
     lynis_report: /root/lynis.log
     sudoers_install_dir: /etc/sudoers.d/ansible
@@ -20,6 +22,7 @@
 
 - name: Set FreeBSD FS Names
   ansible.builtin.set_fact:
+    flatpak_distro: no
     lynis_install_dir: /usr/local/lynis
     lynis_report: /root/lynis.log
     sudoers_install_dir: /usr/local/etc/sudoers.d/ansible
diff --git a/facts/user_names.yml b/facts/user.yml
similarity index 100%
rename from facts/user_names.yml
rename to facts/user.yml
diff --git a/local.yml b/local.yml
index 8b8f32a..384a392 100644
--- a/local.yml
+++ b/local.yml
@@ -8,10 +8,10 @@
   become: true  
 
   pre_tasks:
-    - include: facts/filesystem_names.yml
-    - include: facts/package_names.yml
-    - include: facts/service_names.yml
-    - include: facts/user_names.yml
+    - include: facts/system.yml
+    - include: facts/package.yml
+    - include: facts/service.yml
+    - include: facts/user.yml
 
   tasks:
     - include: tasks/packages.yml
@@ -30,6 +30,7 @@
   tasks:
     - include: tasks/flatpaks.yml
       when: ansible_distribution != "FreeBSD"
+        and "{{ flatpak_distro }} == yes"
 
 
 # FreeBSD Workstations