diff --git a/include/regs.h b/include/regs.h
index 276c569577..7a02837de2 100644
--- a/include/regs.h
+++ b/include/regs.h
@@ -103,10 +103,10 @@
 #define R_MAGIC_FILL_X              XREG(51)
 #define R_ENV_LIGHT1_DIR(i)         cREG(3 + i)
 #define R_ENV_LIGHT2_DIR(i)         cREG(6 + i)
-#define R_MESH2_DEBUG_MODE          iREG(86)
-#define R_MESH2_NUM_ALL_ENTRIES     iREG(87)
-#define R_MESH2_NUM_DRAWN_ENTRIES   iREG(88)
-#define R_MESH2_DEBUG_DRAW_TARGET   iREG(89)
+#define R_ROOM_CULL_DEBUG_MODE      iREG(86)
+#define R_ROOM_CULL_NUM_ENTRIES     iREG(87)
+#define R_ROOM_CULL_USED_ENTRIES    iREG(88)
+#define R_ROOM_CULL_DEBUG_TARGET    iREG(89)
 #define R_B_LABEL_DD                WREG(0)
 #define R_OW_MINIMAP_X              WREG(29)
 #define R_OW_MINIMAP_Y              WREG(30)
diff --git a/src/code/z_room.c b/src/code/z_room.c
index 85e0207d8a..feb46598b3 100644
--- a/src/code/z_room.c
+++ b/src/code/z_room.c
@@ -180,7 +180,7 @@ void Room_DrawCullMeshes(PlayState* play, Room* room, u32 flags) {
     }
 
     // if this is real then I might not be
-    R_MESH2_NUM_ALL_ENTRIES = meshHeaderCull->numEntries & 0xFFFF & 0xFFFF & 0xFFFF;
+    R_ROOM_CULL_NUM_ENTRIES = meshHeaderCull->numEntries & 0xFFFF & 0xFFFF & 0xFFFF;
 
     // Draw entries, from nearest to furthest
     for (i = 1; head != NULL; head = head->next, i++) {
@@ -188,7 +188,7 @@ void Room_DrawCullMeshes(PlayState* play, Room* room, u32 flags) {
 
         meshHeaderCullEntry = head->entry;
 
-        if (R_MESH2_DEBUG_MODE != 0) {
+        if (R_ROOM_CULL_DEBUG_MODE != 0) {
             // Debug mode drawing
 
             // This loop does nothing
@@ -199,8 +199,8 @@ void Room_DrawCullMeshes(PlayState* play, Room* room, u32 flags) {
                 }
             }
 
-            if (((R_MESH2_DEBUG_MODE == 1) && (R_MESH2_DEBUG_DRAW_TARGET >= i)) ||
-                ((R_MESH2_DEBUG_MODE == 2) && (R_MESH2_DEBUG_DRAW_TARGET == i))) {
+            if (((R_ROOM_CULL_DEBUG_MODE == 1) && (R_ROOM_CULL_DEBUG_TARGET >= i)) ||
+                ((R_ROOM_CULL_DEBUG_MODE == 2) && (R_ROOM_CULL_DEBUG_TARGET == i))) {
                 if (flags & ROOM_DRAW_OPA) {
                     displayList = meshHeaderCullEntry->opa;
                     if (displayList != NULL) {
@@ -232,7 +232,7 @@ void Room_DrawCullMeshes(PlayState* play, Room* room, u32 flags) {
         }
     }
 
-    R_MESH2_NUM_DRAWN_ENTRIES = i - 1;
+    R_ROOM_CULL_USED_ENTRIES = i - 1;
 
     CLOSE_DISPS(play->state.gfxCtx, "../z_room.c", 430);
 }