Canonicalize event label capitalization

21 files changed, 145 insertions, 145 deletions

diff --git a/world/map/npc/005-4/bossfight.txt b/world/map/npc/005-4/bossfight.txt
index 4a197025..8f8ab384 100644
--- a/world/map/npc/005-4/bossfight.txt
+++ b/world/map/npc/005-4/bossfight.txt
@@ -23,11 +23,11 @@ L_Start_Level_1:
     mapannounce "005-4.gat", "Level 1 starting", 0;
 
     // Random colors for everyone!
-    areatimer "005-4.gat", 19, 19, 54, 37, 10, "Switch#elecave::onChaos";
+    areatimer "005-4.gat", 19, 19, 54, 37, 10, "Switch#elecave::OnChaos";
 
     // Two red, two blue.
-    areamonster "005-4.gat", 19, 19, 54, 37, "", 1080, 2, "Switch#elecave::onBlueDeath";
-    areamonster "005-4.gat", 19, 19, 54, 37, "", 1081, 2, "Switch#elecave::onRedDeath";
+    areamonster "005-4.gat", 19, 19, 54, 37, "", 1080, 2, "Switch#elecave::OnBlueDeath";
+    areamonster "005-4.gat", 19, 19, 54, 37, "", 1081, 2, "Switch#elecave::OnRedDeath";
     goto L_Exit; // This one is triggered on talking to the switch.
 
 L_Enjoy:
@@ -59,8 +59,8 @@ OnTimer3000:
     set $@ELE_CAVE_PLAYER_COUNT, 0; // The onTick refills this with a live count
 
     // We punish them for having a different count (Aka need kill them at the same time)
-    set $@ELE_CAVE_RED_COUNT, mobcount("005-4.gat","Switch#elecave::onRedDeath") + 1;
-    set $@ELE_CAVE_BLUE_COUNT, mobcount("005-4.gat","Switch#elecave::onBlueDeath") + 1;
+    set $@ELE_CAVE_RED_COUNT, mobcount("005-4.gat","Switch#elecave::OnRedDeath") + 1;
+    set $@ELE_CAVE_BLUE_COUNT, mobcount("005-4.gat","Switch#elecave::OnBlueDeath") + 1;
 
     set $@ELE_CAVE_DIFF, 0;
     if ($@ELE_CAVE_RED_COUNT > $@ELE_CAVE_BLUE_COUNT) goto L_More_Red;
@@ -85,7 +85,7 @@ L_More_Blue:
 
 L_Next_Step:
     // Basic per player logic
-    areatimer "005-4.gat", 19, 19, 54, 37, 10, "Switch#elecave::onTick";
+    areatimer "005-4.gat", 19, 19, 54, 37, 10, "Switch#elecave::OnTick";
 
     if ($@ELE_CAVE_RED_COUNT == 0 && $@ELE_CAVE_BLUE_COUNT == 0) goto L_Next_Level;
 
@@ -103,11 +103,11 @@ L_Start_Level_2:
     mapannounce "005-4.gat", "Level 2 starting", 0;
 
     // Random colors for everyone!
-    areatimer "005-4.gat", 19, 19, 54, 37, 10, "Switch#elecave::onChaos";
+    areatimer "005-4.gat", 19, 19, 54, 37, 10, "Switch#elecave::OnChaos";
 
     // four red, four blue.
-    areamonster "005-4.gat", 19, 19, 54, 37, "", 1080, 4, "Switch#elecave::onBlueDeath";
-    areamonster "005-4.gat", 19, 19, 54, 37, "", 1081, 4, "Switch#elecave::onRedDeath";
+    areamonster "005-4.gat", 19, 19, 54, 37, "", 1080, 4, "Switch#elecave::OnBlueDeath";
+    areamonster "005-4.gat", 19, 19, 54, 37, "", 1081, 4, "Switch#elecave::OnRedDeath";
     end;
 
 L_Start_Level_3:
@@ -116,23 +116,23 @@ L_Start_Level_3:
     mapannounce "005-4.gat", "Level 3 starting", 0;
 
     // Random colors for everyone!
-    areatimer "005-4.gat", 19, 19, 54, 37, 10, "Switch#elecave::onChaos";
+    areatimer "005-4.gat", 19, 19, 54, 37, 10, "Switch#elecave::OnChaos";
 
     // eight red, eight blue.
-    areamonster "005-4.gat", 19, 19, 54, 37, "", 1080, 8, "Switch#elecave::onBlueDeath";
-    areamonster "005-4.gat", 19, 19, 54, 37, "", 1081, 8, "Switch#elecave::onRedDeath";
+    areamonster "005-4.gat", 19, 19, 54, 37, "", 1080, 8, "Switch#elecave::OnBlueDeath";
+    areamonster "005-4.gat", 19, 19, 54, 37, "", 1081, 8, "Switch#elecave::OnRedDeath";
     end;
 
 // Being ticks
 
-onChaos:
+OnChaos:
     if (isdead()) end;
 L_Set_Color:
     message strcharinfo(0), "You feel funny.  You think your color has changed.";
     set @ELE_CAVE_COLOR, rand(1, 2);
     end;
 
-onTick:
+OnTick:
     if (isdead()) end;
 
     // Count this player as alive
@@ -175,21 +175,21 @@ L_Heal:
     end;
 
 // Death triggers
-onBlueDeath:
+OnBlueDeath:
     // Blue players have to kill blue sparks
     if (@ELE_CAVE_COLOR == 2) end;
     message strcharinfo(0), "The dying spark reacts explosively with you.  You should only kill sparks with the same color as you.";
     heal MaxHp / -2, 0;
     end;
 
-onRedDeath:
+OnRedDeath:
     // Red players have to kill red sparks
     if (@ELE_CAVE_COLOR == 1) end;
     message strcharinfo(0), "The dying spark reacts explosively with you.  You should only kill sparks with the same color as you.";
     heal MaxHp / -2, 0;
     end;
 
-onInit:
+OnInit:
     if (debug >= 2) end;
     initnpctimer;
     stopnpctimer;
@@ -200,8 +200,8 @@ L_CleanUp:
     set $@ELE_CAVE_LEVEL, 0;
     set $@ELE_CAVE_ROUND_TIMER, 0;
 
-    killmonster "005-4.gat", "Switch#elecave::onBlueDeath";
-    killmonster "005-4.gat", "Switch#elecave::onRedDeath";
+    killmonster "005-4.gat", "Switch#elecave::OnBlueDeath";
+    killmonster "005-4.gat", "Switch#elecave::OnRedDeath";
 
     stopnpctimer;
     setnpctimer 0;
diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-1/witch.txt
index 4fddbc8e..8eb78a2b 100644
--- a/world/map/npc/007-1/witch.txt
+++ b/world/map/npc/007-1/witch.txt
@@ -643,7 +643,7 @@ OnTimer300000:
 {
 end;
 
-onInit:
+OnInit:
     disablenpc "#IlliaTorch1";
     disablenpc "#IlliaTorch2";
     disablenpc "#IlliaTorch3";
diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt
index 1ab74af3..66c1c746 100644
--- a/world/map/npc/008-1/annualeaster.txt
+++ b/world/map/npc/008-1/annualeaster.txt
@@ -133,7 +133,7 @@ L_End1:
 {
     end;
 
-onInit:
+OnInit:
     set $@EASTER_FOUND_WAIT_TIME, 15;
     set $@EASTER_FINAL_REW_INV_CHANCE, 70;
     set $@EASTER_EGG_INV_CHANCE, 750;
diff --git a/world/map/npc/009-6/brodomir.txt b/world/map/npc/009-6/brodomir.txt
index ab26c081..8d9bf5f5 100644
--- a/world/map/npc/009-6/brodomir.txt
+++ b/world/map/npc/009-6/brodomir.txt
@@ -192,10 +192,10 @@ L_SkipItemback:
 L_Check:
     if (getareausers("009-5.gat", 20, 20, 80, 80, 1) > 1)
         end;
-    areatimer "009-5.gat", 20, 20, 80, 80, 0, "Brodomir::onReward";
+    areatimer "009-5.gat", 20, 20, 80, 80, 0, "Brodomir::OnReward";
     goto L_End;
 
-onReward:
+OnReward:
     if (isdead())
         goto L_Dead;
     message strcharinfo(0), "Congratulations you won!";
diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt
index 4344b9ce..8fb16e2c 100644
--- a/world/map/npc/011-1/auldsbel.txt
+++ b/world/map/npc/011-1/auldsbel.txt
@@ -944,10 +944,10 @@ L_component_quest_5:
     mes "\"I suggest that you run.\"";
     next;
     misceffect sfx_magic_transmute;
-    monster "this", 50, 68, "Grass Snake", 1034, 4, "Auldsbel#_M::onSnakeDeath";
+    monster "this", 50, 68, "Grass Snake", 1034, 4, "Auldsbel#_M::OnSnakeDeath";
     close;
 
-onSnakeDeath:
+OnSnakeDeath:
     set BOSS_POINTS, BOSS_POINTS + 5;
     message strcharinfo(0), "You gain 5 Boss Points giving you a total of " + BOSS_POINTS + ".";
     end;
diff --git a/world/map/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt
index 66f817c1..c9ee88da 100644
--- a/world/map/npc/011-1/oscar.txt
+++ b/world/map/npc/011-1/oscar.txt
@@ -299,7 +299,7 @@ L_QuestAlreadyDone:
     mes "That was interesting, but really, fruits are more quiet!\"";
     goto L_End;
 
-onInit:
+OnInit:
     set $@halloween_num_seeds, 12;
     set $@halloween_num_water_bottles, 15;
     set $@halloween_num_pumpkins, $@halloween_num_seeds * 4;
@@ -312,8 +312,8 @@ OnTimer3000:
         end;
     callsub S_CheckPlayer;
     set $@HalloweenQuest_PumpkinsTimer, $@HalloweenQuest_PumpkinsTimer + 1;
-    if (mobcount("011-1.gat", "Oscar::onPD")  < 0 &&
-        mobcount("011-1.gat", "Oscar::onPDP") < 0 &&
+    if (mobcount("011-1.gat", "Oscar::OnPD")  < 0 &&
+        mobcount("011-1.gat", "Oscar::OnPDP") < 0 &&
         $@HalloweenQuest_PumpkinsCount <= 0)
         goto L_AllPumpkinsDead;
     // A quick "cheer up"
@@ -329,14 +329,14 @@ OnTimer3000:
 
 L_TrySpawnPumpkin:
     if ($@HalloweenQuest_PumpkinsCount > 0)
-        areamonster "011-1.gat", 97, 40, 101, 44, "", 1063, 1, "Oscar::onPD";
+        areamonster "011-1.gat", 97, 40, 101, 44, "", 1063, 1, "Oscar::OnPD";
     setnpctimer 0;
     end;
 
 OnTimer2500:
     if ($@HalloweenQuest_PumpkinsState != 0)
         end;
-    areamonster "011-1.gat", 97, 40, 101, 44, "", 1063, 2, "Oscar::onPD";
+    areamonster "011-1.gat", 97, 40, 101, 44, "", 1063, 2, "Oscar::OnPD";
     end;
 
 OnTimer6000:
@@ -348,7 +348,7 @@ OnTimer6000:
     setnpctimer 0;
     end;
 
-onPD:
+OnPD:
     if (strcharinfo(0) != $@HalloweenQuest_PumpkinHunter$)
         goto L_KillBadHunter;
     set $@HalloweenQuest_PumpkinsCount, $@HalloweenQuest_PumpkinsCount - 1;
@@ -369,18 +369,18 @@ onPD:
         getitem "PumpkinHelmet", 1;
     // huntsman spider x1
     if (@halloween_rand < (15*BaseLevel)/100)
-        areamonster "011-1.gat", 97, 40, 101, 44, "", 1083, 1, "Oscar::onPDP";
+        areamonster "011-1.gat", 97, 40, 101, 44, "", 1083, 1, "Oscar::OnPDP";
     // Or spider x1
     if (@halloween_rand >= (15*BaseLevel)/100 && @halloween_rand < (75*BaseLevel)/100)
-        areamonster "011-1.gat", 97, 40, 101, 44, "", 1012, 1, "Oscar::onPDP";
+        areamonster "011-1.gat", 97, 40, 101, 44, "", 1012, 1, "Oscar::OnPDP";
     // Or archant x2
     if (@halloween_rand >= (75*BaseLevel)/100)
-        areamonster "011-1.gat", 97, 40, 101, 44, "", 1060, 2, "Oscar::onPDP";
+        areamonster "011-1.gat", 97, 40, 101, 44, "", 1060, 2, "Oscar::OnPDP";
 
     set @halloween_rand, 0;
     end;
 
-onPDP:
+OnPDP:
     end;
 
 L_KillBadHunter:
@@ -435,8 +435,8 @@ L_Success:
     goto L_Clean;
 
 L_Clean:
-    killmonster "011-1.gat", "Oscar::onPD";
-    killmonster "011-1.gat", "Oscar::onPDP";
+    killmonster "011-1.gat", "Oscar::OnPD";
+    killmonster "011-1.gat", "Oscar::OnPDP";
     set $@HalloweenQuest_PumpkinHunter$, "";
     set $@HalloweenQuest_PumpkinsCount, 0;
     set $@HalloweenQuest_PumpkinsState, 0;
diff --git a/world/map/npc/011-6/bryant.txt b/world/map/npc/011-6/bryant.txt
index 9bc94df8..528bf434 100644
--- a/world/map/npc/011-6/bryant.txt
+++ b/world/map/npc/011-6/bryant.txt
@@ -25,10 +25,10 @@ L_Bryant_Summon:
     mes "\"I believe I saw him run into a cave south and east of here.  There is a red carpet in front of the cave entrance.  Be careful and good luck.\"";
     set @state, 4;
     callsub S_Update_Var;
-    monster "011-6.gat",260,250,"BanditLord",1065,1, "Bryant::onBanditLordDead";
+    monster "011-6.gat",260,250,"BanditLord",1065,1, "Bryant::OnBanditLordDead";
     goto L_Close;
 
-onBanditLordDead:
+OnBanditLordDead:
     message strcharinfo(0), "You killed the bandit lord.";
     set @state, ((QUEST_Hurnscald & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
     if (@state != 4)
@@ -51,15 +51,15 @@ L_Bryant_Waits:
 L_Bryant_No:
     mes "[Bryant]";
     mes "\"Well, maybe he ran off.  I'm pretty sure he should be there now.\"";
-    killmonster "011-6.gat", "Bryant::onBanditLordDead";
-    monster "011-6.gat",260,250,"BanditLord",1065,1, "Bryant::onBanditLordDead";
+    killmonster "011-6.gat", "Bryant::OnBanditLordDead";
+    monster "011-6.gat",260,250,"BanditLord",1065,1, "Bryant::OnBanditLordDead";
     goto L_Close;
 
 L_Bryant_Yes:
     mes "[Bryant]";
     mes "\"I don't think you killed him.  Please try to find and kill him.  He should be in the cave south and east of here with the red carpet in front of it.\"";
-    killmonster "011-6.gat", "Bryant::onBanditLordDead";
-    monster "011-6.gat",260,250,"BanditLord",1065,1, "Bryant::onBanditLordDead";
+    killmonster "011-6.gat", "Bryant::OnBanditLordDead";
+    monster "011-6.gat",260,250,"BanditLord",1065,1, "Bryant::OnBanditLordDead";
     goto L_Close;
 
 L_Bryant_Quiet:
diff --git a/world/map/npc/019-1/mobmanager.txt b/world/map/npc/019-1/mobmanager.txt
index b2269658..22917bea 100644
--- a/world/map/npc/019-1/mobmanager.txt
+++ b/world/map/npc/019-1/mobmanager.txt
@@ -4,7 +4,7 @@
 {
     end; // just to be secure
 
-onInit:
+OnInit:
     set $@019_1_SANTASLIME_MONSTER_MAX_NUMBER,15;
     set $@019_1_SANTASLIME_MOMSTER_ID,1015;
     set $@019_1_SANTASLIME_MONSTER_SPAWN_X1,32;
diff --git a/world/map/npc/027-2/caretaker.txt b/world/map/npc/027-2/caretaker.txt
index ddacf86a..cb1cdc8f 100644
--- a/world/map/npc/027-2/caretaker.txt
+++ b/world/map/npc/027-2/caretaker.txt
@@ -117,7 +117,7 @@ OnTimer3000:
     setnpctimer 0;
     end;
 
-onInit:
+OnInit:
     monster "027-2.gat", 29, 21, "Caretaker's Wife", 1044, 1, "Caretaker::OnWifeDeath";
     end;
 
diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt
index 75bb4878..41b5d79c 100644
--- a/world/map/npc/029-3/parua.txt
+++ b/world/map/npc/029-3/parua.txt
@@ -139,7 +139,7 @@ OnTimer5000:
 
 L_Return_1:
     set $@FIGHT_CAVE_PLAYER_COUNT, 0;
-    areatimer "029-3.gat", 20, 20, 70, 60, 10, "Parua::onTick";
+    areatimer "029-3.gat", 20, 20, 70, 60, 10, "Parua::OnTick";
     end;
 
 L_CaveLogic:
@@ -149,7 +149,7 @@ L_CaveLogic:
     if ($@FIGHT_CAVE_PLAYER_COUNT <= 0)
         goto L_CleanUp;
     set $@FIGHT_CAVE_ROUND_TIMER, $@FIGHT_CAVE_ROUND_TIMER + 5; // Advance 5 seconds
-    if (mobcount("029-3.gat", "Parua::onPetDeath") <= 0)
+    if (mobcount("029-3.gat", "Parua::OnPetDeath") <= 0)
         goto L_NextRound;
     if ($@FIGHT_CAVE_ROUND_TIMER + $@FIGHT_CAVE_ROUND_PEN >= 120)
         goto L_NextRound;
@@ -167,7 +167,7 @@ L_NextRound:
         goto L_CleanUp;
     set $@FIGHT_CAVE_POINTS, $@FIGHT_CAVE_LEVEL;
 
-    areatimer "029-3.gat", 20, 20, 70, 60, 10, "Parua::onNewRound";
+    areatimer "029-3.gat", 20, 20, 70, 60, 10, "Parua::OnNewRound";
 
     mapannounce "029-1.gat", "Parua: The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0;
     mapannounce "029-3.gat", "Parua: The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0;
@@ -233,47 +233,47 @@ L_Fifteen_Minutes:
 L_MOB1:
     set $@MOB_1_SUMMON, $@MOB_1_SUMMON + 1;
     set $@FIGHT_CAVE_POINTS, $@FIGHT_CAVE_POINTS - 243;
-    areamonster "029-3.gat", 20, 20, 70, 60, "", 1022, 1, "Parua::onPetDeath";
+    areamonster "029-3.gat", 20, 20, 70, 60, "", 1022, 1, "Parua::OnPetDeath";
     goto L_Summon;
 
 L_MOB2:
     set $@MOB_2_SUMMON, $@MOB_2_SUMMON + 1;
     set $@FIGHT_CAVE_POINTS, $@FIGHT_CAVE_POINTS - 81;
-    areamonster "029-3.gat", 20, 20, 70, 60, "", 1045, 1, "Parua::onPetDeath";
+    areamonster "029-3.gat", 20, 20, 70, 60, "", 1045, 1, "Parua::OnPetDeath";
     goto L_Summon;
 
 L_MOB3:
     set $@MOB_3_SUMMON, $@MOB_3_SUMMON + 1;
     set $@FIGHT_CAVE_POINTS, $@FIGHT_CAVE_POINTS - 27;
-    areamonster "029-3.gat", 20, 20, 70, 60, "", 1024, 1, "Parua::onPetDeath";
+    areamonster "029-3.gat", 20, 20, 70, 60, "", 1024, 1, "Parua::OnPetDeath";
     goto L_Summon;
 
 L_MOB4:
     set $@MOB_4_SUMMON, $@MOB_4_SUMMON + 1;
     set $@FIGHT_CAVE_POINTS, $@FIGHT_CAVE_POINTS - 9;
-    areamonster "029-3.gat", 20, 20, 70, 60, "", 1043, 1, "Parua::onPetDeath";
+    areamonster "029-3.gat", 20, 20, 70, 60, "", 1043, 1, "Parua::OnPetDeath";
     goto L_Summon;
 
 L_MOB5:
     set $@MOB_5_SUMMON, $@MOB_5_SUMMON + 1;
     set $@FIGHT_CAVE_POINTS, $@FIGHT_CAVE_POINTS - 3;
-    areamonster "029-3.gat", 20, 20, 70, 60, "", 1010, 1, "Parua::onPetDeath";
+    areamonster "029-3.gat", 20, 20, 70, 60, "", 1010, 1, "Parua::OnPetDeath";
     goto L_Summon;
 
 L_MOB6:
     set $@MOB_6_SUMMON, $@MOB_6_SUMMON + 1;
     set $@FIGHT_CAVE_POINTS, $@FIGHT_CAVE_POINTS - 1;
-    areamonster "029-3.gat", 20, 20, 70, 60, "", 1008, 1, "Parua::onPetDeath";
+    areamonster "029-3.gat", 20, 20, 70, 60, "", 1008, 1, "Parua::OnPetDeath";
     goto L_Summon;
 
 // Called on each player once every 5 seconds
-onTick:
+OnTick:
     if (isdead()) end;
     set $@FIGHT_CAVE_PLAYER_COUNT, $@FIGHT_CAVE_PLAYER_COUNT + 1;
     end;
 
 // called on each player when a new round begins
-onNewRound:
+OnNewRound:
     if (isdead())
         end;
     if ($@FIGHT_CAVE_LEVEL < 600)
@@ -290,10 +290,10 @@ onNewRound:
     message strcharinfo(0), "The evil energy of this place hurts you. You should keep moving!";
     end;
 
-onPetDeath:
+OnPetDeath:
     end;
 
-onInit:
+OnInit:
     if (debug >= 2) end;
     initnpctimer;
     stopnpctimer;
@@ -301,12 +301,12 @@ onInit:
 L_CleanUp:
     npctalk "Game Over";
     mapannounce "029-1.gat", "Parua: The dungeon is now ready for its next victims.", 0;
-    areatimer "029-3.gat", 20, 20, 70, 60, 10, "Parua::onReward";
+    areatimer "029-3.gat", 20, 20, 70, 60, 10, "Parua::OnReward";
     set $@FIGHT_CAVE_STATUS, 0;
     set $@FIGHT_CAVE_PLAYER_COUNT, 0;
     set $@FIGHT_CAVE_LEVEL, 1;
     set $@FIGHT_CAVE_ROUND_TIMER, 0;
-    killmonster "029-3.gat", "Parua::onPetDeath";
+    killmonster "029-3.gat", "Parua::OnPetDeath";
     stopnpctimer;
     setnpctimer 0;
     end;
@@ -336,7 +336,7 @@ L_IdleCheckPassed:
     //set @candor_idle_counter, 0;
     end;
 
-onReward:
+OnReward:
     if (isdead())
         end;
     set BOSS_POINTS, BOSS_POINTS + 100;
diff --git a/world/map/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt
index 2534981a..6c03e951 100644
--- a/world/map/npc/031-4/cindyCave.txt
+++ b/world/map/npc/031-4/cindyCave.txt
@@ -64,7 +64,7 @@ L_Try_Cage:
     set $@FIGHT_YETI_WAVE, 0;
     set $@YETI_COUNT, 1;
     set $@FIGHT_YETI_PLAYER_COUNT, getmapusers("031-4.gat");
-    areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, 1, "Cindy::onPetDeath";
+    areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, 1, "Cindy::OnPetDeath";
 
     initnpctimer;
     goto L_Close;
@@ -142,7 +142,7 @@ OnTimer5000:
 
 L_Return_1:
     set $@FIGHT_YETI_PLAYER_COUNT, 0;
-    areatimer "031-4.gat", 0, 0, 95, 91, 10, "Cindy::onTick";
+    areatimer "031-4.gat", 0, 0, 95, 91, 10, "Cindy::OnTick";
     end;
 
 L_CaveLogic:
@@ -152,7 +152,7 @@ L_CaveLogic:
     if ($@FIGHT_YETI_PLAYER_COUNT <= 0)
         goto L_CleanUp;
     set $@FIGHT_YETI_ROUND_TIMER, $@FIGHT_YETI_ROUND_TIMER + 5; // Advance 5 seconds
-    if (mobcount("031-4.gat", "Cindy::onPetDeath") < 0)
+    if (mobcount("031-4.gat", "Cindy::OnPetDeath") < 0)
         goto L_NextWave;
     if ($@FIGHT_YETI_ROUND_TIMER + $@FIGHT_YETI_ROUND_PEN >= 120)
         goto L_NextWave;
@@ -168,13 +168,13 @@ L_NextWave:
         && $@FIGHT_YETI_WAVE < 22)
             goto L_Return_1;
     if ($@FIGHT_YETI_WAVE > 22)
-        areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, $@FIGHT_YETI_WAVE*2 + $@FIGHT_YETI_PLAYER_COUNT*5, "Cindy::onPetDeath";
+        areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, $@FIGHT_YETI_WAVE*2 + $@FIGHT_YETI_PLAYER_COUNT*5, "Cindy::OnPetDeath";
     if ($@FIGHT_YETI_WAVE > 22)
         set $@YETI_COUNT, $@YETI_COUNT + $@FIGHT_YETI_WAVE*2 + $@FIGHT_YETI_PLAYER_COUNT*5;
     set $@FIGHT_YETI_NUMBER, (5 + (1 * $@FIGHT_YETI_WAVE) + (2 * $@FIGHT_YETI_PLAYER_COUNT))/4;
     set $@YETI_COUNT, $@YETI_COUNT + $@FIGHT_YETI_NUMBER;
 
-    areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, $@FIGHT_YETI_NUMBER, "Cindy::onPetDeath";
+    areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, $@FIGHT_YETI_NUMBER, "Cindy::OnPetDeath";
 
     if ($@FIGHT_YETI_WAVE == 1)
         mapannounce "031-4.gat", "Cindy: Yetis!", 0;
@@ -221,17 +221,17 @@ L_NextWave:
     goto L_Return_1;
 
 // Called on each player once every 5 seconds
-onTick:
+OnTick:
     if (isdead()) end;
     set $@FIGHT_YETI_PLAYER_COUNT, $@FIGHT_YETI_PLAYER_COUNT + 1;
     end;
 
-onPetDeath:
+OnPetDeath:
     set $@YETI_COUNT, $@YETI_COUNT - 1;
     end;
 
 L_CleanUp:
-    areatimer "031-4.gat", 0, 0, 95, 91, 10, "Cindy::onReward";
+    areatimer "031-4.gat", 0, 0, 95, 91, 10, "Cindy::OnReward";
     set $@FIGHT_YETI_STATUS, 0;
     set $@FIGHT_YETI_PLAYER_COUNT, 0;
     set $@FIGHT_YETI_WAVE, 0;
@@ -239,12 +239,12 @@ L_CleanUp:
     set $@YETI_COUNT, 0;
     set $@FIGHT_YETI_ROUND_PEN, 0;
     set $@FIGHT_YETI_NUMBER, 0;
-    killmonster "031-4.gat", "Cindy::onPetDeath";
+    killmonster "031-4.gat", "Cindy::OnPetDeath";
     stopnpctimer;
     setnpctimer 0;
     end;
 
-onReward:
+OnReward:
     if (isdead()) end;
     set @bonus, (BaseLevel/2);
     set DailyQuestBonus, DailyQuestBonus + @bonus;
diff --git a/world/map/npc/042-1/hasan.txt b/world/map/npc/042-1/hasan.txt
index a8774166..581eb83a 100644
--- a/world/map/npc/042-1/hasan.txt
+++ b/world/map/npc/042-1/hasan.txt
@@ -96,7 +96,7 @@ L_Trick:
     set $@ScorpionTimer, 0;
     set $@ScorpionFighter, getcharid(3);
     set $@ScorpDeath, PC_DIE_COUNTER;
-    monster "042-1.gat",89,63,"Scorpion",1003,1, "Hasan::onScorpionDeath";
+    monster "042-1.gat",89,63,"Scorpion",1003,1, "Hasan::OnScorpionDeath";
     initnpctimer;
     end;
 
@@ -158,11 +158,11 @@ L_SummonAgain:
     message strcharinfo(0), "Kaan is mad at you for your interference! He walks over to the edge of the cliff and throws a rock on top of your head, then lets another scorpion run just near Hasan!";
     percentheal -100, 0;
     message strcharinfo(0), "Kaan: \"Just go while he is distracted and no one is interfering!\"";
-    monster "042-1.gat",89,63,"Scorpion",1003,1, "Hasan::onScorpionDeath";
+    monster "042-1.gat",89,63,"Scorpion",1003,1, "Hasan::OnScorpionDeath";
     end;
 
 L_Clean:
-    killmonster "042-1.gat", "Hasan::onScorpionDeath";
+    killmonster "042-1.gat", "Hasan::OnScorpionDeath";
     set $@ScorpionFighter, 0;
     set $@ScorpionTimer, 0;
     set $@ScorpDeath, 0;
@@ -200,7 +200,7 @@ OnTimer5000:
     setnpctimer 0;
     end;
 
-onScorpionDeath:
+OnScorpionDeath:
     if (getcharid(3) != $@ScorpionFighter)
         goto L_SummonAgain;
     if (hasan != 3)
diff --git a/world/map/npc/051-3/ambush.txt b/world/map/npc/051-3/ambush.txt
index 5d31eff5..109d55b2 100644
--- a/world/map/npc/051-3/ambush.txt
+++ b/world/map/npc/051-3/ambush.txt
@@ -72,17 +72,17 @@ OnTimer9000:
     end;
 
 OnTimer11000:
-    areatimer "051-3.gat", 22, 12, 102, 97, 500, "#BndtTl::onOuch";
-    areatimer "051-3.gat", 22, 12, 102, 97, 3000, "#BndtTl::onA";
+    areatimer "051-3.gat", 22, 12, 102, 97, 500, "#BndtTl::OnOuch";
+    areatimer "051-3.gat", 22, 12, 102, 97, 3000, "#BndtTl::OnA";
     stopnpctimer;
     setnpctimer 0;
     end;
 
-onOuch:
+OnOuch:
     message strcharinfo(0), "Ouch my head...";
     end;
 
-onA:
+OnA:
     if (strcharinfo(0) == $@ILLIA_HERO$)
         goto L_CaptureHero;
     if (strcharinfo(0) == $@ILLIA_HELPER1$)
diff --git a/world/map/npc/051-3/janitor.txt b/world/map/npc/051-3/janitor.txt
index 32a9f22c..527ca24c 100644
--- a/world/map/npc/051-3/janitor.txt
+++ b/world/map/npc/051-3/janitor.txt
@@ -5,7 +5,7 @@ end;
 
 OnCommandClean:
     // Kill all remaining bandits spawned during the "reinforcements" event
-    killmonster "051-1.gat", "Door::onB";
+    killmonster "051-1.gat", "Door::OnB";
     end;
 
 }
diff --git a/world/map/npc/051-3/reinforcements.txt b/world/map/npc/051-3/reinforcements.txt
index 62e78bf6..90699b8b 100644
--- a/world/map/npc/051-3/reinforcements.txt
+++ b/world/map/npc/051-3/reinforcements.txt
@@ -46,18 +46,18 @@ L_Warp:
 OnRnfrcmts:
     set $@illia_level_2_progress, 3;
     // Spawn 20 bandits
-    areamonster "051-3.gat", 29, 25, 48, 39, "", 1064, 18, "Door::onB";
+    areamonster "051-3.gat", 29, 25, 48, 39, "", 1064, 18, "Door::OnB";
     // Spawn 4 bandit lords
-    areamonster "051-3.gat", 29, 25, 48, 39, "", 1065, 3, "Door::onB";
+    areamonster "051-3.gat", 29, 25, 48, 39, "", 1065, 3, "Door::OnB";
     initnpctimer;
     mapannounce "051-3.gat", "Bandit Lords: Do not let them escape!!" , 0;
-    areatimer "051-3.gat", 25, 20, 80, 85, 10, "Door::onDRnfrcmts";
+    areatimer "051-3.gat", 25, 20, 80, 85, 10, "Door::OnDRnfrcmts";
     end;
 
-onB:
+OnB:
     end;
 
-onDRnfrcmts:
+OnDRnfrcmts:
     message strcharinfo(0), "Oh no, reinforcements! We must kill them all!";
     end;
 
@@ -65,7 +65,7 @@ OnTimer2000:
     setnpctimer 0;
     if ($@illia_level_2_progress != 3 || $@illia_progress != 2)
         end;
-    if (mobcount("051-3.gat", "Door::onB") < 0)
+    if (mobcount("051-3.gat", "Door::OnB") < 0)
         goto L_OpenDoor;
     end;
 
@@ -74,12 +74,12 @@ L_OpenDoor:
     set $@illia_progress, 3;
     callfunc "UpdateIlliaProgress";
     set $@illia_max_time, $@illia_max_time + 900;
-    areatimer "051-3.gat", 25, 20, 80, 85, 10, "Door::onKeyFound";
+    areatimer "051-3.gat", 25, 20, 80, 85, 10, "Door::OnKeyFound";
     stopnpctimer;
     setnpctimer 0;
     end;
 
-onKeyFound:
+OnKeyFound:
     message strcharinfo(0), "One of the defeated bandit lords had a door key attached to his belt.";
     end;
 
diff --git a/world/map/npc/052-1/channelling.txt b/world/map/npc/052-1/channelling.txt
index 3575dcbe..eda49450 100644
--- a/world/map/npc/052-1/channelling.txt
+++ b/world/map/npc/052-1/channelling.txt
@@ -40,11 +40,11 @@ L_PushBack:
     close;
 
 OnCommandDS:
-    areamonster "052-1.gat", 56, 30, 60, 31, "", 1101, 2 + rand(3), "#Enchanted Door::onSpawn";
+    areamonster "052-1.gat", 56, 30, 60, 31, "", 1101, 2 + rand(3), "#Enchanted Door::OnSpawn";
     misceffect FX_EVIL_SUMMON;
     end;
 
-onSpawn:
+OnSpawn:
     end;
 
 }
@@ -256,11 +256,11 @@ S_CheckChannelling:
         set $@illia_channelling_status_msg$, $@illia_char_channelling$ + ": Damn! It faded a little.";
 
     if ($@illia_channelling_status_msg$ != "")
-        areatimer "052-1.gat", 1, 1, 100, 80, 0, "#Power Circle::onMPSC";
+        areatimer "052-1.gat", 1, 1, 100, 80, 0, "#Power Circle::OnMPSC";
 
     return;
 
-onMPSC:
+OnMPSC:
     message strcharinfo(0), $@illia_channelling_status_msg$;
     set $@illia_channelling_status_msg$, "";
     end;
diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt
index 11725a9a..f1c9872e 100644
--- a/world/map/npc/052-2/chest.txt
+++ b/world/map/npc/052-2/chest.txt
@@ -29,7 +29,7 @@ L_ShouldNotBeHere:
     percentheal -100, 0;
     end;
 
-onInit:
+OnInit:
     setarray $@illia_item_common_rewards, 601, 636, 637, 638, 639, 625, 626, 658, 571, 579, 876, 782, 545, 758, 4028, 602, 536, 720, 532, 570, 642;
     setarray $@illia_item_unique_rewards, 877, 878, 879, 880;
     end;
@@ -139,30 +139,30 @@ L_PrepareLeaving:
 L_Leave:
     set @illia_got_rewards, 3;
     set @illia_current_num_rewards, 0;
-    addtimer 1000, "Chest::onMsg1";
-    addtimer 4000, "Chest::onMsg2";
-    addtimer 7000, "Chest::onMsg3";
-    addtimer 9000, "Chest::onFx";
-    addtimer 10000, "Chest::onRing";
+    addtimer 1000, "Chest::OnMsg1";
+    addtimer 4000, "Chest::OnMsg2";
+    addtimer 7000, "Chest::OnMsg3";
+    addtimer 9000, "Chest::OnFx";
+    addtimer 10000, "Chest::OnRing";
     close;
 
-onMsg1:
+OnMsg1:
     message strcharinfo(0), "At the moment you are wearing the ring, you start to feel dizzy...";
     end;
 
-onMsg2:
+OnMsg2:
     message strcharinfo(0), "Who is Luvia? Something isn't right... It looks like your memory is rewritten.";
     end;
 
-onMsg3:
+OnMsg3:
     message strcharinfo(0), "Damn, this ring! That Valia! Someone...";
     end;
 
-onFx:
+OnFx:
     misceffect FX_MAGIC_BLUE_TELEPORT, strcharinfo(0);
     end;
 
-onRing:
+OnRing:
     warp "007-1.gat", 85 + rand(0,2), 75 + rand(0,2);
     if (strcharinfo(0) == $@ILLIA_HERO$)
         goto L_ScheduleEnd;
diff --git a/world/map/npc/052-2/janitor.txt b/world/map/npc/052-2/janitor.txt
index 32ed405c..7ee68955 100644
--- a/world/map/npc/052-2/janitor.txt
+++ b/world/map/npc/052-2/janitor.txt
@@ -17,7 +17,7 @@ OnCommandClean:
 end;
 
 OnCommandClean:
-    killmonster "052-2.gat", "#ItemsInvoker::onDeath";
+    killmonster "052-2.gat", "#ItemsInvoker::OnDeath";
     npcwarp 1, 1, "#ItemsInvoker";
     end;
 
@@ -29,8 +29,8 @@ OnCommandClean:
 end;
 
 OnCommandClean:
-    killmonster "052-2.gat", "#LuviaDaemon::onDeath";
-    killmonster "052-2.gat", "#LuviaDaemon::onWGD";
+    killmonster "052-2.gat", "#LuviaDaemon::OnDeath";
+    killmonster "052-2.gat", "#LuviaDaemon::OnWGD";
     npcwarp 83, 28, "#LuviaDaemon";
     npcwarp 88, 15, "Luvia";
     end;
diff --git a/world/map/npc/052-2/lobby.txt b/world/map/npc/052-2/lobby.txt
index c651266c..744a0a2a 100644
--- a/world/map/npc/052-2/lobby.txt
+++ b/world/map/npc/052-2/lobby.txt
@@ -107,7 +107,7 @@ OnNN:
 {
 end;
 
-onInit:
+OnInit:
     setarray $@illia_lobby_voices$, "Finally.", "I was...", "Waiting...", "For you!";
     end;
 
@@ -236,7 +236,7 @@ OnTimer24500:
     npctalk "Demonotis!";
     misceffect FX_EVIL_SUMMON;
     callsub S_GetHeroRect;
-    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 20 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::onDSDeath";
+    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 20 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath";
     callsub S_ClearHeroRect;
     end;
 
@@ -246,7 +246,7 @@ OnTimer44000:
     npctalk "Demonotis!";
     misceffect FX_EVIL_SUMMON;
     callsub S_GetHeroRect;
-    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 28 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::onDSDeath";
+    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 28 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath";
     callsub S_ClearHeroRect;
     end;
 
@@ -256,7 +256,7 @@ OnTimer77000:
     npctalk "Demonotis!";
     misceffect FX_EVIL_SUMMON;
     callsub S_GetHeroRect;
-    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 42 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::onDSDeath";
+    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 42 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath";
     callsub S_ClearHeroRect;
     // That was the last spawn: reset the timer to start the CheckInvoke loop.
     set $@illia_level_5_progress, 5;
@@ -289,7 +289,7 @@ OnTimer18500:
     misceffect FX_EVIL_SUMMON;
     misceffect FX_MAGIC_DARK_EXPLOSION;
     callsub S_GetHeroRect;
-    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1103, 8 + (16 - 480/(30+$Illia_Luvia_Harvest))/3, "Luvia?::onWGDeath";
+    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1103, 8 + (16 - 480/(30+$Illia_Luvia_Harvest))/3, "Luvia?::OnWGDeath";
     callsub S_ClearHeroRect;
     end;
 
@@ -309,19 +309,19 @@ OnTimer2000:
         end;
     setnpctimer 0;
     // Mock players randomly (more or less once every 40 secs) and if still enough mobs running after them
-    if ($@illia_level_5_progress == 5 && rand(20) == 0 && (mobcount("052-2.gat", "Luvia?::onDSDeath") > 20))
+    if ($@illia_level_5_progress == 5 && rand(20) == 0 && (mobcount("052-2.gat", "Luvia?::OnDSDeath") > 20))
         npctalk "Ahaha! Run... Run!";
-    if ($@illia_level_5_progress == 5 && (mobcount("052-2.gat", "Luvia?::onDSDeath") < 0))
+    if ($@illia_level_5_progress == 5 && (mobcount("052-2.gat", "Luvia?::OnDSDeath") < 0))
         goto L_AllWavesClear;
-    if ($@illia_level_5_progress == 7 && (mobcount("052-2.gat", "Luvia?::onWGDeath") < 0))
+    if ($@illia_level_5_progress == 7 && (mobcount("052-2.gat", "Luvia?::OnWGDeath") < 0))
         goto L_AllWavesClear;
     end;
 
 L_Clear:
     stopnpctimer;
     setnpctimer 0;
-    killmonster "052-2.gat", "Luvia?::onDSDeath";
-    killmonster "052-2.gat", "Luvia?::onWGDeath";
+    killmonster "052-2.gat", "Luvia?::OnDSDeath";
+    killmonster "052-2.gat", "Luvia?::OnWGDeath";
     end;
 
 L_AllWavesClear:
@@ -372,10 +372,10 @@ S_ClearHeroRect:
     set $@illia_lobby_y2, 0;
     return;
 
-onDSDeath:
+OnDSDeath:
     end;
 
-onWGDeath:
+OnWGDeath:
     end;
 
 }
diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt
index fc1094f5..edbade40 100644
--- a/world/map/npc/052-2/partyroom.txt
+++ b/world/map/npc/052-2/partyroom.txt
@@ -142,7 +142,7 @@ OnTimer5500:
     enablenpc "#LuviaDaemon";
     misceffect FX_EVIL_SUMMON;
     misceffect FX_CHANNELLING_CAST;
-    monster "052-2.gat", $@illia_luvia_x, $@illia_luvia_y, "", 1102, 1, "#LuviaDaemon::onDeath";
+    monster "052-2.gat", $@illia_luvia_x, $@illia_luvia_y, "", 1102, 1, "#LuviaDaemon::OnDeath";
     set $@illia_luvia_x, 0;
     set $@illia_luvia_y, 0;
     end;
@@ -182,9 +182,9 @@ S_SpawnWitchGuard:
     npcwarp getx(), gety(), "#LuviaDaemon";
     misceffect FX_EVIL_SUMMON;
     misceffect FX_GROUND_SPAWN;
-    monster "052-2.gat", getx(), gety(), "", 1103, 1, "#LuviaDaemon::onWGD";
+    monster "052-2.gat", getx(), gety(), "", 1103, 1, "#LuviaDaemon::OnWGD";
     detachrid;
-    areatimer "052-2.gat", 73, 11, 115, 49, 0, "#LuviaDaemon::onWGS";
+    areatimer "052-2.gat", 73, 11, 115, 49, 0, "#LuviaDaemon::OnWGS";
     return;
 
 OnTimer30000:
@@ -200,7 +200,7 @@ OnTimer30000:
 L_TriggerTrance:
     set $@illia_level_7_progress, 3;
     set $@illia_luvia_trance_delay, 0;
-    areatimer "052-2.gat", 73, 11, 115, 49, 0, "#LuviaDaemon::onTT";
+    areatimer "052-2.gat", 73, 11, 115, 49, 0, "#LuviaDaemon::OnTT";
     setnpctimer 0;
     end;
 
@@ -209,19 +209,19 @@ L_Clear:
     setnpctimer 0;
     end;
 
-onDeath:
+OnDeath:
     stopnpctimer;
     setnpctimer 0;
     if ($@illia_progress != 7)
         end;
     set $@illia_level_7_progress, 4;
-    killmonster "052-2.gat", "#LuviaDaemon::onWGD";
+    killmonster "052-2.gat", "#LuviaDaemon::OnWGD";
     mapannounce "052-2.gat", "Luvia: How? By mere humans! But we will see again! Enjoy your victory while it lasts, " + $@ILLIA_HERO$ + "!!", 0;
     set @illia_bp, $Illia_Luvia_Harvest * 16 / 10 + 120;
     set BOSS_POINTS, BOSS_POINTS + @illia_bp;
     message strcharinfo(0), "You gain " + @illia_bp + " Boss Points giving you a total of " + BOSS_POINTS + ".";
     set @illia_bp, 0;
-    areatimer "052-2.gat", 73, 11, 115, 49, 2000, "#LuviaDaemon::onW00t";
+    areatimer "052-2.gat", 73, 11, 115, 49, 2000, "#LuviaDaemon::OnW00t";
 
     set $@illia_progress, 8;
     callfunc "UpdateIlliaProgress";
@@ -249,20 +249,20 @@ onDeath:
 
     end;
 
-onWGD:
+OnWGD:
     end;
 
-onWGS:
+OnWGS:
     if ($@illia_level_7_progress == 2)
         message strcharinfo(0), "One of Luvia's guard spawned from the depths to assist her!";
     end;
 
-onTT:
+OnTT:
     if ($@illia_level_7_progress == 3)
         message strcharinfo(0), "Luvia seems to become in trance!";
     end;
 
-onW00t:
+OnW00t:
     message strcharinfo(0), "You defeated this evil sorceress... But what about her sister now?";
     end;
 
diff --git a/world/map/npc/052-2/storage.txt b/world/map/npc/052-2/storage.txt
index 43160db8..464eee9b 100644
--- a/world/map/npc/052-2/storage.txt
+++ b/world/map/npc/052-2/storage.txt
@@ -31,7 +31,7 @@ L_StartItemInvoker:
 {
 end;
 
-onInit:
+OnInit:
     setarray $@illia_storage_items, 541, 567, 568, 562;
     setarray $@illia_storage_special_items, 687, 827, 1229;
     // Map coords : x1,y1, x2,y2, ...
@@ -42,10 +42,10 @@ OnCommandStart:
     set $@illia_storage_max_items, 20;
     set $@illia_storage_deviation, (8 + ($Illia_Luvia_Harvest*70)/100)*3;
     initnpctimer;
-    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::onStart";
+    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnStart";
     end;
 
-onStart:
+OnStart:
     message strcharinfo(0), "You feel a strange atmosphere in this room... You sense a strong magic rising from the depth!";
     end;
 
@@ -64,7 +64,7 @@ OnTimer1000:
 OnTimer1500:
     // See the note above.
     enablenpc "#ItemsInvoker";
-    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::onItem";
+    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnItem";
     misceffect FX_GROUND_SPAWN;
     end;
 
@@ -75,7 +75,7 @@ OnTimer3750:
     set $@item_invoke_index, 0;
     end;
 
-onItem:
+OnItem:
     if (strcharinfo(0) == $@ILLIA_HERO$)
         goto L_ItemSpawn;
     end;
@@ -108,20 +108,20 @@ L_ItemSpawn:
     end;
 
 L_MakeSpecialMonster:
-    monster "052-2.gat", $@item_invoke_x, $@item_invoke_y, "", 1103, 1, "#ItemsInvoker::onDeath";
-    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::onWtf";
+    monster "052-2.gat", $@item_invoke_x, $@item_invoke_y, "", 1103, 1, "#ItemsInvoker::OnDeath";
+    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnWtf";
     set $@illia_storage_max_items, $@illia_storage_max_items - 1;
     end;
 
 L_MakeMonster:
-    monster "052-2.gat", $@item_invoke_x, $@item_invoke_y, "", 1101, rand(1, 3), "#ItemsInvoker::onDeath";
+    monster "052-2.gat", $@item_invoke_x, $@item_invoke_y, "", 1101, rand(1, 3), "#ItemsInvoker::OnDeath";
     set $@illia_storage_max_items, $@illia_storage_max_items - 1;
     set @r, 0;
     end;
 
 L_MakeSpecialItem:
     makeitem $@illia_storage_special_items[rand(getarraysize($@illia_storage_special_items))], rand(2, 4), "052-2.gat", $@item_invoke_x, $@item_invoke_y;
-    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::onWow";
+    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnWow";
     set $@illia_storage_max_items, $@illia_storage_max_items - 1;
     set @r, 0;
     end;
@@ -129,7 +129,7 @@ L_MakeSpecialItem:
 L_CheckMobs:
     if ($@illia_progress != 6)
         goto L_Clear;
-    if (mobcount("052-2.gat", "#ItemsInvoker::onDeath") < 0)
+    if (mobcount("052-2.gat", "#ItemsInvoker::OnDeath") < 0)
         goto L_Stop;
     setnpctimer 0;
     end;
@@ -139,7 +139,7 @@ L_Clear:
     setnpctimer 0;
     set $@illia_storage_deviation, 0;
     set $@illia_storage_max_items, 0;
-    killmonster "052-2.gat", "#ItemsInvoker::onDeath";
+    killmonster "052-2.gat", "#ItemsInvoker::OnDeath";
     end;
 
 L_Stop:
@@ -152,21 +152,21 @@ L_Stop:
     set $@illia_progress, 7;
     callfunc "UpdateIlliaProgress";
     set $@illia_max_time, $@illia_max_time + 1200;
-    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::onStop";
+    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnStop";
     end;
 
-onDeath:
+OnDeath:
     end;
 
-onStop:
+OnStop:
     message strcharinfo(0), "The magic seems to quickly dissipate.";
     end;
 
-onWtf:
+OnWtf:
     message strcharinfo(0), "Look out!";
     end;
 
-onWow:
+OnWow:
     message strcharinfo(0), "Wow, see what appeared!";
     end;