diff --git a/pkgs/games/0ad/data.nix b/pkgs/by-name/ze/zeroad-data/package.nix
similarity index 100%
rename from pkgs/games/0ad/data.nix
rename to pkgs/by-name/ze/zeroad-data/package.nix
diff --git a/pkgs/games/0ad/fix-build-script.patch b/pkgs/by-name/ze/zeroad-unwrapped/fix-build-script.patch
similarity index 100%
rename from pkgs/games/0ad/fix-build-script.patch
rename to pkgs/by-name/ze/zeroad-unwrapped/fix-build-script.patch
diff --git a/pkgs/games/0ad/game.nix b/pkgs/by-name/ze/zeroad-unwrapped/package.nix
similarity index 100%
rename from pkgs/games/0ad/game.nix
rename to pkgs/by-name/ze/zeroad-unwrapped/package.nix
diff --git a/pkgs/games/0ad/rootdir_env.patch b/pkgs/by-name/ze/zeroad-unwrapped/rootdir_env.patch
similarity index 100%
rename from pkgs/games/0ad/rootdir_env.patch
rename to pkgs/by-name/ze/zeroad-unwrapped/rootdir_env.patch
diff --git a/pkgs/games/0ad/wrapper.nix b/pkgs/by-name/ze/zeroad/package.nix
similarity index 100%
rename from pkgs/games/0ad/wrapper.nix
rename to pkgs/by-name/ze/zeroad/package.nix
diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix
deleted file mode 100644
index 963b3c471217..000000000000
--- a/pkgs/games/0ad/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  fmt,
-  wxGTK,
-  stdenv,
-  newScope,
-}:
-let
-  callPackage = newScope self;
-
-  self = {
-    zeroad-unwrapped = callPackage ./game.nix { inherit fmt wxGTK stdenv; };
-
-    zeroad-data = callPackage ./data.nix { inherit stdenv; };
-
-    zeroad = callPackage ./wrapper.nix { };
-  };
-
-in
-self
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b7e55f2f4371..1f20014a8b9f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1733,6 +1733,11 @@ mapAliases {
 
   ### Z ###
 
+  zeroadPackages = recurseIntoAttrs {
+    zeroad = lib.warnOnInstantiate "'zeroadPackages.zeroad' has been renamed to 'zeroad'" zeroad; # Added 2025-03-22
+    zeroad-data = lib.warnOnInstantiate "'zeroadPackages.zeroad-data' has been renamed to 'zeroad-data'" zeroad-data; # Added 2025-03-22
+    zeroad-unwrapped = lib.warnOnInstantiate "'zeroadPackages.zeroad-unwrapped' has been renamed to 'zeroad-unwrapped'" zeroad-unwrapped; # Added 2025-03-22
+  };
   zeromq4 = zeromq; # Added 2024-11-03
   zfsStable = zfs; # Added 2024-02-26
   zfsUnstable = zfs_unstable; # Added 2024-02-26
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c253c9d35785..de87b1392570 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16497,12 +16497,10 @@ with pkgs;
     yquake2-the-reckoning
     yquake2-all-games;
 
-  zeroadPackages = recurseIntoAttrs (callPackage ../games/0ad {
+  zeroad-unwrapped = callPackage ../by-name/ze/zeroad-unwrapped/package.nix {
     wxGTK = wxGTK32;
     fmt = fmt_9;
-  });
-
-  zeroad = zeroadPackages.zeroad;
+  };
 
   ### DESKTOP ENVIRONMENTS