diff --git a/include/z64scene.h b/include/z64scene.h
index 4ae2c6fd9c..f2248b01ad 100644
--- a/include/z64scene.h
+++ b/include/z64scene.h
@@ -343,20 +343,20 @@ typedef enum {
 typedef enum {
     /* 0x00 */ SCENE_CMD_ID_SPAWN_LIST,
     /* 0x01 */ SCENE_CMD_ID_ACTOR_LIST,
-    /* 0x02 */ SCENE_CMD_ID_UNUSED_02,
-    /* 0x03 */ SCENE_CMD_ID_COL_HEADER,
+    /* 0x02 */ SCENE_CMD_ID_UNUSED_2,
+    /* 0x03 */ SCENE_CMD_ID_COLLISION_HEADER,
     /* 0x04 */ SCENE_CMD_ID_ROOM_LIST,
     /* 0x05 */ SCENE_CMD_ID_WIND_SETTINGS,
     /* 0x06 */ SCENE_CMD_ID_ENTRANCE_LIST,
     /* 0x07 */ SCENE_CMD_ID_SPECIAL_FILES,
     /* 0x08 */ SCENE_CMD_ID_ROOM_BEHAVIOR,
-    /* 0x09 */ SCENE_CMD_ID_UNK_09,
-    /* 0x0A */ SCENE_CMD_ID_MESH,
+    /* 0x09 */ SCENE_CMD_ID_UNDEFINED_9,
+    /* 0x0A */ SCENE_CMD_ID_MESH_HEADER,
     /* 0x0B */ SCENE_CMD_ID_OBJECT_LIST,
     /* 0x0C */ SCENE_CMD_ID_LIGHT_LIST,
     /* 0x0D */ SCENE_CMD_ID_PATH_LIST,
-    /* 0x0E */ SCENE_CMD_ID_TRANSI_ACTOR_LIST,
-    /* 0x0F */ SCENE_CMD_ID_ENV_LIGHT_SETTINGS,
+    /* 0x0E */ SCENE_CMD_ID_TRANSITION_ACTOR_LIST,
+    /* 0x0F */ SCENE_CMD_ID_LIGHT_SETTINGS_LIST,
     /* 0x10 */ SCENE_CMD_ID_TIME_SETTINGS,
     /* 0x11 */ SCENE_CMD_ID_SKYBOX_SETTINGS,
     /* 0x12 */ SCENE_CMD_ID_SKYBOX_DISABLES,
@@ -377,10 +377,10 @@ typedef enum {
     { SCENE_CMD_ID_ACTOR_LIST, numActors, CMD_PTR(actorList) }
 
 #define SCENE_CMD_UNUSED_02(unk, data) \
-    { SCENE_CMD_ID_UNUSED_02, unk, CMD_PTR(data) }
+    { SCENE_CMD_ID_UNUSED_2, unk, CMD_PTR(data) }
 
 #define SCENE_CMD_COL_HEADER(colHeader) \
-    { SCENE_CMD_ID_COL_HEADER, 0, CMD_PTR(colHeader) }
+    { SCENE_CMD_ID_COLLISION_HEADER, 0, CMD_PTR(colHeader) }
 
 #define SCENE_CMD_ROOM_LIST(numRooms, roomList) \
     { SCENE_CMD_ID_ROOM_LIST, numRooms, CMD_PTR(roomList) }
@@ -399,10 +399,10 @@ typedef enum {
         curRoomUnk2 | _SHIFTL(showInvisActors, 8, 1) | _SHIFTL(disableWarpSongs, 10, 1) }
 
 #define SCENE_CMD_UNK_09() \
-    { SCENE_CMD_ID_UNK_09, 0, CMD_W(0) }
+    { SCENE_CMD_ID_UNDEFINED_9, 0, CMD_W(0) }
 
 #define SCENE_CMD_MESH(meshHeader) \
-    { SCENE_CMD_ID_MESH, 0, CMD_PTR(meshHeader) }
+    { SCENE_CMD_ID_MESH_HEADER, 0, CMD_PTR(meshHeader) }
 
 #define SCENE_CMD_OBJECT_LIST(numObjects, objectList) \
     { SCENE_CMD_ID_OBJECT_LIST, numObjects, CMD_PTR(objectList) }
@@ -414,10 +414,10 @@ typedef enum {
     { SCENE_CMD_ID_PATH_LIST, 0, CMD_PTR(pathList) }
 
 #define SCENE_CMD_TRANSITION_ACTOR_LIST(numActors, list) \
-    { SCENE_CMD_ID_TRANSI_ACTOR_LIST, numActors, CMD_PTR(list) }
+    { SCENE_CMD_ID_TRANSITION_ACTOR_LIST, numActors, CMD_PTR(list) }
 
 #define SCENE_CMD_ENV_LIGHT_SETTINGS(numLightSettings, lightSettingsList) \
-    { SCENE_CMD_ID_ENV_LIGHT_SETTINGS, numLightSettings, CMD_PTR(lightSettingsList) }
+    { SCENE_CMD_ID_LIGHT_SETTINGS_LIST, numLightSettings, CMD_PTR(lightSettingsList) }
 
 #define SCENE_CMD_TIME_SETTINGS(hour, min, speed) \
     { SCENE_CMD_ID_TIME_SETTINGS, 0, CMD_BBBB(hour, min, speed, 0) }
diff --git a/src/code/z_scene.c b/src/code/z_scene.c
index f84c35937d..e4cc19ca2e 100644
--- a/src/code/z_scene.c
+++ b/src/code/z_scene.c
@@ -470,20 +470,20 @@ void Scene_CommandMiscSettings(GlobalContext* globalCtx, SceneCmd* cmd) {
 void (*gSceneCmdHandlers[SCENE_CMD_ID_MAX])(GlobalContext*, SceneCmd*) = {
     Scene_CommandSpawnList,           // SCENE_CMD_ID_SPAWN_LIST
     Scene_CommandActorList,           // SCENE_CMD_ID_ACTOR_LIST
-    Scene_CommandUnused2,             // SCENE_CMD_ID_UNUSED_02
-    Scene_CommandCollisionHeader,     // SCENE_CMD_ID_COL_HEADER
+    Scene_CommandUnused2,             // SCENE_CMD_ID_UNUSED_2
+    Scene_CommandCollisionHeader,     // SCENE_CMD_ID_COLLISION_HEADER
     Scene_CommandRoomList,            // SCENE_CMD_ID_ROOM_LIST
     Scene_CommandWindSettings,        // SCENE_CMD_ID_WIND_SETTINGS
     Scene_CommandEntranceList,        // SCENE_CMD_ID_ENTRANCE_LIST
     Scene_CommandSpecialFiles,        // SCENE_CMD_ID_SPECIAL_FILES
     Scene_CommandRoomBehavior,        // SCENE_CMD_ID_ROOM_BEHAVIOR
-    Scene_CommandUndefined9,          // SCENE_CMD_ID_UNK_09
-    Scene_CommandMeshHeader,          // SCENE_CMD_ID_MESH
+    Scene_CommandUndefined9,          // SCENE_CMD_ID_UNDEFINED_9
+    Scene_CommandMeshHeader,          // SCENE_CMD_ID_MESH_HEADER
     Scene_CommandObjectList,          // SCENE_CMD_ID_OBJECT_LIST
     Scene_CommandLightList,           // SCENE_CMD_ID_LIGHT_LIST
     Scene_CommandPathList,            // SCENE_CMD_ID_PATH_LIST
-    Scene_CommandTransitionActorList, // SCENE_CMD_ID_TRANSI_ACTOR_LIST
-    Scene_CommandLightSettingsList,   // SCENE_CMD_ID_ENV_LIGHT_SETTINGS
+    Scene_CommandTransitionActorList, // SCENE_CMD_ID_TRANSITION_ACTOR_LIST
+    Scene_CommandLightSettingsList,   // SCENE_CMD_ID_LIGHT_SETTINGS_LIST
     Scene_CommandTimeSettings,        // SCENE_CMD_ID_TIME_SETTINGS
     Scene_CommandSkyboxSettings,      // SCENE_CMD_ID_SKYBOX_SETTINGS
     Scene_CommandSkyboxDisables,      // SCENE_CMD_ID_SKYBOX_DISABLES