diff --git a/TombEngine/Game/control/volume.cpp b/TombEngine/Game/control/volume.cpp
index 88f11f94f..2e5481491 100644
--- a/TombEngine/Game/control/volume.cpp
+++ b/TombEngine/Game/control/volume.cpp
@@ -128,7 +128,7 @@ namespace TEN::Control::Volumes
 
 		for (auto& volume : room.triggerVolumes)
 		{
-			if (!volume.IsEnabled)
+			if (!volume.Enabled)
 				continue;
 
 			if (volume.EventSetIndex == NO_EVENT_SET)
@@ -238,16 +238,15 @@ namespace TEN::Control::Volumes
 	void TestVolumes(int roomNumber, MESH_INFO* meshPtr)
 	{
 		auto box = GetBoundsAccurate(*meshPtr, false).ToBoundingOrientedBox(meshPtr->pos);
-		
 		TestVolumes(roomNumber, box, VolumeActivatorFlags::Static, meshPtr);
 	}
 
 	void TestVolumes(CAMERA_INFO* cameraPtr)
 	{
-		constexpr auto CAMERA_EXTENT = 32.0f;
+		constexpr auto CAMERA_EXTENTS = Vector3(32.0f);
 
-		// TODO: Camera box is currently AABB. Should derive orientation from look-at? -- Sezz 2023.08.11
-		auto box = BoundingOrientedBox(cameraPtr->pos.ToVector3(), Vector3(CAMERA_EXTENT), Quaternion::Identity);
+		// TODO: Camera box is currently an AABB. Should derive orientation from look-at? -- Sezz 2023.08.11
+		auto box = BoundingOrientedBox(cameraPtr->pos.ToVector3(), CAMERA_EXTENTS, Quaternion::Identity);
 		TestVolumes(cameraPtr->pos.RoomNumber, box, VolumeActivatorFlags::Flyby, cameraPtr);
 	}
 }
diff --git a/TombEngine/Game/control/volume.h b/TombEngine/Game/control/volume.h
index dd8f374f1..0d5727118 100644
--- a/TombEngine/Game/control/volume.h
+++ b/TombEngine/Game/control/volume.h
@@ -46,7 +46,7 @@ namespace TEN::Control::Volumes
 // ActivatorVolume
 struct TriggerVolume
 {
-	bool IsEnabled	   = true;
+	bool Enabled	   = true;
 	int	 EventSetIndex = 0;
 
 	std::string Name = {};
diff --git a/TombEngine/Game/savegame.cpp b/TombEngine/Game/savegame.cpp
index f41f77fb0..845c336ba 100644
--- a/TombEngine/Game/savegame.cpp
+++ b/TombEngine/Game/savegame.cpp
@@ -930,7 +930,7 @@ bool SaveGame::Save(int slot)
 			volume.add_room_number(room->index);
 			volume.add_number(j);
 			volume.add_name(nameOffset);
-			volume.add_enabled(currVolume.IsEnabled);
+			volume.add_enabled(currVolume.Enabled);
 			volume.add_position(&FromVector3(currVolume.Box.Center));
 			volume.add_rotation(&FromVector4(currVolume.Box.Orientation));
 			volume.add_scale(&FromVector3(currVolume.Box.Extents));
@@ -1416,7 +1416,7 @@ bool SaveGame::Load(int slot)
 		auto room = &g_Level.Rooms[volume->room_number()];
 		int number = volume->number();
 
-		room->triggerVolumes[number].IsEnabled = volume->enabled();
+		room->triggerVolumes[number].Enabled = volume->enabled();
 		room->triggerVolumes[number].Name = volume->name()->str();
 		room->triggerVolumes[number].Box.Center =
 		room->triggerVolumes[number].Sphere.Center = ToVector3(volume->position());
diff --git a/TombEngine/Scripting/Internal/TEN/Objects/Volume/VolumeObject.cpp b/TombEngine/Scripting/Internal/TEN/Objects/Volume/VolumeObject.cpp
index 68db9a20f..9b4c85b21 100644
--- a/TombEngine/Scripting/Internal/TEN/Objects/Volume/VolumeObject.cpp
+++ b/TombEngine/Scripting/Internal/TEN/Objects/Volume/VolumeObject.cpp
@@ -95,18 +95,18 @@ void Volume::Register(sol::table& parent)
 
 void Volume::Enable()
 {
-	m_volume.IsEnabled = true;
+	m_volume.Enabled = true;
 }
 
 void Volume::Disable()
 {
 	ClearActivators();
-	m_volume.IsEnabled = false;
+	m_volume.Enabled = false;
 }
 
 bool Volume::GetActive() const
 {
-	return m_volume.IsEnabled;
+	return m_volume.Enabled;
 }
 
 Vec3 Volume::GetPos() const