diff --git a/source/games/duke/src/actors_r.cpp b/source/games/duke/src/actors_r.cpp
index 073dfcc30..bf4a454b5 100644
--- a/source/games/duke/src/actors_r.cpp
+++ b/source/games/duke/src/actors_r.cpp
@@ -1889,7 +1889,7 @@ void resetswitch(int tag)
 	DukeStatIterator it2(STAT_DEFAULT);
 	while (auto act2 = it2.Next())
 	{
-		if (act2->spr.picnum == DIPSWITCH3 + 1)
+		if (act2->spr.picnum == DIPSWITCH3ON)
 			if (act2->spr.hitag == tag)
 				act2->spr.picnum = DIPSWITCH3;
 	}
diff --git a/source/games/duke/src/flags_d.cpp b/source/games/duke/src/flags_d.cpp
index 0e3265612..e6cb7231e 100644
--- a/source/games/duke/src/flags_d.cpp
+++ b/source/games/duke/src/flags_d.cpp
@@ -42,45 +42,45 @@ void initactorflags_d()
 {
 	settileflag(TFLAG_WALLSWITCH, {
 		HANDPRINTSWITCH,
-		HANDPRINTSWITCH + 1,
+		HANDPRINTSWITCHON,
 		ALIENSWITCH,
-		ALIENSWITCH + 1,
+		ALIENSWITCHON,
 		MULTISWITCH,
-		MULTISWITCH + 1,
-		MULTISWITCH + 2,
-		MULTISWITCH + 3,
+		MULTISWITCH_2,
+		MULTISWITCH_3,
+		MULTISWITCH_4,
 		ACCESSSWITCH,
 		ACCESSSWITCH2,
 		PULLSWITCH,
-		PULLSWITCH + 1,
+		PULLSWITCHON,
 		HANDSWITCH,
-		HANDSWITCH + 1,
+		HANDSWITCHON,
 		SLOTDOOR,
-		SLOTDOOR + 1,
+		SLOTDOORON,
 		LIGHTSWITCH,
-		LIGHTSWITCH + 1,
+		LIGHTSWITCHON,
 		SPACELIGHTSWITCH,
-		SPACELIGHTSWITCH + 1,
+		SPACELIGHTSWITCHON,
 		SPACEDOORSWITCH,
-		SPACEDOORSWITCH + 1,
+		SPACEDOORSWITCHON,
 		FRANKENSTINESWITCH,
-		FRANKENSTINESWITCH + 1,
+		FRANKENSTINESWITCHON,
 		LIGHTSWITCH2,
-		LIGHTSWITCH2 + 1,
+		LIGHTSWITCH2ON,
 		POWERSWITCH1,
-		POWERSWITCH1 + 1,
+		POWERSWITCH1ON,
 		LOCKSWITCH1,
-		LOCKSWITCH1 + 1,
+		LOCKSWITCH1ON,
 		POWERSWITCH2,
-		POWERSWITCH2 + 1,
+		POWERSWITCH2ON,
 		DIPSWITCH,
-		DIPSWITCH + 1,
+		DIPSWITCHON,
 		DIPSWITCH2,
-		DIPSWITCH2 + 1,
+		DIPSWITCH2ON,
 		TECHSWITCH,
-		TECHSWITCH + 1,
+		TECHSWITCHON,
 		DIPSWITCH3,
-		DIPSWITCH3 + 1 });
+		DIPSWITCH3ON });
 
 	settileflag(TFLAG_ADULT, {
 		FEM1,
diff --git a/source/games/duke/src/flags_r.cpp b/source/games/duke/src/flags_r.cpp
index fbc94a4ae..50f1baa4e 100644
--- a/source/games/duke/src/flags_r.cpp
+++ b/source/games/duke/src/flags_r.cpp
@@ -36,54 +36,54 @@ void initactorflags_r()
 {
 	settileflag(TFLAG_WALLSWITCH, {
 		HANDPRINTSWITCH,
-		HANDPRINTSWITCH + 1,
+		HANDPRINTSWITCHON,
 		ALIENSWITCH,
-		ALIENSWITCH + 1,
+		ALIENSWITCHON,
 		MULTISWITCH,
-		MULTISWITCH + 1,
-		MULTISWITCH + 2,
-		MULTISWITCH + 3,
+		MULTISWITCH_2,
+		MULTISWITCH_3,
+		MULTISWITCH_4,
 		ACCESSSWITCH,
 		ACCESSSWITCH2,
 		PULLSWITCH,
-		PULLSWITCH + 1,
+		PULLSWITCHON,
 		HANDSWITCH,
-		HANDSWITCH + 1,
+		HANDSWITCHON,
 		SLOTDOOR,
-		SLOTDOOR + 1,
+		SLOTDOORON,
 		LIGHTSWITCH,
-		LIGHTSWITCH + 1,
+		LIGHTSWITCHON,
 		SPACELIGHTSWITCH,
-		SPACELIGHTSWITCH + 1,
+		SPACELIGHTSWITCHON,
 		SPACEDOORSWITCH,
-		SPACEDOORSWITCH + 1,
+		SPACEDOORSWITCHON,
 		FRANKENSTINESWITCH,
-		FRANKENSTINESWITCH + 1,
+		FRANKENSTINESWITCHON,
 		LIGHTSWITCH2,
-		LIGHTSWITCH2 + 1,
+		LIGHTSWITCH2ON,
 		POWERSWITCH1,
-		POWERSWITCH1 + 1,
+		POWERSWITCH1ON,
 		LOCKSWITCH1,
-		LOCKSWITCH1 + 1,
+		LOCKSWITCH1ON,
 		POWERSWITCH2,
-		POWERSWITCH2 + 1,
+		POWERSWITCH2ON,
 		DIPSWITCH,
-		DIPSWITCH + 1,
+		DIPSWITCHON,
 		DIPSWITCH2,
-		DIPSWITCH2 + 1,
+		DIPSWITCH2ON,
 		TECHSWITCH,
-		TECHSWITCH + 1,
+		TECHSWITCHON,
 		DIPSWITCH3,
-		DIPSWITCH3 + 1,
+		DIPSWITCH3ON,
 		CHICKENPLANTBUTTON,
-		CHICKENPLANTBUTTON + 1 });
+		CHICKENPLANTBUTTONON });
 	if (isRRRA()) settileflag(TFLAG_WALLSWITCH, {
 		MULTISWITCH2,
-		MULTISWITCH2 + 1,
-		MULTISWITCH2 + 2,
-		MULTISWITCH2 + 3,
-		RRTILE8464,
-		RRTILE8464 + 1 });
+		MULTISWITCH2_2,
+		MULTISWITCH2_3,
+		MULTISWITCH2_4,
+		IRONWHEELSWITCH,
+		IRONWHEELSWITCHON });
 
 	settileflag(TFLAG_ADULT, {
 		FEM10,
diff --git a/source/games/duke/src/namelist_d.h b/source/games/duke/src/namelist_d.h
index 3813f4e80..759bc9144 100644
--- a/source/games/duke/src/namelist_d.h
+++ b/source/games/duke/src/namelist_d.h
@@ -57,12 +57,20 @@ x(WALLLIGHT4, 124)
 x(WALLLIGHTBUST4, 125)
 x(ACCESSSWITCH, 130)
 x(SLOTDOOR, 132)
+x(SLOTDOORON, 133)
 x(LIGHTSWITCH, 134)
+x(LIGHTSWITCHON, 135)
 x(SPACEDOORSWITCH, 136)
+x(SPACEDOORSWITCHON, 137)
 x(SPACELIGHTSWITCH, 138)
+x(SPACELIGHTSWITCHON, 139)
 x(FRANKENSTINESWITCH, 140)
+x(FRANKENSTINESWITCHON, 141)
 x(NUKEBUTTON, 142)
 x(MULTISWITCH, 146)
+x(MULTISWITCH_2, 147)
+x(MULTISWITCH_3, 148)
+x(MULTISWITCH_4, 149)
 x(DOORTILE5, 150)
 x(DOORTILE6, 151)
 x(DOORTILE1, 152)
@@ -75,9 +83,13 @@ x(DOORTILE9, 158)
 x(DOORTILE10, 159)
 x(DOORSHOCK, 160)
 x(DIPSWITCH, 162)
+x(DIPSWITCHON, 163)
 x(DIPSWITCH2, 164)
+x(DIPSWITCH2ON, 165)
 x(TECHSWITCH, 166)
+x(TECHSWITCHON, 167)
 x(DIPSWITCH3, 168)
+x(DIPSWITCH3ON, 169)
 x(ACCESSSWITCH2, 170)
 x(REFLECTWATERTILE, 180)
 x(FLOORSLIME, 200)
@@ -209,6 +221,7 @@ x(WALLLIGHTBUST1, 704)
 x(WALLLIGHT2, 705)
 x(WALLLIGHTBUST2, 706)
 x(LIGHTSWITCH2, 712)
+x(LIGHTSWITCH2ON, 713)
 x(WAITTOBESEATED, 716)
 x(DOORTILE14, 717)
 x(STATUE, 753)
@@ -224,8 +237,11 @@ x(OJ, 806)
 x(MASKWALL13, 830)
 x(HURTRAIL, 859)
 x(POWERSWITCH1, 860)
+x(POWERSWITCH1ON, 861)
 x(LOCKSWITCH1, 862)
+x(LOCKSWITCH1ON, 863)
 x(POWERSWITCH2, 864)
+x(POWERSWITCH2ON, 865)
 x(ATM, 867)
 x(STATUEFLASH, 869)
 x(ATMBROKE, 888)
@@ -304,14 +320,18 @@ x(REACTORSPARK, 1092)
 x(REACTORBURNT, 1096)
 x(DOORTILE15, 1102)
 x(HANDSWITCH, 1111)
+x(HANDSWITCHON, 1112)
 x(CIRCLEPANNEL, 1113)
 x(CIRCLEPANNELBROKE, 1114)
 x(PULLSWITCH, 1122)
+x(PULLSWITCHON, 1123)
 x(MASKWALL8, 1124)
 x(BIGHOLE, 1141)
 x(ALIENSWITCH, 1142)
+x(ALIENSWITCHON, 1143)
 x(DOORTILE21, 1144)
 x(HANDPRINTSWITCH, 1155)
+x(HANDPRINTSWITCHON, 1156)
 x(BOTTLE10, 1157)
 x(BOTTLE11, 1158)
 x(BOTTLE12, 1159)
diff --git a/source/games/duke/src/namelist_r.h b/source/games/duke/src/namelist_r.h
index b08adc951..d1e6bc570 100644
--- a/source/games/duke/src/namelist_r.h
+++ b/source/games/duke/src/namelist_r.h
@@ -64,12 +64,21 @@ x(MOTOAMMO, 78)
 x(BUTTON1, 80)
 x(ACCESSSWITCH, 82)
 x(SLOTDOOR, 84)
+x(SLOTDOORON, 85)
 x(LIGHTSWITCH, 86)
+x(LIGHTSWITCHON, 87)
 x(SPACEDOORSWITCH, 88)
+x(SPACEDOORSWITCHON, 89)
 x(SPACELIGHTSWITCH, 90)
+x(SPACELIGHTSWITCHON, 91)
 x(FRANKENSTINESWITCH, 92)
+x(FRANKENSTINESWITCHON, 93)
 x(CHICKENPLANTBUTTON, 94)
+x(CHICKENPLANTBUTTONON, 95)
 x(MULTISWITCH, 98)
+x(MULTISWITCH_2, 99)
+x(MULTISWITCH_3, 100)
+x(MULTISWITCH_4, 101)
 x(DOORTILE1, 102)
 x(DOORTILE2, 103)
 x(DOORTILE3, 104)
@@ -86,9 +95,13 @@ x(DOORTILE16, 117)
 x(DOORTILE18, 119)
 x(DOORSHOCK, 120)
 x(DIPSWITCH, 121)
+x(DIPSWITCHON, 122)
 x(DIPSWITCH2, 123)
+x(DIPSWITCH2ON, 124)
 x(TECHSWITCH, 125)
+x(TECHSWITCHON, 126)
 x(DIPSWITCH3, 127)
+x(DIPSWITCH3ON, 128)
 x(ACCESSSWITCH2, 129)
 x(REFLECTWATERTILE, 131)
 x(FLOORSLIME, 132)
@@ -156,6 +169,7 @@ x(WALLLIGHTBUST1, 247)
 x(WALLLIGHT2, 248)
 x(WALLLIGHTBUST2, 249)
 x(LIGHTSWITCH2, 250)
+x(LIGHTSWITCH2ON, 251)
 x(UFOBEAM, 252)
 y(BOWLINGPINSPOT, 280)
 y(RRTILE281, 281)
@@ -382,6 +396,7 @@ x(PLUG, 1272)
 x(OOZFILTER, 1273)
 x(FLOORPLASMA, 1276)
 x(HANDPRINTSWITCH, 1278)
+x(HANDPRINTSWITCHON, 1278)
 x(BOTTLE10, 1280)
 x(BOTTLE11, 1281)
 x(BOTTLE12, 1282)
@@ -660,8 +675,11 @@ x(WAITTOBESEATED, 2215)
 x(OJ, 2217)
 x(HURTRAIL, 2221)
 x(POWERSWITCH1, 2222)
+x(POWERSWITCH1ON, 2223)
 x(LOCKSWITCH1, 2224)
+x(LOCKSWITCH1ON, 2225)
 x(POWERSWITCH2, 2226)
+x(POWERSWITCH2ON, 2227)
 x(ATM, 2229)
 x(STATUEFLASH, 2231)
 x(ATMBROKE, 2233)
@@ -672,10 +690,13 @@ x(REACTOR, 2239)
 x(REACTORSPARK, 2243)
 x(REACTORBURNT, 2247)
 x(HANDSWITCH, 2249)
+x(HANDSWITCHON, 2250)
 x(CIRCLEPANNEL, 2251)
 x(CIRCLEPANNELBROKE, 2252)
 x(PULLSWITCH, 2254)
+x(PULLSWITCHON, 2255)
 x(ALIENSWITCH, 2259)
+x(ALIENSWITCHON, 2260)
 x(DOORTILE21, 2261)
 x(DOORTILE17, 2263)
 x(MASKWALL7, 2264)
@@ -1184,6 +1205,9 @@ y(RRTILE7913, 7913)
 y(RRTILE7936, 7936)
 y(RRTILE8047, 8047)
 x(MULTISWITCH2, 8048)
+x(MULTISWITCH2_2, 8049)
+x(MULTISWITCH2_3, 8050)
+x(MULTISWITCH2_4, 8051)
 y(RRTILE8059, 8059)
 y(RRTILE8060, 8060)
 y(RRTILE8063, 8063)
@@ -1239,7 +1263,8 @@ y(RRTILE8450, 8450)
 x(BOATAMMO, 8460)
 y(RRTILE8461, 8461)
 y(RRTILE8462, 8462)
-y(RRTILE8464, 8464)
+x(IRONWHEELSWITCH, 8464)
+x(IRONWHEELSWITCHON, 8465)
 y(RRTILE8475, 8475)
 y(RRTILE8487, 8487)
 y(RRTILE8488, 8488)
diff --git a/source/games/duke/src/player_d.cpp b/source/games/duke/src/player_d.cpp
index 0159245b4..b6f995946 100644
--- a/source/games/duke/src/player_d.cpp
+++ b/source/games/duke/src/player_d.cpp
@@ -449,13 +449,13 @@ static void shootweapon(DDukeActor *actor, int p, DVector3 pos, DAngle ang, int
 
 			if (p >= 0 && (
 				hit.actor()->spr.picnum == DIPSWITCH ||
-				hit.actor()->spr.picnum == DIPSWITCH + 1 ||
+				hit.actor()->spr.picnum == DIPSWITCHON ||
 				hit.actor()->spr.picnum == DIPSWITCH2 ||
-				hit.actor()->spr.picnum == DIPSWITCH2 + 1 ||
+				hit.actor()->spr.picnum == DIPSWITCH2ON ||
 				hit.actor()->spr.picnum == DIPSWITCH3 ||
-				hit.actor()->spr.picnum == DIPSWITCH3 + 1 ||
+				hit.actor()->spr.picnum == DIPSWITCH3ON ||
 				hit.actor()->spr.picnum == HANDSWITCH ||
-				hit.actor()->spr.picnum == HANDSWITCH + 1))
+				hit.actor()->spr.picnum == HANDSWITCHON))
 			{
 				fi.checkhitswitch(p, nullptr, hit.actor());
 				return;
@@ -469,13 +469,13 @@ static void shootweapon(DDukeActor *actor, int p, DVector3 pos, DAngle ang, int
 				goto SKIPBULLETHOLE;
 			if (p >= 0 && (
 				hit.hitWall->picnum == DIPSWITCH ||
-				hit.hitWall->picnum == DIPSWITCH + 1 ||
+				hit.hitWall->picnum == DIPSWITCHON ||
 				hit.hitWall->picnum == DIPSWITCH2 ||
-				hit.hitWall->picnum == DIPSWITCH2 + 1 ||
+				hit.hitWall->picnum == DIPSWITCH2ON ||
 				hit.hitWall->picnum == DIPSWITCH3 ||
-				hit.hitWall->picnum == DIPSWITCH3 + 1 ||
+				hit.hitWall->picnum == DIPSWITCH3ON ||
 				hit.hitWall->picnum == HANDSWITCH ||
-				hit.hitWall->picnum == HANDSWITCH + 1))
+				hit.hitWall->picnum == HANDSWITCHON))
 			{
 				fi.checkhitswitch(p, hit.hitWall, nullptr);
 				return;
diff --git a/source/games/duke/src/player_r.cpp b/source/games/duke/src/player_r.cpp
index dac748447..89e8a9ab9 100644
--- a/source/games/duke/src/player_r.cpp
+++ b/source/games/duke/src/player_r.cpp
@@ -343,14 +343,14 @@ static void shootweapon(DDukeActor* actor, int p, DVector3 pos, DAngle ang, int
 
 			if (p >= 0 && (
 				hit.actor()->spr.picnum == DIPSWITCH ||
-				hit.actor()->spr.picnum == DIPSWITCH + 1 ||
+				hit.actor()->spr.picnum == DIPSWITCHON ||
 				hit.actor()->spr.picnum == DIPSWITCH2 ||
-				hit.actor()->spr.picnum == DIPSWITCH2 + 1 ||
+				hit.actor()->spr.picnum == DIPSWITCH2ON ||
 				hit.actor()->spr.picnum == DIPSWITCH3 ||
-				hit.actor()->spr.picnum == DIPSWITCH3 + 1 ||
+				hit.actor()->spr.picnum == DIPSWITCH3ON ||
 				(isRRRA() && hit.actor()->spr.picnum == RRTILE8660) ||
 				hit.actor()->spr.picnum == HANDSWITCH ||
-				hit.actor()->spr.picnum == HANDSWITCH + 1))
+				hit.actor()->spr.picnum == HANDSWITCHON))
 			{
 				fi.checkhitswitch(p, nullptr, hit.actor());
 				return;
@@ -366,14 +366,14 @@ static void shootweapon(DDukeActor* actor, int p, DVector3 pos, DAngle ang, int
 				goto SKIPBULLETHOLE;
 			if (p >= 0 && (
 				hit.hitWall->picnum == DIPSWITCH ||
-				hit.hitWall->picnum == DIPSWITCH + 1 ||
+				hit.hitWall->picnum == DIPSWITCHON ||
 				hit.hitWall->picnum == DIPSWITCH2 ||
-				hit.hitWall->picnum == DIPSWITCH2 + 1 ||
+				hit.hitWall->picnum == DIPSWITCH2ON ||
 				hit.hitWall->picnum == DIPSWITCH3 ||
-				hit.hitWall->picnum == DIPSWITCH3 + 1 ||
+				hit.hitWall->picnum == DIPSWITCH3ON ||
 				(isRRRA() && hit.hitWall->picnum == RRTILE8660) ||
 				hit.hitWall->picnum == HANDSWITCH ||
-				hit.hitWall->picnum == HANDSWITCH + 1))
+				hit.hitWall->picnum == HANDSWITCHON))
 			{
 				fi.checkhitswitch(p, hit.hitWall, nullptr);
 				return;
diff --git a/source/games/duke/src/premap_d.cpp b/source/games/duke/src/premap_d.cpp
index b5d6d8617..14df7214f 100644
--- a/source/games/duke/src/premap_d.cpp
+++ b/source/games/duke/src/premap_d.cpp
@@ -311,19 +311,19 @@ void prelevel_d(int g, TArray<DDukeActor*>& actors)
 	{
 		switch (actor->spr.picnum)
 		{
-		case DIPSWITCH + 1:
-		case DIPSWITCH2 + 1:
-		case PULLSWITCH + 1:
-		case HANDSWITCH + 1:
-		case SLOTDOOR + 1:
-		case LIGHTSWITCH + 1:
-		case SPACELIGHTSWITCH + 1:
-		case SPACEDOORSWITCH + 1:
-		case FRANKENSTINESWITCH + 1:
-		case LIGHTSWITCH2 + 1:
-		case POWERSWITCH1 + 1:
-		case LOCKSWITCH1 + 1:
-		case POWERSWITCH2 + 1:
+		case DIPSWITCHON:
+		case DIPSWITCH2ON:
+		case PULLSWITCHON:
+		case HANDSWITCHON:
+		case SLOTDOORON:
+		case LIGHTSWITCHON:
+		case SPACELIGHTSWITCHON:
+		case SPACEDOORSWITCHON:
+		case FRANKENSTINESWITCHON:
+		case LIGHTSWITCH2ON:
+		case POWERSWITCH1ON:
+		case LOCKSWITCH1ON:
+		case POWERSWITCH2ON:
 			for (j = 0; j < lotaglist; j++)
 				if (actor->spr.lotag == lotags[j])
 					break;
diff --git a/source/games/duke/src/premap_r.cpp b/source/games/duke/src/premap_r.cpp
index 77922ed3e..446977b5f 100644
--- a/source/games/duke/src/premap_r.cpp
+++ b/source/games/duke/src/premap_r.cpp
@@ -612,24 +612,24 @@ void prelevel_r(int g, TArray<DDukeActor*>& actors)
 	{
 		switch (ac->spr.picnum)
 		{
-		case RRTILE8464 + 1:
+		case IRONWHEELSWITCHON:
 			if (!isRRRA()) break;
 			[[fallthrough]];
-		case DIPSWITCH + 1:
-		case DIPSWITCH2 + 1:
-		case PULLSWITCH + 1:
-		case HANDSWITCH + 1:
-		case SLOTDOOR + 1:
-		case LIGHTSWITCH + 1:
-		case SPACELIGHTSWITCH + 1:
-		case SPACEDOORSWITCH + 1:
-		case FRANKENSTINESWITCH + 1:
-		case LIGHTSWITCH2 + 1:
-		case POWERSWITCH1 + 1:
-		case LOCKSWITCH1 + 1:
-		case POWERSWITCH2 + 1:
+		case DIPSWITCHON:
+		case DIPSWITCH2ON:
+		case PULLSWITCHON:
+		case HANDSWITCHON:
+		case SLOTDOORON:
+		case LIGHTSWITCHON:
+		case SPACELIGHTSWITCHON:
+		case SPACEDOORSWITCHON:
+		case FRANKENSTINESWITCHON:
+		case LIGHTSWITCH2ON:
+		case POWERSWITCH1ON:
+		case LOCKSWITCH1ON:
+		case POWERSWITCH2ON:
 		case CHICKENPLANTBUTTON:
-		case CHICKENPLANTBUTTON + 1:
+		case CHICKENPLANTBUTTONON:
 
 			for (j = 0; j < lotaglist; j++)
 				if (ac->spr.lotag == lotags[j])
diff --git a/source/games/duke/src/sectors_d.cpp b/source/games/duke/src/sectors_d.cpp
index beba513a8..ceac3200d 100644
--- a/source/games/duke/src/sectors_d.cpp
+++ b/source/games/duke/src/sectors_d.cpp
@@ -229,11 +229,11 @@ bool checkhitswitch_d(int snum, walltype* wwal, DDukeActor *act)
 	switch (picnum)
 	{
 	case DIPSWITCH:
-	case DIPSWITCH + 1:
+	case DIPSWITCHON:
 	case TECHSWITCH:
-	case TECHSWITCH + 1:
+	case TECHSWITCHON:
 	case ALIENSWITCH:
-	case ALIENSWITCH + 1:
+	case ALIENSWITCHON:
 		break;
 	case DEVELOPERCOMMENTARY + 1: //Twentieth Anniversary World Tour
 		if (act)
@@ -288,35 +288,35 @@ bool checkhitswitch_d(int snum, walltype* wwal, DDukeActor *act)
 		}
 		[[fallthrough]];
 	case DIPSWITCH2:
-	case DIPSWITCH2 + 1:
+	case DIPSWITCH2ON:
 	case DIPSWITCH3:
-	case DIPSWITCH3 + 1:
+	case DIPSWITCH3ON:
 	case MULTISWITCH:
-	case MULTISWITCH + 1:
-	case MULTISWITCH + 2:
-	case MULTISWITCH + 3:
+	case MULTISWITCH_2:
+	case MULTISWITCH_3:
+	case MULTISWITCH_4:
 	case PULLSWITCH:
-	case PULLSWITCH + 1:
+	case PULLSWITCHON:
 	case HANDSWITCH:
-	case HANDSWITCH + 1:
+	case HANDSWITCHON:
 	case SLOTDOOR:
-	case SLOTDOOR + 1:
+	case SLOTDOORON:
 	case LIGHTSWITCH:
-	case LIGHTSWITCH + 1:
+	case LIGHTSWITCHON:
 	case SPACELIGHTSWITCH:
-	case SPACELIGHTSWITCH + 1:
+	case SPACELIGHTSWITCHON:
 	case SPACEDOORSWITCH:
-	case SPACEDOORSWITCH + 1:
+	case SPACEDOORSWITCHON:
 	case FRANKENSTINESWITCH:
-	case FRANKENSTINESWITCH + 1:
+	case FRANKENSTINESWITCHON:
 	case LIGHTSWITCH2:
-	case LIGHTSWITCH2 + 1:
+	case LIGHTSWITCH2ON:
 	case POWERSWITCH1:
-	case POWERSWITCH1 + 1:
+	case POWERSWITCH1ON:
 	case LOCKSWITCH1:
-	case LOCKSWITCH1 + 1:
+	case LOCKSWITCH1ON:
 	case POWERSWITCH2:
-	case POWERSWITCH2 + 1:
+	case POWERSWITCH2ON:
 		if (check_activator_motion(lotag)) return 0;
 		break;
 	default:
@@ -336,19 +336,19 @@ bool checkhitswitch_d(int snum, walltype* wwal, DDukeActor *act)
 			else if (other->spr.hitag == 0) correctdips++;
 			numdips++;
 			break;
-		case TECHSWITCH + 1:
-		case DIPSWITCH + 1:
-		case ALIENSWITCH + 1:
+		case TECHSWITCHON:
+		case DIPSWITCHON:
+		case ALIENSWITCHON:
 			if (act && act == other) other->spr.picnum--;
 			else if (other->spr.hitag == 1) correctdips++;
 			numdips++;
 			break;
 		case MULTISWITCH:
-		case MULTISWITCH + 1:
-		case MULTISWITCH + 2:
-		case MULTISWITCH + 3:
+		case MULTISWITCH_2:
+		case MULTISWITCH_3:
+		case MULTISWITCH_4:
 			other->spr.picnum++;
-			if (other->spr.picnum > (MULTISWITCH + 3))
+			if (other->spr.picnum > (MULTISWITCH_4))
 				other->spr.picnum = MULTISWITCH;
 			break;
 		case ACCESSSWITCH:
@@ -368,19 +368,19 @@ bool checkhitswitch_d(int snum, walltype* wwal, DDukeActor *act)
 		case DIPSWITCH3:
 			other->spr.picnum++;
 			break;
-		case PULLSWITCH + 1:
-		case HANDSWITCH + 1:
-		case LIGHTSWITCH2 + 1:
-		case POWERSWITCH1 + 1:
-		case LOCKSWITCH1 + 1:
-		case POWERSWITCH2 + 1:
-		case SLOTDOOR + 1:
-		case LIGHTSWITCH + 1:
-		case SPACELIGHTSWITCH + 1:
-		case SPACEDOORSWITCH + 1:
-		case FRANKENSTINESWITCH + 1:
-		case DIPSWITCH2 + 1:
-		case DIPSWITCH3 + 1:
+		case PULLSWITCHON:
+		case HANDSWITCHON:
+		case LIGHTSWITCH2ON:
+		case POWERSWITCH1ON:
+		case LOCKSWITCH1ON:
+		case POWERSWITCH2ON:
+		case SLOTDOORON:
+		case LIGHTSWITCHON:
+		case SPACELIGHTSWITCHON:
+		case SPACEDOORSWITCHON:
+		case FRANKENSTINESWITCHON:
+		case DIPSWITCH2ON:
+		case DIPSWITCH3ON:
 			other->spr.picnum--;
 			break;
 		}
@@ -398,19 +398,19 @@ bool checkhitswitch_d(int snum, walltype* wwal, DDukeActor *act)
 				else if (wal.hitag == 0) correctdips++;
 				numdips++;
 				break;
-			case DIPSWITCH + 1:
-			case TECHSWITCH + 1:
-			case ALIENSWITCH + 1:
+			case DIPSWITCHON:
+			case TECHSWITCHON:
+			case ALIENSWITCHON:
 				if (!act && &wal == wwal) wal.picnum--;
 				else if (wal.hitag == 1) correctdips++;
 				numdips++;
 				break;
 			case MULTISWITCH:
-			case MULTISWITCH + 1:
-			case MULTISWITCH + 2:
-			case MULTISWITCH + 3:
+			case MULTISWITCH_2:
+			case MULTISWITCH_3:
+			case MULTISWITCH_4:
 				wal.picnum++;
-				if (wal.picnum > (MULTISWITCH + 3))
+				if (wal.picnum > (MULTISWITCH_4))
 					wal.picnum = MULTISWITCH;
 				break;
 			case ACCESSSWITCH:
@@ -429,18 +429,18 @@ bool checkhitswitch_d(int snum, walltype* wwal, DDukeActor *act)
 			case DIPSWITCH3:
 				wal.picnum++;
 				break;
-			case HANDSWITCH + 1:
-			case PULLSWITCH + 1:
-			case LIGHTSWITCH2 + 1:
-			case POWERSWITCH1 + 1:
-			case LOCKSWITCH1 + 1:
-			case POWERSWITCH2 + 1:
-			case SLOTDOOR + 1:
-			case LIGHTSWITCH + 1:
-			case SPACELIGHTSWITCH + 1:
-			case SPACEDOORSWITCH + 1:
-			case DIPSWITCH2 + 1:
-			case DIPSWITCH3 + 1:
+			case HANDSWITCHON:
+			case PULLSWITCHON:
+			case LIGHTSWITCH2ON:
+			case POWERSWITCH1ON:
+			case LOCKSWITCH1ON:
+			case POWERSWITCH2ON:
+			case SLOTDOORON:
+			case LIGHTSWITCHON:
+			case SPACELIGHTSWITCHON:
+			case SPACEDOORSWITCHON:
+			case DIPSWITCH2ON:
+			case DIPSWITCH3ON:
 				wal.picnum--;
 				break;
 			}
@@ -459,16 +459,16 @@ bool checkhitswitch_d(int snum, walltype* wwal, DDukeActor *act)
 		if (fi.isadoorwall(picnum) == 0) break;
 		[[fallthrough]];
 	case DIPSWITCH:
-	case DIPSWITCH + 1:
+	case DIPSWITCHON:
 	case TECHSWITCH:
-	case TECHSWITCH + 1:
+	case TECHSWITCHON:
 	case ALIENSWITCH:
-	case ALIENSWITCH + 1:
-		if (picnum == DIPSWITCH || picnum == DIPSWITCH + 1 ||
-			picnum == ALIENSWITCH || picnum == ALIENSWITCH + 1 ||
-			picnum == TECHSWITCH || picnum == TECHSWITCH + 1)
+	case ALIENSWITCHON:
+		if (picnum == DIPSWITCH || picnum == DIPSWITCHON ||
+			picnum == ALIENSWITCH || picnum == ALIENSWITCHON ||
+			picnum == TECHSWITCH || picnum == TECHSWITCHON)
 		{
-			if (picnum == ALIENSWITCH || picnum == ALIENSWITCH + 1)
+			if (picnum == ALIENSWITCH || picnum == ALIENSWITCHON)
 			{
 				if (act)
 					S_PlaySound3D(ALIEN_SWITCH1, act, v);
@@ -485,40 +485,40 @@ bool checkhitswitch_d(int snum, walltype* wwal, DDukeActor *act)
 		}
 		[[fallthrough]];
 	case DIPSWITCH2:
-	case DIPSWITCH2 + 1:
+	case DIPSWITCH2ON:
 	case DIPSWITCH3:
-	case DIPSWITCH3 + 1:
+	case DIPSWITCH3ON:
 	case MULTISWITCH:
-	case MULTISWITCH + 1:
-	case MULTISWITCH + 2:
-	case MULTISWITCH + 3:
+	case MULTISWITCH_2:
+	case MULTISWITCH_3:
+	case MULTISWITCH_4:
 	case ACCESSSWITCH:
 	case ACCESSSWITCH2:
 	case SLOTDOOR:
-	case SLOTDOOR + 1:
+	case SLOTDOORON:
 	case LIGHTSWITCH:
-	case LIGHTSWITCH + 1:
+	case LIGHTSWITCHON:
 	case SPACELIGHTSWITCH:
-	case SPACELIGHTSWITCH + 1:
+	case SPACELIGHTSWITCHON:
 	case SPACEDOORSWITCH:
-	case SPACEDOORSWITCH + 1:
+	case SPACEDOORSWITCHON:
 	case FRANKENSTINESWITCH:
-	case FRANKENSTINESWITCH + 1:
+	case FRANKENSTINESWITCHON:
 	case LIGHTSWITCH2:
-	case LIGHTSWITCH2 + 1:
+	case LIGHTSWITCH2ON:
 	case POWERSWITCH1:
-	case POWERSWITCH1 + 1:
+	case POWERSWITCH1ON:
 	case LOCKSWITCH1:
-	case LOCKSWITCH1 + 1:
+	case LOCKSWITCH1ON:
 	case POWERSWITCH2:
-	case POWERSWITCH2 + 1:
+	case POWERSWITCH2ON:
 	case HANDSWITCH:
-	case HANDSWITCH + 1:
+	case HANDSWITCHON:
 	case PULLSWITCH:
-	case PULLSWITCH + 1:
+	case PULLSWITCHON:
 
-		if (picnum == MULTISWITCH || picnum == (MULTISWITCH + 1) ||
-			picnum == (MULTISWITCH + 2) || picnum == (MULTISWITCH + 3))
+		if (picnum == MULTISWITCH || picnum == (MULTISWITCH_2) ||
+			picnum == (MULTISWITCH_3) || picnum == (MULTISWITCH_4))
 			lotag += picnum - MULTISWITCH;
 
 		DukeStatIterator itr(STAT_EFFECTOR);
@@ -554,9 +554,9 @@ bool checkhitswitch_d(int snum, walltype* wwal, DDukeActor *act)
 		fi.operateforcefields(ps[snum].GetActor(), lotag);
 		operatemasterswitches(lotag);
 
-		if (picnum == DIPSWITCH || picnum == DIPSWITCH + 1 ||
-			picnum == ALIENSWITCH || picnum == ALIENSWITCH + 1 ||
-			picnum == TECHSWITCH || picnum == TECHSWITCH + 1) return 1;
+		if (picnum == DIPSWITCH || picnum == DIPSWITCHON ||
+			picnum == ALIENSWITCH || picnum == ALIENSWITCHON ||
+			picnum == TECHSWITCH || picnum == TECHSWITCHON) return 1;
 
 		if (hitag == 0 && fi.isadoorwall(picnum) == 0)
 		{
diff --git a/source/games/duke/src/sectors_r.cpp b/source/games/duke/src/sectors_r.cpp
index 4385330f5..b7f5eacc1 100644
--- a/source/games/duke/src/sectors_r.cpp
+++ b/source/games/duke/src/sectors_r.cpp
@@ -344,11 +344,11 @@ bool checkhitswitch_r(int snum, walltype* wwal, DDukeActor* act)
 	switch (picnum)
 	{
 	case DIPSWITCH:
-	case DIPSWITCH + 1:
+	case DIPSWITCHON:
 	case TECHSWITCH:
-	case TECHSWITCH + 1:
+	case TECHSWITCHON:
 	case ALIENSWITCH:
-	case ALIENSWITCH + 1:
+	case ALIENSWITCHON:
 		break;
 	case ACCESSSWITCH:
 	case ACCESSSWITCH2:
@@ -400,45 +400,45 @@ bool checkhitswitch_r(int snum, walltype* wwal, DDukeActor* act)
 		goto goOn1;
 
 	case MULTISWITCH2:
-	case MULTISWITCH2 + 1:
-	case MULTISWITCH2 + 2:
-	case MULTISWITCH2 + 3:
-	case RRTILE8464:
+	case MULTISWITCH2_2:
+	case MULTISWITCH2_3:
+	case MULTISWITCH2_4:
+	case IRONWHEELSWITCH:
 	case RRTILE8660:
 		if (!isRRRA()) break;
 		[[fallthrough]];
 	case DIPSWITCH2:
-	case DIPSWITCH2 + 1:
+	case DIPSWITCH2ON:
 	case DIPSWITCH3:
-	case DIPSWITCH3 + 1:
+	case DIPSWITCH3ON:
 	case MULTISWITCH:
-	case MULTISWITCH + 1:
-	case MULTISWITCH + 2:
-	case MULTISWITCH + 3:
+	case MULTISWITCH_2:
+	case MULTISWITCH_3:
+	case MULTISWITCH_4:
 	case PULLSWITCH:
-	case PULLSWITCH + 1:
+	case PULLSWITCHON:
 	case HANDSWITCH:
-	case HANDSWITCH + 1:
+	case HANDSWITCHON:
 	case SLOTDOOR:
-	case SLOTDOOR + 1:
+	case SLOTDOORON:
 	case LIGHTSWITCH:
-	case LIGHTSWITCH + 1:
+	case LIGHTSWITCHON:
 	case SPACELIGHTSWITCH:
-	case SPACELIGHTSWITCH + 1:
+	case SPACELIGHTSWITCHON:
 	case SPACEDOORSWITCH:
-	case SPACEDOORSWITCH + 1:
+	case SPACEDOORSWITCHON:
 	case FRANKENSTINESWITCH:
-	case FRANKENSTINESWITCH + 1:
+	case FRANKENSTINESWITCHON:
 	case LIGHTSWITCH2:
-	case LIGHTSWITCH2 + 1:
+	case LIGHTSWITCH2ON:
 	case POWERSWITCH1:
-	case POWERSWITCH1 + 1:
+	case POWERSWITCH1ON:
 	case LOCKSWITCH1:
-	case LOCKSWITCH1 + 1:
+	case LOCKSWITCH1ON:
 	case POWERSWITCH2:
-	case POWERSWITCH2 + 1:
+	case POWERSWITCH2ON:
 	case CHICKENPLANTBUTTON:
-	case CHICKENPLANTBUTTON + 1:
+	case CHICKENPLANTBUTTONON:
 	case RRTILE2214:
 	case RRTILE2697:
 	case RRTILE2697 + 1:
@@ -464,28 +464,28 @@ bool checkhitswitch_r(int snum, walltype* wwal, DDukeActor* act)
 			else if (other->spr.hitag == 0) correctdips++;
 			numdips++;
 			break;
-		case TECHSWITCH + 1:
-		case DIPSWITCH + 1:
-		case ALIENSWITCH + 1:
+		case TECHSWITCHON:
+		case DIPSWITCHON:
+		case ALIENSWITCHON:
 			if (act && act == other) other->spr.picnum--;
 			else if (other->spr.hitag == 1) correctdips++;
 			numdips++;
 			break;
 		case MULTISWITCH:
-		case MULTISWITCH + 1:
-		case MULTISWITCH + 2:
-		case MULTISWITCH + 3:
+		case MULTISWITCH_2:
+		case MULTISWITCH_3:
+		case MULTISWITCH_4:
 			other->spr.picnum++;
-			if (other->spr.picnum > (MULTISWITCH + 3))
+			if (other->spr.picnum > (MULTISWITCH_4))
 				other->spr.picnum = MULTISWITCH;
 			break;
 		case MULTISWITCH2:
-		case MULTISWITCH2 + 1:
-		case MULTISWITCH2 + 2:
-		case MULTISWITCH2 + 3:
+		case MULTISWITCH2_2:
+		case MULTISWITCH2_3:
+		case MULTISWITCH2_4:
 			if (!isRRRA()) break;
 			other->spr.picnum++;
-			if (other->spr.picnum > (MULTISWITCH2 + 3))
+			if (other->spr.picnum > (MULTISWITCH2_4))
 				other->spr.picnum = MULTISWITCH2;
 			break;
 
@@ -533,23 +533,23 @@ bool checkhitswitch_r(int snum, walltype* wwal, DDukeActor* act)
 			}
 			other->spr.picnum++;
 			break;
-		case PULLSWITCH + 1:
-		case HANDSWITCH + 1:
-		case LIGHTSWITCH2 + 1:
-		case POWERSWITCH1 + 1:
-		case LOCKSWITCH1 + 1:
-		case POWERSWITCH2 + 1:
-		case SLOTDOOR + 1:
-		case LIGHTSWITCH + 1:
-		case SPACELIGHTSWITCH + 1:
-		case SPACEDOORSWITCH + 1:
-		case FRANKENSTINESWITCH + 1:
-		case DIPSWITCH2 + 1:
-		case DIPSWITCH3 + 1:
-		case CHICKENPLANTBUTTON + 1:
+		case PULLSWITCHON:
+		case HANDSWITCHON:
+		case LIGHTSWITCH2ON:
+		case POWERSWITCH1ON:
+		case LOCKSWITCH1ON:
+		case POWERSWITCH2ON:
+		case SLOTDOORON:
+		case LIGHTSWITCHON:
+		case SPACELIGHTSWITCHON:
+		case SPACEDOORSWITCHON:
+		case FRANKENSTINESWITCHON:
+		case DIPSWITCH2ON:
+		case DIPSWITCH3ON:
+		case CHICKENPLANTBUTTONON:
 		case RRTILE2697 + 1:
 		case RRTILE2707 + 1:
-			if (other->spr.picnum == CHICKENPLANTBUTTON + 1)
+			if (other->spr.picnum == CHICKENPLANTBUTTONON)
 				ud.chickenplant = 1;
 			if (other->spr.hitag != 999)
 				other->spr.picnum--;
@@ -569,28 +569,28 @@ bool checkhitswitch_r(int snum, walltype* wwal, DDukeActor* act)
 				else if (wal.hitag == 0) correctdips++;
 				numdips++;
 				break;
-			case DIPSWITCH + 1:
-			case TECHSWITCH + 1:
-			case ALIENSWITCH + 1:
+			case DIPSWITCHON:
+			case TECHSWITCHON:
+			case ALIENSWITCHON:
 				if (!act && &wal == wwal) wal.picnum--;
 				else if (wal.hitag == 1) correctdips++;
 				numdips++;
 				break;
 			case MULTISWITCH:
-			case MULTISWITCH + 1:
-			case MULTISWITCH + 2:
-			case MULTISWITCH + 3:
+			case MULTISWITCH_2:
+			case MULTISWITCH_3:
+			case MULTISWITCH_4:
 				wal.picnum++;
-				if (wal.picnum > (MULTISWITCH + 3))
+				if (wal.picnum > (MULTISWITCH_4))
 					wal.picnum = MULTISWITCH;
 				break;
 			case MULTISWITCH2:
-			case MULTISWITCH2 + 1:
-			case MULTISWITCH2 + 2:
-			case MULTISWITCH2 + 3:
+			case MULTISWITCH2_2:
+			case MULTISWITCH2_3:
+			case MULTISWITCH2_4:
 				if (!isRRRA()) break;
 				wal.picnum++;
-				if (wal.picnum > (MULTISWITCH2 + 3))
+				if (wal.picnum > (MULTISWITCH2_4))
 					wal.picnum = MULTISWITCH2;
 				break;
 			case RRTILE8660:
@@ -614,18 +614,18 @@ bool checkhitswitch_r(int snum, walltype* wwal, DDukeActor* act)
 			case RRTILE2707:
 				wal.picnum++;
 				break;
-			case HANDSWITCH + 1:
-			case PULLSWITCH + 1:
-			case LIGHTSWITCH2 + 1:
-			case POWERSWITCH1 + 1:
-			case LOCKSWITCH1 + 1:
-			case POWERSWITCH2 + 1:
-			case SLOTDOOR + 1:
-			case LIGHTSWITCH + 1:
-			case SPACELIGHTSWITCH + 1:
-			case SPACEDOORSWITCH + 1:
-			case DIPSWITCH2 + 1:
-			case DIPSWITCH3 + 1:
+			case HANDSWITCHON:
+			case PULLSWITCHON:
+			case LIGHTSWITCH2ON:
+			case POWERSWITCH1ON:
+			case LOCKSWITCH1ON:
+			case POWERSWITCH2ON:
+			case SLOTDOORON:
+			case LIGHTSWITCHON:
+			case SPACELIGHTSWITCHON:
+			case SPACEDOORSWITCHON:
+			case DIPSWITCH2ON:
+			case DIPSWITCH3ON:
 			case RRTILE2697 + 1:
 			case RRTILE2707 + 1:
 				wal.picnum--;
@@ -645,16 +645,16 @@ bool checkhitswitch_r(int snum, walltype* wwal, DDukeActor* act)
 		if (fi.isadoorwall(picnum) == 0) break;
 		[[fallthrough]];
 	case DIPSWITCH:
-	case DIPSWITCH + 1:
+	case DIPSWITCHON:
 	case TECHSWITCH:
-	case TECHSWITCH + 1:
+	case TECHSWITCHON:
 	case ALIENSWITCH:
-	case ALIENSWITCH + 1:
-		if (picnum == DIPSWITCH || picnum == DIPSWITCH + 1 ||
-			picnum == ALIENSWITCH || picnum == ALIENSWITCH + 1 ||
-			picnum == TECHSWITCH || picnum == TECHSWITCH + 1)
+	case ALIENSWITCHON:
+		if (picnum == DIPSWITCH || picnum == DIPSWITCHON ||
+			picnum == ALIENSWITCH || picnum == ALIENSWITCHON ||
+			picnum == TECHSWITCH || picnum == TECHSWITCHON)
 		{
-			if (picnum == ALIENSWITCH || picnum == ALIENSWITCH + 1)
+			if (picnum == ALIENSWITCH || picnum == ALIENSWITCHON)
 			{
 				if (act)
 					S_PlaySound3D(ALIEN_SWITCH1, act, v);
@@ -671,45 +671,45 @@ bool checkhitswitch_r(int snum, walltype* wwal, DDukeActor* act)
 		}
 		goto goOn2;
 	case MULTISWITCH2:
-	case MULTISWITCH2 + 1:
-	case MULTISWITCH2 + 2:
-	case MULTISWITCH2 + 3:
-	case RRTILE8464:
+	case MULTISWITCH2_2:
+	case MULTISWITCH2_3:
+	case MULTISWITCH2_4:
+	case IRONWHEELSWITCH:
 	case RRTILE8660:
 		if (!isRRRA()) break;
 		[[fallthrough]];
 	case DIPSWITCH2:
-	case DIPSWITCH2 + 1:
+	case DIPSWITCH2ON:
 	case DIPSWITCH3:
-	case DIPSWITCH3 + 1:
+	case DIPSWITCH3ON:
 	case MULTISWITCH:
-	case MULTISWITCH + 1:
-	case MULTISWITCH + 2:
-	case MULTISWITCH + 3:
+	case MULTISWITCH_2:
+	case MULTISWITCH_3:
+	case MULTISWITCH_4:
 	case ACCESSSWITCH:
 	case ACCESSSWITCH2:
 	case SLOTDOOR:
-	case SLOTDOOR + 1:
+	case SLOTDOORON:
 	case LIGHTSWITCH:
-	case LIGHTSWITCH + 1:
+	case LIGHTSWITCHON:
 	case SPACELIGHTSWITCH:
-	case SPACELIGHTSWITCH + 1:
+	case SPACELIGHTSWITCHON:
 	case SPACEDOORSWITCH:
-	case SPACEDOORSWITCH + 1:
+	case SPACEDOORSWITCHON:
 	case FRANKENSTINESWITCH:
-	case FRANKENSTINESWITCH + 1:
+	case FRANKENSTINESWITCHON:
 	case LIGHTSWITCH2:
-	case LIGHTSWITCH2 + 1:
+	case LIGHTSWITCH2ON:
 	case POWERSWITCH1:
-	case POWERSWITCH1 + 1:
+	case POWERSWITCH1ON:
 	case LOCKSWITCH1:
-	case LOCKSWITCH1 + 1:
+	case LOCKSWITCH1ON:
 	case POWERSWITCH2:
-	case POWERSWITCH2 + 1:
+	case POWERSWITCH2ON:
 	case HANDSWITCH:
-	case HANDSWITCH + 1:
+	case HANDSWITCHON:
 	case PULLSWITCH:
-	case PULLSWITCH + 1:
+	case PULLSWITCHON:
 	case RRTILE2697:
 	case RRTILE2697 + 1:
 	case RRTILE2707:
@@ -723,7 +723,7 @@ bool checkhitswitch_r(int snum, walltype* wwal, DDukeActor* act)
 				BellSprite = act;
 				act->spr.picnum++;
 			}
-			else if (picnum == RRTILE8464)
+			else if (picnum == IRONWHEELSWITCH)
 			{
 				act->spr.picnum = act->spr.picnum + 1;
 				if (hitag == 10001)
@@ -738,10 +738,10 @@ bool checkhitswitch_r(int snum, walltype* wwal, DDukeActor* act)
 			}
 			else if (hitag == 10000)
 			{
-				if (picnum == MULTISWITCH || picnum == (MULTISWITCH + 1) ||
-					picnum == (MULTISWITCH + 2) || picnum == (MULTISWITCH + 3) ||
-					picnum == MULTISWITCH2 || picnum == (MULTISWITCH2 + 1) ||
-					picnum == (MULTISWITCH2 + 2) || picnum == (MULTISWITCH2 + 3))
+				if (picnum == MULTISWITCH || picnum == (MULTISWITCH_2) ||
+					picnum == (MULTISWITCH_3) || picnum == (MULTISWITCH_4) ||
+					picnum == MULTISWITCH2 || picnum == (MULTISWITCH2_2) ||
+					picnum == (MULTISWITCH2_3) || picnum == (MULTISWITCH2_4))
 				{
 					DDukeActor* switches[3];
 					int switchcount = 0, j;
@@ -772,9 +772,9 @@ bool checkhitswitch_r(int snum, walltype* wwal, DDukeActor* act)
 						{
 							switches[j]->spr.hitag = 0;
 							if (picnum >= MULTISWITCH2)
-								switches[j]->spr.picnum = MULTISWITCH2 + 3;
+								switches[j]->spr.picnum = MULTISWITCH2_4;
 							else
-								switches[j]->spr.picnum = MULTISWITCH + 3;
+								switches[j]->spr.picnum = MULTISWITCH_4;
 							checkhitswitch_r(snum, nullptr, switches[j]);
 						}
 					}
@@ -782,13 +782,13 @@ bool checkhitswitch_r(int snum, walltype* wwal, DDukeActor* act)
 				}
 			}
 		}
-		if (picnum == MULTISWITCH || picnum == (MULTISWITCH + 1) ||
-			picnum == (MULTISWITCH + 2) || picnum == (MULTISWITCH + 3))
+		if (picnum == MULTISWITCH || picnum == (MULTISWITCH_2) ||
+			picnum == (MULTISWITCH_3) || picnum == (MULTISWITCH_4))
 			lotag += picnum - MULTISWITCH;
 		if (isRRRA())
 		{
-			if (picnum == MULTISWITCH2 || picnum == (MULTISWITCH2 + 1) ||
-				picnum == (MULTISWITCH2 + 2) || picnum == (MULTISWITCH2 + 3))
+			if (picnum == MULTISWITCH2 || picnum == (MULTISWITCH2_2) ||
+				picnum == (MULTISWITCH2_3) || picnum == (MULTISWITCH2_4))
 				lotag += picnum - MULTISWITCH2;
 		}
 
@@ -830,9 +830,9 @@ bool checkhitswitch_r(int snum, walltype* wwal, DDukeActor* act)
 		fi.operateforcefields(ps[snum].GetActor(), lotag);
 		operatemasterswitches(lotag);
 
-		if (picnum == DIPSWITCH || picnum == DIPSWITCH + 1 ||
-			picnum == ALIENSWITCH || picnum == ALIENSWITCH + 1 ||
-			picnum == TECHSWITCH || picnum == TECHSWITCH + 1) return 1;
+		if (picnum == DIPSWITCH || picnum == DIPSWITCHON ||
+			picnum == ALIENSWITCH || picnum == ALIENSWITCHON ||
+			picnum == TECHSWITCH || picnum == TECHSWITCHON) return 1;
 
 		if (hitag == 0 && fi.isadoorwall(picnum) == 0)
 		{
@@ -1024,7 +1024,7 @@ void checkhitwall_r(DDukeActor* spr, walltype* wal, const DVector3& pos, int atw
 
 	switch (wal->picnum)
 	{
-	case RRTILE8464:
+	case IRONWHEELSWITCH:
 		if (isRRRA()) break;
 		break;
 	case RRTILE3643:
@@ -1548,7 +1548,7 @@ void checkhitsprite_r(DDukeActor* targ, DDukeActor* proj)
 
 	if (isRRRA()) switch (targ->spr.picnum)
 	{
-	case RRTILE8464:
+	case IRONWHEELSWITCH:
 		break;
 	case RRTILE8487:
 	case RRTILE8489: