diff --git a/roles/linux_common/molecule/default/playbook.yml b/roles/linux_common/molecule/default/playbook.yml
index 33ddb66..031092e 100644
--- a/roles/linux_common/molecule/default/playbook.yml
+++ b/roles/linux_common/molecule/default/playbook.yml
@@ -2,4 +2,4 @@
 - name: Converge
   hosts: all
   roles:
-    - role: linux-common
+    - role: linux_common
diff --git a/roles/linux_common/tasks/redhat.yml b/roles/linux_common/tasks/amazon.yml
similarity index 100%
rename from roles/linux_common/tasks/redhat.yml
rename to roles/linux_common/tasks/amazon.yml
diff --git a/roles/linux_common/tasks/main.yml b/roles/linux_common/tasks/main.yml
index 7cc3138..5e6ef0f 100644
--- a/roles/linux_common/tasks/main.yml
+++ b/roles/linux_common/tasks/main.yml
@@ -3,7 +3,7 @@
 # Note: Try and limit these to packages that are distro-specific, and
 # place commonly-named ones below.
 - name: Install distro-specific prerequisites
-  include: "{{ ansible_os_family|lower }}.yml"
+  include: "{{ ansible_distribution|lower }}.yml"
 
 - name: Install common support packags
   package:
diff --git a/roles/linux_common/tasks/debian.yml b/roles/linux_common/tasks/ubuntu.yml
similarity index 100%
rename from roles/linux_common/tasks/debian.yml
rename to roles/linux_common/tasks/ubuntu.yml