diff --git a/wadsrc_extra/static/iwadinfo.txt b/wadsrc_extra/static/iwadinfo.txt
index d8149623ce6..f0709ec7d22 100644
--- a/wadsrc_extra/static/iwadinfo.txt
+++ b/wadsrc_extra/static/iwadinfo.txt
@@ -325,7 +325,7 @@ IWad
 	Autoname = "doom.id.doom1.bfg"
 	Game = "Doom"
 	Config = "Doom"
-	IWADName = "doom.wad", 2
+	IWADName = "doombfg.wad", 2
 	Mapinfo = "mapinfo/ultdoom.txt"
 	Compatibility = "Shorttex", "nosectionmerge"
 	MustContain = "E1M1","E2M1","E2M2","E2M3","E2M4","E2M5","E2M6","E2M7","E2M8","E2M9",
@@ -342,7 +342,7 @@ IWad
 	Autoname = "doom.id.doom1.kex"
 	Game = "Doom"
 	Config = "Doom"
-	IWADName = "doom.wad", 2
+	IWADName = "doomkex.wad", 2
 	Mapinfo = "mapinfo/ultdoom.txt"
 	Compatibility = "Shorttex", "nosectionmerge"
 	MustContain = "E1M1","E2M1","E2M2","E2M3","E2M4","E2M5","E2M6","E2M7","E2M8","E2M9",
@@ -467,7 +467,7 @@ IWad
 	Autoname = "doom.id.doom2.tnt.kex"
 	Game = "Doom"
 	Config = "Doom"
-	IWADName = "tnt.wad"
+	IWADName = "tntkex.wad"
 	Mapinfo = "mapinfo/tnt.txt"
 	Compatibility = "Shorttex", "Stairs"
 	MustContain = "MAP01", "REDTNT2", "GAMECONF"
@@ -510,7 +510,7 @@ IWad
 	Autoname = "doom.id.doom2.plutonia.kex"
 	Game = "Doom"
 	Config = "Doom"
-	IWADName = "plutonia.wad"
+	IWADName = "plutoniakex.wad"
 	Mapinfo = "mapinfo/plutonia.txt"
 	Compatibility = "Shorttex"
 	MustContain = "MAP01", "CAMO1", "GAMECONF"
@@ -539,7 +539,7 @@ IWad
 	Autoname = "doom.id.doom2.bfg"
 	Game = "Doom"
 	Config = "Doom"
-	IWADName = "doom2.wad"
+	IWADName = "doom2bfg.wad"
 	Mapinfo = "mapinfo/doom2bfg.txt"
 	Compatibility = "Shorttex", "nosectionmerge"
 	MustContain = "MAP01", "DMENUPIC", "M_ACPT", "M_CAN", "M_EXITO", "M_CHG"
@@ -554,7 +554,7 @@ IWad
 	Autoname = "doom.id.doom2.kex"
 	Game = "Doom"
 	Config = "Doom"
-	IWADName = "doom2.wad", 2
+	IWADName = "doom2kex.wad", 2
 	Mapinfo = "mapinfo/doom2.txt"
 	Compatibility = "Shorttex", "nosectionmerge"
 	MustContain = "MAP01", "DMENUPIC", "GAMECONF"
@@ -584,7 +584,7 @@ IWad
 	Autoname = "doom.id.doom2.commercial.xbox"
 	Game = "Doom"
 	Config = "Doom"
-	IWADName = "doom2.wad", 1
+	IWADName = "doom2xbox.wad", 1
 	Mapinfo = "mapinfo/doom2xbox.txt"
 	Compatibility = "Shorttex", "nosectionmerge"
 	MustContain = "MAP01", "MAP33", "CWILV32"
@@ -628,10 +628,12 @@ Names
 	"doom_complete.pk3"
 	"doom2.wad"
 	"doom2unity.wad"
+	"doom2kex.wad"
 	"doom2f.wad"
 	"doomu.wad"
 	"doom.wad"
 	"doomunity.wad"
+	"doomkex.wad"
 	"doom1.wad"
 	"bfgdoom.wad"
 	"bfgdoom2.wad"
@@ -641,8 +643,10 @@ Names
 	"doom2xbox.wad"
 	"plutonia.wad"
 	"plutoniaunity.wad"
+	"plutoniakex.wad"
 	"tnt.wad"
 	"tntunity.wad"
+	"tntkex.wad"
 	"freedoom1.wad"
 	"freedoom2.wad"
 	"freedoomu.wad"
@@ -677,17 +681,17 @@ Order	// Order in the IWAD selection box
 	"DOOM: Complete: WadSmoosh"
 	"DOOM 2: Hell on Earth"
 	"DOOM 2: L'Enfer sur Terre"
+	"DOOM 2: BFG Edition"
+	"DOOM 2: XBox Edition"
+	"DOOM 2: KEX Edition"
+	"DOOM 2: Unity Edition"
 	"The Ultimate DOOM"
 	"DOOM Registered"
 	"DOOM Shareware"
 	"DOOM: BFG Edition"
-	"DOOM 2: BFG Edition"
 	"DOOM: XBox Edition"
-	"DOOM 2: XBox Edition"
 	"DOOM: KEX Edition"
 	"DOOM: Unity Edition"
-	"DOOM 2: KEX Edition"
-	"DOOM 2: Unity Edition"
 	"Final Doom: Plutonia Experiment"
 	"Final Doom: Plutonia Experiment: Unity Edition"
 	"Final Doom: Plutonia Experiment: KEX Edition"