diff --git a/playbooks/ldap.yml b/playbooks/ldap.yml
index 1de8d64..15bb763 100644
--- a/playbooks/ldap.yml
+++ b/playbooks/ldap.yml
@@ -23,7 +23,7 @@
 
   roles:
     - base
-    - ldap-server
+    - ldap_server
     - role: ldap_netdb
       when: ldap_master is defined
     - role: ldap_gravatar
diff --git a/roles/ldap-server/defaults/main.yml b/roles/ldap_server/defaults/main.yml
similarity index 100%
rename from roles/ldap-server/defaults/main.yml
rename to roles/ldap_server/defaults/main.yml
diff --git a/roles/ldap-server/files/check_password.conf b/roles/ldap_server/files/check_password.conf
similarity index 100%
rename from roles/ldap-server/files/check_password.conf
rename to roles/ldap_server/files/check_password.conf
diff --git a/roles/ldap-server/files/kerberos.schema b/roles/ldap_server/files/kerberos.schema
similarity index 100%
rename from roles/ldap-server/files/kerberos.schema
rename to roles/ldap_server/files/kerberos.schema
diff --git a/roles/ldap-server/files/ldap-backup.sh b/roles/ldap_server/files/ldap-backup.sh
similarity index 100%
rename from roles/ldap-server/files/ldap-backup.sh
rename to roles/ldap_server/files/ldap-backup.sh
diff --git a/roles/ldap-server/files/ldapspn.py b/roles/ldap_server/files/ldapspn.py
similarity index 100%
rename from roles/ldap-server/files/ldapspn.py
rename to roles/ldap_server/files/ldapspn.py
diff --git a/roles/ldap-server/files/openssh-lpk.schema b/roles/ldap_server/files/openssh-lpk.schema
similarity index 100%
rename from roles/ldap-server/files/openssh-lpk.schema
rename to roles/ldap_server/files/openssh-lpk.schema
diff --git a/roles/ldap-server/files/rfc2307bis.schema b/roles/ldap_server/files/rfc2307bis.schema
similarity index 100%
rename from roles/ldap-server/files/rfc2307bis.schema
rename to roles/ldap_server/files/rfc2307bis.schema
diff --git a/roles/ldap-server/files/samba.schema b/roles/ldap_server/files/samba.schema
similarity index 100%
rename from roles/ldap-server/files/samba.schema
rename to roles/ldap_server/files/samba.schema
diff --git a/roles/ldap-server/files/slapd.sysconfig b/roles/ldap_server/files/slapd.sysconfig
similarity index 100%
rename from roles/ldap-server/files/slapd.sysconfig
rename to roles/ldap_server/files/slapd.sysconfig
diff --git a/roles/ldap-server/files/yubikey.schema b/roles/ldap_server/files/yubikey.schema
similarity index 100%
rename from roles/ldap-server/files/yubikey.schema
rename to roles/ldap_server/files/yubikey.schema
diff --git a/roles/ldap-server/handlers/main.yml b/roles/ldap_server/handlers/main.yml
similarity index 100%
rename from roles/ldap-server/handlers/main.yml
rename to roles/ldap_server/handlers/main.yml
diff --git a/roles/ldap-server/meta/main.yml b/roles/ldap_server/meta/main.yml
similarity index 100%
rename from roles/ldap-server/meta/main.yml
rename to roles/ldap_server/meta/main.yml
diff --git a/roles/ldap-server/tasks/main.yml b/roles/ldap_server/tasks/main.yml
similarity index 100%
rename from roles/ldap-server/tasks/main.yml
rename to roles/ldap_server/tasks/main.yml
diff --git a/roles/ldap-server/templates/slapd.conf.j2 b/roles/ldap_server/templates/slapd.conf.j2
similarity index 100%
rename from roles/ldap-server/templates/slapd.conf.j2
rename to roles/ldap_server/templates/slapd.conf.j2