diff --git a/wadsrc/static/iwadinfo.txt b/wadsrc/static/iwadinfo.txt
index 0fcdd9b87..ceceafd2b 100644
--- a/wadsrc/static/iwadinfo.txt
+++ b/wadsrc/static/iwadinfo.txt
@@ -3,6 +3,7 @@
 IWad
 {
 	Name = "The Adventures of Square"
+	Autoname = "square.square"
 	Game = "Doom"
 	Config = "Square"
 	MustContain = "SQU-IWAD", "E1A1"
@@ -12,6 +13,7 @@ IWad
 IWad
 {
 	Name = "The Adventures of Square (Square-ware)"
+	Autoname = "square.squareware"
 	Game = "Doom"
 	Config = "Square"
 	MustContain = "SQU-SWE1", "E1A1"
@@ -21,6 +23,7 @@ IWad
 IWad
 {
 	Name = "Harmony"
+	Autoname = "harmony"
 	Game = "Doom"
 	Config = "Harmony"
 	Mapinfo = "mapinfo/hacxharm.txt"
@@ -33,7 +36,7 @@ IWad
 	Name = "Hacx 2.0"
 	Game = "Doom"
 	Config = "Hacx"
-	Autoname = "Hacx2"
+	Autoname = "hacx.2_0"
 	Mapinfo = "mapinfo/hacxharm.txt"
 	MustContain = "MAP01", "HACX-E"
 	BannerColors = "ff ff ff", "00 88 22"
@@ -44,7 +47,7 @@ IWad
 	Name = "Hacx: Twitch'n Kill"
 	Game = "Doom"
 	Config = "Hacx"
-	Autoname = "Hacx12"
+	Autoname = "hacx.1_2"
 	Mapinfo = "mapinfo/hacxharm.txt"
 	MustContain = "MAP01", "HACX-R"
 	BannerColors = "00 00 a8", "a8 a8 a8"
@@ -53,6 +56,7 @@ IWad
 IWad
 {
 	Name = "Action Doom 2: Urban Brawl"
+	Autoname = "urbanbrawl"
 	Game = "Doom"
 	Config = "UrbanBrawl"
 	Mapinfo = "mapinfo/urbanbrawl.txt"
@@ -63,7 +67,7 @@ IWad
 IWad
 {
 	Name = "Chex(R) Quest 3"
-	Autoname = "Chex3"
+	Autoname = "chex.3"
 	Game = "Chex"
 	Config = "Chex"
 	Mapinfo = "mapinfo/chex.txt"
@@ -75,7 +79,7 @@ IWad
 IWad
 {
 	Name = "Chex(R) Quest"
-	Autoname = "Chex1"
+	Autoname = "chex.1"
 	Game = "Chex"
 	Config = "Chex"
 	Mapinfo = "mapinfo/chex.txt"
@@ -86,6 +90,7 @@ IWad
 IWad
 {
 	Name = "Strife: Quest for the Sigil"
+	Autoname = "strife"
 	Game = "Strife"
 	Config = "Strife"
 	Mapinfo = "mapinfo/strife.txt"
@@ -99,7 +104,7 @@ IWad
 	Name = "Strife: Teaser (New Version)"
 	Game = "Strife"
 	Config = "Strife"
-	Autoname = "Strifeteaser2"
+	Autoname = "strifeteaser2"
 	Mapinfo = "mapinfo/strife.txt"
 	Compatibility = "Shareware", "Teaser2"
 	MustContain = "MAP33", "ENDSTRF", "INVCURS"
@@ -111,7 +116,7 @@ IWad
 	Name = "Strife: Teaser (Old Version)"
 	Game = "Strife"
 	Config = "Strife"
-	Autoname = "Strifeteaser1"
+	Autoname = "strifeteaser1"
 	Mapinfo = "mapinfo/strife.txt"
 	Compatibility = "Shareware"
 	MustContain = "MAP33", "ENDSTRF"
@@ -123,7 +128,7 @@ IWad
 	Name = "Hexen: Beyond Heretic"
 	Game = "Hexen"
 	Config = "Hexen"
-	Autoname = "Hexen1"
+	Autoname = "hexen.hexen"
 	Mapinfo = "mapinfo/hexen.txt"
 	Compatibility = "Poly1"
 	MustContain = "TITLE", "MAP01", "MAP40", "WINNOWR"
@@ -133,7 +138,7 @@ IWad
 IWad
 {
 	Name = "Hexen: Deathkings of the Dark Citadel"
-	Autoname = "HexenDK"
+	Autoname = "hexen.deathkings"
 	Game = "Hexen"
 	Config = "Hexen"
 	Mapinfo = "mapinfo/hexen.txt"
@@ -157,7 +162,7 @@ IWad
 IWad
 {
 	Name = "Blasphemer"
-	Autoname = "Blasphemer"
+	Autoname = "blasphemer"
 	Game = "Heretic"
 	Config = "Heretic"
 	Mapinfo = "mapinfo/heretic.txt"
@@ -168,7 +173,7 @@ IWad
 IWad
 {
 	Name = "Heretic: Shadow of the Serpent Riders"
-	Autoname = "HereticSR"
+	Autoname = "heretic.shadow"
 	Game = "Heretic"
 	Config = "Heretic"
 	Mapinfo = "mapinfo/heretic.txt"
@@ -182,7 +187,7 @@ IWad
 	Name = "Heretic"
 	Game = "Heretic"
 	Config = "Heretic"
-	Autoname = "Heretic1"
+	Autoname = "heretic.heretic"
 	Mapinfo = "mapinfo/heretic.txt"
 	MustContain = "E1M1", "E2M1", "TITLE", "MUS_E1M1"
 	BannerColors = "fc fc 00", "a8 00 00"
@@ -202,8 +207,7 @@ IWad
 IWad
 {
 	Name = "FreeDM"
-	Autoname = "FreeDM"
-	Group = "Freedoom"
+	Autoname = "doom.freedoom.freedm"
 	Game = "Doom"
 	Config = "Doom"
 	Mapinfo = "mapinfo/doom2.txt"
@@ -214,8 +218,7 @@ IWad
 IWad
 {
 	Name = "Freedoom: Phase 2"
-	Autoname = "Freedoom2"
-	Group = "Freedoom"
+	Autoname = "doom.freedoom.phase2"
 	Game = "Doom"
 	Config = "Doom"
 	Mapinfo = "mapinfo/doom2.txt"
@@ -226,8 +229,7 @@ IWad
 IWad
 {
 	Name = "Freedoom: Phase 1"
-	Autoname = "Freedoom1"
-	Group = "Freedoom"
+	Autoname = "doom.freedoom.phase1"
 	Game = "Doom"
 	Config = "Doom"
 	Mapinfo = "mapinfo/doom1.txt"
@@ -238,8 +240,7 @@ IWad
 IWad
 {
 	Name = "Freedoom: Demo Version"
-	Autoname = "Freedoom1"
-	Group = "Freedoom"
+	Autoname = "doom.freedoom.demo"
 	Game = "Doom"
 	Config = "Doom"
 	Mapinfo = "mapinfo/doom1.txt"
@@ -250,7 +251,7 @@ IWad
 IWad
 {
 	Name = "DOOM: BFG Edition"
-	Autoname = "DoomBFG"
+	Autoname = "doom.doom1.bfg"
 	Game = "Doom"
 	Config = "Doom"
 	Mapinfo = "mapinfo/ultdoom.txt"
@@ -265,7 +266,7 @@ IWad
 IWad
 {
 	Name = "The Ultimate DOOM"
-	Autoname = "DoomU"
+	Autoname = "doom.doom1.ultimate"
 	Game = "Doom"
 	Config = "Doom"
 	Mapinfo = "mapinfo/ultdoom.txt"
@@ -279,7 +280,7 @@ IWad
 IWad
 {
 	Name = "DOOM Registered"
-	Autoname = "Doom1"
+	Autoname = "doom.doom1.registered"
 	Game = "Doom"
 	Config = "Doom"
 	Mapinfo = "mapinfo/doom1.txt"
@@ -304,7 +305,7 @@ IWad
 IWad
 {
 	Name = "Final Doom: TNT - Evilution"
-	Autoname = "TNT"
+	Autoname = "doom.doom2.tnt"
 	Game = "Doom"
 	Config = "Doom"
 	Mapinfo = "mapinfo/tnt.txt"
@@ -316,7 +317,7 @@ IWad
 IWad
 {
 	Name = "Final Doom: Plutonia Experiment"
-	Autoname = "Plutonia"
+	Autoname = "doom.doom2.plutonia"
 	Game = "Doom"
 	Config = "Doom"
 	Mapinfo = "mapinfo/plutonia.txt"
@@ -328,7 +329,7 @@ IWad
 IWad
 {
 	Name = "DOOM 2: BFG Edition"
-	Autoname = "Doom2BFG"
+	Autoname = "doom.doom2.bfg"
 	Game = "Doom"
 	Config = "Doom"
 	Mapinfo = "mapinfo/doom2bfg.txt"
@@ -342,7 +343,7 @@ IWad
 IWad
 {
 	Name = "DOOM 2: Hell on Earth"
-	Autoname = "Doom2"
+	Autoname = "doom.doom2.commercial"
 	Game = "Doom"
 	Config = "Doom"
 	Mapinfo = "mapinfo/doom2.txt"