Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4

- Consolidated case in remaining variables, labels, constants.

Signed-off-by: Haru <haru@dotalux.com>

30 files changed, 213 insertions, 213 deletions

diff --git a/npc/custom/battleground/bg_common.txt b/npc/custom/battleground/bg_common.txt
index f24e1e5a8..895191961 100644
--- a/npc/custom/battleground/bg_common.txt
+++ b/npc/custom/battleground/bg_common.txt
@@ -136,14 +136,14 @@ bat_room,160,140,3	script	Prince Croix	4_M_CRU_CRUA,{
 // Time calculation Function
 // *********************************************************************
 function	script	Time2Str	{
-	set .@Time_Left, getarg(0) - gettimetick(2);
+	set .@time_left, getarg(0) - gettimetick(2);
 	
-	set .@Days, .@Time_Left / 86400;
-	set .@Time_Left, .@Time_Left - (.@Days * 86400);
-	set .@Hours, .@Time_Left / 3600;
-	set .@Time_Left, .@Time_Left - (.@Hours * 3600);
-	set .@Minutes, .@Time_Left / 60;
-	set .@Time_Left, .@Time_Left - (.@Minutes * 60);
+	set .@Days, .@time_left / 86400;
+	set .@time_left, .@time_left - (.@Days * 86400);
+	set .@Hours, .@time_left / 3600;
+	set .@time_left, .@time_left - (.@Hours * 3600);
+	set .@Minutes, .@time_left / 60;
+	set .@time_left, .@time_left - (.@Minutes * 60);
 	
 	set .@Time$, "";
 	if( .@Days > 1 )
@@ -161,10 +161,10 @@ function	script	Time2Str	{
 	else if( .@Minutes > 0 )
 		set .@Time$, .@Time$ + .@Minutes + " minute, ";
 
-	if( .@Time_Left > 1 || .@Time_Left == 0 )
-		set .@Time$, .@Time$ + .@Time_Left + " seconds.";
-	else if( .@Time_Left == 1 )
-		set .@Time$, .@Time$ + .@Time_Left + " second.";
+	if( .@time_left > 1 || .@time_left == 0 )
+		set .@Time$, .@Time$ + .@time_left + " seconds.";
+	else if( .@time_left == 1 )
+		set .@Time$, .@Time$ + .@time_left + " second.";
 	
 	return .@Time$;
 }
@@ -1292,12 +1292,12 @@ bat_room,160,150,3	script	Erundek	4_M_MANAGER,{
 	mes "If you are not sure, check the catalog.";
 	next;
 
-	set .@Menu$, "";
+	set .@menu$, "";
 	set .@count, getarraysize(.@Item_DB);
 	for( set .@i, 0; .@i < .@count; set .@i, .@i + 1 )
-		set .@Menu$, .@Menu$ + getitemname(.@Item_DB[.@i]) + ":";
+		set .@menu$, .@menu$ + getitemname(.@Item_DB[.@i]) + ":";
 
-	set .@Item_ID, .@Item_DB[select(.@Menu$) - 1];
+	set .@Item_ID, .@Item_DB[select(.@menu$) - 1];
 
 	mes "[Erundek]";
 	mes "Would you like to exchange ^FF0000" + .@Value + " " + getitemname(.@Badge) + "^000000 for a ^0000FF" + getitemname(.@Item_ID) + "^000000?";
diff --git a/npc/custom/battleground/bg_flavius_01.txt b/npc/custom/battleground/bg_flavius_01.txt
index 0d2ee8a7e..5a78a7002 100644
--- a/npc/custom/battleground/bg_flavius_01.txt
+++ b/npc/custom/battleground/bg_flavius_01.txt
@@ -278,7 +278,7 @@ bat_b01,390,13,5	script	Guillaume Vintenar#fl1	4_M_KY_HEAD,{
 			mes "Let's enjoy our glorious victory!";
 			mes "" + strcharinfo(0) + ", its a sign reflecting victory";
 			close2;
-			set .@Reward, 9;
+			set .@reward, 9;
 		}
 		else
 		{ // 
@@ -287,11 +287,11 @@ bat_b01,390,13,5	script	Guillaume Vintenar#fl1	4_M_KY_HEAD,{
 			mes "This is a reward for your great dedication by Guillaume Marollo!";
 			mes "Just take this defeat a lesson, and later you would definitely learn.";
 			close2;
-			set .@Reward, 3;
+			set .@reward, 3;
 		}
 
 		setquest 2070;
-		getitem 7829, .@Reward;
+		getitem 7829, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -309,7 +309,7 @@ bat_b01,10,293,5	script	Croix Vintenar#fl1	4_M_CRU_HEAD,{
 			mes "Let's enjoy our glorious victory!";
 			mes "" + strcharinfo(0) + ", its a sign reflecting victory";
 			close2;
-			set .@Reward, 9;
+			set .@reward, 9;
 		}
 		else
 		{ // 
@@ -318,11 +318,11 @@ bat_b01,10,293,5	script	Croix Vintenar#fl1	4_M_CRU_HEAD,{
 			mes "Even though we didn't win, we did our best.";
 			mes "This is a Royal gift from Croix, and please don't forget this battle. We can win the next.";
 			close2;
-			set .@Reward, 3;
+			set .@reward, 3;
 		}
 
 		setquest 2070;
-		getitem 7829, .@Reward;
+		getitem 7829, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
diff --git a/npc/custom/battleground/bg_flavius_02.txt b/npc/custom/battleground/bg_flavius_02.txt
index 3e5215faa..1a66d39c5 100644
--- a/npc/custom/battleground/bg_flavius_02.txt
+++ b/npc/custom/battleground/bg_flavius_02.txt
@@ -278,7 +278,7 @@ bat_b02,390,13,5	script	Guillaume Vintenar#fl2	4_M_KY_HEAD,{
 			mes "Let's enjoy our glorious victory!";
 			mes "" + strcharinfo(0) + ", its a sign reflecting victory";
 			close2;
-			set .@Reward, 9;
+			set .@reward, 9;
 		}
 		else
 		{ // 
@@ -287,11 +287,11 @@ bat_b02,390,13,5	script	Guillaume Vintenar#fl2	4_M_KY_HEAD,{
 			mes "This is a reward for your great dedication by Guillaume Marollo!";
 			mes "Just take this defeat a lesson, and later you would definitely learn.";
 			close2;
-			set .@Reward, 3;
+			set .@reward, 3;
 		}
 
 		setquest 2070;
-		getitem 7829, .@Reward;
+		getitem 7829, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -309,7 +309,7 @@ bat_b02,10,293,5	script	Croix Vintenar#fl2	4_M_CRU_HEAD,{
 			mes "Let's enjoy our glorious victory!";
 			mes "" + strcharinfo(0) + ", its a sign reflecting victory";
 			close2;
-			set .@Reward, 9;
+			set .@reward, 9;
 		}
 		else
 		{ // 
@@ -318,11 +318,11 @@ bat_b02,10,293,5	script	Croix Vintenar#fl2	4_M_CRU_HEAD,{
 			mes "Even though we didn't win, we did our best.";
 			mes "This is a Royal gift from Croix, and please don't forget this battle. We can win the next.";
 			close2;
-			set .@Reward, 3;
+			set .@reward, 3;
 		}
 
 		setquest 2070;
-		getitem 7829, .@Reward;
+		getitem 7829, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
diff --git a/npc/custom/battleground/bg_kvm01.txt b/npc/custom/battleground/bg_kvm01.txt
index ed8e0ad76..cfa2f01d7 100644
--- a/npc/custom/battleground/bg_kvm01.txt
+++ b/npc/custom/battleground/bg_kvm01.txt
@@ -313,7 +313,7 @@ bat_c01,51,130,5	script	Guillaume Vintenar::VintenarKvM01a	4_M_KY_HEAD,{
 		}
 		else if( $@KvM01BG_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 5;
+			set .@reward, 5;
 			mes "[Swandery]";
 			mes "Blessed Guillaume!!";
 			mes "Let's enjoy our glorious victory!";
@@ -322,7 +322,7 @@ bat_c01,51,130,5	script	Guillaume Vintenar::VintenarKvM01a	4_M_KY_HEAD,{
 		}
 		else
 		{ // 
-			set .@Reward, 1;
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "You lost, but you're dedicated to this battle.";
 			mes "This is a reward for your great dedication by Guillaume Marollo!";
@@ -331,7 +331,7 @@ bat_c01,51,130,5	script	Guillaume Vintenar::VintenarKvM01a	4_M_KY_HEAD,{
 		}
 
 		setquest 6025;
-		getitem 7773, .@Reward;
+		getitem 7773, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -351,7 +351,7 @@ bat_c01,148,53,1	script	Croix Vintenar::VintenarKvM01b	4_M_CRU_HEAD,{
 		}
 		else if( $@KvM01BG_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 5;
+			set .@reward, 5;
 			mes "[Swandery]";
 			mes "Blessed Croax!!";
 			mes "Let's enjoy our glorious victory!";
@@ -360,7 +360,7 @@ bat_c01,148,53,1	script	Croix Vintenar::VintenarKvM01b	4_M_CRU_HEAD,{
 		}
 		else
 		{ // 
-			set .@Reward, 1;
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
 			mes "Even though we didn't win, we did our best.";
@@ -369,7 +369,7 @@ bat_c01,148,53,1	script	Croix Vintenar::VintenarKvM01b	4_M_CRU_HEAD,{
 		}
 
 		setquest 6025;
-		getitem 7773, .@Reward;
+		getitem 7773, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
diff --git a/npc/custom/battleground/bg_kvm02.txt b/npc/custom/battleground/bg_kvm02.txt
index 919b7a583..f759e2b9a 100644
--- a/npc/custom/battleground/bg_kvm02.txt
+++ b/npc/custom/battleground/bg_kvm02.txt
@@ -313,7 +313,7 @@ bat_c02,51,130,5	script	Guillaume Vintenar::VintenarKvM02a	4_M_KY_HEAD,{
 		}
 		else if( $@KvM02BG_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 3;
+			set .@reward, 3;
 			mes "[Swandery]";
 			mes "Blessed Guillaume!!";
 			mes "Let's enjoy our glorious victory!";
@@ -322,7 +322,7 @@ bat_c02,51,130,5	script	Guillaume Vintenar::VintenarKvM02a	4_M_KY_HEAD,{
 		}
 		else
 		{ // 
-			set .@Reward, 1;
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "You lost, but you're dedicated to this battle.";
 			mes "This is a reward for your great dedication by Guillaume Marollo!";
@@ -331,7 +331,7 @@ bat_c02,51,130,5	script	Guillaume Vintenar::VintenarKvM02a	4_M_KY_HEAD,{
 		}
 
 		setquest 6025;
-		getitem 7773, .@Reward;
+		getitem 7773, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -351,7 +351,7 @@ bat_c02,148,53,1	script	Croix Vintenar::VintenarKvM02b	4_M_CRU_HEAD,{
 		}
 		else if( $@KvM02BG_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 3;
+			set .@reward, 3;
 			mes "[Swandery]";
 			mes "Blessed Croax!!";
 			mes "Let's enjoy our glorious victory!";
@@ -360,7 +360,7 @@ bat_c02,148,53,1	script	Croix Vintenar::VintenarKvM02b	4_M_CRU_HEAD,{
 		}
 		else
 		{ // 
-			set .@Reward, 1;
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
 			mes "Even though we didn't win, we did our best.";
@@ -369,7 +369,7 @@ bat_c02,148,53,1	script	Croix Vintenar::VintenarKvM02b	4_M_CRU_HEAD,{
 		}
 
 		setquest 6025;
-		getitem 7773, .@Reward;
+		getitem 7773, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
diff --git a/npc/custom/battleground/bg_kvm03.txt b/npc/custom/battleground/bg_kvm03.txt
index b13624067..dde4d8147 100644
--- a/npc/custom/battleground/bg_kvm03.txt
+++ b/npc/custom/battleground/bg_kvm03.txt
@@ -313,7 +313,7 @@ bat_c03,51,130,5	script	Guillaume Vintenar::VintenarKvM03a	4_M_KY_HEAD,{
 		}
 		else if( $@KvM03BG_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 1;
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "Blessed Guillaume!!";
 			mes "Let's enjoy our glorious victory!";
@@ -322,7 +322,7 @@ bat_c03,51,130,5	script	Guillaume Vintenar::VintenarKvM03a	4_M_KY_HEAD,{
 		}
 		else
 		{ // 
-			set .@Reward, 0;
+			set .@reward, 0;
 			mes "[Swandery]";
 			mes "You lost, but you're dedicated to this battle.";
 			mes "This is a reward for your great dedication by Guillaume Marollo!";
@@ -331,7 +331,7 @@ bat_c03,51,130,5	script	Guillaume Vintenar::VintenarKvM03a	4_M_KY_HEAD,{
 		}
 
 		setquest 6025;
-		getitem 7773, .@Reward;
+		getitem 7773, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -351,7 +351,7 @@ bat_c03,148,53,1	script	Croix Vintenar::VintenarKvM03b	4_M_CRU_HEAD,{
 		}
 		else if( $@KvM03BG_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 1;
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "Blessed Croax!!";
 			mes "Let's enjoy our glorious victory!";
@@ -360,7 +360,7 @@ bat_c03,148,53,1	script	Croix Vintenar::VintenarKvM03b	4_M_CRU_HEAD,{
 		}
 		else
 		{ // 
-			set .@Reward, 0;
+			set .@reward, 0;
 			mes "[Swandery]";
 			mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
 			mes "Even though we didn't win, we did our best.";
@@ -369,7 +369,7 @@ bat_c03,148,53,1	script	Croix Vintenar::VintenarKvM03b	4_M_CRU_HEAD,{
 		}
 
 		setquest 6025;
-		getitem 7773, .@Reward;
+		getitem 7773, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
diff --git a/npc/custom/battleground/bg_tierra_01.txt b/npc/custom/battleground/bg_tierra_01.txt
index c6a6c3b36..819fa9158 100644
--- a/npc/custom/battleground/bg_tierra_01.txt
+++ b/npc/custom/battleground/bg_tierra_01.txt
@@ -322,7 +322,7 @@ bat_a01,45,19,3	script	Croix Vintenar#tv1	4_M_CRU_HEAD,{
 	{
 		if( $@TierraBG1_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 3;
+			set .@reward, 3;
 			mes "[Swandery]";
 			mes "Blessed Croax!!";
 			mes "Let's enjoy our glorious victory!";
@@ -331,7 +331,7 @@ bat_a01,45,19,3	script	Croix Vintenar#tv1	4_M_CRU_HEAD,{
 		}
 		else
 		{ // 
-			set .@Reward, 1;
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
 			mes "Even though we didn't win, we did our best.";
@@ -340,7 +340,7 @@ bat_a01,45,19,3	script	Croix Vintenar#tv1	4_M_CRU_HEAD,{
 		}
 
 		setquest 2069;
-		getitem 7828, .@Reward;
+		getitem 7828, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -353,7 +353,7 @@ bat_a01,53,377,3	script	Guillaume Vintenar#tv1	4_M_KY_HEAD,{
 	{
 		if( $@TierraBG1_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 3;
+			set .@reward, 3;
 			mes "[Swandery]";
 			mes "Blessed Guillaume!!";
 			mes "Let's enjoy our glorious victory!";
@@ -362,7 +362,7 @@ bat_a01,53,377,3	script	Guillaume Vintenar#tv1	4_M_KY_HEAD,{
 		}
 		else
 		{ // 
-			set .@Reward, 1;
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "You lost, but you're dedicated to this battle.";
 			mes "This is a reward for your great dedication by Guillaume Marollo!";
@@ -371,7 +371,7 @@ bat_a01,53,377,3	script	Guillaume Vintenar#tv1	4_M_KY_HEAD,{
 		}
 
 		setquest 2069;
-		getitem 7828, .@Reward;
+		getitem 7828, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
diff --git a/npc/custom/battleground/bg_tierra_02.txt b/npc/custom/battleground/bg_tierra_02.txt
index 23b58dffd..25796c4bc 100644
--- a/npc/custom/battleground/bg_tierra_02.txt
+++ b/npc/custom/battleground/bg_tierra_02.txt
@@ -322,7 +322,7 @@ bat_a02,45,19,3	script	Croix Vintenar#tv2	4_M_CRU_HEAD,{
 	{
 		if( $@TierraBG2_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 3;
+			set .@reward, 3;
 			mes "[Swandery]";
 			mes "Blessed Croax!!";
 			mes "Let's enjoy our glorious victory!";
@@ -331,7 +331,7 @@ bat_a02,45,19,3	script	Croix Vintenar#tv2	4_M_CRU_HEAD,{
 		}
 		else
 		{ // 
-			set .@Reward, 1;
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
 			mes "Even though we didn't win, we did our best.";
@@ -340,7 +340,7 @@ bat_a02,45,19,3	script	Croix Vintenar#tv2	4_M_CRU_HEAD,{
 		}
 
 		setquest 2069;
-		getitem 7828, .@Reward;
+		getitem 7828, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
@@ -353,7 +353,7 @@ bat_a02,53,377,3	script	Guillaume Vintenar#tv2	4_M_KY_HEAD,{
 	{
 		if( $@TierraBG2_Victory == Bat_Team )
 		{ // Victory
-			set .@Reward, 3;
+			set .@reward, 3;
 			mes "[Swandery]";
 			mes "Blessed Guillaume!!";
 			mes "Let's enjoy our glorious victory!";
@@ -362,7 +362,7 @@ bat_a02,53,377,3	script	Guillaume Vintenar#tv2	4_M_KY_HEAD,{
 		}
 		else
 		{ // 
-			set .@Reward, 1;
+			set .@reward, 1;
 			mes "[Swandery]";
 			mes "You lost, but you're dedicated to this battle.";
 			mes "This is a reward for your great dedication by Guillaume Marollo!";
@@ -371,7 +371,7 @@ bat_a02,53,377,3	script	Guillaume Vintenar#tv2	4_M_KY_HEAD,{
 		}
 
 		setquest 2069;
-		getitem 7828, .@Reward;
+		getitem 7828, .@reward;
 		bg_leave;
 		warp "bat_room",155,150;
 		end;
diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt
index 5bac0fd3f..62ea56c93 100644
--- a/npc/custom/etc/quest_warper.txt
+++ b/npc/custom/etc/quest_warper.txt
@@ -94,7 +94,7 @@ function	script	Q_Warpra	{
 	case 10: goto L_GStorage;
 	case 11:
 	default:
-		goto L_end;
+		goto L_End;
 	}
 
 //=====================GM-Menu=Functions===========================
@@ -320,7 +320,7 @@ L_town:
 	freeloop(0);
 	set @TWMenu,select(.@menu$);
 
-	if (@Tmenuref[@TWMenu-1] == 57005) goto L_end; // 57005='dead' in hex
+	if (@Tmenuref[@TWMenu-1] == 57005) goto L_End; // 57005='dead' in hex
 
 	if(Zeny<@pTprice[@Tmenuref[@TWMenu-1]]) callsub L_Short_on_zeny,0;
 	set Zeny, Zeny-@pTprice[@Tmenuref[@TWMenu-1]];
@@ -341,7 +341,7 @@ L_dungeon:
 	freeloop(0);
 	set @DWMenu,select(.@menu$);
 
-	if (@Dmenuref[@DWMenu-1] == 57005) goto L_end; // 57005='dead' in hex
+	if (@Dmenuref[@DWMenu-1] == 57005) goto L_End; // 57005='dead' in hex
 	set @DwarpMenu, (@Dmenuref[@DWMenu-1]);
 	callfunc "QWS_DLarray";
 
@@ -355,7 +355,7 @@ L_dungeon:
 	freeloop(0);
 	set @DWLMenu,select(.@menu$);
 
-	if (@DWLmenuref[@DWLMenu-1] == 57005) goto L_end; // 57005='dead' in hex
+	if (@DWLmenuref[@DWLMenu-1] == 57005) goto L_End; // 57005='dead' in hex
 
 	set @Darrayref, @DWLmenuref[@DWLMenu-1];
 	set @warpprice, @pDprice[@Dmenuref[@DWMenu-1]]+(getd(@pDfee$[@Dmenuref[@DWMenu-1]])*(@DDepth[@Darrayref]));
@@ -387,22 +387,22 @@ L_heal_Part:
 	if (@healchoice == 1) callsub PHeal,1,1;
 	if (@healchoice == 2) callsub PHeal,1,0;
 	if (@healchoice == 3) callsub PHeal,0,1;
-	goto L_end;
+	goto L_End;
 	
 PHeal:
 	next;
 	set @Hp, MaxHp-Hp;
 	set @Sp, MaxSp-Sp;
-	set @HpPrice, @hp*$QW_HP_H_PRICE;
-	set @SpPrice, @sp*$QW_HP_S_PRICE;
+	set @HpPrice, @Hp*$QW_HP_H_PRICE;
+	set @SpPrice, @Sp*$QW_HP_S_PRICE;
 	mes "[Warpra]";
 	if(getarg(0) == 1) mes ""+@HpPrice+" Zeny for "+@Hp+" health points";
 	if(getarg(1) == 1) mes ""+@SpPrice+" Zeny for "+@Sp+" skill points";
 	set @total, @HpPrice+@SpPrice;
 	mes "for a total of "+@total+" zeny";
-    	if (select("Heal me","Let me see the choices again")==2) goto L_heal_Part;
-    	
-    	if(getarg(0) == 1)set @HpPrice, (MaxHp-Hp)*$QW_HP_H_PRICE;
+	if (select("Heal me","Let me see the choices again")==2) goto L_heal_Part;
+
+	if(getarg(0) == 1)set @HpPrice, (MaxHp-Hp)*$QW_HP_H_PRICE;
 	if(getarg(1) == 1)set @SpPrice, (MaxSp-Sp)*$QW_HP_S_PRICE;
 	set @healfee, @HpPrice+@SpPrice;
 	if (getarg(0) == 1)&&(getarg(1) == 1)&&(Zeny<@healfee) goto Zeny_Short_Both;
@@ -419,18 +419,18 @@ Zeny_Short_Both:
 	mes "[Warpra]";
 	mes "Choose another option, you can afford both.";
 	mes "I can heal as much as you can afford, too.";
-	if (select("OK","Exit") == 2) goto L_end;
+	if (select("OK","Exit") == 2) goto L_End;
 	goto PHeal;
 
 Zeny_short_HP:
 	mes "[Warpra]";
 	mes "Do you want me to partly heal your HP?";
-	if (select("Yes","No") == 2) goto L_end;
+	if (select("Yes","No") == 2) goto L_End;
 	set @Hp, Zeny/$QW_HP_H_PRICE;
-    	set @HpPrice, @Hp*$QW_HP_H_PRICE;
-    	if (@Hp == 1) mes "You're not worth the effort.";
-    	if (@Hp == 1) goto L_end;
-    	set Zeny, Zeny-@HpPrice;
+	set @HpPrice, @Hp*$QW_HP_H_PRICE;
+	if (@Hp == 1) mes "You're not worth the effort.";
+	if (@Hp == 1) goto L_End;
+	set Zeny, Zeny-@HpPrice;
 	heal @Hp,0;
 	close;
 	end;
@@ -438,12 +438,12 @@ Zeny_short_HP:
 Zeny_short_SP:
 	mes "[Warpra]";
 	mes "Do you want me to partly heal your SP?";
-	if (select("Yes","No") == 2) goto L_end;
+	if (select("Yes","No") == 2) goto L_End;
 	set @Sp, Zeny/$QW_HP_S_PRICE;
-    	set @SpPrice, @Sp*$QW_HP_S_PRICE;
-    	if (@Sp == 1) mes "You're not worth the effort.";
-    	if (@Sp == 1) goto L_end;
-    	set Zeny, Zeny-@SpPrice;
+	set @SpPrice, @Sp*$QW_HP_S_PRICE;
+	if (@Sp == 1) mes "You're not worth the effort.";
+	if (@Sp == 1) goto L_End;
+	set Zeny, Zeny-@SpPrice;
 	heal 0,@Sp;
 	close;
 	end;
@@ -500,7 +500,7 @@ L_GStorage:
 	guildopenstorage;
 	end;
 	
-L_end:
+L_End:
 	close;
 	end;
 
diff --git a/npc/custom/etc/rpsroulette.txt b/npc/custom/etc/rpsroulette.txt
index fccb365ef..22123580d 100644
--- a/npc/custom/etc/rpsroulette.txt
+++ b/npc/custom/etc/rpsroulette.txt
@@ -16,7 +16,7 @@ cmd_in02,182,126,2	script	Crazy Boris	4_M_03,{
 	set @counter,1;
 	mes "Hey you! Up for Rock Scissors Roulette?";
 	next;
-	menu "Let me play.",PLAY,"Explain the rules.",RULES,"Leave",LEAVE;
+	menu "Let me play.",PLAY,"Explain the rules.",L_Rules,"Leave",LEAVE;
 	SAME:
 	mes "Draw! Again!";
 	next;
@@ -37,9 +37,9 @@ LOSE:
 PLAY:
 	mes "Rock... Paper...";
 	set @opp,rand (1,3);
-	menu "^0000FFROCK!",ROCK,"^FF0000SCISSORS!",SCISSORS,"^00FF00PAPER!^000000",PAPER;
+	menu "^0000FFROCK!",L_Rock,"^FF0000SCISSORS!",SCISSORS,"^00FF00PAPER!^000000",PAPER;
 
-ROCK:
+L_Rock:
   	if (@lastchoice == 1) set @opp,rand (1,3);
   	if (@opp == 1) emotion 11;
   	if (@opp == 2) emotion 10;
@@ -203,7 +203,7 @@ KILL:
 	next;
 	goto PRIZE;
 
-RULES:
+L_Rules:
 	mes "Ok here are the rules:";
 	mes "I have with me a ^FF00006^000000 chamber pistol with ^FF00001^000000 round. First we play ^FF0000Scissors ^00FF00Paper ^0000FFRock^000000. The loser pulls the trigger. The winner is whoever comes out best.";
 	mes "Beat me to win a prize.";
diff --git a/npc/custom/events/disguise.txt b/npc/custom/events/disguise.txt
index 877916738..5e03f5802 100644
--- a/npc/custom/events/disguise.txt
+++ b/npc/custom/events/disguise.txt
@@ -133,15 +133,15 @@ OnInit:
 		B_MAGALETA, B_SHECIL, B_KATRINN, B_YGNIZEM, APOCALIPS_H, LADY_TANEE, THANATOS, DETALE, KIEL_, RANDGRIS,
 		GLOOMUNDERNIGHT, KTULLANUX, ATROCE, G_MAGALETA_, IFRIT, FALLINGBISHOP, BEELZEBUB_, GOPINICH, MOROCC_, KUBLIN,
 		S_NYDHOG, BOITATA, QUEEN_SCARABA, LOST_DRAGON, LEAK, I_QUEEN_SCARABA;
-	set .BlackList$, "1003,1006,1017,1021,1022,1027,1043,1075,1136,1137,1168," + 
-	    "1171,1172,1173,1181,1187,1210,1217,1218,1222,1223,1224,1225,1226,1227,1228," + 
-	    "1233,1284,1407,1411,1414,1495,1501,1900,1996,2000,2001,2002,2003,2004," + 
-	    "2005,2006,2007,2011,2012,2025,2028,2029,2030,2031,2032,2033,2034,2035," + 
-	    "2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049," + 
-	    "2050,2051,2052,2053,2054,2055,2056,2057,2058,2059,2060,2061,2062,2063," + 
-	    "2064,2065,2066,2067,2075,2076,2077,2078,2079,2080,2081,2083,2084,2085," + 
-	    "2086,2087,2088,2089,2090,2091,2092,2093,2094,2095,2096,2097,2098,2099," + 
-	    "2100,2101,2012,2103,2104,2105,2106,2107,2108,2109,2110,2111,2112,2113," + 
+	set .Blacklist$, "1003,1006,1017,1021,1022,1027,1043,1075,1136,1137,1168," +
+	    "1171,1172,1173,1181,1187,1210,1217,1218,1222,1223,1224,1225,1226,1227,1228," +
+	    "1233,1284,1407,1411,1414,1495,1501,1900,1996,2000,2001,2002,2003,2004," +
+	    "2005,2006,2007,2011,2012,2025,2028,2029,2030,2031,2032,2033,2034,2035," +
+	    "2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049," +
+	    "2050,2051,2052,2053,2054,2055,2056,2057,2058,2059,2060,2061,2062,2063," +
+	    "2064,2065,2066,2067,2075,2076,2077,2078,2079,2080,2081,2083,2084,2085," +
+	    "2086,2087,2088,2089,2090,2091,2092,2093,2094,2095,2096,2097,2098,2099," +
+	    "2100,2101,2012,2103,2104,2105,2106,2107,2108,2109,2110,2111,2112,2113," +
 	    "2114,2115,2116,2117,2118,2119,2120,2121,2123,2124,2125,1496,";
 	end;
 OnClock0000:
@@ -201,22 +201,22 @@ OnTimer180000:
 iDisguise:
 	if (.Rule==1) {
 		set .Winner,0;
-		set .@Monster, rand(SCORPION, PINGUICULA);
-		if (compare(","+.BlackList$+"," , ","+.@Monster+",")) goto iDisguise;
-		if (.@Monster==.LastMonster) goto iDisguise;
-		set .LastMonster,.@Monster;
-		set $MonsterName$,getmonsterinfo(.@Monster,0);
+		set .@monster, rand(SCORPION, PINGUICULA);
+		if (compare(","+.Blacklist$+"," , ","+.@monster+",")) goto iDisguise;
+		if (.@monster==.LastMonster) goto iDisguise;
+		set .LastMonster,.@monster;
+		set $MonsterName$,getmonsterinfo(.@monster,0);
 	}
 	if (.Rule==2) {
 		set .Winner,0;
-		set .@Monster, rand(getarraysize(.MVP));
-		set $MonsterName$,getmonsterinfo(.MVP[.@Monster],0);
+		set .@monster, rand(getarraysize(.MVP));
+		set $MonsterName$,getmonsterinfo(.MVP[.@monster],0);
 	}
 	deletepset 1;
 	defpattern 1,"([^:]+):.\\s*"+$MonsterName$+".*", "iCorrect";
 	activatepset 1;
-	if (.Rule==1) setnpcdisplay "Disguise Event",.@Monster;
-	if (.Rule==2) setnpcdisplay "Disguise Event",.MVP[.@Monster];
+	if (.Rule==1) setnpcdisplay "Disguise Event",.@monster;
+	if (.Rule==2) setnpcdisplay "Disguise Event",.MVP[.@monster];
 	set .Change,1;
 	setnpctimer 0;
 	end;
diff --git a/npc/custom/events/valentinesdayexp.txt b/npc/custom/events/valentinesdayexp.txt
index c0c7ddb66..7f12e5325 100644
--- a/npc/custom/events/valentinesdayexp.txt
+++ b/npc/custom/events/valentinesdayexp.txt
@@ -199,7 +199,7 @@ prt_castle,54,34,4	script	Carl Orleans#val1	1_M_01,{
 	mes "[Carl Orleans]";
 	mes "Yes? What can I cook for you?";
 	next;
-	menu "Black handmade Chocolate, please",-,"I want a White handmade Chocolate...",M_WHITE,"I'm lost, sorry to bother you.",M_END;
+	menu "Black handmade Chocolate, please",-,"I want a White handmade Chocolate...",M_WHITE,"I'm lost, sorry to bother you.",M_End;
      
 	mes "[Carl Orleans]";
 	mes "Well, I just might be able to fulfill your needs...";
@@ -266,7 +266,7 @@ M_WHITE:
 	mes "Enjoy.";
 	close;
 
-M_END:
+M_End:
 	mes "[Carl Orleans]";
 	mes "Oh.. well, if you want me to make some of my special handmade Chocolate....";
 	mes "You will need to give me at least ^0000FF 3 Chocolates^000000 or ^0000FF 3 White Chocolates^000000.";
diff --git a/npc/custom/events/xmas_rings_event.txt b/npc/custom/events/xmas_rings_event.txt
index 8d8be443b..e031ea129 100644
--- a/npc/custom/events/xmas_rings_event.txt
+++ b/npc/custom/events/xmas_rings_event.txt
@@ -111,7 +111,7 @@ louyang,224,249,4	script	Sneewy	4_F_KID3,{
 		mes "[Sneewy]";
 		mes "Oh, hello. Has my brother Snower told you everything?";
 		next;
-		menu "Here are your 4 Gift Boxes",-, "I don't know any Snowhatevers...",M_END;
+		menu "Here are your 4 Gift Boxes",-, "I don't know any Snowhatevers...",M_End;
 
 		mes "[Sneewy]";
 		if(countitem(644)<4){
@@ -133,7 +133,7 @@ louyang,224,249,4	script	Sneewy	4_F_KID3,{
 	mes "Thanks again! No children will meet the holidays without the gifts!";
 	close;
 
-M_END:
+M_End:
 	mes "[Sneewy]";
 	mes "Pity... I've got a magic Santa's ring... I'd exchange it for 4 Gift Boxes...";
 	emotion e_swt;
@@ -163,7 +163,7 @@ izlu2dun,133,160,2	script	Snoowy	4_F_06,{
 		mes "[Snoowy]";
 		mes "But I too need 3 more gifts for my marine folk friends...";
 		next;
-		menu "Have these gifts!",-, "I need a li'l something in return",M_END;
+		menu "Have these gifts!",-, "I need a li'l something in return",M_End;
 
 		mes "[Snoowy]";
 		if(countitem(644)<3){
@@ -183,7 +183,7 @@ izlu2dun,133,160,2	script	Snoowy	4_F_06,{
 	if(rand(2))mes "Didn't you know that Santa's Hat reveals the real power of the rings?";
 	close;
 
-M_END:
+M_End:
 	mes "[Snoowy]";
 	mes "I'd exchange a GOLD magic ring for 3 gift boxes...";
 	emotion e_swt;
diff --git a/npc/custom/healer.txt b/npc/custom/healer.txt
index 1b1d94d91..e11e2a647 100644
--- a/npc/custom/healer.txt
+++ b/npc/custom/healer.txt
@@ -13,16 +13,16 @@
 
 -	script	Healer	-1,{
 
-	set .@Price,0;	// Zeny required for heal
+	set .@price,0;	// Zeny required for heal
 	set .@Buffs,0;	// Also buff players? (1: yes / 0: no)
 	set .@Delay,0;	// Heal delay, in seconds
 
 	if (@HD > gettimetick(2)) end;
-	if (.@Price) {
-		message strcharinfo(0),"Healing costs "+.@Price+" Zeny.";
-		if (Zeny < .@Price) end;
+	if (.@price) {
+		message strcharinfo(0),"Healing costs "+.@price+" Zeny.";
+		if (Zeny < .@price) end;
 		if(select("^0055FFHeal^000000:^777777Cancel^000000") == 2) end;
-		set Zeny, Zeny-.@Price;
+		set Zeny, Zeny-.@price;
 	}
 	specialeffect2 EF_HEAL2; percentheal 100,100;
 	if (.@Buffs) {
diff --git a/npc/custom/item_signer.txt b/npc/custom/item_signer.txt
index dfc93fb85..3cd66234b 100644
--- a/npc/custom/item_signer.txt
+++ b/npc/custom/item_signer.txt
@@ -14,7 +14,7 @@
 prt_in,24,61,7	script	Perchik	1_M_01,{
 	
 	setarray .@item[0],644,3;	// Item requirements: <ID>,<Count>{,...} (0 to disable)
-	setarray .@Cost[0],0,5000;	// Zeny requirements: <base price>,<price per refine>
+	setarray .@cost[0],0,5000;	// Zeny requirements: <base price>,<price per refine>
 
 	disable_items;
 	mes "[Perchik]";
@@ -26,12 +26,12 @@ prt_in,24,61,7	script	Perchik	1_M_01,{
 		emotion e_ic;
 		next;
 		mes "[Perchik]";
-		if (getarraysize(.@item) || getarraysize(.@Cost)) {
+		if (getarraysize(.@item) || getarraysize(.@cost)) {
 			mes "For my work I accept:";
 			if (getarraysize(.@item)) for(set .@i,0; .@i<getarraysize(.@item); set .@i,.@i+2)
 				mes " ~ "+.@item[.@i+1]+"x "+getitemname(.@item[.@i]);
-			if (.@Cost[0]) mes " ~ "+.@Cost[0]+" Zeny";
-			if (.@Cost[1]) mes " ~ "+.@Cost[1]+" Zeny per refine";
+			if (.@cost[0]) mes " ~ "+.@cost[0]+" Zeny";
+			if (.@cost[1]) mes " ~ "+.@cost[1]+" Zeny per refine";
 		}
 		else mes "I work for free, but...";
 		next;
@@ -91,7 +91,7 @@ prt_in,24,61,7	script	Perchik	1_M_01,{
 			emotion e_hmm;
 			close;
 		}
-	set .@price, .@Cost[0]+(.@Cost[1]*.@ref);
+	set .@price, .@cost[0]+(.@cost[1]*.@ref);
 	if (getarraysize(.@item) || .@price) {
 		mes "I will need:";
 		if (getarraysize(.@item)) for(set .@i,0; .@i<getarraysize(.@item); set .@i,.@i+2) {
diff --git a/npc/custom/quests/bandit_beard.txt b/npc/custom/quests/bandit_beard.txt
index ebb74afc7..fb28732d7 100644
--- a/npc/custom/quests/bandit_beard.txt
+++ b/npc/custom/quests/bandit_beard.txt
@@ -44,7 +44,7 @@ L_THREAD:
 	mes "[Bearded Man]";
 	mes "Also I would need you to get me some things for the beard.";
 	mes "They are:";
-L_LIST:
+L_List:
 	mes "^8080FFElastic Band^000000";
 	mes "^8080FF5 Animal Skins^000000";
 	mes "^8080FFBlack Dye Stuff^000000";
@@ -96,7 +96,7 @@ L_NOITEMS:
 	mes "What the hell! I can't make a beard without the items!";
 	mes "Here is the list again:";
 	emotion 23;
-	goto L_LIST;
+	goto L_List;
 }  
 
 //Master Tailor----------
@@ -124,7 +124,7 @@ aldeba_in,70,179,5	script	Karfa Clerk#bandit	4_F_KAFRA5,{
 
 	mes "What can I do for you?";
 	next;
-	if(BEARD_QUEST == 2 ) goto L_DELIVERY;
+	if(BEARD_QUEST == 2 ) goto L_Delivery;
 
 	menu "What's in the boxes?",-,"Nothing.",M_NOPE;
 
@@ -133,7 +133,7 @@ aldeba_in,70,179,5	script	Karfa Clerk#bandit	4_F_KAFRA5,{
 M_NOPE:
 	close;
 
-L_DELIVERY:
+L_Delivery:
 
 	mes "[Karfa Clerk]";
 	mes "Sorry but we have not received any ^8080FFThread^000000.";
@@ -209,7 +209,7 @@ M_NO:
 //mobsummons -------
 alberta,1,1,1	script	BRDQ_MOBS	-1,{
 OnStart:
-	set $@beardMob,10;
+	set $@beardmob,10;
 	set $@beardMobD,0;
 	monster "alberta",65,120,"Thef Bug Male",1054,1,"BRDQ_MOBS::OnDie";
 	monster "alberta",66,120,"Thef Bug Male",1054,1,"BRDQ_MOBS::OnDie";
@@ -229,7 +229,7 @@ OnDie:
 	end;
 On1201:
 On0001:
-	set $@beardMob,0;
+	set $@beardmob,0;
 	set $@beardMobD,0;
 	end;
 }
diff --git a/npc/custom/quests/dead_branch.txt b/npc/custom/quests/dead_branch.txt
index 95f0a95b7..bb70f6020 100644
--- a/npc/custom/quests/dead_branch.txt
+++ b/npc/custom/quests/dead_branch.txt
@@ -25,10 +25,10 @@ niflheim,204,179,3	script	Mister Mobry	2_M_MOLGENSTEIN,{
 	mes "[Mister Mobry]";
 	mes "I can create a spirited branch... That is, if you can provide me with the correct materials...";
 	next;
-	goto L_MENU;
+	goto L_Menu;
 
-L_MENU:
-	menu "What Do I Need?",-,"Where Can I find this Crap?",M_FIND,"Make me a Dead Branch!",M_CREATE,"Forget it...",M_END;
+L_Menu:
+	menu "What Do I Need?",-,"Where Can I find this Crap?",M_FIND,"Make me a Dead Branch!",M_CREATE,"Forget it...",M_End;
 
 	mes "[Mister Mobry]";
 	mes "Mwehehe... I see you want to control tree spirits am I right? Ok... I need:";
@@ -37,7 +37,7 @@ L_MENU:
 	mes "^1354455 Trunk^000000";
 	mes "^1354451 Wooden Gnarl^000000";
 	next;
-	goto L_MENU;
+	goto L_Menu;
 
 M_FIND:
 	mes "[Mister Mobry]";
@@ -47,7 +47,7 @@ M_FIND:
 	mes "^135445Trunks? Seriously, think wood...^000000";
 	mes "^135445Wooden Gnarl... Gibbet...^000000";
 	next;
-	goto L_MENU;
+	goto L_Menu;
 
 L_NOLOG:
 	mes "[Mister Mobry]";
@@ -95,7 +95,7 @@ L_GIVE2:
 	getitem 12103,1; //Bloody Branch
 	close;
 
-M_END:
+M_End:
 	mes "[Mister Mobry]";
 	mes "No spirit for you... then go!";
 	close;
diff --git a/npc/custom/quests/hunting_missions.txt b/npc/custom/quests/hunting_missions.txt
index d07ebb0d0..d5d466f73 100644
--- a/npc/custom/quests/hunting_missions.txt
+++ b/npc/custom/quests/hunting_missions.txt
@@ -152,7 +152,7 @@ Mission_Status:
 	set .@Mission_Points, 3+(.@j[.Quests]/.Quests/6);
 	set .@Base_Exp, #Mission_Count*.@j[.Quests+1]/5;
 	set .@Job_Exp, #Mission_Count*.@j[.Quests+2]/5;
-	set .@Zeny, #Mission_Count*.Quests*.@j[.@i]*.Modifier[2];
+	set .@zeny, #Mission_Count*.Quests*.@j[.@i]*.Modifier[2];
 
 	next;
 	mes "[Hunting Missions]";
@@ -160,7 +160,7 @@ Mission_Status:
 	mes " > Mission Points: ^0055FF"+.@Mission_Points+"^000000";
 	mes " > Base Experience: ^0055FF"+Cm(.@Base_Exp)+"^000000";
 	mes " > Job Experience: ^0055FF"+Cm(.@Job_Exp)+"^000000";
-	mes " > Zeny: ^0055FF"+Cm(.@Zeny)+"^000000";
+	mes " > Zeny: ^0055FF"+Cm(.@zeny)+"^000000";
 	if (@f) { set @f,0; return; }
 	next;
 	mes "[Hunting Missions]";
@@ -173,7 +173,7 @@ Mission_Status:
 	set #Mission_Points, #Mission_Points+.@Mission_Points;
 	set BaseExp, BaseExp+.@Base_Exp;
 	set JobExp, JobExp+.@Job_Exp;
-	set Zeny, Zeny+.@Zeny;
+	set Zeny, Zeny+.@zeny;
 	for(set .@i,0; .@i<.Quests; set .@i,.@i+1) {
 		setd "Mission"+.@i,0;
 		setd "Mission"+.@i+"_",0;
@@ -259,7 +259,7 @@ OnNPCKillEvent:
 		for(set .@i,0; .@i<$@partymembercount; set .@i,.@i+1) {
 			if (isloggedin($@partymemberaid[.@i], $@partymembercid[.@i])) {
 				attachrid $@partymemberaid[.@i];
-				if (#Mission_Count && Mission0 && HP > 0) {
+				if (#Mission_Count && Mission0 && Hp > 0) {
 					getmapxy(.@map2$,.@x2,.@y2,0);
 					if ((.@map1$ == .@map2$ || .Party == 1) && (distance(.@x1,.@y1,.@x2,.@y2) <= 30 || .Party < 3)) {
 						for(set .@j,0; .@j<.Quests; set .@j,.@j+1) {
diff --git a/npc/custom/quests/may_hats.txt b/npc/custom/quests/may_hats.txt
index cd81e0149..789fc364f 100644
--- a/npc/custom/quests/may_hats.txt
+++ b/npc/custom/quests/may_hats.txt
@@ -19,7 +19,7 @@ gonryun,187,140,4	script	Yakima	4_F_EINWOMAN,{
 	mes "They are quite rare novadays...";
 	specialeffect 417;
 	next;
-	menu "Bird Nest",-,"Lion Mask",M_2,"Skeleton Manteau",M_3,"Fashion Hip Sack",M_4,"Sales Banner",M_5,"Leave",M_EXIT;
+	menu "Bird Nest",-,"Lion Mask",M_2,"Skeleton Manteau",M_3,"Fashion Hip Sack",M_4,"Sales Banner",M_5,"Leave",M_Exit;
 
 	mes "[Yakima]";
 	mes "Oh.. it's an excellent item for any beast hunter.";
@@ -34,7 +34,7 @@ gonryun,187,140,4	script	Yakima	4_F_EINWOMAN,{
 	mes "[Yakima]";
 	mes "Do you have all the items?";
 	next;
-	menu "Yeah.",-,"Nay.",M_EXIT;
+	menu "Yeah.",-,"Nay.",M_Exit;
 
 	if(countitem(5067) < 1 || countitem(916) < 920 || countitem(925) < 310) goto L_NOITEM;//Items: Sombrero, Feather_of_Birds, Bill_of_Birds,
 	delitem 5067,1;//Items: Sombrero,
@@ -61,7 +61,7 @@ M_2:
 	mes "[Yakima]";
 	mes "Do you have all the items?";
 	next;
-	menu "Yeah.",-,"Nay.",M_EXIT;
+	menu "Yeah.",-,"Nay.",M_Exit;
 
 	if(countitem(5098) < 1 || countitem(1030) < 10 || countitem(1029) < 30 || countitem(7267) < 300) goto L_NOITEM;//Items: Tiger_Mask, Tiger_Skin, Tiger's_Footskin, Tiger_Panty,
 	delitem 5098,1;//Items: Tiger_Mask,
@@ -90,7 +90,7 @@ M_3:
 	mes "[Yakima]";
 	mes "Do you have all the items?";
 	next;
-	menu "Yeah.",-,"Nay.",M_EXIT;
+	menu "Yeah.",-,"Nay.",M_Exit;
 
 	if(countitem(2508) < 1 || countitem(2506) < 2 || countitem(2609) < 3 || countitem(7207) < 10) goto L_NOITEM;//Items: Ragamuffin_Manteau, Manteau_, Skull_Ring, Old_Manteau,
 	delitem 2508,1;//Items: Ragamuffin_Manteau,
@@ -119,7 +119,7 @@ M_4:
 	mes "[Yakima]";
 	mes "Do you have all the items?";
 	next;
-	menu "Yeah.",-,"Nay.",M_EXIT;
+	menu "Yeah.",-,"Nay.",M_Exit;
 
 	if(countitem(2269) < 3 || countitem(2207) < 3 || countitem(2612) < 2 || countitem(2287)<3 ) goto L_NOITEM;//Items: Romantic_Flower, Fancy_Flower, Flower_Ring,
 	delitem 2269,3;//Items: Romantic_Flower,
@@ -150,7 +150,7 @@ M_5:
 	mes "[Yakima]";
 	mes "Do you have all the items?";
 	next;
-	menu "Yeah.",-,"Nay.",M_EXIT;
+	menu "Yeah.",-,"Nay.",M_Exit;
 
 	if(countitem(975) < 1 || countitem(980) < 1 || countitem(2272) < 2 || countitem(2262) < 3 || countitem(7298) < 180 || countitem(7164) < 20) goto L_NOITEM;//Items: Scarlet_Dyestuff, Orange_Dyestuff, Stop_Post, Clown_Nose, Fig_Leaf, Solid_Peach,
 	delitem 975,1;//Items: Scarlet_Dyestuff,
@@ -171,7 +171,7 @@ L_NOITEM:
 	emotion e_sry;
 	close;
 
-M_EXIT:
+M_Exit:
 	mes "[Yakima]";
 	mes callfunc("F_Bye");
 	close;
diff --git a/npc/custom/quests/thq/THQS_ChatingNPC.txt b/npc/custom/quests/thq/THQS_ChatingNPC.txt
index a8cb49b9f..8ade6d8fd 100644
--- a/npc/custom/quests/thq/THQS_ChatingNPC.txt
+++ b/npc/custom/quests/thq/THQS_ChatingNPC.txt
@@ -59,9 +59,9 @@ yuno_in01,22,162,6	script	Female Assasin	4_F_JOB_ASSASSIN,{
 	mes "Umm sorry I'm not gona waste my time talking to you if you arn't even a member!";
 	close;
 N_Member:
-	set @TEMP,rand(1,2);
-	if (@TEMP == 1) goto N_Chat1;
-	if (@TEMP == 2) goto N_Chat2;
+	set @temp,rand(1,2);
+	if (@temp == 1) goto N_Chat1;
+	if (@temp == 2) goto N_Chat2;
 	mes "How are you reading this???";
 	mes "Well unless you are reading the code :)";
 	close;
@@ -80,8 +80,8 @@ yuno_in01,25,162,6	script	Female Wizard	2_F_MAGICMASTER,{
 	mes "Umm sorry I'm not gona waste my time talking to you if you arn't even a member!";
 	close;
 N_Member:
-	set @TEMP,rand(2);
-	if (@TEMP == 1) goto N_Chat;
+	set @temp,rand(2);
+	if (@temp == 1) goto N_Chat;
 	mes "Ahh welcome fellow Treasure Hunter "+strcharinfo(0)+".";
 	mes "Did you hear about that goat man running around in the trees?";
 	mes " ";
diff --git a/npc/custom/quests/thq/THQS_QuestNPC.txt b/npc/custom/quests/thq/THQS_QuestNPC.txt
index 1fad134aa..9a09089b0 100644
--- a/npc/custom/quests/thq/THQS_QuestNPC.txt
+++ b/npc/custom/quests/thq/THQS_QuestNPC.txt
@@ -30,7 +30,7 @@ yuno_in01,112,151,6	script	Quest Manager	1_M_SIZ,{
 	mes "Good well get back out there.";
 	close;
 N_PayZeny:
-	if (zeny < 2500) goto N_ZenyFail;
+	if (Zeny < 2500) goto N_ZenyFail;
 	set one_qset, 0;
 	set two_qset, 0;
 	set three_qset, 0;
diff --git a/npc/custom/quests/umbalian_language.txt b/npc/custom/quests/umbalian_language.txt
index 70ae07d28..5bb17955e 100644
--- a/npc/custom/quests/umbalian_language.txt
+++ b/npc/custom/quests/umbalian_language.txt
@@ -155,10 +155,10 @@ L_AGAIN:
 yuno,157,366,2	script	Wise Man Fabius	2_M_SAGE_OLD,{
 	mes "[Fabius]";
 	if(event_umbala >= 3) set umb_lang,2; //You already learnt Umbalian language from Umbalian Chief. So this Quest is disabled
-	if(umb_lang<2) goto L_QUEST;
+	if(umb_lang<2) goto L_Quest;
 	mes "You speak Umbalian fluently! So you will never forget the language of Umbalians!";
 	close;
-L_QUEST:
+L_Quest:
 	if((countitem(1006) < 1) || (countitem(7118) < 1) || (countitem(7117) < 1)) goto L_DONE;//Items: Old Magic Book, Torn Scroll, Torn Spell Book,
 	delitem 1006,1;	//Items: Old Magic Book,
 	delitem 7118,1;	//Items: Torn Scroll,
diff --git a/npc/custom/stylist.txt b/npc/custom/stylist.txt
index 387c876c2..4bbc8f8dd 100644
--- a/npc/custom/stylist.txt
+++ b/npc/custom/stylist.txt
@@ -12,23 +12,23 @@
 
 prontera,170,180,1	script	Stylist#custom_stylist	2_M_DYEINGER,{
 
-	setarray .@Styles[1],getbattleflag("max_cloth_color"),getbattleflag("max_hair_style"),getbattleflag("max_hair_color");
+	setarray .@styles[1],getbattleflag("max_cloth_color"),getbattleflag("max_hair_style"),getbattleflag("max_hair_color");
 	setarray .@Look[1],7,1,6;
 	set .@s, select(" ~ Cloth color: ~ Hairstyle: ~ Hair color");
 	set .@Revert, getlook(.@Look[.@s]);
-	set .@Style,1;
+	set .@style,1;
 	while(1) {
-		setlook .@Look[.@s], .@Style;
-		message strcharinfo(0),"This is style #"+.@Style+".";
-		set .@menu$, " ~ Next (^0055FF"+((.@Style!=.@Styles[.@s])?.@Style+1:1)+"^000000): ~ Previous (^0055FF"+((.@Style!=1)?.@Style-1:.@Styles[.@s])+"^000000): ~ Jump to...: ~ Revert to original (^0055FF"+.@Revert+"^000000)";
+		setlook .@Look[.@s], .@style;
+		message strcharinfo(0),"This is style #"+.@style+".";
+		set .@menu$, " ~ Next (^0055FF"+((.@style!=.@styles[.@s])?.@style+1:1)+"^000000): ~ Previous (^0055FF"+((.@style!=1)?.@style-1:.@styles[.@s])+"^000000): ~ Jump to...: ~ Revert to original (^0055FF"+.@Revert+"^000000)";
 		switch(select(.@menu$)) {
-			case 1: set .@Style, ((.@Style!=.@Styles[.@s])?.@Style+1:1); break;
-			case 2: set .@Style, ((.@Style!=1)?.@Style-1:.@Styles[.@s]); break;
-			case 3: message strcharinfo(0),"Choose a style between 1 - "+.@Styles[.@s]+".";
-				input .@Style,0,.@Styles[.@s];
-				if (!.@Style) set .@Style, rand(1,.@Styles[.@s]);
+			case 1: set .@style, ((.@style!=.@styles[.@s])?.@style+1:1); break;
+			case 2: set .@style, ((.@style!=1)?.@style-1:.@styles[.@s]); break;
+			case 3: message strcharinfo(0),"Choose a style between 1 - "+.@styles[.@s]+".";
+				input .@style,0,.@styles[.@s];
+				if (!.@style) set .@style, rand(1,.@styles[.@s]);
 				break;
-			case 4: set .@Style, .@Revert; setlook .@Look[.@s], .@Revert; break;
+			case 4: set .@style, .@Revert; setlook .@Look[.@s], .@Revert; break;
 		}
 	}
 }
diff --git a/npc/custom/woe_controller.txt b/npc/custom/woe_controller.txt
index 609b7942c..c21018d60 100644
--- a/npc/custom/woe_controller.txt
+++ b/npc/custom/woe_controller.txt
@@ -163,9 +163,9 @@ OnReward:
 	freeloop(1);
 	for(set .@i,0; .@i<30; set .@i,.@i+1)
 		if (getarg(0)&(1<<.@i)) {
-			set .@gid, getcastledata(.Castles$[.@i],1);
-			if (!.@gid) continue;
-			set .@size, query_sql("SELECT account_id,char_id FROM `guild_member` WHERE guild_id = '"+.@gid+"' AND "+.@sql$,.@aid,.@cid);
+			set .@GID, getcastledata(.Castles$[.@i],1);
+			if (!.@GID) continue;
+			set .@size, query_sql("SELECT account_id,char_id FROM `guild_member` WHERE guild_id = '"+.@GID+"' AND "+.@sql$,.@aid,.@cid);
 			for(set .@j,0; .@j<.@size; set .@j,.@j+1) {
 				if (.Options&8 && !(.Options&4)) {
 					set .@ip$, replacestr(getcharip(.@aid[.@j]),".","a");
@@ -297,26 +297,26 @@ while(1) {
 			}
 			mes "Select a day.";
 			next;
-			set .@Day, select(" ~ "+implode(.Days$,": ~ "))-1;
+			set .@day, select(" ~ "+implode(.Days$,": ~ "))-1;
 			mes "[New Session]";
-			mes "Select a start time for ^0055FF"+.Days$[.@Day]+"^000000.";
+			mes "Select a start time for ^0055FF"+.Days$[.@day]+"^000000.";
 			next;
 			set .@menu$,"";
 			for(set .@i,0; .@i<23; set .@i,.@i+1)
 				set .@menu$, .@menu$+" ~ "+Add_Zero(.@i,1)+":";
-			set .@Start, select(.@menu$)-1;
+			set .@start, select(.@menu$)-1;
 			mes "[New Session]";
-			mes "Select an end time for ^0055FF"+.Days$[.@Day]+"^000000.";
+			mes "Select an end time for ^0055FF"+.Days$[.@day]+"^000000.";
 			next;
 			set .@menu$,"";
-			for(set .@i,.@Start+1; .@i<24; set.@i,.@i+1)
+			for(set .@i,.@start+1; .@i<24; set.@i,.@i+1)
 				set .@menu$, .@menu$+" ~ "+Add_Zero(.@i,1)+":";
-			set .@End, select(.@menu$)+.@Start;
+			set .@end, select(.@menu$)+.@start;
 			for(set .@i,0; .@i<.Size; set .@i,.@i+4)
-				if (.@Day == $WOE_CONTROL[.@i] &&
-				   ((.@Start >= $WOE_CONTROL[.@i+1] && .@Start < $WOE_CONTROL[.@i+2]) ||
-				    (.@End > $WOE_CONTROL[.@i+1] && .@End <= $WOE_CONTROL[.@i+2]) ||
-				    (.@Start <= $WOE_CONTROL[.@i+1] && .@End >= $WOE_CONTROL[.@i+2]))) {
+				if (.@day == $WOE_CONTROL[.@i] &&
+				   ((.@start >= $WOE_CONTROL[.@i+1] && .@start < $WOE_CONTROL[.@i+2]) ||
+				    (.@end > $WOE_CONTROL[.@i+1] && .@end <= $WOE_CONTROL[.@i+2]) ||
+				    (.@start <= $WOE_CONTROL[.@i+1] && .@end >= $WOE_CONTROL[.@i+2]))) {
 					mes "[New Session]";
 					mes "The chosen times overlap with an existing session.";
 					next;
@@ -324,22 +324,22 @@ while(1) {
 					break;
 				}
 			if (.@d) { set .@d,0; break; }
-			set .@Castle,0;
+			set .@castle,0;
 			while(1) {
 				mes "[New Session]";
-				mes "^0055FF"+.Days$[.@Day]+" ("+Add_Zero(.@Start)+"-"+Add_Zero(.@End)+")^000000";
+				mes "^0055FF"+.Days$[.@day]+" ("+Add_Zero(.@start)+"-"+Add_Zero(.@end)+")^000000";
 				mes " > Castles:";
-				if (!.@Castle)
+				if (!.@castle)
 					mes "   ~ ^777777(none selected)^000000";
 				else for(set .@i,0; .@i<30; set .@i,.@i+1)
-					if (.@Castle&(1<<.@i)) mes "   ~ "+getcastlename(.Castles$[.@i])+" ("+.Castles$[.@i]+")";
+					if (.@castle&(1<<.@i)) mes "   ~ "+getcastlename(.Castles$[.@i])+" ("+.Castles$[.@i]+")";
 				next;
-				set .@menu$,((.@Castle)?" ~ ^FF0000Finished...^000000":"")+":";
+				set .@menu$,((.@castle)?" ~ ^FF0000Finished...^000000":"")+":";
 				for(set .@i,0; .@i<30; set .@i,.@i+1)
-					set .@menu$, .@menu$+" ~ "+((.@Castle&(1<<.@i))?"^0055FF":"")+getcastlename(.Castles$[.@i])+" ("+.Castles$[.@i]+")^000000:";
+					set .@menu$, .@menu$+" ~ "+((.@castle&(1<<.@i))?"^0055FF":"")+getcastlename(.Castles$[.@i])+" ("+.Castles$[.@i]+")^000000:";
 				set .@i, select(.@menu$)-1;
 				if (.@i)
-					set .@Castle, .@Castle^(1<<(.@i-1));
+					set .@castle, .@castle^(1<<(.@i-1));
 				else {
 					mes "[New Session]";
 					mes "Are you sure?";
@@ -347,13 +347,13 @@ while(1) {
 					switch(select(" ~ ^0055FFAdd session...^000000: ~ Continue selecting castles...: ~ ^777777Cancel^000000")) {
 					case 1:
 						for(set .@i,0; .@i<.Size; set .@i,.@i+4)
-							if ((.@Day == $WOE_CONTROL[.@i] && .@End <= $WOE_CONTROL[.@i+1]) || .@Day < $WOE_CONTROL[.@i]) {
+							if ((.@day == $WOE_CONTROL[.@i] && .@end <= $WOE_CONTROL[.@i+1]) || .@day < $WOE_CONTROL[.@i]) {
 								set .@d,1;
 								break;
 							}
 						if (!.@d) { set .@d,1; set .@i,.Size; }
 						copyarray $WOE_CONTROL[.@i+4], $WOE_CONTROL[.@i], .Size-.@i;
-						setarray $WOE_CONTROL[.@i], .@Day, .@Start, .@End, .@Castle;
+						setarray $WOE_CONTROL[.@i], .@day, .@start, .@end, .@castle;
 						set .Size, getarraysize($WOE_CONTROL);
 					case 3:
 						mes "[New Session]";
diff --git a/npc/events/dumplingfestival.txt b/npc/events/dumplingfestival.txt
index 1c94548f9..04a8b7f4c 100644
--- a/npc/events/dumplingfestival.txt
+++ b/npc/events/dumplingfestival.txt
@@ -37,7 +37,7 @@ payon,93,81,4	script	Exorcist Master Fahae	4_M_BUDDHIST,{
 	input @input;
 	if(@input==0) close;
 	if(@input>5) goto L_SORRY;
-	if(Zeny< @input*20000) goto L_NOZENY;
+	if(Zeny< @input*20000) goto L_NoZeny;
 	set Zeny,Zeny-20000*@input;
 	getitem 682,@input;
 	mes "[Exorcist Master Fahae]";
@@ -64,14 +64,14 @@ M_HERB:
 	input @input;
 	if(@input==0) close;
 	if(@input>5) goto L_SORRY;
-	if(Zeny< @input*10000) goto L_NOZENY;
+	if(Zeny< @input*10000) goto L_NoZeny;
 	set Zeny,Zeny-10000*@input;
 	getitem 683,@input;
 	mes "[Exorcist Master Fahae]";
 	mes "Here you go, I hope you may succeed in my quest.";
 	close;
 
-L_NOZENY:
+L_NoZeny:
 	mes "[Exorcist Master Fahae]";
 	mes "Money doesn't bring joy to everyone, but we need it to support the temple and myself. Please, try to kill some monsters and take their drops.";
 	close;
diff --git a/npc/events/whiteday.txt b/npc/events/whiteday.txt
index 7e921ed97..472f0030b 100644
--- a/npc/events/whiteday.txt
+++ b/npc/events/whiteday.txt
@@ -29,7 +29,7 @@ alberta,188,64,4	script	Sugar	4_F_02,{
 	mes "heartfelt like";
 	mes "the sweetness of the present some how.";
 	next;
-	menu "Please give me!",-,"I don't need it.",M_END,"The teacher.",M_L1;
+	menu "Please give me!",-,"I don't need it.",M_End,"The teacher.",M_L1;
 
 	mes "[Sugar]";
 	mes "Yes!";
@@ -69,7 +69,7 @@ L0_3:
 L_INPUT:
 	input @maplenum;
 	if (@maplenum > 5) goto L_ERROR;
-	if (@maplenum == 0) goto M_END;
+	if (@maplenum == 0) goto M_End;
 	set @maplePriceT,@maplePrice*@maplenum;
 	if (Zeny < @maplePriceT) goto L_ERROR2;
 	set Zeny,Zeny- @maplePriceT;
@@ -115,7 +115,7 @@ L_ERROR2:
 	mes "I will ask you to check your money first.";
 	close;
 
-M_END:
+M_End:
 	mes "[Sugar]";
 	mes "Really .... You might regret it..";
 	mes "If you change your mind.";
diff --git a/npc/events/xmas.txt b/npc/events/xmas.txt
index 37b91e6e0..d8423dda7 100644
--- a/npc/events/xmas.txt
+++ b/npc/events/xmas.txt
@@ -20,7 +20,7 @@
 //= 1.4 Added a fix to make Lutie & Bard quests passable during this event [Lupus]
 //============================================================
 
-xmas_in,100,96,4	script	Father Christmas::Santa2	4_M_SANTA,{
+xmas_in,100,96,4	script	Santa Claus::Santa2	4_M_SANTA,{
 	mes "[Santa Claus]";
 	if(xmas_npc==0) set xmas_npc, 1; // For Lutie & Bard quest
 	if(#event_xmas > 0 && #event_xmas < 30 ) goto L_Start;
@@ -104,7 +104,7 @@ L_Start:
 		close;
 
 OnInit:
-	disablenpc "Santa1";
+	disablenpc "Santa Claus";
 	end;
 }
 
diff --git a/npc/merchants/coin_exchange.txt b/npc/merchants/coin_exchange.txt
index b2c65f966..1e929bf86 100644
--- a/npc/merchants/coin_exchange.txt
+++ b/npc/merchants/coin_exchange.txt
@@ -54,8 +54,8 @@
 				if (countitem(.@coin)) {
 					mes .@n$;
 					mes "Thank you for coming.";
-					delitem .@Coin,1; 
-					getitem .@Items[.@i],3;
+					delitem .@coin,1;
+					getitem .@items[.@i],3;
 					close;
 				}
 				else {
diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt
index b8e43199d..3f7d1d20a 100644
--- a/npc/other/Global_Functions.txt
+++ b/npc/other/Global_Functions.txt
@@ -309,14 +309,14 @@ function	script	F_GetArmorType	{
 // Time calculation Function
 // *********************************************************************
 function	script	Time2Str	{
-	set .@Time_Left, getarg(0) - gettimetick(2);
+	set .@time_left, getarg(0) - gettimetick(2);
 	
-	set .@Days, .@Time_Left / 86400;
-	set .@Time_Left, .@Time_Left - (.@Days * 86400);
-	set .@Hours, .@Time_Left / 3600;
-	set .@Time_Left, .@Time_Left - (.@Hours * 3600);
-	set .@Minutes, .@Time_Left / 60;
-	set .@Time_Left, .@Time_Left - (.@Minutes * 60);
+	set .@Days, .@time_left / 86400;
+	set .@time_left, .@time_left - (.@Days * 86400);
+	set .@Hours, .@time_left / 3600;
+	set .@time_left, .@time_left - (.@Hours * 3600);
+	set .@Minutes, .@time_left / 60;
+	set .@time_left, .@time_left - (.@Minutes * 60);
 	
 	set .@Time$, "";
 	if( .@Days > 1 )
@@ -334,10 +334,10 @@ function	script	Time2Str	{
 	else if( .@Minutes > 0 )
 		set .@Time$, .@Time$ + .@Minutes + " minute, ";
 
-	if( .@Time_Left > 1 || .@Time_Left == 0 )
-		set .@Time$, .@Time$ + .@Time_Left + " seconds";
-	else if( .@Time_Left == 1 )
-		set .@Time$, .@Time$ + .@Time_Left + " second";
+	if( .@time_left > 1 || .@time_left == 0 )
+		set .@Time$, .@Time$ + .@time_left + " seconds";
+	else if( .@time_left == 1 )
+		set .@Time$, .@Time$ + .@time_left + " second";
 	
 	return .@Time$;
 }
diff --git a/npc/quests/dandelion_request.txt b/npc/quests/dandelion_request.txt
index 47d9964f7..e278a4773 100644
--- a/npc/quests/dandelion_request.txt
+++ b/npc/quests/dandelion_request.txt
@@ -7950,7 +7950,7 @@ OnTouch:
 	mes "What was that?";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate1_talk2";
 	end;
 }
@@ -8007,7 +8007,7 @@ OnTouch:
 	mes "............";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate1_talk3";
 	end;
 }
@@ -8059,7 +8059,7 @@ OnTouch:
 	mes "in Castle Morroc...";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate1_talk4";
 	end;
 }
@@ -8096,7 +8096,7 @@ OnTouch:
 	mes "Come on, let's go...";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate1_talk5";
 	end;
 }
@@ -8169,7 +8169,7 @@ OnTouch:
 	mes "the hell is Raiyan Moore?!";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate1_talk6";
 	end;
 }
@@ -8223,7 +8223,7 @@ OnTouch:
 	mes "don't let me be too late!";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate1_talk7";
 	end;
 }
@@ -8933,7 +8933,7 @@ OnTouch:
 	mes "What was that?";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate2_talk2";
 	end;
 }
@@ -8990,7 +8990,7 @@ OnTouch:
 	mes "............";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate2_talk3";
 	end;
 }
@@ -9042,7 +9042,7 @@ OnTouch:
 	mes "in Castle Morroc...";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate2_talk4";
 	end;
 }
@@ -9079,7 +9079,7 @@ OnTouch:
 	mes "Come on, let's go...";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate2_talk5";
 	end;
 }
@@ -9152,7 +9152,7 @@ OnTouch:
 	mes "the hell is Raiyan Moore?!";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate2_talk6";
 	end;
 }
@@ -9206,7 +9206,7 @@ OnTouch:
 	mes "don't let me be too late!";
 	close2;
 	soundeffect "wander_man_move.wav",0;
-	sc_end SC_All;
+	sc_end SC_ALL;
 	disablenpc "#maogate2_talk7";
 	end;
 }