diff --git a/gamedata/core.games/common.games.txt b/gamedata/core.games/common.games.txt
index b26edae5..fc962f88 100644
--- a/gamedata/core.games/common.games.txt
+++ b/gamedata/core.games/common.games.txt
@@ -133,6 +133,7 @@
 	{
 		"#supported"
 		{
+			"engine"				"csgo"
 			"game"					"cstrike"
 			"game"					"dod"
 			"game"					"sourceforts"
@@ -159,7 +160,6 @@
 			"game"					"dinodday"
 			"game"					"esmod"
 			"game"					"nucleardawn"
-			"game"					"csgo"
 			"game"					"berimbau"
 			"game"					"nmrih"
 			"game"					"KreedzClimbing"
@@ -178,6 +178,7 @@
 	{
 		"#supported"
 		{
+			"engine"				"csgo"
 			"game"					"tf"
 			"game"					"synergy"
 			"game"					"dod"
@@ -195,7 +196,6 @@
 			"game"					"fof"
 			"game"					"dinodday"
 			"game"					"nucleardawn"
-			"game"					"csgo"
 			"game"					"berimbau"
 			"game"					"$INSURGENCY" // retail game
 			"game"					"nmrih"
@@ -258,8 +258,8 @@
 	{
 		"#supported"
 		{
+			"engine"	"csgo"
 			"game"		"cstrike"
-			"game"		"csgo"
 		}
 		
 		"Keys"
diff --git a/gamedata/core.games/engine.csgo.txt b/gamedata/core.games/engine.csgo.txt
index c3532c4c..e52ad97b 100644
--- a/gamedata/core.games/engine.csgo.txt
+++ b/gamedata/core.games/engine.csgo.txt
@@ -14,11 +14,6 @@
 	/* CGlobalEntityList */
 	"#default"
 	{
-		"#supported"
-		{
-			"game"		"csgo"
-		}
-		
 		"Addresses"
 		{
 			"EntInfosPtr"
diff --git a/gamedata/sdktools.games/engine.csgo.txt b/gamedata/sdktools.games/engine.csgo.txt
index 04047316..a204a4dd 100644
--- a/gamedata/sdktools.games/engine.csgo.txt
+++ b/gamedata/sdktools.games/engine.csgo.txt
@@ -208,7 +208,7 @@
 		}
 	}
 	
-	"csgo"
+	"#default"
 	{
 		"Keys"
 		{
diff --git a/gamedata/sm-cstrike.games/game.csgo.txt b/gamedata/sm-cstrike.games/game.csgo.txt
index a2d95a59..2141515d 100644
--- a/gamedata/sm-cstrike.games/game.csgo.txt
+++ b/gamedata/sm-cstrike.games/game.csgo.txt
@@ -11,7 +11,7 @@
 
 "Games"
 {
-	"csgo"
+	"#default"
 	{
 		"Keys"
 		{
@@ -165,7 +165,7 @@
 		}
 	}
 	
-	"csgo"
+	"#default"
 	{
 		"Keys"
 		{
@@ -183,7 +183,7 @@
 		}
 	}
 	
-	"csgo"
+	"#default"
 	{
 		"Keys"
 		{
@@ -201,7 +201,7 @@
 		}
 	}
 	
-	"csgo"
+	"#default"
 	{
 		"Keys"
 		{
diff --git a/gamedata/sm-cstrike.games/master.games.txt b/gamedata/sm-cstrike.games/master.games.txt
index 42c3576b..0c83ac53 100644
--- a/gamedata/sm-cstrike.games/master.games.txt
+++ b/gamedata/sm-cstrike.games/master.games.txt
@@ -1,23 +1,23 @@
-/**
- * Do not edit this file.  Any changes will be overwritten by the gamedata
- * updater or by upgrading your SourceMod install.
- *
- * To override data in this file, create a subdirectory named "custom" and
- * place your own gamedata file(s) inside of it.  Such files will be parsed
- * after SM's own.
- *
- * For more information, see http://wiki.alliedmods.net/Gamedata_Updating_(SourceMod)
- */
-
-"Game Master"
-{
-	"game.csgo.txt"
-	{
-		"game"		"csgo"
-	}
-
-	"game.css.txt"
-	{
-		"game"		"cstrike"
-	}	
-}
+/**
+ * Do not edit this file.  Any changes will be overwritten by the gamedata
+ * updater or by upgrading your SourceMod install.
+ *
+ * To override data in this file, create a subdirectory named "custom" and
+ * place your own gamedata file(s) inside of it.  Such files will be parsed
+ * after SM's own.
+ *
+ * For more information, see http://wiki.alliedmods.net/Gamedata_Updating_(SourceMod)
+ */
+
+"Game Master"
+{
+	"game.csgo.txt"
+	{
+		"engine"	"csgo"
+	}
+
+	"game.css.txt"
+	{
+		"game"		"cstrike"
+	}	
+}