diff --git a/datasrc/network.py b/datasrc/network.py
index 5c81ff4fe..9a2114c75 100644
--- a/datasrc/network.py
+++ b/datasrc/network.py
@@ -17,7 +17,7 @@ GameInfoFlags = [
 	"BUG_DDRACE_INPUT", "BUG_FNG_LASER_RANGE", "BUG_VANILLA_BOUNCE",
 	"PREDICT_FNG", "PREDICT_DDRACE", "PREDICT_DDRACE_TILES", "PREDICT_VANILLA",
 	"ENTITIES_DDNET", "ENTITIES_DDRACE", "ENTITIES_RACE", "ENTITIES_FNG",
-	"ENTITIES_VANILLA", "ENTITIES_UNUSED",
+	"ENTITIES_VANILLA", "DONT_MASK_ENTITIES",
 ]
 ExPlayerFlags = ["AFK"]
 
diff --git a/src/game/client/components/maplayers.cpp b/src/game/client/components/maplayers.cpp
index 2a895860d..4aaad70cc 100644
--- a/src/game/client/components/maplayers.cpp
+++ b/src/game/client/components/maplayers.cpp
@@ -620,21 +620,21 @@ void CMapLayers::OnMapLoad()
 									{
 										Index = ((CTile*)pTiles)[y*pTMap->m_Width+x].m_Index;
 										Flags = ((CTile*)pTiles)[y*pTMap->m_Width+x].m_Flags;
-										if(!GameClient()->m_GameInfo.m_EntitiesUnused && !IsValidGameTile(Index))
+										if(!GameClient()->m_GameInfo.m_DontMaskEntities && !IsValidGameTile(Index))
 											Index = 0;
 									}
 									if(IsFrontLayer)
 									{
 										Index = ((CTile*)pTiles)[y*pTMap->m_Width+x].m_Index;
 										Flags = ((CTile*)pTiles)[y*pTMap->m_Width+x].m_Flags;
-										if(!GameClient()->m_GameInfo.m_EntitiesUnused && !IsValidFrontTile(Index))
+										if(!GameClient()->m_GameInfo.m_DontMaskEntities && !IsValidFrontTile(Index))
 											Index = 0;
 									}
 									if(IsSwitchLayer)
 									{
 										Flags = 0;
 										Index = ((CSwitchTile*)pTiles)[y*pTMap->m_Width+x].m_Type;
-										if(!GameClient()->m_GameInfo.m_EntitiesUnused && !IsValidSwitchTile(Index))
+										if(!GameClient()->m_GameInfo.m_DontMaskEntities && !IsValidSwitchTile(Index))
 											Index = 0;
 										else if(CurOverlay == 0)
 										{
@@ -650,7 +650,7 @@ void CMapLayers::OnMapLoad()
 									{
 										Index = ((CTeleTile*)pTiles)[y*pTMap->m_Width+x].m_Type;
 										Flags = 0;
-										if(!GameClient()->m_GameInfo.m_EntitiesUnused && !IsValidTeleTile(Index))
+										if(!GameClient()->m_GameInfo.m_DontMaskEntities && !IsValidTeleTile(Index))
 											Index = 0;
 										else if(CurOverlay == 1)
 										{
@@ -664,7 +664,7 @@ void CMapLayers::OnMapLoad()
 										Index = ((CSpeedupTile*)pTiles)[y*pTMap->m_Width+x].m_Type;
 										Flags = 0;
 										AngleRotate = ((CSpeedupTile*)pTiles)[y*pTMap->m_Width + x].m_Angle;
-										if(!GameClient()->m_GameInfo.m_EntitiesUnused && (!IsValidSpeedupTile(Index) || ((CSpeedupTile*)pTiles)[y*pTMap->m_Width+x].m_Force == 0))
+										if(!GameClient()->m_GameInfo.m_DontMaskEntities && (!IsValidSpeedupTile(Index) || ((CSpeedupTile*)pTiles)[y*pTMap->m_Width+x].m_Force == 0))
 											Index = 0;
 										else if(CurOverlay == 1)
 											Index = ((CSpeedupTile*)pTiles)[y*pTMap->m_Width+x].m_Force;
@@ -674,7 +674,7 @@ void CMapLayers::OnMapLoad()
 									if(IsTuneLayer)
 									{
 										Index = ((CTuneTile*)pTiles)[y*pTMap->m_Width+x].m_Type;
-										if(!GameClient()->m_GameInfo.m_EntitiesUnused && !IsValidTuneTile(Index))
+										if(!GameClient()->m_GameInfo.m_DontMaskEntities && !IsValidTuneTile(Index))
 											Index = 0;
 										Flags = 0;
 									}
diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp
index e8f4eb0f3..a0068b285 100644
--- a/src/game/client/gameclient.cpp
+++ b/src/game/client/gameclient.cpp
@@ -1025,8 +1025,8 @@ static CGameInfo GetGameInfo(const CNetObj_GameInfoEx *pInfoEx, int InfoExSize,
 	Info.m_EntitiesRace = Race;
 	Info.m_EntitiesFNG = FNG;
 	Info.m_EntitiesVanilla = Vanilla;
-	Info.m_EntitiesUnused = !DDNet;
 	Info.m_Race = Race;
+	Info.m_DontMaskEntities = !DDNet;
 
 	if(Version >= 0)
 	{
@@ -1057,8 +1057,8 @@ static CGameInfo GetGameInfo(const CNetObj_GameInfoEx *pInfoEx, int InfoExSize,
 	}
 	if(Version >= 3)
 	{
-		Info.m_EntitiesUnused = Flags&GAMEINFOFLAG_ENTITIES_UNUSED;
 		Info.m_Race = Flags&GAMEINFOFLAG_RACE;
+		Info.m_DontMaskEntities = Flags&GAMEINFOFLAG_DONT_MASK_ENTITIES;
 	}
 	return Info;
 }
diff --git a/src/game/client/gameclient.h b/src/game/client/gameclient.h
index 356a34c5f..7034b3743 100644
--- a/src/game/client/gameclient.h
+++ b/src/game/client/gameclient.h
@@ -88,8 +88,9 @@ public:
 	bool m_EntitiesFNG;
 	bool m_EntitiesVanilla;
 
-	bool m_EntitiesUnused;
 	bool m_Race;
+
+	bool m_DontMaskEntities;
 };
 
 class CGameClient : public IGameClient