Made Constants case-sensitive

67 files changed, 331 insertions, 331 deletions

diff --git a/world/map/npc/001-1/bleacher.txt b/world/map/npc/001-1/bleacher.txt
index f8158e4b..a63105d5 100644
--- a/world/map/npc/001-1/bleacher.txt
+++ b/world/map/npc/001-1/bleacher.txt
@@ -8,7 +8,7 @@
 
     if (countitem("PileOfAsh") < 3) goto L_no_ash;
 
-    if (zeny < 5000) goto L_no_money;
+    if (Zeny < 5000) goto L_no_money;
 
     menu
         "I'd like to bleach something", -,
@@ -160,12 +160,12 @@ L_choose_color:
 
     if (countitem("PileOfAsh") < 3) goto L_no_ash;
 
-    if (zeny < 5000) goto L_no_money;
+    if (Zeny < 5000) goto L_no_money;
 
     delitem @del, 1;
     getitem @normal, 1;
     delitem "PileOfAsh", 3;
-    set zeny, zeny - 5000;
+    set Zeny, Zeny - 5000;
 
 L_again:
     mes "[Candide]";
diff --git a/world/map/npc/001-1/elanore.txt b/world/map/npc/001-1/elanore.txt
index 0c35568f..ca9e0239 100644
--- a/world/map/npc/001-1/elanore.txt
+++ b/world/map/npc/001-1/elanore.txt
@@ -45,7 +45,7 @@ function|script|ElanoreFix|{
     set @Q_status, @STATUS_INITIAL;
     callsub S_update_var;
     if (sc_check(sc_poison)) goto L_CurePoison;
-    if (baselevel > 10) goto L_NoHeal;
+    if (BaseLevel > 10) goto L_NoHeal;
     set @TEMP,rand(4);
     if(@TEMP == 0) goto Heal1;
     if(@TEMP == 1) goto Heal2;
diff --git a/world/map/npc/001-1/trader.txt b/world/map/npc/001-1/trader.txt
index a90ca8a5..5976ffb9 100644
--- a/world/map/npc/001-1/trader.txt
+++ b/world/map/npc/001-1/trader.txt
@@ -8,7 +8,7 @@
     set @Ironprice, 1000;
     set @Sulphurprice, 1200;
     set @Potionprice, 500;
-    if ((getskilllv(@TRADE_SKILL) > 0) && baselevel >= 25) goto L_Trade;
+    if ((getskilllv(@TRADE_SKILL) > 0) && BaseLevel >= 25) goto L_Trade;
     if (getskilllv(@TRADE_SKILL) > 0) goto L_Later;
 
     mes "[Trader]";
@@ -38,8 +38,8 @@ L_Except:
     goto L_Close;
 
 L_Teach:
-    if (zeny < 5) goto L_NotEnoughMoney;
-    set zeny, zeny - 5;
+    if (Zeny < 5) goto L_NotEnoughMoney;
+    set Zeny, Zeny - 5;
     setskill @TRADE_SKILL, 1;
     mes "[Trader]";
     mes "\"You can initiate trade with someone by right-clicking on them and choosing trade.";
@@ -96,11 +96,11 @@ L_Healpots:
 
 L_Ipowder:
     if (countitem("IronOre") < 1) goto L_Missing;
-    if (zeny < @Ironprice) goto L_NotEnoughMoney;
+    if (Zeny < @Ironprice) goto L_NotEnoughMoney;
     getinventorylist;
     if (@inventorylist_count == 100 && countitem("IronOre") > 1 && countitem("IronPowder") < 1) goto L_Full;
     delitem "IronOre", 1;
-    set zeny, zeny - @Ironprice;
+    set Zeny, Zeny - @Ironprice;
     getitem "IronPowder", 4;
     mes "[Trader]";
     mes "\"There you go.  Would you like to trade anything else?\"";
@@ -111,11 +111,11 @@ L_Ipowder:
 
 L_Spowder:
     if (countitem("PileOfAsh") < 1) goto L_Missing;
-    if (zeny < @Sulphurprice) goto L_NotEnoughMoney;
+    if (Zeny < @Sulphurprice) goto L_NotEnoughMoney;
     getinventorylist;
     if (@inventorylist_count == 100 && countitem("PileOfAsh") > 1 && countitem("SulphurPowder") < 1) goto L_Full;
     delitem "PileOfAsh", 1;
-    set zeny, zeny - @Sulphurprice;
+    set Zeny, Zeny - @Sulphurprice;
     getitem "SulphurPowder", 5;
     mes "[Trader]";
     mes "\"There you go.  Would you like to trade anything else?\"";
@@ -126,11 +126,11 @@ L_Spowder:
 
 L_Pots:
     if (countitem("SmallHealingPotion") < 3) goto L_Missing;
-    if (zeny < @Potionprice) goto L_NotEnoughMoney;
+    if (Zeny < @Potionprice) goto L_NotEnoughMoney;
     getinventorylist;
     if (@inventorylist_count == 100 && countitem("SmallHealingPotion") > 3 && countitem("MediumHealingPotion") < 1) goto L_Full;
     delitem "SmallHealingPotion", 3;
-    set zeny, zeny - @Potionprice;
+    set Zeny, Zeny - @Potionprice;
     getitem "MediumHealingPotion", 1;
     mes "[Trader]";
     mes "\"There you go.  Would you like to trade anything else?\"";
diff --git a/world/map/npc/001-1/vincent.txt b/world/map/npc/001-1/vincent.txt
index c7d50302..e2a53a31 100644
--- a/world/map/npc/001-1/vincent.txt
+++ b/world/map/npc/001-1/vincent.txt
@@ -111,7 +111,7 @@ L_Have:
     next;
     if(countitem("BugLeg") < 10) goto L_Progress;
     delitem "BugLeg", 10;
-    set zeny, zeny + 1000;
+    set Zeny, Zeny + 1000;
     set TMW_Quest, 10;
 
     mes "[Vincent]";
diff --git a/world/map/npc/001-2/omar.txt b/world/map/npc/001-2/omar.txt
index c541fce6..9b1eea8b 100644
--- a/world/map/npc/001-2/omar.txt
+++ b/world/map/npc/001-2/omar.txt
@@ -126,7 +126,7 @@ L_cured_choice:
     next;
     set @Q_status, @Q_STATUS_COMPLETED_NOELANORE;
     callsub S_update_var;
-    set zeny, zeny + 5000;
+    set Zeny, Zeny + 5000;
     goto L_Close;
 
 L_cured_nothing:
@@ -137,7 +137,7 @@ L_cured_nothing:
     set @Q_status, @Q_STATUS_COMPLETED_NOELANORE;
     callsub S_update_var;
     getitem "Pearl", 2;
-    set zeny, zeny + 10000;
+    set Zeny, Zeny + 10000;
     goto L_Close;
 
 L_cured_elanore:
diff --git a/world/map/npc/001-2/phaet.txt b/world/map/npc/001-2/phaet.txt
index 1e37bdcb..dfdf2ebe 100644
--- a/world/map/npc/001-2/phaet.txt
+++ b/world/map/npc/001-2/phaet.txt
@@ -13,8 +13,8 @@
     close;
 
 L_Sure:
-    if (zeny < 50) goto L_NoMoney;
-    set zeny, zeny - 50;
+    if (Zeny < 50) goto L_NoMoney;
+    set Zeny, Zeny - 50;
 
     mes "[Phaet the Royal Guard]";
     mes "\"Get ready!\"";
diff --git a/world/map/npc/002-1/lieutenant_dausen.txt b/world/map/npc/002-1/lieutenant_dausen.txt
index 605a4d58..95e2bb02 100644
--- a/world/map/npc/002-1/lieutenant_dausen.txt
+++ b/world/map/npc/002-1/lieutenant_dausen.txt
@@ -96,7 +96,7 @@ L_LD_Nickos_Waits:
 
 L_LD_Orders:
     set TMW_Quest, 19;
-    set zeny, zeny + 500;
+    set Zeny, Zeny + 500;
     mes "[Lieutenant Dausen]";
     mes "\"Thank you for clearing up the orders to my men!  Here's some gold for your efforts.\"";
     next;
diff --git a/world/map/npc/002-1/nickos.txt b/world/map/npc/002-1/nickos.txt
index 1e469ef8..011fc5ad 100644
--- a/world/map/npc/002-1/nickos.txt
+++ b/world/map/npc/002-1/nickos.txt
@@ -65,7 +65,7 @@ L_Nickos_Waits:
 
 L_Nickos_Check_Happy:
     set TMW_Quest, 23;
-    set zeny, zeny + 500;
+    set Zeny, Zeny + 500;
     mes "[Nickos]";
     mes "\"Oh, everything is okay?  That's great!  I think they are pretty busy and could use some help.  Feel free to give them a hand.  Here's some gold for your troubles.\"";
     close;
diff --git a/world/map/npc/002-1/rogue.txt b/world/map/npc/002-1/rogue.txt
index 400dec83..7358230c 100644
--- a/world/map/npc/002-1/rogue.txt
+++ b/world/map/npc/002-1/rogue.txt
@@ -6,7 +6,7 @@
 
 // set @cost, 10000000 / ($ResetA_uses + 1);
 
-    set @cost, baselevel * 100;
+    set @cost, BaseLevel * 100;
 
     mes "[Rogue Mage]";
     mes "\"I have come across a spell that will";
@@ -20,13 +20,13 @@
         "Reset my stats",-,
         "Forget about it",L_Pass;
 
-    if (zeny<@cost) goto L_NoMoney;
+    if (Zeny<@cost) goto L_NoMoney;
 
 // set $ResetA_uses, $ResetA_uses + 1;
 // set ResetA_charstate, 1;
 
 L_Reset:
-    set zeny, zeny-@cost;
+    set Zeny, Zeny-@cost;
     resetstatus;
 
     mes "[Rogue Mage]";
diff --git a/world/map/npc/003-1/stranger.txt b/world/map/npc/003-1/stranger.txt
index d8e05cc2..f5abf179 100644
--- a/world/map/npc/003-1/stranger.txt
+++ b/world/map/npc/003-1/stranger.txt
@@ -11,7 +11,7 @@
     if (gettime(6) != @month) goto L_No_Event;
     if (gettime(5) < @start_day) goto L_No_Event;
     if (gettime(5) > @end_day) goto L_No_Event;
-    if ((gettimetick(2)-TUT_var < 6*7*86400) || (baselevel < 42 )) //player must be created at least 6 weeks ago and at least level 42
+    if ((gettimetick(2)-TUT_var < 6*7*86400) || (BaseLevel < 42 )) //player must be created at least 6 weeks ago and at least level 42
         goto L_No_Event;
     if (FLAGS & FLAG_TOWEL_HELPED) goto L_Towel;
 
diff --git a/world/map/npc/005-1/spirit.txt b/world/map/npc/005-1/spirit.txt
index c39a74d3..91610530 100644
--- a/world/map/npc/005-1/spirit.txt
+++ b/world/map/npc/005-1/spirit.txt
@@ -132,9 +132,9 @@ L_Q_magic_1:
 
     if (countitem("DruidTreeBranch") < 1) goto L_Q_tree_none;
     if (!(MAGIC_FLAGS & MFLAG_DID_CUTTREE)) goto L_Q_tree_dry;
-    if (zeny < 100000) goto L_Q_tree_nomoney;
+    if (Zeny < 100000) goto L_Q_tree_nomoney;
 
-    set zeny, zeny - 100000;
+    set Zeny, Zeny - 100000;
     delitem "DruidTreeBranch", 1;
     mes "[Earth Spirit]";
     mes "Following the earth sprite's instructions, you throw branch and GP into the well.";
@@ -165,9 +165,9 @@ L_Q_magic_2:
         "Here you are.", -,
         "No.", L_main;
 
-    if (zeny < 20000) goto L_no20k;
+    if (Zeny < 20000) goto L_no20k;
 
-    set zeny, zeny - 20000;
+    set Zeny, Zeny - 20000;
     mes "[Earth Spirit]";
     mes "\"Kekeke... excellent!  Yes, here goes your first spell, the flying backpack!  If you are overloaded, it will take the load off your shoulders.\"";
     next;
@@ -183,8 +183,8 @@ L_Q_magic_3:
         "Here you are.", -,
         "No.", L_main;
 
-    if (zeny < 20000) goto L_no20k;
-    set zeny, zeny - 20000;
+    if (Zeny < 20000) goto L_no20k;
+    set Zeny, Zeny - 20000;
     mes "[Earth Spirit]";
     mes "\"Yeees, good!  This one is a protection spell, making your skin harder.  You need a hard spike for it, though.  Hold that spike in your hands, and focus on it.\"";
     next;
diff --git a/world/map/npc/006-1/pachua.txt b/world/map/npc/006-1/pachua.txt
index fc2b27fd..6f25c42b 100644
--- a/world/map/npc/006-1/pachua.txt
+++ b/world/map/npc/006-1/pachua.txt
@@ -119,20 +119,20 @@ L_Chaps_store:
             "On second thought, maybe later.", L_NoDeal;
 
 L_BuyChaps:
-    if (zeny < 10000) goto L_NoMoney;
+    if (Zeny < 10000) goto L_NoMoney;
     if (countitem("JeansShorts") < 1) goto L_NoJeans;
     if (countitem("SnakeSkin") < 10) goto L_NoSkin;
-    set zeny, zeny - 10000;
+    set Zeny, Zeny - 10000;
     delitem "SnakeSkin", 10;
     delitem "JeansShorts", 1;
     getitem "JeansChaps", 1;
     goto L_DealDone;
 
 L_BuyCowboy:
-    if (zeny < 5000) goto L_NoMoney;
+    if (Zeny < 5000) goto L_NoMoney;
     if (countitem("FancyHat") < 1) goto L_NoFancy;
     if (countitem("SnakeSkin") < 2) goto L_NoSkin;
-    set zeny, zeny - 5000;
+    set Zeny, Zeny - 5000;
     delitem "SnakeSkin", 2;
     delitem "FancyHat", 1;
     set @temp,rand(2);
@@ -158,11 +158,11 @@ L_leather_patch:
         "That's too expensive!.", L_NoDeal;
 
     if (countitem("SnakeSkin") < 1) goto L_NoSkins;
-    if (zeny < @LEATHER_PATCH_PRICE) goto L_NoMoney;
+    if (Zeny < @LEATHER_PATCH_PRICE) goto L_NoMoney;
     getinventorylist;
     if (@inventorylist_count == 100 && countitem("SnakeSkin") > 1) goto L_TooMany;
 
-    set zeny, zeny - @LEATHER_PATCH_PRICE;
+    set Zeny, Zeny - @LEATHER_PATCH_PRICE;
     delitem "SnakeSkin", 1;
     getitem "LeatherPatch", 1;
     goto L_DealDone;
diff --git a/world/map/npc/007-1/voltain.txt b/world/map/npc/007-1/voltain.txt
index d2becc5a..eea17aad 100644
--- a/world/map/npc/007-1/voltain.txt
+++ b/world/map/npc/007-1/voltain.txt
@@ -99,7 +99,7 @@ state0:
     if (countitem("EmptyBottle") < @BOTTLE_NEEDED)
         goto L_NOT_ENOUGH;
     delitem "EmptyBottle", @BOTTLE_NEEDED;
-    set zeny, zeny + @BOTTLE_REWARD_GOLD;
+    set Zeny, Zeny + @BOTTLE_REWARD_GOLD;
     getexp @BOTTLE_REWARD_XP, 0;
     set $state, 1;
     mes "\"Thanks for the bottles. Much easier to carry liquid in them.\"";
@@ -117,7 +117,7 @@ menu
     if (countitem("BlackScorpionStinger") < @BLACK_SC_ST_NEEDED)
         goto L_NOT_ENOUGH;
     delitem "BlackScorpionStinger", @BLACK_SC_ST_NEEDED;
-    set zeny, zeny + @BLACK_SC_ST_REWARD_GOLD;
+    set Zeny, Zeny + @BLACK_SC_ST_REWARD_GOLD;
     getexp @BLACK_SC_ST_REWARD_XP, 0;
     set $state, 2;
     mes "\"Well, since you went to the trouble of getting me these here's a little something for your time...\"";
@@ -135,7 +135,7 @@ state2:
     if (countitem("BugLeg") < @BUGLEG_NEEDED)
         goto L_NOT_ENOUGH;
     delitem "BugLeg", @BUGLEG_NEEDED;
-    set zeny, zeny + @BUGLEG_REWARD_GOLD;
+    set Zeny, Zeny + @BUGLEG_REWARD_GOLD;
     getexp @BUGLEG_REWARD_XP, 0;
     set $state, 3;
     mes "\"Great! My potion is ready to poison the moub...I mean cure scorpion stings. \"";
@@ -169,7 +169,7 @@ state4:
         goto L_NOT_ENOUGH;
     delitem "MauveHerb", @HERBS_NEEDED;
     getexp @HERBS_REWARD_XP, 0;
-    set zeny, zeny + @HERBS_REWARD_GOLD;    
+    set Zeny, Zeny + @HERBS_REWARD_GOLD;    
     set $state, 5;
     mes "\"Great! Now I can thicken the potion! I will try directly.\"";
     goto L_Close;
@@ -186,7 +186,7 @@ state5:
         goto L_NOT_ENOUGH;
     delitem "RawLog", @RAWLOG_NEEDED;
     getexp @RAWLOG_REWARD_XP, 0;
-    set zeny, zeny + @RAWLOG_REWARD_GOLD;    
+    set Zeny, Zeny + @RAWLOG_REWARD_GOLD;    
     set $state, 6;
     mes "\"Great! Now I can thicken the potion! I will try directly.\"";
     goto L_Close;
@@ -203,7 +203,7 @@ state6:
         goto L_NOT_ENOUGH;
     delitem "RedApple", @REDAPPLE_NEEDED;
     getexp @REDAPPLE_REWARD_XP, 0;
-    set zeny, zeny + @REDAPPLE_REWARD_GOLD;    
+    set Zeny, Zeny + @REDAPPLE_REWARD_GOLD;    
     set $state,7;
     mes "\"Very well, this will be useful.\"";
     goto L_Close;
@@ -220,7 +220,7 @@ state7:
         goto L_NOT_ENOUGH;
     delitem "CobaltHerb", @HERBS_NEEDED;
     getexp @HERBS_REWARD_XP, 0;
-    set zeny, zeny + @HERBS_REWARD_GOLD;    
+    set Zeny, Zeny + @HERBS_REWARD_GOLD;    
     set $state, 8;
     mes "\"Great! Now I can go on with the ven-  the experiments for the welfare of humanity, i mean.\"";
     goto L_Close;
@@ -237,7 +237,7 @@ state8:
         goto L_NOT_ENOUGH;
     delitem "SnakeTongue", @SNAKETONGUE_NEEDED;
     getexp @SNAKETONGUE_REWARD_XP, 0;
-    set zeny, zeny + @SNAKETONGUE_REWARD_GOLD;    
+    set Zeny, Zeny + @SNAKETONGUE_REWARD_GOLD;    
     set $state, 9;
     mes "\"Excellent, now I can extract the venom to- uhm, nevermind. Thanks for your help.\"";
     goto L_Close;
@@ -254,7 +254,7 @@ state9:
         goto L_NOT_ENOUGH;
     delitem "AlizarinHerb", @HERBS_NEEDED;
     getexp @HERBS_REWARD_XP, 0;
-    set zeny, zeny + @HERBS_REWARD_GOLD;    
+    set Zeny, Zeny + @HERBS_REWARD_GOLD;    
     set $state, 10;
     mes "\"Great! Now I can thicken the potion! I will try directly.\"";
     goto L_Close;
@@ -273,7 +273,7 @@ state10:
         goto L_NOT_ENOUGH;
     delitem "Steak", @STEAK_NEEDED;
     getexp @STEAK_REWARD_XP, 0;
-    set zeny, zeny + @STEAK_REWARD_GOLD;    
+    set Zeny, Zeny + @STEAK_REWARD_GOLD;    
     set $state, 11;
     mes "\"Thanks a lot. I will really enjoy my meal.\"";
     goto L_Close;
@@ -291,7 +291,7 @@ state11:
         goto L_NOT_ENOUGH;
     delitem "Arrow", @ARROW_NEEDED;
     getexp @ARROW_REWARD_XP, 0;
-    set zeny, zeny + @ARROW_REWARD_GOLD;    
+    set Zeny, Zeny + @ARROW_REWARD_GOLD;    
     set $state, 12;
     mes "\"Thanks a lot. Now I feel more secure here in the outdoors.\"";
     goto L_Close;
@@ -308,7 +308,7 @@ state12:
         goto L_NOT_ENOUGH;
     delitem "GambogeHerb", @HERBS_NEEDED;
     getexp @HERBS_REWARD_XP, 0;
-    set zeny, zeny + @HERBS_REWARD_GOLD;    
+    set Zeny, Zeny + @HERBS_REWARD_GOLD;    
     set $state, 13;
     mes "\"Great! Now I can thicken the potion! I will try directly.\"";
     goto L_Close;
@@ -325,7 +325,7 @@ state13:
         goto L_NOT_ENOUGH;
     delitem "ChocolateCake", @CHOCOLATECAKE_NEEDED;
     getexp @CHOCOLATECAKE_REWARD_XP, 0;
-    set zeny, zeny + @CHOCOLATECAKE_REWARD_GOLD;    
+    set Zeny, Zeny + @CHOCOLATECAKE_REWARD_GOLD;    
     set $state, 0;
     mes "\"I love chocolate cakes. I wonder, if I can use my ven- \"";
     emotion EMOTE_EVIL;
diff --git a/world/map/npc/008-1/andra.txt b/world/map/npc/008-1/andra.txt
index 0ad3ab2a..a58e465a 100644
--- a/world/map/npc/008-1/andra.txt
+++ b/world/map/npc/008-1/andra.txt
@@ -5,7 +5,7 @@
     set @water_amount, 1;
     set @seeds_amount, 4;
     if ($@andra_status == 1) goto L_Planting;
-    if (baselevel < 30) goto L_TooYoung;
+    if (BaseLevel < 30) goto L_TooYoung;
     if (FLAGS & FLAG_ANDRA_HELPED) goto L_Return;
     mes "[Andra]";
     mes "\"Hello, my name is Andra. You see those nice trees? I planted every single one of them! I'm very proud of my work!\"";
diff --git a/world/map/npc/008-1/diryn.txt b/world/map/npc/008-1/diryn.txt
index d4d3698e..b238b497 100644
--- a/world/map/npc/008-1/diryn.txt
+++ b/world/map/npc/008-1/diryn.txt
@@ -35,50 +35,50 @@ L_Diryn_Yes:
     goto L_Clearvars;
 
 L_Diryn_Druid_Tree:
-    if (zeny < @cost_druidtree) goto L_NoMoney;
+    if (Zeny < @cost_druidtree) goto L_NoMoney;
     mes "[Diryn]";
     mes "\"Be fearless!\"";
-    set zeny, zeny - @cost_druidtree;
+    set Zeny, Zeny - @cost_druidtree;
     warp "005-1.gat",73,36;
     goto L_Clearvars;
 
 L_Diryn_Graveyard:
-    if (zeny < @cost_graveyard) goto L_NoMoney;
+    if (Zeny < @cost_graveyard) goto L_NoMoney;
     mes "[Diryn]";
     mes "\"Be fearless!\"";
-    set zeny, zeny - @cost_graveyard;
+    set Zeny, Zeny - @cost_graveyard;
     warp "027-1.gat",70,85;
     goto L_Clearvars;
 
 L_Diryn_Magic_House:
-    if (zeny < @cost_magichouse) goto L_NoMoney;
+    if (Zeny < @cost_magichouse) goto L_NoMoney;
     mes "[Diryn]";
     mes "\"Be fearless!\"";
-    set zeny, zeny - @cost_magichouse;
+    set Zeny, Zeny - @cost_magichouse;
     warp "013-1.gat",45,92;
     goto L_Clearvars;
 
 L_Diryn_Terranite:
-    if (zeny < @cost_terranitecave) goto L_NoMoney;
+    if (Zeny < @cost_terranitecave) goto L_NoMoney;
     mes "[Diryn]";
     mes "\"Be fearless!\"";
-    set zeny, zeny - @cost_terranitecave;
+    set Zeny, Zeny - @cost_terranitecave;
     warp "012-3.gat",445,65;
     goto L_Clearvars;
 
 L_Diryn_Tulimshar:
-    if (zeny < @cost_tulimshar) goto L_NoMoney;
+    if (Zeny < @cost_tulimshar) goto L_NoMoney;
     mes "[Diryn]";
     mes "\"Be fearless!\"";
-    set zeny, zeny - @cost_tulimshar;
+    set Zeny, Zeny - @cost_tulimshar;
     warp "001-1.gat",44,70;
     goto L_Clearvars;
 
 L_Diryn_Nivalis:
-    if (zeny < @cost_nivalis) goto L_NoMoney;
+    if (Zeny < @cost_nivalis) goto L_NoMoney;
     mes "[Diryn]";
     mes "\"Be fearless!\"";
-    set zeny, zeny - @cost_nivalis;
+    set Zeny, Zeny - @cost_nivalis;
     warp "020-1.gat",71,100;
     goto L_Clearvars;
 
diff --git a/world/map/npc/009-1/jack.txt b/world/map/npc/009-1/jack.txt
index c8a4e586..11ee259e 100644
--- a/world/map/npc/009-1/jack.txt
+++ b/world/map/npc/009-1/jack.txt
@@ -159,13 +159,13 @@ L_Shield_state_2:
     next;
     if (countitem("RawLog") < @RAWLOGS_AMOUNT)
         goto L_Not_enough_logs;
-    if (zeny < @SHIELD_COST)
+    if (Zeny < @SHIELD_COST)
         goto L_Not_enough_money;
     getinventorylist;
     if (@inventorylist_count == 100)
         goto L_TooMany;
     delitem "RawLog", @RAWLOGS_AMOUNT;
-    set zeny, zeny - @SHIELD_COST;
+    set Zeny, Zeny - @SHIELD_COST;
     getexp @QUEST_SHIELD_EXP, 0;
     getitem "WoodenShield", 1;
     set @Q_Woodenshield, 3;
diff --git a/world/map/npc/009-2/airlia.txt b/world/map/npc/009-2/airlia.txt
index 568582cc..3bc92277 100644
--- a/world/map/npc/009-2/airlia.txt
+++ b/world/map/npc/009-2/airlia.txt
@@ -72,7 +72,7 @@ L_Caretaker_first_reward:
         mes "[" + @LETTER_REWARD_GOLD_INITIAL + " GP]";
     if (@LETTER_REWARD_EXP_INITIAL > 0)
         mes "[" + @LETTER_REWARD_EXP_INITIAL + " experience points]";
-    set zeny, zeny + @LETTER_REWARD_GOLD_INITIAL;
+    set Zeny, Zeny + @LETTER_REWARD_GOLD_INITIAL;
     getexp @LETTER_REWARD_EXP_INITIAL, 0;
     set QUEST_Graveyard_Caretaker, @Q_STATUS_DELIVERED_FIRST_LETTER;
     close;
@@ -84,7 +84,7 @@ L_Caretaker_later_rewards:
         mes "[" + @LETTER_REWARD_GOLD + " GP]";
     if (@LETTER_REWARD_EXP > 0)
         mes "[" + @LETTER_REWARD_EXP + " experience points]";
-    set zeny, zeny + @LETTER_REWARD_GOLD;
+    set Zeny, Zeny + @LETTER_REWARD_GOLD;
     getexp @LETTER_REWARD_EXP, 0;
     set QUEST_Graveyard_Caretaker, @Q_STATUS_HAS_NO_NEW_LETTER;
     close;
@@ -204,7 +204,7 @@ L_Fetch_initial_reward:
     if (@FETCH_REWARD_EXP_INITIAL > 0)
         mes "[" + @FETCH_REWARD_EXP_INITIAL + " experience points]";
     delitem @FETCH_LABEL_INITIAL$, @FETCH_AMOUNT_INITIAL;
-    set zeny, zeny + @FETCH_REWARD_GOLD_INITIAL;
+    set Zeny, Zeny + @FETCH_REWARD_GOLD_INITIAL;
     getexp @FETCH_REWARD_EXP_INITIAL, 0;
     set QUEST_Airlia, @Q_STATUS_INITIAL_FETCH_REWARDED;
     next;
@@ -224,7 +224,7 @@ L_Fetch_later_rewards:
     if (@FETCH_REWARD_EXP > 0)
         mes "[" + @FETCH_REWARD_EXP + " experience points]";
     delitem @FETCH_LABEL$, @FETCH_AMOUNT;
-    set zeny, zeny + @FETCH_REWARD_GOLD;
+    set Zeny, Zeny + @FETCH_REWARD_GOLD;
     getexp @FETCH_REWARD_EXP, 0;
     close;
 
diff --git a/world/map/npc/009-2/alan.txt b/world/map/npc/009-2/alan.txt
index c08a7086..1715fe72 100644
--- a/world/map/npc/009-2/alan.txt
+++ b/world/map/npc/009-2/alan.txt
@@ -174,12 +174,12 @@ L_State_4:
     close;
 
 L_State_4_pay:
-    if (zeny < 10000)
+    if (Zeny < 10000)
         goto L_State_4_nocash;
     getinventorylist;
     if (@inventorylist_count == 100)
         goto L_State_4_TooMany;
-    set zeny, zeny - 10000;
+    set Zeny, Zeny - 10000;
     getitem "ForestBow", 1;
     set @Q_status, 5;
     callsub S_Update_Var;
diff --git a/world/map/npc/009-2/kfahr.txt b/world/map/npc/009-2/kfahr.txt
index a8837865..5be800b8 100644
--- a/world/map/npc/009-2/kfahr.txt
+++ b/world/map/npc/009-2/kfahr.txt
@@ -283,7 +283,7 @@ L_worm_see_bones:
         goto L_boneknife_quest_ip;
     if (@Q_status > @QS_KNIFE_QUEST)
         goto L_worm_continue2;
-    if (baselevel >= 40)
+    if (BaseLevel >= 40)
         goto L_boneknife_quest;
 
     mes "[Kfahr the Warrior]";
@@ -602,7 +602,7 @@ L_boneknife_quest:
         goto L_boneknife_quest_ip;
     if (@Q_status > @QS_KNIFE_QUEST)
         goto L_boneknife_quest_completed;
-    if (baselevel < 40)
+    if (BaseLevel < 40)
         goto L_boneknife_quest_tooweak;
 
     mes "[Kfahr the Warrior]";
@@ -847,7 +847,7 @@ L_golden_scorpion:
         "I need a golden scorpion stinger.", -;
     mes "[Kfahr the Warrior]";
     mes "\"A golden scorpion stinger?  Those are rare and valuable, I hope that you know that!\"";
-    if (baselevel < 60)
+    if (BaseLevel < 60)
         goto L_too_lowlevel_for_stinger;
     if (@Q_status < @QS_KNIFE_QUEST)
         goto L_golden_requires_knife_quest;
diff --git a/world/map/npc/009-2/lena.txt b/world/map/npc/009-2/lena.txt
index ee4cb7f5..e458eb74 100644
--- a/world/map/npc/009-2/lena.txt
+++ b/world/map/npc/009-2/lena.txt
@@ -8,7 +8,7 @@
     if (TMW_Quest == 43) goto L_Lena_Bandit_Leader_Fail;
     if (TMW_Quest == 42) goto L_Lena_Bandit_Leader;
     if (TMW_Quest == 41) goto L_Lena_Fairy_Hat;
-    if (TMW_Quest == 40) && (baselevel >= 30) goto L_Lena_Start;
+    if (TMW_Quest == 40) && (BaseLevel >= 30) goto L_Lena_Start;
 
     mes "[Lena]";
     mes "\"I got ambushed by a group of bandits and one of them stabbed me pretty good.  Hopefully I heal up soon so I can fight this menace.\"";
diff --git a/world/map/npc/009-2/nicholas.txt b/world/map/npc/009-2/nicholas.txt
index fbffd3e8..08fe98c2 100644
--- a/world/map/npc/009-2/nicholas.txt
+++ b/world/map/npc/009-2/nicholas.txt
@@ -180,40 +180,40 @@ L_NoMoney:
     close;
 
 L_YesKnight:
-    if (zeny < 10000)
+    if (Zeny < 10000)
         goto L_NoMoney;
     if ( (countitem("IronIngot")<3) || (countitem("Coal") < 6) )
         goto L_NoItem;
     getinventorylist;
     if (@inventorylist_count == 100)
         goto L_TooMany;
-    set zeny, zeny - 10000;
+    set Zeny, Zeny - 10000;
     delitem "IronIngot", 3;
     delitem "Coal", 6;
     getitem "KnightsHelmet", 1;
     goto L_Done;
 
 L_YesCrusade:
-    if (zeny < 10000) goto L_NoMoney;
+    if (Zeny < 10000) goto L_NoMoney;
     if ( (countitem("IronIngot")<6) || (countitem("Coal") < 12) )
         goto L_NoItem;
     getinventorylist;
     if (@inventorylist_count == 100)
         goto L_TooMany;
-    set zeny, zeny-10000;
+    set Zeny, Zeny-10000;
     delitem "IronIngot", 6;
     delitem "Coal", 12;
     getitem "CrusadeHelmet", 1;
     goto L_Done;
 
 L_YesWarlord:
-    if (zeny < 10000) goto L_NoMoney;
+    if (Zeny < 10000) goto L_NoMoney;
     if ( (countitem("IronIngot")<9) || (countitem("Coal") < 18) )
         goto L_NoItem;
     getinventorylist;
     if (@inventorylist_count == 100)
         goto L_TooMany;
-    set zeny, zeny-10000;
+    set Zeny, Zeny-10000;
     delitem "IronIngot", 9;
     delitem "Coal", 18;
     getitem "WarlordHelmet", 1;
@@ -243,7 +243,7 @@ L_YesShield:
         "Here you are!", -,
         "Where can I get a Leather Patch?", L_WhereLeather,
         "No way.", L_Pass;
-    if (zeny < 20000)
+    if (Zeny < 20000)
         goto L_ShieldNoZeny;
     if (countitem("InfantryHelmet") < 2)
         goto L_ShieldNoInfantry;
@@ -264,7 +264,7 @@ L_YesShield:
     delitem "LeatherPatch", 1;
     delitem "IronIngot", 6;
     delitem "Coal", 12;
-    set zeny, zeny - 20000;
+    set Zeny, Zeny - 20000;
 
     if (@Q_SHIELD_status < @SHIELD_COMPLETED)
         getexp @SHIELD_XP, 0;
@@ -332,7 +332,7 @@ L_SetzerQuest:
         "Here you are.", -,
         "Monster oil?  What's that?", L_ExplainMonsterOil,
         "HOW much?  Nevermind then!", L_Pass;
-    if (zeny < 50000)
+    if (Zeny < 50000)
         goto L_SetzerNoZeny;
     if ( (countitem("IronIngot") < 3) || (countitem("Coal") < 6) )
         goto L_SetzerNoIngot;
@@ -344,7 +344,7 @@ L_SetzerQuest:
 
     mes "[Nicholas]";
     mes "Nicholas takes the items, heats up your sword and pounds it with a heavy hammer.  As you watch, it turns thinner and flatter.  Finally he pours the monster oil over it, heats the metal up again and douses it in water.";
-    set zeny, zeny - 50000;
+    set Zeny, Zeny - 50000;
     delitem "IronIngot", 3;
     delitem "Coal", 6;
     delitem "MonsterOilPotion", 1;
diff --git a/world/map/npc/009-2/nurse.txt b/world/map/npc/009-2/nurse.txt
index b9be0a7d..7052edc0 100644
--- a/world/map/npc/009-2/nurse.txt
+++ b/world/map/npc/009-2/nurse.txt
@@ -80,7 +80,7 @@ L_Doctor:
     close;
 
 L_Heal:
-    if (baselevel > 20) goto L_NoHeal;
+    if (BaseLevel > 20) goto L_NoHeal;
     mes "[Nurse]";
     mes "\"Here, let me heal you.\"";
     next;
diff --git a/world/map/npc/009-2/olana.txt b/world/map/npc/009-2/olana.txt
index 3f5024f9..fe0e92e1 100644
--- a/world/map/npc/009-2/olana.txt
+++ b/world/map/npc/009-2/olana.txt
@@ -35,7 +35,7 @@
     mes "\"Hello. We don't usually get guests back here.\"";
     next;
     mes "\"My name is Olana and my father owns this inn. I live in Tulimshar, but came to Hurnscald on vacation with my two young daughters, Rossy and Julia.\"";
-    if (baselevel < @MinLevel) close;
+    if (BaseLevel < @MinLevel) close;
     next;
     mes "\"I let my two lovely girls play in the woods nearby but they haven't come back yet!\"";
     next;
@@ -90,7 +90,7 @@ L_See:
     mes "[Olana]";
     mes "\"Ohhh... How sweet... Sometimes Rossy impresses me with her kindness. Here... You are spending so much time helping us, and we give nothing back. Take this as a small reward.\"";
     getexp @Cherry_EXP, 0;
-    set zeny, zeny + @Cherry_Money;
+    set Zeny, Zeny + @Cherry_Money;
     set gotcherry, 1;
     goto L_Task;
 
@@ -168,7 +168,7 @@ L_Allergic:
     set Rossy_Quest, 12;
     mes "[Olana]";
     mes "\"Oh, how stupid I am! Here, take some of my money and buy Red Tulips instead, the same amount. Keep the flowers.\"";
-    set zeny, zeny + @Flower_Money;
+    set Zeny, Zeny + @Flower_Money;
     next;
     mes "\"Please, tell Rossy I am really sorry. My mind was on Julia when I asked you to bring the red roses, they are her favorite.\"";
     menu
@@ -207,7 +207,7 @@ L_Found:
         set Rossy_Quest, 19;
     mes "\"Thank you "+ strcharinfo(0) +", thank you! Here is a reward for you.\"";
     getexp @Finish_EXP, 0;
-    set zeny, zeny + @Finish_Money;
+    set Zeny, Zeny + @Finish_Money;
     if (Rossy_Quest == 19)
         goto L_Clear;
     close;
diff --git a/world/map/npc/009-2/peter.txt b/world/map/npc/009-2/peter.txt
index 10186d3b..6a97070f 100644
--- a/world/map/npc/009-2/peter.txt
+++ b/world/map/npc/009-2/peter.txt
@@ -17,7 +17,7 @@
     close;
 
 L_Peter_Chain_Mail:
-    if (zeny < 20000)
+    if (Zeny < 20000)
         goto L_Peter_NotEnough_Zeny;
     if (countitem("IronIngot") < 5)
         goto L_Peter_NotEnough_Ingot;
@@ -26,7 +26,7 @@ L_Peter_Chain_Mail:
     getinventorylist;
     if (@inventorylist_count == 100)
         goto L_Peter_TooMany;
-    set zeny, zeny - 20000;
+    set Zeny, Zeny - 20000;
     delitem "IronIngot", 5;
     getitem "ChainmailShirt", 1;
     mes "[Peter]";
@@ -34,7 +34,7 @@ L_Peter_Chain_Mail:
     close;
 
 L_Peter_Light_Plate:
-    if (zeny < 50000)
+    if (Zeny < 50000)
         goto L_Peter_NotEnough_Zeny;
     if (countitem("IronIngot") < 10)
         goto L_Peter_NotEnough_Ingot;
@@ -43,7 +43,7 @@ L_Peter_Light_Plate:
     getinventorylist;
     if (@inventorylist_count == 100)
         goto L_Peter_TooMany;
-    set zeny, zeny - 50000;
+    set Zeny, Zeny - 50000;
     delitem "IronIngot", 10;
     delitem "Coal", 20;
     getitem "LightPlatemail", 1;
@@ -52,7 +52,7 @@ L_Peter_Light_Plate:
     close;
 
 L_Peter_Warlord_Plate:
-    if (zeny < 100000)
+    if (Zeny < 100000)
         goto L_Peter_NotEnough_Zeny;
     if (countitem("IronIngot") < 15)
         goto L_Peter_NotEnough_Ingot;
@@ -61,7 +61,7 @@ L_Peter_Warlord_Plate:
     getinventorylist;
     if (@inventorylist_count == 100)
         goto L_Peter_TooMany;
-    set zeny, zeny - 100000;
+    set Zeny, Zeny - 100000;
     delitem "IronIngot", 15;
     delitem "Coal", 30;
     getitem "WarlordPlate", 1;
diff --git a/world/map/npc/009-2/waitress.txt b/world/map/npc/009-2/waitress.txt
index 550cd6c4..782426b2 100644
--- a/world/map/npc/009-2/waitress.txt
+++ b/world/map/npc/009-2/waitress.txt
@@ -14,36 +14,36 @@
     close;
 
 L_NoTip:
-    if (zeny < 170)
+    if (Zeny < 170)
         goto L_NoMoney;
     getinventorylist;
     if (@inventorylist_count == 100 && countitem("Beer") == 0)
         goto L_TooMany;
-    set zeny, zeny - 170;
+    set Zeny, Zeny - 170;
     getitem "Beer", 1;
     mes "[Melinda]";
     mes "Pff... nickel nurser!";
     close;
 
 L_5Tip:
-    if (zeny < 175)
+    if (Zeny < 175)
         goto L_NoMoney;
     getinventorylist;
     if (@inventorylist_count == 100 && countitem("Beer") == 0)
         goto L_TooMany;
-    set zeny, zeny - 175;
+    set Zeny, Zeny - 175;
     getitem "Beer", 1;
     mes "[Melinda]";
     mes "\"Here you go, sweetheart!\"";
     close;
 
 L_10Tip:
-    if (zeny < 180)
+    if (Zeny < 180)
         goto L_NoMoney;
     getinventorylist;
     if (@inventorylist_count == 100 && countitem("Beer") == 0)
         goto L_TooMany;
-    set zeny, zeny - 180;
+    set Zeny, Zeny - 180;
     getitem "Beer", 1;
     mes "[Melinda]";
     mes "\"Thank you, sweetie! Want to hear a secret?\"";
diff --git a/world/map/npc/010-2/chef.txt b/world/map/npc/010-2/chef.txt
index 9bc7e468..f5a6e8d5 100644
--- a/world/map/npc/010-2/chef.txt
+++ b/world/map/npc/010-2/chef.txt
@@ -68,10 +68,10 @@ L_lace_cupcake:
         goto L_no_orange;
     if (countitem ("MopoxCurePotion") < 1)
         goto L_no_potion;
-    if (zeny < 500)
-        goto L_no_zeny;
+    if (Zeny < 500)
+        goto L_no_Zeny;
 
-    set zeny, zeny - 500;
+    set Zeny, Zeny - 500;
     delitem "GingerBreadMan", 3;
     delitem "Orange", 1;
     delitem "MopoxCurePotion", 1;
@@ -106,7 +106,7 @@ L_no_orange:
     mes "\"Please bring me an orange for these cupcakes.\"";
     close;
 
-L_no_zeny:
+L_no_Zeny:
     mes "[Chef]";
     mes "";
     mes "\"No.  I need extra ingredients worth 500 GP, and I expect you to pay for those.\"";
diff --git a/world/map/npc/010-2/doug.txt b/world/map/npc/010-2/doug.txt
index 5bcd8fef..233490fa 100644
--- a/world/map/npc/010-2/doug.txt
+++ b/world/map/npc/010-2/doug.txt
@@ -97,7 +97,7 @@ L_Have:
     if(countitem("CaveSnakeLamp") < 20)
         goto L_State2;
     delitem "CaveSnakeLamp", 20;
-    set zeny, zeny + 5000;
+    set Zeny, Zeny + 5000;
     getexp 5000, 0;
     set CaveSnakeLamp, 2;
 
diff --git a/world/map/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt
index fd268230..c1d758f3 100644
--- a/world/map/npc/010-2/loratay.txt
+++ b/world/map/npc/010-2/loratay.txt
@@ -239,11 +239,11 @@ L_desert_hat:
         goto L_desert_hat_noheadband;
     if (countitem("CottonCloth") < 3)
         goto L_desert_hat_nocotton;
-    if (zeny < 300)
+    if (Zeny < 300)
         goto L_desert_hat_nogp;
     delitem @item, 1;
     delitem "CottonCloth", 3;
-    set zeny, zeny - 300;
+    set Zeny, Zeny - 300;
     getitem @genitem, 1;
     mes "[Lora Tay the Seamstress]";
     mes "\"Now then, this should only take a minute.\"";
@@ -307,14 +307,14 @@ L_trim:
         set @genitem, @item - 70;
     if (@genitem == 0)
         goto L_trim_impossible;
-    if (zeny < 100)
+    if (Zeny < 100)
         goto L_trim_nozeny;
     if (countitem(@delitem) < 1)
         goto L_main_menu;
 
     delitem @delitem, 1;
     getitem @genitem, 1;
-    set zeny, zeny - 100;
+    set Zeny, Zeny - 100;
     mes "[Lora Tay the Seamstress]";
     mes "";
     mes "\"There you are, dear.\"";
@@ -368,7 +368,7 @@ L_lengthen:
         set @genitem, @item + 70;
     if (@genitem == 0)
         goto L_lengthen_impossible;
-    if (zeny < 500)
+    if (Zeny < 500)
         goto L_lengthen_nozeny;
     if (countitem ("CottonCloth") < 1)
         goto L_lengthen_nocotton;
@@ -378,7 +378,7 @@ L_lengthen:
     delitem @delitem, 1;
     delitem "CottonCloth", 1;
     getitem @genitem, 1;
-    set zeny, zeny - 500;
+    set Zeny, Zeny - 500;
     mes "[Lora Tay the Seamstress]";
     mes "The seamstress cuts your piece of cotton cloth into stripes and sews them on.  Using some odd liquid, she flattens the seams and borders.";
     if (@delitem > 2000) // dyed
@@ -427,12 +427,12 @@ L_tanktop_menu:
 L_tanktop_short:
     if (countitem ("CottonCloth") < 5)
         goto L_tanktop_insufficient_cloth;
-    if (zeny < 1000)
-        goto L_tanktop_insufficient_zeny;
+    if (Zeny < 1000)
+        goto L_tanktop_insufficient_Zeny;
     getinventorylist;
     if (@inventorylist_count == 100 && countitem("CottonCloth") > 5)
         goto L_TooMany;
-    set zeny, zeny - 1000;
+    set Zeny, Zeny - 1000;
     delitem "CottonCloth", 5;
     getitem "ShortTankTop", 1;
     mes "[Lora Tay the Seamstress]";
@@ -446,12 +446,12 @@ L_tanktop_short:
 L_tanktop_long:
     if (countitem ("CottonCloth") < 6)
         goto L_tanktop_insufficient_cloth;
-    if (zeny < 1000)
-        goto L_tanktop_insufficient_zeny;
+    if (Zeny < 1000)
+        goto L_tanktop_insufficient_Zeny;
     getinventorylist;
     if (@inventorylist_count == 100 && countitem("CottonCloth") > 6)
         goto L_TooMany;
-    set zeny, zeny - 1000;
+    set Zeny, Zeny - 1000;
     delitem "CottonCloth", 6;
     getitem "TankTop", 1;
     mes "[Lora Tay the Seamstress]";
@@ -466,7 +466,7 @@ L_tanktop_insufficient_cloth:
     next;
     goto L_tanktop_menu;
 
-L_tanktop_insufficient_zeny:
+L_tanktop_insufficient_Zeny:
     mes "[Lora Tay the Seamstress]";
     mes "As you note that you don't have enough GP on you, Lora rolls her eyes.";
     mes "\"I don't work for free, you know.  I already gave you a discounted peasant price.\"";
@@ -517,12 +517,12 @@ L_robe_menu:
         "Very well then, here you are.", -;
     if (countitem("SilkCocoon") < @ROBE_COCOONS_NR)
         goto L_robe_missing_cocoons;
-    if (zeny < @ROBE_ZENY)
-        goto L_robe_missing_zeny;
+    if (Zeny < @ROBE_ZENY)
+        goto L_robe_missing_Zeny;
     getinventorylist;
     if (@inventorylist_count == 100 && countitem("SilkCocoon") > @ROBE_COCOONS_NR)
         goto L_TooMany;
-    set zeny, zeny - @ROBE_ZENY;
+    set Zeny, Zeny - @ROBE_ZENY;
     delitem "SilkCocoon", @ROBE_COCOONS_NR;
     getitem "SilkRobe", 1;
     mes "[Lora Tay the Seamstress]";
@@ -548,9 +548,9 @@ L_robe_missing_cocoons:
     next;
     goto L_main_menu;
 
-L_robe_missing_zeny:
+L_robe_missing_Zeny:
     mes "[Lora Tay the Seamstress]";
-    mes "\"No, no no.  The way this works is that you give me the GP first and I give you the robe afterwards.  You're " + (@ROBE_ZENY - zeny) + " GP short, so come back when you can afford the robe!\"";
+    mes "\"No, no no.  The way this works is that you give me the GP first and I give you the robe afterwards.  You're " + (@ROBE_ZENY - Zeny) + " GP short, so come back when you can afford the robe!\"";
     next;
     goto L_main_menu;
 
diff --git a/world/map/npc/011-1/alchemist.txt b/world/map/npc/011-1/alchemist.txt
index 3b76578f..35609063 100644
--- a/world/map/npc/011-1/alchemist.txt
+++ b/world/map/npc/011-1/alchemist.txt
@@ -143,7 +143,7 @@ L_iron_powder:
         "Here you are!", -;
     if (countitem("IronOre") < 1)
         goto L_iron_powder_noore;
-    if (zeny < 100)
+    if (Zeny < 100)
         goto L_iron_powder_nozeny;
     getinventorylist;
     if (@inventorylist_count == 100
@@ -151,7 +151,7 @@ L_iron_powder:
         && countitem("IronPowder") < 1)
             goto L_iron_powder_full;
     delitem "IronOre", 1;
-    set zeny, zeny - 100;
+    set Zeny, Zeny - 100;
     getitem "IronPowder", 4;
     mes "[Rauk the Alchemist]";
     mes "Rauk places your chunk of ore in a strange glass container, then pours a steaming yellow liquid over it.  Before your eyes, the ore dissolves.";
@@ -541,11 +541,11 @@ L_green:
         && countitem("CobaltHerb") > 20
         && countitem("GambogeHerb") > 20)
             goto L_TooMany;
