diff --git a/pkgs/applications/display-managers/sddm/unwrapped.nix b/pkgs/applications/display-managers/sddm/unwrapped.nix
index a1d059d26dae..09fa4c71998d 100644
--- a/pkgs/applications/display-managers/sddm/unwrapped.nix
+++ b/pkgs/applications/display-managers/sddm/unwrapped.nix
@@ -13,7 +13,7 @@
   qtdeclarative,
   qtquickcontrols2 ? null,
   systemd,
-  xkeyboardconfig,
+  xkeyboard-config,
   nixosTests,
   docutils,
 }:
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     substituteInPlace src/greeter/waylandkeyboardbackend.cpp \
-      --replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml"
+      --replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboard-config}/share/X11/xkb/rules/evdev.xml"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index 6526006ec5ef..b3dbb8e516b4 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -38,11 +38,11 @@
   libxcb,
   libxkbcommon,
   mesa-demos,
-  xcbutilwm,
-  xcbutilrenderutil,
-  xcbutilkeysyms,
-  xcbutilimage,
-  xcbutilcursor,
+  libxcb-wm,
+  libxcb-render-util,
+  libxcb-keysyms,
+  libxcb-image,
+  libxcb-cursor,
   libxkbfile,
   libXcomposite,
   libXcursor,
@@ -171,11 +171,11 @@ let
             libX11
             libxcb
             libxkbcommon
-            xcbutilwm
-            xcbutilrenderutil
-            xcbutilkeysyms
-            xcbutilimage
-            xcbutilcursor
+            libxcb-wm
+            libxcb-render-util
+            libxcb-keysyms
+            libxcb-image
+            libxcb-cursor
             libice
             libsm
             libxkbfile
diff --git a/pkgs/applications/editors/jetbrains/ides/rider.nix b/pkgs/applications/editors/jetbrains/ides/rider.nix
index 44489af09de8..c7db457d1740 100644
--- a/pkgs/applications/editors/jetbrains/ides/rider.nix
+++ b/pkgs/applications/editors/jetbrains/ides/rider.nix
@@ -10,8 +10,8 @@
   libxcrypt,
   lttng-ust_2_12,
   musl,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libX11,
   dotnetCorePackages,
   libxcb-keysyms,
@@ -73,8 +73,8 @@ in
   ];
   extraLdPath = lib.optionals (stdenv.hostPlatform.isLinux) [
     # Avalonia dependencies needed for dotMemory
-    libICE
-    libSM
+    libice
+    libsm
     libX11
   ];
 
diff --git a/pkgs/applications/editors/vim/full.nix b/pkgs/applications/editors/vim/full.nix
index 752be0d2484c..7ea0de1676ae 100644
--- a/pkgs/applications/editors/vim/full.nix
+++ b/pkgs/applications/editors/vim/full.nix
@@ -18,14 +18,14 @@
   ruby,
   libX11,
   libXext,
-  libSM,
+  libsm,
   libXpm,
   libXt,
   libXaw,
   libXau,
   libXmu,
   libsodium,
-  libICE,
+  libice,
   wayland-scanner,
   vimPlugins,
   makeWrapper,
@@ -177,8 +177,8 @@ stdenv.mkDerivation {
   ]
   # All X related dependencies
   ++ lib.optionals (guiSupport == "gtk2" || guiSupport == "gtk3") [
-    libSM
-    libICE
+    libsm
+    libice
     libX11
     libXext
     libXpm
diff --git a/pkgs/applications/emulators/kega-fusion/default.nix b/pkgs/applications/emulators/kega-fusion/default.nix
index c3a9cc999983..fd5ed5924b27 100644
--- a/pkgs/applications/emulators/kega-fusion/default.nix
+++ b/pkgs/applications/emulators/kega-fusion/default.nix
@@ -9,7 +9,7 @@
   glib,
   gtk2,
   alsa-lib,
-  libSM,
+  libsm,
   libX11,
   gdk-pixbuf,
   pango,
@@ -26,7 +26,7 @@ let
     glib
     gtk2
     alsa-lib
-    libSM
+    libsm
     libX11
     gdk-pixbuf
     pango
diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index e1d571e4dbd0..644aa457acba 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -16,7 +16,7 @@
   wrapGAppsHook3,
   makeWrapper,
   pixman,
-  libpthreadstubs,
+  libpthread-stubs,
   gtkmm3,
   libXau,
   libXdmcp,
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
     libepoxy
     libXtst
     pixman
-    libpthreadstubs
+    libpthread-stubs
     gtkmm3
     libXau
     libXdmcp
diff --git a/pkgs/applications/graphics/unigine-superposition/default.nix b/pkgs/applications/graphics/unigine-superposition/default.nix
index 3b200ed30ac1..78ddf8f4edae 100644
--- a/pkgs/applications/graphics/unigine-superposition/default.nix
+++ b/pkgs/applications/graphics/unigine-superposition/default.nix
@@ -9,14 +9,14 @@
   qtquickcontrols2,
   libXinerama,
   libxcb,
-  libSM,
+  libsm,
   libXi,
   libglvnd,
   libXext,
   libXrandr,
   mailspring,
   libX11,
-  libICE,
+  libice,
   libXrender,
   autoPatchelfHook,
   makeWrapper,
@@ -54,14 +54,14 @@ let
       qtquickcontrols2
       libXinerama
       libxcb
-      libSM
+      libsm
       libXi
       libglvnd
       libXext
       libXrandr
       mailspring
       libX11
-      libICE
+      libice
       libXrender
     ];
 
@@ -111,14 +111,14 @@ buildFHSEnv {
     qtquickcontrols2
     libXinerama
     libxcb
-    libSM
+    libsm
     libXi
     libglvnd
     libXext
     libXrandr
     mailspring
     libX11
-    libICE
+    libice
     libXrender
     openal
   ];
diff --git a/pkgs/applications/misc/avalonia-ilspy/default.nix b/pkgs/applications/misc/avalonia-ilspy/default.nix
index d9984f028989..be52ef6a3a82 100644
--- a/pkgs/applications/misc/avalonia-ilspy/default.nix
+++ b/pkgs/applications/misc/avalonia-ilspy/default.nix
@@ -5,8 +5,8 @@
   buildDotnetModule,
   dotnetCorePackages,
   libX11,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libXi,
   libXcursor,
   libXext,
@@ -60,8 +60,8 @@ buildDotnetModule rec {
   runtimeDeps = [
     # Avalonia UI
     libX11
-    libICE
-    libSM
+    libice
+    libsm
     libXi
     libXcursor
     libXext
diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/applications/misc/googleearth-pro/default.nix
index 46c7eb81c2b1..0b476660c585 100644
--- a/pkgs/applications/misc/googleearth-pro/default.nix
+++ b/pkgs/applications/misc/googleearth-pro/default.nix
@@ -6,7 +6,7 @@
   glib,
   libGL,
   libGLU,
-  libSM,
+  libsm,
 
   libXcomposite,
   libXi,
@@ -27,7 +27,7 @@
   cups,
   alsa-lib,
 
-  xkeyboardconfig,
+  xkeyboard-config,
   autoPatchelfHook,
   wrapQtAppsHook,
 }:
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     autoPatchelfHook
     wrapQtAppsHook
   ];
-  propagatedBuildInputs = [ xkeyboardconfig ];
+  propagatedBuildInputs = [ xkeyboard-config ];
   buildInputs = [
     dbus
     cups
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     gst_all_1.gstreamer
     libGL
     libGLU
-    libSM
+    libsm
     libX11
     libXcomposite
     libXi
@@ -126,7 +126,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     wrapProgram $out/bin/googleearth-pro \
       --set QT_QPA_PLATFORM xcb \
-      --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb"
+      --set QT_XKB_CONFIG_ROOT "${xkeyboard-config}/share/X11/xkb"
   '';
 
   meta = {
diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index 8a43134d20d7..111109a18312 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -8,7 +8,7 @@
   gtk3,
   libgee,
   poppler,
-  libpthreadstubs,
+  libpthread-stubs,
   gstreamer,
   gst-plugins-base,
   gst-plugins-good,
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
           [ librsvg ]
         else
           [
-            libpthreadstubs
+            libpthread-stubs
             webkitgtk_4_1
           ];
     in
diff --git a/pkgs/applications/misc/peaclock/default.nix b/pkgs/applications/misc/peaclock/default.nix
index 7564bc874abe..daf65937b5b4 100644
--- a/pkgs/applications/misc/peaclock/default.nix
+++ b/pkgs/applications/misc/peaclock/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  libpthreadstubs,
+  libpthread-stubs,
   icu,
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [
-    libpthreadstubs
+    libpthread-stubs
     icu
   ];
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index f3878220f640..9d4903adc988 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -16,8 +16,8 @@
   gtkspell2,
   intltool,
   lib,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libXScrnSaver,
   libXext,
   libgcrypt,
@@ -74,8 +74,8 @@ let
         gst_all_1.gst-plugins-base
         gst_all_1.gst-plugins-good
         gst_all_1.gstreamer
-        libICE
-        libSM
+        libice
+        libsm
         libXScrnSaver
         libXext
         libgnt
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 7ab61b6a91c1..446ba3f40a64 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -13,7 +13,7 @@
   libXext,
   libXdamage,
   libXtst,
-  libSM,
+  libsm,
   libXfixes,
   coreutils,
   wrapQtAppsHook,
@@ -131,7 +131,7 @@ stdenv.mkDerivation rec {
         libXext
         libXdamage
         libXtst
-        libSM
+        libsm
         libXfixes
         dbus
         icu63
diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix
index 435ed3f28a44..353600b8cc90 100644
--- a/pkgs/applications/science/misc/gplates/default.nix
+++ b/pkgs/applications/science/misc/gplates/default.nix
@@ -13,7 +13,7 @@
   gmp,
   libGL,
   libGLU,
-  libSM,
+  libsm,
   mpfr,
   proj,
   python3,
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     gmp
     libGL
     libGLU
-    libSM
+    libsm
     mpfr
     proj
     python
diff --git a/pkgs/applications/version-management/p4v/linux.nix b/pkgs/applications/version-management/p4v/linux.nix
index f2af8b405600..c8808b66928c 100644
--- a/pkgs/applications/version-management/p4v/linux.nix
+++ b/pkgs/applications/version-management/p4v/linux.nix
@@ -24,10 +24,10 @@
   qttools,
   qtwebengine,
   qtwebview,
-  xcbutilimage,
-  xcbutilkeysyms,
-  xcbutilrenderutil,
-  xcbutilwm,
+  libxcb-image,
+  libxcb-keysyms,
+  libxcb-render-util,
+  libxcb-wm,
 }:
 
 {
@@ -66,10 +66,10 @@ let
       qttools
       qtwebengine
       qtwebview
-      xcbutilimage
-      xcbutilkeysyms
-      xcbutilrenderutil
-      xcbutilwm
+      libxcb-image
+      libxcb-keysyms
+      libxcb-render-util
+      libxcb-wm
     ];
 
     dontBuild = true;
diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix
index bf5f0a40752a..b4a87cee6961 100644
--- a/pkgs/applications/video/kodi/unwrapped.nix
+++ b/pkgs/applications/video/kodi/unwrapped.nix
@@ -81,7 +81,7 @@
   harfbuzz,
   lcms2,
   libidn2,
-  libpthreadstubs,
+  libpthread-stubs,
   libtasn1,
   libplist,
   p11-kit,
@@ -335,7 +335,7 @@ stdenv.mkDerivation (
       glib
       harfbuzz
       lcms2
-      libpthreadstubs
+      libpthread-stubs
       ffmpeg
       flatbuffers
       fstrcmp
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 255ba02e5f3d..62e3f8a03e32 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -17,7 +17,7 @@
   jansson,
   libjack2,
   libxkbcommon,
-  libpthreadstubs,
+  libpthread-stubs,
   libXdmcp,
   qtbase,
   qtsvg,
@@ -139,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
     libjack2
     libv4l
     libxkbcommon
-    libpthreadstubs
+    libpthread-stubs
     libXdmcp
     qtbase
     qtsvg
diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix
index dc4c069df341..95dc5c5fecf6 100644
--- a/pkgs/applications/video/vdr/softhddevice/default.nix
+++ b/pkgs/applications/video/vdr/softhddevice/default.nix
@@ -4,8 +4,8 @@
   vdr,
   alsa-lib,
   fetchFromGitHub,
-  xcbutilwm,
-  xorgserver,
+  libxcb-wm,
+  xorg-server,
   ffmpeg,
   libva,
   libvdpau,
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     vdr
-    xcbutilwm
+    libxcb-wm
     ffmpeg
     alsa-lib
     libva
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace softhddev.c \
-      --replace "LOCALBASE \"/bin/X\"" "\"${xorgserver}/bin/X\""
+      --replace "LOCALBASE \"/bin/X\"" "\"${xorg-server}/bin/X\""
   '';
 
   meta = {
diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix
index 8e8131a0062d..f5a54b9c229b 100644
--- a/pkgs/applications/window-managers/2bwm/default.nix
+++ b/pkgs/applications/window-managers/2bwm/default.nix
@@ -4,10 +4,10 @@
   fetchFromGitHub,
   patches,
   libxcb,
-  xcbutilkeysyms,
-  xcbutilwm,
+  libxcb-keysyms,
+  libxcb-wm,
   libX11,
-  xcbutil,
+  libxcb-util,
   xcbutilxrm,
 }:
 
@@ -27,10 +27,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libxcb
-    xcbutilkeysyms
-    xcbutilwm
+    libxcb-keysyms
+    libxcb-wm
     libX11
-    xcbutil
+    libxcb-util
     xcbutilxrm
   ];
 
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 6c477bec07f2..8c7ef0442848 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -21,8 +21,8 @@
   libxcb,
   libstartup_notification,
   libxdg_basedir,
-  libpthreadstubs,
-  xcb-util-cursor,
+  libpthread-stubs,
+  libxcb-cursor,
   makeWrapper,
   pango,
   gobject-introspection,
@@ -123,13 +123,13 @@ stdenv.mkDerivation rec {
     dbus
     gdk-pixbuf
     luaEnv
-    libpthreadstubs
+    libpthread-stubs
     libstartup_notification
     libxdg_basedir
     lua
     net-tools
     pango
-    xcb-util-cursor
+    libxcb-cursor
     libxau
     libxdmcp
     libxcb
diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix
index 2d0d0e8209ad..30f79ff8d5ee 100644
--- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix
@@ -13,10 +13,10 @@
   makeWrapper,
   pcre2,
   pkg-config,
-  xcbutilcursor,
-  xcbutilkeysyms,
-  xcbutilwm,
-  xcbutil,
+  libxcb-cursor,
+  libxcb-keysyms,
+  libxcb-wm,
+  libxcb-util,
   xmodmap,
 }:
 
@@ -50,10 +50,10 @@ stdenv.mkDerivation (finalAttrs: {
     libXdmcp
     libxcb
     pcre2
-    xcbutilcursor
-    xcbutilkeysyms
-    xcbutilwm
-    xcbutil
+    libxcb-cursor
+    libxcb-keysyms
+    libxcb-wm
+    libxcb-util
   ];
 
   # src/ewmh/ewmh.cpp:67:28: error: non-constant-expression cannot be narrowed from type 'int' to 'uint32_t' (aka 'unsigned int') in initializer list
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index d761e7144297..a104a4902897 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -8,21 +8,21 @@
   ninja,
   installShellFiles,
   libxcb,
-  xcbutilkeysyms,
-  xcbutil,
-  xcbutilwm,
+  libxcb-keysyms,
+  libxcb-util,
+  libxcb-wm,
   xcbutilxrm,
   libstartup_notification,
   libX11,
   pcre2,
   libev,
   yajl,
-  xcb-util-cursor,
+  libxcb-cursor,
   perl,
   pango,
   perlPackages,
   libxkbcommon,
-  xorgserver,
+  xorg-server,
   xvfb-run,
   xdotool,
   xrandr,
@@ -69,9 +69,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    xcbutilkeysyms
-    xcbutil
-    xcbutilwm
+    libxcb-keysyms
+    libxcb-util
+    libxcb-wm
     xcbutilxrm
     libxkbcommon
     libstartup_notification
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     pcre2
     libev
     yajl
-    xcb-util-cursor
+    libxcb-cursor
     perl
     pango
     perlPackages.AnyEventI3
@@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = stdenv.hostPlatform.isLinux;
 
   nativeCheckInputs = lib.optionals finalAttrs.finalPackage.doCheck [
-    xorgserver
+    xorg-server
     xvfb-run
     xdotool
     setxkbmap
diff --git a/pkgs/applications/window-managers/i3/easyfocus.nix b/pkgs/applications/window-managers/i3/easyfocus.nix
index e1ba87a78404..7689be9806e0 100644
--- a/pkgs/applications/window-managers/i3/easyfocus.nix
+++ b/pkgs/applications/window-managers/i3/easyfocus.nix
@@ -5,7 +5,7 @@
   pkg-config,
   xorgproto,
   libxcb,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libx11,
   i3ipc-glib,
   glib,
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     libxcb
-    xcbutilkeysyms
+    libxcb-keysyms
     xorgproto
     libx11.dev
     i3ipc-glib
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index 51d3af3ed4b3..bfa39114c90d 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -5,8 +5,8 @@
   autoreconfHook,
   pkg-config,
   libxcb,
-  xcbutilkeysyms,
-  xcbutilimage,
+  libxcb-keysyms,
+  libxcb-image,
   pam,
   libX11,
   libev,
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     libxcb
-    xcbutilkeysyms
-    xcbutilimage
+    libxcb-keysyms
+    libxcb-image
     pam
     libX11
     libev
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index de64e19608cf..6918a964de26 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -6,8 +6,8 @@
   ninja,
   pkg-config,
   libxcb,
-  xcbutilkeysyms,
-  xcbutilimage,
+  libxcb-keysyms,
+  libxcb-image,
   xcbutilxrm,
   pam,
   libX11,
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     libxcb
-    xcbutilkeysyms
-    xcbutilimage
+    libxcb-keysyms
+    libxcb-image
     xcbutilxrm
     pam
     libX11
diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix
index 195461b39beb..098f7d4c3e62 100644
--- a/pkgs/applications/window-managers/ion-3/default.nix
+++ b/pkgs/applications/window-managers/ion-3/default.nix
@@ -5,8 +5,8 @@
   lua,
   gettext,
   groff,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libX11,
   libXext,
 }:
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libICE
-    libSM
+    libice
+    libsm
     libX11
     libXext
     lua
diff --git a/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix b/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix
index 2a96830ffef7..6c3177fdae96 100644
--- a/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix
+++ b/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix
@@ -14,7 +14,7 @@
   libinput,
   libxkbcommon,
   vulkan-headers,
-  xcbutilwm,
+  libxcb-wm,
   gtkmm3,
   withFiltersPlugin ? true,
   withFocusRequestPlugin ? true,
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     libinput
     libxkbcommon
     vulkan-headers
-    xcbutilwm
+    libxcb-wm
     gtkmm3
   ];
 
diff --git a/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
index b33910cc9c1f..8728631bf4e1 100644
--- a/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
+++ b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
@@ -3,8 +3,8 @@
   dotnetCorePackages,
   fontconfig,
   lib,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libX11,
   stdenv,
   writeText,
@@ -56,8 +56,8 @@
       lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
         setupHook = writeText "setupHook.sh" ''
           prependToVar dotnetRuntimeDeps \
-            "${lib.getLib libICE}" \
-            "${lib.getLib libSM}" \
+            "${lib.getLib libice}" \
+            "${lib.getLib libsm}" \
             "${lib.getLib libX11}"
         '';
       }
diff --git a/pkgs/by-name/af/afterstep/package.nix b/pkgs/by-name/af/afterstep/package.nix
index a71585cad7df..22e30b1905a7 100644
--- a/pkgs/by-name/af/afterstep/package.nix
+++ b/pkgs/by-name/af/afterstep/package.nix
@@ -6,8 +6,8 @@
   dbus,
   fltk_1_3,
   gtk2,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libtiff,
   pkg-config,
 }:
@@ -60,8 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
     dbus
     fltk_1_3
     gtk2
-    libICE
-    libSM
+    libice
+    libsm
     libtiff
   ];
 
diff --git a/pkgs/by-name/al/alfaview/package.nix b/pkgs/by-name/al/alfaview/package.nix
index f75cb18919b2..fe9d38198f42 100644
--- a/pkgs/by-name/al/alfaview/package.nix
+++ b/pkgs/by-name/al/alfaview/package.nix
@@ -21,7 +21,7 @@
   libgbm,
   openssl,
   systemd,
-  xcb-util-cursor,
+  libxcb-cursor,
   libxcb-wm,
   libxcb-render-util,
   libxcb-keysyms,
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     openssl
     stdenv.cc.cc
     systemd
-    xcb-util-cursor
+    libxcb-cursor
     libx11
     libxcb-wm
     libxcb-image
diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix
index 532ee5c64ebf..54e8bfe7965e 100644
--- a/pkgs/by-name/an/animeko/package.nix
+++ b/pkgs/by-name/an/animeko/package.nix
@@ -51,7 +51,7 @@
   libshout,
   ffmpeg_6,
   libmpeg2,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   lirc,
   lua5_2,
   taglib,
