diff --git a/playbooks/bootstrap.yml b/playbooks/bootstrap.yml
index 645eedd..92147b0 100644
--- a/playbooks/bootstrap.yml
+++ b/playbooks/bootstrap.yml
@@ -13,7 +13,7 @@
       when: ansible_distribution in [ "AlmaLinux", "CentOS" ]
 
     # Upgrade all packages and install the basic-bitch ones
-    - role: base/system
+    - role: base_system
       become: true
 
     # Enable Cockpit
@@ -37,7 +37,7 @@
       tags: sshd
 
     # Handle basic user configuration
-    - base/desktop
+    - base_desktop
 
     # Shell utilities
     - role: shell/zsh
diff --git a/roles/base/desktop/files/boxname.sh b/roles/base_desktop/files/boxname.sh
similarity index 100%
rename from roles/base/desktop/files/boxname.sh
rename to roles/base_desktop/files/boxname.sh
diff --git a/roles/base/desktop/files/srht.py b/roles/base_desktop/files/srht.py
similarity index 100%
rename from roles/base/desktop/files/srht.py
rename to roles/base_desktop/files/srht.py
diff --git a/roles/base/desktop/tasks/desktop-utilities.yml b/roles/base_desktop/tasks/desktop-utilities.yml
similarity index 100%
rename from roles/base/desktop/tasks/desktop-utilities.yml
rename to roles/base_desktop/tasks/desktop-utilities.yml
diff --git a/roles/base/desktop/tasks/main.yml b/roles/base_desktop/tasks/main.yml
similarity index 100%
rename from roles/base/desktop/tasks/main.yml
rename to roles/base_desktop/tasks/main.yml
diff --git a/roles/base/desktop/tasks/scripts.yml b/roles/base_desktop/tasks/scripts.yml
similarity index 100%
rename from roles/base/desktop/tasks/scripts.yml
rename to roles/base_desktop/tasks/scripts.yml
diff --git a/roles/base/desktop/tasks/structure.yml b/roles/base_desktop/tasks/structure.yml
similarity index 100%
rename from roles/base/desktop/tasks/structure.yml
rename to roles/base_desktop/tasks/structure.yml
diff --git a/roles/base/server/tasks/main.yml b/roles/base_server/tasks/main.yml
similarity index 100%
rename from roles/base/server/tasks/main.yml
rename to roles/base_server/tasks/main.yml
diff --git a/roles/base/system/tasks/main.yml b/roles/base_system/tasks/main.yml
similarity index 100%
rename from roles/base/system/tasks/main.yml
rename to roles/base_system/tasks/main.yml
diff --git a/roles/base/system/tasks/upgrade.yml b/roles/base_system/tasks/upgrade.yml
similarity index 100%
rename from roles/base/system/tasks/upgrade.yml
rename to roles/base_system/tasks/upgrade.yml