-    if (zeny < 1000)
+    if (Zeny < 1000)
         goto L_green_fail;
     delitem "CobaltHerb", 20;
     delitem "GambogeHerb", 20;
-    set zeny, zeny - 1000;
+    set Zeny, Zeny - 1000;
     getitem "GreenDye", 1;
     goto L_ok;
 
@@ -583,12 +583,12 @@ L_orange:
         && countitem("GambogeHerb") > 10
         && countitem("IronOre") > 2)
             goto L_TooMany;
-    if (zeny < 1000)
+    if (Zeny < 1000)
         goto L_orange_fail;
     delitem "AlizarinHerb", 10;
     delitem "GambogeHerb", 10;
     delitem "IronOre", 2;
-    set zeny, zeny - 1000;
+    set Zeny, Zeny - 1000;
     getitem "OrangeDye", 1;
     goto L_ok;
 
@@ -610,7 +610,7 @@ L_pink:
         goto L_pink_fail;
     if (countitem("PinkPetal") < 6)
         goto L_pink_fail;
-    if (zeny < 1000)
+    if (Zeny < 1000)
         goto L_pink_fail;
     getinventorylist;
     if (@inventorylist_count == 100
@@ -619,7 +619,7 @@ L_pink:
             goto L_TooMany;
     delitem "AlizarinHerb", 10;
     delitem "PinkPetal", 6;
-    set zeny, zeny - 1000;
+    set Zeny, Zeny - 1000;
     getitem "PinkDye", 1;
     goto L_ok;
 
@@ -643,7 +643,7 @@ L_dark_blue:
         goto L_dark_blue_fail;
     if (countitem("Pearl") < 1)
         goto L_dark_blue_fail;
-    if (zeny < 10000)
+    if (Zeny < 10000)
         goto L_dark_blue_fail;
     getinventorylist;
     if (@inventorylist_count == 100
@@ -654,7 +654,7 @@ L_dark_blue:
     delitem "CobaltHerb", 100;
     delitem "MauveHerb", 50;
     delitem "Pearl", 1;
-    set zeny, zeny - 10000;
+    set Zeny, Zeny - 10000;
     getitem "DarkBlueDye", 1;
     goto L_ok;
 
@@ -688,13 +688,13 @@ L_purple:
         && countitem("MauveHerb") > 20
         && countitem("Pearl") > 1)
             goto L_TooMany;
-    if (zeny < 40000)
+    if (Zeny < 40000)
         goto L_purple_fail;
     delitem "CobaltHerb", 100;
     delitem "AlizarinHerb", 100;
     delitem "MauveHerb", 20;
     delitem "Pearl", 1;
-    set zeny, zeny - 40000;
+    set Zeny, Zeny - 40000;
     getitem "PurpleDye", 1;
     goto L_ok;
 
@@ -731,13 +731,13 @@ L_black:
         && countitem("GambogeHerb") > 40
         && countitem("MauveHerb") > 40)
             goto L_TooMany;