@@ -203,7 +203,7 @@ stdenv.mkDerivation (finalAttrs: {
     srt
     libshout
     ffmpeg_6
-    xcbutilkeysyms
+    libxcb-keysyms
     lirc
     lua5_2
     taglib
diff --git a/pkgs/by-name/ar/arcan/package.nix b/pkgs/by-name/ar/arcan/package.nix
index 0f723a613e20..75d471de2e3a 100644
--- a/pkgs/by-name/ar/arcan/package.nix
+++ b/pkgs/by-name/ar/arcan/package.nix
@@ -43,8 +43,8 @@
   wayland,
   wayland-protocols,
   wayland-scanner,
-  xcbutil,
-  xcbutilwm,
+  libxcb-util,
+  libxcb-wm,
   xz,
   # Boolean flags
   buildManPages ? true,
@@ -105,8 +105,8 @@ stdenv.mkDerivation (finalAttrs: {
     valgrind
     wayland
     wayland-protocols
-    xcbutil
-    xcbutilwm
+    libxcb-util
+    libxcb-wm
     xz
   ]
   ++ lib.optionals (!useBuiltinLua) [ luajit ]
diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix
index 845c910b6748..72ab394c00dc 100644
--- a/pkgs/by-name/ar/art/package.nix
+++ b/pkgs/by-name/ar/art/package.nix
@@ -15,7 +15,7 @@
   libXtst,
   wrapGAppsHook3,
   pixman,
-  libpthreadstubs,
+  libpthread-stubs,
   gtkmm3,
   libXau,
   libXdmcp,
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
     libepoxy
     libXtst
     pixman
-    libpthreadstubs
+    libpthread-stubs
     gtkmm3
     libXau
     libXdmcp
diff --git a/pkgs/by-name/ar/artyFX/package.nix b/pkgs/by-name/ar/artyFX/package.nix
index 6064c7d8cd11..68694583fe50 100644
--- a/pkgs/by-name/ar/artyFX/package.nix
+++ b/pkgs/by-name/ar/artyFX/package.nix
@@ -5,7 +5,7 @@
   cairomm,
   cmake,
   libjack2,
-  libpthreadstubs,
+  libpthread-stubs,
   libXdmcp,
   libxshmfence,
   libsndfile,
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cairomm
     libjack2
-    libpthreadstubs
+    libpthread-stubs
     libXdmcp
     libxshmfence
     libsndfile
diff --git a/pkgs/by-name/at/ataripp/package.nix b/pkgs/by-name/at/ataripp/package.nix
index 427aac0c0c21..d31bb3b4f897 100644
--- a/pkgs/by-name/at/ataripp/package.nix
+++ b/pkgs/by-name/at/ataripp/package.nix
@@ -5,8 +5,8 @@
   alsa-lib,
   fetchurl,
   gcc-unwrapped,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libX11,
   libXext,
 }:
@@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
     SDL
     alsa-lib
     gcc-unwrapped
-    libICE
-    libSM
+    libice
+    libsm
     libX11
     libXext
   ];
diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix
index 55c926e91fbe..b876eadd8880 100644
--- a/pkgs/by-name/au/audacity/package.nix
+++ b/pkgs/by-name/au/audacity/package.nix
@@ -42,7 +42,7 @@
   libepoxy,
   libXdmcp,
   libXtst,
-  libpthreadstubs,
+  libpthread-stubs,
   libsbsms_2_3_0,
   libselinux,
   libsepol,
@@ -138,7 +138,7 @@ stdenv.mkDerivation (finalAttrs: {
     libepoxy
     libXdmcp
     libXtst
-    libpthreadstubs
+    libpthread-stubs
     libxkbcommon
     libselinux
     libsepol
diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix
index 19a69b17e4aa..3c18fc19fd7a 100644
--- a/pkgs/by-name/av/avalonia/package.nix
+++ b/pkgs/by-name/av/avalonia/package.nix
@@ -5,8 +5,8 @@
   fetchzip,
   fontconfig,
   lib,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libX11,
   libXcursor,
   libXext,
@@ -81,9 +81,9 @@ stdenvNoCC.mkDerivation (
         patchShebangs build.sh
 
         substituteInPlace src/Avalonia.X11/ICELib.cs \
-          --replace-fail '"libICE.so.6"' '"${lib.getLib libICE}/lib/libICE.so.6"'
+          --replace-fail '"libICE.so.6"' '"${lib.getLib libice}/lib/libICE.so.6"'
         substituteInPlace src/Avalonia.X11/SMLib.cs \
-          --replace-fail '"libSM.so.6"' '"${lib.getLib libSM}/lib/libSM.so.6"'
+          --replace-fail '"libSM.so.6"' '"${lib.getLib libsm}/lib/libSM.so.6"'
         substituteInPlace src/Avalonia.X11/XLib.cs \
           --replace-fail '"libX11.so.6"' '"${lib.getLib libX11}/lib/libX11.so.6"' \
           --replace-fail '"libXrandr.so.2"' '"${lib.getLib libXrandr}/lib/libXrandr.so.2"' \
diff --git a/pkgs/by-name/ba/bamf/package.nix b/pkgs/by-name/ba/bamf/package.nix
index 0f0dfc309246..4231719ddf11 100644
--- a/pkgs/by-name/ba/bamf/package.nix
+++ b/pkgs/by-name/ba/bamf/package.nix
@@ -15,7 +15,7 @@
   gobject-introspection,
   gtk-doc,
   docbook_xsl,
-  xorgserver,
+  xorg-server,
   dbus,
   python3,
   wrapGAppsHook3,
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     vala
     which
     wrapGAppsHook3
-    xorgserver
+    xorg-server
   ];
 
   buildInputs = [
diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix
index fb8395362b05..36a29a13c4d7 100644
--- a/pkgs/by-name/be/bespokesynth/package.nix
+++ b/pkgs/by-name/be/bespokesynth/package.nix
@@ -22,10 +22,10 @@
   libGL,
   libxcb,
   vst2-sdk,
-  xcbutil,
+  libxcb-util,
   libxkbcommon,
-  xcbutilkeysyms,
-  xcb-util-cursor,
+  libxcb-keysyms,
+  libxcb-cursor,
   gtk3,
   webkitgtk_4_1,
   python3,
@@ -112,10 +112,10 @@ stdenv.mkDerivation (finalAttrs: {
     zenity
     alsa-tools
     libxcb
-    xcbutil
+    libxcb-util
     libxkbcommon
-    xcbutilkeysyms
-    xcb-util-cursor
+    libxcb-keysyms
+    libxcb-cursor
     mount
   ];
 
diff --git a/pkgs/by-name/bi/binaryninja-free/package.nix b/pkgs/by-name/bi/binaryninja-free/package.nix
index 0675fb730d59..9e1d352a9828 100644
--- a/pkgs/by-name/bi/binaryninja-free/package.nix
+++ b/pkgs/by-name/bi/binaryninja-free/package.nix
@@ -12,10 +12,10 @@
   stdenv,
   unzip,
   wayland,
-  xcbutilimage,
-  xcbutilkeysyms,
-  xcbutilrenderutil,
-  xcbutilwm,
+  libxcb-image,
+  libxcb-keysyms,
+  libxcb-render-util,
+  libxcb-wm,
   libxml2,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -61,10 +61,10 @@ stdenv.mkDerivation (finalAttrs: {
     libxkbcommon
     stdenv.cc.cc.lib
     wayland
-    xcbutilimage
-    xcbutilkeysyms
-    xcbutilrenderutil
-    xcbutilwm
+    libxcb-image
+    libxcb-keysyms
+    libxcb-render-util
+    libxcb-wm
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/bo/boinc/package.nix b/pkgs/by-name/bo/boinc/package.nix
index 7d037a93aaf9..1825c41d476c 100644
--- a/pkgs/by-name/bo/boinc/package.nix
+++ b/pkgs/by-name/bo/boinc/package.nix
@@ -15,7 +15,7 @@
   libjpeg,
   libtool,
   wxGTK32,
-  xcbutil,
+  libxcb-util,
   sqlite,
   gtk3,
   patchelf,
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     libnotify
     libX11
     libxcb
-    xcbutil
+    libxcb-util
   ];
 
   NIX_LDFLAGS = lib.optionalString (!headless) "-lX11";
diff --git a/pkgs/by-name/bs/bspwm/package.nix b/pkgs/by-name/bs/bspwm/package.nix
index e7052cb87b54..c5e621f5eba4 100644
--- a/pkgs/by-name/bs/bspwm/package.nix
+++ b/pkgs/by-name/bs/bspwm/package.nix
@@ -4,9 +4,9 @@
   fetchFromGitHub,
   libxcb,
   libXinerama,
-  xcbutil,
-  xcbutilkeysyms,
-  xcbutilwm,
+  libxcb-util,
+  libxcb-keysyms,
+  libxcb-wm,
   nixosTests,
 }:
 
@@ -24,9 +24,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libxcb
     libXinerama
-    xcbutil
-    xcbutilkeysyms
-    xcbutilwm
+    libxcb-util
+    libxcb-keysyms
+    libxcb-wm
   ];
 
   makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/by-name/bu/budgie-session/package.nix b/pkgs/by-name/bu/budgie-session/package.nix
index 2aae236f1527..91f0d2e8f4ef 100644
--- a/pkgs/by-name/bu/budgie-session/package.nix
+++ b/pkgs/by-name/bu/budgie-session/package.nix
@@ -14,7 +14,7 @@
   gnome-settings-daemon,
   dbus,
   json-glib,
-  libICE,
+  libice,
   xmlto,
   docbook_xsl,
   docbook_xml_dtd_412,
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     glib
     gtk3
-    libICE
+    libice
     gnome-desktop
     json-glib
     xtrans
diff --git a/pkgs/by-name/bu/bumblebee/package.nix b/pkgs/by-name/bu/bumblebee/package.nix
index d44ac9bfaa2e..26b401397b93 100644
--- a/pkgs/by-name/bu/bumblebee/package.nix
+++ b/pkgs/by-name/bu/bumblebee/package.nix
@@ -27,9 +27,9 @@
   glib,
   libbsd,
   libX11,
-  xorgserver,
+  xorg-server,
   kmod,
-  xf86videonouveau,
+  xf86-video-nouveau,
   nvidia_x11 ? linuxPackages.nvidia_x11,
   linuxPackages,
   pkgsi686Linux,
@@ -65,12 +65,12 @@ let
 
   bbdPath = lib.makeBinPath [
     kmod
-    xorgserver
+    xorg-server
   ];
 
   xmodules = lib.concatStringsSep "," (
     map (x: "${x.out or x}/lib/xorg/modules") (
-      [ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau
+      [ xorg-server ] ++ lib.optional (!useNvidia) xf86-video-nouveau
     )
   );
 
diff --git a/pkgs/by-name/c6/c64-debugger/package.nix b/pkgs/by-name/c6/c64-debugger/package.nix
index bb13dd188b3e..4ddc6309cdd7 100644
--- a/pkgs/by-name/c6/c64-debugger/package.nix
+++ b/pkgs/by-name/c6/c64-debugger/package.nix
@@ -9,7 +9,7 @@
   libX11,
   pkg-config,
   upx,
-  xcbutil,
+  libxcb-util,
 }:
 
 stdenv.mkDerivation {
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     libGL
     libGLU
     libX11
-    xcbutil
+    libxcb-util
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cage/package.nix b/pkgs/by-name/ca/cage/package.nix
index 0d7e15158985..8f8e06024e1a 100644
--- a/pkgs/by-name/ca/cage/package.nix
+++ b/pkgs/by-name/ca/cage/package.nix
@@ -14,7 +14,7 @@
   wayland-protocols,
   pixman,
   libxkbcommon,
-  xcbutilwm,
+  libxcb-wm,
   libGL,
   libX11,
   xwayland ? null,
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-protocols
     pixman
     libxkbcommon
-    xcbutilwm
+    libxcb-wm
     libGL
     libX11
   ];
diff --git a/pkgs/by-name/ca/cagebreak/package.nix b/pkgs/by-name/ca/cagebreak/package.nix
index 5f4a1d2c5b01..adabf5144bfc 100644
--- a/pkgs/by-name/ca/cagebreak/package.nix
+++ b/pkgs/by-name/ca/cagebreak/package.nix
@@ -8,7 +8,7 @@
   libevdev,
   libinput,
   libxkbcommon,
-  xcbutilwm,
+  libxcb-wm,
   makeWrapper,
   meson,
   ninja,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     libevdev
     libinput
     libxkbcommon
-    xcbutilwm
+    libxcb-wm
     pango
     pixman
     systemd
diff --git a/pkgs/by-name/ch/chow-centaur/package.nix b/pkgs/by-name/ch/chow-centaur/package.nix
index 08aae7013add..9e5aa61cbda2 100644
--- a/pkgs/by-name/ch/chow-centaur/package.nix
+++ b/pkgs/by-name/ch/chow-centaur/package.nix
@@ -6,9 +6,9 @@
   pkg-config,
   cairo,
   libxkbcommon,
-  xcbutilcursor,
-  xcbutilkeysyms,
-  xcbutil,
+  libxcb-cursor,
+  libxcb-keysyms,
+  libxcb-util,
   libXrandr,
   libXinerama,
   libXcursor,
@@ -37,9 +37,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cairo
     libxkbcommon
-    xcbutilcursor
-    xcbutilkeysyms
-    xcbutil
+    libxcb-cursor
+    libxcb-keysyms
+    libxcb-util
     libXrandr
     libXinerama
     libXcursor
diff --git a/pkgs/by-name/cl/clightd/package.nix b/pkgs/by-name/cl/clightd/package.nix
index 0d4881e449f0..33fa4c4fd91f 100644
--- a/pkgs/by-name/cl/clightd/package.nix
+++ b/pkgs/by-name/cl/clightd/package.nix
@@ -14,7 +14,7 @@
   libmodule,
   libXdmcp,
   util-linux,
-  libpthreadstubs,
+  libpthread-stubs,
   enableDdc ? true,
   ddcutil,
   enableDpms ? true,
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     libXdmcp
     util-linux
-    libpthreadstubs
+    libpthread-stubs
   ]
   ++ lib.optionals enableDdc [ ddcutil ]
   ++ lib.optionals enableDpms [ libXext ]
diff --git a/pkgs/by-name/dk/dk/package.nix b/pkgs/by-name/dk/dk/package.nix
index f0bfbba4c528..d3bc13495cc9 100644
--- a/pkgs/by-name/dk/dk/package.nix
+++ b/pkgs/by-name/dk/dk/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchFromBitbucket,
-  xcbutil,
-  xcbutilkeysyms,
-  xcbutilwm,
-  xcb-util-cursor,
+  libxcb-util,
+  libxcb-keysyms,
+  libxcb-wm,
+  libxcb-cursor,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -20,10 +20,10 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    xcbutil
-    xcbutilkeysyms
-    xcbutilwm
-    xcb-util-cursor
+    libxcb-util
+    libxcb-keysyms
+    libxcb-wm
+    libxcb-cursor
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/do/dolphin-emu-primehack/package.nix b/pkgs/by-name/do/dolphin-emu-primehack/package.nix
index 0aea13b4ce0d..a15859c43049 100644
--- a/pkgs/by-name/do/dolphin-emu-primehack/package.nix
+++ b/pkgs/by-name/do/dolphin-emu-primehack/package.nix
@@ -16,14 +16,14 @@
   gettext,
   libGL,
   libGLU,
-  libSM,
+  libsm,
   libXdmcp,
   libXext,
   libXinerama,
   libXrandr,
   libXxf86vm,
   libao,
-  libpthreadstubs,
+  libpthread-stubs,
   libpulseaudio,
   libusb1,
   mbedtls,
@@ -86,14 +86,14 @@ stdenv.mkDerivation (finalAttrs: {
     gettext
     libGL
     libGLU
-    libSM
+    libsm
     libXdmcp
     libXext
     libXinerama
     libXrandr
     libXxf86vm
     libao
-    libpthreadstubs
+    libpthread-stubs
     libpulseaudio
     libusb1
     mbedtls
diff --git a/pkgs/by-name/dr/dreamchess/package.nix b/pkgs/by-name/dr/dreamchess/package.nix
index 6862666c8980..dca3b4a027d8 100644
--- a/pkgs/by-name/dr/dreamchess/package.nix
+++ b/pkgs/by-name/dr/dreamchess/package.nix
@@ -13,7 +13,7 @@
   expat,
   glew,
   freetype,
-  libSM,
+  libsm,
   libXext,
   libGL,
   libGLU,
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     expat
     glew
     freetype
-    libSM
+    libsm
     libXext
     libGL
     libGLU
diff --git a/pkgs/by-name/dr/drumgizmo/package.nix b/pkgs/by-name/dr/drumgizmo/package.nix
index b37e56fa9757..5b37f44fabb1 100644
--- a/pkgs/by-name/dr/drumgizmo/package.nix
+++ b/pkgs/by-name/dr/drumgizmo/package.nix
@@ -10,7 +10,7 @@
   libXext,
   libX11,
   libpng,
-  libpthreadstubs,
+  libpthread-stubs,
   libsmf,
   libsndfile,
   lv2,
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     libXext
     libX11
     libpng
-    libpthreadstubs
+    libpthread-stubs
     libsmf
     libsndfile
     lv2
diff --git a/pkgs/by-name/ds/dssi/package.nix b/pkgs/by-name/ds/dssi/package.nix
index 33af2d4792f9..f0861c5646b2 100644
--- a/pkgs/by-name/ds/dssi/package.nix
+++ b/pkgs/by-name/ds/dssi/package.nix
@@ -8,13 +8,13 @@
   alsa-lib,
   libX11,
   libsndfile,
-  libSM,
+  libsm,
   libsamplerate,
   libtool,
   autoconf,
   automake,
   xorgproto,
-  libICE,
+  libice,
   pkg-config,
 }:
 
@@ -43,11 +43,11 @@ stdenv.mkDerivation rec {
     alsa-lib
     libX11
     libsndfile
-    libSM
+    libsm
     libsamplerate
     libtool
     xorgproto
-    libICE
+    libice
   ];
 
   meta = {
diff --git a/pkgs/by-name/dw/dwl/package.nix b/pkgs/by-name/dw/dwl/package.nix
index 0c28d18fa496..748a464ad63e 100644
--- a/pkgs/by-name/dw/dwl/package.nix
+++ b/pkgs/by-name/dw/dwl/package.nix
@@ -16,7 +16,7 @@
   wayland-scanner,
   wlroots_0_18,
   writeText,
-  xcbutilwm,
+  libxcb-wm,
   xwayland,
   # Boolean flags
   enableXWayland ? true,
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals enableXWayland [
     libX11
-    xcbutilwm
+    libxcb-wm
     xwayland
   ];
 
diff --git a/pkgs/by-name/e1/e16/package.nix b/pkgs/by-name/e1/e16/package.nix
index d2e70a0beefa..96d3f75d26b1 100644
--- a/pkgs/by-name/e1/e16/package.nix
+++ b/pkgs/by-name/e1/e16/package.nix
@@ -5,7 +5,7 @@
   pkg-config,
   freetype,
   imlib2,
-  libSM,
+  libsm,
   libXcomposite,
   libXdamage,
   libXext,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     freetype
     imlib2
-    libSM
+    libsm
     libXcomposite
     libXdamage
     libXext
diff --git a/pkgs/by-name/em/embree/package.nix b/pkgs/by-name/em/embree/package.nix
index eb4519e13742..6a16aee8f1ed 100644
--- a/pkgs/by-name/em/embree/package.nix
+++ b/pkgs/by-name/em/embree/package.nix
@@ -10,7 +10,7 @@
   openimageio,
   libjpeg,
   libpng,
-  libpthreadstubs,
+  libpthread-stubs,
   libX11,
   glib,
 }:
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     libjpeg
     libpng
     libX11
-    libpthreadstubs
+    libpthread-stubs
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ glib ];
 
diff --git a/pkgs/by-name/ex/extremetuxracer/package.nix b/pkgs/by-name/ex/extremetuxracer/package.nix
index b2c6b1799f65..8c4f315ce370 100644
--- a/pkgs/by-name/ex/extremetuxracer/package.nix
+++ b/pkgs/by-name/ex/extremetuxracer/package.nix
@@ -14,8 +14,8 @@
   libXmu,
   libXext,
   libXt,
-  libSM,
-  libICE,
+  libsm,
+  libice,
   libpng,
   pkg-config,
   gettext,
@@ -48,8 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
     libXmu
     libXext
     libXt
-    libSM
-    libICE
+    libsm
+    libice
     libpng
     gettext
   ];
diff --git a/pkgs/by-name/fa/factorio/package.nix b/pkgs/by-name/fa/factorio/package.nix
index 62511cc4c77b..e8893ae7f1ae 100644
--- a/pkgs/by-name/fa/factorio/package.nix
+++ b/pkgs/by-name/fa/factorio/package.nix
@@ -4,8 +4,8 @@
   factorio-utils,
   fetchurl,
   libGL,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libX11,
   libXcursor,
   libXext,
@@ -242,8 +242,8 @@ let
       libPath = lib.makeLibraryPath [
         alsa-lib
         libGL
-        libICE
-        libSM
+        libice
+        libsm
         libX11
         libXcursor
         libXext
diff --git a/pkgs/by-name/fl/flightgear/package.nix b/pkgs/by-name/fl/flightgear/package.nix
index 19a427320bac..055af0bbdb2c 100644
--- a/pkgs/by-name/fl/flightgear/package.nix
+++ b/pkgs/by-name/fl/flightgear/package.nix
@@ -7,11 +7,11 @@
   freealut,
   libGLU,
   libGL,
-  libICE,
+  libice,
   libjpeg,
   openal,
   plib,
-  libSM,
+  libsm,
   libunwind,
   libX11,
   xorgproto,
@@ -75,12 +75,12 @@ stdenv.mkDerivation rec {
     freealut
     libGLU
     libGL
-    libICE
+    libice
     libjpeg
     openal
     openscenegraph
     plib
-    libSM
+    libsm
     libunwind
     libX11
     xorgproto
diff --git a/pkgs/by-name/fr/freeglut/package.nix b/pkgs/by-name/fr/freeglut/package.nix
index c6d5d0883f5d..028bb23b892a 100644
--- a/pkgs/by-name/fr/freeglut/package.nix
+++ b/pkgs/by-name/fr/freeglut/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libICE,
+  libice,
   libXext,
   libXi,
   libXrandr,
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [
-    libICE
+    libice
     libXext
     libXi
     libXrandr
diff --git a/pkgs/by-name/fr/freewheeling/package.nix b/pkgs/by-name/fr/freewheeling/package.nix
index 7d5c1f84ffa2..16d6e3104982 100644
--- a/pkgs/by-name/fr/freewheeling/package.nix
+++ b/pkgs/by-name/fr/freewheeling/package.nix
@@ -13,7 +13,7 @@
   alsa-lib,
   libjack2,
   libvorbis,
-  libSM,
+  libsm,
   libsndfile,
   libogg,
   libX11,
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     libvorbis
     libsndfile
     libogg
-    libSM
+    libsm
     libX11
     nettle
   ];
diff --git a/pkgs/by-name/fr/fricas/package.nix b/pkgs/by-name/fr/fricas/package.nix
index 8227890003a2..3f76a5ff11a6 100644
--- a/pkgs/by-name/fr/fricas/package.nix
+++ b/pkgs/by-name/fr/fricas/package.nix
@@ -5,8 +5,8 @@
   sbcl,
   libX11,
   libXpm,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libXt,
   libXau,
   libXdmcp,
@@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
     sbcl
     libX11
     libXpm
-    libICE
-    libSM
+    libice
+    libsm
     libXt
     libXau
     libXdmcp
diff --git a/pkgs/by-name/fv/fvwm3/package.nix b/pkgs/by-name/fv/fvwm3/package.nix
index 887001e5be72..41b13cffc17a 100644
--- a/pkgs/by-name/fv/fvwm3/package.nix
+++ b/pkgs/by-name/fv/fvwm3/package.nix
@@ -7,7 +7,7 @@
   fontconfig,
   freetype,
   fribidi,
-  libSM,
+  libsm,
   libX11,
   libXcursor,
   libXft,
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     fontconfig
     freetype
     fribidi
-    libSM
+    libsm
     libX11
     libXcursor
     libXft
diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix
index d81cb58d5295..ce03f3130dca 100644
--- a/pkgs/by-name/gd/gdm/package.nix
+++ b/pkgs/by-name/gd/gdm/package.nix
@@ -26,7 +26,7 @@
   gobject-introspection,
   plymouth,
   coreutils,
-  xorgserver,
+  xorg-server,
   dbus,
   nixos-icons,
   runCommand,
@@ -110,9 +110,9 @@ stdenv.mkDerivation (finalAttrs: {
       inherit
         coreutils
         plymouth
-        xorgserver
         dbus
         ;
+      xorgserver = xorg-server;
     })
 
     # The following patches implement certain environment variables in GDM which are set by
@@ -135,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     # Upstream checks some common paths to find an `X` binary. We already know it.
     echo #!/bin/sh > build-aux/find-x-server.sh
-    echo "echo ${lib.getBin xorgserver}/bin/X" >> build-aux/find-x-server.sh
+    echo "echo ${lib.getBin xorg-server}/bin/X" >> build-aux/find-x-server.sh
     patchShebangs build-aux/find-x-server.sh
 
     # Reverts https://gitlab.gnome.org/GNOME/gdm/-/commit/b0f802e36ff948a415bfd2bccaa268b6990515b7
diff --git a/pkgs/by-name/ge/geis/package.nix b/pkgs/by-name/ge/geis/package.nix
index 4e049ccbc44a..d2d1951c39fd 100644
--- a/pkgs/by-name/ge/geis/package.nix
+++ b/pkgs/by-name/ge/geis/package.nix
@@ -18,7 +18,7 @@
   libxext,
   libx11,
   pango,
-  xorgserver,
+  xorg-server,
   testers,
   validatePkgConfig,
 }:
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxtst
     pango
     python3Packages.python
-    xorgserver
+    xorg-server
   ];
 
   prePatch = ''
diff --git a/pkgs/by-name/gf/gfxreconstruct/package.nix b/pkgs/by-name/gf/gfxreconstruct/package.nix
index 93fe2235f906..67a11ffef607 100644
--- a/pkgs/by-name/gf/gfxreconstruct/package.nix
+++ b/pkgs/by-name/gf/gfxreconstruct/package.nix
@@ -11,7 +11,7 @@
   libxcb,
   lz4,
   vulkan-loader,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   zlib,
   zstd,
 }:
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     lz4
     python3
     wayland
-    xcbutilkeysyms
+    libxcb-keysyms
     zlib
     zstd
   ];
diff --git a/pkgs/by-name/gk/gkrellm/package.nix b/pkgs/by-name/gk/gkrellm/package.nix
index 9db44ac580f3..806d99f17a1d 100644
--- a/pkgs/by-name/gk/gkrellm/package.nix
+++ b/pkgs/by-name/gk/gkrellm/package.nix
@@ -7,8 +7,8 @@
   glib,
   gtk2,
   libX11,
-  libSM,
-  libICE,
+  libsm,
+  libice,
   which,
   copyDesktopItems,
   makeDesktopItem,
@@ -36,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtk2
     libX11
-    libSM
-    libICE
+    libsm
+    libice
   ];
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix
index 2d84429ee513..947aefe87b30 100644
--- a/pkgs/by-name/gn/gnome-control-center/package.nix
+++ b/pkgs/by-name/gn/gnome-control-center/package.nix
@@ -71,7 +71,7 @@
   gnome-user-share,
   gnome-remote-desktop,
   wrapGAppsHook4,
-  xorgserver,
+  xorg-server,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: {
     python3.pkgs.pygobject3 # for test-networkmanager-service.py
     python3.pkgs.python-dbusmock
     setxkbmap
-    xorgserver # for Xvfb
+    xorg-server # for Xvfb
   ];
 
   doCheck = true;
diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix
index 4fc3f41a0ed4..bcb2f7e15e56 100644
--- a/pkgs/by-name/gn/gnome-session/package.nix
+++ b/pkgs/by-name/gn/gnome-session/package.nix
@@ -17,7 +17,7 @@
   gnome-shell,
   dbus,
   json-glib,
-  libICE,
+  libice,
   xmlto,
   docbook_xsl,
   docbook_xml_dtd_45,
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     glib
     gtk4
-    libICE
+    libice
     gnome-desktop
     json-glib
     xtrans
diff --git a/pkgs/by-name/gr/gravit/package.nix b/pkgs/by-name/gr/gravit/package.nix
index ea3216dba79a..7b04fa94285a 100644
--- a/pkgs/by-name/gr/gravit/package.nix
+++ b/pkgs/by-name/gr/gravit/package.nix
@@ -6,8 +6,8 @@
   SDL,
   SDL_ttf,
   SDL_image,
-  libSM,
-  libICE,
+  libsm,
+  libice,
   libGLU,
   libGL,
   libpng,
@@ -46,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
     SDL_image
     lua5
     libpng
-    libSM
-    libICE
+    libsm
+    libice
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gr/gromit-mpx/package.nix b/pkgs/by-name/gr/gromit-mpx/package.nix
index fcd3148602a3..ea65d36cb5f2 100644
--- a/pkgs/by-name/gr/gromit-mpx/package.nix
+++ b/pkgs/by-name/gr/gromit-mpx/package.nix
@@ -7,7 +7,7 @@
   gtk3,
   glib,
   libappindicator-gtk3,
-  libpthreadstubs,
+  libpthread-stubs,
   libxdmcp,
   libxkbcommon,
   libepoxy,
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     glib
     libappindicator-gtk3
-    libpthreadstubs
+    libpthread-stubs
     libxdmcp
     libxkbcommon
     libepoxy
diff --git a/pkgs/by-name/gu/gummy/package.nix b/pkgs/by-name/gu/gummy/package.nix
index eb272661ea7a..ca89df1aa601 100644
--- a/pkgs/by-name/gu/gummy/package.nix
+++ b/pkgs/by-name/gu/gummy/package.nix
@@ -8,7 +8,7 @@
   libXext,
   sdbus-cpp,
   udev,
-  xcbutilimage,
+  libxcb-image,
   coreutils,
   cli11,
   ddcutil,
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     sdbus-cpp
     spdlog
     udev
-    xcbutilimage
+    libxcb-image
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/he/herbstluftwm/package.nix b/pkgs/by-name/he/herbstluftwm/package.nix
index 4f7b6fec3ab9..b33d446464d6 100644
--- a/pkgs/by-name/he/herbstluftwm/package.nix
+++ b/pkgs/by-name/he/herbstluftwm/package.nix
@@ -16,7 +16,7 @@
   freetype,
   asciidoc,
   xdotool,
-  xorgserver,
+  xorg-server,
   xsetroot,
   xterm,
   runtimeShell,
@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
       ]
     ))
     xdotool
-    xorgserver
+    xorg-server
     xsetroot
     xterm
     python3.pkgs.pytestCheckHook
diff --git a/pkgs/by-name/hu/hubstaff/package.nix b/pkgs/by-name/hu/hubstaff/package.nix
index afb7e2c9256f..776493e07b5a 100644
--- a/pkgs/by-name/hu/hubstaff/package.nix
+++ b/pkgs/by-name/hu/hubstaff/package.nix
@@ -6,8 +6,8 @@
   makeWrapper,
   libX11,
   zlib,
-  libSM,
-  libICE,
+  libsm,
+  libice,
   libXext,
   freetype,
   libXrender,
@@ -38,8 +38,8 @@ let
   rpath = lib.makeLibraryPath [
     libX11
     zlib
-    libSM
-    libICE
+    libsm
+    libice
     libXext
     freetype
     libXrender
diff --git a/pkgs/by-name/hy/hybridreverb2/package.nix b/pkgs/by-name/hy/hybridreverb2/package.nix
index 17588b42ccbe..20eb1f6fe840 100644
--- a/pkgs/by-name/hy/hybridreverb2/package.nix
+++ b/pkgs/by-name/hy/hybridreverb2/package.nix
@@ -11,7 +11,7 @@
   libX11,
   gtk3,
   pcre,
-  libpthreadstubs,
+  libpthread-stubs,
   libXdmcp,
   libxkbcommon,
   libepoxy,
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     libX11
     gtk3
     pcre
-    libpthreadstubs
+    libpthread-stubs
     libXdmcp
     libxkbcommon
     libepoxy
diff --git a/pkgs/by-name/ic/icesl/package.nix b/pkgs/by-name/ic/icesl/package.nix
index 636cebd144fb..a3a1bfae3d96 100644
--- a/pkgs/by-name/ic/icesl/package.nix
+++ b/pkgs/by-name/ic/icesl/package.nix
@@ -6,10 +6,10 @@
   libXmu,
   libXi,
   libX11,
-  libICE,
+  libice,
   libGLU,
   libGL,
-  libSM,
+  libsm,
   libXext,
   glibc,
   lua,
@@ -25,10 +25,10 @@ let
     libXi
     libX11
     libglut
-    libICE
+    libice
     libGLU
     libGL
-    libSM
+    libsm
     libXext
     glibc
     lua
diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix
index ddec31d3fbb3..bfa10432754d 100644
--- a/pkgs/by-name/ic/icewm/package.nix
+++ b/pkgs/by-name/ic/icewm/package.nix
@@ -14,8 +14,8 @@
   giflib,
   glib,
   imlib2,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libX11,
   libXcomposite,
   libXdamage,
@@ -29,7 +29,7 @@
   libjpeg,
   libogg,
   libpng,
-  libpthreadstubs,
+  libpthread-stubs,
   libsndfile,
   libtiff,
   libxcb,
@@ -71,8 +71,8 @@ gccStdenv.mkDerivation (finalAttrs: {
     giflib
     glib
     imlib2
-    libICE
-    libSM
+    libice
+    libsm
     libX11
     libXcomposite
     libXdamage
@@ -86,7 +86,7 @@ gccStdenv.mkDerivation (finalAttrs: {
     libjpeg
     libogg
     libpng
-    libpthreadstubs
+    libpthread-stubs
     libsndfile
     libtiff
     libxcb
diff --git a/pkgs/by-name/id/ideamaker/package.nix b/pkgs/by-name/id/ideamaker/package.nix
index 1711200a3c8a..087d701ea053 100644
--- a/pkgs/by-name/id/ideamaker/package.nix
+++ b/pkgs/by-name/id/ideamaker/package.nix
@@ -22,7 +22,7 @@
   shared-mime-info,
   stdenv,
   writeShellApplication,
-  xkeyboardconfig,
+  xkeyboard-config,
 }:
 let
   pname = "ideamaker";
@@ -86,7 +86,7 @@ stdenv.mkDerivation {
   preFixup = ''
     wrapProgram $out/bin/ideamaker \
       --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
-      --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \
+      --set QT_XKB_CONFIG_ROOT "${xkeyboard-config}/share/X11/xkb" \
       --set QTCOMPOSE "${libX11.out}/share/X11/locale" \
       --set KDEDIRS "$HOME/.nix-profile:/nix/var/nix/profiles/default" \
       --set NIX_REDIRECTS /usr/share=$out/share/
diff --git a/pkgs/by-name/in/infamousPlugins/package.nix b/pkgs/by-name/in/infamousPlugins/package.nix
index bf63c3781a9a..23d0fc4498db 100644
--- a/pkgs/by-name/in/infamousPlugins/package.nix
+++ b/pkgs/by-name/in/infamousPlugins/package.nix
@@ -6,7 +6,7 @@
   cairomm,
   cmake,
   lv2,
-  libpthreadstubs,
+  libpthread-stubs,
   libXdmcp,
   libXft,
   ntk,
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cairomm
     lv2
-    libpthreadstubs
+    libpthread-stubs
     libXdmcp
     libXft
     ntk
diff --git a/pkgs/by-name/in/input-leap/package.nix b/pkgs/by-name/in/input-leap/package.nix
index 329d388aec42..1432e0a04cc2 100644
--- a/pkgs/by-name/in/input-leap/package.nix
+++ b/pkgs/by-name/in/input-leap/package.nix
@@ -4,8 +4,8 @@
   fetchFromGitHub,
   cmake,
   curl,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libX11,
   libXdmcp,
   libXext,
@@ -55,8 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
     libXinerama
     libXrandr
     libXdmcp
-    libICE
-    libSM
+    libice
+    libsm
   ]
   ++ lib.optionals withLibei [
     libei
diff --git a/pkgs/by-name/in/intel-gpu-tools/package.nix b/pkgs/by-name/in/intel-gpu-tools/package.nix
index 276c675a0cc1..7ee4a89e01c0 100644
--- a/pkgs/by-name/in/intel-gpu-tools/package.nix
+++ b/pkgs/by-name/in/intel-gpu-tools/package.nix
@@ -12,7 +12,7 @@
   meson,
   ninja,
   pkg-config,
-  utilmacros,
+  util-macros,
 
   # runtime
   alsa-lib,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     pkg-config
-    utilmacros
+    util-macros
   ];
 
   buildInputs = [
diff --git a/pkgs/by-name/in/intel-media-sdk/package.nix b/pkgs/by-name/in/intel-media-sdk/package.nix
index dd04951d2fac..ed5d7f982ea6 100644
--- a/pkgs/by-name/in/intel-media-sdk/package.nix
+++ b/pkgs/by-name/in/intel-media-sdk/package.nix
@@ -11,7 +11,7 @@
   libX11,
   libXau,
   libXdmcp,
-  libpthreadstubs,
+  libpthread-stubs,
   fetchpatch,
 }:
 
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     libX11
     libXau
     libXdmcp
-    libpthreadstubs
+    libpthread-stubs
   ];
   nativeCheckInputs = [ gtest ];
 
diff --git a/pkgs/by-name/io/io/package.nix b/pkgs/by-name/io/io/package.nix
index 03f1c5ad7fe5..1bce2be773cb 100644
--- a/pkgs/by-name/io/io/package.nix
+++ b/pkgs/by-name/io/io/package.nix
@@ -29,7 +29,7 @@
   openssl,
   glfw,
   pkg-config,
-  libpthreadstubs,
+  libpthread-stubs,
   libXdmcp,
   libmemcached,
 }:
@@ -87,7 +87,7 @@ stdenv.mkDerivation {
     yajl
     glfw
     openssl
-    libpthreadstubs
+    libpthread-stubs
     libXdmcp
     libmemcached
     python3
diff --git a/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix b/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix
index e8ce78821b61..573072b2f013 100644
--- a/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix
+++ b/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix
@@ -12,7 +12,7 @@
   ladspa-sdk,
   libxcb,
   lv2,
-  xcbutilwm,
+  libxcb-wm,
   libxcb-util,
   zita-convolver,
   zita-resampler,
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     ladspa-sdk
     libxcb
     lv2
-    xcbutilwm
+    libxcb-wm
     libxcb-util
     zita-convolver
     zita-resampler
diff --git a/pkgs/by-name/ki/kicad/base.nix b/pkgs/by-name/ki/kicad/base.nix
index a52799550842..3dcee6002355 100644
--- a/pkgs/by-name/ki/kicad/base.nix
+++ b/pkgs/by-name/ki/kicad/base.nix
@@ -18,7 +18,7 @@
   pkg-config,
   doxygen,
   graphviz,
-  libpthreadstubs,
+  libpthread-stubs,
   libXdmcp,
   unixODBC,
   libgit2,
@@ -164,7 +164,7 @@ stdenv.mkDerivation (finalAttrs: {
     gettext
     glew
     glm
-    libpthreadstubs
+    libpthread-stubs
     cairo
     curl
     openssl
diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix
index 7c7c9bc4db8a..c39d3e161152 100644
--- a/pkgs/by-name/la/labwc/package.nix
+++ b/pkgs/by-name/la/labwc/package.nix
@@ -23,7 +23,7 @@
   wayland-protocols,
   wayland-scanner,
   wlroots_0_19,
-  xcbutilwm,
+  libxcb-wm,
   xwayland,
 }:
 
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland
     wayland-protocols
     wlroots_0_19
-    xcbutilwm
+    libxcb-wm
     xwayland
   ];
 
diff --git a/pkgs/by-name/li/libdrm/package.nix b/pkgs/by-name/li/libdrm/package.nix
index ae6d16ccac3d..87a968eed0a1 100644
--- a/pkgs/by-name/li/libdrm/package.nix
+++ b/pkgs/by-name/li/libdrm/package.nix
@@ -6,7 +6,7 @@
   meson,
   ninja,
   docutils,
-  libpthreadstubs,
+  libpthread-stubs,
   withIntel ? lib.meta.availableOn stdenv.hostPlatform libpciaccess,
   libpciaccess,
   withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light && !stdenv.cc.isClang,
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     docutils
   ];
   buildInputs = [
-    libpthreadstubs
+    libpthread-stubs
   ]
   ++ lib.optional withIntel libpciaccess
   ++ lib.optional withValgrind valgrind-light;
diff --git a/pkgs/by-name/li/libepoxy/package.nix b/pkgs/by-name/li/libepoxy/package.nix
index ba41e23ae2f1..c10f2392279d 100644
--- a/pkgs/by-name/li/libepoxy/package.nix
+++ b/pkgs/by-name/li/libepoxy/package.nix
@@ -5,7 +5,7 @@
   meson,
   ninja,
   pkg-config,
-  utilmacros,
+  util-macros,
   python3,
   libGL,
   libX11,
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     pkg-config
-    utilmacros
+    util-macros
     python3
   ];
 
diff --git a/pkgs/by-name/li/libmatchbox/package.nix b/pkgs/by-name/li/libmatchbox/package.nix
index 70ec8514213b..9eedb7d2d29d 100644
--- a/pkgs/by-name/li/libmatchbox/package.nix
+++ b/pkgs/by-name/li/libmatchbox/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   autoreconfHook,
-  libICE,
+  libice,
   libjpeg,
   libpng,
   libX11,
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
   ];
   propagatedBuildInputs = [
-    libICE
+    libice
     libjpeg
     libpng
     libX11
diff --git a/pkgs/by-name/li/librearp-lv2/package.nix b/pkgs/by-name/li/librearp-lv2/package.nix
index c1ee31ca9d1c..a1a0900ee3f1 100644
--- a/pkgs/by-name/li/librearp-lv2/package.nix
+++ b/pkgs/by-name/li/librearp-lv2/package.nix
@@ -6,9 +6,9 @@
   pkg-config,
   cairo,
   libxkbcommon,
-  xcbutilcursor,
-  xcbutilkeysyms,
-  xcbutil,
+  libxcb-cursor,
+  libxcb-keysyms,
+  libxcb-util,
   libXrandr,
   libXinerama,
   libXcursor,
@@ -38,9 +38,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cairo
     libxkbcommon
-    xcbutilcursor
-    xcbutilkeysyms
-    xcbutil
+    libxcb-cursor
+    libxcb-keysyms
+    libxcb-util
     libXrandr
     libXinerama
     libXcursor
diff --git a/pkgs/by-name/li/librearp/package.nix b/pkgs/by-name/li/librearp/package.nix
index 72f167fbe727..e1bc9b01086c 100644
--- a/pkgs/by-name/li/librearp/package.nix
+++ b/pkgs/by-name/li/librearp/package.nix
@@ -6,9 +6,9 @@
   pkg-config,
   cairo,
   libxkbcommon,
-  xcbutilcursor,
-  xcbutilkeysyms,
-  xcbutil,
+  libxcb-cursor,
+  libxcb-keysyms,
+  libxcb-util,
   libXrandr,
   libXinerama,
   libXcursor,
@@ -38,9 +38,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     cairo
     libxkbcommon
-    xcbutilcursor
-    xcbutilkeysyms
-    xcbutil
+    libxcb-cursor
+    libxcb-keysyms
+    libxcb-util
     libXrandr
     libXinerama
     libXcursor
diff --git a/pkgs/by-name/li/libstartup_notification/package.nix b/pkgs/by-name/li/libstartup_notification/package.nix
index fd308cde106c..a1a00404d835 100644
--- a/pkgs/by-name/li/libstartup_notification/package.nix
+++ b/pkgs/by-name/li/libstartup_notification/package.nix
@@ -5,7 +5,7 @@
   libX11,
   libxcb,
   pkg-config,
-  xcbutil,
+  libxcb-util,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libX11
     libxcb
-    xcbutil
+    libxcb-util
   ];
 
   meta = {
diff --git a/pkgs/by-name/li/libvdpau-va-gl/package.nix b/pkgs/by-name/li/libvdpau-va-gl/package.nix
index fd71b4049bdc..e380334562de 100644
--- a/pkgs/by-name/li/libvdpau-va-gl/package.nix
+++ b/pkgs/by-name/li/libvdpau-va-gl/package.nix
@@ -5,7 +5,7 @@
   cmake,
   pkg-config,
   libX11,
-  libpthreadstubs,
+  libpthread-stubs,
   libXau,
   libXdmcp,
   libXext,
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     libX11
-    libpthreadstubs
+    libpthread-stubs
     libXau
     libXdmcp
     libXext
diff --git a/pkgs/by-name/li/libxfce4ui/package.nix b/pkgs/by-name/li/libxfce4ui/package.nix
index c809c5cd15d6..0a580612e1a0 100644
--- a/pkgs/by-name/li/libxfce4ui/package.nix
+++ b/pkgs/by-name/li/libxfce4ui/package.nix
@@ -7,8 +7,8 @@
   pkg-config,
   xfce4-dev-tools,
   wrapGAppsHook3,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libepoxy,
   libgtop,
   libgudev,
@@ -55,8 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    libICE
-    libSM
+    libice
+    libsm
     libepoxy
     libgtop
     libgudev
diff --git a/pkgs/by-name/li/lincity/package.nix b/pkgs/by-name/li/lincity/package.nix
index b399b8c0427c..3082377791e9 100644
--- a/pkgs/by-name/li/lincity/package.nix
+++ b/pkgs/by-name/li/lincity/package.nix
@@ -7,8 +7,8 @@
   libX11,
   libXext,
   xorgproto,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libpng12,
   zlib,
 }:
@@ -25,9 +25,9 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ gettext ];
 
   buildInputs = [
-    libICE
+    libice
     libpng12
-    libSM
+    libsm
     libX11
     libXext
     xorgproto
diff --git a/pkgs/by-name/li/lirc/package.nix b/pkgs/by-name/li/lirc/package.nix
index 3d53db781544..bef5a9bbcbc4 100644
--- a/pkgs/by-name/li/lirc/package.nix
+++ b/pkgs/by-name/li/lirc/package.nix
@@ -14,8 +14,8 @@
   systemd,
   libusb-compat-0_1,
   libftdi1,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libX11,
 }:
 
@@ -90,8 +90,8 @@ stdenv.mkDerivation rec {
     systemd
     libusb-compat-0_1
     libftdi1
-    libICE
-    libSM
+    libice
+    libsm
     libX11
   ];
 
diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix
index 093043be1999..6320250049e2 100644
--- a/pkgs/by-name/lm/lms/package.nix
+++ b/pkgs/by-name/lm/lms/package.nix
@@ -13,8 +13,8 @@
   graphicsmagick,
   ffmpeg,
   zlib,
-  libSM,
-  libICE,
+  libsm,
+  libice,
   stb,
   openssl,
   xxHash,
@@ -47,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
     graphicsmagick
     ffmpeg
     zlib
-    libSM
-    libICE
+    libsm
+    libice
     stb
     openssl
     xxHash
diff --git a/pkgs/by-name/lu/luastatus/package.nix b/pkgs/by-name/lu/luastatus/package.nix
index c38a269f0121..826d2dba15e7 100644
--- a/pkgs/by-name/lu/luastatus/package.nix
+++ b/pkgs/by-name/lu/luastatus/package.nix
@@ -24,8 +24,8 @@
   docutils,
   libxcb,
   libX11,
-  xcbutil,
-  xcbutilwm,
+  libxcb-util,
+  libxcb-wm,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -48,8 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libxcb
     libX11
-    xcbutil
-    xcbutilwm
+    libxcb-util
+    libxcb-wm
     libXdmcp
     libXau
     libpulseaudio
