diff --git a/TR5Main/Game/Lara/lara.cpp b/TR5Main/Game/Lara/lara.cpp
index 7ead10667..0b48ea2c9 100644
--- a/TR5Main/Game/Lara/lara.cpp
+++ b/TR5Main/Game/Lara/lara.cpp
@@ -831,7 +831,7 @@ void LaraAboveWater(ITEM_INFO* item, COLL_INFO* coll) //hmmmm
 	coll->Setup.EnableSpaz = true;
 	coll->Setup.SlopesAreWalls = false;
 	coll->Setup.SlopesArePits = false;
-	coll->Setup.DeathIsPit = false;
+	coll->Setup.DeathFlagIsPit = false;
 	coll->Setup.OldAnimNumber = item->animNumber;
 	coll->Setup.OldFrameNumber = item->frameNumber;
 	coll->Setup.Radius = LARA_RAD;
@@ -952,7 +952,7 @@ void LaraUnderWater(ITEM_INFO* item, COLL_INFO* coll)
 
 	coll->Setup.SlopesAreWalls = false;
 	coll->Setup.SlopesArePits = false;
-	coll->Setup.DeathIsPit = false;
+	coll->Setup.DeathFlagIsPit = false;
 
 	coll->Setup.EnableObjectPush = true;
 	coll->Setup.EnableSpaz = false;
@@ -1065,7 +1065,7 @@ void LaraSurface(ITEM_INFO* item, COLL_INFO* coll)
 
 	coll->Setup.SlopesAreWalls = false;
 	coll->Setup.SlopesArePits = false;
-	coll->Setup.DeathIsPit = false;
+	coll->Setup.DeathFlagIsPit = false;
 	coll->Setup.EnableObjectPush = false;
 	coll->Setup.EnableSpaz = false;
 
diff --git a/TR5Main/Game/Lara/lara_basic.cpp b/TR5Main/Game/Lara/lara_basic.cpp
index c1b6abb9f..18e7fe81e 100644
--- a/TR5Main/Game/Lara/lara_basic.cpp
+++ b/TR5Main/Game/Lara/lara_basic.cpp
@@ -130,7 +130,7 @@ void lara_col_walk(ITEM_INFO* item, COLL_INFO* coll)
 
 	coll->Setup.SlopesAreWalls = true;
 	coll->Setup.SlopesArePits = true;
-	coll->Setup.DeathIsPit = 1;
+	coll->Setup.DeathFlagIsPit = 1;
 
 	coll->Setup.ForwardAngle = Lara.moveAngle;
 	GetCollisionInfo(coll, item, LARA_HEIGHT);
diff --git a/TR5Main/Game/collide.cpp b/TR5Main/Game/collide.cpp
index d614884ac..9585fa056 100644
--- a/TR5Main/Game/collide.cpp
+++ b/TR5Main/Game/collide.cpp
@@ -1465,7 +1465,7 @@ void GetCollisionInfo(COLL_INFO* coll, ITEM_INFO* item, PHD_VECTOR offset, int o
 	{
 		coll->Front.Floor = STOP_SIZE;
 	}
-	else if ((coll->Setup.DeathIsPit)
+	else if ((coll->Setup.DeathFlagIsPit)
 		     && (coll->Front.Floor > 0)
 		     && collResult.BottomBlock->Flags.Death)
 	{
@@ -1497,7 +1497,7 @@ void GetCollisionInfo(COLL_INFO* coll, ITEM_INFO* item, PHD_VECTOR offset, int o
 		coll->MiddleLeft.Floor = MAX_HEIGHT;
 	else if (coll->Setup.SlopesArePits && (coll->MiddleLeft.Type == BIG_SLOPE || coll->MiddleLeft.Type == DIAGONAL) && coll->MiddleLeft.Floor > 0)
 		coll->MiddleLeft.Floor = STOP_SIZE;
-	else if (coll->Setup.DeathIsPit && coll->MiddleLeft.Floor > 0 && collResult.BottomBlock->Flags.Death)
+	else if (coll->Setup.DeathFlagIsPit && coll->MiddleLeft.Floor > 0 && collResult.BottomBlock->Flags.Death)
 		coll->MiddleLeft.Floor = STOP_SIZE;
 
 	collResult = GetCollisionResult(x, yTop, z, topRoomNumber); // We use plain x/z values here, proposed by Choco
@@ -1522,7 +1522,7 @@ void GetCollisionInfo(COLL_INFO* coll, ITEM_INFO* item, PHD_VECTOR offset, int o
 		coll->FrontLeft.Floor = MAX_HEIGHT;
 	else if (coll->Setup.SlopesArePits && (coll->FrontLeft.Type == BIG_SLOPE || coll->FrontLeft.Type == DIAGONAL) && coll->FrontLeft.Floor > 0)
 		coll->FrontLeft.Floor = STOP_SIZE;
-	else if (coll->Setup.DeathIsPit && coll->FrontLeft.Floor > 0 && collResult.BottomBlock->Flags.Death)
+	else if (coll->Setup.DeathFlagIsPit && coll->FrontLeft.Floor > 0 && collResult.BottomBlock->Flags.Death)
 		coll->FrontLeft.Floor = STOP_SIZE;
 
 	x = xPos + xright;
@@ -1550,7 +1550,7 @@ void GetCollisionInfo(COLL_INFO* coll, ITEM_INFO* item, PHD_VECTOR offset, int o
 		coll->MiddleRight.Floor = MAX_HEIGHT;
 	else if (coll->Setup.SlopesArePits && (coll->MiddleRight.Type == BIG_SLOPE || coll->MiddleRight.Type == DIAGONAL) && coll->MiddleRight.Floor > 0)
 		coll->MiddleRight.Floor = STOP_SIZE;
-	else if (coll->Setup.DeathIsPit && coll->MiddleRight.Floor > 0 && collResult.BottomBlock->Flags.Death)
+	else if (coll->Setup.DeathFlagIsPit && coll->MiddleRight.Floor > 0 && collResult.BottomBlock->Flags.Death)
 		coll->MiddleRight.Floor = STOP_SIZE;
 
 	collResult = GetCollisionResult(x, yTop, z, topRoomNumber);
@@ -1575,7 +1575,7 @@ void GetCollisionInfo(COLL_INFO* coll, ITEM_INFO* item, PHD_VECTOR offset, int o
 		coll->FrontRight.Floor = MAX_HEIGHT;
 	else if (coll->Setup.SlopesArePits && (coll->FrontRight.Type == BIG_SLOPE || coll->FrontRight.Type == DIAGONAL) && coll->FrontRight.Floor > 0)
 		coll->FrontRight.Floor = STOP_SIZE;
-	else if (coll->Setup.DeathIsPit && coll->FrontRight.Floor > 0 && collResult.BottomBlock->Flags.Death)
+	else if (coll->Setup.DeathFlagIsPit && coll->FrontRight.Floor > 0 && collResult.BottomBlock->Flags.Death)
 		coll->FrontRight.Floor = STOP_SIZE;
 
 	CollideSolidStatics(item, coll);
@@ -1842,7 +1842,7 @@ void GetObjectCollisionInfo(COLL_INFO* coll, ITEM_INFO* item, PHD_VECTOR offset,
 	{
 		coll->Front.Floor = STOP_SIZE;
 	}
-	else if ((coll->Setup.DeathIsPit)
+	else if ((coll->Setup.DeathFlagIsPit)
 		&& (coll->Front.Floor > 0)
 		&& collResult.BottomBlock->Flags.Death)
 	{
@@ -1870,7 +1870,7 @@ void GetObjectCollisionInfo(COLL_INFO* coll, ITEM_INFO* item, PHD_VECTOR offset,
 		coll->MiddleLeft.Floor = MAX_HEIGHT;
 	else if (coll->Setup.SlopesArePits && (coll->MiddleLeft.Type == BIG_SLOPE || coll->MiddleLeft.Type == DIAGONAL) && coll->MiddleLeft.Floor > 0)
 		coll->MiddleLeft.Floor = STOP_SIZE;
-	else if (coll->Setup.DeathIsPit && coll->MiddleLeft.Floor > 0 && collResult.BottomBlock->Flags.Death)
+	else if (coll->Setup.DeathFlagIsPit && coll->MiddleLeft.Floor > 0 && collResult.BottomBlock->Flags.Death)
 		coll->MiddleLeft.Floor = STOP_SIZE;
 
 	collResult = GetCollisionResult(x, yTop, z, topRoomNumber);
@@ -1891,7 +1891,7 @@ void GetObjectCollisionInfo(COLL_INFO* coll, ITEM_INFO* item, PHD_VECTOR offset,
 		coll->FrontLeft.Floor = MAX_HEIGHT;
 	else if (coll->Setup.SlopesArePits && (coll->FrontLeft.Type == BIG_SLOPE || coll->FrontLeft.Type == DIAGONAL) && coll->FrontLeft.Floor > 0)
 		coll->FrontLeft.Floor = STOP_SIZE;
-	else if (coll->Setup.DeathIsPit && coll->FrontLeft.Floor > 0 && collResult.BottomBlock->Flags.Death)
+	else if (coll->Setup.DeathFlagIsPit && coll->FrontLeft.Floor > 0 && collResult.BottomBlock->Flags.Death)
 		coll->FrontLeft.Floor = STOP_SIZE;
 
 	x = xPos + xright;
@@ -1915,7 +1915,7 @@ void GetObjectCollisionInfo(COLL_INFO* coll, ITEM_INFO* item, PHD_VECTOR offset,
 		coll->MiddleRight.Floor = MAX_HEIGHT;
 	else if (coll->Setup.SlopesArePits && (coll->MiddleRight.Type == BIG_SLOPE || coll->MiddleRight.Type == DIAGONAL) && coll->MiddleRight.Floor > 0)
 		coll->MiddleRight.Floor = STOP_SIZE;
-	else if (coll->Setup.DeathIsPit && coll->MiddleRight.Floor > 0 && collResult.BottomBlock->Flags.Death)
+	else if (coll->Setup.DeathFlagIsPit && coll->MiddleRight.Floor > 0 && collResult.BottomBlock->Flags.Death)
 		coll->MiddleRight.Floor = STOP_SIZE;
 
 	collResult = GetCollisionResult(x, yTop, z, topRoomNumber);
@@ -1936,7 +1936,7 @@ void GetObjectCollisionInfo(COLL_INFO* coll, ITEM_INFO* item, PHD_VECTOR offset,
 		coll->FrontRight.Floor = MAX_HEIGHT;
 	else if (coll->Setup.SlopesArePits && (coll->FrontRight.Type == BIG_SLOPE || coll->FrontRight.Type == DIAGONAL) && coll->FrontRight.Floor > 0)
 		coll->FrontRight.Floor = STOP_SIZE;
-	else if (coll->Setup.DeathIsPit && coll->FrontRight.Floor > 0 && collResult.BottomBlock->Flags.Death)
+	else if (coll->Setup.DeathFlagIsPit && coll->FrontRight.Floor > 0 && collResult.BottomBlock->Flags.Death)
 		coll->FrontRight.Floor = STOP_SIZE;
 
 	CollideSolidStatics(item, coll);
diff --git a/TR5Main/Game/collide.h b/TR5Main/Game/collide.h
index 459f91068..a38f5885e 100644
--- a/TR5Main/Game/collide.h
+++ b/TR5Main/Game/collide.h
@@ -70,7 +70,7 @@ struct COLL_SETUP
 {
 	bool SlopesAreWalls;    // Treat steep slopes as walls
 	bool SlopesArePits;     // Treat steep slopes as pits
-	bool DeathIsPit;        // Treat death sectors as pits
+	bool DeathFlagIsPit;        // Treat death sectors as pits
 	bool EnableObjectPush;  // Can be pushed by objects
 	bool EnableSpaz;        // Push is treated as hurt
 						    
diff --git a/TR5Main/Objects/TR3/Vehicles/upv.cpp b/TR5Main/Objects/TR3/Vehicles/upv.cpp
index 5c0144bb2..aac55bf57 100644
--- a/TR5Main/Objects/TR3/Vehicles/upv.cpp
+++ b/TR5Main/Objects/TR3/Vehicles/upv.cpp
@@ -437,7 +437,7 @@ static void BackgroundCollision(ITEM_INFO* v, ITEM_INFO* l, SUB_INFO* sub)
 	coll->Setup.Radius = SUB_RADIUS;
 	coll->Setup.SlopesAreWalls = false;
 	coll->Setup.SlopesArePits = false;
-	coll->Setup.DeathIsPit = false;
+	coll->Setup.DeathFlagIsPit = false;
 	coll->Setup.EnableSpaz = false;
 	coll->Setup.EnableObjectPush = true;