diff --git a/tasks/bootstrap_debian.yml b/tasks/bootstrap.debian.yml
similarity index 100%
rename from tasks/bootstrap_debian.yml
rename to tasks/bootstrap.debian.yml
diff --git a/tasks/bootstrap_fedora.yml b/tasks/bootstrap.fedora.yml
similarity index 100%
rename from tasks/bootstrap_fedora.yml
rename to tasks/bootstrap.fedora.yml
diff --git a/tasks/bootstrap_redhat.yml b/tasks/bootstrap.redhat.yml
similarity index 100%
rename from tasks/bootstrap_redhat.yml
rename to tasks/bootstrap.redhat.yml
diff --git a/tasks/bootstrap.yml b/tasks/bootstrap.yml
index fcbba72aa82f5060a1091be3a2b44d4b9919391a..dc843922e2220caab986bdd698cab532eb8c8213 100644
--- a/tasks/bootstrap.yml
+++ b/tasks/bootstrap.yml
@@ -29,10 +29,10 @@
     - name: Include OS specific bootstrap tasks
       include_tasks: '{{ item }}'
       with_first_found:
-        - tasks/bootstrap_{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml
-        - tasks/bootstrap_{{ ansible_distribution | lower }}-{{ ansible_distribution_release | lower }}.yml
-        - tasks/bootstrap_{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml
-        - tasks/bootstrap_{{ ansible_distribution | lower }}.yml
-        - tasks/bootstrap_{{ ansible_os_family | lower }}.yml
+        - tasks/bootstrap.{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml
+        - tasks/bootstrap.{{ ansible_distribution | lower }}-{{ ansible_distribution_release | lower }}.yml
+        - tasks/bootstrap.{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml
+        - tasks/bootstrap.{{ ansible_distribution | lower }}.yml
+        - tasks/bootstrap.{{ ansible_os_family | lower }}.yml
 ...
 # vi: set ts=2 sts=2 sw=2 et ft=yaml:
diff --git a/tasks/install-common-utils_debian.yml b/tasks/install-common-utils.debian.yml
similarity index 100%
rename from tasks/install-common-utils_debian.yml
rename to tasks/install-common-utils.debian.yml
diff --git a/tasks/install-common-utils_fedora.yml b/tasks/install-common-utils.fedora.yml
similarity index 100%
rename from tasks/install-common-utils_fedora.yml
rename to tasks/install-common-utils.fedora.yml
diff --git a/tasks/install-common-utils_redhat.yml b/tasks/install-common-utils.redhat.yml
similarity index 100%
rename from tasks/install-common-utils_redhat.yml
rename to tasks/install-common-utils.redhat.yml
diff --git a/tasks/main.yml b/tasks/main.yml
index 31bd0475665bf799fb6be9a2994362c30a91a3b7..74b775d74c48521412978a7d48ce8cff86a6ed3a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -29,11 +29,11 @@
 # Install common packages and utils
 - include_tasks: '{{ item }}'
   with_first_found:
-    - tasks/install-common-utils_{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml
-    - tasks/install-common-utils_{{ ansible_distribution | lower }}-{{ ansible_distribution_release | lower }}.yml
-    - tasks/install-common-utils_{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml
-    - tasks/install-common-utils_{{ ansible_distribution | lower }}.yml
-    - tasks/install-common-utils_{{ ansible_os_family | lower }}.yml
+    - tasks/install-common-utils.{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml
+    - tasks/install-common-utils.{{ ansible_distribution | lower }}-{{ ansible_distribution_release | lower }}.yml
+    - tasks/install-common-utils.{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml
+    - tasks/install-common-utils.{{ ansible_distribution | lower }}.yml
+    - tasks/install-common-utils.{{ ansible_os_family | lower }}.yml
 
 ...
 # vi: set ts=2 sts=2 sw=2 et ft=yaml: