diff --git a/sprites/flak/EXP2A0.png b/sprites/flak/FLEXA0.png
similarity index 100%
rename from sprites/flak/EXP2A0.png
rename to sprites/flak/FLEXA0.png
diff --git a/sprites/flak/EXP2B0.png b/sprites/flak/FLEXB0.png
similarity index 100%
rename from sprites/flak/EXP2B0.png
rename to sprites/flak/FLEXB0.png
diff --git a/sprites/flak/EXP2C0.png b/sprites/flak/FLEXC0.png
similarity index 100%
rename from sprites/flak/EXP2C0.png
rename to sprites/flak/FLEXC0.png
diff --git a/sprites/flak/EXP2D0.png b/sprites/flak/FLEXD0.png
similarity index 100%
rename from sprites/flak/EXP2D0.png
rename to sprites/flak/FLEXD0.png
diff --git a/sprites/flak/EXP2E0.png b/sprites/flak/FLEXE0.png
similarity index 100%
rename from sprites/flak/EXP2E0.png
rename to sprites/flak/FLEXE0.png
diff --git a/sprites/flak/EXP2F0.png b/sprites/flak/FLEXF0.png
similarity index 100%
rename from sprites/flak/EXP2F0.png
rename to sprites/flak/FLEXF0.png
diff --git a/sprites/flak/EXP2G0.png b/sprites/flak/FLEXG0.png
similarity index 100%
rename from sprites/flak/EXP2G0.png
rename to sprites/flak/FLEXG0.png
diff --git a/sprites/flak/EXP2H0.png b/sprites/flak/FLEXH0.png
similarity index 100%
rename from sprites/flak/EXP2H0.png
rename to sprites/flak/FLEXH0.png
diff --git a/sprites/flak/EXP2I0.png b/sprites/flak/FLEXI0.png
similarity index 100%
rename from sprites/flak/EXP2I0.png
rename to sprites/flak/FLEXI0.png
diff --git a/sprites/flak/EXP2J0.png b/sprites/flak/FLEXJ0.png
similarity index 100%
rename from sprites/flak/EXP2J0.png
rename to sprites/flak/FLEXJ0.png
diff --git a/sprites/flak/EXP2K0.png b/sprites/flak/FLEXK0.png
similarity index 100%
rename from sprites/flak/EXP2K0.png
rename to sprites/flak/FLEXK0.png
diff --git a/sprites/flak/EXP2L0.png b/sprites/flak/FLEXL0.png
similarity index 100%
rename from sprites/flak/EXP2L0.png
rename to sprites/flak/FLEXL0.png
diff --git a/sprites/flak/EXP2M0.png b/sprites/flak/FLEXM0.png
similarity index 100%
rename from sprites/flak/EXP2M0.png
rename to sprites/flak/FLEXM0.png
diff --git a/sprites/flak/EXP2N0.png b/sprites/flak/FLEXN0.png
similarity index 100%
rename from sprites/flak/EXP2N0.png
rename to sprites/flak/FLEXN0.png
diff --git a/sprites/flak/EXP2O0.png b/sprites/flak/FLEXO0.png
similarity index 100%
rename from sprites/flak/EXP2O0.png
rename to sprites/flak/FLEXO0.png
diff --git a/sprites/flak/EXP2P0.png b/sprites/flak/FLEXP0.png
similarity index 100%
rename from sprites/flak/EXP2P0.png
rename to sprites/flak/FLEXP0.png
diff --git a/sprites/flak/EXP2Q0.png b/sprites/flak/FLEXQ0.png
similarity index 100%
rename from sprites/flak/EXP2Q0.png
rename to sprites/flak/FLEXQ0.png
diff --git a/sprites/flak/EXP2R0.png b/sprites/flak/FLEXR0.png
similarity index 100%
rename from sprites/flak/EXP2R0.png
rename to sprites/flak/FLEXR0.png
diff --git a/zscript/flakcannon.zsc b/zscript/flakcannon.zsc
index b285089..18fdb45 100644
--- a/zscript/flakcannon.zsc
+++ b/zscript/flakcannon.zsc
@@ -580,8 +580,8 @@ Class FlakSlug : Actor
 		}
 		Wait;
 	Death:
-		EXP2 A 0 A_FlakExplode();
-		EXP2 ABCDEFGHIJKLMNOPQR 1 BRIGHT;
+		FLEX A 0 A_FlakExplode();
+		FLEX ABCDEFGHIJKLMNOPQR 1 BRIGHT;
 		Stop;
 	}
 }
diff --git a/zscript/utcommon.zsc b/zscript/utcommon.zsc
index cb6d034..163166e 100644
--- a/zscript/utcommon.zsc
+++ b/zscript/utcommon.zsc
@@ -2980,12 +2980,7 @@ Class UTMainHandler : EventHandler
 			if ( Random[Replacements](0,1) ) e.Replacement = 'Minigun';
 			else e.Replacement = 'SniperRifle';
 		}
-		else if ( e.Replacee == 'BFG9000' ) e.Replacement = 'WarheadLauncher';
-		else if ( e.Replacee == 'Mace' )
-		{
-			if ( (!deathmatch || flak_dmsshock) && !Random[Replacements](0,6) ) e.Replacement = 'EnhancedShockRifle';
-			else e.Replacement = 'WarheadLauncher';
-		}
+		else if ( (e.Replacee == 'BFG9000') || (e.Replacee == 'Mace') ) e.Replacement = 'WarheadLauncher';
 		else if ( (e.Replacee == 'Clip') || (e.Replacee == 'GoldWandAmmo') || (e.Replacee == 'GoldWandHefty') ) e.Replacement = 'EClip';
 		else if ( (e.Replacee == 'ClipBox') )
 		{