-    if (zeny < 20000)
+    if (Zeny < 20000)
         goto L_black_fail;
     delitem "CobaltHerb", 40;
     delitem "AlizarinHerb", 40;
     delitem "GambogeHerb", 40;
     delitem "MauveHerb", 40;
-    set zeny, zeny - 20000;
+    set Zeny, Zeny - 20000;
     getitem "BlackDye", 1;
     goto L_ok;
 
@@ -758,7 +758,7 @@ L_d_black:
     goto L_intermediate;
 
 L_dark_green:
-    if (baselevel < 30)
+    if (BaseLevel < 30)
         goto L_d_no_green;
     if (QUEST_clothdyer_knowsdye != @QUEST_HAS_SOLVED_DYE_PUZZLE)
         goto L_d_dark_green;
@@ -770,7 +770,7 @@ L_dark_green:
         goto L_dark_green_fail;
     if (countitem("MaggotSlime") < 1)
         goto L_dark_green_fail;
-    if (zeny < 1000)
+    if (Zeny < 1000)
         goto L_dark_green_fail;
     getinventorylist;
     if (@inventorylist_count == 100
@@ -783,7 +783,7 @@ L_dark_green:
     delitem "MauveHerb", 10;
     delitem "GambogeHerb", 10;
     delitem "MaggotSlime", 1;
-    set zeny, zeny - 1000;
+    set Zeny, Zeny - 1000;
     getitem "DarkGreenDye", 1;
     goto L_ok;
 
diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt
index d7666ea9..c6816eec 100644
--- a/world/map/npc/011-1/auldsbel.txt
+++ b/world/map/npc/011-1/auldsbel.txt
@@ -214,7 +214,7 @@ L_sulphur:
     close;
 
 L_sulphur_buy:
-    if (zeny < @cost)
+    if (Zeny < @cost)
         goto L_sulphur_nozeny;
     if (countitem("PileOfAsh") < 1)
         goto L_sulphur_noash;
@@ -224,7 +224,7 @@ L_sulphur_buy:
         && countitem("PileOfAsh") == 0)
             goto L_sulphur_noroom;
 
