diff --git a/include/z64cutscene.h b/include/z64cutscene.h
index 390f87e3e6..9fcb8411a7 100644
--- a/include/z64cutscene.h
+++ b/include/z64cutscene.h
@@ -354,9 +354,9 @@ correlation with `enum EntranceIndex`
   CS_INDEX_*:    base entrance index + scene layer
 
 `z_select.c` naming:
-  CS_INDEX_AUTO: "Stage: night"
-  CS_INDEX_LAST: "Stage: day"
-  CS_INDEX_*:    "Stage demo 0*"
+  CS_INDEX_AUTO:   "Stage: night"
+  CS_INDEX_UNUSED: "Stage: day"
+  CS_INDEX_*:      "Stage demo 0*"
 */
 typedef enum CutsceneIndex {
     CS_INDEX_AUTO = 0x0000,
@@ -373,8 +373,8 @@ typedef enum CutsceneIndex {
     CS_INDEX_9 = 0xFFF9,
     CS_INDEX_A = 0xFFFA,
     CS_INDEX_TRIGGERED = 0xFFFD,
-    CS_INDEX_STOP = 0xFFFF, // a guess as per `z_demo.c:1369` and `z_demo.c:1372`
-    CS_INDEX_LAST = 0x8000  // unknown, `z_demo.c:747` for CS_DEST_DEATH_MOUNTAIN_TRAIL
+    CS_INDEX_BARRIER = 0xFFFF, // CS_DEST_GANONS_CASTLE_DISPEL_BARRIER_CONDITONAL
+    CS_INDEX_UNUSED = 0x8000   // CS_DEST_DEATH_MOUNTAIN_TRAIL
 } CutsceneIndex;
 
 typedef union CsCmdCam {
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index 6661f29386..282e9b73cb 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -744,7 +744,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
                 play->nextEntranceIndex = ENTR_DEATH_MOUNTAIN_TRAIL_0;
                 play->transitionTrigger = TRANS_TRIGGER_START;
                 play->transitionType = TRANS_TYPE_FADE_BLACK_FAST;
-                gSaveContext.save.cutsceneIndex = CS_INDEX_LAST;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_UNUSED;
                 break;
 
             case CS_DEST_LAKE_HYLIA_WATER_RESTORED:
@@ -1365,10 +1365,10 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
                     play->csCtx.script = SEGMENTED_TO_VIRTUAL(gTowerBarrierCs);
                     play->csCtx.curFrame = 0;
                     gSaveContext.cutsceneTrigger = 1;
-                    gSaveContext.save.cutsceneIndex = CS_INDEX_STOP;
+                    gSaveContext.save.cutsceneIndex = CS_INDEX_BARRIER;
                     csCtx->state = CS_STATE_STOP;
                 } else {
-                    gSaveContext.save.cutsceneIndex = CS_INDEX_STOP;
+                    gSaveContext.save.cutsceneIndex = CS_INDEX_BARRIER;
                     csCtx->state = CS_STATE_STOP;
                 }
                 break;
diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c
index 4b8bcc5013..1b1684f1ae 100644
--- a/src/overlays/gamestates/ovl_select/z_select.c
+++ b/src/overlays/gamestates/ovl_select/z_select.c
@@ -335,7 +335,7 @@ void MapSelect_UpdateMenu(MapSelectState* this) {
         }
 
         if (CHECK_BTN_ALL(input->press.button, BTN_Z)) {
-            if (gSaveContext.save.cutsceneIndex == CS_INDEX_LAST) {
+            if (gSaveContext.save.cutsceneIndex == CS_INDEX_UNUSED) {
                 gSaveContext.save.cutsceneIndex = CS_INDEX_AUTO;
             } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_AUTO) {
                 gSaveContext.save.cutsceneIndex = CS_INDEX_0;
@@ -360,13 +360,13 @@ void MapSelect_UpdateMenu(MapSelectState* this) {
             } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_9) {
                 gSaveContext.save.cutsceneIndex = CS_INDEX_A;
             } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_A) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_LAST;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_UNUSED;
             }
         } else if (CHECK_BTN_ALL(input->press.button, BTN_R)) {
-            if (gSaveContext.save.cutsceneIndex == CS_INDEX_LAST) {
+            if (gSaveContext.save.cutsceneIndex == CS_INDEX_UNUSED) {
                 gSaveContext.save.cutsceneIndex = CS_INDEX_A;
             } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_AUTO) {
-                gSaveContext.save.cutsceneIndex = CS_INDEX_LAST;
+                gSaveContext.save.cutsceneIndex = CS_INDEX_UNUSED;
             } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_0) {
                 gSaveContext.save.cutsceneIndex = CS_INDEX_AUTO;
             } else if (gSaveContext.save.cutsceneIndex == CS_INDEX_1) {
@@ -611,7 +611,7 @@ void MapSelect_PrintCutsceneSetting(MapSelectState* this, GfxPrint* printer, u16
             label = GFXP_HIRAGANA " ﾖﾙ " GFXP_KATAKANA "ｺﾞﾛﾝ";
             gSaveContext.save.dayTime = CLOCK_TIME(0, 0);
             break;
-        case CS_INDEX_LAST:
+        case CS_INDEX_UNUSED:
             // clang-format off
             gSaveContext.save.dayTime = CLOCK_TIME(12, 0); label = GFXP_HIRAGANA "ｵﾋﾙ " GFXP_KATAKANA "ｼﾞｬﾗ";
             // clang-format on
@@ -778,6 +778,6 @@ void MapSelect_Init(GameState* thisx) {
         DMA_REQUEST_SYNC(this->staticSegment, (uintptr_t)_z_select_staticSegmentRomStart, size, "../z_select.c", 1115);
     }
 
-    gSaveContext.save.cutsceneIndex = CS_INDEX_LAST;
+    gSaveContext.save.cutsceneIndex = CS_INDEX_UNUSED;
     gSaveContext.save.linkAge = LINK_AGE_CHILD;
 }