item adds/changes

36 files changed, 282 insertions, 338 deletions

diff --git a/world/map/npc/001-1/north_shops.txt b/world/map/npc/001-1/north_shops.txt
index a99e09ff..507e725e 100644
--- a/world/map/npc/001-1/north_shops.txt
+++ b/world/map/npc/001-1/north_shops.txt
@@ -1,5 +1,5 @@
 // Northern shopping plaza
-001-1,106,105,0|shop|Neko|101,TonoriDelight:*10,CactusDrink:*1,CactusPotion:*1,RoastedMaggot:*1,Beer:*1,ChickenLeg:*2
+001-1,106,105,0|shop|Neko|101,TonoriDelight:*10,CactusDrink:*1,CactusPotion:*1,RoastedMaggot:*1,Beer:*1,BirdLeg:*2,Sauerkraut:*2
 001-1,111,108,0|shop|Inar|108,CottonShirt:*1,SerfHat:*1,CottonShorts:*1,CottonBoots:*1,DesertShirt:*1,CottonHeadband:*1,DesertHat:*4
 001-1,48,79,0|script|Well|400
 {
diff --git a/world/map/npc/001-1/tinris.txt b/world/map/npc/001-1/tinris.txt
index 2ae908bc..e4982001 100644
--- a/world/map/npc/001-1/tinris.txt
+++ b/world/map/npc/001-1/tinris.txt
@@ -5,8 +5,8 @@
 
     set @slime_amount1, 6;
     set @slime_amount2, 4;
-    set @bugleg_amount1, 4;
-    set @bugleg_amount2, 5;
+    set @insectleg_amount1, 4;
+    set @insectleg_amount2, 5;
     set @stinger_amount1, 3;
     set @stinger_amount2, 2;
     set @ash_amount1, 1;
@@ -64,16 +64,16 @@ L_FirstTry:
     // QL_ANWAR == 3
     mes "[Tinris]";
     mes "\"You need to bring me some ingredients.";
-    mes "The ingredients are " + @slime_amount1 + " Maggot Slimes, " + @bugleg_amount1 + " Bug Legs, " + @stinger_amount1 + " Scorpion Stingers and " + @ash_amount1 + " Piles of Ash.\"";
+    mes "The ingredients are " + @slime_amount1 + " Insect Slimes, " + @insectleg_amount1 + " Insect Legs, " + @stinger_amount1 + " Scorpion Stingers and " + @ash_amount1 + " Piles of Ash.\"";
     menu
         "I have it.",L_Continue,
         "Ok, I'll go and get it.",L_Close;
 
 L_Continue:
-    if ((countitem("MaggotSlime") < @slime_amount1) || (countitem("BugLeg") < @bugleg_amount1) || (countitem("ScorpionStinger") < @stinger_amount1) || (countitem("PileOfAsh") < @ash_amount1))
+    if ((countitem("InsectSlime") < @slime_amount1) || (countitem("InsectLeg") < @insectleg_amount1) || (countitem("ScorpionStinger") < @stinger_amount1) || (countitem("PileOfAsh") < @ash_amount1))
         goto L_NoItem;
-    delitem "MaggotSlime", @slime_amount1;
-    delitem "BugLeg", @bugleg_amount1;
+    delitem "InsectSlime", @slime_amount1;
+    delitem "InsectLeg", @insectleg_amount1;
     delitem "ScorpionStinger", @stinger_amount1;
     delitem "PileOfAsh", @ash_amount1;
     set QL_ANWAR, 4;
@@ -102,16 +102,16 @@ L_SecondTry:
     // QL_ANWAR == 6
     mes "[Tinris]";
     mes "\"Oh no! All right, we need to do another try.";
-    mes "Bring me " + @slime_amount2 + " Maggot Slimes, " + @bugleg_amount2 + " Bug Legs, " + @stinger_amount2 + " Scorpion Stingers, " + @ash_amount2 + " Piles of Ash and " + @cactusp_amount + " Cactus Potion.\"";
+    mes "Bring me " + @slime_amount2 + " Insect Slimes, " + @insectleg_amount2 + " Insect Legs, " + @stinger_amount2 + " Scorpion Stingers, " + @ash_amount2 + " Piles of Ash and " + @cactusp_amount + " Cactus Potion.\"";
     menu
         "Here it is.",L_HereItIs,
         "Ok, I'll go and get it.",L_Close;
 
 L_HereItIs:
-    if ((countitem("MaggotSlime") < @slime_amount2) || (countitem("BugLeg") < @bugleg_amount2) || (countitem("ScorpionStinger") < @stinger_amount2) || (countitem("PileOfAsh") < @ash_amount2) || (countitem("CactusPotion") < @cactusp_amount))
+    if ((countitem("InsectSlime") < @slime_amount2) || (countitem("InsectLeg") < @insectleg_amount2) || (countitem("ScorpionStinger") < @stinger_amount2) || (countitem("PileOfAsh") < @ash_amount2) || (countitem("CactusPotion") < @cactusp_amount))
         goto L_NoItem;
-    delitem "MaggotSlime", @slime_amount2;
-    delitem "BugLeg", @bugleg_amount2;
+    delitem "InsectSlime", @slime_amount2;
+    delitem "InsectLeg", @insectleg_amount2;
     delitem "ScorpionStinger", @stinger_amount2;
     delitem "PileOfAsh", @ash_amount2;
     delitem "CactusPotion", @cactusp_amount;
@@ -176,8 +176,8 @@ L_NoItem:
 L_Close:
     set @slime_amount1, 0;
     set @slime_amount2, 0;
-    set @bugleg_amount1, 0;
-    set @bugleg_amount2, 0;
+    set @insectleg_amount1, 0;
+    set @insectleg_amount2, 0;
     set @stinger_amount1, 0;
     set @stinger_amount2, 0;
     set @ash_amount1, 0;
diff --git a/world/map/npc/001-2/fieri.txt b/world/map/npc/001-2/fieri.txt
index 0d122fb2..8be6bcee 100644
--- a/world/map/npc/001-2/fieri.txt
+++ b/world/map/npc/001-2/fieri.txt
@@ -18,7 +18,7 @@ L_Opening0:
 
 L_Opening1:
     mes "[Fieri]";
-    mes "\"These Wizards eat like a store house full of maggots.";
+    mes "\"These wizards eat like a store house full of maggots.";
     mes "At this rate I'll have nothing left to cook. Can you help me with a task?\"";
     next;
     goto L_Ask;
@@ -35,13 +35,13 @@ L_Yes:
 
 L_Req0:
     mes "[Fieri]";
-    mes "\"Great!  I need a Beer for my Tonori Delight.\"";
+    mes "\"Great!  I need a beer for my tonori delight.\"";
     next;
     goto L_Set;
 
 L_Req1:
     mes "[Fieri]";
-    mes "\"Bring me a Beer. I'll give you something if you do.\"";
+    mes "\"Bring me a beer. I'll give you something if you do.\"";
     next;
     goto L_Set;
 
@@ -55,7 +55,7 @@ L_Progress:
     if (countitem("Beer") < 1) goto L_NotEnough;
     mes "[Fieri]";
     mes "\"Oooh, perfect! It's perfect!";
-    mes "You brought me my Beer!  Here, have some cake for your troubles.\"";
+    mes "You brought me my beer!  Here, have some cake for your troubles.\"";
     getinventorylist;
     if (@inventorylist_count - (countitem("Beer") == 1) > 99 - (countitem("CherryCake") == 0) ) goto L_TooMany;
     delitem "Beer", 1;
@@ -67,13 +67,13 @@ L_Progress:
     goto L_Close;
 
 L_Progress2:
-    if (countitem("MaggotSlime") < 3) goto L_NotEnough1;
+    if (countitem("InsectSlime") < 3) goto L_NotEnough1;
     mes "[Fieri]";
-    mes "\"Nice!  They're perfect, just perfect!";
-    mes "You brought me the 3 Maggot Slimes! Here, have some Tonori Delight as reward.\"";
+    mes "\"Nice! They're perfect, just perfect!";
+    mes "You brought me the 3 insect slimes! Here, have some tonori delight as reward.\"";
     getinventorylist;
-    if ((@inventorylist_count - (countitem("MaggotSlime") == 3) > 99  - (countitem("TonoriDelight") == 0) )) goto L_TooMany;
-    delitem "MaggotSlime", 3;
+    if ((@inventorylist_count - (countitem("InsectSlime") == 3) > 99  - (countitem("TonoriDelight") == 0) )) goto L_TooMany;
+    delitem "InsectSlime", 3;
     getexp 100, 0;
     getitem "TonoriDelight", 3;
     set QL_FIERI, 4;
@@ -81,12 +81,12 @@ L_Progress2:
 
 L_NotEnough:
     mes "[Fieri]";
-    mes "\"Oh, please hurry and bring me a Beer. The Wizards need their Tonori Delight!\"";
+    mes "\"Oh, please hurry and bring me a beer. The wizards need their tonori delight!\"";
     goto L_Close;
 
 L_NotEnough1:
     mes "[Fieri]";
-    mes "\"Please do hurry and bring me 3 Maggot Slimes, so I can finish the Tonori Delight!\"";
+    mes "\"Please do hurry and bring me 3 insect slimes, so I can finish the tonori delight!\"";
     goto L_Close;
 
 L_Done1:
@@ -94,16 +94,16 @@ L_Done1:
     mes "\"Thank you so much!\"";
     mes "\"But... I need some more ingredients.\"";
     next;
-    mes "\"I need 3 Maggot Slimes for that.\"";
+    mes "\"I need 3 insect slimes for that.\"";
     mes "\"Bring them to me, and I'll give you something nice.\"";
     set QL_FIERI, 3;
     goto L_Close;
 
 L_Done2:
     mes "[Fieri]";
-    mes "\"I hope you like Tonori Delight as much as I do, because, you see...\"";
+    mes "\"I hope you like tonori delight as much as I do, because, you see...\"";
     next;
-    mes "\"Tonori Delight is life!\"";
+    mes "\"Tonori delight is life!\"";
     goto L_Close;
 
 L_Close:
diff --git a/world/map/npc/001-2/pauline.txt b/world/map/npc/001-2/pauline.txt
index 05287653..497116f6 100644
--- a/world/map/npc/001-2/pauline.txt
+++ b/world/map/npc/001-2/pauline.txt
@@ -126,8 +126,8 @@ L_KnowIngredientsMouboo:
 L_Next3:
     cleararray @items$, "", getarraysize(@items$);
     cleararray @item_names$, "", getarraysize(@item_names$);
-    setarray @items$, "AlizarinHerb", "GambogeHerb", "SilkCocoon", "PinkAntenna", "MaggotSlime", "BugLeg", "GrassSeeds", "ReedBundle", "RoastedAcorn", "Candy", "Milk", "BottleOfWater", "ChickenLeg", "Steak", "Root", "RawLog", "Beer", "CactusDrink", "MoubooFigurine", "Acorn", "Iten", "WarpedLog";
-    setarray @item_names$, "Alizarin Herb", "Gamboge Herb", "Silk Cocoon", "Pink Antenna", "Maggot Slime", "Bug Leg", "Grass Seeds", "Reed Bundle", "Roasted Acorn", "Candy", "Milk", "Bottle of Water", "Chicken Leg", "Steak", "Root", "Raw Log", "Beer", "Cactus Drink", "Mouboo Figurine", "Acorn", "Iten", "Warped Log";
+    setarray @items$, "AlizarinHerb", "GambogeHerb", "SilkCocoon", "PinkAntenna", "InsectSlime", "InsectLeg", "GrassSeeds", "ReedBundle", "RoastedAcorn", "Candy", "Milk", "BottleOfWater", "BirdLeg", "Steak", "Root", "RawLog", "Beer", "CactusDrink", "MoubooFigurine", "Acorn", "Iten", "WarpedLog";
+    setarray @item_names$, "Alizarin Herb", "Gamboge Herb", "Silk Cocoon", "Pink Antenna", "Insect Slime", "Insect Leg", "Grass Seeds", "Reed Bundle", "Roasted Acorn", "Candy", "Milk", "Bottle of Water", "Bird Leg", "Steak", "Root", "Raw Log", "Beer", "Cactus Drink", "Mouboo Figurine", "Acorn", "Iten", "Warped Log";
     mes "\"Then tell me the ingredients for the mouboo summoning spell and give them to me. Start with the first ingredient and then tell me the second one separately.\"";
     next;
     callfunc "DynamicItemMenu$";
@@ -188,8 +188,8 @@ L_TrySpellMouboo:
 L_KnowIngredientsPinkie:
     cleararray @items$, "", getarraysize(@items$);
     cleararray @item_names$, "", getarraysize(@item_names$);
-    setarray @items$, "AlizarinHerb", "GambogeHerb", "SilkCocoon", "PinkAntenna", "MaggotSlime", "BugLeg", "GrassSeeds", "ReedBundle", "RoastedAcorn", "Candy", "Milk", "BottleOfWater", "ChickenLeg", "Steak", "Root", "RawLog", "Beer", "CactusDrink", "MoubooFigurine", "Acorn", "Iten", "WarpedLog";
-    setarray @item_names$, "Alizarin Herb", "Gamboge Herb", "Silk Cocoon", "Pink Antenna", "Maggot Slime", "Bug Leg", "Grass Seeds", "Reed Bundle", "Roasted Acorn", "Candy", "Milk", "Bottle of Water", "Chicken Leg", "Steak", "Root", "Raw Log", "Beer", "Cactus Drink", "Mouboo Figurine", "Acorn", "Iten", "Warped Log";
+    setarray @items$, "AlizarinHerb", "GambogeHerb", "SilkCocoon", "PinkAntenna", "InsectSlime", "InsectLeg", "GrassSeeds", "ReedBundle", "RoastedAcorn", "Candy", "Milk", "BottleOfWater", "BirdLeg", "Steak", "Root", "RawLog", "Beer", "CactusDrink", "MoubooFigurine", "Acorn", "Iten", "WarpedLog";
+    setarray @item_names$, "Alizarin Herb", "Gamboge Herb", "Silk Cocoon", "Pink Antenna", "Insect Slime", "Insect Leg", "Grass Seeds", "Reed Bundle", "Roasted Acorn", "Candy", "Milk", "Bottle of Water", "Bird Leg", "Steak", "Root", "Raw Log", "Beer", "Cactus Drink", "Mouboo Figurine", "Acorn", "Iten", "Warped Log";
     mes "[Pauline]";
     mes "\"Now give me the ingredients for the pinkie spell.\"";
     next;
diff --git a/world/map/npc/002-1/elanore.txt b/world/map/npc/002-1/elanore.txt
index 217d1ae6..15e8439e 100644
--- a/world/map/npc/002-1/elanore.txt
+++ b/world/map/npc/002-1/elanore.txt
@@ -231,7 +231,7 @@ L_MakeSelf:
     goto L_MakeSelf_yes;
 
 L_MakeSelf_yes:
-    mes "\"Oh, but of course!  You are powerful enough to make your own lifestones, using the enchantment '" + get(.invocation$, "enchant-lifestone") + "'. This will consume a bug leg or a maggot slime or one of each of the four healing herbs, though.\"";
+    mes "\"Oh, but of course!  You are powerful enough to make your own lifestones, using the enchantment '" + get(.invocation$, "enchant-lifestone") + "'. This will consume a insect leg or a insect slime or one of each of the four healing herbs, though.\"";
     goto L_Close;
 
 L_MakeSelf_no:
diff --git a/world/map/npc/003-1/npcs.txt b/world/map/npc/003-1/npcs.txt
index 692f1450..3ecd668c 100644
--- a/world/map/npc/003-1/npcs.txt
+++ b/world/map/npc/003-1/npcs.txt
@@ -107,7 +107,7 @@ L_Items:
     mes "can be equipped for fashionable purposes or to raise your status";
     next;
     mes "[Ian]";
-    mes "Miscellaneous items such as maggot slime, are used";
+    mes "Miscellaneous items such as insect slime, are used";
     mes "in creating other items, or just to trade and sell.";
     next;
     goto L_Menu;
diff --git a/world/map/npc/007-1/voltain.txt b/world/map/npc/007-1/voltain.txt
index 0366ea5c..9d7fc37c 100644
--- a/world/map/npc/007-1/voltain.txt
+++ b/world/map/npc/007-1/voltain.txt
@@ -12,7 +12,7 @@
 // # used Variables: global variable $@VOLTAIN_state
 // # 0: bring bottles
 // # 1: bring black scorpion stinger
-// # 2: bring bug legs
+// # 2: bring insect legs
 // # 3: bring another black scorpion stinger
 // # 4: bring mauve herbs
 // # 5: bring raw logs
@@ -35,9 +35,9 @@
     set @BLACK_SC_ST_REWARD_XP,  500;
     set @BLACK_SC_ST_REWARD_GOLD,  250;
 
-    set @BUGLEG_NEEDED,  10;
-    set @BUGLEG_REWARD_XP,  200;
-    set @BUGLEG_REWARD_GOLD,  150;
+    set @INSECTLEG_NEEDED,  10;
+    set @INSECTLEG_REWARD_XP,  200;
+    set @INSECTLEG_REWARD_GOLD,  150;
 
     set @HERBS_NEEDED,  7;
     set @HERBS_REWARD_XP,  200;
@@ -131,19 +131,19 @@ L_Next2:
 
 L_state2:
     mes "[Voltain]";
-    mes "\"Care to to help me with my potion? I need " + @BUGLEG_NEEDED + " bug legs so that I can thicken the potion.\"";
+    mes "\"Care to to help me with my potion? I need " + @INSECTLEG_NEEDED + " insect legs so that I can thicken the potion.\"";
     next;
     menu
-        "I've got the bug legs.", L_Next3,
-        "I'd rather not carry around dead bugs for you.", L_NOHELP ;
+        "I've got the insect legs.", L_Next3,
+        "I'd rather not carry around parts of dead insects for you.", L_NOHELP ;
 
 L_Next3:
     mes "[Voltain]";
-    if (countitem("BugLeg") < @BUGLEG_NEEDED)
+    if (countitem("InsectLeg") < @INSECTLEG_NEEDED)
         goto L_NOT_ENOUGH;
-    delitem "BugLeg", @BUGLEG_NEEDED;
-    set Zeny, Zeny + @BUGLEG_REWARD_GOLD;
-    getexp @BUGLEG_REWARD_XP, 0;
+    delitem "InsectLeg", @INSECTLEG_NEEDED;
+    set Zeny, Zeny + @INSECTLEG_REWARD_GOLD;
+    getexp @INSECTLEG_REWARD_XP, 0;
     set $@VOLTAIN_state, 3;
     mes "\"Great! My potion is ready to poison the moub...I mean cure scorpion stings. \"";
     goto L_Close;
@@ -373,9 +373,9 @@ L_Close:
     set @BLACK_SC_ST_NEEDED,  0;
     set @BLACK_SC_ST_REWARD_XP,  0;
     set @BLACK_SC_ST_REWARD_GOLD,  0;
-    set @BUGLEG_NEEDED,  0;
-    set @BUGLEG_REWARD_XP,  0;
-    set @BUGLEG_REWARD_GOLD,  0;
+    set @INSECTLEG_NEEDED,  0;
+    set @INSECTLEG_REWARD_XP,  0;
+    set @INSECTLEG_REWARD_GOLD,  0;
     set @HERBS_NEEDED,  0;
     set @HERBS_REWARD_XP,  0;
     set @HERBS_REWARD_GOLD,  0;
diff --git a/world/map/npc/008-1/mikhail.txt b/world/map/npc/008-1/mikhail.txt
index aca28beb..1098ae26 100644
--- a/world/map/npc/008-1/mikhail.txt
+++ b/world/map/npc/008-1/mikhail.txt
@@ -16,7 +16,7 @@ L_Con_Mik_First:
 
 L_Start:
     mes "[Mikhail]";
-    mes "\"Bernard sent me to get five Maggot Slimes from the maggots in the fields, but they scare me so bad!\"";
+    mes "\"Bernard sent me to get five Insect Slimes from the maggots in the fields, but they scare me so bad!\"";
     next;
     mes "\"You look like a nice person. Would you go get them for me?\"";
     menu
@@ -31,21 +31,21 @@ L_accept:
 
 L_Progress:
     mes "[Mikhail]";
-    mes "\"Did you bring me the five Maggot Slimes I need?\"";
+    mes "\"Did you bring me the five Insect Slimes I need?\"";
     next;
     menu
         "Yes, here they are, kiddo!", L_try,
         "Not yet, but I'll be back soon.", L_Close;
 
 L_try:
-    if (countitem("MaggotSlime") >= 5)
+    if (countitem("InsectSlime") >= 5)
         goto L_get;
     mes "[Mikhail]";
     mes "\"It doesn't look like you have them all...\"";
     goto L_Close;
 
 L_get:
-    delitem "MaggotSlime", 5;
+    delitem "InsectSlime", 5;
     getexp 100, 0;
     set QL_SOUP, 6;
     mes "[Mikhail]";
@@ -54,7 +54,7 @@ L_get:
 
 L_Done:
     mes "[Mikhail]";
-    mes "\"Thanks again for helping me get those Maggot Slimes!\"";
+    mes "\"Thanks again for helping me get those Insect Slimes!\"";
     goto L_Close;
 
 L_Close:
diff --git a/world/map/npc/009-1/guide.txt b/world/map/npc/009-1/guide.txt
index 75dd0bb4..db53c222 100644
--- a/world/map/npc/009-1/guide.txt
+++ b/world/map/npc/009-1/guide.txt
@@ -58,7 +58,7 @@ L_Items:
     mes "can be equipped for fashionable purposes or to raise your status.\"";
     next;
     mes "[Ian the Guide]";
-    mes "\"Miscellaneous items such as maggot slime, are used";
+    mes "\"Miscellaneous items such as insect slime, are used";
     mes "in creating other items, or just to trade and sell.\"";
     next;
     goto L_Menu_A;
diff --git a/world/map/npc/009-2/bernard.txt b/world/map/npc/009-2/bernard.txt
index 2a085e61..3de35879 100644
--- a/world/map/npc/009-2/bernard.txt
+++ b/world/map/npc/009-2/bernard.txt
@@ -36,13 +36,13 @@ L_Yes:
 
 L_Req0:
     mes "[Bernard]";
-    mes "\"Great!  I need a Roasted Maggot for my soup.\"";
+    mes "\"Great!  I need a roasted maggot for my soup.\"";
     next;
     goto L_Set;
 
 L_Req1:
     mes "[Bernard]";
-    mes "\"Bring me a Roasted Maggot. I'll give you something if you do.\"";
+    mes "\"Bring me a roasted maggot. I'll give you something if you do.\"";
     next;
     goto L_Set;
 
@@ -56,7 +56,7 @@ L_Progress:
     if (countitem("RoastedMaggot") < 1) goto L_NotEnough;
     mes "[Bernard]";
     mes "\"Oooh, perfect! It's perfect!";
-    mes "You brought me my Roasted Maggot!  Here, have some cake for your troubles.\"";
+    mes "You brought me my roasted maggot!  Here, have some cake for your troubles.\"";
     getinventorylist;
     if (@inventorylist_count - (countitem("RoastedMaggot") == 1) > 99 - (countitem("CherryCake") == 0) ) goto L_TooMany;
     delitem "RoastedMaggot", 1;
@@ -68,13 +68,13 @@ L_Progress:
     goto L_Close;
 
 L_Progress2:
-    if (countitem("MaggotSlime") < 3) goto L_NotEnough1;
+    if (countitem("InsectSlime") < 3) goto L_NotEnough1;
     mes "[Bernard]";
     mes "\"Nice!  They're perfect, just perfect!";
-    mes "You brought me the 3 Maggot Slimes!  Here, have some beer as reward.\"";
+    mes "You brought me the 3 insect slimes!  Here, have some beer as reward.\"";
     getinventorylist;
-    if ((@inventorylist_count - (countitem("MaggotSlime") == 3) > 99  - (countitem("Beer") == 0) )) goto L_TooMany;
-    delitem "MaggotSlime", 3;
+    if ((@inventorylist_count - (countitem("InsectSlime") == 3) > 99  - (countitem("Beer") == 0) )) goto L_TooMany;
+    delitem "InsectSlime", 3;
     getexp 100, 0;
     getitem "Beer", 3;
     set QL_SOUP, 4;
@@ -82,12 +82,12 @@ L_Progress2:
 
 L_NotEnough:
     mes "[Bernard]";
-    mes "\"Oh, please hurry and bring me a Roasted Maggot. I'm yearning for maggot soup!\"";
+    mes "\"Oh, please hurry and bring me a roasted maggot. I'm yearning for maggot soup!\"";
     goto L_Close;
 
 L_NotEnough1:
     mes "[Bernard]";
-    mes "\"Please do hurry and bring me 3 Maggot Slimes, so I can finish my soup!\"";
+    mes "\"Please do hurry and bring me 3 insect slimes, so I can finish my soup!\"";
     goto L_Close;
 
 L_Done1:
@@ -95,7 +95,7 @@ L_Done1:
     mes "\"Thank you so much!\"";
     mes "\"But... something is missing to make the soup creamy.\"";
     next;
-    mes "\"I need 3 Maggot Slimes for that.\"";
+    mes "\"I need 3 Insect Slimes for that.\"";
     mes "\"Bring them to me, and I'll give you something nice.\"";
     set QL_SOUP, 3;
     goto L_Close;
diff --git a/world/map/npc/009-2/kfahr.txt b/world/map/npc/009-2/kfahr.txt
index e7f5547a..130fa349 100644
--- a/world/map/npc/009-2/kfahr.txt
+++ b/world/map/npc/009-2/kfahr.txt
@@ -185,7 +185,7 @@ L_tale_desert_worm:
     mes "\"One day I was hired to protect a caravan going north to Tulimshar, with a friend of mine, old Arvek. He only came along for the fun, of course; it's not as if I really need much help defending a caravan... or at least normally it isn't.\"";
     next;
     mes "[Kfahr the Warrior]";
-    mes "\"Arvek's fun to have about. His manners are as bad as his breath, but he knows how to make a laugh out of everything. One thing you musnt't ever do with him, though, and that is to try his `homebrew'-- some kind of ale he makes out of maggot slime...\"";
+    mes "\"Arvek's fun to have about. His manners are as bad as his breath, but he knows how to make a laugh out of everything. One thing you musnt't ever do with him, though, and that is to try his `homebrew'-- some kind of ale he makes out of insect slime...\"";
     next;
     mes "[Kfahr the Warrior]";
     mes "Kfahr takes another sip of beer, momentarily irritated as if surprised by the taste.";
@@ -231,7 +231,7 @@ L_tale_desert_worm:
     next;
     mes "[Kfahr the Warrior]";
     mes "He grins.";
-    mes "\"But I remember something better. That beast had grown nostrils, right?  So it can smell and taste!  So I tear open his backpack and pull out that big snakeskin of that disgusting maggot ale of his. It's still filled to the brim.\"";
+    mes "\"But I remember something better. That beast had grown nostrils, right?  So it can smell and taste!  So I tear open his backpack and pull out that big snakeskin of that disgusting insect ale of his. It's still filled to the brim.\"";
     next;
     mes "[Kfahr the Warrior]";
     mes "\"I quickly put on my gloves again, because I don't want to touch that stuff with my bare skin. The beast is almost upon me, but I have only that one chance – so I squeeze the skin while sticking my thumb into the opening, until I can see the black of its nostrils...\"";
diff --git a/world/map/npc/009-2/wyara.txt b/world/map/npc/009-2/wyara.txt
index dd8f7f25..41d79392 100644
--- a/world/map/npc/009-2/wyara.txt
+++ b/world/map/npc/009-2/wyara.txt
@@ -317,7 +317,7 @@ L_M_purify_explained:
         goto L_M_purify_doit;
 
     mes "[Wyara the Witch]";
-    mes "\"To make the purification potion, I will need twenty maggot slimes and twenty leaves of mauve.\"";
+    mes "\"To make the purification potion, I will need twenty insect slimes and twenty leaves of mauve.\"";
     next;
     menu
         "I shall get them later.", L_M_main,
@@ -326,14 +326,14 @@ L_M_purify_explained:
 
 L_Next:
     getinventorylist;
-    if ((@inventorylist_count == 100) && (countitem("MauveHerb") > 20) && (countitem("MaggotSlime") > 20))
+    if ((@inventorylist_count == 100) && (countitem("MauveHerb") > 20) && (countitem("InsectSlime") > 20))
         goto L_M_purify_nospace;
     if (countitem("MauveHerb") < 20)
         goto L_M_purify_lacking;
-    if (countitem("MaggotSlime") < 20)
+    if (countitem("InsectSlime") < 20)
         goto L_M_purify_lacking;
     delitem "MauveHerb", 20;
-    delitem "MaggotSlime", 20;
+    delitem "InsectSlime", 20;
     getitem "PurificationPotion", 1;
     mes "[Wyara the Witch]";
     mes "Wyara grinds the leaves and mixes them with the slime, boils them, then speaks a brief incantation over them and hands you the result.";
@@ -353,7 +353,7 @@ L_M_purify_nospace:
 
 L_M_purify_lacking:
     mes "[Wyara the Witch]";
-    mes "\"You'll need twenty mauve leaves and twenty maggot slimes for the potion.\"";
+    mes "\"You'll need twenty mauve leaves and twenty insect slimes for the potion.\"";
     next;
     goto L_M_main;
 
@@ -365,7 +365,7 @@ L_M_purify_once:
     if (countitem("PurificationPotion"))
         goto L_M_purify_doit2;
     mes "[Wyara the Witch]";
-    mes "\"I'll need twenty more maggot slimes and leaves of mauve.\"";
+    mes "\"I'll need twenty more insect slimes and leaves of mauve.\"";
     next;
     menu
         "I'll do that later.", L_Main,
@@ -374,14 +374,14 @@ L_M_purify_once:
 
 L_Next1:
     getinventorylist;
-    if ((@inventorylist_count == 100) && (countitem("MauveHerb") > 20) && (countitem("MaggotSlime") > 20))
+    if ((@inventorylist_count == 100) && (countitem("MauveHerb") > 20) && (countitem("InsectSlime") > 20))
         goto L_M_purify_nospace;
     if (countitem("MauveHerb") < 20)
         goto L_M_purify_lacking;
-    if (countitem("MaggotSlime") < 20)
+    if (countitem("InsectSlime") < 20)
         goto L_M_purify_lacking;
     delitem "MauveHerb", 20;
-    delitem "MaggotSlime", 20;
+    delitem "InsectSlime", 20;
     getitem "PurificationPotion", 1;
     mes "[Wyara the Witch]";
     mes "Wyara brews another purification potion.";
@@ -487,7 +487,7 @@ L_M_train_t_backgd:
     mes "\"Many generations ago, there was a lush, green oasis in the desert south-east of Tulimshar. Plants of all kinds grew there, and many animals, including mouboos, made this place their home.\"";
     next;
     mes "[Wyara the Witch]";
-    mes "\"Then there came war, and some people pleaded to a dragon called Grenxen. He founded Tulimshar, and to provide it with water he changed the underground waterflow. The oasis began to dry out quickly.\"";
+    mes "\"Then there came war, and some people pleaded to the demon Grenxen. He founded Tulimshar, and to provide it with water he changed the underground waterflow. The oasis began to dry out quickly.\"";
     next;
     mes "[Wyara the Witch]";
     mes "\"But the oasis, like many such places back in the old days, had a druid watching over it. The druid refused to accept what Grenxen had done, but he was powerless to revert or change it.\"";
diff --git a/world/map/npc/009-7/shops.txt b/world/map/npc/009-7/shops.txt
index 47d70561..2946f1a4 100644
--- a/world/map/npc/009-7/shops.txt
+++ b/world/map/npc/009-7/shops.txt
@@ -1,3 +1,3 @@
 009-7,34,23,0|shop|Bartender#Duels|177,Beer:*1,IronPotion:*1,EnlighteningElixir:*1,ConcentrationPotion:*1,BottleOfWater:*1,Milk:*1
 
-009-7,27,26,0|shop|Garcon#Duels|180,RoastedMaggot:*1,PickledBeets:*30,ChickenLeg:*1,Steak:*1,Beer:*1
+009-7,27,26,0|shop|Garcon#Duels|180,RoastedMaggot:*1,PickledBeets:*30,BirdLeg:*1,Sauerkraut:*1,Steak:*1,Beer:*1
diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt
index 76a77f80..ef5e2364 100644
--- a/world/map/npc/010-2/dimonds.txt
+++ b/world/map/npc/010-2/dimonds.txt
@@ -366,7 +366,7 @@ S_food_menu:
     setarray @choice$, "","","","","","";
 
     set @C_steak, 676;
-    set @C_chickenleg, 562;
+    set @C_birdleg, 562;
     set @C_redapple, 535;
     set @C_greenapple, 719;
     set @C_beer, 539;
@@ -382,14 +382,14 @@ S_food_menu:
     goto L_nosteaks;
 
 L_nosteaks:
-    if (countitem("ChickenLeg") == 0)
-        goto L_nochickenleg;
-    set @choice_idx[@choices_nr], @C_chickenleg;
-    set @choice$[@choices_nr], "Offer him a chicken leg.";
+    if (countitem("BirdLeg") == 0)
+        goto L_nobirdleg;
+    set @choice_idx[@choices_nr], @C_birdleg;
+    set @choice$[@choices_nr], "Offer him a bird leg.";
     set @choices_nr, @choices_nr + 1;
-    goto L_nochickenleg;
+    goto L_nobirdleg;
 
-L_nochickenleg:
+L_nobirdleg:
     if (countitem("RedApple") == 0)
         goto L_noredapple;
     set @choice_idx[@choices_nr], @C_redapple;
@@ -436,7 +436,7 @@ L_MenuItems:
         goto L_Close;
     if ((countitem("Steak") != 0) && (@choice_idx[@choose] == @C_steak))
         goto L_RmItem;
-    if ((countitem("ChickenLeg") != 0) && (@choice_idx[@choose] == @C_chickenleg))
+    if ((countitem("BirdLeg") != 0) && (@choice_idx[@choose] == @C_birdleg))
         goto L_RmItem;
     if ((countitem("RedApple") != 0) && (@choice_idx[@choose] == @C_redapple))
         goto L_RmItem;
@@ -538,7 +538,7 @@ L_Close:
 
 010-2,24,27,0|shop|Bartender|112,Beer:*1,IronPotion:*1,EnlighteningElixir:*1,ConcentrationPotion:*1
 
-010-2,32,34,0|shop|Waitress|139,CherryCake:*1,RoastedMaggot:*1,OrangeCupcake:*1,ChickenLeg:*1,Steak:*1
+010-2,32,34,0|shop|Waitress|139,CherryCake:*1,RoastedMaggot:*1,OrangeCupcake:*1,BirdLeg:*1,Sauerkraut:*1,Steak:*1
 
 010-2,85,41,0|shop|Blacksmith|146,ForestBow:*1,SilverArrow:*2,IronArrow:*1,Arrow:*1,LeatherShield:*1
 
diff --git a/world/map/npc/011-1/alchemist.txt b/world/map/npc/011-1/alchemist.txt
index b8823283..c961c1d9 100644
--- a/world/map/npc/011-1/alchemist.txt
+++ b/world/map/npc/011-1/alchemist.txt
@@ -521,7 +521,7 @@ L_NextMenu:
         "Where can I find pink petals?", L_d_pink_petals,
         "Where can I find iron ore?", L_d_ore,
         "Where can I find a pearl?", L_d_pearl,
-        "Where can I find maggot slime?", L_d_maggot_slime,
+        "Where can I find insect slime?", L_d_insect_slime,
         "I see. Thank you, and a good day to you!", L_abort;
 
 L_d_herbs:
@@ -548,9 +548,9 @@ L_d_pearl:
     next;
     goto L_description_quick;
 
-L_d_maggot_slime:
+L_d_insect_slime:
     mes "[Rauk the Alchemist]";
-    mes "\"As the name might have given away already, maggot slime is most easily obtained from maggots. Still, there are some other creatures – such as bats – that secrete a similar kind of slime that for alchemistic purposes is equivalent.\"";
+    mes "\"As the name might have given away already, insect slime is most easily obtained from maggots. Still, there are some other creatures – such as bats – that secrete a similar kind of slime that for alchemistic purposes is equivalent.\"";
     next;
     goto L_description_quick;
 
@@ -872,7 +872,7 @@ L_dark_green:
         goto L_dark_green_fail;
     if (countitem("MauveHerb") < 10)
         goto L_dark_green_fail;
-    if (countitem("MaggotSlime") < 1)
+    if (countitem("InsectSlime") < 1)
         goto L_dark_green_fail;
     if (Zeny < 1000)
         goto L_dark_green_fail;
@@ -881,12 +881,12 @@ L_dark_green:
         && countitem("CobaltHerb") > 10
         && countitem("GambogeHerb") > 10
         && countitem("MauveHerb") > 10
-        && countitem("MaggotSlime") > 1)
+        && countitem("InsectSlime") > 1)
             goto L_TooMany;
     delitem "CobaltHerb", 10;
     delitem "MauveHerb", 10;
     delitem "GambogeHerb", 10;