-    set zeny, zeny - @cost;
+    set Zeny, Zeny - @cost;
     delitem "PileOfAsh", 1;
     getitem "SulphurPowder", 5;
     mes "[Auldsbel the Wizard]";
@@ -548,9 +548,9 @@ L_Q_astralsoul_L:
     goto L_main_menu;
 
 L_Q_astralsoul_L1:
-    if (zeny < 11300)
+    if (Zeny < 11300)
         goto L_Q_astralsoul_nz;
-    set zeny, zeny - 11300;
+    set Zeny, Zeny - 11300;
     mes "[Auldsbel the Wizard]";
     mes "\"Okay, listen:\"";
     next;
@@ -671,7 +671,7 @@ L_make_mana_potion:
         "Here you are.", -,
         "I will look for those items.", L_main_menu,
         "I'm not interested.", L_Q_manaseed_touched_short;
-    if (zeny < 10000)
+    if (Zeny < 10000)
         goto L_make_mana_potion_missing;
     if (countitem("GambogeHerb") < 10)
         goto L_make_mana_potion_missing;
@@ -689,7 +689,7 @@ L_make_mana_potion:
             && countitem("BottleOfWater") > 1
             && countitem("ManaPotion") < 1)
                 goto L_mana_potion_toomuch;
-    set zeny, zeny - 10000;
+    set Zeny, Zeny - 10000;
     delitem "GambogeHerb", 10;
     delitem "MauveHerb", 20;
     delitem "Pearl", 1;
@@ -777,7 +777,7 @@ L_component_quest_0:
     if (countitem ("MauveHerb") < 20)
         goto L_component_quest_missing;
     delitem "MauveHerb", 20;
-    set zeny, zeny + 2500;
+    set Zeny, Zeny + 2500;
     mes "[Auldsbel the Wizard]";
     mes "\"Well done, my young friend!  Here are 2,500 GP to compensate you for your efforts.\"";
     mes "[You gain 250 experience points]";
@@ -810,7 +810,7 @@ L_component_quest_1:
     delitem "MediumHealingPotion", 3;
     delitem "IronPotion", 1;
     delitem "ConcentrationPotion", 1;
-    set zeny, zeny + 2500;
+    set Zeny, Zeny + 2500;
     mes "[Auldsbel the Wizard]";
     mes "\"Ah, excellent, excellent!  These are precisely what I needed.  Here are another 2,500 GP to compensate you for your efforts.\"";
     mes "[You gain 500 experience points]";
@@ -833,7 +833,7 @@ L_component_quest_2:
     if (countitem ("SilkCocoon") < 100)
         goto L_component_quest_missing;
     delitem "SilkCocoon", 100;
-    set zeny, zeny + 5000;
+    set Zeny, Zeny + 5000;
     mes "[Auldsbel the Wizard]";
     mes "\"Splendid, splendid!  Here are 5,000 GP for you.\"";
     mes "Auldsbel attempts to cram the cocoons into his pockets, with little success.  Finally he gives up and takes them into his hut.";
@@ -860,7 +860,7 @@ L_component_quest_3:
         goto L_component_quest_missing;
     delitem "RedScorpionStinger", 25;
     delitem "MaggotSlime", 25;
-    set zeny, zeny + 5000;
+    set Zeny, Zeny + 5000;
     mes "[Auldsbel the Wizard]";
     mes "\"Good " + @address$ + "!  Another 5,000 GP for you.\"";
     mes "\"I believe that I have figured out one possible way to integrate the tincture into the spell... I will let you know how that goes.\"";
@@ -896,7 +896,7 @@ L_component_quest_4:
     delitem "SnakeTongue", 20;
     delitem "CaveSnakeTongue", 20;
     delitem "MountainSnakeTongue", 20;
-    set zeny, zeny + 8000;
+    set Zeny, Zeny + 8000;
     mes "[Auldsbel the Wizard]";
     mes "\"8,000 GP should cover your efforts, I think.\"";
     mes "\"Now let's see if this works...\"";
@@ -929,7 +929,7 @@ L_component_quest_5:
     if (countitem ("GrassSnakeTongue") < 50)
         goto L_component_quest_missing;
     delitem "GrassSnakeTongue", 50;
