diff --git a/host-plumbum.yml b/host-plumbum.yml
index d9aa737..e0c3433 100644
--- a/host-plumbum.yml
+++ b/host-plumbum.yml
@@ -3,7 +3,7 @@
   become: true
 
   roles:
-    - role: nfs-host
+    - role: nfs_host
       vars:
         nfs_host_exports:
           - directory: "/srv/nfs/backup"
diff --git a/host-tau.yml b/host-tau.yml
index ee5e2a4..64c7c56 100644
--- a/host-tau.yml
+++ b/host-tau.yml
@@ -191,7 +191,7 @@
 
     - name: Setup forwarding for Discord invite
       include_role:
-        name: setup-http-site-forward
+        name: setup_http_site_forward
       vars:
         site_name: "{{ discord_invite_domain }}"
         # forward_to: "https://discord.com/invite/8FcDvAf"
diff --git a/roles/nfs-host/defaults/main.yml b/roles/nfs_host/defaults/main.yml
similarity index 87%
rename from roles/nfs-host/defaults/main.yml
rename to roles/nfs_host/defaults/main.yml
index 210a3be..ee0d286 100644
--- a/roles/nfs-host/defaults/main.yml
+++ b/roles/nfs_host/defaults/main.yml
@@ -1,4 +1,4 @@
-# Defaults for nfs-host
+# Defaults for nfs_host
 ---
 nfs_host_exports: []
   # - directory: "/srv/nfs"
diff --git a/roles/nfs-host/handlers/main.yml b/roles/nfs_host/handlers/main.yml
similarity index 100%
rename from roles/nfs-host/handlers/main.yml
rename to roles/nfs_host/handlers/main.yml
diff --git a/roles/nfs-host/tasks/main.yml b/roles/nfs_host/tasks/main.yml
similarity index 100%
rename from roles/nfs-host/tasks/main.yml
rename to roles/nfs_host/tasks/main.yml
diff --git a/roles/nfs-host/templates/exports.j2 b/roles/nfs_host/templates/exports.j2
similarity index 100%
rename from roles/nfs-host/templates/exports.j2
rename to roles/nfs_host/templates/exports.j2
diff --git a/roles/setup-http-site-forward/handlers/main.yml b/roles/setup_http_site_forward/handlers/main.yml
similarity index 100%
rename from roles/setup-http-site-forward/handlers/main.yml
rename to roles/setup_http_site_forward/handlers/main.yml
diff --git a/roles/setup-http-site-forward/tasks/main.yml b/roles/setup_http_site_forward/tasks/main.yml
similarity index 100%
rename from roles/setup-http-site-forward/tasks/main.yml
rename to roles/setup_http_site_forward/tasks/main.yml
diff --git a/roles/setup-http-site-forward/templates/apache-docker-forward-site.j2 b/roles/setup_http_site_forward/templates/apache-docker-forward-site.j2
similarity index 100%
rename from roles/setup-http-site-forward/templates/apache-docker-forward-site.j2
rename to roles/setup_http_site_forward/templates/apache-docker-forward-site.j2