-    delitem "MaggotSlime", 1;
+    delitem "InsectSlime", 1;
     set Zeny, Zeny - 1000;
     getitem "DarkGreenDye", 1;
     goto L_ok;
@@ -894,7 +894,7 @@ L_dark_green:
 L_dark_green_fail:
     mes "[Rauk the Alchemist]";
     mes "Rauk frowns as he examines the items you hand him.";
-    mes "\"No, this will not do. I need ten gamboge leaves, ten cobalt leaves, ten mauve leaves, slime from one maggot, and 1000 GP.\"";
+    mes "\"No, this will not do. I need ten gamboge leaves, ten cobalt leaves, ten mauve leaves, slime from one insect, and 1000 GP.\"";
     next;
     goto L_intermediate;
 
@@ -902,15 +902,15 @@ L_d_dark_green:
     mes "[Rauk the Alchemist]";
     if (QUEST_clothdyer_knowsdye != @QUEST_HAS_SOLVED_DYE_PUZZLE)
         goto L_d_dark_green_quest;
-    mes "\"Since we have figured out how much maggot slime we need for you, all you have to bring me are 1000 GP, one maggot slime, and ten leaves each of mauve, cobalt, and gamboge.\"";
+    mes "\"Since we have figured out how much insect slime we need for you, all you have to bring me are 1000 GP, one insect slime, and ten leaves each of mauve, cobalt, and gamboge.\"";
     next;
     goto L_intermediate;
 
 L_d_dark_green_quest:
-    mes "\"Ah, dark green... dark green dye is actually simple to make, except for one tiny little problem: dark green clothes fade very quickly when they touch human skin. By far the best way to fixate the color is argentum powder, mixed with dark green dye essence extracted from maggot slime.\"";
+    mes "\"Ah, dark green... dark green dye is actually simple to make, except for one tiny little problem: dark green clothes fade very quickly when they touch human skin. By far the best way to fixate the color is argentum powder, mixed with dark green dye essence extracted from insect slime.\"";
     next;
     mes "[Rauk the Alchemist]";
-    mes "\"But just how much maggot slime goes into the fixative and how much into the rest of the mixture varies completely for every individual. We will have to figure out just how many thousandth ounces it is for you before I can make dark green dye for you.\"";
+    mes "\"But just how much insect slime goes into the fixative and how much into the rest of the mixture varies completely for every individual. We will have to figure out just how many thousandth ounces it is for you before I can make dark green dye for you.\"";
     next;
     if (QUEST_clothdyer_knowsdye == @QUEST_CAN_GET_DYE_HERE)
         set QUEST_clothdyer_knowsdye, (rand(1000) + @QUEST_GUESS_BASE);
@@ -933,7 +933,7 @@ L_dark_green_q_wear:
 L_dark_green_q_explain2:
     mes "[Rauk the Alchemist]";
     mes "Rauk blinks.";
