diff --git a/hosts/yodaNas/configuration.nix b/hosts/yodaNas/configuration.nix
index f22a254..08758e7 100644
--- a/hosts/yodaNas/configuration.nix
+++ b/hosts/yodaNas/configuration.nix
@@ -25,8 +25,8 @@ in
       ./host-specific.nix
 
       ../../modules/base.nix
-      ../../modules/base-headless.nix
-      #../../modules/base-gnome.nix
+      ../../modules/headless.nix
+      #../../modules/gnome-base.nix
       #../../modules/programs.nix
       #../../modules/autostart.nix
       #../../modules/wallpaper.nix
diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix
index d63fbcc..f716771 100644
--- a/hosts/yodaTab/configuration.nix
+++ b/hosts/yodaTab/configuration.nix
@@ -24,8 +24,8 @@ in
       ../../modules/nur.nix
 
       ../../modules/base.nix
-      #../../modules/base-headless.nix
-      ../../modules/base-gnome.nix
+      #../../modules/headless.nix
+      ../../modules/gnome-base.nix
       ../../modules/programs.nix
       ../../modules/autostart.nix
       ../../modules/wallpaper.nix
diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix
index c5bcbd2..1fec780 100644
--- a/hosts/yodaTux/configuration.nix
+++ b/hosts/yodaTux/configuration.nix
@@ -24,8 +24,8 @@ in
       ../../modules/nur.nix
 
       ../../modules/base.nix
-      #../../modules/base-headless.nix
-      ../../modules/base-gnome.nix
+      #../../modules/headless.nix
+      ../../modules/gnome-base.nix
       ../../modules/programs.nix
       ../../modules/autostart.nix
       ../../modules/wallpaper.nix
diff --git a/hosts/yodaYoga/configuration.nix b/hosts/yodaYoga/configuration.nix
index 9f3477d..af24300 100644
--- a/hosts/yodaYoga/configuration.nix
+++ b/hosts/yodaYoga/configuration.nix
@@ -25,8 +25,8 @@ in
       ./host-specific.nix
 
       ../../modules/base.nix
-      ../../modules/base-headless.nix
-      #../../modules/base-gnome.nix
+      ../../modules/headless.nix
+      #../../modules/gnome-base.nix
       #../../modules/programs.nix
       #../../modules/autostart.nix
       #../../modules/wallpaper.nix
diff --git a/modules/base-gnome.nix b/modules/gnome-base.nix
similarity index 100%
rename from modules/base-gnome.nix
rename to modules/gnome-base.nix
diff --git a/modules/base-headless.nix b/modules/headless.nix
similarity index 100%
rename from modules/base-headless.nix
rename to modules/headless.nix