diff --git a/playbooks/bootstrap.yml b/playbooks/bootstrap.yml
index 1f8344d..e885340 100644
--- a/playbooks/bootstrap.yml
+++ b/playbooks/bootstrap.yml
@@ -40,9 +40,9 @@
     - base_desktop
 
     # Shell utilities
-    - role: shell/zsh
+    - role: shell_zsh
       tags: zsh
-    - role: shell/tmux
+    - role: shell_tmux
       tags: tmux
 
     # Directory for temporary files
diff --git a/roles/shell/tmux/files/tmux.conf b/roles/shell_tmux/files/tmux.conf
similarity index 100%
rename from roles/shell/tmux/files/tmux.conf
rename to roles/shell_tmux/files/tmux.conf
diff --git a/roles/shell/tmux/files/tmux_status.conf b/roles/shell_tmux/files/tmux_status.conf
similarity index 100%
rename from roles/shell/tmux/files/tmux_status.conf
rename to roles/shell_tmux/files/tmux_status.conf
diff --git a/roles/shell/tmux/tasks/install.yml b/roles/shell_tmux/tasks/install.yml
similarity index 100%
rename from roles/shell/tmux/tasks/install.yml
rename to roles/shell_tmux/tasks/install.yml
diff --git a/roles/shell/tmux/tasks/main.yml b/roles/shell_tmux/tasks/main.yml
similarity index 100%
rename from roles/shell/tmux/tasks/main.yml
rename to roles/shell_tmux/tasks/main.yml
diff --git a/roles/shell/zsh/files/starship.toml b/roles/shell_zsh/files/starship.toml
similarity index 100%
rename from roles/shell/zsh/files/starship.toml
rename to roles/shell_zsh/files/starship.toml
diff --git a/roles/shell/zsh/tasks/install.yml b/roles/shell_zsh/tasks/install.yml
similarity index 100%
rename from roles/shell/zsh/tasks/install.yml
rename to roles/shell_zsh/tasks/install.yml
diff --git a/roles/shell/zsh/tasks/main.yml b/roles/shell_zsh/tasks/main.yml
similarity index 100%
rename from roles/shell/zsh/tasks/main.yml
rename to roles/shell_zsh/tasks/main.yml
diff --git a/roles/shell/zsh/tasks/oh-my-zsh.yml b/roles/shell_zsh/tasks/oh-my-zsh.yml
similarity index 100%
rename from roles/shell/zsh/tasks/oh-my-zsh.yml
rename to roles/shell_zsh/tasks/oh-my-zsh.yml
diff --git a/roles/shell/zsh/tasks/starship.yml b/roles/shell_zsh/tasks/starship.yml
similarity index 100%
rename from roles/shell/zsh/tasks/starship.yml
rename to roles/shell_zsh/tasks/starship.yml
diff --git a/roles/shell/zsh/templates/zshrc b/roles/shell_zsh/templates/zshrc
similarity index 100%
rename from roles/shell/zsh/templates/zshrc
rename to roles/shell_zsh/templates/zshrc