-    mes "\"Very well. It works like this: you give me a maggot slime and tell me how many thousandth parts go into one part of the dye potion.\"";
+    mes "\"Very well. It works like this: you give me a insect slime and tell me how many thousandth parts go into one part of the dye potion.\"";
     next;
     mes "[Rauk the Alchemist]";
     mes "\"Then we try whether that was the right ratio. I will tell you if you guessed right, but if you were wrong, I will tell you whether you guessed too high or too low.\"";
@@ -948,14 +948,14 @@ L_dark_green_q_explain2:
 
 L_dark_green_q_explain:
     mes "[Rauk the Alchemist]";
-    mes "\"We have to measure the balance between your light and your dark bile – two of your humors – and use that as the maggot slime concentration.\"";
-    mes "\"This will probably take several tries; for each try we need maggot slime from one maggot.\"";
+    mes "\"We have to measure the balance between your light and your dark bile – two of your humors – and use that as the insect slime concentration.\"";
+    mes "\"This will probably take several tries; for each try we need one insect slime.\"";
     next;
     mes "[Rauk the Alchemist]";
     mes "\"Each time you tell me how many thousandth parts of one ounce of the concentrate you want to use in the fixative. I will stir the mixture appropriately and put the rest of the slime into the base mixture. We then put the two together, and you dip your finger in.\"";
     next;
     mes "[Rauk the Alchemist]";
-    mes "\"If the mixture is too dark, then that means that we put too much maggot slime into the fixative. If it discolours, we put in too little. But if it retains its color, we are done.\"";
+    mes "\"If the mixture is too dark, then that means that we put too much insect slime into the fixative. If it discolours, we put in too little. But if it retains its color, we are done.\"";
     next;
     mes "[Rauk the Alchemist]";
     mes "Rauk smiles.";
@@ -968,12 +968,12 @@ L_dark_green_q_explain:
         "I don't have time for this.", L_intermediate;
 
 L_dark_green_q_guess_0:
-    if (countitem("MaggotSlime") < 1)
+    if (countitem("InsectSlime") < 1)
         goto L_dark_green_q_noslime;
-    delitem "MaggotSlime", 1;
+    delitem "InsectSlime", 1;
 
     mes "[Rauk the Alchemist]";
-    mes "Rauk fills your maggot slime into a small bottle and picks a glass bottle from within his robe.";
+    mes "Rauk fills your insect slime into a small bottle and picks a glass bottle from within his robe.";
     mes "\"Now we need to figure out just how many thousandths you need. First, tell me how many tenths of an ounce you want to put in.\"";
     next;
     menu
@@ -994,7 +994,7 @@ L_MenuItems1:
 
     mes "[Rauk the Alchemist]";
     if (@menu)
-        mes "Rauk pours a good-sized portion of maggot slime from the small bottle into the glass bottle.";
+        mes "Rauk pours a good-sized portion of insect slime from the small bottle into the glass bottle.";
     mes "\"We now have " + @guess_accumulator + " thousandths of an ounce. How many hundredths of an ounce should I add?\"";
     next;
     menu
@@ -1015,7 +1015,7 @@ L_MenuItems2:
 
     mes "[Rauk the Alchemist]";
     if (@menu)
-      mes "Rauk pours a portion of maggot slime from the small bottle into the glass bottle.";
+      mes "Rauk pours a portion of insect slime from the small bottle into the glass bottle.";
     mes "\"These are now " + @guess_accumulator + " thousandths of an ounce. How many thousands more?\"";
     next;
     menu
@@ -1036,7 +1036,7 @@ L_MenuItems3:
 
     mes "[Rauk the Alchemist]";
     if (@menu)
-        mes "Rauk pours a tiny amount of maggot slime from the small bottle into the glass bottle.";
+        mes "Rauk pours a tiny amount of insect slime from the small bottle into the glass bottle.";
     mes "Rauk mixes some more ingredients into the bottles, stirs them, heats one of them and mixes the results together.";
     next;
 
@@ -1060,7 +1060,7 @@ L_MenuItems3:
     next;
     mes "[Rauk the Alchemist]";
     mes "Rauk is beaming.";
-    mes "\"I can now make dark green dye for you. All I need will be slime from one maggot, ten gamboge leaves, ten cobalt leaves, ten mauve leaves, and 1000 GP for other ingredients.\"";
+    mes "\"I can now make dark green dye for you. All I need will be one insect slime, ten gamboge leaves, ten cobalt leaves, ten mauve leaves, and 1000 GP for other ingredients.\"";
     mes "[You gain 20,000 experience points]";
     getexp 20000, 0;
     set QUEST_clothdyer_knowsdye, @QUEST_HAS_SOLVED_DYE_PUZZLE;
@@ -1086,7 +1086,7 @@ L_dark_green_q_again:
 
 L_dark_green_q_noslime:
     mes "[Rauk the Alchemist]";
-    mes "\"Oh, you don't have any maggot slime? That's unfortunate; I am out of it myself. Still it should be easy enough to find, just bring me one and we can continue testing.\"";
+    mes "\"Oh, you don't have any insect slime? That's unfortunate; I am out of it myself. Still it should be easy enough to find, just bring me one and we can continue testing.\"";
     next;
     goto L_intermediate;
 
diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt
index 39cfff45..8f8fe66c 100644
--- a/world/map/npc/011-1/auldsbel.txt
+++ b/world/map/npc/011-1/auldsbel.txt
@@ -838,7 +838,7 @@ L_c_quest_3:
     mes "\"Yes... I'm actually not certain that my demetamorphosis stock will not drain the life out of these little creatures. Perhaps an alchemical revitalization tincture would be called for. Fortunately this one is easy, I can make it myself.\"";
     next;
     mes "[Auldsbel the Wizard]";
-    mes "\"I'm still not sure how to integrate it into the spell... but leave that to me. Can you get me twenty-five red scorpion stingers and twenty-five lumps of maggot slime?  Those should be just what I need.\"";
+    mes "\"I'm still not sure how to integrate it into the spell... but leave that to me. Can you get me twenty-five red scorpion stingers and twenty-five lumps of insect slime?  Those should be just what I need.\"";
     next;
     menu
         "Here are your stingers and slimes.", L_Next6,
@@ -847,10 +847,10 @@ L_c_quest_3:
 L_Next6:
     if (countitem ("RedScorpionStinger") < 25)
         goto L_c_quest_missing;
-    if (countitem ("MaggotSlime") < 25)
+    if (countitem ("InsectSlime") < 25)
         goto L_c_quest_missing;
     delitem "RedScorpionStinger", 25;
-    delitem "MaggotSlime", 25;
+    delitem "InsectSlime", 25;
     set Zeny, Zeny + 5000;
     mes "[Auldsbel the Wizard]";
     mes "\"Good helper!  Another 5,000 GP for you.\"";
@@ -1072,21 +1072,21 @@ L_stu_start:
         mes "\"Beware, for you will not be able to use it yet; you will first have to gain a greater understanding of magic overall.\"";
     next;
     mes "[Auldsbel the Wizard]";
-    mes "\"Bring me ten bug legs, and I will reveal its invocation to you.\"";
+    mes "\"Bring me ten insect legs, and I will reveal its invocation to you.\"";
     next;
     menu
         "Here you are.", L_Next9,
         "I'll be back with them.", L_main_menu;
 
 L_Next9:
-    if (countitem("BugLeg") < 10)
+    if (countitem("InsectLeg") < 10)
         goto L_c_quest_missing;
-    delitem "BugLeg", 10;
+    delitem "InsectLeg", 10;
     getexp 1000, 0;
     set @Q_main_status, @Q_STATUS_STUDENT0;
     callsub S_update_var;
     mes "[Auldsbel the Wizard]";
-    mes "He picks up the bug legs.";
+    mes "He picks up the insect legs.";
     mes "\"Good. These will come in handy later...\"";
     mes "He grins.";
     mes "[1000 experience points]";
diff --git a/world/map/npc/012-3/beheader.txt b/world/map/npc/012-3/beheader.txt
index 17abc129..dbdd5f11 100644
--- a/world/map/npc/012-3/beheader.txt
+++ b/world/map/npc/012-3/beheader.txt
@@ -1,7 +1,7 @@
 // The Beheader
 // PS. The Hyoid Bone actually exists - https://teachmeanatomy.info/neck/bones/hyoid-bone/
 /////////////////////////////////////////////////////////////////////////////////
-// NOTE: Why bugs don't always drop bug legs? Because when you kill the bugs,
+// NOTE: Why insects don't always drop insect legs? Because when you kill the insects,
 // you are cautious and/or skilled enough to don't damage the usable parts.
 // Some parts are more prone to damage than others, and Terranites, due their
 // anatomy, has a zero per cent success rate for the head surviving death.
@@ -176,7 +176,7 @@ L_Finish:
         goto L_Nope;
 
     getitem "Beheader", 1;
-    getexp 1000000, 0;
+    getexp 750000, 0;
     set FLAGS, FLAGS | FLAG_GOT_BEHEADER_SWORD;
     set TERRAC, 0;
 
diff --git a/world/map/npc/013-3/mask_chest.txt b/world/map/npc/013-3/mask_chest.txt
index a15cf3fc..51ca35c2 100644
--- a/world/map/npc/013-3/mask_chest.txt
+++ b/world/map/npc/013-3/mask_chest.txt
@@ -7,120 +7,120 @@
     if (@state < 2) goto L_This_shouldn_t_happen;
     if (@state == 3) goto L_Finished;
 
-    if (countitem(MaggotSlime) == 0)
-        goto L_No_maggot_slime;
-    if (countitem(SmallMushroom) == 0)
+    if (countitem("InsectSlime") == 0)
+        goto L_No_insect_slime;
+    if (countitem("SmallMushroom") == 0)
         goto L_No_mushroom;
-    if (countitem(PinkPetal) == 0)
+    if (countitem("PinkPetal") == 0)
         goto L_No_pink_petal;
-    if (countitem(Pearl) == 0)
+    if (countitem("Pearl") == 0)
         goto L_No_pearl;
-    if (countitem(HardSpike) == 0)
+    if (countitem("HardSpike") == 0)
         goto L_No_hard_spike;
-    if (countitem(RawLog) == 0)
+    if (countitem("RawLog") == 0)
         goto L_No_raw_log;
-    if (countitem(PinkAntenna) == 0)
+    if (countitem("PinkAntenna") == 0)
         goto L_No_pink_antenna;
-    if (countitem(SnakeTongue) == 0
-        || countitem(MountainSnakeTongue) == 0
-        || countitem(GrassSnakeTongue) == 0
-        || countitem(CaveSnakeTongue) == 0)
+    if (countitem("SnakeTongue") == 0
+        || countitem("MountainSnakeTongue") == 0
+        || countitem("GrassSnakeTongue") == 0
+        || countitem("CaveSnakeTongue") == 0)
             goto L_No_tongues;
-    if (countitem(TreasureKey) == 0)
+    if (countitem("TreasureKey") == 0)
         goto L_No_treasure_key;
-    if (countitem(PileOfAsh) == 0)
+    if (countitem("PileOfAsh") == 0)
         goto L_no_ash;
-    if (countitem(MauveHerb) == 0
-        || countitem(CobaltHerb) == 0
-        || countitem(GambogeHerb) == 0
-        || countitem(AlizarinHerb) == 0)
+    if (countitem("MauveHerb") == 0
+        || countitem("CobaltHerb") == 0
+        || countitem("GambogeHerb") == 0
+        || countitem("AlizarinHerb") == 0)
             goto L_No_herbs;
-    if (countitem(BugLeg) == 0)
-        goto L_No_bug_leg;
-    if (countitem(CaveSnakeLamp) == 0)
+    if (countitem("InsectLeg") == 0)
+        goto L_No_insect_leg;
+    if (countitem("CaveSnakeLamp") == 0)
         goto L_No_lamp;
-    if (countitem(IronOre) == 0)
+    if (countitem("IronOre") == 0)
         goto L_No_iron_ore;
-    if (countitem(ScorpionStinger) == 0
-        || countitem(RedScorpionStinger) == 0
-        || countitem(BlackScorpionStinger) == 0)
+    if (countitem("ScorpionStinger") == 0
+        || countitem("RedScorpionStinger") == 0
+        || countitem("BlackScorpionStinger") == 0)
             goto L_No_stingers;
-    if (countitem(SilkCocoon) == 0)
+    if (countitem("SilkCocoon") == 0)
         goto L_No_silk;
-    if (countitem(WhiteFur) == 0)
+    if (countitem("WhiteFur") == 0)
         goto L_No_fur;
-    if (countitem(DarkCrystal) == 0)
+    if (countitem("DarkCrystal") == 0)
         goto L_No_dark_crystal;
-    if (countitem(BottleOfWater) == 0)
+    if (countitem("BottleOfWater") == 0)
         goto L_No_water;
     getinventorylist;
     if (@inventorylist_count == 100
-        && countitem(MaggotSlime) > 1
-        && countitem(BugLeg) > 1
-        && countitem(SilkCocoon) > 1
-        && countitem(SmallMushroom) > 1
-        && countitem(PinkPetal) > 1
-        && countitem(Pearl) > 1
-        && countitem(HardSpike) > 1
-        && countitem(RawLog) > 1
-        && countitem(PinkAntenna) > 1
-        && countitem(DarkCrystal) > 1
-        && countitem(IronOre) > 1
-        && countitem(ScorpionStinger) > 1
-        && countitem(RedScorpionStinger) > 1
-        && countitem(BlackScorpionStinger) > 1
-        && countitem(SnakeTongue) > 1
-        && countitem(MountainSnakeTongue) > 1
-        && countitem(GrassSnakeTongue) > 1
-        && countitem(CaveSnakeTongue) > 1
-        && countitem(MauveHerb) > 1
-        && countitem(CobaltHerb) > 1
-        && countitem(GambogeHerb) > 1
-        && countitem(AlizarinHerb) > 1
-        && countitem(TreasureKey) > 1
-        && countitem(CaveSnakeLamp) > 1
-        && countitem(PileOfAsh) > 1
-        && countitem(WhiteFur) > 1
-        && countitem(BottleOfWater) > 1)
+        && countitem("InsectSlime") > 1
+        && countitem("InsectLeg") > 1
+        && countitem("SilkCocoon") > 1
+        && countitem("SmallMushroom") > 1
+        && countitem("PinkPetal") > 1
+        && countitem("Pearl") > 1
+        && countitem("HardSpike") > 1
+        && countitem("RawLog") > 1
+        && countitem("PinkAntenna") > 1
+        && countitem("DarkCrystal") > 1
+        && countitem("IronOre") > 1
+        && countitem("ScorpionStinger") > 1
+        && countitem("RedScorpionStinger") > 1
+        && countitem("BlackScorpionStinger") > 1
+        && countitem("SnakeTongue") > 1
+        && countitem("MountainSnakeTongue") > 1
+        && countitem("GrassSnakeTongue") > 1
+        && countitem("CaveSnakeTongue") > 1
+        && countitem("MauveHerb") > 1
+        && countitem("CobaltHerb") > 1
+        && countitem("GambogeHerb") > 1
+        && countitem("AlizarinHerb") > 1
+        && countitem("TreasureKey") > 1
+        && countitem("CaveSnakeLamp") > 1
+        && countitem("PileOfAsh") > 1
+        && countitem("WhiteFur") > 1
+        && countitem("BottleOfWater") > 1)
             goto L_TooMany;
 
