3 files changed, 11 insertions, 11 deletions
diff --git a/world/map/npc/009-4/barriers.txt b/world/map/npc/009-4/barriers.txt
index aed35d96..135f083d 100644
--- a/world/map/npc/009-4/barriers.txt
+++ b/world/map/npc/009-4/barriers.txt
@@ -9,8 +9,8 @@ function|script|GetBarrierColor
 
 L_GetBarrierColor:
     set @Mask, 15;
-    set @Shift, 4 * @Barrier;
-    set @BarrierColor, (OrumQuestBarrier >> @Shift) & @Mask;
+    set @shift, 4 * @Barrier;
+    set @BarrierColor, (OrumQuestBarrier >> @shift) & @Mask;
     return;
 
 L_Error:
diff --git a/world/map/npc/009-4/orum.txt b/world/map/npc/009-4/orum.txt
index 84afced4..df9ac2d9 100644
--- a/world/map/npc/009-4/orum.txt
+++ b/world/map/npc/009-4/orum.txt
@@ -384,7 +384,7 @@ L_Still_Gathering:
     mes "[Orum]";
     mes "\"Have you finished gathering those things yet?\"";
     menu
-        "I believe I have!", L_Finished_Gathering_More,
+        "I believe I have!", L_F_Gather_More,
         "I lost my list... again.", L_List_Materials_More,
         "I've almost got them all.", L_Next8;
 
@@ -406,13 +406,13 @@ L_List_Materials_More:
     mes "\"And try not to lose this one. I don't have much more to write on!\"";
     goto L_Close;
 
-L_Finished_Gathering_More:
+L_F_Gather_More:
     if (countitem("IronPowder") < @BT_IRONPOWDER ||
         countitem("PileOfAsh") < @BT_PILESOFASH ||
         countitem("GambogeHerb") < @BT_HERBS ||
         countitem("AlizarinHerb") < @BT_HERBS ||
         countitem("CobaltHerb") < @BT_HERBS)
-            goto L_Missing_Materials_More;
+            goto L_Missing_Mats_M;
 
     delitem "IronPowder", @BT_IRONPOWDER;
     delitem "PileOfAsh", @BT_PILESOFASH;
@@ -440,7 +440,7 @@ L_Finished_Gathering_More:
     set OrumQuest, 8;
     goto L_Close;
 
-L_Missing_Materials_More:
+L_Missing_Mats_M:
     mes "Orum carefully looks over all of the items then squints his eyes at you.";
     next;
     mes "[Orum]";
@@ -490,7 +490,7 @@ L_More_Powder_Make:
         countitem("GambogeHerb") < @BT_HERBS ||
         countitem("AlizarinHerb") < @BT_HERBS ||
         countitem("CobaltHerb") < @BT_HERBS)
-            goto L_Missing_Materials_More;
+            goto L_Missing_Mats_M;
 
     delitem "IronPowder", @BT_IRONPOWDER;
     delitem "PileOfAsh", @BT_PILESOFASH;
diff --git a/world/map/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt
index 7049b446..4ad0c686 100644
--- a/world/map/npc/009-4/torches.txt
+++ b/world/map/npc/009-4/torches.txt
@@ -4,8 +4,8 @@ function|script|GetTorchColor
     if (@Torch < 0 || @Torch > 2) goto L_Error;
 
     set @Mask, 15;
-    set @Shift, 4 * @Torch;
-    set @TorchColor, (OrumQuestTorch >> @Shift) & @Mask;
+    set @shift, 4 * @Torch;
+    set @TorchColor, (OrumQuestTorch >> @shift) & @Mask;
     return;
 
 L_Error:
@@ -36,8 +36,8 @@ function|script|GetTorchIntensity
     if (@Torch < 0 || @Torch > 2) goto L_Error;
 
     set @Mask, 15;
-    set @Shift, 4 * (@Torch + 3);
-    set @TorchIntensity, (OrumQuestTorch >> @Shift) & @Mask;
+    set @shift, 4 * (@Torch + 3);
+    set @TorchIntensity, (OrumQuestTorch >> @shift) & @Mask;
     return;
 
 L_Error: