diff --git a/Runtime/World/CScriptDock.cpp b/Runtime/World/CScriptDock.cpp
index 2e8435bef..c1b0af0d9 100644
--- a/Runtime/World/CScriptDock.cpp
+++ b/Runtime/World/CScriptDock.cpp
@@ -50,9 +50,9 @@ void CScriptDock::Think(float dt, CStateManager& mgr) {
   }
 
   if (mgr.GetNextAreaId() != x260_area) {
-    x264_dockState = EDockState::Three;
-  } else if (x264_dockState == EDockState::Three) {
-    x264_dockState = EDockState::Idle;
+    x264_dockState = EDockState::InNextRoom;
+  } else if (x264_dockState == EDockState::InNextRoom) {
+    x264_dockState = EDockState::InSourceRoom;
   } else if (x264_dockState == EDockState::PlayerTouched) {
     x264_dockState = EDockState::EnterNextArea;
   } else if (x264_dockState == EDockState::EnterNextArea) {
@@ -75,7 +75,7 @@ void CScriptDock::Think(float dt, CStateManager& mgr) {
       }
     }
 
-    x264_dockState = EDockState::Idle;
+    x264_dockState = EDockState::InSourceRoom;
   }
 }
 
@@ -153,7 +153,7 @@ void CScriptDock::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStat
 }
 
 std::optional<zeus::CAABox> CScriptDock::GetTouchBounds() const {
-  if (x264_dockState == EDockState::Three) {
+  if (x264_dockState == EDockState::InNextRoom) {
     return std::nullopt;
   }
 
@@ -161,7 +161,7 @@ std::optional<zeus::CAABox> CScriptDock::GetTouchBounds() const {
 }
 
 void CScriptDock::Touch(CActor& act, CStateManager&) {
-  if (x264_dockState == EDockState::Three) {
+  if (x264_dockState == EDockState::InNextRoom) {
     return;
   }
 
diff --git a/Runtime/World/CScriptDock.hpp b/Runtime/World/CScriptDock.hpp
index a3e9dd6f7..2266f68e4 100644
--- a/Runtime/World/CScriptDock.hpp
+++ b/Runtime/World/CScriptDock.hpp
@@ -8,13 +8,13 @@
 namespace metaforce {
 
 class CScriptDock : public CPhysicsActor {
-  enum class EDockState { Idle, PlayerTouched, EnterNextArea, Three };
+  enum class EDockState { InSourceRoom, PlayerTouched, EnterNextArea, InNextRoom };
 
   friend class CScriptDoor;
   s32 x258_dockReferenceCount;
   s32 x25c_dock;
   TAreaId x260_area;
-  EDockState x264_dockState = EDockState::Three;
+  EDockState x264_dockState = EDockState::InNextRoom;
   bool x268_24_dockReferenced : 1 = false;
   bool x268_25_loadConnected : 1;
   bool x268_26_areaPostConstructed : 1 = false;