diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp
index f679bec3dc..f10651e658 100644
--- a/src/gameconfigfile.cpp
+++ b/src/gameconfigfile.cpp
@@ -166,19 +166,23 @@ FGameConfigFile::FGameConfigFile ()
 	CreateSectionAtStart("Harmony.Autoload");
 	CreateSectionAtStart("UrbanBrawl.Autoload");
 	CreateSectionAtStart("Chex3.Autoload");
+	CreateSectionAtStart("Chex1.Autoload");
 	CreateSectionAtStart("Chex.Autoload");
 	CreateSectionAtStart("Strife.Autoload");
-	CreateSectionAtStart("HexenDemo.Autoload");
 	CreateSectionAtStart("HexenDK.Autoload");
 	CreateSectionAtStart("Hexen.Autoload");
+	CreateSectionAtStart("HereticSR.Autoload");
 	CreateSectionAtStart("Heretic.Autoload");
 	CreateSectionAtStart("FreeDM.Autoload");
+	CreateSectionAtStart("Freedoom2.Autoload");
 	CreateSectionAtStart("Freedoom1.Autoload");
 	CreateSectionAtStart("Freedoom.Autoload");
 	CreateSectionAtStart("Plutonia.Autoload");
 	CreateSectionAtStart("TNT.Autoload");
+	CreateSectionAtStart("Doom2BFG.Autoload");
 	CreateSectionAtStart("Doom2.Autoload");
 	CreateSectionAtStart("Doom1.Autoload");
+	CreateSectionAtStart("DoomBFG.Autoload");
 	CreateSectionAtStart("Doom.Autoload");
 	CreateSectionAtStart("Global.Autoload");
 
diff --git a/wadsrc/static/iwadinfo.txt b/wadsrc/static/iwadinfo.txt
index 088e744660..43fc340a63 100644
--- a/wadsrc/static/iwadinfo.txt
+++ b/wadsrc/static/iwadinfo.txt
@@ -163,7 +163,7 @@ IWad
 IWad
 {
 	Name = "Heretic: Shadow of the Serpent Riders"
-	Autoname = "Heretic1"
+	Autoname = "HereticSR"
 	Game = "Heretic"
 	Config = "Heretic"
 	Mapinfo = "mapinfo/heretic.txt"
@@ -175,7 +175,6 @@ IWad
 IWad
 {
 	Name = "Heretic"
-	Autoname = "Heretic1"
 	Game = "Heretic"
 	Config = "Heretic"
 	Mapinfo = "mapinfo/heretic.txt"
@@ -208,7 +207,7 @@ IWad
 IWad
 {
 	Name = "Freedoom: Phase 2"
-	Autoname = "Freedoom"
+	Autoname = "Freedoom2"
 	Game = "Doom"
 	Config = "Doom"
 	Mapinfo = "mapinfo/doom2.txt"
@@ -229,7 +228,7 @@ IWad
 	
 IWad
 {
-	Name = "Freedoom 'Demo'"
+	Name = "Freedoom: Demo Version"
 	Autoname = "Freedoom1"
 	Game = "Doom"
 	Config = "Doom"
@@ -240,8 +239,8 @@ IWad
 	
 IWad
 {
-	Name = "DOOM 1: BFG Edition"
-	Autoname = "Doom1"
+	Name = "DOOM: BFG Edition"
+	Autoname = "DoomBFG"
 	Game = "Doom"
 	Config = "Doom"
 	Mapinfo = "mapinfo/ultdoom.txt"