-    delitem MaggotSlime, 1;
-    delitem BugLeg, 1;
-    delitem SilkCocoon, 1;
-    delitem SmallMushroom, 1;
-    delitem PinkPetal, 1;
-    delitem Pearl, 1;
-    delitem HardSpike, 1;
-    delitem RawLog, 1;
-    delitem PinkAntenna, 1;
-    delitem DarkCrystal, 1;
-    delitem IronOre, 1;
-    delitem ScorpionStinger, 1;
-    delitem RedScorpionStinger, 1;
-    delitem BlackScorpionStinger, 1;
-    delitem SnakeTongue, 1;
-    delitem MountainSnakeTongue, 1;
-    delitem GrassSnakeTongue, 1;
-    delitem CaveSnakeTongue, 1;
-    delitem MauveHerb, 1;
-    delitem CobaltHerb, 1;
-    delitem GambogeHerb, 1;
-    delitem AlizarinHerb, 1;
-    delitem TreasureKey, 1;
-    delitem CaveSnakeLamp, 1;
-    delitem WhiteFur, 1;
-    delitem PileOfAsh, 1;
-    delitem BottleOfWater, 1;
+    delitem "InsectSlime", 1;
+    delitem "InsectLeg", 1;
+    delitem "SilkCocoon", 1;
+    delitem "SmallMushroom", 1;
+    delitem "PinkPetal", 1;
+    delitem "Pearl", 1;
+    delitem "HardSpike", 1;
+    delitem "RawLog", 1;
+    delitem "PinkAntenna", 1;
+    delitem "DarkCrystal", 1;
+    delitem "IronOre", 1;
+    delitem "ScorpionStinger", 1;
+    delitem "RedScorpionStinger", 1;
+    delitem "BlackScorpionStinger", 1;
+    delitem "SnakeTongue", 1;
+    delitem "MountainSnakeTongue", 1;
+    delitem "GrassSnakeTongue", 1;
+    delitem "CaveSnakeTongue", 1;
+    delitem "MauveHerb", 1;
+    delitem "CobaltHerb", 1;
+    delitem "GambogeHerb", 1;
+    delitem "AlizarinHerb", 1;
+    delitem "TreasureKey", 1;
+    delitem "CaveSnakeLamp", 1;
+    delitem "WhiteFur", 1;
+    delitem "PileOfAsh", 1;
+    delitem "BottleOfWater", 1;
 
     mes "You managed to perform the ritual and open the chest.";
-    getitem DemonMask, 1;
+    getitem "DemonMask", 1;
     mes "You found a demon mask inside.";
     set @state, 3;
     callsub S_Update_Mask;
     goto L_Close;
 
-L_No_maggot_slime:
-    mes "You do not have any maggot slime.";
+L_No_insect_slime:
+    mes "You do not have any insect slime.";
     goto L_Close;
 
 L_No_mushroom:
@@ -163,8 +163,8 @@ L_No_herbs:
     mes "Four different herbs are needed to get this thing open.";
     goto L_Close;
 
-L_No_bug_leg:
-    mes "You do not have part of a bug on you. That is rather odd considering what you went through to get here.";
+L_No_insect_leg:
+    mes "You do not have part of a insect on you. That is rather odd considering what you went through to get here.";
     goto L_Close;
 
 L_No_lamp:
diff --git a/world/map/npc/015-3/katze.txt b/world/map/npc/015-3/katze.txt
index 15dea917..1aec54db 100644
--- a/world/map/npc/015-3/katze.txt
+++ b/world/map/npc/015-3/katze.txt
@@ -1,7 +1,7 @@
 // Katze doesn't like the player at first, needs following:
 //
 // 1. Some milk
-// 2. Some steak or chicken leg
+// 2. Some steak or bird leg
 // 3. Some fur
 //
 // Now the cat starts to speak, still needs:
@@ -11,7 +11,7 @@
 //
 //    * 2 Snake skins
 //    * 2 Snake tongues
-//    * 2 Maggot slimes
+//    * 2 Insect slimes
 //    * 2 White furs
 //    * 2 Hard spikes
 //    * 2 Tiny potions
@@ -108,7 +108,7 @@ L_NeedsStuff:
     mes "\"You've been really kind to me. I can make you something nice, but I will need";
     mes "2 Snake Skins,";
     mes "2 Snake Tongues,";
-    mes "2 Maggot Slimes,";
+    mes "2 Insect Slimes,";
     mes "2 White Furs,";
     mes "2 Hard Spikes and";
     mes "2 Tiny Healing Potions.\"";
@@ -136,7 +136,7 @@ L_Please:
     mes "\"Alright... [the cat glares at you] it was";
     mes "2 Snake Skins,";
     mes "2 Snake Tongues,";
-    mes "2 Maggot Slimes,";
+    mes "2 Insect Slimes,";
     mes "2 White Furs,";
     mes "2 Hard Spikes and";
     mes "2 Tiny Healing Potions.\"";
@@ -145,7 +145,7 @@ L_Please:
 L_CatChecksStuff:
     if (countitem("SnakeSkin") > 1
         && countitem("SnakeTongue") > 1
-        && countitem("MaggotSlime") > 1
+        && countitem("InsectSlime") > 1
         && countitem("WhiteFur") > 1
         && countitem("HardSpike") > 1
         && countitem("TinyHealingPotion") > 1)
@@ -157,7 +157,7 @@ L_CatChecksStuff:
 L_GiveStuff:
     delitem "SnakeSkin", 2;
     delitem "SnakeTongue", 2;
-    delitem "MaggotSlime", 2;
+    delitem "InsectSlime", 2;
     delitem "WhiteFur", 2;
     delitem "HardSpike", 2;
     delitem "TinyHealingPotion", 2;
diff --git a/world/map/npc/015-3/pot.txt b/world/map/npc/015-3/pot.txt
index 523be319..d13b819f 100644
--- a/world/map/npc/015-3/pot.txt
+++ b/world/map/npc/015-3/pot.txt
@@ -48,23 +48,23 @@ L_NeedsFood:
     mes "The milk is gone!";
     next;
 
-    if (countitem("ChickenLeg") > 0 && countitem("Steak") > 0)
+    if (countitem("BirdLeg") > 0 && countitem("Steak") > 0)
         menu
-            "Put in a chicken leg.", L_GiveChicken,
+            "Put in a bird leg.", L_GiveBird,
             "Put in a steak.", L_GiveSteak,
             "Leave it alone.", L_Close;
-    if (countitem("ChickenLeg") > 0 && countitem("Steak") == 0)
+    if (countitem("BirdLeg") > 0 && countitem("Steak") == 0)
         menu
-            "Put in a chicken leg.", L_GiveChicken,
+            "Put in a bird leg.", L_GiveBird,
             "Leave it alone.", L_Close;
-    if (countitem("ChickenLeg") == 0 && countitem("Steak") > 0)
+    if (countitem("BirdLeg") == 0 && countitem("Steak") > 0)
         menu
             "Put in a steak.", L_GiveSteak,
             "Leave it alone.", L_Close;
     goto L_Close;
 
-L_GiveChicken:
-    delitem "ChickenLeg", 1;
+L_GiveBird:
+    delitem "BirdLeg", 1;
     set @cat, 2;
     callsub S_Update_Katze;
     set @catNeedsAlone, 1;
diff --git a/world/map/npc/016-1/rossy.txt b/world/map/npc/016-1/rossy.txt
index 126dd8b9..d4837a18 100644
--- a/world/map/npc/016-1/rossy.txt
+++ b/world/map/npc/016-1/rossy.txt
@@ -9,10 +9,10 @@
     set @Cherry_EXP, 2000;
 
     set @CactusDrink_Amount, 24;
-    set @MaggotSlime_Amount, 32;
+    set @InsectSlime_Amount, 32;
     set @GambodgeHerb_Amount, 50;
     set @AlizarinHerb_Amount, 43;
-    set @BugLeg_Amount, 30;
+    set @InsectLeg_Amount, 30;
     set @Potion_EXP, 3000;
 
     set @RedRose_Amount, 15;
@@ -133,14 +133,14 @@ L_PaperSays:
     mes "\"Oh no, I completely forgot! My magic school exam! I need to make a potion and give it to my teacher today! But I haven't found Julia yet and I don't even have any of the ingredients required. Could you get them for me, please?\"";
     next;
     set Rossy_Quest, 6;
-    mes "\"I need " + @CactusDrink_Amount + " Cactus Drinks, " + @MaggotSlime_Amount + " Maggot Slimes, " + @GambodgeHerb_Amount + " Gamboge Herbs, " + @AlizarinHerb_Amount + " Alizarin Herbs and " + @BugLeg_Amount + " Bug Legs.\"";
+    mes "\"I need " + @CactusDrink_Amount + " Cactus Drinks, " + @InsectSlime_Amount + " Insect Slimes, " + @GambodgeHerb_Amount + " Gamboge Herbs, " + @AlizarinHerb_Amount + " Alizarin Herbs and " + @InsectLeg_Amount + " Insect Legs.\"";
     next;
     mes "\"Please come back to see me when you have the ingredients. I know the recipe by heart.\"";
     close;
 
 L_NE:
     mes "[Rossy]";
-    mes "\"Please bring me " + @CactusDrink_Amount + " Cactus Drinks, " + @MaggotSlime_Amount + " Maggot Slimes, " + @GambodgeHerb_Amount + " Gamboge Herbs, " + @AlizarinHerb_Amount + " Alizarin Herbs and " + @BugLeg_Amount + " Bug Legs.\"";
+    mes "\"Please bring me " + @CactusDrink_Amount + " Cactus Drinks, " + @InsectSlime_Amount + " Insect Slimes, " + @GambodgeHerb_Amount + " Gamboge Herbs, " + @AlizarinHerb_Amount + " Alizarin Herbs and " + @InsectLeg_Amount + " Insect Legs.\"";
     next;
     mes "\"Please hurry!\"";
     close;
@@ -148,19 +148,19 @@ L_NE:
 L_Check2:
     if(countitem("CactusDrink") < @CactusDrink_Amount)
         goto L_NE;
-    if(countitem("MaggotSlime") < @MaggotSlime_Amount)
+    if(countitem("InsectSlime") < @InsectSlime_Amount)
         goto L_NE;
     if(countitem("GambogeHerb") < @GambodgeHerb_Amount)
         goto L_NE;
     if(countitem("AlizarinHerb") < @AlizarinHerb_Amount)
         goto L_NE;
-    if(countitem("BugLeg") < @BugLeg_Amount)
+    if(countitem("InsectLeg") < @InsectLeg_Amount)
         goto L_NE;
     delitem "CactusDrink", @CactusDrink_Amount;
-    delitem "MaggotSlime", @MaggotSlime_Amount;
+    delitem "InsectSlime", @InsectSlime_Amount;
     delitem "GambogeHerb", @GambodgeHerb_Amount;
     delitem "AlizarinHerb", @AlizarinHerb_Amount;
-    delitem "BugLeg", @BugLeg_Amount;
+    delitem "InsectLeg", @InsectLeg_Amount;
     mes "Rossy takes all the ingredients and places them on the ground. She starts to mix some herbs with the cactus drinks and appears to cast some spells. She seems to know what she is doing.";
     next;
     mes "[Rossy]";
diff --git a/world/map/npc/018-3/bookcase.txt b/world/map/npc/018-3/bookcase.txt
index 8c5d587f..059678a5 100644
--- a/world/map/npc/018-3/bookcase.txt
+++ b/world/map/npc/018-3/bookcase.txt
@@ -24,7 +24,7 @@ L_Search:
     mes "";
     mes "It looks like a lot of items will be needed.";
     next;
-    mes "The slime of a maggot.";
+    mes "The slime of a insect.";
     mes "A mushroom, big or small.";
     mes "The petal of a pink flower.";
     next;
@@ -38,7 +38,7 @@ L_Search:
     next;
     mes "A pile of ash.";
     mes "Four different herbs.";
-    mes "A bug, or part of one.";
+    mes "A insect, or part of one.";
     next;
     mes "A lamp for the dark.";
     mes "Rock and metal, as one.";
diff --git a/world/map/npc/020-1/well.txt b/world/map/npc/020-1/well.txt
index ec42c397..e9b87656 100644
--- a/world/map/npc/020-1/well.txt
+++ b/world/map/npc/020-1/well.txt
@@ -27,9 +27,9 @@ L_Throw:
     mes "What do you want to throw?";
     
     setarray @response_list$, "Yuck! Who threw that on me?", "Ouch! Who's hurting me?", "White powder!? What's going on up there?", "It's raining in Nivalis?!";