-    set zeny, zeny + 10000;
+    set Zeny, Zeny + 10000;
     mes "[Auldsbel the Wizard]";
     mes "\"Excellent!  Here are 10,000 GP for you, and now let's see how this goes.\"";
     mes "[You gain 100,000 experience points]";
diff --git a/world/map/npc/013-2/apprentice.txt b/world/map/npc/013-2/apprentice.txt
index 0b4bfb47..2f7fa3ee 100644
--- a/world/map/npc/013-2/apprentice.txt
+++ b/world/map/npc/013-2/apprentice.txt
@@ -39,14 +39,14 @@ L_Beer:
         "No thanks", L_Beer_no;
 
 L_Beer_yes:
-    if (zeny < 175)
+    if (Zeny < 175)
         goto L_Low_money;
     getinventorylist;
     if (@inventorylist_count == 100
         && countitem("Beer") == 0)
             goto L_TooMany;
     getitem "Beer", 1;
-    set zeny, zeny - 175;
+    set Zeny, Zeny - 175;
     goto L_Finish;
 
 L_Beer_no:
@@ -64,14 +64,14 @@ L_Milk:
         "No thanks", L_Milk_no;
 
 L_Milk_yes:
-    if (zeny < 300)
+    if (Zeny < 300)
         goto L_Low_money;
     getinventorylist;
     if (@inventorylist_count == 100
         && countitem("Milk") == 0)
             goto L_TooMany;
     getitem "Milk", 1;
-    set zeny, zeny - 300;
+    set Zeny, Zeny - 300;
     goto L_Finish;
 
 L_Milk_no:
diff --git a/world/map/npc/014-1/wedding-officiator.txt b/world/map/npc/014-1/wedding-officiator.txt
index 617a99ae..75f31015 100644
--- a/world/map/npc/014-1/wedding-officiator.txt
+++ b/world/map/npc/014-1/wedding-officiator.txt
@@ -43,7 +43,7 @@ L_explain_marriage:
     goto L_main;
 
 L_get_married:
-    if (zeny < WEDDING_FEE)
+    if (Zeny < WEDDING_FEE)
         goto L_too_poor;
     if (BaseLevel < WEDDING_MIN_LEVEL)
         goto L_too_young;
@@ -84,7 +84,7 @@ L_get_married:
         "This is taking too long.", L_end,
         "No.", L_end;
 
-    if (zeny < WEDDING_FEE)
+    if (Zeny < WEDDING_FEE)
         goto L_too_poor;
     if (BaseLevel < WEDDING_MIN_LEVEL)
         goto L_too_young;
@@ -92,7 +92,7 @@ L_get_married:
     if (@inventorylist_count > 98)
         goto L_No_Room_For_Rings;
 
-    set zeny, zeny - WEDDING_FEE;
+    set Zeny, Zeny - WEDDING_FEE;
     getitem "WeddingRing", 1;
     getitem "WeddingRing", 1;
 
@@ -218,7 +218,7 @@ L_divorce_nomoney:
     close;
 
 L_do_divorce:
-    if (zeny < @divorce_cost)
+    if (Zeny < @divorce_cost)
         goto L_divorce_nomoney;
     if (divorce())
         goto L_DidDivorce;
@@ -232,7 +232,7 @@ L_do_divorce:
     close;
 
 L_DidDivorce:
-    set zeny, zeny - @divorce_cost;
+    set Zeny, Zeny - @divorce_cost;
 
     mes "[Wedding Officiator]";
     mes "After collecting her fee, Wendy licks her quill and writes down some notes.";
diff --git a/world/map/npc/020-1/KrickKrackKrock.txt b/world/map/npc/020-1/KrickKrackKrock.txt
index 6cbe6ac8..59f02370 100644
--- a/world/map/npc/020-1/KrickKrackKrock.txt
+++ b/world/map/npc/020-1/KrickKrackKrock.txt
@@ -31,8 +31,8 @@
 //     input @BET;
 //     if(@BET < 50 ) goto L_poor;
 //     if(@BET > 2000) goto L_Too_rich;
-//     if(zeny < @BET) goto L_No_Money;
-//     set zeny, zeny - @BET;
+//     if(Zeny < @BET) goto L_No_Money;
+//     set Zeny, Zeny - @BET;
 
 
 
@@ -64,7 +64,7 @@
 // L_Money:
 //     mes @NPC_NAME$;
 //     mes "\"Here is your money.\"";
-//     set zeny, zeny + (@BET*2);
+//     set Zeny, Zeny + (@BET*2);
 //     close;
 // L_Item:
 // //item
diff --git a/world/map/npc/020-1/rockscissor.txt b/world/map/npc/020-1/rockscissor.txt
index 7a558014..9cd8b757 100644
--- a/world/map/npc/020-1/rockscissor.txt
+++ b/world/map/npc/020-1/rockscissor.txt
@@ -35,8 +35,8 @@
 //     mes @NPC_name$;
 //     mes "\"How much money do you want to bet?\"";
 //     input @MONEY_BET;
-//     if(zeny < @MONEY_BET) goto L_poor;
-//     set zeny, zeny - @MONEY_BET;
+//     if(Zeny < @MONEY_BET) goto L_poor;
+//     set Zeny, Zeny - @MONEY_BET;
 
 // L_Start:
 //     if(@gamblerun == 3) goto L_finish;
@@ -92,7 +92,7 @@
 // L_Won:
 //     mes @NPC_name$;
 //     mes "\"Here is my money.\"";
-//     set zeny, zeny + @MONEY_BET*2;
+//     set Zeny, Zeny + @MONEY_BET*2;
 //     close;
 // }
 
diff --git a/world/map/npc/020-1/well.txt b/world/map/npc/020-1/well.txt
index b1e4947d..09ffbaeb 100644
--- a/world/map/npc/020-1/well.txt
+++ b/world/map/npc/020-1/well.txt
@@ -9,7 +9,7 @@
 //# When the npc in the well is detected they can be rescued by asking Miler
 //# for help.
 //#
-//# The experience reward given by Miler is 111 * Baselevel
+//# The experience reward given by Miler is 111 * BaseLevel
 //#
 //# used variables: QUEST_Nivalis_state Nibble4
 //############################################
diff --git a/world/map/npc/020-2/baktar.txt b/world/map/npc/020-2/baktar.txt
index 9c441417..c6603d43 100644
--- a/world/map/npc/020-2/baktar.txt
+++ b/world/map/npc/020-2/baktar.txt
@@ -184,7 +184,7 @@ L_DesertHat_Item:
     if(@Q_status & (1<<@BIT_DESERTHAT)) goto L_havealready;
     if (countitem("DesertHat") < 1) goto L_Noitem;
         delitem "DesertHat", 1;
-        set zeny, zeny + @MONEY_DESERTHAT;
+        set Zeny, Zeny + @MONEY_DESERTHAT;
         getexp @XP_DESERTHAT,0;
         set @Q_status, @Q_status | (1<<@BIT_DESERTHAT);
         callsub S_Update_Var;
@@ -193,7 +193,7 @@ L_DesertShirt_Item:
     if(@Q_status & (1<<@BIT_DESERTSHIRT)) goto L_havealready;
     if (countitem("DesertShirt") < 1) goto L_Noitem;
         delitem "DesertShirt", 1;
-        set zeny, zeny + @MONEY_DESERTSHIRT;
+        set Zeny, Zeny + @MONEY_DESERTSHIRT;
         getexp @XP_DESERTSHIRT,0;
         set @Q_status, @Q_status | (1<<@BIT_DESERTSHIRT);
         callsub S_Update_Var;
@@ -202,7 +202,7 @@ L_SerfHat_Item:
     if(@Q_status & (1<<@BIT_SERFHAT)) goto L_havealready;
     if (countitem("SerfHat") < 1) goto L_Noitem;
         delitem "SerfHat", 1;
-        set zeny, zeny + @MONEY_SERFHAT;
+        set Zeny, Zeny + @MONEY_SERFHAT;
         getexp @XP_SERFHAT,0;
         set @Q_status, @Q_status | (1<<@BIT_SERFHAT);
         callsub S_Update_Var;
@@ -211,7 +211,7 @@ L_tongue_Item:
     if(@Q_status & (1<<@BIT_MS_TONGUE)) goto L_havealready;
     if (countitem("MountainSnakeTongue") < 1) goto L_Noitem;
         delitem "MountainSnakeTongue", 1;
-        set zeny, zeny + @MONEY_MS_TONGUE;
+        set Zeny, Zeny + @MONEY_MS_TONGUE;
         getexp @XP_MS_TONGUE,0;
         set @Q_status, @Q_status | (1<<@BIT_MS_TONGUE);
         callsub S_Update_Var;
@@ -220,7 +220,7 @@ L_egg_Item:
     if(@Q_status & (1<<@BIT_MS_EGG)) goto L_havealready;
     if (countitem("MountainSnakeEgg") < 1) goto L_Noitem;
         delitem "MountainSnakeEgg", 1;
-        set zeny, zeny + @MONEY_MS_EGG;
+        set Zeny, Zeny + @MONEY_MS_EGG;
         getexp @XP_MS_EGG,0;
         set @Q_status, @Q_status | (1<<@BIT_MS_EGG);
         callsub S_Update_Var;
@@ -229,7 +229,7 @@ L_skin_Item:
     if(@Q_status & (1<<@BIT_SNAKESKIN)) goto L_havealready;
     if (countitem("SnakeSkin") < 1) goto L_Noitem;
         delitem "SnakeSkin", 1;
-        set zeny, zeny + @MONEY_SNAKESKIN;
+        set Zeny, Zeny + @MONEY_SNAKESKIN;
         getexp @XP_SNAKESKIN,0;
         set @Q_status, @Q_status | (1<<@BIT_SNAKESKIN);
         callsub S_Update_Var;
@@ -238,7 +238,7 @@ L_BugLegItem:
     if(@Q_status & (1<<@BIT_BUGLEG)) goto L_havealready;
     if (countitem("BugLeg") < 1) goto L_Noitem;
         delitem "BugLeg", 1;
-        set zeny, zeny + @MONEY_BUGLEG;
+        set Zeny, Zeny + @MONEY_BUGLEG;
         getexp @XP_BUGLEG,0;
         set @Q_status, @Q_status | (1<<@BIT_BUGLEG);
         callsub S_Update_Var;
diff --git a/world/map/npc/020-2/furquest.txt b/world/map/npc/020-2/furquest.txt
index 1420d2d7..26cccd26 100644
--- a/world/map/npc/020-2/furquest.txt
+++ b/world/map/npc/020-2/furquest.txt
@@ -125,7 +125,7 @@ L_State_0_9:
     mes "[Agostine, The Legendary Tailor]";
     mes "\"Oh! This is damn good! I feel a new man, my friend!\"";
     next;
-    set zeny, zeny + 500;
+    set Zeny, Zeny + 500;
     mes "[Agostine, The Legendary Tailor]";
     mes "\"This is a little reward for your help. Take 500 GP, my friend!\"";
     set QUEST_WG_state, 2;
@@ -221,10 +221,10 @@ L_State_5:
     close;
 
 L_State_5_pay:
-    if (zeny < 15000) goto L_State_5_nocash;
+    if (Zeny < 15000) goto L_State_5_nocash;
     getinventorylist;
     if (@inventorylist_count == 100) goto L_TooMany;
-    set zeny, zeny - 15000;
+    set Zeny, Zeny - 15000;
     getitem "WinterGloves", 1;
     set QUEST_WG_state, 6;
     mes "[Agostine, The Legendary Tailor]";
@@ -308,10 +308,10 @@ L_State_12:
     close;
 
 L_State_12_pay:
-    if (zeny < 15000) goto L_State_12_missing;
+    if (Zeny < 15000) goto L_State_12_missing;
     if (countitem("Boots") < 1) goto L_State_12_missing;
     // No inventory check needed, as boots are removed, opening a slot
-    set zeny, zeny - 15000;
+    set Zeny, Zeny - 15000;
     delitem "Boots", 1;
     getitem "FurBoots", 1;
     set QUEST_WG_state, 9;
diff --git a/world/map/npc/021-1/eurni.txt b/world/map/npc/021-1/eurni.txt
index 3575ab1f..16a2ea77 100644
--- a/world/map/npc/021-1/eurni.txt
+++ b/world/map/npc/021-1/eurni.txt
@@ -7,7 +7,7 @@
 
 L_Begin:
     if (BaseLevel < 10) goto L_TooYoung;
-    if (zeny < 10000) goto L_NoMoney;
+    if (Zeny < 10000) goto L_NoMoney;
 
     mes "[Eurni the Surgeon]";
     mes "\"Are you tired of being what you are?\"";
@@ -26,9 +26,9 @@ L_Begin:
     close;
 
 L_Change:
-    if (zeny < 10000)
+    if (Zeny < 10000)
         goto L_No_Money;
-    set zeny, zeny - 10000;
+    set Zeny, Zeny - 10000;
     changesex;
     close;
 
diff --git a/world/map/npc/021-2/bakery.txt b/world/map/npc/021-2/bakery.txt
index 76253c0f..bea20d9e 100644
--- a/world/map/npc/021-2/bakery.txt
+++ b/world/map/npc/021-2/bakery.txt
@@ -72,12 +72,12 @@ L_lace_chococake:
         goto L_lacking_ingredients;
     if (countitem("MopoxCurePotion") < 1)
         goto L_lacking_ingredients;
-    if (zeny < 400)
-        goto L_lacking_zeny;
+    if (Zeny < 400)
+        goto L_lacking_Zeny;
     delitem "MopoxCurePotion", 1;
     delitem "ChocolateBar", 10;
     getitem "LacedChocolateCake", 1;
-    set zeny, zeny - 400;
+    set Zeny, Zeny - 400;
 
     mes "[Riskim]";
     mes "";
@@ -91,7 +91,7 @@ L_lace_chococake:
     mes "\"Here you are.  I hope that this works.\"";
     close;
 
-L_lacking_zeny:
+L_lacking_Zeny:
     mes "[Riskim]";
     mes "";
     mes "\"I'm sorry, but I have to charge 400 GP.\"";
diff --git a/world/map/npc/021-2/government_building.txt b/world/map/npc/021-2/government_building.txt
index ab2a9214..dc2749b2 100644
--- a/world/map/npc/021-2/government_building.txt
+++ b/world/map/npc/021-2/government_building.txt
@@ -24,7 +24,7 @@ L_main_married:
 L_marry:
     if (BaseLevel < WEDDING_MIN_LEVEL)
         goto L_marry_too_young;
-    if (zeny < WEDDING_FEE)
+    if (Zeny < WEDDING_FEE)
         goto L_marry_too_poor;
 
     mes "[Estard]";
@@ -60,10 +60,10 @@ L_get_rings:
     mes "[Estard]";
     mes "\"Yes. They are " + WEDDING_FEE + " GP. That covers all administrative fees for the marriage.\"";
 
-    if (zeny < WEDDING_FEE)
+    if (Zeny < WEDDING_FEE)
         menu
             "Thanks anyways. I don't have enough with me.", -;
