diff --git a/tasks/configure-nfs-mounts.yml b/tasks/configure_nfs_mounts.yml
similarity index 100%
rename from tasks/configure-nfs-mounts.yml
rename to tasks/configure_nfs_mounts.yml
diff --git a/tasks/create-users-groups.yml b/tasks/create_users_groups.yml
similarity index 100%
rename from tasks/create-users-groups.yml
rename to tasks/create_users_groups.yml
diff --git a/tasks/install-packages.yml b/tasks/install_packages.yml
similarity index 100%
rename from tasks/install-packages.yml
rename to tasks/install_packages.yml
diff --git a/tasks/install-test-scripts.yml b/tasks/install_test_scripts.yml
similarity index 100%
rename from tasks/install-test-scripts.yml
rename to tasks/install_test_scripts.yml
diff --git a/tasks/main.yml b/tasks/main.yml
index 7fd53084a1f60b96411b3ad3a7c650dc75acf0e1..189f1fca3cb00a129ad740c3aeb133d6bad6c0d3 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -6,11 +6,11 @@
   tags: [always]
 
 - name: install packages
-  import_tasks: install-packages.yml
+  import_tasks: "install_packages.yml"
   tags: [apt, packages]
 
 - name: create users and groups
-  import_tasks: create-users-groups.yml
+  import_tasks: "create_users_groups.yml"
   tags: [users]
 
 - name: configure SSH keys
@@ -18,9 +18,9 @@
   tags: [ssh]
 
 - name: configure nfs mounts
-  import_tasks: configure-nfs-mounts.yml
+  import_tasks: "configure_nfs_mounts.yml"
   tags: [nfs]
 
 - name: install test scripts
-  import_tasks: install-test-scripts.yml
+  import_tasks: "install_test_scripts.yml"
   tags: [testscripts]