diff --git a/roles/base/README.md b/roles/base/README.md
index 11fe9af..c0207fb 100644
--- a/roles/base/README.md
+++ b/roles/base/README.md
@@ -19,4 +19,4 @@ system's base packages.
 Following secondary services that are not required for production
 capability are installed:
 
- * munin-node for monitoring system usage
+ * munin_node for monitoring system usage
diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 1aaf451..eac5a77 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -47,7 +47,7 @@
   include_role:
     name: "{{ role }}"
   with_items:
-    - munin-node
+    - munin_node
     - network
     - pki
     - psacct
diff --git a/roles/munin-node/handlers/main.yml b/roles/munin_node/handlers/main.yml
similarity index 100%
rename from roles/munin-node/handlers/main.yml
rename to roles/munin_node/handlers/main.yml
diff --git a/roles/munin-node/meta/main.yml b/roles/munin_node/meta/main.yml
similarity index 100%
rename from roles/munin-node/meta/main.yml
rename to roles/munin_node/meta/main.yml
diff --git a/roles/munin-node/tasks/main.yml b/roles/munin_node/tasks/main.yml
similarity index 100%
rename from roles/munin-node/tasks/main.yml
rename to roles/munin_node/tasks/main.yml
diff --git a/roles/munin-node/templates/munin-node.conf.j2 b/roles/munin_node/templates/munin-node.conf.j2
similarity index 100%
rename from roles/munin-node/templates/munin-node.conf.j2
rename to roles/munin_node/templates/munin-node.conf.j2
diff --git a/roles/munin-node/vars/OpenBSD.yml b/roles/munin_node/vars/OpenBSD.yml
similarity index 100%
rename from roles/munin-node/vars/OpenBSD.yml
rename to roles/munin_node/vars/OpenBSD.yml
diff --git a/roles/munin-node/vars/RedHat.yml b/roles/munin_node/vars/RedHat.yml
similarity index 100%
rename from roles/munin-node/vars/RedHat.yml
rename to roles/munin_node/vars/RedHat.yml