-    setarray @item_list$, "MaggotSlime", "RawLog", "PileOfAsh", "BottleOfWater";
+    setarray @item_list$, "InsectSlime", "RawLog", "PileOfAsh", "BottleOfWater";
     menu
-        "Maggot slime", L_CheckItem,
+        "Insect slime", L_CheckItem,
         "A raw log", L_CheckItem,
         "Pile of ash", L_CheckItem,
         "Bottle of water", L_CheckItem,
diff --git a/world/map/npc/020-2/baktar.txt b/world/map/npc/020-2/baktar.txt
index 9d1f658b..4dcef7a6 100644
--- a/world/map/npc/020-2/baktar.txt
+++ b/world/map/npc/020-2/baktar.txt
@@ -17,7 +17,7 @@
 //# bit 4        tongue_Item
 //# bit 5        eggs_Item
 //# bit 6        skin_Item
-//# bit 7        bugleg
+//# bit 7        insectleg
 //#=========================
 020-2,70,61,0|script|Baktar|191
 {
@@ -49,9 +49,9 @@
     set @MONEY_SNAKESKIN, 800;
     set @XP_SNAKESKIN, 350;
 
-    set @BIT_BUGLEG,7;
-    set @MONEY_BUGLEG, 20;
-    set @XP_BUGLEG, 130;
+    set @BIT_INSECTLEG,7;
+    set @MONEY_INSECTLEG, 20;
+    set @XP_INSECTLEG, 130;
 
     set @run, ((QUEST_NorthTulimshar & TWOBIT_8_MASK) >> TWOBIT_8_SHIFT);
     if ((@run == 3) && (QL_KYLIAN == 13))
@@ -130,15 +130,15 @@ L_egg:
     goto L_Skin;
 
 L_Skin:
-    if (countitem("SnakeSkin") < 1 || QL_BAKTAR & (1<<@BIT_SNAKESKIN)) goto L_bugleg;
+    if (countitem("SnakeSkin") < 1 || QL_BAKTAR & (1<<@BIT_SNAKESKIN)) goto L_insectleg;
     set @exotic_item$[@c], "a Snake Skin?";
     set @menuid[@c], 5;
     set @c, @c + 1;
-    goto L_bugleg;
+    goto L_insectleg;
 
-L_bugleg:
-    if (countitem("BugLeg") < 1 || QL_BAKTAR & (1<<@BIT_BUGLEG)) goto L_NeverMind;
-    set @exotic_item$[@c], "a Bug Leg?";
+L_insectleg:
+    if (countitem("InsectLeg") < 1 || QL_BAKTAR & (1<<@BIT_INSECTLEG)) goto L_NeverMind;
+    set @exotic_item$[@c], "a Insect Leg?";
     set @menuid[@c], 6;
     set @c, @c + 1;
     goto L_NeverMind;
@@ -165,7 +165,7 @@ L_MenuItems:
     if (@menuid[@menu] == 3) goto L_tongue_Item;
     if (@menuid[@menu] == 4) goto L_egg_Item;
     if (@menuid[@menu] == 5) goto L_skin_Item;
-    if (@menuid[@menu] == 6) goto L_BugLegItem;
+    if (@menuid[@menu] == 6) goto L_InsectLegItem;
 //if Never mind
     mes @npcname$;
     mes "\"Ok, goodbye then.\"";
@@ -225,13 +225,13 @@ L_skin_Item:
     set QL_BAKTAR, QL_BAKTAR | (1<<@BIT_SNAKESKIN);
     close;
 
-L_BugLegItem:
-    if(QL_BAKTAR & (1<<@BIT_BUGLEG)) goto L_havealready;
-    if (countitem("BugLeg") < 1) goto L_Noitem;
-    delitem "BugLeg", 1;
-    set Zeny, Zeny + @MONEY_BUGLEG;
-    getexp @XP_BUGLEG,0;
-    set QL_BAKTAR, QL_BAKTAR | (1<<@BIT_BUGLEG);
+L_InsectLegItem:
+    if(QL_BAKTAR & (1<<@BIT_INSECTLEG)) goto L_havealready;
+    if (countitem("InsectLeg") < 1) goto L_Noitem;
+    delitem "InsectLeg", 1;
+    set Zeny, Zeny + @MONEY_INSECTLEG;
+    getexp @XP_INSECTLEG,0;
+    set QL_BAKTAR, QL_BAKTAR | (1<<@BIT_INSECTLEG);
     close;
 
 L_Noitem:
diff --git a/world/map/npc/026-2/gy_inn_shops.txt b/world/map/npc/026-2/gy_inn_shops.txt
index 18580dbd..ec4d1c04 100644
--- a/world/map/npc/026-2/gy_inn_shops.txt
+++ b/world/map/npc/026-2/gy_inn_shops.txt
@@ -34,7 +34,7 @@
     close;
 }
 
-026-2,31,119,0|shop|Leofwin|304,CactusDrink:*1,CactusPotion:*1,BugLeg:*1,SmallMushroom:*1,IronPotion:*1,EnlighteningElixir:*1,ConcentrationPotion:*1,HardSpike:*1,DarkCrystal:*1,Root:*1,WispPowder:*1,SpectrePowder:*1,PoltergeistPowder:*1
+026-2,31,119,0|shop|Leofwin|304,CactusDrink:*1,CactusPotion:*1,InsectLeg:*1,SmallMushroom:*1,IronPotion:*1,EnlighteningElixir:*1,ConcentrationPotion:*1,HardSpike:*1,DarkCrystal:*1,Root:*1,WispPowder:*1,SpectrePowder:*1,PoltergeistPowder:*1
 
 026-2,22,120,0|shop|Umfrey|302,BoneArrows:*1,ThornArrow:*1,ShockSweet:*1
 // Bank and Storage
diff --git a/world/map/npc/029-1/hasan.txt b/world/map/npc/029-1/hasan.txt
index 724db18c..b87794dc 100644
--- a/world/map/npc/029-1/hasan.txt
+++ b/world/map/npc/029-1/hasan.txt
@@ -60,7 +60,7 @@ L_Main:
     mes "[Unfriendly Guy]";
     mes "\"What are you looking at?\"";
     menu
-        "What ever you call maggot slime scrapped off a boat after a walk through the sewers.", L_Fight,
+        "What ever you call insect slime scrapped off a boat after a walk through the sewers.", L_Fight,
         "Who me? I saw nothing, just passing by.", L_Close;
 
 L_FightAgain:
diff --git a/world/map/npc/029-1/hideandseek.txt b/world/map/npc/029-1/hideandseek.txt
index e0ed487f..fb2a606d 100644
--- a/world/map/npc/029-1/hideandseek.txt
+++ b/world/map/npc/029-1/hideandseek.txt
@@ -166,13 +166,13 @@ L_Next:
 L_Next1:
     mes "[Latif]";
     mes "\"My friend Vincent thinks so too. He doesn't join us playing.";
-    mes "Do you know what he does instead? He builds action figures out of Bug Legs! That is lame.\"";
+    mes "Do you know what he does instead? He builds action figures out of insect legs! That is lame.\"";
     goto L_Close;
 
 L_Agree:
     mes "[Latif]";
     mes "\"Yeah, right? My friend Vincent doesn't thinks so. He doesn't join us playing.";
-    mes "Do you know what he does instead? He builds action figures out of Bug Legs! That is lame.\"";
+    mes "Do you know what he does instead? He builds action figures out of insect legs! That is lame.\"";
     goto L_Close;
 
 L_Find:
diff --git a/world/map/npc/029-1/rewards_master.txt b/world/map/npc/029-1/rewards_master.txt
index 943fe8cb..442bf1f6 100644
--- a/world/map/npc/029-1/rewards_master.txt
+++ b/world/map/npc/029-1/rewards_master.txt
@@ -6,7 +6,7 @@
     if (tvis == 0) set tvis, 1;
     if (Mobpt < tvis) goto L_NotEnough;
 
-    setarray @Items$, "AppleCake", "Arrow", "Beer", "Boots", "BugLeg", "CactusDrink", "CactusPotion", "Cake", "Candy", "CasinoCoins", "CherryCake", "ChickenLeg", "ChocolateBar", "ChocolateCake", "CottonBoots", "CottonCloth", "CottonShirt", "CottonShorts", "FancyHat", "GreenApple", "HardSpike", "IronOre", "Lifestone", "LightBlueDye", "MaggotSlime", "Milk", "Orange", "OrangeCake", "OrangeCupcake", "PinkPetal", "PileOfAsh", "PinkAntenna", "PoltergeistPowder", "RawLog", "RedApple", "RedDye", "ScorpionStinger", "SerfHat", "SmallHealingPotion", "SmallMushroom", "SnakeSkin", "SpectrePowder", "Steak", "TinyHealingPotion", "WhiteCake", "WhiteFur", "WispPowder", "YellowDye", "Coal", "ManaDust";
+    setarray @Items$, "AppleCake", "Arrow", "Beer", "Boots", "InsectLeg", "CactusDrink", "CactusPotion", "Cake", "Candy", "CasinoCoins", "CherryCake", "BirdLeg", "ChocolateBar", "ChocolateCake", "CottonBoots", "CottonCloth", "CottonShirt", "CottonShorts", "FancyHat", "GreenApple", "HardSpike", "IronOre", "Lifestone", "LightBlueDye", "InsectSlime", "Milk", "Orange", "OrangeCake", "OrangeCupcake", "PinkPetal", "PileOfAsh", "PinkAntenna", "PoltergeistPowder", "RawLog", "RedApple", "RedDye", "ScorpionStinger", "SerfHat", "SmallHealingPotion", "SmallMushroom", "SnakeSkin", "SpectrePowder", "Steak", "TinyHealingPotion", "WhiteCake", "WhiteFur", "WispPowder", "YellowDye", "Coal", "ManaDust";
 
     mes "[Ishi the Rewards Master]";
     mes "\"Welcome! I see you have " + Mobpt + " Monster Points. Would you like to exchange some of those for items?\"";
diff --git a/world/map/npc/029-1/vincent.txt b/world/map/npc/029-1/vincent.txt
index e36b52c2..ddc6233b 100644
--- a/world/map/npc/029-1/vincent.txt
+++ b/world/map/npc/029-1/vincent.txt
@@ -40,12 +40,12 @@ L_Con_Vin_First:
     goto L_Opening1;
 
 L_Opening1:
-    mes "\"I just need 5 more Bug Legs to finish my action figure!\"";
+    mes "\"I just need 5 more insect legs to finish my action figure!\"";
     next;
     goto L_Ask;
 
 L_Opening2:
-    mes "\"This maggot action figure is awesome! I just need to attach 5 Bug Legs.\"";
+    mes "\"This maggot action figure is awesome! I just need to attach 5 insect legs.\"";
     next;
     goto L_Ask;
 
@@ -55,12 +55,12 @@ L_Opening3:
     goto L_Ask;
 
 L_Opening4:
-    mes "\"Can you get me 5 Bug Legs? I need them to replace the action figure parts.\"";
+    mes "\"Can you get me 5 insect legs? I need them to replace the action figure parts.\"";
     next;
     goto L_Ask;
 
 L_Ask:
-    mes "\"Will you help me find 5 Bug Legs?\"";
+    mes "\"Will you help me find 5 insect legs?\"";
     next;
     menu
         "Yes.", L_Sure,
@@ -99,23 +99,23 @@ L_Req4:
     goto L_Wait;
 
 L_Wait:
