diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index da917e2870..8400849be2 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -288,9 +288,9 @@ (define-public alex4
 The game includes a built-in editor so you can design and share your own maps.")
     (license license:gpl2+)))
 
-(define-public armagetron-advanced
+(define-public armagetronad
   (package
-    (name "armagetron-advanced")
+    (name "armagetronad")
     (version "0.2.8.3.4")
     (source (origin
               (method url-fetch)
@@ -317,8 +317,8 @@ (define-public armagetron-advanced
 physics settings to tweak as well.")
     (license license:gpl2+)))
 
-(define-public armagetronad
-  (deprecated-package "armagetronad" armagetron-advanced))
+(define-public armagetron-advanced
+  (deprecated-package "armagetron-advanced" armagetronad))
 
 (define-public bastet
   (package
@@ -384,7 +384,7 @@ (define-public bastet
 canyons and wait for the long I-shaped block to clear four rows at a time.")
     (license license:gpl3+)))
 
-(define-public cataclysm-dark-days-ahead
+(define-public cataclysm-dda
   (let ((commit "9c732a5de48928691ab863d3ab275ca7b0e522fc"))
     (package
       (name "cataclysm-dda")
@@ -449,8 +449,8 @@ (define-public cataclysm-dark-days-ahead
 want what you have.")
       (license license:cc-by-sa3.0))))
 
-(define-public cataclysm-dda
-  (deprecated-package "cataclysm-dda" cataclysm-dark-days-ahead))
+(define-public cataclysm-dark-days-ahead
+  (deprecated-package "cataclysm-dark-days-ahead" cataclysm-dda))
 
 (define-public cowsay
   (package
@@ -1312,9 +1312,9 @@ (define-public xshogi
     ;; state "GNU General Public Licence" without specifying a version.
     (license license:gpl1+)))
 
-(define-public l-abbaye-des-morts
+(define-public abbaye
   (package
-    (name "l-abbaye-des-morts")
+    (name "abbaye")
     (version "2.0.1")
     (source
      (origin
@@ -1366,8 +1366,8 @@ (define-public l-abbaye-des-morts
 that beneath its ruins lay buried an ancient evil.")
     (license license:gpl3)))
 
-(define-public abbaye
-  (deprecated-package "abbaye" l-abbaye-des-morts))
+(define-public l-abbaye-des-morts
+  (deprecated-package "l-abbaye-des-morts" abbaye))
 
 (define-public angband
   (package
@@ -2215,9 +2215,9 @@ (define-public gnujump
 falling, themeable graphics and sounds, and replays.")
     (license license:gpl3+)))
 
-(define-public the-battle-for-wesnoth
+(define-public wesnoth
   (package
-    (name "the-battle-for-wesnoth")
+    (name "wesnoth")
     (version "1.14.6")
     (source (origin
               (method url-fetch)
@@ -2255,13 +2255,13 @@ (define-public the-battle-for-wesnoth
 next campaign.")
     (license license:gpl2+)))
 
-(define-public wesnoth
-  (deprecated-package "wesnoth" the-battle-for-wesnoth))
+(define-public the-battle-for-wesnoth
+  (deprecated-package "the-battle-for-wesnoth" wesnoth))
 
-(define-public the-battle-for-wesnoth-server
+(define-public wesnoth-server
   (package
-    (inherit the-battle-for-wesnoth)
-    (name "the-battle-for-wesnoth-server")
+    (inherit wesnoth)
+    (name "wesnoth-server")
     (inputs
      `(("boost" ,boost)
        ("icu4c" ,icu4c)
@@ -2274,8 +2274,8 @@ (define-public the-battle-for-wesnoth-server
     (description "This package contains a dedicated server for @emph{The
 Battle for Wesnoth}.")))
 
-(define-public wesnoth-server
-  (deprecated-package "wesnoth-server" the-battle-for-wesnoth-server))
+(define-public the-battle-for-wesnoth-server
+  (deprecated-package "the-battle-for-wesnoth-server" wesnoth-server))
 
 (define-public gamine
   (package
@@ -3250,9 +3250,9 @@ (define-public warzone2100
                    license:gpl2+
                    license:lgpl2.1+))))
 
-(define-public project-starfighter
+(define-public starfighter
   (package
-    (name "project-starfighter")
+    (name "starfighter")
     (version "1.7")
     (source (origin
               (method url-fetch)
@@ -3285,8 +3285,8 @@ (define-public project-starfighter
                    license:cc0
                    license:public-domain))))
 
-(define-public starfighter
-  (deprecated-package "starfighter" project-starfighter))
+(define-public project-starfighter
+  (deprecated-package "project-starfighter" starfighter))
 
 (define-public chromium-bsu
   (package
@@ -4116,9 +4116,9 @@ (define-public cdogs-sdl
                    license:cc-by3.0
                    license:cc-by-sa3.0))))
 
-(define-public kiki-the-nano-bot
+(define-public kiki
   (package
-    (name "kiki-the-nano-bot")
+    (name "kiki")
     (version "1.0.2")
     (source (origin
               (method url-fetch)
@@ -4212,8 +4212,8 @@ (define-public kiki-the-nano-bot
     ;; for a statement from the author.
     (license license:public-domain)))
 
-(define-public kiki
-  (deprecated-package "kiki" kiki-the-nano-bot))
+(define-public kiki-the-nano-bot
+  (deprecated-package "kiki-the-nano-bot" kiki))
 
 (define-public teeworlds
   (package
@@ -4435,9 +4435,9 @@ (define-public chroma
  becoming difficult enough to tax even the brightest of minds.")
     (license license:gpl2+)))
 
-(define-public fish-fillets-ng
+(define-public fillets-ng
   (package
-    (name "fish-fillets-ng")
+    (name "fillets-ng")
     (version "1.0.1")
     (source (origin
               (method url-fetch)
@@ -4504,12 +4504,12 @@ (define-public fish-fillets-ng
 fish.  The whole game is accompanied by quiet, comforting music.")
     (license license:gpl2+)))
 
-(define-public fillets-ng
-  (deprecated-package "fillets-ng" fish-fillets-ng))
+(define-public fish-fillets-ng
+  (deprecated-package "fish-fillets-ng" fillets-ng))
 
-(define-public dungeon-crawl-stone-soup
+(define-public crawl
   (package
-    (name "dungeon-crawl-stone-soup")
+    (name "crawl")
     (version "0.23.2")
     (source
      (origin
@@ -4586,16 +4586,16 @@ (define-public dungeon-crawl-stone-soup
                    license:zlib
                    license:asl2.0))))
 
-(define-public crawl
-  (deprecated-package "crawl" dungeon-crawl-stone-soup))
+(define-public dungeon-crawl-stone-soup
+  (deprecated-package "dungeon-crawl-stone-soup" crawl))
 
 ;; The linter here claims that patch file names should start with the package
 ;; name. But, in this case, the patches are inherited from crawl with the
 ;; "crawl-" prefix instead of "crawl-tiles-".
-(define-public dungeon-crawl-stone-soup-tiles
+(define-public crawl-tiles
   (package
-    (inherit dungeon-crawl-stone-soup)
-    (name "dungeon-crawl-stone-soup-tiles")
+    (inherit crawl)
+    (name "crawl-tiles")
     (arguments
      (substitute-keyword-arguments
          (package-arguments crawl)
@@ -4625,8 +4625,8 @@ (define-public dungeon-crawl-stone-soup-tiles
        ("which" ,which)))
     (synopsis "Graphical roguelike dungeon crawler game")))
 
-(define-public crawl-tiles
-  (deprecated-package "crawl-tiles" dungeon-crawl-stone-soup-tiles))
+(define-public dungeon-crawl-stone-soup-tiles
+  (deprecated-package "dungeon-crawl-stone-soup-tiles" crawl-tiles))
 
 (define-public lugaru
   (package
@@ -4910,9 +4910,9 @@ (define-public open-adventure
 \"adventure 2.5\" and \"430-point adventure\".")
       (license license:bsd-2))))
 
-(define-public tales-of-maj-eyal
+(define-public tome4
   (package
-    (name "tales-of-maj-eyal")
+    (name "tome4")
     (version "1.5.10")
     (synopsis "Single-player, RPG roguelike game set in the world of Eyal")
     (source
@@ -5033,8 +5033,8 @@ (define-public tales-of-maj-eyal
 Tales of Maj’Eyal offers engaging roguelike gameplay for the 21st century.")
     (license license:gpl3+)))
 
-(define-public tome4
-  (deprecated-package "tome4" tales-of-maj-eyal))
+(define-public tales-of-maj-eyal
+  (deprecated-package "tales-of-maj-eyal" tome4))
 
 (define-public quakespasm
   (package
@@ -6273,9 +6273,9 @@ (define-public stepmania
     (home-page "https://www.stepmania.com")
     (license license:expat)))
 
-(define-public battle-tanks
+(define-public btanks
   (package
-    (name "battle-tanks")
+    (name "btanks")
     (version "0.9.8083")
     (source
      (origin
@@ -6359,8 +6359,8 @@ (define-public battle-tanks
     ;; developers.
     (license (list license:gpl2+ license:lgpl2.1+))))
 
-(define-public btanks
-  (deprecated-package "btanks" battle-tanks))
+(define-public battle-tanks
+  (deprecated-package "battle-tanks" btanks))
 
 (define-public slingshot
   (package
@@ -6516,9 +6516,9 @@ (define-public arx-libertatis
 the desired spell.")
     (license license:gpl3+)))
 
-(define-public the-legend-of-edgar
+(define-public edgar
   (package
-    (name "the-legend-of-edgar")
+    (name "edgar")
     (version "1.31")
     (source
      (origin
@@ -6561,8 +6561,8 @@ (define-public the-legend-of-edgar
     (home-page "https://www.parallelrealities.co.uk/games/edgar/")
     (license license:gpl2+)))
 
-(define-public edgar
-  (deprecated-package "edgar" the-legend-of-edgar))
+(define-public the-legend-of-edgar
+  (deprecated-package "the-legend-of-edgar" edgar))
 
 (define-public openclonk
   (package