8 files changed, 19 insertions, 19 deletions
diff --git a/world/map/npc/009-1/jack.txt b/world/map/npc/009-1/jack.txt
index 206f0c3e..3446c191 100644
--- a/world/map/npc/009-1/jack.txt
+++ b/world/map/npc/009-1/jack.txt
@@ -193,7 +193,7 @@ L_Next10:
     if (countitem("RawLog") < @RAWLOGS_AMOUNT)
         goto L_Not_enough_logs;
     if (Zeny < @SHIELD_COST)
-        goto L_Not_enough_money;
+        goto L_not_enough_money;
     getinventorylist;
     if (@inventorylist_count == 100)
         goto L_TooMany;
@@ -227,7 +227,7 @@ L_Not_enough_logs:
     mes "\"You don't have enough wood for me to craft this shield; I need a total of " + @RAWLOGS_AMOUNT + " raw logs.\"";
     goto L_Close;
 
-L_Not_enough_money:
+L_not_enough_money:
     mes "[Jack Lumber]";
     mes "\"I'm afraid that you don't have enough gold. I need " + @SHIELD_COST + " GP to finish your shield.\"";
     goto L_Close;
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/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:
diff --git a/world/map/npc/009-7/battlemaster.txt b/world/map/npc/009-7/battlemaster.txt
index bbac54e9..ed07eefb 100644
--- a/world/map/npc/009-7/battlemaster.txt
+++ b/world/map/npc/009-7/battlemaster.txt
@@ -5,7 +5,7 @@
     mes "\"Hey, you seem tough enough! Would you like to prove your skills?\"";
     next;
     menu
-        "PvP Cave (50gp)", L_PVP,
+        "PvP Cave (50gp)", L_Pvp,
         "Last Man Standing (150gp)", L_Brodomir,
         "Nevermind.", L_Next;
 
@@ -30,7 +30,7 @@ L_Brodomir:
     savepoint "009-7", 39, 37;
     end;
 
-L_PVP:
+L_Pvp:
     if (Zeny < 50) goto L_NoMoney;
     set Zeny, Zeny - 50;
     mes "[Battle Master]";
diff --git a/world/map/npc/009-7/core.txt b/world/map/npc/009-7/core.txt
index 03eb2095..c4999606 100644
--- a/world/map/npc/009-7/core.txt
+++ b/world/map/npc/009-7/core.txt
@@ -2,9 +2,9 @@
 
 function|script|fightclub_sendrequest
 {
-    goto L_Try;
+    goto L_try;
 
-L_Try:
+L_try:
     set @loop, 0;
     goto L_Loop;
 
@@ -22,7 +22,7 @@ L_ShiftQueue:
     set @Duel_Queue$[(@loop + 1)], "";
     set @Duel_Queue[(@loop + 1)], 0;
     set @loop, (@loop + 1);
-    if(@loop >= getarraysize(@Duel_Queue)) goto L_Try;
+    if(@loop >= getarraysize(@Duel_Queue)) goto L_try;
     goto L_ShiftQueue;
 
 L_Full:
diff --git a/world/map/npc/013-3/mask_chest.txt b/world/map/npc/013-3/mask_chest.txt
index a175b4b2..1b62e66c 100644
--- a/world/map/npc/013-3/mask_chest.txt
+++ b/world/map/npc/013-3/mask_chest.txt
@@ -31,7 +31,7 @@
     if (countitem("TreasureKey") == 0)
         goto L_No_treasure_key;
     if (countitem("PileOfAsh") == 0)
-        goto L_No_ash;
+        goto L_no_ash;
     if (countitem("MauveHerb") == 0
         || countitem("CobaltHerb") == 0
         || countitem("GambogeHerb") == 0
@@ -157,7 +157,7 @@ L_No_treasure_key:
     mes "No treasure chest key, no opening ritual.";
     goto L_Close;
 
-L_No_ash:
+L_no_ash:
     mes "You still need a pile of ash.";
     goto L_Close;
 
diff --git a/world/map/npc/014-1/wedding-officiator.txt b/world/map/npc/014-1/wedding-officiator.txt
index 30f6201c..fc237082 100644
--- a/world/map/npc/014-1/wedding-officiator.txt
+++ b/world/map/npc/014-1/wedding-officiator.txt
@@ -96,7 +96,7 @@ L_Next2:
         goto L_too_young;
     getinventorylist;
     if (@inventorylist_count > 98)
-        goto L_No_Room_For_Rings;
+        goto L_no_room_for_rings;
 
     set Zeny, Zeny - WEDDING_FEE;
     getitem "WeddingRing", 1;
@@ -239,7 +239,7 @@ L_DidDivorce:
     mes "\"You are divorced now. Thank you for your business.\"";
     close;
 
-L_No_Room_For_Rings:
+L_no_room_for_rings:
     mes "[Wedding Officiator]";
     mes "\"You don't have room to carry the rings.\"";
     close;
diff --git a/world/map/npc/029-2/sorfina.txt b/world/map/npc/029-2/sorfina.txt
index feea5f5f..c7d6e150 100644
--- a/world/map/npc/029-2/sorfina.txt
+++ b/world/map/npc/029-2/sorfina.txt
@@ -28,9 +28,9 @@ L_Start:
     mes "\"You didn't have any possessions on you when we found you and no one knows who you are.\"";
     mes "Do you have a name?";
     menu
-        strcharinfo(0), L_Name;
+        strcharinfo(0), L_name;
 
-L_Name:
+L_name:
     mes "[Old Woman]";
     mes "\"Well " + strcharinfo(0) + " what else can you tell me about yourself?.\"";
     menu