diff --git a/modules/services/x11/xserver/default.nix b/modules/services/x11/xserver/default.nix
index 42642aa91379..3904566d2f35 100644
--- a/modules/services/x11/xserver/default.nix
+++ b/modules/services/x11/xserver/default.nix
@@ -470,9 +470,9 @@ mkIf cfg.enable {
     options
 
     # services.xserver.*Manager
-    ./displayManager/default.nix
-    ./windowManager/default.nix
-    ./desktopManager/default.nix
+    ./display-managers/default.nix
+    ./window-managers/default.nix
+    ./desktop-managers/default.nix
 
     # services.extraJobs
     # ../../upstart-jobs/default.nix
diff --git a/modules/services/x11/xserver/desktopManager/default.nix b/modules/services/x11/xserver/desktop-managers/default.nix
similarity index 100%
rename from modules/services/x11/xserver/desktopManager/default.nix
rename to modules/services/x11/xserver/desktop-managers/default.nix
diff --git a/modules/services/x11/xserver/desktopManager/gnome.nix b/modules/services/x11/xserver/desktop-managers/gnome.nix
similarity index 100%
rename from modules/services/x11/xserver/desktopManager/gnome.nix
rename to modules/services/x11/xserver/desktop-managers/gnome.nix
diff --git a/modules/services/x11/xserver/desktopManager/kdeEnvironment.nix b/modules/services/x11/xserver/desktop-managers/kde-environment.nix
similarity index 100%
rename from modules/services/x11/xserver/desktopManager/kdeEnvironment.nix
rename to modules/services/x11/xserver/desktop-managers/kde-environment.nix
diff --git a/modules/services/x11/xserver/desktopManager/kde.nix b/modules/services/x11/xserver/desktop-managers/kde.nix
similarity index 98%
rename from modules/services/x11/xserver/desktopManager/kde.nix
rename to modules/services/x11/xserver/desktop-managers/kde.nix
index 15fbf666e9c8..4bea8308e409 100644
--- a/modules/services/x11/xserver/desktopManager/kde.nix
+++ b/modules/services/x11/xserver/desktop-managers/kde.nix
@@ -23,7 +23,7 @@ mkIf cfg.enable {
     options
 
     # environment.kdePackages
-    ./kdeEnvironment.nix
+    ./kde-environment.nix
   ];
 
   services = {
diff --git a/modules/services/x11/xserver/desktopManager/kde.pam b/modules/services/x11/xserver/desktop-managers/kde.pam
similarity index 100%
rename from modules/services/x11/xserver/desktopManager/kde.pam
rename to modules/services/x11/xserver/desktop-managers/kde.pam
diff --git a/modules/services/x11/xserver/desktopManager/kde4.nix b/modules/services/x11/xserver/desktop-managers/kde4.nix
similarity index 98%
rename from modules/services/x11/xserver/desktopManager/kde4.nix
rename to modules/services/x11/xserver/desktop-managers/kde4.nix
index 6cd25b3b4599..c74429e74860 100644
--- a/modules/services/x11/xserver/desktopManager/kde4.nix
+++ b/modules/services/x11/xserver/desktop-managers/kde4.nix
@@ -23,7 +23,7 @@ mkIf cfg.enable {
     options
 
     # environment.kdePackages
-    ./kdeEnvironment.nix
+    ./kde-environment.nix
   ];
 
   services = {
diff --git a/modules/services/x11/xserver/desktopManager/none.nix b/modules/services/x11/xserver/desktop-managers/none.nix
similarity index 100%
rename from modules/services/x11/xserver/desktopManager/none.nix
rename to modules/services/x11/xserver/desktop-managers/none.nix
diff --git a/modules/services/x11/xserver/desktopManager/xterm.nix b/modules/services/x11/xserver/desktop-managers/xterm.nix
similarity index 100%
rename from modules/services/x11/xserver/desktopManager/xterm.nix
rename to modules/services/x11/xserver/desktop-managers/xterm.nix
diff --git a/modules/services/x11/xserver/displayManager/default.nix b/modules/services/x11/xserver/display-managers/default.nix
similarity index 100%
rename from modules/services/x11/xserver/displayManager/default.nix
rename to modules/services/x11/xserver/display-managers/default.nix
diff --git a/modules/services/x11/xserver/displayManager/kdm.nix b/modules/services/x11/xserver/display-managers/kdm.nix
similarity index 100%
rename from modules/services/x11/xserver/displayManager/kdm.nix
rename to modules/services/x11/xserver/display-managers/kdm.nix
diff --git a/modules/services/x11/xserver/displayManager/slim.nix b/modules/services/x11/xserver/display-managers/slim.nix
similarity index 100%
rename from modules/services/x11/xserver/displayManager/slim.nix
rename to modules/services/x11/xserver/display-managers/slim.nix
diff --git a/modules/services/x11/xserver/displayManager/slim.pam b/modules/services/x11/xserver/display-managers/slim.pam
similarity index 100%
rename from modules/services/x11/xserver/displayManager/slim.pam
rename to modules/services/x11/xserver/display-managers/slim.pam
diff --git a/modules/services/x11/xserver/windowManager/compiz.nix b/modules/services/x11/xserver/window-managers/compiz.nix
similarity index 100%
rename from modules/services/x11/xserver/windowManager/compiz.nix
rename to modules/services/x11/xserver/window-managers/compiz.nix
diff --git a/modules/services/x11/xserver/windowManager/default.nix b/modules/services/x11/xserver/window-managers/default.nix
similarity index 100%
rename from modules/services/x11/xserver/windowManager/default.nix
rename to modules/services/x11/xserver/window-managers/default.nix
diff --git a/modules/services/x11/xserver/windowManager/kwm.nix b/modules/services/x11/xserver/window-managers/kwm.nix
similarity index 100%
rename from modules/services/x11/xserver/windowManager/kwm.nix
rename to modules/services/x11/xserver/window-managers/kwm.nix
diff --git a/modules/services/x11/xserver/windowManager/metacity.nix b/modules/services/x11/xserver/window-managers/metacity.nix
similarity index 100%
rename from modules/services/x11/xserver/windowManager/metacity.nix
rename to modules/services/x11/xserver/window-managers/metacity.nix
diff --git a/modules/services/x11/xserver/windowManager/none.nix b/modules/services/x11/xserver/window-managers/none.nix
similarity index 100%
rename from modules/services/x11/xserver/windowManager/none.nix
rename to modules/services/x11/xserver/window-managers/none.nix
diff --git a/modules/services/x11/xserver/windowManager/twm.nix b/modules/services/x11/xserver/window-managers/twm.nix
similarity index 100%
rename from modules/services/x11/xserver/windowManager/twm.nix
rename to modules/services/x11/xserver/window-managers/twm.nix
diff --git a/modules/services/x11/xserver/windowManager/wmii.nix b/modules/services/x11/xserver/window-managers/wmii.nix
similarity index 100%
rename from modules/services/x11/xserver/windowManager/wmii.nix
rename to modules/services/x11/xserver/window-managers/wmii.nix
diff --git a/modules/services/x11/xserver/windowManager/xmonad.nix b/modules/services/x11/xserver/window-managers/xmonad.nix
similarity index 100%
rename from modules/services/x11/xserver/windowManager/xmonad.nix
rename to modules/services/x11/xserver/window-managers/xmonad.nix