diff --git a/src/newgame.asm b/src/newgame.asm
index 397e20e4..0555d71e 100644
--- a/src/newgame.asm
+++ b/src/newgame.asm
@@ -113,7 +113,7 @@ _SetFlags:
     d_byte Breaker4, "BREAKER4"
     d_byte Collapse, "  MINE  "
     d_byte Breaker5, "BREAKER5"
-    d_byte Sinkhole, "  CITY  "
+    d_byte Sinkhole, "SINKHOLE"
     d_byte Breaker6, "BREAKER6"
     d_byte Shadow,   " SHADOW "
     d_byte Depths,   " DEPTHS "
@@ -139,7 +139,7 @@ _SetFlags:
     d_byte Breaker4, eRoom::BossLava
     d_byte Collapse, eRoom::MineCollapse
     d_byte Breaker5, eRoom::BossMine
-    d_byte Sinkhole, eRoom::CityPit
+    d_byte Sinkhole, eRoom::CitySinkhole
     d_byte Breaker6, eRoom::BossCity
     d_byte Shadow,   eRoom::ShadowTeleport
     d_byte Depths,   eRoom::ShadowDepths
diff --git a/src/program.inc b/src/program.inc
index b2647f23..447ec549 100644
--- a/src/program.inc
+++ b/src/program.inc
@@ -122,7 +122,7 @@
     CityCenterSemaphore3
     CityCenterSemaphore4
     CityOutskirtsLauncher
-    CityPitLift
+    CitySinkholeLift
     CoreBossBlaster
     CoreBossCannon
     CoreBossLaser
diff --git a/src/room.asm b/src/room.asm
index 9742de7c..65be37d5 100644
--- a/src/room.asm
+++ b/src/room.asm
@@ -50,7 +50,7 @@
 .IMPORT DataC_City_East_sRoom
 .IMPORT DataC_City_Flower_sRoom
 .IMPORT DataC_City_Outskirts_sRoom
-.IMPORT DataC_City_Pit_sRoom
+.IMPORT DataC_City_Sinkhole_sRoom
 .IMPORT DataC_City_West_sRoom
 .IMPORT DataC_Core_Boss_sRoom
 .IMPORT DataC_Core_East_sRoom
@@ -309,7 +309,7 @@ _LoadNewRoom:
     d_entry table, CityEast,        DataC_City_East_sRoom
     d_entry table, CityFlower,      DataC_City_Flower_sRoom
     d_entry table, CityOutskirts,   DataC_City_Outskirts_sRoom
-    d_entry table, CityPit,         DataC_City_Pit_sRoom
+    d_entry table, CitySinkhole,    DataC_City_Sinkhole_sRoom
     d_entry table, CityWest,        DataC_City_West_sRoom
     d_entry table, CoreBoss,        DataC_Core_Boss_sRoom
     d_entry table, CoreEast,        DataC_Core_East_sRoom
@@ -495,7 +495,7 @@ _PrisonMusic:
     d_byte CityEast,        eMusic::Silence
     d_byte CityFlower,      eMusic::Silence
     d_byte CityOutskirts,   eMusic::Silence
-    d_byte CityPit,         eMusic::Silence
+    d_byte CitySinkhole,    eMusic::Silence
     d_byte CityWest,        eMusic::Silence
     d_byte CoreBoss,        eMusic::Silence
     d_byte CoreEast,        eMusic::Silence
diff --git a/src/room.inc b/src/room.inc
index c54e3f13..14a23778 100644
--- a/src/room.inc
+++ b/src/room.inc
@@ -60,7 +60,7 @@ kMaxPassages = 8
     CityEast
     CityFlower
     CityOutskirts
-    CityPit
+    CitySinkhole
     CityWest
     CoreBoss
     CoreEast
diff --git a/src/rooms/boss_city.asm b/src/rooms/boss_city.asm
index 2f266697..2920d520 100644
--- a/src/rooms/boss_city.asm
+++ b/src/rooms/boss_city.asm
@@ -485,7 +485,7 @@ _Devices_sDevice_arr:
     d_byte Type_eDevice, eDevice::Door1Unlocked
     d_byte BlockRow_u8, 12
     d_byte BlockCol_u8, 4
-    d_byte Target_byte, eRoom::CityPit
+    d_byte Target_byte, eRoom::CitySinkhole
     D_END
     .assert * - :- = kBossUpgradeDeviceIndex * .sizeof(sDevice), error
     D_STRUCT sDevice
diff --git a/src/rooms/city_center.asm b/src/rooms/city_center.asm
index 16b076ac..031023c7 100644
--- a/src/rooms/city_center.asm
+++ b/src/rooms/city_center.asm
@@ -361,7 +361,7 @@ _Passages_sPassage_arr:
     D_END
     D_STRUCT sPassage
     d_byte Exit_bPassage, ePassage::Bottom | 2
-    d_byte Destination_eRoom, eRoom::CityPit
+    d_byte Destination_eRoom, eRoom::CitySinkhole
     d_byte SpawnBlock_u8, 42
     d_byte SpawnAdjust_byte, $c1
     D_END
diff --git a/src/rooms/city_pit.asm b/src/rooms/city_sinkhole.asm
similarity index 88%
rename from src/rooms/city_pit.asm
rename to src/rooms/city_sinkhole.asm
index bd3e165a..8df2cb1d 100644
--- a/src/rooms/city_pit.asm
+++ b/src/rooms/city_sinkhole.asm
@@ -40,10 +40,10 @@
 
 ;;;=========================================================================;;;
 