diff --git a/pkgs/by-name/lu/lunacy/package.nix b/pkgs/by-name/lu/lunacy/package.nix
index e5770012c882..231d32a5f13a 100644
--- a/pkgs/by-name/lu/lunacy/package.nix
+++ b/pkgs/by-name/lu/lunacy/package.nix
@@ -10,8 +10,8 @@
   libX11,
   lttng-ust,
   icu,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libXcursor,
   openssl,
   imagemagick,
@@ -35,8 +35,8 @@ stdenv.mkDerivation (finalAttrs: {
     fontconfig.lib
 
     # Runtime deps
-    libICE
-    libSM
+    libice
+    libsm
     libX11
     libXcursor
   ];
@@ -63,8 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   # will add to the RPATH of executable only
   runtimeDependencies = [
-    libICE
-    libSM
+    libice
+    libsm
     libX11
     libXcursor
   ];
diff --git a/pkgs/by-name/lu/lutris-unwrapped/package.nix b/pkgs/by-name/lu/lutris-unwrapped/package.nix
index a06c8fb92384..3846f9245415 100644
--- a/pkgs/by-name/lu/lutris-unwrapped/package.nix
+++ b/pkgs/by-name/lu/lutris-unwrapped/package.nix
@@ -32,7 +32,7 @@
   gettext,
   libstrangle,
   fluidsynth,
-  xorgserver,
+  xorg-server,
   xkbcomp,
   setxkbmap,
   util-linux,
@@ -54,7 +54,7 @@ let
     xgamma
     libstrangle
     fluidsynth
-    xorgserver
+    xorg-server
     setxkbmap
     xkbcomp
     # bypass mount suid wrapper which does not work in fhsenv
diff --git a/pkgs/by-name/lw/lwm/package.nix b/pkgs/by-name/lw/lwm/package.nix
index f47078b09d5b..a26ba20cdbd3 100644
--- a/pkgs/by-name/lw/lwm/package.nix
+++ b/pkgs/by-name/lw/lwm/package.nix
@@ -4,9 +4,9 @@
   fetchurl,
   imake,
   libX11,
-  libSM,
+  libsm,
   libXext,
-  libICE,
+  libice,
 }:
 
 stdenv.mkDerivation rec {
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libX11
-    libSM
+    libsm
     libXext
-    libICE
+    libice
   ];
 
   dontConfigure = true;
diff --git a/pkgs/by-name/ma/magma/package.nix b/pkgs/by-name/ma/magma/package.nix
index 75b9b70e5f97..dbf04424be14 100644
--- a/pkgs/by-name/ma/magma/package.nix
+++ b/pkgs/by-name/ma/magma/package.nix
@@ -11,7 +11,7 @@
   rocmPackages,
   lapack,
   lib,
-  libpthreadstubs,
+  libpthread-stubs,
   ninja,
   perl,
   python3,
@@ -198,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   buildInputs = [
-    libpthreadstubs
+    libpthread-stubs
     lapack
     blas
     python3
diff --git a/pkgs/by-name/ma/mangowc/package.nix b/pkgs/by-name/ma/mangowc/package.nix
index 88e87d30d75e..1a0bb75f0a1d 100644
--- a/pkgs/by-name/ma/mangowc/package.nix
+++ b/pkgs/by-name/ma/mangowc/package.nix
@@ -12,7 +12,7 @@
   wayland,
   wayland-protocols,
   wayland-scanner,
-  xcbutilwm,
+  libxcb-wm,
   xwayland,
   enableXWayland ? true,
   meson,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals enableXWayland [
     libX11
-    xcbutilwm
+    libxcb-wm
     xwayland
   ];
 
diff --git a/pkgs/by-name/ma/mathematica/generic.nix b/pkgs/by-name/ma/mathematica/generic.nix
index 3c38de14a67f..5c6e1c747e32 100644
--- a/pkgs/by-name/ma/mathematica/generic.nix
+++ b/pkgs/by-name/ma/mathematica/generic.nix
@@ -42,8 +42,8 @@
   pciutils,
   tre,
   unixODBC,
-  xcbutilimage,
-  xcbutilkeysyms,
+  libxcb-image,
+  libxcb-keysyms,
   xkeyboard_config,
   libxtst,
   libxscrnsaver,
@@ -127,8 +127,8 @@ stdenv.mkDerivation {
     pciutils
     tre
     unixODBC
-    xcbutilimage
-    xcbutilkeysyms
+    libxcb-image
+    libxcb-keysyms
     xkeyboard_config
     libice
     libsm
diff --git a/pkgs/by-name/mc/mc/package.nix b/pkgs/by-name/mc/mc/package.nix
index f2ebadea851b..8d96a6db3423 100644
--- a/pkgs/by-name/mc/mc/package.nix
+++ b/pkgs/by-name/mc/mc/package.nix
@@ -8,7 +8,7 @@
   gpm,
   file,
   e2fsprogs,
-  libICE,
+  libice,
   perl,
   zip,
   unzip,
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     file
     gettext
     glib
-    libICE
+    libice
     libssh2
     openssl
     slang
diff --git a/pkgs/by-name/me/mediainfo-gui/package.nix b/pkgs/by-name/me/mediainfo-gui/package.nix
index 860d44195592..878c491e45ee 100644
--- a/pkgs/by-name/me/mediainfo-gui/package.nix
+++ b/pkgs/by-name/me/mediainfo-gui/package.nix
@@ -7,7 +7,7 @@
   libmediainfo,
   wxGTK32,
   desktop-file-utils,
-  libSM,
+  libsm,
   imagemagick,
   wrapGAppsHook3,
 }:
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     libmediainfo
     wxGTK32
     desktop-file-utils
-    libSM
+    libsm
     imagemagick
   ];
 
diff --git a/pkgs/by-name/mp/mpv-unwrapped/package.nix b/pkgs/by-name/mp/mpv-unwrapped/package.nix
index 80193dc6af98..19b44bbc49a6 100644
--- a/pkgs/by-name/mp/mpv-unwrapped/package.nix
+++ b/pkgs/by-name/mp/mpv-unwrapped/package.nix
@@ -30,7 +30,7 @@
   libdvdnav,
   libjack2,
   libplacebo,
-  libpthreadstubs,
+  libpthread-stubs,
   libpulseaudio,
   libsixel,
   libuchardet,
@@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: {
     freetype
     libass
     libplacebo
-    libpthreadstubs
+    libpthread-stubs
     libuchardet
     luaEnv
     python3
diff --git a/pkgs/by-name/mu/muffin/package.nix b/pkgs/by-name/mu/muffin/package.nix
index f249d6ad4d31..eac0caef6cee 100644
--- a/pkgs/by-name/mu/muffin/package.nix
+++ b/pkgs/by-name/mu/muffin/package.nix
@@ -36,7 +36,7 @@
   wayland-protocols,
   wayland-scanner,
   wrapGAppsHook3,
-  xorgserver,
+  xorg-server,
   xwayland,
   zenity,
 }:
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     pkg-config
     python3
     wrapGAppsHook3
-    xorgserver # for cvt command
+    xorg-server # for cvt command
     gobject-introspection
     wayland-scanner
   ];
diff --git a/pkgs/by-name/mu/muse-sounds-manager/package.nix b/pkgs/by-name/mu/muse-sounds-manager/package.nix
index ab19be802e90..c99e4a7ca42d 100644
--- a/pkgs/by-name/mu/muse-sounds-manager/package.nix
+++ b/pkgs/by-name/mu/muse-sounds-manager/package.nix
@@ -10,8 +10,8 @@
   libXext,
   libXi,
   libXrandr,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   openssl,
   unzip,
   xdg-utils,
@@ -52,8 +52,8 @@ stdenv.mkDerivation rec {
     libXext
     libXi
     libXrandr
-    libICE
-    libSM
+    libice
+    libsm
     openssl
   ];
 
diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix
index 7dce4468738a..b070d0e0a709 100644
--- a/pkgs/by-name/mu/mutter/package.nix
+++ b/pkgs/by-name/mu/mutter/package.nix
@@ -49,12 +49,12 @@
   pipewire,
   libgudev,
   libwacom,
-  libSM,
+  libsm,
   xwayland,
   mesa-gl-headers,
   meson,
   gnome-settings-daemon,
-  xorgserver,
+  xorg-server,
   python3,
   wayland-scanner,
   wrapGAppsHook4,
@@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-scanner
     wrapGAppsHook4
     gi-docgen
-    xorgserver
+    xorg-server
     gobject-introspection
     udevCheckHook
   ];
@@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
     libinput
     libstartup_notification
     libwacom
-    libSM
+    libsm
     colord
     lcms2
     pango
diff --git a/pkgs/by-name/mu/mutter48/package.nix b/pkgs/by-name/mu/mutter48/package.nix
index 17c973d1751d..f52fdde8852a 100644
--- a/pkgs/by-name/mu/mutter48/package.nix
+++ b/pkgs/by-name/mu/mutter48/package.nix
@@ -18,7 +18,7 @@
   libadwaita,
   libxcvt,
   libGL,
-  libICE,
+  libice,
   libX11,
   libXcomposite,
   libXcursor,
@@ -49,12 +49,12 @@
   pipewire,
   libgudev,
   libwacom,
-  libSM,
+  libsm,
   xwayland,
   mesa-gl-headers,
   meson,
   gnome-settings-daemon,
-  xorgserver,
+  xorg-server,
   python3,
   wayland-scanner,
   wrapGAppsHook4,
@@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-scanner
     wrapGAppsHook4
     gi-docgen
-    xorgserver
+    xorg-server
     gobject-introspection
     udevCheckHook
   ];
