diff --git a/root/scripts/vscripts/community/c8m4_elevatorfix.nut b/root/scripts/vscripts/community/c8m4_elevatorfix.nut
index 688107ac..74560a34 100644
--- a/root/scripts/vscripts/community/c8m4_elevatorfix.nut
+++ b/root/scripts/vscripts/community/c8m4_elevatorfix.nut
@@ -37,16 +37,16 @@ EntFire( "trigger_nojump", "Kill" );
 // delay ensure gravity was reset. To thwart DoS Attacks delete the teleport triggers
 // after a substantial 5 second delay.
 
-EntFire( "elevator_button",	"AddOutput",	"OnPressed anv_mapfixes_elevator_trigmult:Enable::0:-1" );
-EntFire( "elevator_button",	"AddOutput",	"OnPressed anv_mapfixes_faller_trigmult:Enable::0:-1" );
-EntFire( "elevator_button",	"AddOutput",	"OnPressed anv_mapfixes_skybox_trigmult:Enable::0:-1" );
-EntFire( "elevator_button",	"AddOutput",	"OnPressed anv_mapfixes_elevator_infectdump:Enable::5:-1" );
-EntFire( "elevator",		"AddOutput",	"OnReachedTop anv_mapfixes_elevator_tabbernaut:Kill::5:-1" );
-EntFire( "elevator",		"AddOutput",	"OnReachedTop anv_mapfixes_elevator_infectdump:Kill::0:-1" );
-EntFire( "elevator",		"AddOutput",	"OnReachedTop anv_mapfixes_elevator_trigmult:Kill::0:-1" );
+EntFire( "elevator_button",	"AddOutput",	"OnPressed " + g_UpdateName + "_elevator_trigmult:Enable::0:-1" );
+EntFire( "elevator_button",	"AddOutput",	"OnPressed " + g_UpdateName + "_faller_trigmult:Enable::0:-1" );
+EntFire( "elevator_button",	"AddOutput",	"OnPressed " + g_UpdateName + "_skybox_trigmult:Enable::0:-1" );
+EntFire( "elevator_button",	"AddOutput",	"OnPressed " + g_UpdateName + "_elevator_infectdump:Enable::5:-1" );
+EntFire( "elevator",		"AddOutput",	"OnReachedTop " + g_UpdateName + "_elevator_tabbernaut:Kill::5:-1" );
+EntFire( "elevator",		"AddOutput",	"OnReachedTop " + g_UpdateName + "_elevator_infectdump:Kill::0:-1" );
+EntFire( "elevator",		"AddOutput",	"OnReachedTop " + g_UpdateName + "_elevator_trigmult:Kill::0:-1" );
 EntFire( "elevator",		"AddOutput",	"OnReachedTop worldspawn:RunScriptCode:c8m4_TeamGravity(1.0):1:-1" );
-EntFire( "elevator",		"AddOutput",	"OnReachedTop anv_mapfixes_faller_trigmult:Kill::5:-1" );
-EntFire( "elevator",		"AddOutput",	"OnReachedTop anv_mapfixes_skybox_trigmult:Kill::5:-1" );
+EntFire( "elevator",		"AddOutput",	"OnReachedTop " + g_UpdateName + "_faller_trigmult:Kill::5:-1" );
+EntFire( "elevator",		"AddOutput",	"OnReachedTop " + g_UpdateName + "_skybox_trigmult:Kill::5:-1" );
 
 // Survivor-only default-Enabled blocker that helps Survivors not fall through but
 // is not perfect -- it's required that its top is exactly flush with elevator floor
diff --git a/root/scripts/vscripts/community/functions.nut b/root/scripts/vscripts/community/functions.nut
index 1eb17042..ca08dbd7 100644
--- a/root/scripts/vscripts/community/functions.nut
+++ b/root/scripts/vscripts/community/functions.nut
@@ -973,7 +973,7 @@ function kill_funcinfclip( flDesiredRadius )
 //	parking lot fence ladder is close but has 3x+ this wiggle room.
 //
 //	Radius of 1.4 supports a shift of up to 0.47 on all 3 axis -- never round
-//	VSSM's more than 0.1 (anv_mapfixes.nut rounds to nearest 0.01 or less).
+//	VSSM's more than 0.1 (mapfixes.nut rounds to nearest 0.01 or less).
 //
 // Function patch_ladder() tweaks ladders found with this and make_ladder()
 // passes the found ladder to clone_model() to get its "model" Keyvalue so it
@@ -1219,7 +1219,7 @@ function InfectedLadders_Spawn()
 
 	EntFire( "worldspawn", "CallScriptFunction", "InfectedLadders" );
 
-//	// Required global function so anv_mapfixes.nut InfectedLadders_Spawn() call
+//	// Required global function so mapfixes.nut InfectedLadders_Spawn() call
 //	// can find it -- if not global, its logic_timer will stall and do nothing.
 //
 //	::RetryThink <- function()
@@ -1281,7 +1281,7 @@ function InfectedLadders_Spawn()
 **  Function runs for all those plus future unknowns.
 **
 **  Some maps like Death Toll 3 and 5 have non-solid trees that'd otherwise
-**  be useful for SI Players to spawn behind. File anv_mapfixes.nut declares
+**  be useful for SI Players to spawn behind. File mapfixes.nut declares
 **  an "ALL MODES" function InfectedHumEnts() then runs InfectedHumEnts_Spawn()
 **  which produces them on gamemodes with Human-controlled SI.
 **