-    if (zeny >= WEDDING_FEE)
+    if (Zeny >= WEDDING_FEE)
         menu
             "I'll buy a pair.", L_get_rings_pay,
             "Thanks anyways.", -;
@@ -79,7 +79,7 @@ L_get_rings_pay:
 L_divorce:
     set @divorce_cost, DIVORCE_FEE_PER_LEVEL * BaseLevel;
 
-    if (zeny < @divorce_cost)
+    if (Zeny < @divorce_cost)
         goto L_divorce_not_enough;
 
     mes "[Estard]";
@@ -91,7 +91,7 @@ L_divorce:
     close;
 
 L_do_divorce:
-    if (zeny < @divorce_cost)
+    if (Zeny < @divorce_cost)
         goto L_not_enough_money;
 
     if (divorce())
@@ -104,7 +104,7 @@ L_do_divorce:
     close;
 
 L_divorce_done:
-    set zeny, zeny - @divorce_cost;
+    set Zeny, Zeny - @divorce_cost;
 
     mes "[Estard]";
     mes "\"You have been divorced. Come again.\"";
@@ -126,13 +126,13 @@ L_no_room_for_rings:
     close;
 
 S_give_rings:
-    if (zeny < WEDDING_FEE)
+    if (Zeny < WEDDING_FEE)
         goto L_not_enough_money;
     getinventorylist;
     if (@inventorylist_count > 98)
         goto L_no_room_for_rings;
 
-    set zeny, zeny - WEDDING_FEE;
+    set Zeny, Zeny - WEDDING_FEE;
     getitem "WeddingRing", 1;
     getitem "WeddingRing", 1;
     return;
@@ -187,9 +187,9 @@ L_Get_Party:
     close;
 
 L_Give_Party:
-    if (zeny < 10)
+    if (Zeny < 10)
         goto L_NotEnoughMoney;
-    set zeny, zeny - 10;
+    set Zeny, Zeny - 10;
     setskill @PARTY_SKILL, 1;
     mes "[Tathin]";
     mes "\"Here's your permit. You'll need to be invited by an existing member of a party to join it.\"";
@@ -208,9 +208,9 @@ L_Get_Make_Party:
     close;
 
 L_Give_Make_Party:
-    if (zeny < 50)
+    if (Zeny < 50)
         goto L_NotEnoughMoney;
-    set zeny, zeny - 50;
+    set Zeny, Zeny - 50;
     setskill @PARTY_SKILL, 2;
     mes "[Tathin]";
     mes "\"Here's your permit. You can create parties with the 'new' or 'create' commands on the Party tab in the client. Parties need to have unique names.\"";
diff --git a/world/map/npc/021-2/heathin.txt b/world/map/npc/021-2/heathin.txt
index e83ab281..acfff47f 100644
--- a/world/map/npc/021-2/heathin.txt
+++ b/world/map/npc/021-2/heathin.txt
@@ -6,22 +6,22 @@
     set @TARROW_REQ_COAL, 5;
     set @TARROW_REQ_GP, 3000;
 
-    if (HEATHIN_QUEST == 14) && (baselevel >= 80) goto L_Heathin_Terranite_Arrows_Trade;
-    if (HEATHIN_QUEST == 13) && (baselevel >= 80) goto L_Heathin_Terranite_Arrows_Ready;
-    if (HEATHIN_QUEST == 12) && (baselevel >= 80) goto L_Heathin_Terranite_Arrows_Forge;
-    if (HEATHIN_QUEST == 11) && (baselevel >= 80) goto L_Heathin_Terranite_Arrows;
-    if (HEATHIN_QUEST == 10) && (baselevel >= 80) goto L_Heathin_Terranite_Chest_Armor_Ready;
-    if (HEATHIN_QUEST == 9) && (baselevel >= 80) goto L_Heathin_Terranite_Chest_Armor_Forge;
-    if (HEATHIN_QUEST == 8) && (baselevel >= 80) goto L_Heathin_Terranite_Chest_Armor;
-    if (HEATHIN_QUEST == 7) && (baselevel >= 80) goto L_Heathin_Terranite_Legs_Ready;
-    if (HEATHIN_QUEST == 6) && (baselevel >= 80) goto L_Heathin_Terranite_Legs_Forge;
-    if (HEATHIN_QUEST == 5) && (baselevel >= 80) goto L_Heathin_Terranite_Legs;
-    if (HEATHIN_QUEST == 4) && (baselevel >= 80) goto L_Heathin_Terranite_Hood_Ready;
-    if (HEATHIN_QUEST == 3) && (baselevel >= 80) goto L_Heathin_Terranite_Hood_Forge;
-    if (HEATHIN_QUEST == 2) && (baselevel >= 80) goto L_Heathin_Terranite_Hood;
-    if (HEATHIN_QUEST == 2) && (baselevel >= 60)goto L_Heathin_Ring_Thanks;
-    if (HEATHIN_QUEST == 1) && (baselevel >= 60) goto L_Heathin_Ring_Award;
-    if (baselevel >= 60) goto L_Heathin_Start;
+    if (HEATHIN_QUEST == 14) && (BaseLevel >= 80) goto L_Heathin_Terranite_Arrows_Trade;
+    if (HEATHIN_QUEST == 13) && (BaseLevel >= 80) goto L_Heathin_Terranite_Arrows_Ready;
+    if (HEATHIN_QUEST == 12) && (BaseLevel >= 80) goto L_Heathin_Terranite_Arrows_Forge;
+    if (HEATHIN_QUEST == 11) && (BaseLevel >= 80) goto L_Heathin_Terranite_Arrows;
+    if (HEATHIN_QUEST == 10) && (BaseLevel >= 80) goto L_Heathin_Terranite_Chest_Armor_Ready;
+    if (HEATHIN_QUEST == 9) && (BaseLevel >= 80) goto L_Heathin_Terranite_Chest_Armor_Forge;
+    if (HEATHIN_QUEST == 8) && (BaseLevel >= 80) goto L_Heathin_Terranite_Chest_Armor;
+    if (HEATHIN_QUEST == 7) && (BaseLevel >= 80) goto L_Heathin_Terranite_Legs_Ready;
+    if (HEATHIN_QUEST == 6) && (BaseLevel >= 80) goto L_Heathin_Terranite_Legs_Forge;
+    if (HEATHIN_QUEST == 5) && (BaseLevel >= 80) goto L_Heathin_Terranite_Legs;
+    if (HEATHIN_QUEST == 4) && (BaseLevel >= 80) goto L_Heathin_Terranite_Hood_Ready;
+    if (HEATHIN_QUEST == 3) && (BaseLevel >= 80) goto L_Heathin_Terranite_Hood_Forge;
+    if (HEATHIN_QUEST == 2) && (BaseLevel >= 80) goto L_Heathin_Terranite_Hood;
+    if (HEATHIN_QUEST == 2) && (BaseLevel >= 60)goto L_Heathin_Ring_Thanks;
+    if (HEATHIN_QUEST == 1) && (BaseLevel >= 60) goto L_Heathin_Ring_Award;
+    if (BaseLevel >= 60) goto L_Heathin_Start;
 
     mes "[Heathin]";
     mes "\"Hello, friend.  I am Heathin, a smith of exotic metals. \"";
@@ -68,11 +68,11 @@ L_Heathin_Interested:
     close;
 
 L_Heathin_Ring_Award:
