diff --git a/gamedata/common.games/entities.games/cstrike/offsets-cbot.txt b/gamedata/common.games/entities.games/cstrike/offsets-cbot.txt
index 6eb9025f..4d8bdcdf 100644
--- a/gamedata/common.games/entities.games/cstrike/offsets-cbot.txt
+++ b/gamedata/common.games/entities.games/cstrike/offsets-cbot.txt
@@ -19,7 +19,7 @@
 			{
 				"Offsets"
 				{
-					"m_profile"  // const BotProfile*
+					"m_profile"  // const class BotProfile*
 					{
 						"windows"   "2480"
 						"linux"     "2500"
diff --git a/gamedata/common.games/entities.games/cstrike/offsets-ccsbot.txt b/gamedata/common.games/entities.games/cstrike/offsets-ccsbot.txt
index c717ac6b..cf37b736 100644
--- a/gamedata/common.games/entities.games/cstrike/offsets-ccsbot.txt
+++ b/gamedata/common.games/entities.games/cstrike/offsets-ccsbot.txt
@@ -138,98 +138,98 @@
 						"mac"       "2696"
 					}
 
-					"m_idleState"  // IdleState
+					"m_idleState"  // class IdleState
 					{
 						"windows"   "2684"
 						"linux"     "2704"
 						"mac"       "2704"
 					}
 
-					"m_huntState"  // HuntState
+					"m_huntState"  // class HuntState
 					{
 						"windows"   "2688"
 						"linux"     "2708"
 						"mac"       "2708"
 					}
 
-					"m_attackState"  // AttackState
+					"m_attackState"  // class AttackState
 					{
 						"windows"   "2696"
 						"linux"     "2716"
 						"mac"       "2716"
 					}
 
-					"m_investigateNoiseState"  // InvestigateNoiseState
+					"m_investigateNoiseState"  // class InvestigateNoiseState
 					{
 						"windows"   "2756"
 						"linux"     "2776"
 						"mac"       "2776"
 					}
 
-					"m_buyState"  // BuyState
+					"m_buyState"  // class BuyState
 					{
 						"windows"   "2772"
 						"linux"     "2792"
 						"mac"       "2792"
 					}
 
-					"m_moveToState"  // MoveToState
+					"m_moveToState"  // class MoveToState
 					{
 						"windows"   "2800"
 						"linux"     "2820"
 						"mac"       "2820"
 					}
 
-					"m_fetchBombState"  // FetchBombState
+					"m_fetchBombState"  // class FetchBombState
 					{
 						"windows"   "2824"
 						"linux"     "2844"
 						"mac"       "2844"
 					}
 
-					"m_plantBombState"  // PlantBombState
+					"m_plantBombState"  // class PlantBombState
 					{
 						"windows"   "2828"
 						"linux"     "2848"
 						"mac"       "2848"
 					}
 
-					"m_defuseBombState"  // DefuseBombState
+					"m_defuseBombState"  // class DefuseBombState
 					{
 						"windows"   "2832"
 						"linux"     "2852"
 						"mac"       "2852"
 					}
 
-					"m_hideState"  // HideState
+					"m_hideState"  // class HideState
 					{
 						"windows"   "2836"
 						"linux"     "2856"
 						"mac"       "2856"
 					}
 
-					"m_escapeFromBombState"  // EscapeFromBombState
+					"m_escapeFromBombState"  // class EscapeFromBombState
 					{
 						"windows"   "2900"
 						"linux"     "2920"
 						"mac"       "2920"
 					}
 
-					"m_followState"  // FollowState
+					"m_followState"  // class FollowState
 					{
 						"windows"   "2904"
 						"linux"     "2924"
 						"mac"       "2924"
 					}
 
-					"m_useEntityState"  // UseEntityState
+					"m_useEntityState"  // class UseEntityState
 					{
 						"windows"   "2980"
 						"linux"     "3000"
 						"mac"       "3000"
 					}
 
-					"m_state"  // BotState*
+					"m_state"  // class BotState*
 					{
 						"windows"   "2992"
 						"linux"     "3012"
@@ -656,7 +656,7 @@
 						"mac"       "9988"
 					}
 
-					"m_spotEncounter"  // SpotEncounter*
+					"m_spotEncounter"  // class SpotEncounter*
 					{
 						"windows"   "9976"
 						"linux"     "9996"
@@ -915,7 +915,7 @@
 						"mac"       "10953"
 					}
 
-					"m_equipTimer"  // IntervalTimer
+					"m_equipTimer"  // class IntervalTimer
 					{
 						"windows"   "10936"
 						"linux"     "10956"
diff --git a/gamedata/common.games/entities.games/dod/offsets-cbasemonster.txt b/gamedata/common.games/entities.games/dod/offsets-cbasemonster.txt
index 938d71e7..0c3b0dbb 100644
--- a/gamedata/common.games/entities.games/dod/offsets-cbasemonster.txt
+++ b/gamedata/common.games/entities.games/dod/offsets-cbasemonster.txt
@@ -117,7 +117,7 @@
 						"mac"       "644"
 					}
 
-					"m_pSchedule"  // Schedule_t*
+					"m_pSchedule"  // class Schedule_t*
 					{
 						"windows"   "628"
 						"linux"     "648"
diff --git a/gamedata/common.games/entities.games/gearbox/offsets-cbasemonster.txt b/gamedata/common.games/entities.games/gearbox/offsets-cbasemonster.txt
index 0e859d15..a807870a 100644
--- a/gamedata/common.games/entities.games/gearbox/offsets-cbasemonster.txt
+++ b/gamedata/common.games/entities.games/gearbox/offsets-cbasemonster.txt
@@ -117,7 +117,7 @@
 						"mac"       "404"
 					}
 
-					"m_pSchedule"  // Schedule_t*
+					"m_pSchedule"  // class Schedule_t*
 					{
 						"windows"   "388"
 						"linux"     "408"
diff --git a/gamedata/common.games/entities.games/gearbox/offsets-crope.txt b/gamedata/common.games/entities.games/gearbox/offsets-crope.txt
index a8766bc1..e434cb78 100644
--- a/gamedata/common.games/entities.games/gearbox/offsets-crope.txt
+++ b/gamedata/common.games/entities.games/gearbox/offsets-crope.txt
@@ -103,7 +103,7 @@
 						"mac"       "924"
 					}
 
-					"m_TempSys"  // RopeSampleData*[5]
+					"m_TempSys"  // class RopeSampleData*[5]
 					{
 						"windows"   "1164"
 						"linux"     "1180"
@@ -117,7 +117,7 @@
 						"mac"       "1200"
 					}
 
-					"m_Spring"  // Spring*
+					"m_Spring"  // class Spring*
 					{
 						"windows"   "1188"
 						"linux"     "1204"
diff --git a/gamedata/common.games/entities.games/tfc/offsets-careadef.txt b/gamedata/common.games/entities.games/tfc/offsets-careadef.txt
index f20acd42..dbded07e 100644
--- a/gamedata/common.games/entities.games/tfc/offsets-careadef.txt
+++ b/gamedata/common.games/entities.games/tfc/offsets-careadef.txt
@@ -19,7 +19,7 @@
 			{
 				"Offsets"
 				{
-					"m_ClassData"  // DBAreaClassData[12]
+					"m_ClassData"  // class DBAreaClassData[12]
 					{
 						"windows"   "1124"
 						"linux"     "1140"
diff --git a/gamedata/common.games/entities.games/tfc/offsets-cbasemonster.txt b/gamedata/common.games/entities.games/tfc/offsets-cbasemonster.txt
index 6cef76fb..a46d05ec 100644
--- a/gamedata/common.games/entities.games/tfc/offsets-cbasemonster.txt
+++ b/gamedata/common.games/entities.games/tfc/offsets-cbasemonster.txt
@@ -117,7 +117,7 @@
 						"mac"       "1432"
 					}
 
-					"m_pSchedule"  // Schedule_t*
+					"m_pSchedule"  // class Schedule_t*
 					{
 						"windows"   "1416"
 						"linux"     "1436"