@@ -1298,7 +1298,7 @@ function InfectedHumEnts_Spawn()
 {
 	if ( HasPlayerControlledZombies() )
 	{
-		// Simply spawn all anv_mapfixes.nut-declared entities.
+		// Simply spawn all mapfixes.nut-declared entities.
 
 		EntFire( "worldspawn", "CallScriptFunction", "InfectedHumEnts" );
 	}
@@ -1355,7 +1355,7 @@ function patch_nav_obscured( user_strOrigin )
 **
 **  This is how each map is exploitable, standing up against door in each case:
 **
-**	mapname			which door?	"anv_mapfixes.nut" call
+**	mapname			which door?	"mapfixes.nut" call
 **
 **	c2m2_fairgrounds	start		patch_nav_checkpoint( "1737 2712 4" );
 **	c2m2_fairgrounds	end		patch_nav_checkpoint( "-4337 -5511 -64" );
@@ -1504,8 +1504,8 @@ function make_atomizer( user_strTargetname,
 		{
 			OnTimer =
 			{
-				cmd1 = "anv_mapfixes_atomizer_monitoredStartGlowing0-1"
-				cmd2 = "anv_mapfixes_atomizer_monitoredKill5-1"
+				cmd1 = g_UpdateName + "_atomizer_monitoredStartGlowing0-1"
+				cmd2 = g_UpdateName + "_atomizer_monitoredKill5-1"
 				cmd3 = "!selfDisable0-1"
 				cmd4 = "!selfResetTimer0-1"
 			}
@@ -1523,7 +1523,7 @@ function make_atomizer( user_strTargetname,
 			OnStartTouch =
 			{
 				cmd1 = g_UpdateName + user_strTargetname + "_timer" + "Enable0-1"
-				cmd2 = "!activatorAddOutputtargetname anv_mapfixes_atomizer_monitored0-1"
+				cmd2 = "!activatorAddOutputtargetname " + g_UpdateName + "_atomizer_monitored0-1"
 				cmd3 = "!selfAddOutputspawnflags 00-1"
 			}
 			OnEndTouch =
@@ -1781,7 +1781,7 @@ function VectorToString_Valve( vector )
 
 //////////////////////////////////////////////////////////////////////////////
 // Equivalent to built-in printl() but only outputs anything if DEVELOPER MODE.
-// This is used in "anv_mapfixes.nut" to have code comments in-game for fixes
+// This is used in "mapfixes.nut" to have code comments in-game for fixes
 // that require logic or trigger injection. Accompanies entity dumps.
 //////////////////////////////////////////////////////////////////////////////
 
@@ -1800,7 +1800,7 @@ function con_comment( strComment )
 **  Confirms that even maps/modes without fixes are still running their case. An
 **  example of output: "MAP FIXES :: LAST STAND - THE LIGHTHOUSE ( ALL MODES )".
 **
-**  File "anv_mapfixes.nut" runs this when "BASE COOP / VERSUS / SURVIVAL / SCAVENGE"
+**  File "mapfixes.nut" runs this when "BASE COOP / VERSUS / SURVIVAL / SCAVENGE"
 **  (here simplified to just != "TUTORIAL") for only the Official Valve maps.
 **  After all entities have been spawned (and dumped if DEVELOPER MODE) if it's
 **  an Official Valve map 'devchap( "TUTORIAL" )' then runs to inform testers
@@ -1823,13 +1823,13 @@ function devchap( mode )
 	}
 
 	// Ensure the tutorial is only shown once per "round_start" and always show "developer 1" notice.
-	// Function is called with 'devchap( "TUTORIAL" )' at end of "anv_mapfixes.nut".
+	// Function is called with 'devchap( "TUTORIAL" )' at end of "mapfixes.nut".
 
 	if ( developer() > 0 && mode == "TUTORIAL" )
 	{
 		printl( "Anniversary Map Fixes: Run or bind \"script ShowUpdate()\" and \"script HideUpdate()\"" );
 		printl( "to draw new blockers and glow new props. They are named according to purpose and" );
-		printl( "you can see entity definitions above. If you make/delete \"anv_mapfixes\"-prefixed" );
+		printl( "you can see entity definitions above. If you make/delete \"mapfixes\"-prefixed" );
 		printl( "entities, toggle Hide/Show to apply changes. Please report all issues and concerns" );
 		printl( "to Tsuey's Workshop https://steamcommunity.com/sharedfiles/filedetails/?id=1959405608\n" );
 	}
diff --git a/root/scripts/vscripts/community/mapfixes.nut b/root/scripts/vscripts/community/mapfixes.nut
index c03cb520..0a34e229 100644
--- a/root/scripts/vscripts/community/mapfixes.nut
+++ b/root/scripts/vscripts/community/mapfixes.nut
@@ -1,4 +1,4 @@
-printl( "VSCRIPT: Running anv_mapfixes.nut" );
+printl( "VSCRIPT: Running mapfixes.nut" );
 
 /*****************************************************************************
 **  This file is RunScriptFile'd on "worldspawn" by mapspawn.nut and its function
@@ -162,7 +162,7 @@ __CollectEventCallbacks( this, "OnGameEvent_", "GameEventCallbacks", RegisterScr
 	devchap( "TUTORIAL" );
 
 	// We've run once so set mapspawn.nut's global variable to "true". This allows
-	// anv_mapfixes.nut and other RunScriptFile'd *.nut's to only declare functions
+	// mapfixes.nut and other RunScriptFile'd *.nut's to only declare functions
 	// once (outside of mapspawn.nut's natural doing so). Also to only patch NAV once.
 	// If 0 second delay it'd be set "true" before switch-case RunScriptFile's ran.
 
diff --git a/root/scripts/vscripts/community/maps/c11m2_offices.nut b/root/scripts/vscripts/community/maps/c11m2_offices.nut
index c4ac32f3..f5e9e13e 100644
--- a/root/scripts/vscripts/community/maps/c11m2_offices.nut
+++ b/root/scripts/vscripts/community/maps/c11m2_offices.nut
@@ -26,7 +26,7 @@ function DoRoundFixes()
         make_trighurt( "_finalstreet_trighurta", "Survivor", "-879 -112 0", "603 48 17", "9071 3888 196" );
         make_trighurt( "_finalstreet_trighurtb", "Survivor", "-1753 -823 0", "59 935 32", "8261 4759 196" );
         make_trighurt( "_finalstreet_trighurtc", "Survivor", "-781 -361 0", "359 599 32", "9101 4969 196" );
-        DoEntFire( "!self", "AddOutput", "OnTrigger anv_mapfixes_finalstreet_trighurt*:Kill::0:-1", 0.0, null, Entities.FindByClassnameNearest( "trigger_once", Vector( 8616, 4320, 140 ), 1 ) );
+        DoEntFire( "!self", "AddOutput", "OnTrigger " + g_UpdateName + "_finalstreet_trighurt*:Kill::0:-1", 0.0, null, Entities.FindByClassnameNearest( "trigger_once", Vector( 8616, 4320, 140 ), 1 ) );
 
     }
     if ( g_BaseMode == "survival" )
diff --git a/root/scripts/vscripts/community/maps/c11m5_runway.nut b/root/scripts/vscripts/community/maps/c11m5_runway.nut
index 9889c70f..2505ca76 100644
--- a/root/scripts/vscripts/community/maps/c11m5_runway.nut
+++ b/root/scripts/vscripts/community/maps/c11m5_runway.nut
@@ -10,7 +10,7 @@ function DoRoundFixes()
     make_clip( "_planecrash_concreteramp", "SI Players", 1, "-290 -10 0", "345 10 185", "-4127 11223 -128", "0 -56 45" );
 
     make_prop( "dynamic", "_terry", "models/deadbodies/dead_male_civilian_body.mdl", "-4154 9350 -140", "0 -111 0", "shadow_no", "solid_no" );
-    EntFire( "relay_outro_start", "AddOutput", "OnTrigger anv_mapfixes_terry:Kill::2:-1" );
+    EntFire( "relay_outro_start", "AddOutput", "OnTrigger " + g_UpdateName + "_terry:Kill::2:-1" );
 
     if ( HasPlayerControlledZombies() )
     {
@@ -38,9 +38,9 @@ function DoRoundFixes()
         make_ladder( "_ladder_wreckedrear_cloned_escapeplaneleft", "-4354 9230 -96", "-2781 246 -12", "0 -5.65 0", "-1 0.1 0" );
         make_prop( "dynamic",		"_losblocker_fireline_tractor",	"models/props_vehicles/airport_baggage_tractor.mdl",	"-2980.23 10393 -141",		"70 180 -10",		"shadow_no" );
 
-        DoEntFire( "!self", "AddOutput", "OnBreak anv_mapfixes_boardingramp_wallclip:Kill::0:-1", 0.0, null, Entities.FindByClassnameNearest( "func_breakable", Vector( -5913.99, 10371.6, 162.64 ), 1 ) );
-        DoEntFire( "!self", "AddOutput", "OnBreak anv_mapfixes_boardingramp_wallclip:Kill::0:-1", 0.0, null, Entities.FindByClassnameNearest( "func_breakable", Vector( -5727.82, 10368.7, 143.43 ), 1 ) );
-        DoEntFire( "!self", "AddOutput", "OnBreak anv_mapfixes_boardingramp_wallclip:Kill::0:-1", 0.0, null, Entities.FindByClassnameNearest( "func_breakable", Vector( -5611.89, 10356, 143.21 ), 1 ) );
+        DoEntFire( "!self", "AddOutput", "OnBreak " + g_UpdateName + "_boardingramp_wallclip:Kill::0:-1", 0.0, null, Entities.FindByClassnameNearest( "func_breakable", Vector( -5913.99, 10371.6, 162.64 ), 1 ) );
+        DoEntFire( "!self", "AddOutput", "OnBreak " + g_UpdateName + "_boardingramp_wallclip:Kill::0:-1", 0.0, null, Entities.FindByClassnameNearest( "func_breakable", Vector( -5727.82, 10368.7, 143.43 ), 1 ) );
+        DoEntFire( "!self", "AddOutput", "OnBreak " + g_UpdateName + "_boardingramp_wallclip:Kill::0:-1", 0.0, null, Entities.FindByClassnameNearest( "func_breakable", Vector( -5611.89, 10356, 143.21 ), 1 ) );
 
         con_comment( "PROP:\tBaggage cart under the plane wing moved closer to the ring of fire to give infected better spawn points" );
 
diff --git a/root/scripts/vscripts/community/maps/c12m3_bridge.nut b/root/scripts/vscripts/community/maps/c12m3_bridge.nut
index 3e1cecb8..32c057ba 100644
--- a/root/scripts/vscripts/community/maps/c12m3_bridge.nut
+++ b/root/scripts/vscripts/community/maps/c12m3_bridge.nut
@@ -17,7 +17,7 @@ function DoRoundFixes()
     con_comment( "MOVER:\tClip \"_bridge_dynamic_clip\" simulated to move when bridge collapses." );
 
     make_clip( "_bridge_dynamic_clip", "Survivors", 1, "-69 -926 0", "69 6 1450", "5932 -13314 272" );
-    EntFire( "train_engine_button", "AddOutput", "OnPressed anv_mapfixes_bridge_dynamic_clip:AddOutput:origin 5932 -13784 272:0:-1" );
+    EntFire( "train_engine_button", "AddOutput", "OnPressed " + g_UpdateName + "_bridge_dynamic_clip:AddOutput:origin 5932 -13784 272:0:-1" );
 
     if ( g_BaseMode == "coop" || g_BaseMode == "realism" )
     {
diff --git a/root/scripts/vscripts/community/maps/c12m4_barn.nut b/root/scripts/vscripts/community/maps/c12m4_barn.nut
index 86c43a22..eeecd7cf 100644
--- a/root/scripts/vscripts/community/maps/c12m4_barn.nut
+++ b/root/scripts/vscripts/community/maps/c12m4_barn.nut
@@ -57,10 +57,10 @@ function DoRoundFixes()
 	// is touched first then delete original. New trigger deletes the blockers. Note that
 	// original uses "OnTrigger" instead of "OnStartTouch".
 
-	EntFire( "window_trigger", "AddOutput", "OnTrigger anv_mapfixes_eventskip_commonhop*:Kill::0:-1" );
-	EntFire( "window_trigger", "AddOutput", "OnTrigger anv_mapfixes_eventskip_fence_trigonce:Kill::0:-1" );
+	EntFire( "window_trigger", "AddOutput", "OnTrigger " + g_UpdateName + "_eventskip_commonhop*:Kill::0:-1" );
+	EntFire( "window_trigger", "AddOutput", "OnTrigger " + g_UpdateName + "_eventskip_fence_trigonce:Kill::0:-1" );
 
-	EntFire( g_UpdateName + "_eventskip_fence_trigonce", "AddOutput", "OnTrigger anv_mapfixes_eventskip_commonhop*:Kill::0:-1" );
+	EntFire( g_UpdateName + "_eventskip_fence_trigonce", "AddOutput", "OnTrigger " + g_UpdateName + "_eventskip_commonhop*:Kill::0:-1" );
 	EntFire( g_UpdateName + "_eventskip_fence_trigonce", "AddOutput", "OnTrigger window_trigger:Kill::0:-1" );
 
 	// Replicate the original trigger_once's "OnTrigger" Outputs to the new trigger.
diff --git a/root/scripts/vscripts/community/maps/c12m5_cornfield.nut b/root/scripts/vscripts/community/maps/c12m5_cornfield.nut
index 51350aaa..64516103 100644
--- a/root/scripts/vscripts/community/maps/c12m5_cornfield.nut
+++ b/root/scripts/vscripts/community/maps/c12m5_cornfield.nut
@@ -31,7 +31,7 @@ function DoRoundFixes()
     con_comment( "LOGIC:\tPoint-of-no-return clip will be Enabled when finale is started." );
 
     make_clip( "_point_of_no_return", "Survivors", 0, "-148 -16 0", "148 26 1660", "9017 3511 202" );
-    EntFire( "trigger_finale", "AddOutput", "FinaleStart anv_mapfixes_point_of_no_return:Enable::0:-1" );
+    EntFire( "trigger_finale", "AddOutput", "FinaleStart " + g_UpdateName + "_point_of_no_return:Enable::0:-1" );
 
     if ( HasPlayerControlledZombies() )
     {
@@ -108,7 +108,7 @@ function DoRoundFixes()
 
         con_comment( "LOGIC:\tBarricade ladders will be deleted 17 seconds into \"relay_outro_start\"." );
 
-        EntFire( "relay_outro_start", "AddOutput", "OnTrigger anv_mapfixes_ladder_barricade*:Kill::17:-1" );
+        EntFire( "relay_outro_start", "AddOutput", "OnTrigger " + g_UpdateName + "_ladder_barricade*:Kill::17:-1" );
 
         con_comment( "EASTER_EGG:\tChair deleted, replaced with bumper car, SetModel to chair, clipped, parented and OnHitByTank I/O'd." );
 
@@ -117,6 +117,6 @@ function DoRoundFixes()
         Entities.FindByName( null, g_UpdateName + "_replacement_chair" ).SetModel( "models/props_interiors/sofa_chair02.mdl" );
         make_clip( "_replacement_chair_clip", "Everyone", 1, "-16 -22 0", "30 22 40", "6922 1059 238" );
         EntFire( g_UpdateName + "_replacement_chair_clip", "SetParent", g_UpdateName + "_replacement_chair" );
-        EntFire( g_UpdateName + "_replacement_chair", "AddOutput", "OnHitByTank anv_mapfixes_replacement_chair_clip:Kill:0:-1" );
+        EntFire( g_UpdateName + "_replacement_chair", "AddOutput", "OnHitByTank " + g_UpdateName + "_replacement_chair_clip:Kill:0:-1" );
     }
 }
\ No newline at end of file
diff --git a/root/scripts/vscripts/community/maps/c13m3_memorialbridge.nut b/root/scripts/vscripts/community/maps/c13m3_memorialbridge.nut
index 4e743287..42d8c7b6 100644
--- a/root/scripts/vscripts/community/maps/c13m3_memorialbridge.nut
+++ b/root/scripts/vscripts/community/maps/c13m3_memorialbridge.nut
@@ -45,7 +45,7 @@ function DoRoundFixes()
         con_comment( "LOGIC:\tAnti-shortcut tanker clip will be deleted upon its destruction." );
 
         make_clip( "_shortcut_tanker", "Survivors", 1, "-58 -577 0", "58 271 527", "1092 -3999 1328", "0 27 0" );
-        EntFire( "tanker_destruction_relay", "AddOutput", "OnTrigger anv_mapfixes_shortcut_tanker:Kill::0:-1" );
+        EntFire( "tanker_destruction_relay", "AddOutput", "OnTrigger " + g_UpdateName + "_shortcut_tanker:Kill::0:-1" );
 
     }
 
@@ -74,7 +74,7 @@ function DoRoundFixes()
         EntFire( g_UpdateName + "_watercushion_trigonce", "AddOutput", "maxs 139 985 401" );
         EntFire( g_UpdateName + "_watercushion_trigonce", "AddOutput", "solid 2" );
 
-        EntFire( g_UpdateName + "_watercushion_trigonce", "AddOutput", "OnStartTouch anv_mapfixes_watercushion_trighurt:Kill::0:-1" );
+        EntFire( g_UpdateName + "_watercushion_trigonce", "AddOutput", "OnStartTouch " + g_UpdateName + "_watercushion_trighurt:Kill::0:-1" );
     }
 
     if ( HasPlayerControlledZombies() )
diff --git a/root/scripts/vscripts/community/maps/c1m1_hotel.nut b/root/scripts/vscripts/community/maps/c1m1_hotel.nut
index 8d68b19e..d3aa8444 100644
--- a/root/scripts/vscripts/community/maps/c1m1_hotel.nut
+++ b/root/scripts/vscripts/community/maps/c1m1_hotel.nut
@@ -33,7 +33,7 @@ function DoRoundFixes()
         EntFire( g_UpdateName + "_shortcut_balcrail_trigonce", "AddOutput", "maxs 185 2052 104" );
         EntFire( g_UpdateName + "_shortcut_balcrail_trigonce", "AddOutput", "solid 2" );
 
-        EntFire( g_UpdateName + "_shortcut_balcrail_trigonce", "AddOutput", "OnStartTouch anv_mapfixes_shortcut_balcrail_*:Kill::0:-1" );
+        EntFire( g_UpdateName + "_shortcut_balcrail_trigonce", "AddOutput", "OnStartTouch " + g_UpdateName + "_shortcut_balcrail_*:Kill::0:-1" );
 
         SpawnEntityFromTable( "info_particle_system",
         {
@@ -52,7 +52,7 @@ function DoRoundFixes()
         con_comment( "LOGIC:\tAnti-doorbreak trighurt will be deleted 4 seconds after elevator starts." );
 
         make_trighurt( "_elevator_exploit_bean", "Ghost", "-55 -2 0", "55 2 111", "2169 5713 2344" );
-        EntFire( "elevator_button", "AddOutput", "OnPressed anv_mapfixes_elevator_exploit_bean:Kill::4:-1" );
+        EntFire( "elevator_button", "AddOutput", "OnPressed " + g_UpdateName + "_elevator_exploit_bean:Kill::4:-1" );
 
         con_comment( "QOL:\tThe 2nd fire door is open immediately for Versus-only QoL." );
 
diff --git a/root/scripts/vscripts/community/maps/c1m2_streets.nut b/root/scripts/vscripts/community/maps/c1m2_streets.nut
index 33bd885e..9ed0d2ac 100644
--- a/root/scripts/vscripts/community/maps/c1m2_streets.nut
+++ b/root/scripts/vscripts/community/maps/c1m2_streets.nut
@@ -175,7 +175,7 @@ function DoRoundFixes()
 
 		con_comment( "LOGIC:\tLOS tanker fixes will be deleted upon its destruction." );
 
-		EntFire( "tanker_destruction_relay", "AddOutput", "OnTrigger anv_mapfixes_losfix_tanker*:Kill::0:-1" );
+		EntFire( "tanker_destruction_relay", "AddOutput", "OnTrigger " + g_UpdateName + "_losfix_tanker*:Kill::0:-1" );
 
 		con_comment( "FIX/ANTI-GRIEF:\tRemoved trigger which disables common infected spawns in Save 4 Less area for Versus only." );
 		kill_entity( Entities.FindByClassnameNearest( "trigger_once", Vector( -5128, -992, 548 ), 1 ) );
diff --git a/root/scripts/vscripts/community/maps/c2m2_fairgrounds.nut b/root/scripts/vscripts/community/maps/c2m2_fairgrounds.nut
index 4aad98ae..29dce891 100644
--- a/root/scripts/vscripts/community/maps/c2m2_fairgrounds.nut
+++ b/root/scripts/vscripts/community/maps/c2m2_fairgrounds.nut
@@ -43,7 +43,7 @@ function DoRoundFixes()
 
         make_clip( "_tol_clip_brush_a", "Survivors", 1, "-818 -16 0", "82 599 572", "-3530 -5162 192" );
         make_clip( "_tol_clip_brush_b", "Survivors", 1, "-9 -263 0", "488 -1 572", "-3439 -5178 192" );
-        DoEntFire( "!self", "AddOutput", "OnTrigger anv_mapfixes_tol_clip_brush*:Kill::-1", 0.0, null, Entities.FindByClassnameNearest( "trigger_once", Vector( -2496, -6544, 4 ), 1 ) );
+        DoEntFire( "!self", "AddOutput", "OnTrigger " + g_UpdateName + "_tol_clip_brush*:Kill::-1", 0.0, null, Entities.FindByClassnameNearest( "trigger_once", Vector( -2496, -6544, 4 ), 1 ) );
 
     }
 
@@ -155,7 +155,7 @@ function DoRoundFixes()
         patch_nav_checkpoint( "1737 2712 4" );
         patch_nav_checkpoint( "-4337 -5511 -64" );
 
-        // Manually fix the 2009 forklift since it is spawned after anv_mapfixes runs
+        // Manually fix the 2009 forklift since it is spawned after mapfixes runs
         NetProps.SetPropInt( Entities.FindByName( null, g_UpdateName + "_hittable_2009forklift" ), "m_iMinHealthDmg", 400 );
         NetProps.SetPropInt( Entities.FindByName( null, g_UpdateName + "_hittable_2009forklift" ), "m_takedamage", 3 );
     }
diff --git a/root/scripts/vscripts/community/maps/c2m3_coaster.nut b/root/scripts/vscripts/community/maps/c2m3_coaster.nut
index 33d1188d..05471ab9 100644
--- a/root/scripts/vscripts/community/maps/c2m3_coaster.nut
+++ b/root/scripts/vscripts/community/maps/c2m3_coaster.nut
@@ -48,8 +48,8 @@ function DoRoundFixes()
     //con_comment( "LOGIC:\tBeta Coaster Rubble restored for Campaign and Survival relays." );
 
     //make_prop( "dynamic", "_dynamic_coaster_rubble", "models/rollercoaster/coaster_debris.mdl", "0 0 -8", "0 0 0", "shadow_no", "solid_no" );
-    //EntFire( "relay_start_onslaught", "AddOutput", "OnTrigger anv_mapfixes_dynamic_coaster_rubble:SetAnimation:debris:6.33:-1" );
-    //EntFire( "relay_panicevent", "AddOutput", "OnTrigger anv_mapfixes_dynamic_coaster_rubble:SetAnimation:debris:6.33:-1" );
+    //EntFire( "relay_start_onslaught", "AddOutput", "OnTrigger " + g_UpdateName + "_dynamic_coaster_rubble:SetAnimation:debris:6.33:-1" );
+    //EntFire( "relay_panicevent", "AddOutput", "OnTrigger " + g_UpdateName + "_dynamic_coaster_rubble:SetAnimation:debris:6.33:-1" );
 
     if ( g_BaseMode == "versus" )
     {
diff --git a/root/scripts/vscripts/community/maps/c2m4_barns.nut b/root/scripts/vscripts/community/maps/c2m4_barns.nut
index 1ae271b5..c5d9d6c8 100644
--- a/root/scripts/vscripts/community/maps/c2m4_barns.nut
+++ b/root/scripts/vscripts/community/maps/c2m4_barns.nut
@@ -96,7 +96,7 @@ function DoRoundFixes()
         EntFire( g_UpdateName + "_barnsroof_trigonce", "AddOutput", "maxs 4 32 112" );
         EntFire( g_UpdateName + "_barnsroof_trigonce", "AddOutput", "solid 2" );
 
-        EntFire( g_UpdateName + "_barnsroof_trigonce", "AddOutput", "OnStartTouch anv_mapfixes_barnsroof_commonhop:Kill::0:-1" );
+        EntFire( g_UpdateName + "_barnsroof_trigonce", "AddOutput", "OnStartTouch " + g_UpdateName + "_barnsroof_commonhop:Kill::0:-1" );
     }
 
     if ( HasPlayerControlledZombies() )
diff --git a/root/scripts/vscripts/community/maps/c3m2_swamp.nut b/root/scripts/vscripts/community/maps/c3m2_swamp.nut
index 887e5f16..4d6d5096 100644
--- a/root/scripts/vscripts/community/maps/c3m2_swamp.nut
+++ b/root/scripts/vscripts/community/maps/c3m2_swamp.nut
@@ -21,7 +21,7 @@ function DoRoundFixes()
         make_clip( "_cabin_door_button_a", "Survivors", 1, "-138 -176 -13", "138 372 444", "-1932 3700 196", "0 28 0" );
         make_clip( "_cabin_door_button_b", "Survivors", 1, "-147 -434 -70", "138 404 444", "-1888 3079 226" );
         make_clip( "_cabin_door_button_c", "Survivors", 1, "-112 -516 -30", "108 431 521", "-1622 2298 162", "0 28 0" );
-        EntFire( "Blow_door", "AddOutput", "OnTrigger anv_mapfixes_cabin_door_button*:Kill::0:-1" );
+        EntFire( "Blow_door", "AddOutput", "OnTrigger " + g_UpdateName + "_cabin_door_button*:Kill::0:-1" );
 
     }
 
diff --git a/root/scripts/vscripts/community/maps/c3m4_plantation.nut b/root/scripts/vscripts/community/maps/c3m4_plantation.nut
index adf94340..17dce27f 100644
--- a/root/scripts/vscripts/community/maps/c3m4_plantation.nut
+++ b/root/scripts/vscripts/community/maps/c3m4_plantation.nut
@@ -26,7 +26,7 @@ function DoRoundFixes()
     con_comment( "LOGIC:\tPoint-of-no-return clip will be Enabled when finale is started." );
 
     make_clip( "_point_of_no_return", "Survivors", 0, "-168 -164 12", "128 92 196", "2064 -412 396" );
-    EntFire( "trigger_finale", "AddOutput", "FinaleStart anv_mapfixes_point_of_no_return:Enable::0:-1" );
+    EntFire( "trigger_finale", "AddOutput", "FinaleStart " + g_UpdateName + "_point_of_no_return:Enable::0:-1" );
 
     if ( g_BaseMode == "survival" )
     {
diff --git a/root/scripts/vscripts/community/maps/c4m1_milltown_a.nut b/root/scripts/vscripts/community/maps/c4m1_milltown_a.nut
index 6e6d3f46..159af2df 100644
--- a/root/scripts/vscripts/community/maps/c4m1_milltown_a.nut
+++ b/root/scripts/vscripts/community/maps/c4m1_milltown_a.nut
@@ -103,7 +103,7 @@ function DoRoundFixes()
 		make_prop( "dynamic", "_ladder_safehouse_pipe", "models/props_pipes/PipeSet02d_512_001a.mdl", "3726 -1560 160", "-90 90 0", "shadow_no", "solid_no" );
 		make_prop( "dynamic", "_ladder_saferoofpipe_pipe", "models/props_mill/PipeSet08d_512_001a.mdl", "3726 -1765 158", "90 90 0", "shadow_no" );
 
-		EntFire( g_UpdateName + "_ladder_grocerypillar_prop", "AddOutput", "OnBreak anv_mapfixes_ladder_grocerypillar_cloned_garagesalehouse:Kill::0:-1" );
+		EntFire( g_UpdateName + "_ladder_grocerypillar_prop", "AddOutput", "OnBreak " + g_UpdateName + "_ladder_grocerypillar_cloned_garagesalehouse:Kill::0:-1" );
 	}
 }
 
diff --git a/root/scripts/vscripts/community/maps/c4m2_sugarmill_a.nut b/root/scripts/vscripts/community/maps/c4m2_sugarmill_a.nut
index d44d3645..963d7619 100644
--- a/root/scripts/vscripts/community/maps/c4m2_sugarmill_a.nut
+++ b/root/scripts/vscripts/community/maps/c4m2_sugarmill_a.nut
@@ -48,7 +48,7 @@ function DoRoundFixes()
 
     make_trighurt( "_instakill_elevatora", "Survivor", "-196 -691 0", "1460 61 8", "-1204 -9549 394" );
     make_trighurt( "_instakill_elevatorb", "Survivor", "-372 -691 0", "644 -65 8", "-2044 -9549 394" );
-    EntFire( "button_inelevator", "AddOutput", "OnPressed anv_mapfixes_instakill_elevator*:Kill::0:-1" );
+    EntFire( "button_inelevator", "AddOutput", "OnPressed " + g_UpdateName + "_instakill_elevator*:Kill::0:-1" );
 
     // All-mode QoL clip for a Valve ladder and move it 2 units so players don't get caught on critpath anymore.
 
diff --git a/root/scripts/vscripts/community/maps/c4m5_milltown_escape.nut b/root/scripts/vscripts/community/maps/c4m5_milltown_escape.nut
index ea2775dd..b92412f1 100644
--- a/root/scripts/vscripts/community/maps/c4m5_milltown_escape.nut
+++ b/root/scripts/vscripts/community/maps/c4m5_milltown_escape.nut
@@ -27,7 +27,7 @@ function DoRoundFixes()
     con_comment( "LOGIC:\tPoint-of-no-return clip will be Enabled when finale is started." );
 
     make_clip( "_point_of_no_return", "Survivors", 0, "-73 -135 0", "19 135 1361", "-4077 7139 125" );
-    EntFire( "trigger_finale", "AddOutput", "FinaleStart anv_mapfixes_point_of_no_return:Enable::0:-1", 1 );
+    EntFire( "trigger_finale", "AddOutput", "FinaleStart " + g_UpdateName + "_point_of_no_return:Enable::0:-1", 1 );
 
     if ( HasPlayerControlledZombies() )
     {
@@ -49,7 +49,7 @@ function DoRoundFixes()
         make_prop( "dynamic", "_ladder_grocerypillar_bust", "models/props_interiors/concretepillar01_dm_base.mdl", "-5680 6576 160.2", "0 0 0", "shadow_no" );
         make_prop( "dynamic", "_ladder_grocerypillar_prop", "models/props_interiors/concretepillar01.mdl", "-5680 6128 163.8", "0 0 0", "shadow_no" );
 
-        EntFire( g_UpdateName + "_ladder_grocerypillar_prop", "AddOutput", "OnBreak anv_mapfixes_ladder_grocerypillar_cloned_garagesalehouse:Kill::0:-1" );
+        EntFire( g_UpdateName + "_ladder_grocerypillar_prop", "AddOutput", "OnBreak " + g_UpdateName + "_ladder_grocerypillar_cloned_garagesalehouse:Kill::0:-1" );
     }
 }
 
diff --git a/root/scripts/vscripts/community/maps/c5m4_quarter.nut b/root/scripts/vscripts/community/maps/c5m4_quarter.nut
index 5c956c43..5191ac84 100644
--- a/root/scripts/vscripts/community/maps/c5m4_quarter.nut
+++ b/root/scripts/vscripts/community/maps/c5m4_quarter.nut
@@ -52,7 +52,7 @@ function DoRoundFixes()
         con_comment( "LOGIC:\tTMP shortcut fence clip will be deleted when a Survivor exits final building." );
 
         make_clip( "_shortcut_fence_TMP", "Survivors", 1, "-84 -12 0", "86 9 149", "-1836 -1212 208" );
-        DoEntFire( "!self", "AddOutput", "OnTrigger anv_mapfixes_shortcut_fence_TMP:Kill::0:-1", 0.0, null, Entities.FindByClassnameNearest( "trigger_once", Vector( -1540, -1604, 314 ), 1 ) );
+        DoEntFire( "!self", "AddOutput", "OnTrigger " + g_UpdateName + "_shortcut_fence_TMP:Kill::0:-1", 0.0, null, Entities.FindByClassnameNearest( "trigger_once", Vector( -1540, -1604, 314 ), 1 ) );
 
     }
 
diff --git a/root/scripts/vscripts/community/maps/c7m3_port.nut b/root/scripts/vscripts/community/maps/c7m3_port.nut
index 86558883..5458b4ec 100644
--- a/root/scripts/vscripts/community/maps/c7m3_port.nut
+++ b/root/scripts/vscripts/community/maps/c7m3_port.nut
@@ -19,14 +19,14 @@ function DoRoundFixes()
 	con_comment( "LOGIC:\tTMP shortcut booster clips will be deleted on trigger_finale FinaleEscapeStarted.\n"
 		+ "\tNot a gamebreaker if absent and only for Sacrifice 3 to avoid players bumping their head." );
 
-	EntFire( "trigger_finale", "AddOutput", "FinaleEscapeStarted anv_mapfixes_booster_bridge_TMP*:Kill::0:-1" );
+	EntFire( "trigger_finale", "AddOutput", "FinaleEscapeStarted " + g_UpdateName + "_booster_bridge_TMP*:Kill::0:-1" );
 
 	make_clip(	"_anti_finaleskip_TMP",		"Survivors",	1,	"-21 -420 0",		"88 88 888",		"230 -849 216" );
 
 	con_comment( "LOGIC:\tTMP finale skip clip will be deleted after bridge is almost fully raised.\n"
 		+ "\tAllows sacrificer to use stairs. Incompatible with Passing 3 because of Louis." );
 
-	EntFire( "bridge_start_button", "AddOutput", "OnPressed anv_mapfixes_anti_finaleskip_TMP:Kill::8.1:-1" );
+	EntFire( "bridge_start_button", "AddOutput", "OnPressed " + g_UpdateName + "_anti_finaleskip_TMP:Kill::8.1:-1" );
 
 	make_clip(	"_booster_tankwindows",		"Survivors",	1,	"-132 -8 -24",		"132 8 64",		"-1280 -1016 216" );
 	make_clip(	"_cliprework_semitrailer",	"Survivors",	1,	"-8 -194 -256",		"8 194 759",		"1727 2883 285" );
diff --git a/root/scripts/vscripts/community/maps/c8m3_sewers.nut b/root/scripts/vscripts/community/maps/c8m3_sewers.nut
index 08450191..f5b4b818 100644
--- a/root/scripts/vscripts/community/maps/c8m3_sewers.nut
+++ b/root/scripts/vscripts/community/maps/c8m3_sewers.nut
@@ -29,16 +29,16 @@ function DoRoundFixes()
 
     con_comment( "LOGIC:\tTMP Gas Station roof clip will be deleted when it explodes." );
 
-    EntFire( "gas_explosion_sound_relay", "AddOutput", "OnTrigger anv_mapfixes_gasstationroof_TMP:Kill::0:-1" );
+    EntFire( "gas_explosion_sound_relay", "AddOutput", "OnTrigger " + g_UpdateName + "_gasstationroof_TMP:Kill::0:-1" );
 
     con_comment( "MOVER:\tClip \"_ladderqol_scissorlift\" simulated to move up with Scissor Lift." );
 
-    EntFire( "washer_lift_button2", "AddOutput", "OnPressed anv_mapfixes_ladderqol_scissorlift:Enable::2:-1" );
-    EntFire( "washer_lift_button2", "AddOutput", "OnPressed anv_mapfixes_ladderqol_scissorlift:AddOutput:origin 12687 7170 62:4:-1" );
-    EntFire( "washer_lift_button2", "AddOutput", "OnPressed anv_mapfixes_ladderqol_scissorlift:AddOutput:origin 12687 7170 108:6:-1" );
-    EntFire( "washer_lift_button2", "AddOutput", "OnPressed anv_mapfixes_ladderqol_scissorlift:AddOutput:origin 12687 7170 154:8:-1" );
-    EntFire( "washer_lift_button2", "AddOutput", "OnPressed anv_mapfixes_ladderqol_scissorlift:AddOutput:origin 12687 7170 200:10:-1" );
-    EntFire( "washer_lift_button2", "AddOutput", "OnPressed anv_mapfixes_ladderqol_scissorlift:Kill::12:-1" );
+    EntFire( "washer_lift_button2", "AddOutput", "OnPressed " + g_UpdateName + "_ladderqol_scissorlift:Enable::2:-1" );
+    EntFire( "washer_lift_button2", "AddOutput", "OnPressed " + g_UpdateName + "_ladderqol_scissorlift:AddOutput:origin 12687 7170 62:4:-1" );
+    EntFire( "washer_lift_button2", "AddOutput", "OnPressed " + g_UpdateName + "_ladderqol_scissorlift:AddOutput:origin 12687 7170 108:6:-1" );
+    EntFire( "washer_lift_button2", "AddOutput", "OnPressed " + g_UpdateName + "_ladderqol_scissorlift:AddOutput:origin 12687 7170 154:8:-1" );
+    EntFire( "washer_lift_button2", "AddOutput", "OnPressed " + g_UpdateName + "_ladderqol_scissorlift:AddOutput:origin 12687 7170 200:10:-1" );
+    EntFire( "washer_lift_button2", "AddOutput", "OnPressed " + g_UpdateName + "_ladderqol_scissorlift:Kill::12:-1" );
 
 
     if ( g_BaseMode == "versus" )
@@ -56,7 +56,7 @@ function DoRoundFixes()
         make_clip(	"_shortcut_booster_TMP1",	"Survivors",	1,	"-126 -19 0",		"127 20 1048",		"10897 6764 176" );
         make_clip(	"_shortcut_booster_TMP2",	"Survivors",	1,	"-24 -303 0",		"24 304 972",		"11032 7048 252" );
 
-        EntFire( "washer_lift_button2", "AddOutput", "OnPressed anv_mapfixes_shortcut_booster_TMP*:Kill::0:-1" );
+        EntFire( "washer_lift_button2", "AddOutput", "OnPressed " + g_UpdateName + "_shortcut_booster_TMP*:Kill::0:-1" );
 
     }
     if ( g_BaseMode == "survival" )
diff --git a/root/scripts/vscripts/community/maps/c9m2_lots.nut b/root/scripts/vscripts/community/maps/c9m2_lots.nut
index 468b9247..8e7e13ef 100644
--- a/root/scripts/vscripts/community/maps/c9m2_lots.nut
+++ b/root/scripts/vscripts/community/maps/c9m2_lots.nut
@@ -37,7 +37,7 @@ function DoRoundFixes()
     con_comment( "LOGIC:\tPoint-of-no-return clip will be Enabled when finale switch is full." );
 
     make_clip( "_point_of_no_return", "Survivors", 0, "-16 -169 -168", "58 169 784", "5750 7177 368" );
-    EntFire( "finaleswitch_initial", "AddOutput", "OnTimeUp anv_mapfixes_point_of_no_return:Enable::0:-1" );
+    EntFire( "finaleswitch_initial", "AddOutput", "OnTimeUp " + g_UpdateName + "_point_of_no_return:Enable::0:-1" );
 
     if ( HasPlayerControlledZombies() )
     {
diff --git a/root/scripts/vscripts/community/z_developer_showupdate.nut b/root/scripts/vscripts/community/z_developer_showupdate.nut
index b9cea8b4..65538bb2 100644
--- a/root/scripts/vscripts/community/z_developer_showupdate.nut
+++ b/root/scripts/vscripts/community/z_developer_showupdate.nut
@@ -1,7 +1,7 @@
 /*****************************************************************************
 **  SHOW UPDATE DEMO  ( DEVELOPER MODE ONLY )
 **
-**  File "anv_mapfixes.nut" will have already explained "script ShowUpdate()"
+**  File "mapfixes.nut" will have already explained "script ShowUpdate()"
 **  with 'devchap( "TUTORIAL" )' if it's an Official Valve map -- Community maps
 **  have no updates and do nothing. Everything here requires "developer 1" or 2
 **  and manual running of HideUpdate() or ShowUpdate().
@@ -11,10 +11,10 @@
 **  ShowUpdate() creates the Timer Think, displays a tutorial regarding CLIP
 **  (blocker) color coding which correspond with "r_drawclipbrushes 2" or 1,
 **  then draws all new blockers and glows new props. Also useful to force a
-**  re-catalog of any created/deleted "anv_mapfixes"-prefixed entities.
+**  re-catalog of any created/deleted "mapfixes"-prefixed entities.
 **
 **  DebugRedraw() is only called programmatically and isn't manual like the
-**  others. It loops through all "anv_mapfixes"-prefixed blockers and props
+**  others. It loops through all "mapfixes"-prefixed blockers and props
 **  and uses DebugDrawBox() or "StartGlowing" on them accordingly, also drawing
 **  their names as overlays with DebugDrawText(). DebugDrawText() has a couple
 **  limitations: (1) "useViewCheck" parameter as "false" is the best setting
@@ -60,21 +60,21 @@
 **		-> Used switch cases in place of many if else statements
 **	- Fixed some issues with glows not being removed from props consistently
 ** 	- Added optional arguments for ShowUpdate() to change which entities are highlighted, text arguments must be enclosed in "quotes", invalid or blank argument will call ShowUpdate()
-**		-> ShowUpdate()			- Only highlights entities prefixed with "anv_mapfixes" and commentary blockers, unchanged
+**		-> ShowUpdate()			- Only highlights entities prefixed with "mapfixes" and commentary blockers, unchanged
 **		-> ShowUpdate("all")	- Highlights all valid entities regardless of targetname - ShowUpdateAll() can be used instead
-**		-> ShowUpdate("other")	- Highlights all entities without the "anv_mapfixes" prefix - ShowUpdateOther can be used instead
+**		-> ShowUpdate("other")	- Highlights all entities without the "mapfixes" prefix - ShowUpdateOther can be used instead
 **	- Added SetFilter function, usage: function SetFilter( entityGroup, value ), text arguments must be enclosed in "quotes", invalid or blank arguments will result in default values
 **		-> Allows user to filter out different groups of entities, allowing us to massively extend the functionality of ShowUpdate() to see (almost) exactly the entities we want at any time
 **		-> Full description of filters is found just above the function
 **	- Created new function for drawing text on highlighted entities
 **		-> Index of the entity is show at the end of the string, indicating the order it was added and acting as a unique ID
-**		-> Now labels non-anv_mapfixes clips
+**		-> Now labels non-mapfixes clips
 **	- Fixed text on rotated ladders being displaced from the actual model, leaving them unlabelled
 *	- Fixed ladder clone source text being duplicated for each ladder that clones from it, now it only draws the text once per ladder source
 **	- When the appropriate settings to highlight them are on, ladders that have been moved (or added with no targetname) are highlighted in purple
 **		-> Ladders that are not new and haven't been moved are highlighted in light orange
 **	- Added trigger_teleport to potential triggers to highlight
-**	- Allowed commentary blockers, lump blockers, and any blockers added by mods etc to be highlighted with the full functionality that anv_mapfixes blockers are given
+**	- Allowed commentary blockers, lump blockers, and any blockers added by mods etc to be highlighted with the full functionality that mapfixes blockers are given
 **	- Invalid or deleted entities are removed from the drawing index before attempting to draw them
 **		-> This removes the need to toggle ShowUpdate()/HideUpdate() when an entity is deleted
 **	- Adjusted func_brush color to help distinguish it from infected clips better
@@ -91,7 +91,7 @@
 
 function HideUpdate()
 {
-	EntFire( "anv_mapfixes_DebugRedraw_timer", "Kill" );
+	EntFire( g_UpdateName + "_DebugRedraw_timer", "Kill" );
 
 	// Fail-safe 2nd DebugDrawClear to resolve a rare use timing of it not clearing.
 
@@ -206,7 +206,7 @@ function ShowUpdate( showGroup = "anv" )
 		g_TutorialShown = true;
 	}
 
-	// Catalog all "anv_mapfixes"-prefixed entities by populating a Handle array.
+	// Catalog all "mapfixes"-prefixed entities by populating a Handle array.
 	// The "find" returns the earliest character index where 0 means it's a match.
 	// The Timer (and any "helper entities") have no reason to be in this array.
 
@@ -274,7 +274,7 @@ function ShowUpdate( showGroup = "anv" )
 				break;
 		}
 		
-		if ( strEntityName != "anv_mapfixes_DebugRedraw_timer" )
+		if ( strEntityName != g_UpdateName + "_DebugRedraw_timer" )
 		{
 			// Confirmed to be a fix entity so add it to array.
 			
@@ -293,11 +293,11 @@ function ShowUpdate( showGroup = "anv" )
 	// Timer that DebugRedraw()'s every 1 second, better than AddThinkToEnt() because it
 	// runs 1/10th as often and still looks good. Only make if one doesn't already exist.
 
-	if ( Entities.FindByName( null, "anv_mapfixes_DebugRedraw_timer" ) == null )
+	if ( Entities.FindByName( null, g_UpdateName + "_DebugRedraw_timer" ) == null )
 	{
 		SpawnEntityFromTable( "logic_timer",
 		{
-			targetname	=	"anv_mapfixes_DebugRedraw_timer",
+			targetname	=	g_UpdateName + "_DebugRedraw_timer",
 			RefireTime	=	1,
 			connections =
 			{
@@ -671,7 +671,7 @@ function DebugRedrawName( origin, name, entityType, index )
 	switch( entityType )
 	{
 		case "CLIP":
-			additionalPrefix = "(LUMP)"			// Prefix for non-anv_mapfixes entities.
+			additionalPrefix = "(LUMP)"			// Prefix for non-mapfixes entities.
 			break;
 		case "PCLIP":
 			additionalPrefix = "(COMMENTARY)"	// Prefix for commentary blocker entities (env_player_blocker).
@@ -691,7 +691,7 @@ function DebugRedrawName( origin, name, entityType, index )
 	
 	if ( name.find( g_UpdateName ) == null )
 	{
-		namePrefix = additionalPrefix + " " + namePrefix;		// g_UpdateName was not found, mark as non-anv_mapfixes entity.
+		namePrefix = additionalPrefix + " " + namePrefix;		// g_UpdateName was not found, mark as non-mapfixes entity.
 	}
 	else
 	{
diff --git a/root/scripts/vscripts/mapspawn.nut b/root/scripts/vscripts/mapspawn.nut
index 5b605462..3971f0df 100644
--- a/root/scripts/vscripts/mapspawn.nut
+++ b/root/scripts/vscripts/mapspawn.nut
@@ -7,7 +7,7 @@ printl( "VSCRIPT: Running mapspawn.nut" );
 **  Originally an info_target for round persistence was used since that entity
 **  wasn't lost between rounds, but Beta fixes disallowed this so "worldspawn"
 **  instead runs the file which doesn't respawn either and can maintain scope
-**  forever so anv_mapfixes.nut's "round_start" GameEvent runs infinite times.
+**  forever so mapfixes.nut's "round_start" GameEvent runs infinite times.
 **  Note that for some maps, "worldspawn" has even more scripts loaded into
 **  its scope which is perfectly OK as they're all flushed on map transition.
 **
@@ -15,7 +15,7 @@ printl( "VSCRIPT: Running mapspawn.nut" );
 **  required an info_gamemode, and GetMapName() which required a func_orator
 **  hack, all stored into convenient global variables here.
 **
-**  See anv_mapfixes.nut for the actual map fixes. Community Credits at:
+**  See mapfixes.nut for the actual map fixes. Community Credits at:
 **
 **	Community Servers/Groups  ->  Dev Thread: Map fixes for Valve
 **	https://steamcommunity.com/app/550/discussions/1/1651043320659915818/
@@ -41,7 +41,7 @@ g_MutaMode	<- Director.GetGameMode();
 g_BaseMode	<- Director.GetGameModeBase();
 
 g_Chapter	<- null;		// Stores each "friendly" mapname
-g_UpdateName	<- "anv_mapfixes";	// Prefix "anv_mapfixes" to all targetnames
+g_UpdateName	<- "community_update";	// Prefix "community_update" to all targetnames
 g_UpdateRanOnce	<- null;		// Run special code only once outside of mapspawn.nut
 
 ///////////////////////////////////////////////////////////