-    if ( (zeny < 100000)
+    if ( (Zeny < 100000)
         | (countitem ("Coal") < 50) )
             goto L_Heathin_Ring_Wait;
     set HEATHIN_QUEST, 2;
-    set zeny, zeny - 100000;
+    set Zeny, Zeny - 100000;
     delitem "Coal", 50;
     getitem "SimpleRing", 1;
     mes "[Heathin]";
@@ -131,14 +131,14 @@ L_Heathin_Terranite_Yes:
     close;
 
 L_Heathin_Terranite_Hood_Forge:
-    if ( (zeny < 200000)
+    if ( (Zeny < 200000)
         | (countitem("Coal") < 100)
         | (countitem("TerraniteOre") < 10) )
             goto L_Heathin_Terranite_Hood_Wait;
     set HEATHIN_QUEST, 4;
     delitem "Coal", 100;
     delitem "TerraniteOre", 10;
-    set zeny, zeny - 200000;
+    set Zeny, Zeny - 200000;
     mes "[Heathin]";
     mes "\"Great, you brought everything!  Come back later and I'll have the helm ready for you.\"";
     close;
@@ -164,14 +164,14 @@ L_Heathin_Terranite_Legs:
     close;
 
 L_Heathin_Terranite_Legs_Forge:
-    if ( (zeny < 400000)
+    if ( (Zeny < 400000)
         | (countitem("Coal") < 200)
         | (countitem("TerraniteOre") < 30) )
             goto L_Heathin_Terranite_Legs_Wait;
     set HEATHIN_QUEST, 7;
     delitem "Coal", 200;
     delitem "TerraniteOre", 30;
-    set zeny, zeny - 400000;
+    set Zeny, Zeny - 400000;
     mes "[Heathin]";
     mes "\"Great, you have brought everything!  Come back later and I will have those terranite pants ready for you.\"";
     close;
@@ -197,14 +197,14 @@ L_Heathin_Terranite_Chest_Armor:
     close;
 
 L_Heathin_Terranite_Chest_Armor_Forge:
-    if ( (zeny < 500000)
+    if ( (Zeny < 500000)
         | (countitem("Coal") < 250)
         | (countitem("TerraniteOre") < 40) )
             goto L_Heathin_Terranite_Chest_Armor_Wait;
     set HEATHIN_QUEST, 10;
     delitem "Coal", 250;
     delitem "TerraniteOre", 40;
-    set zeny, zeny - 500000;
+    set Zeny, Zeny - 500000;
     mes "[Heathin]";
     mes "\"Splendid, you have brought everything!  Come back later and I will have the terranite chest armor ready for you.\"";
     close;
@@ -245,14 +245,14 @@ L_Heathin_Terranite_Arrows_Yes:
     close;
 
 L_Heathin_Terranite_Arrows_Forge:
-    if ( (zeny < @TARROW_REQ_GP)
+    if ( (Zeny < @TARROW_REQ_GP)
         | (countitem("Coal") < @TARROW_REQ_COAL)
         | (countitem("TerraniteOre") < @TARROW_REQ_TERRA_ORE) )
             goto L_Heathin_Terranite_Arrows_Wait;
     set HEATHIN_QUEST, 13;
     delitem "Coal", @TARROW_REQ_COAL;
     delitem "TerraniteOre", @TARROW_REQ_TERRA_ORE;
-    set zeny, zeny - @TARROW_REQ_GP;
+    set Zeny, Zeny - @TARROW_REQ_GP;
     mes "[Heathin]";
     mes "\"Wonderful! You have everything I asked for.  I will start working on the arrows right away.\"";
     close;
@@ -283,13 +283,13 @@ L_Heathin_Terranite_Arrows_Trade_No:
     close;
 
 L_Heathin_Terranite_Arrows_Trade_Yes:
-    if ( (zeny < @TARROW_REQ_GP)
+    if ( (Zeny < @TARROW_REQ_GP)
         | (countitem("Coal") < @TARROW_REQ_COAL)
         | (countitem("TerraniteOre") < @TARROW_REQ_TERRA_ORE) )
             goto L_Heathin_Terranite_Arrows_Trade_Wait;
     delitem "Coal", @TARROW_REQ_COAL;
     delitem "TerraniteOre", @TARROW_REQ_TERRA_ORE;
-    set zeny, zeny - @TARROW_REQ_GP;
+    set Zeny, Zeny - @TARROW_REQ_GP;
     set @lucky, 5 * rand(readparam(bLuk));
     getitem "TerraniteArrow", 1000 + @lucky;
     mes "[Heathin]";
diff --git a/world/map/npc/021-2/inya.txt b/world/map/npc/021-2/inya.txt
index 1213246c..946bdb33 100644
--- a/world/map/npc/021-2/inya.txt
+++ b/world/map/npc/021-2/inya.txt
@@ -48,10 +48,10 @@ L_Inya_Add_RingGem:
     close;
 
 L_Inya_Remove_Diamond:
-    if ( (zeny < 500000)
+    if ( (Zeny < 500000)
         | (countitem ("DiamondRing") < 1) )
             goto L_Inya_Not_Enough;
-    set zeny, zeny - 500000;
+    set Zeny, Zeny - 500000;
     delitem "DiamondRing", 1;
     getitem "SimpleRing", 1;
     mes "[Inya]";
@@ -59,10 +59,10 @@ L_Inya_Remove_Diamond:
     close;
 
 L_Inya_Remove_Ruby:
-    if ( (zeny < 500000)
+    if ( (Zeny < 500000)
         | (countitem ("RubyRing") < 1) )
             goto L_Inya_Not_Enough;
-    set zeny, zeny - 500000;
+    set Zeny, Zeny - 500000;
     delitem "RubyRing", 1;
     getitem "SimpleRing", 1;
     mes "[Inya]";
@@ -70,10 +70,10 @@ L_Inya_Remove_Ruby:
     close;
 
 L_Inya_Remove_Emerald:
-    if ( (zeny < 500000)
+    if ( (Zeny < 500000)
         | (countitem ("EmeraldRing") < 1) )
             goto L_Inya_Not_Enough;
-    set zeny, zeny - 500000;
+    set Zeny, Zeny - 500000;
     delitem "EmeraldRing", 1;
     getitem "SimpleRing", 1;
     mes "[Inya]";
@@ -81,10 +81,10 @@ L_Inya_Remove_Emerald:
     close;
 
 L_Inya_Remove_Sapphire:
-    if ( (zeny < 500000)
+    if ( (Zeny < 500000)
         | (countitem ("SapphireRing") < 1) )
             goto L_Inya_Not_Enough;
-    set zeny, zeny - 500000;
+    set Zeny, Zeny - 500000;
     delitem "SapphireRing", 1;
     getitem "SimpleRing", 1;
     mes "[Inya]";
@@ -92,10 +92,10 @@ L_Inya_Remove_Sapphire:
     close;
 
 L_Inya_Remove_Topaz:
-    if ( (zeny < 500000)
+    if ( (Zeny < 500000)
         | (countitem ("TopazRing") < 1) )
             goto L_Inya_Not_Enough;
-    set zeny, zeny - 500000;
+    set Zeny, Zeny - 500000;
     delitem "TopazRing", 1;
     getitem "SimpleRing", 1;
     mes "[Inya]";
@@ -103,10 +103,10 @@ L_Inya_Remove_Topaz:
     close;
 
 L_Inya_Remove_Amethyst:
-    if ( (zeny < 500000)
+    if ( (Zeny < 500000)
         | (countitem ("AmethystRing") < 1) )
             goto L_Inya_Not_Enough;
-    set zeny, zeny - 500000;
+    set Zeny, Zeny - 500000;
     delitem "AmethystRing", 1;
     getitem "SimpleRing", 1;
     mes "[Inya]";
@@ -114,11 +114,11 @@ L_Inya_Remove_Amethyst:
     close;
 
 L_Inya_Add_Diamond:
-    if ( (zeny < 1000000)
+    if ( (Zeny < 1000000)
         | (countitem ("SimpleRing") < 1)
         | (countitem ("Diamond") < 1) )
             goto L_Inya_Not_Enough;
-    set zeny, zeny - 1000000;
+    set Zeny, Zeny - 1000000;
     delitem "SimpleRing", 1;
     delitem "Diamond", 1;
     getitem "DiamondRing", 1;
@@ -127,11 +127,11 @@ L_Inya_Add_Diamond:
     close;
 
 L_Inya_Add_Ruby:
-    if ( (zeny < 1000000)
+    if ( (Zeny < 1000000)
         | (countitem ("SimpleRing") < 1)
         | (countitem ("Ruby") < 1) )
             goto L_Inya_Not_Enough;
-    set zeny, zeny - 1000000;
+    set Zeny, Zeny - 1000000;
     delitem "SimpleRing", 1;
     delitem "Ruby", 1;
     getitem "RubyRing", 1;
@@ -140,11 +140,11 @@ L_Inya_Add_Ruby:
     close;
 
 L_Inya_Add_Emerald:
-    if ( (zeny < 1000000)
+    if ( (Zeny < 1000000)
         | (countitem ("SimpleRing") < 1)
         | (countitem ("Emerald") < 1) )
             goto L_Inya_Not_Enough;
-    set zeny, zeny - 1000000;
+    set Zeny, Zeny - 1000000;
     delitem "SimpleRing", 1;
     delitem "Emerald", 1;
     getitem "EmeraldRing", 1;
@@ -153,11 +153,11 @@ L_Inya_Add_Emerald:
     close;
 
 L_Inya_Add_Sapphire:
-    if ( (zeny < 1000000)
+    if ( (Zeny < 1000000)
         | (countitem ("SimpleRing") < 1)
         | (countitem ("Sapphire") < 1) )
             goto L_Inya_Not_Enough;
-    set zeny, zeny - 1000000;
+    set Zeny, Zeny - 1000000;
     delitem "SimpleRing", 1;
     delitem "Sapphire", 1;
     getitem "SapphireRing", 1;
@@ -166,11 +166,11 @@ L_Inya_Add_Sapphire:
     close;
 
 L_Inya_Add_Topaz:
-    if ( (zeny < 1000000)
+    if ( (Zeny < 1000000)
         | (countitem ("SimpleRing") < 1)
         | (countitem ("Topaz") < 1) )
             goto L_Inya_Not_Enough;
-    set zeny, zeny - 1000000;
+    set Zeny, Zeny - 1000000;
     delitem "SimpleRing", 1;
     delitem "Topaz", 1;
     getitem "TopazRing", 1;
@@ -179,11 +179,11 @@ L_Inya_Add_Topaz:
     close;
 
 L_Inya_Add_Amethyst:
-    if ( (zeny < 1000000)
+    if ( (Zeny < 1000000)
         | (countitem ("SimpleRing") < 1)
         | (countitem ("Amethyst") < 1) )
             goto L_Inya_Not_Enough;
-    set zeny, zeny - 1000000;
+    set Zeny, Zeny - 1000000;
     delitem "SimpleRing", 1;
     delitem "Amethyst", 1;
     getitem "AmethystRing", 1;
diff --git a/world/map/npc/021-2/jhedia.txt b/world/map/npc/021-2/jhedia.txt
index 9df2bab0..32f043f3 100644
--- a/world/map/npc/021-2/jhedia.txt
+++ b/world/map/npc/021-2/jhedia.txt
@@ -20,7 +20,7 @@
         goto L_Jhedia_NotEnough_Ore;
     if (countitem("Coal") < @Coal_Per * @ingot_count)
         goto L_Jhedia_NotEnough_Coal;
-    if (zeny < @Zeny_cost)
+    if (Zeny < @Zeny_cost)
         goto L_Jhedia_NotEnough_Zeny;
     getinventorylist;
     if (@inventorylist_count == 100
@@ -28,7 +28,7 @@
         && countitem("IronOre") > @ingot_count * @Iron_Ore_Per
         | countitem("Coal") > @ingot_count * @Coal_Per)
             goto L_Jhedia_NotEnoughSlots;
-    set zeny, zeny - @Zeny_cost;
+    set Zeny, Zeny - @Zeny_cost;
     delitem "IronOre", @ingot_count * @Iron_Ore_Per;
     delitem "Coal", @ingot_count * @Coal_Per;
     getitem "IronIngot", @ingot_count;
diff --git a/world/map/npc/025-1/rossy.txt b/world/map/npc/025-1/rossy.txt
index 8ff158b6..c468503f 100644
--- a/world/map/npc/025-1/rossy.txt
+++ b/world/map/npc/025-1/rossy.txt
@@ -250,7 +250,7 @@ L_Found:
     next;
     mes "Rossy hands you a huge bag full of coins.";
     getexp @Finish_EXP, 0;
-    set zeny, zeny + @Finish_Money;
+    set Zeny, Zeny + @Finish_Money;
     if (Rossy_Quest == 19)
         goto L_Clear;
 close;
diff --git a/world/map/npc/027-1/golbenez.txt b/world/map/npc/027-1/golbenez.txt
index 0d45c154..bc44e850 100644
--- a/world/map/npc/027-1/golbenez.txt
+++ b/world/map/npc/027-1/golbenez.txt
@@ -5,7 +5,7 @@
     mes "[Golbenez]";
     mes "\"Welcome mortal. I finished the creation of the place of leisure.\"";
     next;
-    if (baselevel < 60)
+    if (BaseLevel < 60)
         goto L_Weak;
     mes "\"I will bring you there for a small fee of " + @fee + "GP.\"";
     menu
@@ -16,9 +16,9 @@
     close;
 
 L_Warp:
-    if (zeny < @fee)
+    if (Zeny < @fee)
         goto L_No_Money;
-    set zeny, zeny - @fee;
+    set Zeny, Zeny - @fee;
     warp "027-2.gat", 105, 44;
     close;
 
diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt
index 5498aaf2..a8ba664b 100644
--- a/world/map/npc/029-3/parua.txt
+++ b/world/map/npc/029-3/parua.txt
@@ -15,18 +15,18 @@
          "Fine, here you go.", -;
     if ($@FIGHT_CAVE_STATUS == 1)
         goto L_AlreadyStarted;
-    if (zeny >= 20000 + 3000)
+    if (Zeny >= 20000 + 3000)
         goto L_CallPlayers;
 
 L_Paying:
     if (getareausers("029-3.gat", 20, 20, 70, 60) < 5)
         goto L_NotEnoughPlayers;
-    if (zeny < 20000)
+    if (Zeny < 20000)
         goto L_NotEnough;
 // Do not charge the money if the fight or the announces were already started by someone else
     if ($@FIGHT_CAVE_STATUS != 0)
         close;
-    set zeny, zeny - 20000;
+    set Zeny, Zeny - 20000;
 
 L_StartFight:
     if (getareausers("029-3.gat", 20, 20, 70, 60) < 5)
@@ -60,9 +60,9 @@ L_CallPlayers:
         close;
     if (getareausers("029-3.gat", 20, 20, 70, 60) < 5)
         goto L_NotEnoughPlayers;
-    if (zeny < 20000 + 3000)
+    if (Zeny < 20000 + 3000)
         goto L_NotEnough_Announce;
-    set zeny, zeny - (20000 + 3000);
+    set Zeny, Zeny - (20000 + 3000);
     set $@SPONSOR$, strcharinfo(0);
     set $@FIGHT_CAVE_STATUS, $@FIGHT_CAVE_STATUS + (@menu + 2);
     if ($@FIGHT_CAVE_STATUS == 3)
diff --git a/world/map/npc/032-1/miriam.txt b/world/map/npc/032-1/miriam.txt
index 852c8931..247a2a8b 100644
--- a/world/map/npc/032-1/miriam.txt
+++ b/world/map/npc/032-1/miriam.txt
@@ -7,7 +7,7 @@
 //  0  either fully completed the quests in here, or not started.
 //  1  you said the wrong words, she is insulted. (so you excuse and goto 2)
 //  2  waiting for the ingredients
-//  3  you brought the needed stuff. if you meet other criteria (baselevel, agi) you will be taught the skill
+//  3  you brought the needed stuff. if you meet other criteria (BaseLevel, agi) you will be taught the skill
 //  4  you have met the criteria of 3, but declined to take the speed test.
 //  5  you tried the quest but you failed
 // QUEST_MIRIAM_start
@@ -149,7 +149,7 @@ L_teach:
         goto L_heavyweight;
     if (@agi < 60)
         goto L_slow;
-    if (baselevel < 60)
+    if (BaseLevel < 60)
         goto L_lowlevel;
     if (countitem("SteelShield") > 0
         || countitem("WarlordHelmet") > 0
diff --git a/world/map/npc/033-1/birrod.txt b/world/map/npc/033-1/birrod.txt
index 916d4dc4..097cf26f 100644
--- a/world/map/npc/033-1/birrod.txt
+++ b/world/map/npc/033-1/birrod.txt
@@ -41,7 +41,7 @@ L_Kimarr:
     close;
 
 L_Hunting:
-    if (baselevel < @wolvern_level)
+    if (BaseLevel < @wolvern_level)
         goto L_Weak;
     mes "[Birrod]";
     mes "\"Hello, " + strcharinfo(0) + "! Would you like to prove your hunting skills again?\"";
diff --git a/world/map/npc/033-1/kimarr.txt b/world/map/npc/033-1/kimarr.txt
index 7d565001..fa7d6a47 100644
--- a/world/map/npc/033-1/kimarr.txt
+++ b/world/map/npc/033-1/kimarr.txt
@@ -158,9 +158,9 @@ L_Game:
     set $@Fluffy_Time, 180;
 
 //TODO: set minimum number of killed fluffies, here are some ideas
-//    set $@Fluffy_Min, (baselevel*7)/10;
-//    set $@Fluffy_Min, (baselevel*2)/3;
-//    set $@Fluffy_Min, (baselevel*3)/4;
+//    set $@Fluffy_Min, (BaseLevel*7)/10;
+//    set $@Fluffy_Min, (BaseLevel*2)/3;
+//    set $@Fluffy_Min, (BaseLevel*3)/4;
     set $@Fluffy_Min, 2;
     warp "033-1.gat", 79, 34;
     initnpctimer;
diff --git a/world/map/npc/033-1/yerrnk.txt b/world/map/npc/033-1/yerrnk.txt
index dfdfb4da..f166d1f5 100644
--- a/world/map/npc/033-1/yerrnk.txt
+++ b/world/map/npc/033-1/yerrnk.txt
@@ -121,7 +121,7 @@ L_Skill:
     goto L_Close;
 
 L_Task:
-    if (baselevel >= @yeti_level)
+    if (BaseLevel >= @yeti_level)
         goto L_Yeti;
     mes "[Yerrnk]";
     mes "\"Not at the moment.";
diff --git a/world/map/npc/042-1/hasan.txt b/world/map/npc/042-1/hasan.txt
index f658445e..11126e1e 100644
--- a/world/map/npc/042-1/hasan.txt
+++ b/world/map/npc/042-1/hasan.txt
@@ -38,7 +38,7 @@ L_Toll:
     if (hasan == 0)
         set hasan, 1;
     next;
-    if (zeny >= @toll)
+    if (Zeny >= @toll)
         menu
             "Ok, here you go.",L_Pay,
             "What? I don't have that much money!",L_NoPay,
@@ -58,14 +58,14 @@ L_Fight:
     mes "[Hasan]";
     mes "\"Do you really think you can beat me?\"";
     mes "He pulls out a nasty looking dagger and stabs it in your direction.";
-    set hp, 1;
+    set Hp, 1;
     mes "That hurt! You begin to think searching for a different solution might be healthier.";
     close;
 
 L_Pay:
-    if (zeny < @toll)
+    if (Zeny < @toll)
         goto L_Cheat;
-    set zeny, zeny - @toll;
+    set Zeny, Zeny - @toll;
     mes "He grins gloatingly.";
     mes "[Hasan]";
     mes "\"Very well. You may pass.\"";
@@ -151,9 +151,9 @@ L_Fear:
 
 L_Tut_Done:
     mes "[Hasan]";
-    if (baselevel >= 40)
+    if (BaseLevel >= 40)
         mes "\"Welcome to the suburbs of Tulimshar. I wonder what an experienced adventurer like you is doing here.\"";
-    if (baselevel < 40)
+    if (BaseLevel < 40)
         mes "\"Bah, nothing interesting is happening here.\"";
     close;
 
diff --git a/world/map/npc/042-1/kaan.txt b/world/map/npc/042-1/kaan.txt
index a51b17eb..ca35843f 100644
--- a/world/map/npc/042-1/kaan.txt
+++ b/world/map/npc/042-1/kaan.txt
@@ -66,7 +66,7 @@ L_Tanisha3:
     next;
     mes "\"Ah, I forgot. Without some money the bazaar is less fun I suppose.";
     mes "Here, take this.\"";
-    set zeny, zeny + 15;
+    set Zeny, Zeny + 15;
     next;
     mes "\"And Ian the trainer is hanging around there often. You should talk to him, he's a smart guy.\"";
     set kaan, 2;
diff --git a/world/map/npc/042-2/sorfina.txt b/world/map/npc/042-2/sorfina.txt
index f91d3068..ed426def 100644
--- a/world/map/npc/042-2/sorfina.txt
+++ b/world/map/npc/042-2/sorfina.txt
@@ -89,7 +89,7 @@ L_Clothes:
     mes "\"[Sorfina]\"";
     mes "\"And here is some money for you. At least you can buy yourself something to eat.";
     mes "Good luck!\"";
-    set zeny, zeny + 30;
+    set Zeny, Zeny + 30;
     set sorfina, 4;
     close;
 
@@ -227,7 +227,7 @@ L_SkipTut:
     set FLAGS, FLAGS | FLAG_TUTORIAL_DONE;
     getitem "Knife", 1;
     getitem "CottonShirt", 1;
-    set zeny, zeny + 50;
+    set Zeny, Zeny + 50;
     mes "Good luck.\"";
     close;
 
diff --git a/world/map/npc/042-2/tanisha.txt b/world/map/npc/042-2/tanisha.txt
index 3dd63db9..d9f60209 100644
--- a/world/map/npc/042-2/tanisha.txt
+++ b/world/map/npc/042-2/tanisha.txt
@@ -114,7 +114,7 @@ L_Money:
     mes "[Tanisha]";
     mes "\"Hey, you are so smart taking out all that yucky maggots for me.";
     mes "You can have my pocket money. Here.\"";
-    set zeny, zeny + 5;
+    set Zeny, Zeny + 5;
     next;
 
 L_Advice:
@@ -255,7 +255,7 @@ OnTick:
         goto L_Sleep;
     if (isdead())
         end;
-    if (hp > 20)
+    if (Hp > 20)
         end;
     heal MaxHp, 0;
     message strcharinfo(0), "Tanisha: You're doing good!";
diff --git a/world/map/npc/easter/2010/Doctor2.txt b/world/map/npc/easter/2010/Doctor2.txt
index 1a4b9f36..71b7ec70 100644
--- a/world/map/npc/easter/2010/Doctor2.txt
+++ b/world/map/npc/easter/2010/Doctor2.txt
@@ -186,15 +186,15 @@ L_At_Island_Scared:
 L_At_Island_Terror:
     mes "[Doctor]";
     mes "";
-    if (baselevel == 99)
+    if (BaseLevel == 99)
         mes "\"Really? Out of those I've detected here, I would have thought you'd be among the most skilled.\"";
-    if (baselevel >= 90 && baselevel <= 98)
+    if (BaseLevel >= 90 && BaseLevel <= 98)
         mes "\"Er, um? I'm so sorry, I had assumed you were more than capable for this sort of thing.";
-    if (baselevel >= 70 && baselevel <= 89)
+    if (BaseLevel >= 70 && BaseLevel <= 89)
         mes "\"Please excuse me, but I had sensed you were stronger than that.\"";
-    if (baselevel >= 50 && baselevel <= 69)
+    if (BaseLevel >= 50 && BaseLevel <= 69)
         mes "\"Ah... well, I have seen others here, too. Perhaps you could work together?\"";
-    if (baselevel <= 49)
+    if (BaseLevel <= 49)
         mes "\"Don't lose hope, you're not alone in all this. We'll get through it.\"";
     next;
     menu "I don't know what to say...", -,
diff --git a/world/map/npc/easter/2010/Doctor4.txt b/world/map/npc/easter/2010/Doctor4.txt
index dcbe7481..fde80fca 100644
--- a/world/map/npc/easter/2010/Doctor4.txt
+++ b/world/map/npc/easter/2010/Doctor4.txt
@@ -401,7 +401,7 @@ L_lens_directdamage:
     if (@mod == 1) mes "You barely manage to dive out of the way as the yellow flash sharply hisses through a space which, until a few moments ago, you had occupied...";
     if (@mod == 0) mes "The light burns all around you, with a strong sensation as if you were crushed under a great weight...";
     if (@mod == 0) itemheal readparam(bVit) * readparam(bVit) / 12 - 820, 0;
-    if (hp < 1) close;
+    if (Hp < 1) close;
     set @mod, 1;
 
 L_lens_auto_alter_texture_dry:
diff --git a/world/map/npc/functions/banker.txt b/world/map/npc/functions/banker.txt
index 4b9e7050..863f3ce1 100644
--- a/world/map/npc/functions/banker.txt
+++ b/world/map/npc/functions/banker.txt
@@ -58,62 +58,62 @@ L_Dep_Input:
     goto L_Nev;
 
 L_Dep_5k:
-    if (zeny<5000)
+    if (Zeny<5000)
         goto L_NoMoney;
     set @Amount, 5000;
     goto L_Dep_Continue;
 
 L_Dep_10k:
-    if (zeny<10000)
+    if (Zeny<10000)
         goto L_NoMoney;
     set @Amount, 10000;
     goto L_Dep_Continue;
 
 L_Dep_25k:
-    if (zeny<25000)
+    if (Zeny<25000)
         goto L_NoMoney;
     set @Amount, 25000;
     goto L_Dep_Continue;
 
 L_Dep_50k:
-    if (zeny<50000)
+    if (Zeny<50000)
         goto L_NoMoney;
     set @Amount, 50000;
     goto L_Dep_Continue;
 
 L_Dep_100k:
-    if (zeny<100000)
+    if (Zeny<100000)
         goto L_NoMoney;
     set @Amount, 100000;
     goto L_Dep_Continue;
 
 L_Dep_250k:
-    if (zeny<250000)
+    if (Zeny<250000)
         goto L_NoMoney;
     set @Amount, 250000;
     goto L_Dep_Continue;
 
 L_Dep_500k:
-    if (zeny<500000)
+    if (Zeny<500000)
         goto L_NoMoney;
     set @Amount, 500000;
     goto L_Dep_Continue;
 
 L_Dep_1kk:
-    if (zeny<1000000)
+    if (Zeny<1000000)
         goto L_NoMoney;
     set @Amount, 1000000;
     goto L_Dep_Continue;
 
 L_Dep_All:
-    if (zeny<1)
+    if (Zeny<1)
         goto L_NoMoney;
-    set @Amount, zeny;
+    set @Amount, Zeny;
 
 L_Dep_Continue:
-    if (zeny < @Amount)
+    if (Zeny < @Amount)
         goto L_NoMoney;
-    set zeny, zeny - @Amount;
+    set Zeny, Zeny - @Amount;
     set #BankAccount, #BankAccount + @Amount;
     goto L_Balance;
 
@@ -204,7 +204,7 @@ L_With_All:
 L_With_Continue:
     if (#BankAccount < @Amount)
         goto L_NoMoney;
-    set zeny, zeny + @Amount;
+    set Zeny, Zeny + @Amount;
     set #BankAccount, #BankAccount - @Amount;
     goto L_Balance;
 
diff --git a/world/map/npc/functions/clear_vars.txt b/world/map/npc/functions/clear_vars.txt
index 04af3e40..eed42a44 100644
--- a/world/map/npc/functions/clear_vars.txt
+++ b/world/map/npc/functions/clear_vars.txt
@@ -108,16 +108,16 @@ function|script|ClearVariables|{
     return;
 
 FixBank:
-    if (zeny >= -#BankAccount)
+    if (Zeny >= -#BankAccount)
         goto L_Fix_Full;
 
     // Partial fix
-    set #BankAccount, #BankAccount + zeny;
-    set zeny, 0;
+    set #BankAccount, #BankAccount + Zeny;
+    set Zeny, 0;
     return;
 
 L_Fix_Full:
-    set zeny, zeny + #BankAccount;
+    set Zeny, Zeny + #BankAccount;
     set #BankAccount, 0;
     return;
 //Tulimshar and Mine Variables
diff --git a/world/map/npc/functions/dailyquest.txt b/world/map/npc/functions/dailyquest.txt
index b984050e..83de4f0c 100644
--- a/world/map/npc/functions/dailyquest.txt
+++ b/world/map/npc/functions/dailyquest.txt
@@ -66,7 +66,7 @@ L_Trade:
         goto L_Not_Enough;
     delitem @dq_name$, @dq_count;
 
-    set zeny, zeny + @dq_money;
+    set Zeny, Zeny + @dq_money;
     getexp @dq_exp, 0;
 
     set DailyQuestPoints, DailyQuestPoints - @dq_cost;
diff --git a/world/map/npc/functions/debug.txt b/world/map/npc/functions/debug.txt
index 2a5aadd4..0f1eb727 100644
--- a/world/map/npc/functions/debug.txt
+++ b/world/map/npc/functions/debug.txt
@@ -23,11 +23,11 @@ L_Level:
         goto L_Leveltoohigh;
     if (@lvl < 1)
         goto L_Leveltoolow;
-    if (Baselevel == @lvl)
+    if (BaseLevel == @lvl)
         goto L_Samelvl;
     set BaseLevel, @lvl;
     resetstatus;
-    message strcharinfo(0), "New level: " + Baselevel;
+    message strcharinfo(0), "New level: " + BaseLevel;
     goto L_Begin;
 
 L_Samelvl:
diff --git a/world/map/npc/functions/evil_obelisk.txt b/world/map/npc/functions/evil_obelisk.txt
index d7373bae..30fe927d 100644
--- a/world/map/npc/functions/evil_obelisk.txt
+++ b/world/map/npc/functions/evil_obelisk.txt
@@ -14,15 +14,15 @@ function|script|EvilObelisk|{
     return;
 
 L_JACKO:
-    if (zeny < 200000)
+    if (Zeny < 200000)
         goto L_NotEnough;
-    set zeny, zeny - 200000;
+    set Zeny, Zeny - 200000;
     set @mob_id, 1022;
     set @mob_count, rand(2) + 1;
     goto L_Summon;
 
 L_GRAVEYARD1:
-    if (zeny < 100000)
+    if (Zeny < 100000)
         goto L_NotEnough;
     set @temp, rand(2);
     if(@temp == 0)
@@ -30,11 +30,11 @@ L_GRAVEYARD1:
     if(@temp == 1)
         set @mob_id, 1045;  // Fallen
     set @mob_count, rand(2) + 1;
-    set zeny, zeny - 100000;
+    set Zeny, Zeny - 100000;
     goto L_Summon;
 
 L_GRAVEYARD2:
-    if (zeny < 75000)
+    if (Zeny < 75000)
         goto L_NotEnough;
     set @temp, rand(2);
     if(@temp == 0)
@@ -42,11 +42,11 @@ L_GRAVEYARD2:
     if(@temp == 1)
         set @mob_id, 1043;  // Normal Skelly
     set @mob_count, rand(2) + 1;
-    set zeny, zeny - 75000;
+    set Zeny, Zeny - 75000;
     goto L_Summon;
 
 L_SKULL:
-    if (zeny < 50000)
+    if (Zeny < 50000)
         goto L_NotEnough;
     set @temp, rand(2);
     if(@temp == 0)
@@ -54,11 +54,11 @@ L_SKULL:
     if(@temp == 1)
         set @mob_id, 1023;  // Fire
     set @mob_count, rand(4) + 1;
-    set zeny, zeny - 50000;
+    set Zeny, Zeny - 50000;
     goto L_Summon;
 
 L_SNAKE:
-    if (zeny < 25000)
+    if (Zeny < 25000)
         goto L_NotEnough;
     set @temp, rand(4);
     if(@temp == 0)
@@ -70,7 +70,7 @@ L_SNAKE:
     if(@temp == 3)
         set @mob_id, 1021;  // Cave
     set @mob_count, rand(4) + 1;
-    set zeny, zeny - 25000;
+    set Zeny, Zeny - 25000;
     goto L_Summon;
 
 L_Summon:
diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt
index 50ad9038..26da871d 100644
--- a/world/map/npc/functions/ferry.txt
+++ b/world/map/npc/functions/ferry.txt
@@ -33,30 +33,30 @@ L_MenuWithCandor:
 L_Tulimshar:
     if (@loc == DOCK_tulimshar)
         goto L_AlreadyThere;
-    if (zeny < @cost_tulimshar)
+    if (Zeny < @cost_tulimshar)
         goto L_NotEnoughGP;
 
-    set zeny, zeny - @cost_tulimshar;
+    set Zeny, Zeny - @cost_tulimshar;
     warp "022-1.gat", 76, 72;
     close;
 
 L_Hurnscald:
     if (@loc == DOCK_hurnscald)
         goto L_AlreadyThere;
-    if (zeny < @cost_hurnscald)
+    if (Zeny < @cost_hurnscald)
         goto L_NotEnoughGP;
 
-    set zeny, zeny - @cost_hurnscald;
+    set Zeny, Zeny - @cost_hurnscald;
     warp "008-1.gat", 137, 64;
     close;
 
 L_Candor:
     if (@loc == DOCK_candor)
         goto L_AlreadyThere;
-    if (zeny < @cost_candor)
+    if (Zeny < @cost_candor)
         goto L_NotEnoughGP;
 
-    set zeny, zeny - @cost_candor;
+    set Zeny, Zeny - @cost_candor;
     warp "029-1.gat", 25, 37;
     close;
 
diff --git a/world/map/npc/functions/inn.txt b/world/map/npc/functions/inn.txt
index b778669f..85df4122 100644
--- a/world/map/npc/functions/inn.txt
+++ b/world/map/npc/functions/inn.txt
@@ -8,9 +8,9 @@ function|script|Inn|{
         "Yes", -,
         "No", L_No;
 
-    if (zeny < @cost)
+    if (Zeny < @cost)
         goto L_NoMoney;
-    set zeny, zeny - @cost;
+    set Zeny, Zeny - @cost;
     heal 10000, 10000;
 
     mes "[" + @npcname$ + "]";
diff --git a/world/map/npc/functions/water_bottle.txt b/world/map/npc/functions/water_bottle.txt
index 02dc35b2..e88c5965 100644
--- a/world/map/npc/functions/water_bottle.txt
+++ b/world/map/npc/functions/water_bottle.txt
@@ -13,7 +13,7 @@ function|script|WaterBottle|{
 
     if (@empty < @count)
         goto L_NotEnoughBottles;
-    if (zeny < @cost)
+    if (Zeny < @cost)
         goto L_NotEnoughMoney;
     getinventorylist;
     if (@inventorylist_count == 100
@@ -21,7 +21,7 @@ function|script|WaterBottle|{
         && @empty > @count)
             goto L_NotEnoughSlots;
 
-    set zeny, zeny - @cost;
+    set Zeny, Zeny - @cost;
     delitem "EmptyBottle", @count;
     getitem "BottleOfWater", @count;
     close;
diff --git a/world/map/npc/halloween/2009/Candyman.txt b/world/map/npc/halloween/2009/Candyman.txt
index 4e98788c..d0b4e24d 100644
--- a/world/map/npc/halloween/2009/Candyman.txt
+++ b/world/map/npc/halloween/2009/Candyman.txt
@@ -241,7 +241,7 @@ L_PvP_Done:
     mes "[20 000 experience points!]";
     mes "[20 000 gp!]";
     getexp 20000, 0;
-    set zeny, zeny + 20000;
+    set Zeny, Zeny + 20000;
     set Candyman, @STATE_FINISHED;
 
     mes "";
diff --git a/world/map/npc/xmas/2009/event.txt b/world/map/npc/xmas/2009/event.txt
index 21c91642..2cb390c2 100644
--- a/world/map/npc/xmas/2009/event.txt
+++ b/world/map/npc/xmas/2009/event.txt
@@ -85,7 +85,7 @@ L_Give:
     mes "[You received 20,000 experience points!]";
     mes "[You received 20,000 gold!]";
     getexp 20000, 0;
-    set zeny, zeny + 20000;
+    set Zeny, Zeny + 20000;
     set QUEST_Christmas09_state, 1;
     close;
 
diff --git a/world/map/npc/xmas/2010/golbanez.txt b/world/map/npc/xmas/2010/golbanez.txt
index f5a0e01b..8d7b3e02 100644
--- a/world/map/npc/xmas/2010/golbanez.txt
+++ b/world/map/npc/xmas/2010/golbanez.txt
@@ -192,7 +192,7 @@ L_Done_White:
 Glb_money:
 	input @Give;
 	if (@Give <= 0) close;
-	if (zeny < @Give) goto Glb_Inn_NotEnoughZeny;
+	if (Zeny < @Give) goto Glb_Inn_NotEnoughZeny;
 	goto Golbenez_pay;
 
 Glb_checkGlAn:
@@ -237,7 +237,7 @@ Golbenez_an:
 Golbenez_pay:
 	set Golbenez_Inn_Cost, Golbenez_Inn_Cost + @Give;
 	set $Golbenez_Inn_Cost, $Golbenez_Inn_Cost + @Give;
-	set zeny, zeny - @Give;
+	set Zeny, Zeny - @Give;
 	goto Glb_checkGlAn;
 
 Golbenez_pay_presents: