diff --git a/mp/src/game/shared/ff/ff_sh_gamerules.cpp b/mp/src/game/shared/ff/ff_sh_gamerules.cpp
index f5435798..4ec3c22e 100644
--- a/mp/src/game/shared/ff/ff_sh_gamerules.cpp
+++ b/mp/src/game/shared/ff/ff_sh_gamerules.cpp
@@ -178,20 +178,20 @@ static const char *s_PreserveEnts[] =
 // NOTE: the indices here must match TEAM_TERRORIST, TEAM_CT, TEAM_SPECTATOR, etc.
 char *sTeamNames[] =
 {
-	"Unassigned",
-	"Spectator",
-	"Blue",
-	"Red",
-	"Yellow",
-	"Green",
-	"Custom1",
-	"Custom2",
-	"Custom3",
-	"Custom4",
-	"Custom5",
-	"Custom6",
-	"Custom7",
-	"Custom8",
+	"#FF_TEAM_UNASSIGNED",
+	"#FF_TEAM_SPECTATOR",
+	"#FF_TEAM_BLUE",
+	"#FF_TEAM_RED",
+	"#FF_TEAM_YELLOW",
+	"#FF_TEAM_GREEN",
+	"#FF_TEAM_CUSTOM1",
+	"#FF_TEAM_CUSTOM2",
+	"#FF_TEAM_CUSTOM3",
+	"#FF_TEAM_CUSTOM4",
+	"#FF_TEAM_CUSTOM5",
+	"#FF_TEAM_CUSTOM6",
+	"#FF_TEAM_CUSTOM7",
+	"#FF_TEAM_CUSTOM8",
 };
 #endif
 
diff --git a/mp/src/game/shared/ff/ff_sh_team_manager.cpp b/mp/src/game/shared/ff/ff_sh_team_manager.cpp
index 2e21d06f..64905da8 100644
--- a/mp/src/game/shared/ff/ff_sh_team_manager.cpp
+++ b/mp/src/game/shared/ff/ff_sh_team_manager.cpp
@@ -225,7 +225,7 @@ int CFF_SH_TeamManager::GetTeamLimits( void )
 
 //ConCommand ff_team( "ff_team",
 //ConCommand ff_team( "ffdbg_dump_teams",
-#if defined (DEBUG) && defined (GAME_DLL)
+#if defined (_DEBUG) && defined (GAME_DLL)
 void DebugSetTeamName_f( const CCommand &args ) 
 {
 	if ( args.ArgC() < 2 )