@@ -146,7 +146,7 @@ stdenv.mkDerivation (finalAttrs: {
     libinput
     libstartup_notification
     libwacom
-    libSM
+    libsm
     colord
     lcms2
     pango
@@ -158,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-protocols
     # X11 client
     gtk4
-    libICE
+    libice
     libX11
     libXcomposite
     libXcursor
diff --git a/pkgs/by-name/na/nas/package.nix b/pkgs/by-name/na/nas/package.nix
index 779bd289595b..7bdcdad85e25 100644
--- a/pkgs/by-name/na/nas/package.nix
+++ b/pkgs/by-name/na/nas/package.nix
@@ -11,7 +11,7 @@
   libXext,
   libXpm,
   libXt,
-  xorgcffiles,
+  xorg-cf-files,
   xorgproto,
 }:
 
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postInstall = ''
-    mv $out/${xorgcffiles}/* $out
+    mv $out/${xorg-cf-files}/* $out
     rm -fr $out/nix
   '';
 
diff --git a/pkgs/by-name/ne/neko/package.nix b/pkgs/by-name/ne/neko/package.nix
index 649bb8db3d22..b2702962fc73 100644
--- a/pkgs/by-name/ne/neko/package.nix
+++ b/pkgs/by-name/ne/neko/package.nix
@@ -16,7 +16,7 @@
   mbedtls,
   openssl,
   gtk3,
-  libpthreadstubs,
+  libpthread-stubs,
   nix-update-script,
 }:
 
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     libmysqlclient
     mbedtls
     openssl
-    libpthreadstubs
+    libpthread-stubs
   ]
   ++ lib.optional stdenv.hostPlatform.isLinux gtk3;
   cmakeFlags = [ "-DRUN_LDCONFIG=OFF" ];
diff --git a/pkgs/by-name/no/notion/package.nix b/pkgs/by-name/no/notion/package.nix
index b53dcd200445..fd823a4bd993 100644
--- a/pkgs/by-name/no/notion/package.nix
+++ b/pkgs/by-name/no/notion/package.nix
@@ -6,7 +6,7 @@
   fontconfig,
   gettext,
   groff,
-  libSM,
+  libsm,
   libX11,
   libXext,
   libXft,
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     fontconfig
-    libSM
+    libsm
     libX11
     libXext
     libXft
diff --git a/pkgs/by-name/nx/nxwitness-client/package.nix b/pkgs/by-name/nx/nxwitness-client/package.nix
index e34b7081d4d9..419f8c7976a2 100644
--- a/pkgs/by-name/nx/nxwitness-client/package.nix
+++ b/pkgs/by-name/nx/nxwitness-client/package.nix
@@ -17,10 +17,10 @@
   openal,
   qt6Packages,
   wayland,
-  xcbutilimage,
-  xcbutilkeysyms,
-  xcbutilrenderutil,
-  xcbutilwm,
+  libxcb-image,
+  libxcb-keysyms,
+  libxcb-render-util,
+  libxcb-wm,
 }:
 let
   version = "6.0.6";
@@ -45,10 +45,10 @@ let
     qt6Packages.qtwebsockets
     qt6Packages.qtwebview
     wayland
-    xcbutilimage
-    xcbutilkeysyms
-    xcbutilrenderutil
-    xcbutilwm
+    libxcb-image
+    libxcb-keysyms
+    libxcb-render-util
+    libxcb-wm
   ];
 
   meta = {
diff --git a/pkgs/by-name/ob/obconf/package.nix b/pkgs/by-name/ob/obconf/package.nix
index e35e4d2fc7f1..48e02703fbc6 100644
--- a/pkgs/by-name/ob/obconf/package.nix
+++ b/pkgs/by-name/ob/obconf/package.nix
@@ -7,7 +7,7 @@
   wrapGAppsHook3,
   gtk3,
   imlib2,
-  libSM,
+  libsm,
   libstartup_notification,
   libxml2,
   openbox,
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     gtk3
     imlib2
-    libSM
+    libsm
     libstartup_notification
     libxml2
     openbox
diff --git a/pkgs/by-name/op/openbox/package.nix b/pkgs/by-name/op/openbox/package.nix
index a72c078b3999..0929d85f8aef 100644
--- a/pkgs/by-name/op/openbox/package.nix
+++ b/pkgs/by-name/op/openbox/package.nix
@@ -11,8 +11,8 @@
   libXcursor,
   libXau,
   libXrandr,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   imlib2,
   pango,
   libstartup_notification,
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
     libXcursor
     libXau
     libXrandr
-    libICE
-    libSM
+    libice
+    libsm
     libstartup_notification
     python3
   ];
diff --git a/pkgs/by-name/op/openrct2/package.nix b/pkgs/by-name/op/openrct2/package.nix
index 9c176a9b2222..f23dcfd47d29 100644
--- a/pkgs/by-name/op/openrct2/package.nix
+++ b/pkgs/by-name/op/openrct2/package.nix
@@ -22,7 +22,7 @@
   libiconv,
   libogg,
   libpng,
-  libpthreadstubs,
+  libpthread-stubs,
   libvorbis,
   libzip,
   nlohmann_json,
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     libiconv
     libogg
     libpng
-    libpthreadstubs
+    libpthread-stubs
     libvorbis
     libzip
     nlohmann_json
diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix
index 5e6d54e1a958..4340ae1f6002 100644
--- a/pkgs/by-name/op/openscad-unstable/package.nix
+++ b/pkgs/by-name/op/openscad-unstable/package.nix
@@ -25,8 +25,8 @@
   hidapi,
   lib3mf,
   libGLU,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libsForQt5,
   libspnav,
   libzip,
@@ -107,8 +107,8 @@ clangStdenv.mkDerivation rec {
     ]
     ++ lib.optionals clangStdenv.hostPlatform.isLinux [
       libxdmcp
-      libICE
-      libSM
+      libice
+      libsm
       wayland
       wayland-protocols
       qtwayland
diff --git a/pkgs/by-name/pa/pa_applet/package.nix b/pkgs/by-name/pa/pa_applet/package.nix
index d6c801cee1fe..227f1bdd374b 100644
--- a/pkgs/by-name/pa/pa_applet/package.nix
+++ b/pkgs/by-name/pa/pa_applet/package.nix
@@ -10,7 +10,7 @@
   automake,
   libnotify,
   libX11,
-  xf86inputevdev,
+  xf86-input-evdev,
 }:
 
 stdenv.mkDerivation {
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
     glibc
     libnotify
     libX11
-    xf86inputevdev
+    xf86-input-evdev
   ];
 
   preConfigure = ''
diff --git a/pkgs/by-name/pa/pari/package.nix b/pkgs/by-name/pa/pari/package.nix
index 74d700b358e0..1c46403914c6 100644
--- a/pkgs/by-name/pa/pari/package.nix
+++ b/pkgs/by-name/pa/pari/package.nix
@@ -4,14 +4,14 @@
   fetchurl,
   gmp,
   libX11,
-  libpthreadstubs,
+  libpthread-stubs,
   perl,
   readline,
   texliveBasic,
   withThread ? true,
 }:
 
-assert withThread -> libpthreadstubs != null;
+assert withThread -> libpthread-stubs != null;
 
 stdenv.mkDerivation rec {
   pname = "pari";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     texliveBasic
   ]
   ++ lib.optionals withThread [
-    libpthreadstubs
+    libpthread-stubs
   ];
 
   configureScript = "./Configure";
diff --git a/pkgs/by-name/pi/picom/package.nix b/pkgs/by-name/pi/picom/package.nix
index f1a0b3076827..c3579e63b692 100644
--- a/pkgs/by-name/pi/picom/package.nix
+++ b/pkgs/by-name/pi/picom/package.nix
@@ -24,9 +24,9 @@
   pkg-config,
   stdenv,
   uthash,
-  xcbutil,
-  xcbutilimage,
-  xcbutilrenderutil,
+  libxcb-util,
+  libxcb-image,
+  libxcb-render-util,
   xorgproto,
   xwininfo,
   withDebug ? false,
@@ -74,9 +74,9 @@ stdenv.mkDerivation (finalAttrs: {
     pcre2
     pixman
     uthash
-    xcbutil
-    xcbutilimage
-    xcbutilrenderutil
+    libxcb-util
+    libxcb-image
+    libxcb-render-util
     xorgproto
   ];
 
diff --git a/pkgs/by-name/pi/pixieditor/package.nix b/pkgs/by-name/pi/pixieditor/package.nix
index cb836ae71fee..1a48c79d4fc2 100644
--- a/pkgs/by-name/pi/pixieditor/package.nix
+++ b/pkgs/by-name/pi/pixieditor/package.nix
@@ -14,8 +14,8 @@
   openssl,
   libGL,
   libX11,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libXi,
   libXcursor,
   libXext,
@@ -103,8 +103,8 @@ buildDotnetModule (finalAttrs: {
     openssl
     libGL
     libX11
-    libICE
-    libSM
+    libice
+    libsm
     libXi
     libXcursor
     libXext
diff --git a/pkgs/by-name/pl/plib/package.nix b/pkgs/by-name/pl/plib/package.nix
index 858a5fd2491f..4cd1730d0362 100644
--- a/pkgs/by-name/pl/plib/package.nix
+++ b/pkgs/by-name/pl/plib/package.nix
@@ -8,7 +8,7 @@
   libglut,
   SDL,
   libXi,
-  libSM,
+  libsm,
   libXmu,
   libXext,
   libX11,
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
     # The following libs ought to be propagated build inputs of Mesa.
     libXi
-    libSM
+    libsm
     libXmu
     libXext
     libX11
diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix
index 72b4c5017305..6adee06b5ff5 100644
--- a/pkgs/by-name/po/polybar/package.nix
+++ b/pkgs/by-name/po/polybar/package.nix
@@ -6,7 +6,7 @@
   fetchpatch,
   libuv,
   libXdmcp,
-  libpthreadstubs,
+  libpthread-stubs,
   libxcb,
   pcre,
   pkg-config,
@@ -15,11 +15,11 @@
   lib,
   stdenv,
   xcbproto,
-  xcbutil,
-  xcbutilcursor,
-  xcbutilimage,
-  xcbutilrenderutil,
-  xcbutilwm,
+  libxcb-util,
+  libxcb-cursor,
+  libxcb-image,
+  libxcb-render-util,
+  libxcb-wm,
   xcbutilxrm,
   makeWrapper,
   removeReferencesTo,
@@ -66,16 +66,16 @@ stdenv.mkDerivation (finalAttrs: {
     cairo
     libuv
     libXdmcp
-    libpthreadstubs
+    libpthread-stubs
     libxcb
     pcre
     python3
     xcbproto
-    xcbutil
-    xcbutilcursor
-    xcbutilimage
-    xcbutilrenderutil
-    xcbutilwm
+    libxcb-util
+    libxcb-cursor
+    libxcb-image
+    libxcb-render-util
+    libxcb-wm
     xcbutilxrm
   ]
   ++ lib.optional alsaSupport alsa-lib
diff --git a/pkgs/by-name/po/povray/package.nix b/pkgs/by-name/po/povray/package.nix
index 9dd19ef88e2a..dd99c2ef343f 100644
--- a/pkgs/by-name/po/povray/package.nix
+++ b/pkgs/by-name/po/povray/package.nix
@@ -7,8 +7,8 @@
   boost,
   zlib,
   libX11,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libpng,
   libjpeg,
   libtiff,
@@ -36,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     boost
     libX11
-    libICE
-    libSM
+    libice
+    libsm
     libpng
     libjpeg
     libtiff
diff --git a/pkgs/by-name/qt/qtox/package.nix b/pkgs/by-name/qt/qtox/package.nix
index 75c5eacc3f23..a63ce14c9b86 100644
--- a/pkgs/by-name/qt/qtox/package.nix
+++ b/pkgs/by-name/qt/qtox/package.nix
@@ -7,7 +7,7 @@
   perl,
   kdePackages,
   libtoxcore,
-  libpthreadstubs,
+  libpthread-stubs,
   libXdmcp,
   libXScrnSaver,
   ffmpeg,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     kdePackages.sonnet
     libtoxcore
-    libpthreadstubs
+    libpthread-stubs
     libXdmcp
     libXScrnSaver
     ffmpeg
diff --git a/pkgs/by-name/qu/quartz-wm/package.nix b/pkgs/by-name/qu/quartz-wm/package.nix
index 65b3708a7f1b..324533c5cc29 100644
--- a/pkgs/by-name/qu/quartz-wm/package.nix
+++ b/pkgs/by-name/qu/quartz-wm/package.nix
@@ -7,7 +7,7 @@
   pkg-config,
   util-macros,
   libXinerama,
-  libAppleWM,
+  libapplewm,
   xorgproto,
   libXrandr,
   libXext,
@@ -31,7 +31,7 @@ clangStdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     libXinerama
-    libAppleWM
+    libapplewm
     xorgproto
     libXrandr
     libXext
diff --git a/pkgs/by-name/re/remmina/package.nix b/pkgs/by-name/re/remmina/package.nix
index 7f40f0f8d9b3..0c6e0e9dab7d 100644
--- a/pkgs/by-name/re/remmina/package.nix
+++ b/pkgs/by-name/re/remmina/package.nix
@@ -23,7 +23,7 @@
   libdbusmenu-gtk3,
   libappindicator-gtk3,
   libvncserver,
-  libpthreadstubs,
+  libpthread-stubs,
   libXdmcp,
   libxkbcommon,
   libsecret,
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
     gnutls
     pcre2
     libvncserver
-    libpthreadstubs
+    libpthread-stubs
     libXdmcp
     libxkbcommon
     libsoup_3
diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix
index 085a3f7c1d71..5eb038d83252 100644
--- a/pkgs/by-name/re/renderdoc/package.nix
+++ b/pkgs/by-name/re/renderdoc/package.nix
@@ -9,7 +9,7 @@
   fetchpatch,
   libXdmcp,
   libglvnd,
-  libpthreadstubs,
+  libpthread-stubs,
   makeWrapper,
   nix-update-script,
   pcre,
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libXdmcp
-    libpthreadstubs
+    libpthread-stubs
     python312Packages.pyside2
     python312Packages.pyside2-tools
     python312Packages.shiboken2
diff --git a/pkgs/by-name/ri/rigsofrods-bin/package.nix b/pkgs/by-name/ri/rigsofrods-bin/package.nix
index 31a0701f7f82..bae73c216e5f 100644
--- a/pkgs/by-name/ri/rigsofrods-bin/package.nix
+++ b/pkgs/by-name/ri/rigsofrods-bin/package.nix
@@ -6,8 +6,8 @@
   makeWrapper,
   unzip,
   libGL,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libX11,
   libXrandr,
   zlib,
@@ -33,8 +33,8 @@ stdenv.mkDerivation {
 
   buildInputs = [
     libGL
-    libICE
-    libSM
+    libice
+    libsm
     libX11
     libXrandr
     stdenv.cc.cc
diff --git a/pkgs/by-name/ro/rofi-unwrapped/package.nix b/pkgs/by-name/ro/rofi-unwrapped/package.nix
index 49c485e1385d..c47e3a2bef96 100644
--- a/pkgs/by-name/ro/rofi-unwrapped/package.nix
+++ b/pkgs/by-name/ro/rofi-unwrapped/package.nix
@@ -24,10 +24,10 @@
   wayland-scanner,
   which,
   xcb-imdkit,
-  xcbutil,
-  xcb-util-cursor,
-  xcbutilkeysyms,
-  xcbutilwm,
+  libxcb-util,
+  libxcb-cursor,
+  libxcb-keysyms,
+  libxcb-wm,
   xcbutilxrm,
   waylandSupport ? true,
   x11Support ? true,
@@ -87,10 +87,10 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals x11Support [
     libxcb
     xcb-imdkit
-    xcbutil
-    xcb-util-cursor
-    xcbutilkeysyms
-    xcbutilwm
+    libxcb-util
+    libxcb-cursor
+    libxcb-keysyms
+    libxcb-wm
     xcbutilxrm
   ];
 
diff --git a/pkgs/by-name/ro/rox-filer/package.nix b/pkgs/by-name/ro/rox-filer/package.nix
index 5e362ccdaef9..38691d8cc796 100644
--- a/pkgs/by-name/ro/rox-filer/package.nix
+++ b/pkgs/by-name/ro/rox-filer/package.nix
@@ -7,7 +7,7 @@
   wrapGAppsHook3,
   libxml2,
   gtk2,
-  libSM,
+  libsm,
   shared-mime-info,
 }:
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxml2
     gtk2
     shared-mime-info
-    libSM
+    libsm
   ];
 
   env = {
diff --git a/pkgs/by-name/ro/roxterm/package.nix b/pkgs/by-name/ro/roxterm/package.nix
index 8f66925bb3fb..0c0a7f281104 100644
--- a/pkgs/by-name/ro/roxterm/package.nix
+++ b/pkgs/by-name/ro/roxterm/package.nix
@@ -12,7 +12,7 @@
   libXdmcp,
   libXtst,
   libepoxy,
-  libpthreadstubs,
+  libpthread-stubs,
   libselinux,
   libsepol,
   libtasn1,
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXdmcp
     libXtst
     libepoxy
-    libpthreadstubs
+    libpthread-stubs
     libselinux
     libsepol
     libtasn1
diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix
index b192f4ccfb7d..e9d92c320dd3 100644
--- a/pkgs/by-name/rp/rpcs3/package.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -12,7 +12,7 @@
   vulkan-headers,
   vulkan-loader,
   libpng,
-  libSM,
+  libsm,
   ffmpeg,
   libevdev,
   libusb1,
@@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: {
     sdl3
     flatbuffers
     llvm_18
-    libSM
+    libsm
     opencv.cxxdev
     cubeb
     miniupnpc
diff --git a/pkgs/by-name/ru/runescape/package.nix b/pkgs/by-name/ru/runescape/package.nix
index f45dbb9458dc..8b357475ebf1 100644
--- a/pkgs/by-name/ru/runescape/package.nix
+++ b/pkgs/by-name/ru/runescape/package.nix
@@ -12,7 +12,7 @@
   gtk2-x11,
   libGL,
   libpulseaudio,
-  libSM,
+  libsm,
   libXxf86vm,
   libx11,
   openssl_1_1,
@@ -48,7 +48,7 @@ let
       glib
       glibc
       gtk2-x11
-      libSM
+      libsm
       libXxf86vm
       libx11
       openssl_1_1
@@ -123,7 +123,7 @@ buildFHSEnv {
     gtk2-x11
     libGL
     libpulseaudio
-    libSM
+    libsm
     libXxf86vm
     libx11
     openssl_1_1
diff --git a/pkgs/by-name/ry/ryubing/package.nix b/pkgs/by-name/ry/ryubing/package.nix
index 25f193b56a88..b386c9aad439 100644
--- a/pkgs/by-name/ry/ryubing/package.nix
+++ b/pkgs/by-name/ry/ryubing/package.nix
@@ -17,8 +17,8 @@
   vulkan-loader,
   glew,
   libGL,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libXcursor,
   libXext,
   libXi,
@@ -70,8 +70,8 @@ buildDotnetModule rec {
 
     # Avalonia UI
     glew
-    libICE
-    libSM
+    libice
+    libsm
     libXcursor
     libXext
     libXi
diff --git a/pkgs/by-name/sa/saleae-logic/package.nix b/pkgs/by-name/sa/saleae-logic/package.nix
index 4a6c6a36aac9..a10d428f773c 100644
--- a/pkgs/by-name/sa/saleae-logic/package.nix
+++ b/pkgs/by-name/sa/saleae-logic/package.nix
@@ -12,8 +12,8 @@
   fetchurl,
   unzip,
   glib,
-  libSM,
-  libICE,
+  libsm,
+  libice,
   gtk2,
   libXext,
   libXft,
@@ -30,7 +30,7 @@
   zlib,
   pciutils,
   makeDesktopItem,
-  xkeyboardconfig,
+  xkeyboard-config,
   dbus,
   runtimeShell,
   libGL,
@@ -40,8 +40,8 @@ let
 
   libPath = lib.makeLibraryPath [
     glib
-    libSM
-    libICE
+    libsm
+    libice
     gtk2
     libXext
     libXft
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
     cat > "$out/bin/saleae-logic" << EOF
     #!${runtimeShell}
     export LD_PRELOAD="$out/lib/preload.so"
-    export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"
+    export QT_XKB_CONFIG_ROOT="${xkeyboard-config}/share/X11/xkb"
     export PATH="${pciutils}/bin:\$PATH"
     exec "$out/Logic" "\$@"
     EOF
diff --git a/pkgs/by-name/sa/sawfish/package.nix b/pkgs/by-name/sa/sawfish/package.nix
index aa1e8290dc70..9f75c6fc2b0e 100644
--- a/pkgs/by-name/sa/sawfish/package.nix
+++ b/pkgs/by-name/sa/sawfish/package.nix
@@ -6,8 +6,8 @@
   gdk-pixbuf-xlib,
   gettext,
   gtk2-x11,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libxcrypt,
   libXinerama,
   libXrandr,
@@ -46,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     gdk-pixbuf-xlib
     gtk2-x11
-    libICE
-    libSM
+    libice
+    libsm
     libxcrypt
     libXinerama
     libXrandr
diff --git a/pkgs/by-name/sc/scenefx/package.nix b/pkgs/by-name/sc/scenefx/package.nix
index 1ba9df2cf31f..0b0466ea1f43 100644
--- a/pkgs/by-name/sc/scenefx/package.nix
+++ b/pkgs/by-name/sc/scenefx/package.nix
@@ -15,7 +15,7 @@
   libGL,
   libgbm,
   libxcb,
-  xcbutilwm,
+  libxcb-wm,
   validatePkgConfig,
   testers,
   wayland-scanner,
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxkbcommon
     libgbm
     libxcb
-    xcbutilwm
+    libxcb-wm
     pixman
     wayland
     wayland-protocols
diff --git a/pkgs/by-name/se/segger-ozone/package.nix b/pkgs/by-name/se/segger-ozone/package.nix
index 40417d0004a7..3eba28100d6d 100644
--- a/pkgs/by-name/se/segger-ozone/package.nix
+++ b/pkgs/by-name/se/segger-ozone/package.nix
@@ -6,8 +6,8 @@
   copyDesktopItems,
   fontconfig,
   freetype,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libX11,
   libXcursor,
   libXfixes,
@@ -35,8 +35,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     fontconfig
     freetype
-    libICE
-    libSM
+    libice
+    libsm
     libX11
     libXcursor
     libXfixes
diff --git a/pkgs/by-name/se/selinux-sandbox/package.nix b/pkgs/by-name/se/selinux-sandbox/package.nix
index c6202e84ffea..b4c624e5f26b 100644
--- a/pkgs/by-name/se/selinux-sandbox/package.nix
+++ b/pkgs/by-name/se/selinux-sandbox/package.nix
@@ -9,7 +9,7 @@
   policycoreutils,
   selinux-python,
   dbus,
-  xorgserver,
+  xorg-server,
   openbox,
   xmodmap,
   libselinux,
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     libcap_ng
     policycoreutils
     python3
-    xorgserver
+    xorg-server
     openbox
     xmodmap
     dbus
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
       --replace "#!/bin/sh" "#!${bash}/bin/sh" \
       --replace "/usr/share/sandbox/start" "${placeholder "out"}/share/sandbox/start" \
       --replace "/usr/bin/cut" "${coreutils}/bin/cut" \
-      --replace "/usr/bin/Xephyr" "${xorgserver}/bin/Xepyhr" \
+      --replace "/usr/bin/Xephyr" "${xorg-server}/bin/Xepyhr" \
       --replace "secon" "${policycoreutils}/bin/secon"
     substituteInPlace sandbox \
       --replace "/usr/sbin/seunshare" "$out/bin/seunshare" \
diff --git a/pkgs/by-name/sf/sfml/package.nix b/pkgs/by-name/sf/sfml/package.nix
index 214289478f3e..00ee98350a60 100644
--- a/pkgs/by-name/sf/sfml/package.nix
+++ b/pkgs/by-name/sf/sfml/package.nix
@@ -20,7 +20,7 @@
   libXcursor,
   libXrandr,
   libXrender,
-  xcbutilimage,
+  libxcb-image,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXcursor
     libXrandr
     libXrender
-    xcbutilimage
+    libxcb-image
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/sf/sfml_2/package.nix b/pkgs/by-name/sf/sfml_2/package.nix
index f18d872c830d..060cb935fcd0 100644
--- a/pkgs/by-name/sf/sfml_2/package.nix
+++ b/pkgs/by-name/sf/sfml_2/package.nix
@@ -18,7 +18,7 @@
   libXcursor,
   libXrandr,
   libXrender,
-  xcbutilimage,
+  libxcb-image,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "sfml";
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXcursor
     libXrandr
     libXrender
-    xcbutilimage
+    libxcb-image
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/si/simgear/package.nix b/pkgs/by-name/si/simgear/package.nix
index e19359c316e5..101230bf241d 100644
--- a/pkgs/by-name/si/simgear/package.nix
+++ b/pkgs/by-name/si/simgear/package.nix
@@ -8,8 +8,8 @@
   libX11,
   libXext,
   libXi,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libXt,
   libXmu,
   libGLU,
@@ -49,8 +49,8 @@ stdenv.mkDerivation (finalAttrs: {
     libX11
     libXext
     libXi
-    libICE
-    libSM
+    libice
+    libsm
     libXt
     libXmu
     libGLU
diff --git a/pkgs/by-name/sl/slop/package.nix b/pkgs/by-name/sl/slop/package.nix
index da7536f4f2e0..1d4987633000 100644
--- a/pkgs/by-name/sl/slop/package.nix
+++ b/pkgs/by-name/sl/slop/package.nix
@@ -12,7 +12,7 @@
   libXext,
   libXrender,
   icu74,
-  libSM,
+  libsm,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXext
     libXrender
     icu74
-    libSM
+    libsm
   ];
 
   meta = {
diff --git a/pkgs/by-name/sp/space-station-14-launcher/package.nix b/pkgs/by-name/sp/space-station-14-launcher/package.nix
index d2b30d91ea90..55b9cf96b391 100644
--- a/pkgs/by-name/sp/space-station-14-launcher/package.nix
+++ b/pkgs/by-name/sp/space-station-14-launcher/package.nix
@@ -9,8 +9,8 @@
   copyDesktopItems,
   makeDesktopItem,
   libX11,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libXi,
   libXcursor,
   libXext,
@@ -87,8 +87,8 @@ buildDotnetModule rec {
     freetype
     glib
     libX11
-    libICE
-    libSM
+    libice
+    libsm
     libXi
     libXcursor
     libXext
diff --git a/pkgs/by-name/sp/spectrwm/package.nix b/pkgs/by-name/sp/spectrwm/package.nix
index 97e930bf1fc0..c7cb34ce513c 100644
--- a/pkgs/by-name/sp/spectrwm/package.nix
+++ b/pkgs/by-name/sp/spectrwm/package.nix
@@ -8,9 +8,9 @@
   libXcursor,
   libXft,
   libXt,
-  xcbutil,
-  xcbutilkeysyms,
-  xcbutilwm,
+  libxcb-util,
+  libxcb-keysyms,
+  libxcb-wm,
   writeShellScript,
   curl,
   jq,
@@ -34,9 +34,9 @@ stdenv.mkDerivation (finalAttrs: {
     libXcursor
     libXft
     libXt
-    xcbutil
-    xcbutilkeysyms
-    xcbutilwm
+    libxcb-util
+    libxcb-keysyms
+    libxcb-wm
     libbsd
   ];
 
diff --git a/pkgs/by-name/sp/speed-dreams/package.nix b/pkgs/by-name/sp/speed-dreams/package.nix
index 9db2623d7374..936b3547b319 100644
--- a/pkgs/by-name/sp/speed-dreams/package.nix
+++ b/pkgs/by-name/sp/speed-dreams/package.nix
@@ -11,8 +11,8 @@
   libXrandr,
   xorgproto,
   libXext,
-  libSM,
-  libICE,
+  libsm,
+  libice,
   libXi,
   libXt,
   libXrender,
@@ -51,8 +51,8 @@ let
     freealut
     libXrandr
     libXext
-    libSM
-    libICE
+    libsm
+    libice
     libXi
     libXt
     libXrender
@@ -140,8 +140,8 @@ stdenv.mkDerivation (finalAttrs: {
     libXrandr
     xorgproto
     libXext
-    libSM
-    libICE
+    libsm
+    libice
     libXi
     libXt
     libXrender
diff --git a/pkgs/by-name/sp/spideroak/package.nix b/pkgs/by-name/sp/spideroak/package.nix
index 38fd69606ebc..4cc19a53bc5d 100644
--- a/pkgs/by-name/sp/spideroak/package.nix
+++ b/pkgs/by-name/sp/spideroak/package.nix
@@ -7,8 +7,8 @@
   fontconfig,
   freetype,
   glib,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libX11,
   libXext,
   libXrender,
@@ -22,8 +22,8 @@ let
     fontconfig
     freetype
     glib
-    libICE
-    libSM
+    libice
+    libsm
     libX11
     libXext
     libXrender
diff --git a/pkgs/by-name/st/strawberry/package.nix b/pkgs/by-name/st/strawberry/package.nix
index 69b8f90c8761..e6c79790a329 100644
--- a/pkgs/by-name/st/strawberry/package.nix
+++ b/pkgs/by-name/st/strawberry/package.nix
@@ -15,7 +15,7 @@
   libebur128,
   libidn2,
   libmtp,
-  libpthreadstubs,
+  libpthread-stubs,
   libpulseaudio,
   libselinux,
   libsepol,
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
     libebur128
     libidn2
     libmtp
-    libpthreadstubs
+    libpthread-stubs
     libtasn1
     qt6.qtbase
     sqlite
diff --git a/pkgs/by-name/su/superTux/package.nix b/pkgs/by-name/su/superTux/package.nix
index 4055f7323f60..472ffd65ed0a 100644
--- a/pkgs/by-name/su/superTux/package.nix
+++ b/pkgs/by-name/su/superTux/package.nix
@@ -8,7 +8,7 @@
   curl,
   SDL2,
   SDL2_image,
-  libSM,
+  libsm,
   libXext,
   libpng,
   freetype,
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     SDL2
     SDL2_image
-    libSM
+    libsm
     libXext
     libpng
     freetype
diff --git a/pkgs/by-name/su/supercell-wx/package.nix b/pkgs/by-name/su/supercell-wx/package.nix
index 34e274c8c2c0..9631281f6046 100644
--- a/pkgs/by-name/su/supercell-wx/package.nix
+++ b/pkgs/by-name/su/supercell-wx/package.nix
@@ -21,7 +21,7 @@
   glm,
   gtest,
   howard-hinnant-date,
-  libSM,
+  libsm,
   libcpr,
   libpng,
   onetbb,
@@ -134,7 +134,7 @@ buildStdenv.mkDerivation (finalAttrs: {
     glm
     gtest
     howard-hinnant-date
-    libSM
+    libsm
     libcpr
     libpng
     onetbb
diff --git a/pkgs/by-name/su/surge/package.nix b/pkgs/by-name/su/surge/package.nix
index 6d8734803635..505c2755f0c4 100644
--- a/pkgs/by-name/su/surge/package.nix
+++ b/pkgs/by-name/su/surge/package.nix
@@ -12,9 +12,9 @@
   libsndfile,
   libxcb,
   libxkbcommon,
-  xcbutil,
-  xcbutilcursor,
-  xcbutilkeysyms,
+  libxcb-util,
+  libxcb-cursor,
+  libxcb-keysyms,
   zenity,
   curl,
   rsync,
@@ -62,9 +62,9 @@ stdenv.mkDerivation (finalAttrs: {
     libsndfile
     libxcb
     libxkbcommon
-    xcbutil
-    xcbutilcursor
-    xcbutilkeysyms
+    libxcb-util
+    libxcb-cursor
+    libxcb-keysyms
     zenity
     curl
     rsync
diff --git a/pkgs/by-name/su/survex/package.nix b/pkgs/by-name/su/survex/package.nix
index 64392cae34ae..e4609f1a1c36 100644
--- a/pkgs/by-name/su/survex/package.nix
+++ b/pkgs/by-name/su/survex/package.nix
@@ -5,7 +5,7 @@
   ffmpeg,
   glib,
   libGLU,
-  libICE,
+  libice,
   libX11,
   libgbm,
   perl,
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     # (#233265); is it required for anything?
     libGLU
     libgbm
-    libICE
+    libice
     libX11
   ];
 
diff --git a/pkgs/by-name/sw/swayfx-unwrapped/package.nix b/pkgs/by-name/sw/swayfx-unwrapped/package.nix
index 6192c86efad2..3fda6fd4c897 100644
--- a/pkgs/by-name/sw/swayfx-unwrapped/package.nix
+++ b/pkgs/by-name/sw/swayfx-unwrapped/package.nix
@@ -24,7 +24,7 @@
   scdoc,
   scenefx,
   wayland-scanner,
-  xcbutilwm,
+  libxcb-wm,
   wlroots_0_19,
   testers,
   nixosTests,
@@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-protocols
     (wlroots_0_19.override { inherit (finalAttrs) enableXWayland; })
   ]
-  ++ lib.optionals finalAttrs.enableXWayland [ xcbutilwm ];
+  ++ lib.optionals finalAttrs.enableXWayland [ libxcb-wm ];
 
   mesonFlags =
     let
diff --git a/pkgs/by-name/sw/swi-prolog/package.nix b/pkgs/by-name/sw/swi-prolog/package.nix
index ee6745c234a3..23fb6516d913 100644
--- a/pkgs/by-name/sw/swi-prolog/package.nix
+++ b/pkgs/by-name/sw/swi-prolog/package.nix
@@ -40,7 +40,7 @@
   libXinerama,
   libjpeg,
   libXt,
-  libSM,
+  libsm,
   freetype,
   fontconfig,
 
@@ -108,7 +108,7 @@ let
       libXft
       libXinerama
       libjpeg
-      libSM
+      libsm
       freetype
       fontconfig
     ])
diff --git a/pkgs/by-name/sx/sxhkd/package.nix b/pkgs/by-name/sx/sxhkd/package.nix
index 3a454b69034e..d7e9cf4abff0 100644
--- a/pkgs/by-name/sx/sxhkd/package.nix
+++ b/pkgs/by-name/sx/sxhkd/package.nix
@@ -5,9 +5,9 @@
   fetchpatch,
   asciidoc,
   libxcb,
-  xcbutil,
-  xcbutilkeysyms,
-  xcbutilwm,
+  libxcb-util,
+  libxcb-keysyms,
+  libxcb-wm,
   nixosTests,
 }:
 
@@ -34,9 +34,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    xcbutil
-    xcbutilkeysyms
-    xcbutilwm
+    libxcb-util
+    libxcb-keysyms
+    libxcb-wm
   ];
 
   strictDeps = true;
diff --git a/pkgs/by-name/sy/synaesthesia/package.nix b/pkgs/by-name/sy/synaesthesia/package.nix
index f4e14474bca4..9defac42f914 100644
--- a/pkgs/by-name/sy/synaesthesia/package.nix
+++ b/pkgs/by-name/sy/synaesthesia/package.nix
@@ -4,7 +4,7 @@
   fetchzip,
   SDL,
   pkg-config,
-  libSM,
+  libsm,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "synaesthesia";
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     SDL
-    libSM
+    libsm
   ];
 
   meta = {
diff --git a/pkgs/by-name/sy/synergy/package.nix b/pkgs/by-name/sy/synergy/package.nix
index 9f4663e3942d..c7ab360d0e81 100644
--- a/pkgs/by-name/sy/synergy/package.nix
+++ b/pkgs/by-name/sy/synergy/package.nix
@@ -13,15 +13,15 @@
   pkg-config,
   gdk-pixbuf,
   libnotify,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libX11,
   libxkbfile,
   libXi,
   libXtst,
   libXrandr,
   libXinerama,
-  xkeyboardconfig,
+  xkeyboard-config,
   xinput,
   avahi-compat,
   libsForQt5,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
   ''
   + lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace src/lib/synergy/unix/AppUtilUnix.cpp \
-      --replace-fail "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml"
+      --replace-fail "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboard-config}/share/X11/xkb/rules/evdev.xml"
   '';
 
   nativeBuildInputs = [
@@ -71,8 +71,8 @@ stdenv.mkDerivation (finalAttrs: {
     util-linux
     libselinux
     libsepol
-    libICE
-    libSM
+    libice
+    libsm
     libX11
     libXi
     libXtst
diff --git a/pkgs/by-name/te/tenacity/package.nix b/pkgs/by-name/te/tenacity/package.nix
index 4f9fbbc5348a..b191502d57ec 100644
--- a/pkgs/by-name/te/tenacity/package.nix
+++ b/pkgs/by-name/te/tenacity/package.nix
@@ -41,7 +41,7 @@
   libepoxy,
   libXdmcp,
   libXtst,
-  libpthreadstubs,
+  libpthread-stubs,
   libselinux,
   libsepol,
   libxkbcommon,
@@ -168,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: {
     libepoxy
     libXdmcp
     libXtst
-    libpthreadstubs
+    libpthread-stubs
     libxkbcommon
     libselinux
     libsepol
diff --git a/pkgs/by-name/ti/tint2/package.nix b/pkgs/by-name/ti/tint2/package.nix
index 976badf097d8..127f53c1c5e2 100644
--- a/pkgs/by-name/ti/tint2/package.nix
+++ b/pkgs/by-name/ti/tint2/package.nix
@@ -18,7 +18,7 @@
   libX11,
   libXrandr,
   librsvg,
-  libpthreadstubs,
+  libpthread-stubs,
   libXdmcp,
   libstartup_notification,
   wrapGAppsHook3,
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     libX11
     libXrandr
     librsvg
-    libpthreadstubs
+    libpthread-stubs
     libXdmcp
     libstartup_notification
   ];
diff --git a/pkgs/by-name/tk/tkmm/package.nix b/pkgs/by-name/tk/tkmm/package.nix
index 081b4a09d8c5..83da8700efbb 100644
--- a/pkgs/by-name/tk/tkmm/package.nix
+++ b/pkgs/by-name/tk/tkmm/package.nix
@@ -8,8 +8,8 @@
   libX11,
   glew,
   libGL,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libXcursor,
   libXext,
   libXi,
@@ -50,8 +50,8 @@ buildDotnetModule (finalAttrs: {
     libX11
     libGL
     glew
-    libICE
-    libSM
+    libice
+    libsm
     libXcursor
     libXext
     libXi
diff --git a/pkgs/by-name/to/torcs/package.nix b/pkgs/by-name/to/torcs/package.nix
index b3e79ea0b51e..7912a04c0d88 100644
--- a/pkgs/by-name/to/torcs/package.nix
+++ b/pkgs/by-name/to/torcs/package.nix
@@ -12,8 +12,8 @@
   libXrandr,
   xorgproto,
   libXext,
-  libSM,
-  libICE,
+  libsm,
+  libice,
   libXi,
   libXt,
   libXrender,
@@ -60,8 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
     libXrandr
     xorgproto
     libXext
-    libSM
-    libICE
+    libsm
+    libice
     libXi
     libXt
     libXrender
diff --git a/pkgs/by-name/tr/transcribe/package.nix b/pkgs/by-name/tr/transcribe/package.nix
index bbb95e135321..ae8f70a66568 100644
--- a/pkgs/by-name/tr/transcribe/package.nix
+++ b/pkgs/by-name/tr/transcribe/package.nix
@@ -13,7 +13,7 @@
   glib,
   gst_all_1,
   gtk3,
-  libSM,
+  libsm,
   libX11,
   libXtst,
   libpng12,
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
       alsa-lib
       libX11
       libXtst
-      libSM
+      libsm
       libpng12
       gstreamer
       gst-plugins-base
diff --git a/pkgs/by-name/uh/uhhyou-plugins/package.nix b/pkgs/by-name/uh/uhhyou-plugins/package.nix
index f24ffa197b58..fbc7aa820fe3 100644
--- a/pkgs/by-name/uh/uhhyou-plugins/package.nix
+++ b/pkgs/by-name/uh/uhhyou-plugins/package.nix
@@ -9,9 +9,9 @@
   fontconfig,
   freetype,
   libxcb,
-  xcbutil,
+  libxcb-util,
   libxcb-cursor,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxkbcommon,
   libX11,
   libXrandr,
@@ -44,9 +44,9 @@ stdenv.mkDerivation (finalAttrs: {
     fontconfig
     freetype
     libxcb
-    xcbutil
+    libxcb-util
     libxcb-cursor
-    xcbutilkeysyms
+    libxcb-keysyms
     libxkbcommon
     libX11
     libXrandr
diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix
index 772503549fea..22eda1bbf2cd 100644
--- a/pkgs/by-name/vi/vivaldi/package.nix
+++ b/pkgs/by-name/vi/vivaldi/package.nix
@@ -6,8 +6,8 @@
   zlib,
   libX11,
   libXext,
-  libSM,
-  libICE,
+  libsm,
+  libice,
   libxkbcommon,
   libxshmfence,
   libXfixes,
@@ -107,8 +107,8 @@ stdenv.mkDerivation rec {
     libX11
     libXt
     libXext
-    libSM
-    libICE
+    libsm
+    libice
     libxcb
     libxkbcommon
     libxshmfence
diff --git a/pkgs/by-name/vk/vkmark/package.nix b/pkgs/by-name/vk/vkmark/package.nix
index 4ef602d4d7fc..3c35f06203ac 100644
--- a/pkgs/by-name/vk/vkmark/package.nix
+++ b/pkgs/by-name/vk/vkmark/package.nix
@@ -13,7 +13,7 @@
   glm,
   assimp,
   libxcb,
-  xcbutilwm,
+  libxcb-wm,
   nix-update-script,
 }:
 
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     glm
     assimp
     libxcb
-    xcbutilwm
+    libxcb-wm
     wayland
     wayland-protocols
   ];
diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix
index 94af6b973cc7..2ad8eba462cc 100644
--- a/pkgs/by-name/vl/vlc/package.nix
+++ b/pkgs/by-name/vl/vlc/package.nix
@@ -21,7 +21,7 @@
   gnutls,
   harfbuzz,
   libGL,
-  libSM,
+  libsm,
   libXext,
   libXinerama,
   libXpm,
@@ -83,7 +83,7 @@
   wayland-scanner,
   wrapGAppsHook3,
   writeShellScript,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   zlib,
 
   chromecastSupport ? true,
@@ -150,7 +150,7 @@ stdenv.mkDerivation (finalAttrs: {
     gnutls
     harfbuzz
     libGL
-    libSM
+    libsm
     libarchive
     libass
     libbluray-full
@@ -193,7 +193,7 @@ stdenv.mkDerivation (finalAttrs: {
     srt
     systemdLibs
     taglib_1
-    xcbutilkeysyms
+    libxcb-keysyms
     zlib
   ]
   ++ optionals (!onlyLibVLC) [ live555 ]
diff --git a/pkgs/by-name/vn/vncrec/package.nix b/pkgs/by-name/vn/vncrec/package.nix
index 859d202c7e2e..e5f8e60a236b 100644
--- a/pkgs/by-name/vn/vncrec/package.nix
+++ b/pkgs/by-name/vn/vncrec/package.nix
@@ -10,8 +10,8 @@
   libXmu,
   libXaw,
   libXext,
-  libSM,
-  libICE,
+  libsm,
+  libice,
   libXpm,
   libXp,
 }:
@@ -47,8 +47,8 @@ stdenv.mkDerivation {
     libXmu
     libXaw
     libXext
-    libSM
-    libICE
+    libsm
+    libice
     libXpm
     libXp
   ];
diff --git a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
index 6e2a6f298ed3..9e37fe8a0099 100644
--- a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
+++ b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
@@ -15,8 +15,8 @@
   pkg-config,
   wayland,
   which,
-  xcbutilkeysyms,
-  xcbutilwm,
+  libxcb-keysyms,
+  libxcb-wm,
   valijson,
   vulkan-headers,
   vulkan-loader,
@@ -58,8 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-loader
     vulkan-utility-libraries
     wayland
-    xcbutilkeysyms
-    xcbutilwm
+    libxcb-keysyms
+    libxcb-wm
     qt6.qtbase
     qt6.qtwayland
   ];
diff --git a/pkgs/by-name/we/webex/package.nix b/pkgs/by-name/we/webex/package.nix
index 4514c110313c..3834e5e1db41 100644
--- a/pkgs/by-name/we/webex/package.nix
+++ b/pkgs/by-name/we/webex/package.nix
@@ -44,11 +44,11 @@
   libXrender,
   libXtst,
   libxshmfence,
-  xcbutil,
-  xcbutilimage,
-  xcbutilkeysyms,
-  xcbutilrenderutil,
-  xcbutilwm,
+  libxcb-util,
+  libxcb-image,
+  libxcb-keysyms,
+  libxcb-render-util,
+  libxcb-wm,
   p7zip,
   onetbb,
   wayland,
@@ -110,12 +110,12 @@ stdenv.mkDerivation rec {
     libXrender
     libXtst
     libxshmfence
-    xcbutil
-    xcbutilimage
+    libxcb-util
+    libxcb-image
     libXScrnSaver
-    xcbutilkeysyms
-    xcbutilrenderutil
-    xcbutilwm
+    libxcb-keysyms
+    libxcb-render-util
+    libxcb-wm
     onetbb
     wayland
   ];
diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix
index 7970ca56c2c5..f6c89f75e50e 100644
--- a/pkgs/by-name/we/wechat-uos/package.nix
+++ b/pkgs/by-name/we/wechat-uos/package.nix
@@ -28,10 +28,10 @@
   atkmm,
   libdrm,
   libxkbcommon,
-  xcbutilwm,
-  xcbutilimage,
-  xcbutilkeysyms,
-  xcbutilrenderutil,
+  libxcb-wm,
+  libxcb-image,
+  libxcb-keysyms,
+  libxcb-render-util,
   libgbm,
   alsa-lib,
   wayland,
@@ -84,10 +84,10 @@ let
     stdenv.cc.libc
     pango
     zlib
-    xcbutilwm
-    xcbutilimage
-    xcbutilkeysyms
-    xcbutilrenderutil
+    libxcb-wm
+    libxcb-image
+    libxcb-keysyms
+    libxcb-render-util
     libx11
     libxt
     libxext
diff --git a/pkgs/by-name/we/weston/package.nix b/pkgs/by-name/we/weston/package.nix
index 1ed7c54d6364..fe1c81ce22a2 100644
--- a/pkgs/by-name/we/weston/package.nix
+++ b/pkgs/by-name/we/weston/package.nix
@@ -19,7 +19,7 @@
   seatd,
   wayland,
   wayland-protocols,
-  xcbutilcursor,
+  libxcb-cursor,
 
   demoSupport ? true,
   jpegSupport ? true,
@@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional webpSupport libwebp
   ++ lib.optionals xwaylandSupport [
     libXcursor
-    xcbutilcursor
+    libxcb-cursor
     xwayland
   ];
 
diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix
index 57db01c1ab11..f025c6940b10 100644
--- a/pkgs/by-name/we/wezterm/package.nix
+++ b/pkgs/by-name/we/wezterm/package.nix
@@ -19,10 +19,10 @@
   vulkan-loader,
   wayland,
   wezterm,
-  xcbutil,
-  xcbutilimage,
-  xcbutilkeysyms,
-  xcbutilwm,
+  libxcb-util,
+  libxcb-image,
+  libxcb-keysyms,
+  libxcb-wm,
   zlib,
 }:
 
@@ -78,10 +78,10 @@ rustPlatform.buildRustPackage rec {
     libxcb
     libxkbcommon
     wayland
-    xcbutil
-    xcbutilimage
-    xcbutilkeysyms
-    xcbutilwm # contains xcb-ewmh among others
+    libxcb-util
+    libxcb-image
+    libxcb-keysyms
+    libxcb-wm # contains xcb-ewmh among others
   ];
 
   buildFeatures = [ "distro-defaults" ];
diff --git a/pkgs/by-name/wi/widelands/package.nix b/pkgs/by-name/wi/widelands/package.nix
index 8a2ba417c0a6..f22d0c7a9614 100644
--- a/pkgs/by-name/wi/widelands/package.nix
+++ b/pkgs/by-name/wi/widelands/package.nix
@@ -23,8 +23,8 @@
   zlib,
   minizip,
   asio,
-  libSM,
-  libICE,
+  libsm,
+  libice,
   libXext,
 }:
 
@@ -77,8 +77,8 @@ stdenv.mkDerivation rec {
     zlib
     minizip
     asio
-    libSM # XXX: these should be propagated by SDL2?
-    libICE
+    libsm # XXX: these should be propagated by SDL2?
+    libice
   ]
   ++ lib.optional stdenv.hostPlatform.isLinux libXext;
 
diff --git a/pkgs/by-name/wi/windowchef/package.nix b/pkgs/by-name/wi/windowchef/package.nix
index 24c2105d6ff0..7d06b697c4a1 100644
--- a/pkgs/by-name/wi/windowchef/package.nix
+++ b/pkgs/by-name/wi/windowchef/package.nix
@@ -4,9 +4,9 @@
   fetchFromGitHub,
   libxcb,
   libXrandr,
-  xcbutil,
-  xcbutilkeysyms,
-  xcbutilwm,
+  libxcb-util,
+  libxcb-keysyms,
+  libxcb-wm,
   xcbproto,
 }:
 
@@ -24,9 +24,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libxcb
     libXrandr
-    xcbutil
-    xcbutilkeysyms
-    xcbutilwm
+    libxcb-util
+    libxcb-keysyms
+    libxcb-wm
     xcbproto
   ];
 
diff --git a/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix b/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix
index 44a61008c9a3..92a9b9d38ee5 100644
--- a/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix
+++ b/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix
@@ -3,7 +3,7 @@
   stdenv,
   autoreconfHook,
   dockapps-sources,
-  fontutil,
+  font-util,
   libX11,
   libXext,
   libXpm,
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     libX11
     libXext
     libXpm
-    fontutil
+    font-util
     mkfontdir
   ];
 
diff --git a/pkgs/by-name/wm/wmutils-core/package.nix b/pkgs/by-name/wm/wmutils-core/package.nix
index 2bab3597b7a5..61ef453b2a11 100644
--- a/pkgs/by-name/wm/wmutils-core/package.nix
+++ b/pkgs/by-name/wm/wmutils-core/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchFromGitHub,
   libxcb,
-  xcbutil,
-  xcb-util-cursor,
+  libxcb-util,
+  libxcb-cursor,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    xcbutil
-    xcb-util-cursor
+    libxcb-util
+    libxcb-cursor
   ];
 
   installFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/by-name/wm/wmutils-libwm/package.nix b/pkgs/by-name/wm/wmutils-libwm/package.nix
index 2ed91047c2bb..a14c1fc8f03f 100644
--- a/pkgs/by-name/wm/wmutils-libwm/package.nix
+++ b/pkgs/by-name/wm/wmutils-libwm/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   libxcb,
-  xcb-util-cursor,
+  libxcb-cursor,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    xcb-util-cursor
+    libxcb-cursor
   ];
 
   installFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/by-name/wo/workrave/package.nix b/pkgs/by-name/wo/workrave/package.nix
index f9b5e4ff1840..545b4f511f19 100644
--- a/pkgs/by-name/wo/workrave/package.nix
+++ b/pkgs/by-name/wo/workrave/package.nix
@@ -10,8 +10,8 @@
   intltool,
   libtool,
   pkg-config,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libXScrnSaver,
   libXtst,
   gobject-introspection,
@@ -56,8 +56,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libICE
-    libSM
+    libice
+    libsm
     libXScrnSaver
     libXtst
     glib
diff --git a/pkgs/by-name/wx/wxGTK31/package.nix b/pkgs/by-name/wx/wxGTK31/package.nix
index 5957a5c73210..9fd4bf665814 100644
--- a/pkgs/by-name/wx/wxGTK31/package.nix
+++ b/pkgs/by-name/wx/wxGTK31/package.nix
@@ -7,7 +7,7 @@
   gtk3,
   libGL,
   libGLU,
-  libSM,
+  libsm,
   libXinerama,
   libXtst,
   libXxf86vm,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     gtk3
-    libSM
+    libsm
     libXinerama
     libXtst
     libXxf86vm
diff --git a/pkgs/by-name/wx/wxGTK32/package.nix b/pkgs/by-name/wx/wxGTK32/package.nix
index c820a2e39f92..b7bf1124e034 100644
--- a/pkgs/by-name/wx/wxGTK32/package.nix
+++ b/pkgs/by-name/wx/wxGTK32/package.nix
@@ -9,7 +9,7 @@
   gtk3,
   libGL,
   libGLU,
-  libSM,
+  libsm,
   libXinerama,
   libXtst,
   libXxf86vm,
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     gspell # wxTextCtrl spell checking
     gtk3
-    libSM
+    libsm
     libXinerama
     libXtst
     libXxf86vm
diff --git a/pkgs/by-name/wx/wxwidgets_3_3/package.nix b/pkgs/by-name/wx/wxwidgets_3_3/package.nix
index 7a8236a7792f..973fd1d4a91c 100644
--- a/pkgs/by-name/wx/wxwidgets_3_3/package.nix
+++ b/pkgs/by-name/wx/wxwidgets_3_3/package.nix
@@ -9,7 +9,7 @@
   gtk3,
   libGL,
   libGLU,
-  libSM,
+  libsm,
   libXinerama,
   libXtst,
   libXxf86vm,
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     curl
     gspell # wxTextCtrl spell checking
     gtk3
-    libSM
+    libsm
     libXinerama
     libXtst
     libXxf86vm
diff --git a/pkgs/by-name/x3/x3270/package.nix b/pkgs/by-name/x3/x3270/package.nix
index 997349a24bc1..d3e9c89bbad3 100644
--- a/pkgs/by-name/x3/x3270/package.nix
+++ b/pkgs/by-name/x3/x3270/package.nix
@@ -11,11 +11,11 @@
   libXmu,
   bdftopcf,
   mkfontdir,
-  fontadobe100dpi,
-  fontadobeutopia100dpi,
-  fontbh100dpi,
-  fontbhlucidatypewriter100dpi,
-  fontbitstream100dpi,
+  font-adobe-100dpi,
+  font-adobe-utopia-100dpi,
+  font-bh-100dpi,
+  font-bh-lucidatypewriter-100dpi,
+  font-bitstream-100dpi,
   tcl,
   ncurses,
   openssl,
@@ -73,11 +73,11 @@ stdenv.mkDerivation (finalAttrs: {
     libXmu
     bdftopcf
     mkfontdir
-    fontadobe100dpi
-    fontadobeutopia100dpi
-    fontbh100dpi
-    fontbhlucidatypewriter100dpi
-    fontbitstream100dpi
+    font-adobe-100dpi
+    font-adobe-utopia-100dpi
+    font-bh-100dpi
+    font-bh-lucidatypewriter-100dpi
+    font-bitstream-100dpi
     tcl
     ncurses
     expat
diff --git a/pkgs/by-name/xa/xarcan/package.nix b/pkgs/by-name/xa/xarcan/package.nix
index b67513d0cc9e..e662f887d8e2 100644
--- a/pkgs/by-name/xa/xarcan/package.nix
+++ b/pkgs/by-name/xa/xarcan/package.nix
@@ -7,7 +7,7 @@
   dbus,
   dri-pkgconfig-stub,
   libepoxy,
-  fontutil,
+  font-util,
   libGL,
   libX11,
   libXau,
@@ -30,9 +30,9 @@
   pixman,
   pkg-config,
   systemd,
-  xcbutil,
-  xcbutilwm,
-  xcbutilimage,
+  libxcb-util,
+  libxcb-wm,
+  libxcb-image,
   xkbcomp,
   xkeyboard_config,
   xorgproto,
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalPackages: rec {
     dbus
     dri-pkgconfig-stub
     libepoxy
-    fontutil
+    font-util
     libGL
     libX11
     libXau
@@ -83,9 +83,9 @@ stdenv.mkDerivation (finalPackages: rec {
     openssl
     pixman
     systemd
-    xcbutil
-    xcbutilwm
-    xcbutilimage
+    libxcb-util
+    libxcb-wm
+    libxcb-image
     xkbcomp
     xkeyboard_config
     xorgproto
diff --git a/pkgs/by-name/xa/xawtv/package.nix b/pkgs/by-name/xa/xawtv/package.nix
index 8a176bc2ebe5..6e9e1c0e6067 100644
--- a/pkgs/by-name/xa/xawtv/package.nix
+++ b/pkgs/by-name/xa/xawtv/package.nix
@@ -11,12 +11,12 @@
   libXft,
   xorgproto,
   libv4l,
-  libFS,
+  libfs,
   libXaw,
   libXpm,
   libXext,
-  libSM,
-  libICE,
+  libsm,
+  libice,
   perl,
 }:
 
@@ -42,15 +42,15 @@ stdenv.mkDerivation (finalAttrs: {
     libXt
     libXft
     xorgproto
-    libFS
+    libfs
     perl
     alsa-lib
     aalib
     libXaw
     libXpm
     libXext
-    libSM
-    libICE
+    libsm
+    libice
     libv4l
   ];
 
diff --git a/pkgs/by-name/xb/xboard/package.nix b/pkgs/by-name/xb/xboard/package.nix
index 2d6e349927c9..c0fb2a389fff 100644
--- a/pkgs/by-name/xb/xboard/package.nix
+++ b/pkgs/by-name/xb/xboard/package.nix
@@ -7,8 +7,8 @@
   xorgproto,
   libXt,
   libXaw,
-  libSM,
-  libICE,
+  libsm,
+  libice,
   libXmu,
   libXext,
   gnuchess,
@@ -46,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
     xorgproto
     libXt
     libXaw
-    libSM
-    libICE
+    libsm
+    libice
     libXmu
     libXext
     gnuchess
diff --git a/pkgs/by-name/xc/xcb-imdkit/package.nix b/pkgs/by-name/xc/xcb-imdkit/package.nix
index f5e3528d2d93..185fbb26b8dd 100644
--- a/pkgs/by-name/xc/xcb-imdkit/package.nix
+++ b/pkgs/by-name/xc/xcb-imdkit/package.nix
@@ -5,8 +5,8 @@
   cmake,
   extra-cmake-modules,
   uthash,
-  xcbutil,
-  xcbutilkeysyms,
+  libxcb-util,
+  libxcb-keysyms,
   xorgproto,
 }:
 
@@ -31,8 +31,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    xcbutil
-    xcbutilkeysyms
+    libxcb-util
+    libxcb-keysyms
   ];
 
   meta = {
diff --git a/pkgs/by-name/xc/xcbutilxrm/package.nix b/pkgs/by-name/xc/xcbutilxrm/package.nix
index 48146b0a9bb2..a5ade77c1250 100644
--- a/pkgs/by-name/xc/xcbutilxrm/package.nix
+++ b/pkgs/by-name/xc/xcbutilxrm/package.nix
@@ -5,7 +5,7 @@
   pkg-config,
   m4,
   libxcb,
-  xcbutil,
+  libxcb-util,
   libX11,
 }:
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
   buildInputs = [
     libxcb
-    xcbutil
+    libxcb-util
     libX11
   ];
 
diff --git a/pkgs/by-name/xd/xdo/package.nix b/pkgs/by-name/xd/xdo/package.nix
index c7378e84ef1c..ac3ca72065ff 100644
--- a/pkgs/by-name/xd/xdo/package.nix
+++ b/pkgs/by-name/xd/xdo/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchFromGitHub,
   libxcb,
-  xcbutil,
-  xcbutilwm,
+  libxcb-util,
+  libxcb-wm,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -22,8 +22,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    xcbutilwm
-    xcbutil
+    libxcb-wm
+    libxcb-util
   ];
 
   meta = {
diff --git a/pkgs/by-name/xe/xedit/package.nix b/pkgs/by-name/xe/xedit/package.nix
index 136882cd36c1..eae263bfe633 100644
--- a/pkgs/by-name/xe/xedit/package.nix
+++ b/pkgs/by-name/xe/xedit/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitLab,
   autoreconfHook,
   pkg-config,
-  utilmacros,
+  util-macros,
   libX11,
   libXaw,
   libXmu,
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-    utilmacros
+    util-macros
   ];
   buildInputs = [
     libX11
diff --git a/pkgs/by-name/xf/xf86-input-cmt/package.nix b/pkgs/by-name/xf/xf86-input-cmt/package.nix
index 2e7a21877d58..75a7501dd390 100644
--- a/pkgs/by-name/xf/xf86-input-cmt/package.nix
+++ b/pkgs/by-name/xf/xf86-input-cmt/package.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  xorgserver,
+  xorg-server,
   xorgproto,
-  utilmacros,
+  util-macros,
   libgestures,
   libevdevc,
 }:
@@ -27,9 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    xorgserver
+    xorg-server
     xorgproto
-    utilmacros
+    util-macros
     libgestures
     libevdevc
   ];
diff --git a/pkgs/by-name/xf/xf86-input-evdev/package.nix b/pkgs/by-name/xf/xf86-input-evdev/package.nix
index df15fa63733c..3a414ba30662 100644
--- a/pkgs/by-name/xf/xf86-input-evdev/package.nix
+++ b/pkgs/by-name/xf/xf86-input-evdev/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "xf86-input-evdev";
   version = "2.11.0";
 
-  # to get rid of xorgserver.dev; man is tiny
+  # to get rid of xorg-server.dev; man is tiny
   outputs = [
     "out"
     "dev"
diff --git a/pkgs/by-name/xf/xf86-input-wacom/package.nix b/pkgs/by-name/xf/xf86-input-wacom/package.nix
index 7eb6174e950f..5b71936462a4 100644
--- a/pkgs/by-name/xf/xf86-input-wacom/package.nix
+++ b/pkgs/by-name/xf/xf86-input-wacom/package.nix
@@ -15,8 +15,8 @@
   pkg-config,
   udev,
   udevCheckHook,
-  utilmacros,
-  xorgserver,
+  util-macros,
+  xorg-server,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -45,10 +45,10 @@ stdenv.mkDerivation (finalAttrs: {
     libXrender
     ncurses
     udev
-    utilmacros
+    util-macros
     pixman
     xorgproto
-    xorgserver
+    xorg-server
   ];
 
   doInstallCheck = true;
diff --git a/pkgs/by-name/xf/xf86-video-intel/package.nix b/pkgs/by-name/xf/xf86-video-intel/package.nix
index 27064ca6ea71..6ba5f0a24873 100644
--- a/pkgs/by-name/xf/xf86-video-intel/package.nix
+++ b/pkgs/by-name/xf/xf86-video-intel/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     # Comment from 037167ae17fefe6b5dc86dc05f0dd168031c3c68:
     #
-    # The i965 driver was removed in Mesa 22, but the xf86videointel driver
+    # The i965 driver was removed in Mesa 22, but the xf86-video-intel driver
     # hasn't been updated to reflect this. This leads to the following error
     # when used with the affected hardware:
     #
diff --git a/pkgs/by-name/xf/xfce4-settings/package.nix b/pkgs/by-name/xf/xfce4-settings/package.nix
index 9694bf28f248..5e87e9d0be48 100644
--- a/pkgs/by-name/xf/xfce4-settings/package.nix
+++ b/pkgs/by-name/xf/xfce4-settings/package.nix
@@ -26,7 +26,7 @@
   wlr-protocols,
   xapp,
   xfconf,
-  xf86inputlibinput,
+  xf86-input-libinput,
   colord,
   withColord ? true,
   gitUpdater,
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxklavier
     wlr-protocols
     xapp # org.x.apps.portal
-    xf86inputlibinput
+    xf86-input-libinput
     xfconf
   ]
   ++ lib.optionals withUpower [ upower ]
diff --git a/pkgs/by-name/xf/xfe/package.nix b/pkgs/by-name/xf/xfe/package.nix
index 081e9f9b766b..70bcb4aea66d 100644
--- a/pkgs/by-name/xf/xfe/package.nix
+++ b/pkgs/by-name/xf/xfe/package.nix
@@ -7,7 +7,7 @@
   freetype,
   pkg-config,
   gettext,
-  xcbutil,
+  libxcb-util,
   gcc,
   intltool,
   file,
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     fox_1_6
     gettext
-    xcbutil
+    libxcb-util
     gcc
     file
     libpng
diff --git a/pkgs/by-name/xk/xkeyboard-config/custom.nix b/pkgs/by-name/xk/xkeyboard-config/custom.nix
index 374112f51b08..0e5663009450 100644
--- a/pkgs/by-name/xk/xkeyboard-config/custom.nix
+++ b/pkgs/by-name/xk/xkeyboard-config/custom.nix
@@ -1,4 +1,4 @@
-# xkeyboardconfig variant extensible with custom layouts.
+# xkeyboard-config variant extensible with custom layouts.
 # See nixos/modules/services/x11/extra-layouts.nix
 {
   lib,
diff --git a/pkgs/by-name/xm/xmoji/package.nix b/pkgs/by-name/xm/xmoji/package.nix
index f1152d912ad8..c2e3f03afd51 100644
--- a/pkgs/by-name/xm/xmoji/package.nix
+++ b/pkgs/by-name/xm/xmoji/package.nix
@@ -6,11 +6,11 @@
   fontconfig,
   harfbuzz,
   libpng,
-  xcbutil,
+  libxcb-util,
   libXcursor,
-  xcbutilimage,
+  libxcb-image,
   libxkbcommon,
-  xcb-util-cursor,
+  libxcb-cursor,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -40,9 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
     libXcursor
     libpng
     libxkbcommon
-    xcb-util-cursor
-    xcbutil
-    xcbutilimage
+    libxcb-cursor
+    libxcb-util
+    libxcb-image
   ];
 
   makeFlags = [ "prefix=${placeholder "out"}" ];
diff --git a/pkgs/by-name/xo/xorg-server/package.nix b/pkgs/by-name/xo/xorg-server/package.nix
index 03119738d6fb..2afcf03a0137 100644
--- a/pkgs/by-name/xo/xorg-server/package.nix
+++ b/pkgs/by-name/xo/xorg-server/package.nix
@@ -11,7 +11,7 @@
   # deps
   dbus,
   dri-pkgconfig-stub,
-  fontutil,
+  font-util,
   libdrm,
   libepoxy,
   libgbm,
@@ -42,14 +42,14 @@
   pixman,
   udev,
   xkbcomp,
-  xkeyboardconfig,
+  xkeyboard-config,
   xorgproto,
   xtrans,
   zlib,
 
   # darwin specific deps
   darwin,
-  utilmacros,
+  util-macros,
   libapplewm,
 
   writeScript,
@@ -84,11 +84,11 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.bootstrap_cmds
-    utilmacros
+    util-macros
   ];
 
   buildInputs = [
-    fontutil
+    font-util
     libx11
     libxau
     libxcb
@@ -147,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: {
     "-Ddefault_font_path="
 
     "-Dxkb_bin_dir=${xkbcomp}/bin"
-    "-Dxkb_dir=${xkeyboardconfig}/share/X11/xkb"
+    "-Dxkb_dir=${xkeyboard-config}/share/X11/xkb"
     "-Dxkb_output_dir=$out/share/X11/xkb/compiled"
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
diff --git a/pkgs/by-name/xp/xpilot-ng/package.nix b/pkgs/by-name/xp/xpilot-ng/package.nix
index 2e28be64ee9a..54d5facb3971 100644
--- a/pkgs/by-name/xp/xpilot-ng/package.nix
+++ b/pkgs/by-name/xp/xpilot-ng/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   libX11,
-  libSM,
+  libsm,
   libXext,
   SDL,
   libGLU,
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
   buildInputs = [
     libX11
-    libSM
+    libsm
     libXext
     SDL
     SDL_ttf
diff --git a/pkgs/by-name/xp/xpra/package.nix b/pkgs/by-name/xp/xpra/package.nix
index 0d0c56017985..c482b3071e5c 100644
--- a/pkgs/by-name/xp/xpra/package.nix
+++ b/pkgs/by-name/xp/xpra/package.nix
@@ -54,7 +54,7 @@
   libx11,
   xorgproto,
   libxkbfile,
-  xorgserver,
+  xorg-server,
   xxHash,
   clang,
   withHtml ? true,
@@ -76,9 +76,9 @@ let
 
   xorgModulePaths = writeText "module-paths" ''
     Section "Files"
-      ModulePath "${xorgserver}/lib/xorg/modules"
-      ModulePath "${xorgserver}/lib/xorg/modules/extensions"
-      ModulePath "${xorgserver}/lib/xorg/modules/drivers"
+      ModulePath "${xorg-server}/lib/xorg/modules"
+      ModulePath "${xorg-server}/lib/xorg/modules/extensions"
+      ModulePath "${xorg-server}/lib/xorg/modules/drivers"
       ModulePath "${xf86videodummy}/lib/xorg/modules/drivers"
     EndSection
   '';
@@ -254,7 +254,7 @@ effectiveBuildPythonApplication rec {
       --prefix PATH : ${
         lib.makeBinPath [
           getopt
-          xorgserver
+          xorg-server
           xauth
           which
           util-linux
diff --git a/pkgs/by-name/xs/xss-lock/package.nix b/pkgs/by-name/xs/xss-lock/package.nix
index 972199367a33..24602a98cb13 100644
--- a/pkgs/by-name/xs/xss-lock/package.nix
+++ b/pkgs/by-name/xs/xss-lock/package.nix
@@ -6,10 +6,10 @@
   docutils,
   pkg-config,
   glib,
-  libpthreadstubs,
+  libpthread-stubs,
   libXau,
   libXdmcp,
-  xcbutil,
+  libxcb-util,
   nixosTests,
 }:
 
@@ -37,10 +37,10 @@ stdenv.mkDerivation {
   ];
   buildInputs = [
     glib
-    libpthreadstubs
+    libpthread-stubs
     libXau
     libXdmcp
-    xcbutil
+    libxcb-util
   ];
 
   passthru.tests = { inherit (nixosTests) xss-lock; };
diff --git a/pkgs/by-name/xt/xtitle/package.nix b/pkgs/by-name/xt/xtitle/package.nix
index 6c4893ac1836..6ef2a03e99f0 100644
--- a/pkgs/by-name/xt/xtitle/package.nix
+++ b/pkgs/by-name/xt/xtitle/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchFromGitHub,
   libxcb,
-  xcbutil,
-  xcbutilwm,
+  libxcb-util,
+  libxcb-wm,
   git,
 }:
 
@@ -26,8 +26,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libxcb
     git
-    xcbutil
-    xcbutilwm
+    libxcb-util
+    libxcb-wm
   ];
 
   meta = {
diff --git a/pkgs/by-name/xv/xvfb/package.nix b/pkgs/by-name/xv/xvfb/package.nix
index c81ee24becee..afa62f072a22 100644
--- a/pkgs/by-name/xv/xvfb/package.nix
+++ b/pkgs/by-name/xv/xvfb/package.nix
@@ -20,13 +20,13 @@
   mesa-gl-headers,
   openssl,
   pixman,
-  xcbutil,
-  xcbutilimage,
-  xcbutilkeysyms,
-  xcbutilrenderutil,
-  xcbutilwm,
+  libxcb-util,
+  libxcb-image,
+  libxcb-keysyms,
+  libxcb-render-util,
+  libxcb-wm,
   xkbcomp,
-  xkeyboardconfig,
+  xkeyboard-config,
   xorgproto,
   xtrans,
 }:
@@ -55,11 +55,11 @@ stdenv.mkDerivation (finalAttrs: {
     mesa-gl-headers
     openssl
     pixman
-    xcbutil
-    xcbutilimage
-    xcbutilkeysyms
-    xcbutilrenderutil
-    xcbutilwm
+    libxcb-util
+    libxcb-image
+    libxcb-keysyms
+    libxcb-render-util
+    libxcb-wm
     xorgproto
     xtrans
   ];
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--disable-xquartz"
     "--disable-xwayland"
     "--with-xkb-bin-directory=${xkbcomp}/bin"
-    "--with-xkb-path=${xkeyboardconfig}/share/X11/xkb"
+    "--with-xkb-path=${xkeyboard-config}/share/X11/xkb"
     "--with-xkb-output=$out/share/X11/xkb/compiled"
   ]
   ++ lib.optional stdenv.hostPlatform.isDarwin "--without-dtrace";
diff --git a/pkgs/by-name/xw/xwallpaper/package.nix b/pkgs/by-name/xw/xwallpaper/package.nix
index 182721cc68ff..d7906269f86e 100644
--- a/pkgs/by-name/xw/xwallpaper/package.nix
+++ b/pkgs/by-name/xw/xwallpaper/package.nix
@@ -6,8 +6,8 @@
   autoreconfHook,
   installShellFiles,
   pixman,
-  xcbutil,
-  xcbutilimage,
+  libxcb-util,
+  libxcb-image,
   libseccomp,
   libjpeg,
   libpng,
@@ -32,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     pixman
-    xcbutilimage
-    xcbutil
+    libxcb-image
+    libxcb-util
     libseccomp
     libjpeg
     libpng
diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix
index 98a31aff70d4..1a223e7496dc 100644
--- a/pkgs/by-name/xw/xwayland-satellite/package.nix
+++ b/pkgs/by-name/xw/xwayland-satellite/package.nix
@@ -6,7 +6,7 @@
   nix-update-script,
   pkg-config,
   rustPlatform,
-  xcb-util-cursor,
+  libxcb-cursor,
   xwayland,
   withSystemd ? true,
 }:
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     libxcb
-    xcb-util-cursor
+    libxcb-cursor
   ];
 
   buildNoDefaultFeatures = true;
diff --git a/pkgs/by-name/xw/xwayland/package.nix b/pkgs/by-name/xw/xwayland/package.nix
index 35d52ffac981..b44173580179 100644
--- a/pkgs/by-name/xw/xwayland/package.nix
+++ b/pkgs/by-name/xw/xwayland/package.nix
@@ -4,7 +4,7 @@
   bash,
   libepoxy,
   fetchurl,
-  fontutil,
+  font-util,
   lib,
   libdecor,
   libgbm,
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
     libgbm
     libepoxy
     libei
-    fontutil
+    font-util
     libGL
     libGLU
     libX11
diff --git a/pkgs/by-name/ya/yabasic/package.nix b/pkgs/by-name/ya/yabasic/package.nix
index ea31e7f753c0..3213e98bc5fc 100644
--- a/pkgs/by-name/ya/yabasic/package.nix
+++ b/pkgs/by-name/ya/yabasic/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  libSM,
+  libsm,
   libX11,
   libXt,
   libffi,
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libSM
+    libsm
     libX11
     libXt
     libffi
diff --git a/pkgs/by-name/ya/yambar/package.nix b/pkgs/by-name/ya/yambar/package.nix
index aba3516e2259..5bc7402d919b 100644
--- a/pkgs/by-name/ya/yambar/package.nix
+++ b/pkgs/by-name/ya/yambar/package.nix
@@ -21,10 +21,10 @@
   wayland,
   wayland-protocols,
   wayland-scanner,
-  xcbutil,
-  xcbutilcursor,
-  xcbutilerrors,
-  xcbutilwm,
+  libxcb-util,
+  libxcb-cursor,
+  libxcb-errors,
+  libxcb-wm,
   waylandSupport ? true,
   x11Support ? true,
 }:
@@ -75,10 +75,10 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-protocols
   ]
   ++ lib.optionals x11Support [
-    xcbutil
-    xcbutilcursor
-    xcbutilerrors
-    xcbutilwm
+    libxcb-util
+    libxcb-cursor
+    libxcb-errors
+    libxcb-wm
   ];
 
   strictDeps = true;
diff --git a/pkgs/by-name/ze/zeal/package.nix b/pkgs/by-name/ze/zeal/package.nix
index ab65873822c8..58c0f78ef04c 100644
--- a/pkgs/by-name/ze/zeal/package.nix
+++ b/pkgs/by-name/ze/zeal/package.nix
@@ -8,8 +8,8 @@
   httplib,
   libarchive,
   libXdmcp,
-  libpthreadstubs,
-  xcbutilkeysyms,
+  libpthread-stubs,
+  libxcb-keysyms,
   qt6,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -36,11 +36,11 @@ stdenv.mkDerivation (finalAttrs: {
     httplib
     libXdmcp
     libarchive
-    libpthreadstubs
+    libpthread-stubs
     qt6.qtbase
     qt6.qtimageformats
     qt6.qtwebengine
-    xcbutilkeysyms
+    libxcb-keysyms
   ];
 
   cmakeFlags = [
diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix
index 66e648ba38b0..e2bb3289d9d6 100644
--- a/pkgs/data/themes/qtcurve/default.nix
+++ b/pkgs/data/themes/qtcurve/default.nix
@@ -20,7 +20,7 @@
   kwindowsystem,
   kdelibs4support,
   kiconthemes,
-  libpthreadstubs,
+  libpthread-stubs,
   pcre,
   libXdmcp,
   libX11,
@@ -76,7 +76,7 @@ mkDerivation rec {
     kwindowsystem
     kdelibs4support
     frameworkintegration
-    libpthreadstubs
+    libpthread-stubs
     pcre
     libXdmcp
     libX11
diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index 86cdf13cdc8c..19e005ac9e1d 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -6,7 +6,7 @@
   libXdmcp,
   libexif,
   libfm,
-  libpthreadstubs,
+  libpthread-stubs,
   libxcb,
   lxqt-build-tools,
   lxqt-menu-data,
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXdmcp
     libexif
     libfm
-    libpthreadstubs
+    libpthread-stubs
     libxcb
     lxqt-menu-data
     menu-cache
diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix
index 26fb9cc3cfc2..b6d0eb7cfe1e 100644
--- a/pkgs/desktops/lxqt/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/lximage-qt/default.nix
@@ -7,7 +7,7 @@
   libXdmcp,
   libexif,
   libfm-qt,
-  libpthreadstubs,
+  libpthread-stubs,
   lxqt-build-tools,
   menu-cache,
   qtbase,
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     libXdmcp
     libexif
     libfm-qt
-    libpthreadstubs
+    libpthread-stubs
     menu-cache
     qtbase
     qtimageformats # add-on module to support more image file formats
diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix
index d05fcf85d6a0..81477a03a7c5 100644
--- a/pkgs/desktops/lxqt/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-config/default.nix
@@ -10,7 +10,7 @@
   libXdmcp,
   libkscreen,
   liblxqt,
-  libpthreadstubs,
+  libpthread-stubs,
   libqtxdg,
   libxcb,
   lxqt-build-tools,
@@ -21,7 +21,7 @@
   qttools,
   qtwayland,
   wrapQtAppsHook,
-  xf86inputlibinput,
+  xf86-input-libinput,
   xkeyboard_config,
   gitUpdater,
 }:
@@ -53,15 +53,15 @@ stdenv.mkDerivation rec {
     libXdmcp
     libkscreen
     liblxqt
-    libpthreadstubs
+    libpthread-stubs
     libqtxdg
     libxcb
     lxqt-menu-data
     qtbase
     qtsvg
     qtwayland
-    xf86inputlibinput
-    xf86inputlibinput.dev
+    xf86-input-libinput
+    xf86-input-libinput.dev
   ];
 
   cmakeFlags = [ "-DCMAKE_CXX_STANDARD=20" ];
diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
index 424a9c1780b9..77b627c97e3a 100644
--- a/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -14,7 +14,7 @@
   libXtst,
   libdbusmenu,
   liblxqt,
-  libpthreadstubs,
+  libpthread-stubs,
   libpulseaudio,
   libqtxdg,
   libstatgrab,
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXtst
     libdbusmenu
     liblxqt
-    libpthreadstubs
+    libpthread-stubs
     libpulseaudio
     libqtxdg
     libstatgrab
diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix
index d1900e45717a..e3f885ffcd1e 100644
--- a/pkgs/desktops/lxqt/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-session/default.nix
@@ -7,7 +7,7 @@
   layer-shell-qt,
   libXdmcp,
   liblxqt,
-  libpthreadstubs,
+  libpthread-stubs,
   libqtxdg,
   lxqt-build-tools,
   pkg-config,
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     layer-shell-qt
     libXdmcp
     liblxqt
-    libpthreadstubs
+    libpthread-stubs
     libqtxdg
     procps
     qtbase
diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix
index 00a3b1a10c10..8f77173f9c7a 100644
--- a/pkgs/desktops/lxqt/obconf-qt/default.nix
+++ b/pkgs/desktops/lxqt/obconf-qt/default.nix
@@ -3,9 +3,9 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  libSM,
+  libsm,
   libXdmcp,
-  libpthreadstubs,
+  libpthread-stubs,
   lxqt-build-tools,
   openbox,
   pcre,
@@ -37,9 +37,9 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libSM
+    libsm
     libXdmcp
-    libpthreadstubs
+    libpthread-stubs
     openbox
     pcre
     qtbase
diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
index 292985ceb2db..1414ed9973e4 100644
--- a/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/screengrab/default.nix
@@ -8,7 +8,7 @@
   kwindowsystem,
   layer-shell-qt,
   libXdmcp,
-  libpthreadstubs,
+  libpthread-stubs,
   libqtxdg,
   lxqt-build-tools,
   perl,
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     kwindowsystem
     layer-shell-qt
     libXdmcp
-    libpthreadstubs
+    libpthread-stubs
     libqtxdg
     qtbase
     qtsvg
diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
index cba2e8c7d722..06eed5cb86e9 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -7,7 +7,7 @@
   xtrans,
   dbus-glib,
   systemd,
-  libSM,
+  libsm,
   libXtst,
   glib,
   gtk3,
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     dbus-glib
     systemd
-    libSM
+    libsm
     libXtst
     gtk3
     mate-desktop
diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix
index f4dac2209f92..0282b52d3c0f 100644
--- a/pkgs/development/compilers/openjdk/generic.nix
+++ b/pkgs/development/compilers/openjdk/generic.nix
@@ -30,7 +30,7 @@
   libpng,
   lcms2,
   libX11,
-  libICE,
+  libice,
   libXext,
   libXrender,
   libXtst,
@@ -277,7 +277,7 @@ stdenv.mkDerivation (finalAttrs: {
     libjpeg
     giflib
     libX11
-    libICE
+    libice
     libXext
     libXrender
     libXtst
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 018b21108edf..33109f4656af 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -14,7 +14,7 @@
   libGLU,
   libjpeg,
   libpng,
-  libpthreadstubs,
+  libpthread-stubs,
   libpulseaudio,
   libtheora,
   libvorbis,
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
-    libpthreadstubs
+    libpthread-stubs
     libpulseaudio
     libX11
     libXcursor
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
index 0bb6952dda41..ff5da40077aa 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation,
   extra-cmake-modules,
-  libpthreadstubs,
+  libpthread-stubs,
   libXdmcp,
   qtbase,
   qttools,
@@ -12,7 +12,7 @@ mkDerivation {
   pname = "kwindowsystem";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    libpthreadstubs
+    libpthread-stubs
     libXdmcp
     qttools
     qtx11extras
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 9bab63c9a711..13944f58ff5d 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -38,7 +38,7 @@
   wayland,
   wayland-protocols,
   wayland-scanner,
-  xcbutilkeysyms,
+  libxcb-keysyms,
   libxxf86vm,
   libxrandr,
   libxfixes,
@@ -291,7 +291,7 @@ stdenv.mkDerivation {
     vulkan-loader
     wayland
     wayland-protocols
-    xcbutilkeysyms
+    libxcb-keysyms
     xorgproto
     zstd
   ]
diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix
index 3788b865dcbc..137857b8c1df 100644
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@@ -16,8 +16,8 @@
   libglut,
   libGL,
   libGLU,
-  libICE,
-  libSM,
+  libice,
+  libsm,
   libX11,
   libXaw,
   libXmu,
@@ -84,8 +84,8 @@ let
         libglut
         libGL
         libGLU
-        libICE
-        libSM
+        libice
+        libsm
         libX11
         libXaw
         libXmu
diff --git a/pkgs/development/libraries/qcoro/default.nix b/pkgs/development/libraries/qcoro/default.nix
index a58e8362c02b..f4204439a36f 100644
--- a/pkgs/development/libraries/qcoro/default.nix
+++ b/pkgs/development/libraries/qcoro/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  libpthreadstubs,
+  libpthread-stubs,
   qtbase,
   qtwebsockets,
   wrapQtAppsHook,
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     qtbase
     qtwebsockets
-    libpthreadstubs
+    libpthread-stubs
   ];
 
   meta = {
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 0720a23b8936..8b83ec4d8c08 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -42,11 +42,11 @@
   pcre2,
   sqlite,
   udev,
-  xcbutil,
-  xcbutilimage,
-  xcbutilkeysyms,
-  xcbutilrenderutil,
-  xcbutilwm,
+  libxcb-util,
+  libxcb-image,
+  libxcb-keysyms,
+  libxcb-render-util,
+  libxcb-wm,
   zlib,
   at-spi2-core,
 
@@ -131,11 +131,11 @@ stdenv.mkDerivation (
           libXrender
           libxcb
           libxkbcommon
-          xcbutil
-          xcbutilimage
-          xcbutilkeysyms
-          xcbutilrenderutil
-          xcbutilwm
+          libxcb-util
+          libxcb-image
+          libxcb-keysyms
+          libxcb-render-util
+          libxcb-wm
         ]
         ++ lib.optional libGLSupported libGL
       );
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index cdbe8f0740d1..03b455aa67ac 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -56,11 +56,11 @@
   pcre2,
   sqlite,
   udev,
-  xcbutil,
-  xcbutilimage,
-  xcbutilkeysyms,
-  xcbutilrenderutil,
-  xcbutilwm,
+  libxcb-util,
+  libxcb-image,
+  libxcb-keysyms,
+  libxcb-render-util,
+  libxcb-wm,
   zlib,
   at-spi2-core,
   unixODBC,
@@ -153,11 +153,11 @@ stdenv.mkDerivation rec {
     libXrender
     libxcb
     libxkbcommon
-    xcbutil
-    xcbutilimage
-    xcbutilkeysyms
-    xcbutilrenderutil
-    xcbutilwm
+    libxcb-util
+    libxcb-image
+    libxcb-keysyms
+    libxcb-render-util
+    libxcb-wm
     libxdmcp
     libxtst
     libxcb-cursor
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 5178cae8a87f..3b56d3c9bc39 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -37,7 +37,7 @@
   hyphen,
   icu,
   libsysprof-capture,
-  libpthreadstubs,
+  libpthread-stubs,
   nettle,
   libtasn1,
   p11-kit,
@@ -160,7 +160,7 @@ clangStdenv.mkDerivation (finalAttrs: {
     libidn
     libintl
     lcms2
-    libpthreadstubs
+    libpthread-stubs
     libsysprof-capture
     libtasn1
     libwebp
diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix
index 82a644355182..f636eed0e849 100644
--- a/pkgs/development/python-modules/qtile-extras/default.nix
+++ b/pkgs/development/python-modules/qtile-extras/default.nix
@@ -19,7 +19,7 @@
   qtile,
   requests,
   setuptools-scm,
-  xorgserver,
+  xorg-server,
   nixosTests,
 }:
 buildPythonPackage rec {
@@ -63,7 +63,7 @@ buildPythonPackage rec {
     python-dateutil
     qtile
     requests
-    xorgserver
+    xorg-server
     # stravalib  # marked as broken due to https://github.com/stravalib/stravalib/issues/379
   ];
 
diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix
index 8f059c4ecea5..e7ed8e255fa8 100644
--- a/pkgs/development/python-modules/qtile/default.nix
+++ b/pkgs/development/python-modules/qtile/default.nix
@@ -29,8 +29,8 @@
   wayland-protocols,
   wayland-scanner,
   wlroots,
-  xcbutilcursor,
-  xcbutilwm,
+  libxcb-cursor,
+  libxcb-wm,
   xcffib,
   nixosTests,
   extraPackages ? [ ],
@@ -89,7 +89,7 @@ buildPythonPackage (finalAttrs: {
     "--config-setting=GOBJECT=${lib.getLib glib}/lib/libgobject-2.0.so"
     "--config-setting=PANGO=${lib.getLib pango}/lib/libpango-1.0.so"
     "--config-setting=PANGOCAIRO=${lib.getLib pango}/lib/libpangocairo-1.0.so"
-    "--config-setting=XCBCURSOR=${lib.getLib xcbutilcursor}/lib/libxcb-cursor.so"
+    "--config-setting=XCBCURSOR=${lib.getLib libxcb-cursor}/lib/libxcb-cursor.so"
   ];
 
   dependencies = extraPackages ++ [
@@ -112,7 +112,7 @@ buildPythonPackage (finalAttrs: {
     libxkbcommon
     wayland
     wlroots
-    xcbutilwm
+    libxcb-wm
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix
index 46b7601844df..8802cb45a94b 100644
--- a/pkgs/development/python-modules/wxpython/4.2.nix
+++ b/pkgs/development/python-modules/wxpython/4.2.nix
@@ -25,7 +25,7 @@
   gtk3,
   libGL,
   libGLU,
-  libSM,
+  libsm,
   libXinerama,
   libXtst,
   libXxf86vm,
@@ -102,7 +102,7 @@ buildPythonPackage rec {
     gst_all_1.gstreamer
     libGL
     libGLU
-    libSM
+    libsm
     libXinerama
     libXtst
     libXxf86vm
diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix
index 3c63a8ace6fc..12f751a208b3 100644
--- a/pkgs/development/tools/rgp/default.nix
+++ b/pkgs/development/tools/rgp/default.nix
@@ -12,9 +12,9 @@
   libdrm,
   libGLU,
   libglvnd,
-  libICE,
+  libice,
   libkrb5,
-  libSM,
+  libsm,
   libX11,
   libxcb,
   libXi,
@@ -22,7 +22,7 @@
   libxml2_13,
   ncurses,
   wayland,
-  xcbutil,
+  libxcb-util,
   zlib,
   zstd,
 }:
@@ -53,9 +53,9 @@ stdenv.mkDerivation {
     libdrm
     libGLU
     libglvnd
-    libICE
+    libice
     libkrb5
-    libSM
+    libsm
     libX11
     libxcb
     libXi
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
     libxml2_13
     ncurses
     wayland
-    xcbutil
+    libxcb-util
     zlib
     zstd
   ];
diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index 174470b7368c..fc0077124475 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -5,7 +5,7 @@
   fetchpatch,
   cmake,
   libGL,
-  libSM,
+  libsm,
   SDL,
   SDL_image,
   SDL_ttf,
@@ -90,7 +90,7 @@ stdenv.mkDerivation {
     pkg-config
   ];
   buildInputs = [
-    libSM
+    libsm
     SDL
     SDL_image
     SDL_ttf
diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix
index 4287ee5e00f6..9eb8b05a05fa 100644
--- a/pkgs/tools/inputmethods/fcitx5/default.nix
+++ b/pkgs/tools/inputmethods/fcitx5/default.nix
@@ -28,9 +28,9 @@
   libxkbcommon,
   libthai,
   libdatrie,
-  xcbutilkeysyms,
-  xcbutil,
-  xcbutilwm,
+  libxcb-keysyms,
+  libxcb-util,
+  libxcb-wm,
   xcb-imdkit,
   libxkbfile,
   nixosTests,
@@ -86,9 +86,9 @@ stdenv.mkDerivation rec {
     libsepol
     libXdmcp
     libxkbcommon
-    xcbutil
-    xcbutilwm
-    xcbutilkeysyms
+    libxcb-util
+    libxcb-wm
+    libxcb-keysyms
     xcb-imdkit
     xkeyboard_config
     libxkbfile
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
index 0f3822490511..9d38b075135a 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
@@ -21,7 +21,7 @@
   kirigami ? null,
   kirigami2 ? null,
   isocodes,
-  xkeyboardconfig,
+  xkeyboard-config,
   libxkbfile,
   libplasma ? null,
   plasma-framework ? null,
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     kitemviews
     kwidgetsaddons
     isocodes
-    xkeyboardconfig
+    xkeyboard-config
     libxkbfile
   ]
   ++ lib.optionals (lib.versions.major qtbase.version == "5") [
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 549fe02039a3..e22b79149c0e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -669,15 +669,20 @@ mapAliases {
   fmsynth = throw "'fmsynth' has been removed as it was broken and unmaintained both upstream and in nixpkgs."; # Added 2025-09-01
   follow = warnAlias "follow has been renamed to folo" folo; # Added 2025-05-18
   fontadobe75dpi = font-adobe-75dpi; # Added 2026-01-19
+  fontadobe100dpi = font-adobe-100dpi; # Added 2026-02-04
   fontadobeutopia75dpi = font-adobe-utopia-75dpi; # Added 2026-01-19
+  fontadobeutopia100dpi = font-adobe-utopia-100dpi; # Added 2026-02-04
   fontadobeutopiatype1 = font-adobe-utopia-type1; # Added 2026-01-19
   fontalias = font-alias; # Added 2026-01-19
   fontarabicmisc = font-arabic-misc; # Added 2026-01-19
   fontbh75dpi = font-bh-75dpi; # Added 2026-01-19
+  fontbh100dpi = font-bh-100dpi; # Added 2026-02-04
   fontbhlucidatypewriter75dpi = font-bh-lucidatypewriter-75dpi; # Added 2026-01-19
+  fontbhlucidatypewriter100dpi = font-bh-lucidatypewriter-100dpi; # Added 2026-02-04
   fontbhttf = font-bh-ttf; # Added 2026-01-19
   fontbhtype1 = font-bh-type1; # Added 2026-01-19
   fontbitstream75dpi = font-bitstream-75dpi; # Added 2026-01-19
+  fontbitstream100dpi = font-bitstream-100dpi; # Added 2026-02-04
   fontbitstreamspeedo = throw "Bitstream Speedo is an obsolete font format that hasn't been supported by Xorg since 2005"; # added 2025-09-24
   fontbitstreamtype1 = font-bitstream-type1; # Added 2026-01-19
   fontcronyxcyrillic = font-cronyx-cyrillic; # Added 2026-01-19
@@ -697,6 +702,7 @@ mapAliases {
   fontscreencyrillic = font-screen-cyrillic; # Added 2026-01-19
   fontsonymisc = font-sony-misc; # Added 2026-01-19
   fontsunmisc = font-sun-misc; # Added 2026-01-19
+  fontutil = font-util; # Added 2026-02-04
   fontwinitzkicyrillic = font-winitzki-cyrillic; # Added 2026-01-19
   fontxfree86type1 = font-xfree86-type1; # Added 2026-01-19
   forceSystem = warnAlias "forceSystem is deprecated in favour of explicitly importing Nixpkgs" (
@@ -949,6 +955,7 @@ mapAliases {
   ledger_agent = throw "'ledger_agent' has been renamed to/replaced by 'ledger-agent'"; # Converted to throw 2025-10-27
   lesstif = throw "'lesstif' has been removed due to its being broken and unmaintained upstream. Consider using 'motif' instead."; # Added 2025-06-09
   lfs = throw "'lfs' has been renamed to/replaced by 'dysk'"; # Converted to throw 2025-10-27
+  libAppleWM = libapplewm; # Added 2026-02-04
   libast = throw "'libast' has been removed due to lack of maintenance upstream."; # Added 2025-06-09
   libayatana-appindicator-gtk3 = throw "'libayatana-appindicator-gtk3' has been renamed to/replaced by 'libayatana-appindicator'"; # Converted to throw 2025-10-27
   libayatana-indicator-gtk3 = throw "'libayatana-indicator-gtk3' has been renamed to/replaced by 'libayatana-indicator'"; # Converted to throw 2025-10-27
@@ -963,11 +970,13 @@ mapAliases {
   libevdevplus = throw "'libevdevplus' has been removed, as it was unmaintained upstream since 2021, no longer builds, and is no longer used by anything"; # Added 2025-11-02
   libfprint-focaltech-2808-a658 = throw "'libfprint-focaltech-2808-a658' has been removed as it was broken and upstream was taken down"; # Added 2025-11-04
   libfpx = throw "libfpx has been removed as it was unmaintained in Nixpkgs and had known vulnerabilities"; # Added 2025-05-20
+  libFS = libfs; # Added 2026-02-04
   libgadu = throw "'libgadu' has been removed as upstream is unmaintained and has no dependents or maintainers in Nixpkgs"; # Added 2025-05-17
   libgda = throw "'libgda' has been renamed to/replaced by 'libgda5'"; # Converted to throw 2025-10-27
   libgme = throw "'libgme' has been renamed to/replaced by 'game-music-emu'"; # Converted to throw 2025-10-27
   libgnome-keyring3 = throw "'libgnome-keyring3' has been renamed to/replaced by 'libgnome-keyring'"; # Converted to throw 2025-10-27
   libheimdal = throw "'libheimdal' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2025-10-27
+  libICE = libice; # Added 2026-02-04
   libiconv-darwin = throw "'libiconv-darwin' has been renamed to/replaced by 'darwin.libiconv'"; # Converted to throw 2025-10-27
   libixp_hg = throw "'libixp_hg' has been renamed to/replaced by 'libixp'"; # Converted to throw 2025-10-27
   libkkc = throw "'libkkc' has been removed due to lack of maintenance. Consider using anthy instead"; # Added 2025-08-28
@@ -980,6 +989,7 @@ mapAliases {
   libosmo-sccp = throw "'libosmo-sccp' has been renamed to/replaced by 'libosmo-sigtran'"; # Converted to throw 2025-10-27
   libpromhttp = throw "'libpromhttp' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-16
   libpseudo = throw "'libpseudo' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
+  libpthreadstubs = libpthread-stubs; # Added 2025-02-04
   libpulseaudio-vanilla = throw "'libpulseaudio-vanilla' has been renamed to/replaced by 'libpulseaudio'"; # Converted to throw 2025-10-27
   libqt5pas = throw "'libqt5pas' has been renamed to/replaced by 'libsForQt5.libqtpas'"; # Converted to throw 2025-10-27
   libquotient = throw "'libquotient' for qt5 was removed as upstream removed qt5 support. Consider explicitly upgrading to qt6 'libquotient'"; # Converted to throw 2025-07-04
@@ -994,6 +1004,7 @@ mapAliases {
   librewolf-wayland = throw "'librewolf-wayland' has been renamed to/replaced by 'librewolf'"; # Converted to throw 2025-10-27
   librtlsdr = throw "'librtlsdr' has been renamed to/replaced by 'rtl-sdr'"; # Converted to throw 2025-10-27
   libsForQt515 = throw "'libsForQt515' has been renamed to/replaced by 'libsForQt5'"; # Converted to throw 2025-10-27
+  libSM = libsm; # Added 2026-02-04
   libsmartcols = warnAlias "'util-linux' should be used instead of 'libsmartcols'" util-linux; # Added 2025-09-03
   libsoup = throw "'libsoup' has been renamed to/replaced by 'libsoup_2_4'"; # Converted to throw 2025-10-27
   libtap = throw "libtap has been removed, as it was unused and deprecated by its author in favour of cmocka"; # Added 2025-09-16
@@ -1824,6 +1835,7 @@ mapAliases {
   usync = throw "'usync' has been removed as it is unused and unmaintained upstream"; # Added 2025-12-18
   util-linuxCurses = throw "'util-linuxCurses' has been renamed to/replaced by 'util-linux'"; # Converted to throw 2025-10-27
   utillinux = warnAlias "'utillinux' has been renamed to/replaced by 'util-linux'" util-linux; # Converted to warning 2025-10-28
+  utilmacros = util-macros; # Added 2025-02-04
   vaapiIntel = throw "'vaapiIntel' has been renamed to/replaced by 'intel-vaapi-driver'"; # Converted to throw 2025-10-27
   vaapiVdpau = throw "'vaapiVdpau' has been renamed to/replaced by 'libva-vdpau-driver'"; # Converted to throw 2025-10-27
   valum = throw "'valum' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
@@ -1901,14 +1913,24 @@ mapAliases {
   wxGTK33 = wxwidgets_3_3; # Added 2025-07-20
   xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28
   xbursttools = throw "'xbursttools' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-12
+  xcb-util-cursor = libxcb-cursor; # Added 2026-02-04
   xcb-util-cursor-HEAD = warnAlias "'xcb-util-cursor-HEAD' has been removed; use 'libxcb-cursor' instead" libxcb-cursor; # added 2026-01-12
+  xcbutil = libxcb-util; # Added 2026-02-04
+  xcbutilcursor = libxcb-cursor; # Added 2026-02-04
+  xcbutilerrors = libxcb-errors; # Added 2026-02-04
+  xcbutilimage = libxcb-image; # Added 2026-02-04
+  xcbutilkeysyms = libxcb-keysyms; # Added 2026-02-04
+  xcbutilrenderutil = libxcb-render-util; # Added 2026-02-04
+  xcbutilwm = libxcb-wm; # Added 2026-02-04
   xcursorthemes = xcursor-themes; # Added 2026-01-19
   xdragon = throw "'xdragon' has been renamed to/replaced by 'dragon-drop'"; # Converted to throw 2025-10-27
   xf86_input_cmt = xf86-input-cmt; # Added 2025-12-12
   xf86_input_wacom = xf86-input-wacom; # Added 2025-12-12
   xf86_video_nested = xf86-video-nested; # added 2026-01-13
+  xf86inputevdev = xf86-input-evdev; # Added 2026-02-04
   xf86inputjoystick = xf86-input-joystick; # Added 2026-01-19
   xf86inputkeyboard = xf86-input-keyboard; # Added 2026-01-19
+  xf86inputlibinput = xf86-input-libinput; # Added 2026-02-04
   xf86inputmouse = xf86-input-mouse; # Added 2026-01-19
   xf86inputsynaptics = xf86-input-synaptics; # Added 2026-01-19
   xf86inputvmmouse = xf86-input-vmmouse; # Added 2026-01-19
@@ -1931,6 +1953,7 @@ mapAliases {
   xf86videomga = xf86-video-mga; # Added 2026-01-19
   xf86videoneomagic = xf86-video-neomagic; # Added 2026-01-19
   xf86videonewport = throw "The Xorg Newport video driver is broken and hasn't had a release since 2012"; # added 2025-12-13
+  xf86videonouveau = xf86-video-nouveau; # Added 2026-02-04
   xf86videonv = xf86-video-nv; # Added 2026-01-19
   xf86videoomap = xf86-video-omap; # Added 2026-01-19
   xf86videoopenchrome = xf86-video-openchrome; # Added 2026-01-19
@@ -1957,6 +1980,7 @@ mapAliases {
   xflux-gui = throw "'xflux-gui' has been removed as it was unmaintained"; # Added 2025-08-22
   xinput_calibrator = xinput-calibrator; # Added 2025-08-28
   xjump = throw "'xjump' has been removed as it is unmaintained"; # Added 2025-08-22
+  xkeyboardconfig = xkeyboard-config; # Added 2026-02-04
   xkeyboardconfig_custom = xkeyboard-config_custom; # Added 2026-01-19
   xmlada = throw "'xmlada' has been renamed to/replaced by 'gnatPackages.xmlada'"; # Converted to throw 2025-10-27
   xmlroff = throw "'xmlroff' has been removed as it is unmaintained and broken"; # Added 2025-05-18
@@ -2220,7 +2244,9 @@ mapAliases {
       # keep-sorted end
     };
   xorg-autoconf = util-macros; # Added 2025-08-18
+  xorgcffiles = xorg-cf-files; # Added 2026-02-04
   xorgdocs = xorg-docs; # Added 2026-01-19
+  xorgserver = xorg-server; # Added 2026-02-04
   xorgsgmldoctools = xorg-sgml-doctools; # Added 2026-01-19
   xow_dongle-firmware = throw "'xow_dongle-firmware' has been renamed to/replaced by 'xone-dongle-firmware'"; # Added 2025-12-30
   xsw = throw "'xsw' has been removed due to lack of upstream maintenance"; # Added 2025-08-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e6e2b01f9fe..968fec3c04b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7854,8 +7854,6 @@ with pkgs;
     libmagic = file;
   };
 
-  xcb-util-cursor = libxcb-cursor;
-
   xgboostWithCuda = xgboost.override { cudaSupport = true; };
 
   zlib = callPackage ../development/libraries/zlib {
@@ -8824,17 +8822,6 @@ with pkgs;
 
   virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone;
 
-  fontadobe100dpi = font-adobe-100dpi;
-  fontadobeutopia100dpi = font-adobe-utopia-100dpi;
-  fontbh100dpi = font-bh-100dpi;
-  fontbhlucidatypewriter100dpi = font-bh-lucidatypewriter-100dpi;
-  fontbitstream100dpi = font-bitstream-100dpi;
-  fontutil = font-util;
-  libAppleWM = libapplewm;
-  libFS = libfs;
-  libICE = libice;
-  libpthreadstubs = libpthread-stubs;
-  libSM = libsm;
   libX11 = libx11;
   libXau = libxau;
   libXaw = libxaw;
@@ -8864,21 +8851,7 @@ with pkgs;
   libXxf86misc = libxxf86misc;
   libXxf86vm = libxxf86vm;
   mkfontdir = mkfontscale;
-  utilmacros = util-macros;
   xcbproto = xcb-proto;
-  xcbutil = libxcb-util;
-  xcbutilcursor = libxcb-cursor;
-  xcbutilerrors = libxcb-errors;
-  xcbutilimage = libxcb-image;
-  xcbutilkeysyms = libxcb-keysyms;
-  xcbutilrenderutil = libxcb-render-util;
-  xcbutilwm = libxcb-wm;
-  xf86inputevdev = xf86-input-evdev;
-  xf86inputlibinput = xf86-input-libinput;
-  xf86videonouveau = xf86-video-nouveau;
-  xkeyboardconfig = xkeyboard-config;
-  xorgcffiles = xorg-cf-files;
-  xorgserver = xorg-server;
 
   zabbixFor = version: rec {
     agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version};