diff --git a/src/libtrx/game/console/cmd/teleport.c b/src/libtrx/game/console/cmd/teleport.c
index 7f2d82d97..02dbe97b8 100644
--- a/src/libtrx/game/console/cmd/teleport.c
+++ b/src/libtrx/game/console/cmd/teleport.c
@@ -167,8 +167,8 @@ static COMMAND_RESULT M_TeleportToXYZ(float x, const float y, float z)
 
 static COMMAND_RESULT M_TeleportToRoom(const int16_t room_num)
 {
-    if (room_num < 0 || room_num >= Room_GetTotalCount()) {
-        Console_Log(GS(OSD_INVALID_ROOM), room_num, Room_GetTotalCount() - 1);
+    if (room_num < 0 || room_num >= Room_GetCount()) {
+        Console_Log(GS(OSD_INVALID_ROOM), room_num, Room_GetCount() - 1);
         return CR_FAILURE;
     }
 
diff --git a/src/libtrx/game/rooms/common.c b/src/libtrx/game/rooms/common.c
index 8a5405b20..26fa316eb 100644
--- a/src/libtrx/game/rooms/common.c
+++ b/src/libtrx/game/rooms/common.c
@@ -107,7 +107,7 @@ void Room_InitialiseRooms(const int32_t num_rooms)
         : GameBuf_Alloc(sizeof(ROOM) * num_rooms, GBUF_ROOMS);
 }
 
-int32_t Room_GetTotalCount(void)
+int32_t Room_GetCount(void)
 {
     return m_RoomCount;
 }
@@ -122,7 +122,7 @@ ROOM *Room_Get(const int32_t room_num)
 
 void Room_InitialiseFlipStatus(void)
 {
-    for (int32_t i = 0; i < Room_GetTotalCount(); i++) {
+    for (int32_t i = 0; i < Room_GetCount(); i++) {
         ROOM *const room = Room_Get(i);
         if (room->flipped_room == -1) {
             room->flip_status = RFS_NONE;
@@ -136,7 +136,7 @@ void Room_InitialiseFlipStatus(void)
 
 void Room_ParseFloorData(const int16_t *floor_data)
 {
-    for (int32_t i = 0; i < Room_GetTotalCount(); i++) {
+    for (int32_t i = 0; i < Room_GetCount(); i++) {
         const ROOM *const room = Room_Get(i);
         for (int32_t j = 0; j < room->size.x * room->size.z; j++) {
             SECTOR *const sector = &room->sectors[j];
@@ -236,7 +236,7 @@ int16_t Room_GetIndexFromPos(const int32_t x, const int32_t y, const int32_t z)
 
 int32_t Room_FindByPos(const int32_t x, const int32_t y, const int32_t z)
 {
-    for (int32_t i = 0; i < Room_GetTotalCount(); i++) {
+    for (int32_t i = 0; i < Room_GetCount(); i++) {
         const ROOM *const room = Room_Get(i);
         if (room->flip_status == RFS_FLIPPED) {
             continue;
@@ -266,7 +266,7 @@ BOUNDS_32 Room_GetWorldBounds(void)
         .max.y = -MAX_HEIGHT,
     };
 
-    for (int32_t i = 0; i < Room_GetTotalCount(); i++) {
+    for (int32_t i = 0; i < Room_GetCount(); i++) {
         const ROOM *const room = Room_Get(i);
         bounds.min.x = MIN(bounds.min.x, room->pos.x);
         bounds.max.x = MAX(bounds.max.x, room->pos.x + room->size.x * WALL_L);
diff --git a/src/libtrx/include/libtrx/game/rooms/common.h b/src/libtrx/include/libtrx/game/rooms/common.h
index 80a5bdcf7..9aeccb959 100644
--- a/src/libtrx/include/libtrx/game/rooms/common.h
+++ b/src/libtrx/include/libtrx/game/rooms/common.h
@@ -4,7 +4,7 @@
 #include "./types.h"
 
 void Room_InitialiseRooms(int32_t num_rooms);
-int32_t Room_GetTotalCount(void);
+int32_t Room_GetCount(void);
 ROOM *Room_Get(int32_t room_num);
 
 void Room_InitialiseFlipStatus(void);
diff --git a/src/tr1/game/cutscene.c b/src/tr1/game/cutscene.c
index fb4736869..b62883120 100644
--- a/src/tr1/game/cutscene.c
+++ b/src/tr1/game/cutscene.c
@@ -63,7 +63,7 @@ bool Cutscene_Start(const int32_t level_num)
 
     M_InitialiseLara(level);
 
-    const int32_t room_count = Room_GetTotalCount();
+    const int32_t room_count = Room_GetCount();
     for (int16_t room_num = 0; room_num < room_count; room_num++) {
         const ROOM *const room = Room_Get(room_num);
         if (room->flipped_room >= 0) {
diff --git a/src/tr1/game/inject.c b/src/tr1/game/inject.c
index 2ce383944..9e62ec448 100644
--- a/src/tr1/game/inject.c
+++ b/src/tr1/game/inject.c
@@ -950,7 +950,7 @@ static void M_FloorDataEdits(INJECTION *injection, LEVEL_INFO *level_info)
         // Individual FD functions must check that sector is actually set.
         ROOM *room = nullptr;
         SECTOR *sector = nullptr;
-        if (room_num < 0 || room_num >= Room_GetTotalCount()) {
+        if (room_num < 0 || room_num >= Room_GetCount()) {
             LOG_WARNING("Room index %d is invalid", room_num);
         } else {
             room = Room_Get(room_num);
@@ -1239,7 +1239,7 @@ static void M_AlterRoomVertex(const INJECTION *const injection)
         shade_change = VFile_ReadS16(fp);
     }
 
-    if (target_room < 0 || target_room >= Room_GetTotalCount()) {
+    if (target_room < 0 || target_room >= Room_GetCount()) {
         LOG_WARNING("Room index %d is invalid", target_room);
         return;
     }
@@ -1310,7 +1310,7 @@ static void M_AddRoomFace(const INJECTION *const injection)
         return;
     }
 
-    if (target_room < 0 || target_room >= Room_GetTotalCount()) {
+    if (target_room < 0 || target_room >= Room_GetCount()) {
         LOG_WARNING("Room index %d is invalid", target_room);
         return;
     }
@@ -1405,7 +1405,7 @@ static uint16_t *M_GetRoomTexture(
 static uint16_t *M_GetRoomFaceVertices(
     const int16_t room_num, const FACE_TYPE face_type, const int16_t face_index)
 {
-    if (room_num < 0 || room_num >= Room_GetTotalCount()) {
+    if (room_num < 0 || room_num >= Room_GetCount()) {
         LOG_WARNING("Room index %d is invalid", room_num);
         return nullptr;
     }
@@ -1455,7 +1455,7 @@ static void M_RoomDoorEdits(INJECTION *injection)
             door_index = VFile_ReadS16(fp);
         }
 
-        if (base_room < 0 || base_room >= Room_GetTotalCount()) {
+        if (base_room < 0 || base_room >= Room_GetCount()) {
             VFile_Skip(fp, sizeof(int16_t) * 12);
             LOG_WARNING("Room index %d is invalid", base_room);
             continue;
diff --git a/src/tr1/game/items.c b/src/tr1/game/items.c
index f5870cf53..445471546 100644
--- a/src/tr1/game/items.c
+++ b/src/tr1/game/items.c
@@ -300,7 +300,7 @@ int32_t Item_GlobalReplace(
     const GAME_OBJECT_ID src_obj_id, const GAME_OBJECT_ID dst_obj_id)
 {
     int32_t changed = 0;
-    for (int32_t i = 0; i < Room_GetTotalCount(); i++) {
+    for (int32_t i = 0; i < Room_GetCount(); i++) {
         const ROOM *const room = Room_Get(i);
         for (int16_t item_num = room->item_num; item_num != NO_ITEM;
              item_num = g_Items[item_num].next_item) {
diff --git a/src/tr1/game/level.c b/src/tr1/game/level.c
index 7ced07b19..147474406 100644
--- a/src/tr1/game/level.c
+++ b/src/tr1/game/level.c
@@ -630,7 +630,7 @@ static void M_MarkWaterEdgeVertices(void)
     }
 
     BENCHMARK *const benchmark = Benchmark_Start();
-    for (int32_t i = 0; i < Room_GetTotalCount(); i++) {
+    for (int32_t i = 0; i < Room_GetCount(); i++) {
         const ROOM *const room = Room_Get(i);
         const int32_t y_test =
             (room->flags & RF_UNDERWATER) ? room->max_ceiling : room->min_floor;
@@ -671,7 +671,7 @@ static size_t M_CalculateMaxVertices(void)
         max_vertices = MAX(max_vertices, mesh->num_vertices);
     }
 
-    for (int32_t i = 0; i < Room_GetTotalCount(); i++) {
+    for (int32_t i = 0; i < Room_GetCount(); i++) {
         const ROOM *const room = Room_Get(i);
         max_vertices = MAX(max_vertices, room->mesh.num_vertices);
     }
diff --git a/src/tr1/game/objects/creatures/bacon_lara.c b/src/tr1/game/objects/creatures/bacon_lara.c
index 16e0ecc20..b0e8a8916 100644
--- a/src/tr1/game/objects/creatures/bacon_lara.c
+++ b/src/tr1/game/objects/creatures/bacon_lara.c
@@ -39,7 +39,7 @@ void BaconLara_Initialise(int16_t item_num)
 
 bool BaconLara_InitialiseAnchor(const int32_t room_index)
 {
-    if (room_index >= Room_GetTotalCount()) {
+    if (room_index >= Room_GetCount()) {
         return false;
     }
 
diff --git a/src/tr1/game/room.c b/src/tr1/game/room.c
index 755a72e94..237360953 100644
--- a/src/tr1/game/room.c
+++ b/src/tr1/game/room.c
@@ -567,7 +567,7 @@ void Room_FlipMap(void)
 {
     Sound_StopAmbientSounds();
 
-    for (int32_t i = 0; i < Room_GetTotalCount(); i++) {
+    for (int32_t i = 0; i < Room_GetCount(); i++) {
         ROOM *const room = Room_Get(i);
         if (room->flipped_room < 0) {
             continue;
diff --git a/src/tr1/game/stats/common.c b/src/tr1/game/stats/common.c
index e2979fe35..0bd7a33e8 100644
--- a/src/tr1/game/stats/common.c
+++ b/src/tr1/game/stats/common.c
@@ -45,7 +45,7 @@ static void M_TraverseFloor(void)
 {
     uint32_t secrets = 0;
 
-    for (int32_t i = 0; i < Room_GetTotalCount(); i++) {
+    for (int32_t i = 0; i < Room_GetCount(); i++) {
         const ROOM *const room = Room_Get(i);
         for (int32_t z_sector = 0; z_sector < room->size.z; z_sector++) {
             for (int32_t x_sector = 0; x_sector < room->size.x; x_sector++) {
@@ -147,7 +147,7 @@ void Stats_ComputeFinal(GF_LEVEL_TYPE level_type, FINAL_STATS *final_stats)
 
 void Stats_ObserveRoomsLoad(void)
 {
-    const int32_t room_count = Room_GetTotalCount();
+    const int32_t room_count = Room_GetCount();
     m_CachedSectorArray =
         GameBuf_Alloc(room_count * sizeof(SECTOR *), GBUF_ROOM_SECTORS);
     for (int32_t i = 0; i < room_count; i++) {
diff --git a/src/tr2/game/inject.c b/src/tr2/game/inject.c
index b98a08e05..11db839f6 100644
--- a/src/tr2/game/inject.c
+++ b/src/tr2/game/inject.c
@@ -140,7 +140,7 @@ static void M_FloorDataEdits(
         // Individual FD functions must check that sector is actually set.
         const ROOM *room = nullptr;
         SECTOR *sector = nullptr;
-        if (room_num < 0 || room_num >= Room_GetTotalCount()) {
+        if (room_num < 0 || room_num >= Room_GetCount()) {
             LOG_WARNING("Room index %d is invalid", room_num);
         } else {
             room = Room_Get(room_num);
diff --git a/src/tr2/game/items.c b/src/tr2/game/items.c
index 5973c5cc5..6d570c543 100644
--- a/src/tr2/game/items.c
+++ b/src/tr2/game/items.c
@@ -281,7 +281,7 @@ int32_t Item_GlobalReplace(
 {
     int32_t changed = 0;
 
-    for (int32_t i = 0; i < Room_GetTotalCount(); i++) {
+    for (int32_t i = 0; i < Room_GetCount(); i++) {
         int16_t j = Room_Get(i)->item_num;
         while (j != NO_ITEM) {
             ITEM *const item = &g_Items[j];
diff --git a/src/tr2/game/room.c b/src/tr2/game/room.c
index b43af3e8a..131b32b16 100644
--- a/src/tr2/game/room.c
+++ b/src/tr2/game/room.c
@@ -758,7 +758,7 @@ bool Room_GetFlipStatus(void)
 
 void Room_FlipMap(void)
 {
-    for (int32_t i = 0; i < Room_GetTotalCount(); i++) {
+    for (int32_t i = 0; i < Room_GetCount(); i++) {
         ROOM *const room = Room_Get(i);
         if (room->flipped_room == NO_ROOM_NEG) {
             continue;
@@ -846,7 +846,7 @@ void Room_Legacy_TriggerMusicTrack(
 
 void Room_InitCinematic(void)
 {
-    const int32_t room_count = Room_GetTotalCount();
+    const int32_t room_count = Room_GetCount();
     for (int32_t i = 0; i < room_count; i++) {
         ROOM *const room = Room_Get(i);
         if (room->flipped_room != NO_ROOM_NEG) {