diff --git a/roles/mail-certificates/tasks/main.yml b/roles/mail_certificates/tasks/main.yml
similarity index 100%
rename from roles/mail-certificates/tasks/main.yml
rename to roles/mail_certificates/tasks/main.yml
diff --git a/roles/mail-certificates/templates/conf.ini.j2 b/roles/mail_certificates/templates/conf.ini.j2
similarity index 100%
rename from roles/mail-certificates/templates/conf.ini.j2
rename to roles/mail_certificates/templates/conf.ini.j2
diff --git a/roles/mail-utils/tasks/main.yml b/roles/mail_utils/tasks/main.yml
similarity index 100%
rename from roles/mail-utils/tasks/main.yml
rename to roles/mail_utils/tasks/main.yml
diff --git a/roles/nfs-client/defaults/main.yml b/roles/nfs_client/defaults/main.yml
similarity index 100%
rename from roles/nfs-client/defaults/main.yml
rename to roles/nfs_client/defaults/main.yml
diff --git a/roles/nfs-client/tasks/main.yml b/roles/nfs_client/tasks/main.yml
similarity index 100%
rename from roles/nfs-client/tasks/main.yml
rename to roles/nfs_client/tasks/main.yml