-;;; The machine index for the CityPitLift machine in this room.
+;;; The machine index for the CitySinkholeLift machine in this room.
 kLiftMachineIndex = 0
 
-;;; The platform index for the CityPitLift machine.
+;;; The platform index for the CitySinkholeLift machine.
 kLiftPlatformIndex = 0
 
 ;;; The initial and maximum permitted vertical goal values for the lift.
@@ -58,8 +58,8 @@ kLiftInitPlatformTop = kLiftMaxPlatformTop - kLiftInitGoalY * kBlockHeightPx
 
 .SEGMENT "PRGC_City"
 
-.EXPORT DataC_City_Pit_sRoom
-.PROC DataC_City_Pit_sRoom
+.EXPORT DataC_City_Sinkhole_sRoom
+.PROC DataC_City_Sinkhole_sRoom
     D_STRUCT sRoom
     d_byte MinScrollX_u8, $00
     d_word MaxScrollX_u16, $00
@@ -85,12 +85,12 @@ _Ext_sRoomExt:
     d_addr Draw_func_ptr, Func_Noop
     D_END
 _TerrainData:
-:   .incbin "out/rooms/city_pit.room"
+:   .incbin "out/rooms/city_sinkhole.room"
     .assert * - :- = 16 * 15, error
 _Machines_sMachine_arr:
 :   .assert * - :- = kLiftMachineIndex * .sizeof(sMachine), error
     D_STRUCT sMachine
-    d_byte Code_eProgram, eProgram::CityPitLift
+    d_byte Code_eProgram, eProgram::CitySinkholeLift
     d_byte Breaker_eFlag, 0
     d_byte Flags_bMachine, bMachine::MoveV
     d_byte Status_eDiagram, eDiagram::Lift
@@ -98,14 +98,14 @@ _Machines_sMachine_arr:
     d_byte ScrollGoalY_u8, $00
     d_byte RegNames_u8_arr4, 0, 0, 0, "Y"
     d_byte MainPlatform_u8, kLiftPlatformIndex
-    d_addr Init_func_ptr, FuncA_Room_CityPitLift_InitReset
-    d_addr ReadReg_func_ptr, FuncC_City_PitLift_ReadReg
+    d_addr Init_func_ptr, FuncA_Room_CitySinkholeLift_InitReset
+    d_addr ReadReg_func_ptr, FuncC_City_SinkholeLift_ReadReg
     d_addr WriteReg_func_ptr, Func_Noop
-    d_addr TryMove_func_ptr, FuncA_Machine_CityPitLift_TryMove
+    d_addr TryMove_func_ptr, FuncA_Machine_CitySinkholeLift_TryMove
     d_addr TryAct_func_ptr, FuncA_Machine_Error
-    d_addr Tick_func_ptr, FuncA_Machine_CityPitLift_Tick
+    d_addr Tick_func_ptr, FuncA_Machine_CitySinkholeLift_Tick
     d_addr Draw_func_ptr, FuncA_Objects_DrawLiftMachine
-    d_addr Reset_func_ptr, FuncA_Room_CityPitLift_InitReset
+    d_addr Reset_func_ptr, FuncA_Room_CitySinkholeLift_InitReset
     D_END
     .assert * - :- <= kMaxMachines * .sizeof(sMachine), error
 _Platforms_sPlatform_arr:
@@ -148,7 +148,7 @@ _Passages_sPassage_arr:
     .assert * - :- <= kMaxPassages * .sizeof(sPassage), error
 .ENDPROC
 
-.PROC FuncC_City_PitLift_ReadReg
+.PROC FuncC_City_SinkholeLift_ReadReg
     lda #kLiftMaxPlatformTop + kTileHeightPx
     sub Ram_PlatformTop_i16_0_arr + kLiftPlatformIndex
     div #kBlockHeightPx
@@ -159,7 +159,7 @@ _Passages_sPassage_arr:
 
 .SEGMENT "PRGA_Room"
 
-.PROC FuncA_Room_CityPitLift_InitReset
+.PROC FuncA_Room_CitySinkholeLift_InitReset
     lda #kLiftInitGoalY
     sta Ram_MachineGoalVert_u8_arr + kLiftMachineIndex
     rts
@@ -169,12 +169,12 @@ _Passages_sPassage_arr:
 
 .SEGMENT "PRGA_Machine"
 
-.PROC FuncA_Machine_CityPitLift_TryMove
+.PROC FuncA_Machine_CitySinkholeLift_TryMove
     lda #kLiftMaxGoalY  ; param: max goal vert
     jmp FuncA_Machine_LiftTryMove
 .ENDPROC
 
-.PROC FuncA_Machine_CityPitLift_Tick
+.PROC FuncA_Machine_CitySinkholeLift_Tick
     ldax #kLiftMaxPlatformTop  ; param: max platform top
     jmp FuncA_Machine_LiftTick
 .ENDPROC
diff --git a/src/rooms/city_pit.bg b/src/rooms/city_sinkhole.bg
similarity index 100%
rename from src/rooms/city_pit.bg
rename to src/rooms/city_sinkhole.bg
diff --git a/tests/scenario.py b/tests/scenario.py
index 1faf406a..a6ed624e 100644
--- a/tests/scenario.py
+++ b/tests/scenario.py
@@ -38,7 +38,7 @@
 ])
 
 ROOM_PARENTS = {
-    'BossCity': 'CityPit',
+    'BossCity': 'CitySinkhole',
     'BossCrypt': 'CryptTomb',
     'BossGarden': 'GardenTower',
     'BossMine': 'MineCollapse',