diff --git a/include/functions.h b/include/functions.h
index 9a7f822522..8f83176af1 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -1039,7 +1039,7 @@ s32 Player_OverrideLimbDrawGameplayCrawling(PlayState* play, s32 limbIndex, Gfx*
 u8 func_80090480(PlayState* play, ColliderQuad* collider, WeaponInfo* weaponInfo, Vec3f* newTip, Vec3f* newBase);
 void Player_DrawGetItem(PlayState* play, Player* this);
 void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx);
-u32 Player_InitDrawPause(PlayState* play, u8* segment, SkelAnime* skelAnime);
+u32 Player_InitPauseDrawData(PlayState* play, u8* segment, SkelAnime* skelAnime);
 void Player_DrawPause(PlayState* play, u8* segment, SkelAnime* skelAnime, Vec3f* pos, Vec3s* rot, f32 scale,
                       s32 sword, s32 tunic, s32 shield, s32 boots);
 void PreNMI_Init(GameState* thisx);
diff --git a/include/z64pause.h b/include/z64pause.h
index ac577da6a0..7a27a7afe1 100644
--- a/include/z64pause.h
+++ b/include/z64pause.h
@@ -59,7 +59,7 @@ typedef enum {
     /* 16 */ PAUSE_STATE_16,
     /* 17 */ PAUSE_STATE_17,
     /* 18 */ PAUSE_STATE_CLOSING, // Animate the pause menu closing
-    /* 19 */ PAUSE_STATE_UNPAUSE
+    /* 19 */ PAUSE_STATE_RESUME_GAMEPLAY // Handles returning to normal gameplay once the pause menu is visually closed
 } PauseState;
 
 #define IS_PAUSE_STATE_GAMEOVER(pauseCtx) \
diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c
index 814b2e34ba..0525c89874 100644
--- a/src/code/z_bgcheck.c
+++ b/src/code/z_bgcheck.c
@@ -3154,7 +3154,7 @@ f32 BgCheck_RaycastDownDyna(DynaRaycastDown* dynaRaycastDown) {
     f32 result;
     f32 intersect2;
     s32 i2;
-    s32 pauseState;
+    s32 isPaused;
     DynaPolyActor* dynaActor;
     s32 pad;
     Vec3f polyVtx[3];
@@ -3223,8 +3223,8 @@ f32 BgCheck_RaycastDownDyna(DynaRaycastDown* dynaRaycastDown) {
 
     dynaActor = DynaPoly_GetActor(dynaRaycastDown->colCtx, *dynaRaycastDown->bgId);
     if ((result != BGCHECK_Y_MIN) && (dynaActor != NULL) && (dynaRaycastDown->play != NULL)) {
-        pauseState = IS_PAUSED(&dynaRaycastDown->play->pauseCtx);
-        if (!pauseState && (dynaRaycastDown->colCtx->dyna.bgActorFlags[*dynaRaycastDown->bgId] & BGACTOR_1)) {
+        isPaused = IS_PAUSED(&dynaRaycastDown->play->pauseCtx);
+        if (!isPaused && (dynaRaycastDown->colCtx->dyna.bgActorFlags[*dynaRaycastDown->bgId] & BGACTOR_1)) {
             curTransform = &dynaRaycastDown->dyna->bgActors[*dynaRaycastDown->bgId].curTransform;
             polyMin =
                 &dynaRaycastDown->dyna
diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c
index 87156371db..ba23d08611 100644
--- a/src/code/z_kaleido_setup.c
+++ b/src/code/z_kaleido_setup.c
@@ -55,7 +55,6 @@ void KaleidoSetup_Update(PlayState* play) {
             }
         } else if (CHECK_BTN_ALL(input->press.button, BTN_START)) {
             // The start button was pressed, pause
-
             gSaveContext.prevHudVisibilityMode = gSaveContext.hudVisibilityMode;
 
             R_PAUSE_CURSOR_LEFT_X = -175;
diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c
index 565758890f..9c75978a2a 100644
--- a/src/code/z_map_exp.c
+++ b/src/code/z_map_exp.c
@@ -365,7 +365,7 @@ void Minimap_Draw(PlayState* play) {
 
     OPEN_DISPS(play->state.gfxCtx, "../z_map_exp.c", 626);
 
-    if (play->pauseCtx.state < PAUSE_STATE_OPENING_1) {
+    if (play->pauseCtx.state <= PAUSE_STATE_INIT) {
         /* PAUSE_STATE_OFF, PAUSE_STATE_WAIT_LETTERBOX, PAUSE_STATE_WAIT_BG_PRERENDER, PAUSE_STATE_INIT */
         switch (play->sceneId) {
             case SCENE_DEKU_TREE:
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c
index 5c85a4c32c..ad90fed5a0 100644
--- a/src/code/z_player_lib.c
+++ b/src/code/z_player_lib.c
@@ -1641,7 +1641,7 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Ve
     }
 }
 
-u32 Player_InitDrawPause(PlayState* play, u8* segment, SkelAnime* skelAnime) {
+u32 Player_InitPauseDrawData(PlayState* play, u8* segment, SkelAnime* skelAnime) {
     s16 linkObjectId = gLinkObjectIds[(void)0, gSaveContext.save.linkAge];
     u32 size;
     void* ptr;
diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
index 4f04529c36..af4d210776 100644
--- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
@@ -2702,7 +2702,7 @@ void KaleidoScope_SetVertices(PlayState* play, GraphicsContext* gfxCtx) {
 
     if ((pauseCtx->state == PAUSE_STATE_OPENING_1) ||
         (pauseCtx->state >= PAUSE_STATE_CLOSING
-         /* PAUSE_STATE_CLOSING, PAUSE_STATE_UNPAUSE */) ||
+         /* PAUSE_STATE_CLOSING, PAUSE_STATE_RESUME_GAMEPLAY */) ||
         ((pauseCtx->state == PAUSE_STATE_SAVE_PROMPT) &&
          ((pauseCtx->savePromptState == PAUSE_SAVE_PROMPT_STATE_CLOSING) ||
           (pauseCtx->savePromptState == PAUSE_SAVE_PROMPT_STATE_CLOSING_AFTER_SAVED))) ||
@@ -3525,7 +3525,7 @@ void KaleidoScope_Update(PlayState* play) {
             pauseCtx->playerSegment = (void*)(((uintptr_t)play->objectCtx.spaceStart + 0x30) & ~0x3F);
 
             playerSegmentDrawPauseSize =
-                Player_InitDrawPause(play, pauseCtx->playerSegment, &pauseCtx->playerSkelAnime);
+                Player_InitPauseDrawData(play, pauseCtx->playerSegment, &pauseCtx->playerSkelAnime);
             osSyncPrintf("プレイヤー size1＝%x\n", playerSegmentDrawPauseSize);
 
             pauseCtx->iconItemSegment = (void*)ALIGN16((uintptr_t)pauseCtx->playerSegment + playerSegmentDrawPauseSize);
@@ -4129,7 +4129,7 @@ void KaleidoScope_Update(PlayState* play) {
                         }
                     } else {
                         pauseCtx->debugState = 0;
-                        pauseCtx->state = PAUSE_STATE_UNPAUSE;
+                        pauseCtx->state = PAUSE_STATE_RESUME_GAMEPLAY;
                         pauseCtx->itemPageRoll = pauseCtx->equipPageRoll = pauseCtx->mapPageRoll =
                             pauseCtx->questPageRoll = 160.0f;
                         pauseCtx->namedItem = PAUSE_ITEM_NONE;
@@ -4452,7 +4452,7 @@ void KaleidoScope_Update(PlayState* play) {
                 }
             } else {
                 pauseCtx->debugState = 0;
-                pauseCtx->state = PAUSE_STATE_UNPAUSE;
+                pauseCtx->state = PAUSE_STATE_RESUME_GAMEPLAY;
                 pauseCtx->itemPageRoll = pauseCtx->equipPageRoll = pauseCtx->mapPageRoll = pauseCtx->questPageRoll =
                     160.0f;
                 pauseCtx->namedItem = PAUSE_ITEM_NONE;
@@ -4460,7 +4460,7 @@ void KaleidoScope_Update(PlayState* play) {
             }
             break;
 
-        case PAUSE_STATE_UNPAUSE:
+        case PAUSE_STATE_RESUME_GAMEPLAY:
             pauseCtx->state = PAUSE_STATE_OFF;
             R_UPDATE_RATE = 3;
             R_PAUSE_BG_PRERENDER_STATE = PAUSE_BG_PRERENDER_OFF;
diff --git a/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c b/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c
index ec7289e2b7..c98d21762f 100644
--- a/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c
@@ -81,7 +81,7 @@ void PauseMapMark_DrawForDungeon(PlayState* play) {
         Matrix_Push();
 
         if ((play->pauseCtx.state == PAUSE_STATE_OPENING_1) || (play->pauseCtx.state >= PAUSE_STATE_CLOSING)
-            /* PAUSE_STATE_CLOSING, PAUSE_STATE_UNPAUSE */
+            /* PAUSE_STATE_CLOSING, PAUSE_STATE_RESUME_GAMEPLAY */
         ) {
             Matrix_Translate(-36.0f, 101.0f, 0.0f, MTXMODE_APPLY);
         } else {