-    mes "\"Now please go get me 5 Bug Legs.\"";
+    mes "\"Now please go get me 5 insect legs.\"";
     goto L_Close;
 
 L_Progress:
-    if(countitem("BugLeg") >= 5)
+    if(countitem("InsectLeg") >= 5)
         goto L_Have;
     mes "[Vincent]";
-    mes "\"Please help me collect 5 Bug Legs! I need them to complete my action figure.\"";
+    mes "\"Please help me collect 5 insect legs! I need them to complete my action figure.\"";
     goto L_Close;
 
 L_Have:
     mes "[Vincent]";
     mes "\"Excellent! Finally I can complete the model!!\"";
     next;
-    if(countitem("BugLeg") < 5)
+    if(countitem("InsectLeg") < 5)
         goto L_Progress;
-    delitem "BugLeg", 5;
+    delitem "InsectLeg", 5;
     getexp 50, 0;
     set Zeny, Zeny + 1000;
     set QL_VINCENT, 2;
diff --git a/world/map/npc/029-2/sorfina.txt b/world/map/npc/029-2/sorfina.txt
index e1e92867..a851a71c 100644
--- a/world/map/npc/029-2/sorfina.txt
+++ b/world/map/npc/029-2/sorfina.txt
@@ -226,7 +226,7 @@ L_Items:
     next;
     mes "\"Equipment items like Armors, Weapons, Accessories can be equipped for fashionable purposes or to raise your status.\"";
     next;
-    mes "\"Miscellaneous items such as maggot slime, can be used in creating other items, or just to trade and sell.\"";
+    mes "\"Miscellaneous items such as insect slime, can be used in creating other items, or just to trade and sell.\"";
     next;
     mes "\"Your HitchHikers Towel will return you to your last touched soul menhir or here if not set. That also applies if you ever get hurt too badly, mana forbid.\"";
     mes "\"Towels can't be used constantly as the magic needs time to power the jump. If you do get really hurt, you'll also have to wait. Soul Menhirs are magical too, you see?\"";
diff --git a/world/map/npc/annuals/halloween/config.txt b/world/map/npc/annuals/halloween/config.txt
index ffe9dfbe..56b3dba0 100644
--- a/world/map/npc/annuals/halloween/config.txt
+++ b/world/map/npc/annuals/halloween/config.txt
@@ -264,7 +264,7 @@ L_Main:
     set $@halloween_trick_scary$[$@n],     "Hey, that action figure you're building just CAME TO LIFE!";
     set $@halloween_react_scary$[$@n],     "\"Really? Cool! Where? What? You were tricking me? WAAAH!\"";
     set $@halloween_trick_veryscary$[$@n], "Wow, this is a neat action figure! Haha, check out its moves! Oops! Never mind, I'm sure it'll glue back on.";
-    set $@halloween_react_veryscary$[$@n], "\"My Bug Leg action figure! You broke it!\"";
+    set $@halloween_react_veryscary$[$@n], "\"My Insect Leg action figure! You broke it!\"";
 
     set $@n, $@n + 1;
 
diff --git a/world/map/npc/functions/vault.txt b/world/map/npc/functions/vault.txt
index f2c51387..c3d95dd8 100644
--- a/world/map/npc/functions/vault.txt
+++ b/world/map/npc/functions/vault.txt
@@ -6,18 +6,12 @@
 function|script|VaultLogin
 {
     if (##VAULT < 1) goto L_Return;
+    // TODO: Or #VAULT ? Which of the two is set?
 
-    // Imports & Vitals
     callsub S_Exp;
     callsub S_Gold;
     callsub S_Preset;
 
-    // Quest Handlers
-    callsub S_Quest_CR1;
-
-    // Mirror lake
-    callsub S_MirrorLake;
-
     // Clean up
     set @last_preset, 0;
     return; // go back to global handler
@@ -47,9 +41,8 @@ S_Preset:
 
     // Each preset is 5 levels (Preset 1 = Lv 5, Preset 10 = Lv 50, Max Preset 20 - hard limit is 127)
     // TODO: Give more ammo, iron powder, sulphur powder, etc. instead of equips
-    // Give also some bug legs and maggot slime if applicable?
+    // Give also some insect legs and insect slimes if applicable?
     /* Handle weapons */
-    /*
     if (##PRESET >= 1 && @last_preset < 1)
         getitem "SharpKnife",1;
     if (##PRESET >= 2 && @last_preset < 2)
@@ -90,55 +83,14 @@ S_Preset:
         getitem "IronPowder", 150;
     if (##PRESET >= 19 && @last_preset < 19)
         getitem "TerraniteArrow",250;
-    */
-    set ##PRESET, 0;
-    return;
 
-////////////////////////////////
-S_Quest_CR1:
-    if (!(##01_CRQUEST & 1)) goto S_Return;
-    if (##03_TMWWORLD & MLP_CR_DEBUT) goto S_Return;
-    // Check if you can receive the rewards
-    getinventorylist;
-    if (@inventorylist_count >= 96) goto S_Return;
-    // Mark quest as done and issue rewards
-    set BOSS_POINTS, BOSS_POINTS + 871;
-    set ##03_TMWWORLD, ##03_TMWWORLD | MLP_CR_DEBUT;
-    getitem WhiteCake, 1;
-    getitem ChocolateCake, 1;
-    getitem OrangeCake, 1;
-    getitem AppleCake, 1;
-    message strcharinfo(0), "Mirror Lake : You gained 871 boss points.";
-    return;
-
-////////////////////////////////
-S_MirrorLake:
-    // Wipe any existing TMWA internal mirror lake information
-    set ##VAULT_GOTO, 0;
-    set ##VAULT_MLTO, 0;
-    // TODO: Put the Mirror Lake Portal into the shipwreck? (see portal #2)
-    set .@gto, call("get_byte",   ##00_INFO, 3);
-    set .@mlp, call("get_nibble", ##00_INFO, 5);
-    // If we're moving from Mirror Lake to TMW
-    if (.@gto != WORLD_ID) goto S_MirrorFix;
-    debugmes "Vault User "+##VAULT+" moved to lake "+.@mlp;
-    if (.@mlp == 1) warp "013-2", 37, 23; // Hurnscald Mirror Lake
-    if (.@mlp == 2) warp "002-1", 30, 58; // Tulimshar Mirror Lake
-    // Unset the target lake/world
-    void call("set_byte",   ##00_INFO, 3, 0);
-    void call("set_nibble", ##00_INFO, 5, 0);
-    return;
-
-// We've moved to the wrong world, so preserve it.
-S_MirrorFix:
-    set ##VAULT_GOTO, call("get_byte",   ##00_INFO, 3);
-    set ##VAULT_MLTO, call("get_nibble", ##00_INFO, 5);
+    set ##PRESET, 0;
     return;
 }
 
 
 // Remember: ##VAULT_EXP, ##VAULT_GOTO, ##VAULT_MLTO for Mirror Lake Protocol
-// However, without kick(7), it is not really worth anything - so I presumed 7
+// However, without kick(7), it is not really worth anything
 // Remember: Quote symbols are illegal, simple or double, except for parameter
 // To reset the database:
 //    cleararray $EXPORT_DATA$[0], "", 254;
@@ -202,26 +154,6 @@ function|script|VaultLogout
     set $@API_PROTOCOL, API_VAULT;
     set $@API_DATA$, "'UID': "+##VAULT+", 'GID': "+getcharid(3);
     callfunc "FlushAPI";
-
-    return;
-
-L_Return:
-    return;
-}
-
-// MirrorLakeSendTo(World)
-function|script|MirrorLakeSendTo
-{
-    if (##VAULT < 1) goto L_Return;
-    set ##VAULT_GOTO, getarg(0);
-    // This is TMWA - so it'll always use Lake #0 for performance reasons
-    set $@API_PROTOCOL, API_VAULT;
-    set $@API_DATA$, "'UID': "+##VAULT+", 'GID': "+getcharid(3);
-    callfunc "FlushAPI";
-    message strcharinfo(0), "Darkness fills your vision...";
-    // TODO: Misc effects
-    // TODO: Sleep for 10~15 seconds (for mapreg)
-    // TODO: Disconnect user
     return;
 
 L_Return:
diff --git a/world/map/npc/items/rubber_duck.txt b/world/map/npc/items/rubber_duck.txt
new file mode 100644
index 00000000..9f873e1c
--- /dev/null
+++ b/world/map/npc/items/rubber_duck.txt
@@ -0,0 +1,11 @@
+function|script|rubberDuck
+{
+    if (gettimetick(2) - @lastbat < 2) goto L_Return;
+    misceffect 405;
+    set @lastbat, gettimetick(2);
+    goto L_Return;
+
+L_Return:
+    getitem "RubberDucky", 1;
+    return;
+}
diff --git a/world/map/npc/magic/level1-summon-maggots.txt b/world/map/npc/magic/level1-summon-maggots.txt
index 8700e39a..05cadbc8 100644
--- a/world/map/npc/magic/level1-summon-maggots.txt
+++ b/world/map/npc/magic/level1-summon-maggots.txt
@@ -7,12 +7,12 @@ OnCast:
     if (Sp < 21) end;
     if (getmapflag(getmap(), MF_TOWN)) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
-    if (countitem("MaggotSlime") < 1 || countitem("Root") < 1) end;
+    if (countitem("InsectSlime") < 1 || countitem("Root") < 1) end;
     if (getmap() == "033-1") goto L_SpecialRules6;
     goto L_Pay;
 
 L_Pay:
-    delitem "MaggotSlime", 1;
+    delitem "InsectSlime", 1;
     delitem "Root", 1;
     set @_M_BLOCK, 1; // block casting, until the timer clears it
     addtimer 20000, "Magic Timer::OnClear"; // set the new debuff
diff --git a/world/map/npc/magic/level2-enchant-lifestone.txt b/world/map/npc/magic/level2-enchant-lifestone.txt
index a03e645b..05f26b89 100644
--- a/world/map/npc/magic/level2-enchant-lifestone.txt
+++ b/world/map/npc/magic/level2-enchant-lifestone.txt
@@ -3,8 +3,8 @@
     if(call("magic_checks")) end;
     if (Sp < 15) end;
     if (getskilllv(.school) < .level) end;
-    if   (countitem("BugLeg") >= 1) delitem "BugLeg", 1;
-    elif (countitem("MaggotSlime") >= 1) delitem "MaggotSlime", 1;
+    if   (countitem("InsectLeg") >= 1) delitem "InsectLeg", 1;
+    elif (countitem("InsectSlime") >= 1) delitem "InsectSlime", 1;
     elif (countitem("MauveHerb") >= 1 && countitem("AlizarinHerb") >= 1 && countitem("CobaltHerb") >= 1 && countitem("GambogeHerb") >= 1) goto L_Herbs;
     else end;
     goto L_Proceed;
diff --git a/world/map/npc/scripts.conf b/world/map/npc/scripts.conf
index 47a79415..7c20ea88 100644
--- a/world/map/npc/scripts.conf
+++ b/world/map/npc/scripts.conf
@@ -51,6 +51,7 @@ npc: npc/items/launcher_ammo.txt
 npc: npc/items/check_wand.txt
 npc: npc/items/mirror.txt
 npc: npc/items/rubber_bat.txt
+npc: npc/items/rubber_duck.txt
 npc: npc/items/scentedcandle.txt
 npc: npc/items/tmwgift.txt
 npc: npc/items/brawling_item.txt