diff --git a/roles/yubikey/authorized-keys/tasks/main.yml b/roles/yubikey_authorized_keys/tasks/main.yml
similarity index 100%
rename from roles/yubikey/authorized-keys/tasks/main.yml
rename to roles/yubikey_authorized_keys/tasks/main.yml
diff --git a/roles/yubikey/authorized-keys/templates/authorized_yubikeys b/roles/yubikey_authorized_keys/templates/authorized_yubikeys
similarity index 100%
rename from roles/yubikey/authorized-keys/templates/authorized_yubikeys
rename to roles/yubikey_authorized_keys/templates/authorized_yubikeys
diff --git a/roles/yubikey/pam/defaults/main.yml b/roles/yubikey_pam/defaults/main.yml
similarity index 100%
rename from roles/yubikey/pam/defaults/main.yml
rename to roles/yubikey_pam/defaults/main.yml
diff --git a/roles/yubikey/pam/tasks/install.yml b/roles/yubikey_pam/tasks/install.yml
similarity index 100%
rename from roles/yubikey/pam/tasks/install.yml
rename to roles/yubikey_pam/tasks/install.yml
diff --git a/roles/yubikey/pam/tasks/main.yml b/roles/yubikey_pam/tasks/main.yml
similarity index 100%
rename from roles/yubikey/pam/tasks/main.yml
rename to roles/yubikey_pam/tasks/main.yml
diff --git a/roles/yubikey/pam/templates/yubikey-sufficient b/roles/yubikey_pam/templates/yubikey-sufficient
similarity index 100%
rename from roles/yubikey/pam/templates/yubikey-sufficient
rename to roles/yubikey_pam/templates/yubikey-sufficient