diff --git a/pkgs/games/cutechess/default.nix b/pkgs/by-name/cu/cutechess/package.nix
similarity index 76%
rename from pkgs/games/cutechess/default.nix
rename to pkgs/by-name/cu/cutechess/package.nix
index 059c330f1a99..cac459a1656d 100644
--- a/pkgs/games/cutechess/default.nix
+++ b/pkgs/by-name/cu/cutechess/package.nix
@@ -3,8 +3,7 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
-  qtbase,
+  qt5,
   lib,
 }:
 
@@ -15,17 +14,17 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "cutechess";
     repo = "cutechess";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-vhS3Eenxcq7D8E5WVON5C5hCTytcEVbYUeuCkfB0apA=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
+    qt5.qtbase
   ];
 
   postInstall = ''
@@ -35,12 +34,12 @@ stdenv.mkDerivation (finalAttrs: {
     install -Dm444 $src/docs/cutechess-engines.json.5 -t $out/share/man/man5/
   '';
 
-  meta = with lib; {
+  meta = {
     description = "GUI, CLI, and library for playing chess";
     homepage = "https://cutechess.com/";
-    license = licenses.gpl3Plus;
-    maintainers = [ ];
-    platforms = with platforms; (linux ++ windows);
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ iedame ];
+    platforms = with lib.platforms; (linux ++ windows);
     mainProgram = "cutechess";
   };
 })
diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/by-name/cu/cutemaze/package.nix
similarity index 62%
rename from pkgs/games/cutemaze/default.nix
rename to pkgs/by-name/cu/cutemaze/package.nix
index cb4a66b3bf3c..7569510e6dfd 100644
--- a/pkgs/games/cutemaze/default.nix
+++ b/pkgs/by-name/cu/cutemaze/package.nix
@@ -3,34 +3,30 @@
   stdenv,
   fetchurl,
   cmake,
-  qttools,
-  wrapQtAppsHook,
-  qtbase,
-  qtwayland,
-  qtsvg,
+  qt6,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "cutemaze";
   version = "1.3.5";
 
   src = fetchurl {
-    url = "https://gottcode.org/cutemaze/cutemaze-${version}.tar.bz2";
+    url = "https://gottcode.org/cutemaze/cutemaze-${finalAttrs.version}.tar.bz2";
     hash = "sha256-a+QIOD0TB0AGnqIUgtkMBZuPUCQbXp4NtZ6b0vk/J0c=";
   };
 
   nativeBuildInputs = [
     cmake
-    qttools
-    wrapQtAppsHook
+    qt6.qttools
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtsvg
+    qt6.qtbase
+    qt6.qtsvg
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    qtwayland
+    qt6.qtwayland
   ];
 
   installPhase =
@@ -47,13 +43,16 @@ stdenv.mkDerivation rec {
     else
       null;
 
-  meta = with lib; {
-    changelog = "https://github.com/gottcode/cutemaze/blob/v${version}/ChangeLog";
+  meta = {
+    changelog = "https://github.com/gottcode/cutemaze/blob/v${finalAttrs.version}/ChangeLog";
     description = "Simple, top-down game in which mazes are randomly generated";
     mainProgram = "cutemaze";
     homepage = "https://gottcode.org/cutemaze/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dotlambda ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      dotlambda
+      iedame
+    ];
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a1c7a5c4ce0..692de13efcd1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13366,10 +13366,6 @@ with pkgs;
   curseofwar = callPackage ../games/curseofwar { SDL = null; };
   curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; };
 
-  cutechess = qt5.callPackage ../games/cutechess { };
-
-  cutemaze = qt6Packages.callPackage ../games/cutemaze { };
-
   ddnet-server = ddnet.override { buildClient = false; };
 
   duckmarines = callPackage ../games/duckmarines { love = love_0_10; };