Replaced some unsupported symbols in AegisNames (step 2)

This removes the remaining unsupported symbols (despite they being
official names) in AegisNames: The apostrophe (`'`) sign is suppressed.

The full replacement rules (cumulative with the step 1 commit) are thus:

- Any apostrophe is suppressed.
- Any non-`[A-Za-z0-9_]` character is replaced with an underscore (`_`).
- If the replaced symbol is at a word boundary (beginning or end of the
  string, or next to another underscore), it is suppressed instead.
- If the replacement causes an AegisName conflict, underscores are
  appended appropriately.

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

31 files changed, 182 insertions, 182 deletions

diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt
index 83e7e2ea4..3b97f60ee 100644
--- a/npc/quests/cooking_quest.txt
+++ b/npc/quests/cooking_quest.txt
@@ -429,7 +429,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	4_M_OILMAN,{
 		goto L_End;
 	}
 	else if (cooking_q == 1) {
-		if (countitem(Grasshopper's_Leg) > 4 && countitem(Old_Frying_Pan) > 0 && countitem(Cooking_Oil) > 0) {
+		if (countitem(Grasshoppers_Leg) > 4 && countitem(Old_Frying_Pan) > 0 && countitem(Cooking_Oil) > 0) {
 			cutin "orleans_4",0;
 			emotion e_an;
 			mes "[Charles Orleans]";
@@ -462,7 +462,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	4_M_OILMAN,{
 			mes "know this recipe now. That's";
 			mes "all for today, so please go";
 			mes "and practice on your own now.";
-			delitem Grasshopper's_Leg,5;
+			delitem Grasshoppers_Leg,5;
 			delitem Old_Frying_Pan,1;
 			delitem Cooking_Oil,1;
 			cooking_q = 7;
diff --git a/npc/quests/doomed_swords.txt b/npc/quests/doomed_swords.txt
index 63fdccf16..7b0911f37 100644
--- a/npc/quests/doomed_swords.txt
+++ b/npc/quests/doomed_swords.txt
@@ -723,7 +723,7 @@ pay_fild08,218,283,2	script	Mysterious Man#magum	4_M_ORIENT02,{
 						mes "Mysteltainn twig used to kill Baldur. Hurry and bring it...";
 						close;
 					}
-					if (countitem(Loki's_Whispers) < 1) {
+					if (countitem(Lokis_Whispers) < 1) {
 						mes "[Mysterious Blacksmith]";
 						mes "Hm. You forgot to bring";
 						mes "^0099FF1 Loki's Whispers^000000. We need";
@@ -732,7 +732,7 @@ pay_fild08,218,283,2	script	Mysterious Man#magum	4_M_ORIENT02,{
 						mes "find that as quickly as you can! ";
 						close;
 					}
-					if (countitem(Mother's_Nightmare) < 1) {
+					if (countitem(Mothers_Nightmare) < 1) {
 						mes "[Mysterious Blacksmith]";
 						mes "Hm, you still need to";
 						mes "bring ^0099FF1 Mother's Nightmare^000000";
@@ -758,7 +758,7 @@ pay_fild08,218,283,2	script	Mysterious Man#magum	4_M_ORIENT02,{
 						mes "of wielding it. Bring ^0099FF1 Emperium^000000 and I will recognize your worth.";
 						close;
 					}
-					if (countitem(Young_Twig) > 0 && countitem(Loki's_Whispers) > 0 && countitem(Mother's_Nightmare) > 0 && countitem(Foolishness_Of_Blind) > 0 && countitem(Emperium) > 0) {
+					if (countitem(Young_Twig) > 0 && countitem(Lokis_Whispers) > 0 && countitem(Mothers_Nightmare) > 0 && countitem(Foolishness_Of_Blind) > 0 && countitem(Emperium) > 0) {
 						mes "[Mysterious Blacksmith]";
 						mes "Well done, adventurer.";
 						mes "All seems to be in readiness.";
@@ -773,8 +773,8 @@ pay_fild08,218,283,2	script	Mysterious Man#magum	4_M_ORIENT02,{
 						mes "quickly! I d-don't want";
 						mes "to touch it if I can avoid it.";
 						delitem Young_Twig,1;
-						delitem Loki's_Whispers,1;
-						delitem Mother's_Nightmare,1;
+						delitem Lokis_Whispers,1;
+						delitem Mothers_Nightmare,1;
 						delitem Foolishness_Of_Blind,1;
 						delitem Emperium,1;
 						getitem Mysteltainn_,1;
@@ -1058,7 +1058,7 @@ pay_fild08,218,283,2	script	Mysterious Man#magum	4_M_ORIENT02,{
 					mes "prepared to wield that blade";
 					mes "with your own two hands...";
 					next;
-					if (countitem(Executioner's_Mitten) < 2) {
+					if (countitem(Executioners_Mitten) < 2) {
 						mes "[Mysterious Blacksmith]";
 						mes "Hm. In order for me";
 						mes "to forge the Executioner,";
@@ -1105,7 +1105,7 @@ pay_fild08,218,283,2	script	Mysterious Man#magum	4_M_ORIENT02,{
 						mes "if you bring ^0099FF1 Emperium^000000.";
 						close;
 					}
-					if (countitem(Executioner's_Mitten) > 1 && countitem(Bloody_Edge) > 9 && countitem(Frozen_Heart) > 2 && countitem(Amulet) > 49 && countitem(Emperium) > 0) {
+					if (countitem(Executioners_Mitten) > 1 && countitem(Bloody_Edge) > 9 && countitem(Frozen_Heart) > 2 && countitem(Amulet) > 49 && countitem(Emperium) > 0) {
 						mes "[Mysterious Blacksmith]";
 						mes "Great, I see that you've";
 						mes "prepared everything that";
@@ -1120,7 +1120,7 @@ pay_fild08,218,283,2	script	Mysterious Man#magum	4_M_ORIENT02,{
 						mes "terrifying sword. Now";
 						mes "take it! Be wary, and don't";
 						mes "let its bloodlust consume you!";
-						delitem Executioner's_Mitten,2;
+						delitem Executioners_Mitten,2;
 						delitem Bloody_Edge,10;
 						delitem Frozen_Heart,3;
 						delitem Amulet,50;
diff --git a/npc/quests/doomed_swords_quest.txt b/npc/quests/doomed_swords_quest.txt
index 6b10b67fc..2f8ac43c1 100644
--- a/npc/quests/doomed_swords_quest.txt
+++ b/npc/quests/doomed_swords_quest.txt
@@ -896,7 +896,7 @@ morocc,248,159,4	script	Young Man#magum1	4_M_04,{
 		close;
 	}
 	else if (dmdswrd_Q == 40) {
-		if (countitem(Bloody_Edge) == 9 && countitem(Blade_Lost_In_Darkness) == 6 && countitem(Cardinal_Jewel) == 9 && countitem(Loki's_Whispers) == 1) {
+		if (countitem(Bloody_Edge) == 9 && countitem(Blade_Lost_In_Darkness) == 6 && countitem(Cardinal_Jewel) == 9 && countitem(Lokis_Whispers) == 1) {
 			mes "[Huey]";
 			mes "Oh, you're back. Did";
 			mes "you bring everything";
@@ -914,7 +914,7 @@ morocc,248,159,4	script	Young Man#magum1	4_M_04,{
 			delitem Bloody_Edge,9;
 			delitem Blade_Lost_In_Darkness,6;
 			delitem Cardinal_Jewel,9;
-			delitem Loki's_Whispers,1;
+			delitem Lokis_Whispers,1;
 			dmdswrd_Q = 41;
 			close;
 		}
diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt
index 89af304ef..479e71e67 100644
--- a/npc/quests/first_class/tu_archer.txt
+++ b/npc/quests/first_class/tu_archer.txt
@@ -938,7 +938,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 			tu_archer01 = 11;
 			close;
 		} else if(tu_archer01 == 11){
-			if (RENEWAL && countitem(Grasshopper's_Leg) < 10) {
+			if (RENEWAL && countitem(Grasshoppers_Leg) < 10) {
 				mes "Hey...";
 				mes "You gotta bring";
 				mes "^3131FF10 Grasshopper's Leg^000000 to pass my midterm! Go back to the southwest area of Prontera and get them!";
@@ -965,7 +965,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 				specialeffect2 EF_WIND;
 				tu_archer01 = 12;
 				if (RENEWAL)
-					delitem Grasshopper's_Leg,10;
+					delitem Grasshoppers_Leg,10;
 				getexp 1000,1000;
 				getitem Great_Bow,1;
 				close;
diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt
index 7cb580130..87c72ef16 100644
--- a/npc/quests/guildrelay.txt
+++ b/npc/quests/guildrelay.txt
@@ -619,7 +619,7 @@
 						getitem Old_Violet_Box,1;
 					}
 					else if ((.@incen_item > 90) && (.@incen_item < 101)) {
-						getitem Ear_Of_Angel's_Wing,1;
+						getitem Ear_Of_Angels_Wing,1;
 					}
 					next;
 					mes "[" + .@name$ + "]";
@@ -1330,7 +1330,7 @@
 					close;
 				}
 			}
-			if ((countitem(Thin_N'_Long_Tongue) > 29) && (countitem(Shoulder_Protection) > 29) && (countitem(Black_Mask) > 29) && (guildrelay_q == 2)) {
+			if ((countitem(Thin_N_Long_Tongue) > 29) && (countitem(Shoulder_Protection) > 29) && (countitem(Black_Mask) > 29) && (guildrelay_q == 2)) {
 				mes "[" + .@name$ + "]";
 				mes "Huh. I didn't actually";
 				mes "expect that you'd collect";
@@ -1338,7 +1338,7 @@
 				mes "Now, take this and give it to";
 				mes "a Blacksmith or Mastersmith.";
 				mes "Your guild's pretty good...";
-				delitem Thin_N'_Long_Tongue,30;
+				delitem Thin_N_Long_Tongue,30;
 				delitem Shoulder_Protection,30;
 				delitem Black_Mask,30;
 				guildrelay_q = 88;
@@ -1380,7 +1380,7 @@
 				mes "Don't forget this time.";
 				close;
 			}
-			if ((countitem(Fright_Paper_Blade) > 29) && (countitem(Lizard_Scruff) > 29) && (countitem(Elder_Pixie's_Beard) > 29) && (guildrelay_q == 89)) {
+			if ((countitem(Fright_Paper_Blade) > 29) && (countitem(Lizard_Scruff) > 29) && (countitem(Elder_Pixies_Beard) > 29) && (guildrelay_q == 89)) {
 				mes "[" + .@name$ + "]";
 				mes "Huh. I didn't actually";
 				mes "expect that you'd collect";
@@ -1390,7 +1390,7 @@
 				mes "Your guild's pretty good...";
 				delitem Fright_Paper_Blade,30;
 				delitem Lizard_Scruff,30;
-				delitem Elder_Pixie's_Beard,30;
+				delitem Elder_Pixies_Beard,30;
 				guildrelay_q = 88;
 				getitem Soul_Of_Courage,1;
 				close;
@@ -2019,7 +2019,7 @@
 				getitem Soul_Of_Harmony,1;
 				close;
 			}
-			else if ((countitem(Heart_Of_Tree) > 29) && (countitem(Soft_Leaf) > 29) && (countitem(Poison_Toad's_Skin) > 29) && (guildrelay_q == 11)) {
+			else if ((countitem(Heart_Of_Tree) > 29) && (countitem(Soft_Leaf) > 29) && (countitem(Poison_Toads_Skin) > 29) && (guildrelay_q == 11)) {
 				mes "[" + .@name$ + "]";
 				mes "Oh, perfect! You brought";
 				mes "all the items. Well then,";
@@ -2029,7 +2029,7 @@
 				mes "^42426FAssassin Cross^000000. Thank you.";
 				delitem Heart_Of_Tree,30;
 				delitem Soft_Leaf,30;
-				delitem Poison_Toad's_Skin,30;
+				delitem Poison_Toads_Skin,30;
 				if (BaseJob == Job_Dancer) {
 					guildrelay_q = 72;
 				}
@@ -2039,7 +2039,7 @@
 				getitem Soul_Of_Harmony,1;
 				close;
 			}
-			else if ((countitem(Goat's_Horn) > 29) && (countitem(Honey_Jar) > 29) && (countitem(Porcupine_Spike) > 29) && (guildrelay_q == 80)) {
+			else if ((countitem(Goats_Horn) > 29) && (countitem(Honey_Jar) > 29) && (countitem(Porcupine_Spike) > 29) && (guildrelay_q == 80)) {
 				mes "[" + .@name$ + "]";
 				mes "Oh, perfect! You brought";
 				mes "all the items. Well then,";
@@ -2047,7 +2047,7 @@
 				mes "take this spirit now. Please";
 				mes "give it to an ^42426FAssassin^000000 or an";
 				mes "^42426FAssassin Cross^000000. Thank you.";
-				delitem Goat's_Horn,30;
+				delitem Goats_Horn,30;
 				delitem Honey_Jar,30;
 				delitem Porcupine_Spike,30;
 				if (BaseJob == Job_Dancer) {
diff --git a/npc/quests/lvl4_weapon_quest.txt b/npc/quests/lvl4_weapon_quest.txt
index bbc75cd19..977071343 100644
--- a/npc/quests/lvl4_weapon_quest.txt
+++ b/npc/quests/lvl4_weapon_quest.txt
@@ -1778,7 +1778,7 @@ niflheim,240,193,3	script	Kayron#lv4	4_M_NFDEADMAN2,{
 			}
 			else {
 				mes "this... Longinus's Spear!";
-				getitem Longinus's_Spear,1;
+				getitem Longinuss_Spear,1;
 			}
 			lv4_weapon = 0;
 			next;
diff --git a/npc/quests/monstertamers.txt b/npc/quests/monstertamers.txt
index 503fc23bd..8e55e54a3 100644
--- a/npc/quests/monstertamers.txt
+++ b/npc/quests/monstertamers.txt
@@ -593,7 +593,7 @@ aldeba_in,168,175,4	script	Monster Tamer#alde	4_M_TELEPORTER,{
 		mes "Its name?";
 		mes "^3355FFOrc Trophy^000000!";
 		next;
-		if ((countitem(Patriotism_Marks) > 0) && (countitem(Scorpion's_Tail) > 0)) {
+		if ((countitem(Patriotism_Marks) > 0) && (countitem(Scorpions_Tail) > 0)) {
 			mes "[Shogo]";
 			mes "Oh! You have all the items necessary to make an Orc Trophy! Good, good! With all my pride as a monster tamer, let me make one for you right away!";
 			next;
@@ -610,7 +610,7 @@ aldeba_in,168,175,4	script	Monster Tamer#alde	4_M_TELEPORTER,{
 			mes "the cute monster";
 			mes "you are raising...";
 			mes "Orc Trophy!";
-			delitem Scorpion's_Tail,1;
+			delitem Scorpions_Tail,1;
 			delitem Patriotism_Marks,1;
 			getitem Horror_Of_Tribe,1; // Horror_Of_Tribe
 			close;
@@ -641,7 +641,7 @@ aldeba_in,168,175,4	script	Monster Tamer#alde	4_M_TELEPORTER,{
 }
 
 comodo,112,182,0	script	Munak's Grandma	8_F_GRANDMOTHER,{
-	if (countitem(Girl's_Diary) > 0) {
+	if (countitem(Girls_Diary) > 0) {
 		mes "[Munak's grandma]";
 		mes "Oh my...";
 		mes "Have you seen my granddaughter,";
diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt
index 6a8a295bf..722509fbc 100644
--- a/npc/quests/newgears/2004_headgears.txt
+++ b/npc/quests/newgears/2004_headgears.txt
@@ -414,7 +414,7 @@ prontera,165,232,3	script	Nephia#1	4_F_ALCHE,{
 		mes "- you put some items into Kafra Storage. -";
 		close;
 	}
-	if (countitem(Big_Sis'_Ribbon) > 0 && countitem(Ribbon_) > 0 && countitem(Silk_Ribbon) > 0) {
+	if (countitem(Big_Sis_Ribbon) > 0 && countitem(Ribbon_) > 0 && countitem(Silk_Ribbon) > 0) {
 		mes "[Nephia]";
 		mes "Oh...";
 		mes "You've brought all these ribbons! I can't wait to tie you a new ribbon to put on your ^FF66CCbeautiful hair!^000000";
@@ -430,7 +430,7 @@ prontera,165,232,3	script	Nephia#1	4_F_ALCHE,{
 		next;
 		mes "[Nephia]";
 		mes "That's it~! We're done! Oh, I just know you're going to look precious wearing this.";
-		delitem Big_Sis'_Ribbon,1;
+		delitem Big_Sis_Ribbon,1;
 		delitem Ribbon_,1;
 		delitem Silk_Ribbon,1;
 		getitem Red_Tailed_Ribbon,1;
@@ -719,7 +719,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	2_M_OLDBLSMITH,{
 						delitem Angelic_Chain,1;
 						delitem Elven_Ears,1;
 						Zeny -= 20000;
-						getitem Ear_Of_Angel's_Wing,1;
+						getitem Ear_Of_Angels_Wing,1;
 						next;
 						mes "[Hatbyr Mhore]";
 						mes "There's no doubt that you'll be the talk of the town sporting these fashionable things.";
@@ -774,7 +774,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	2_M_OLDBLSMITH,{
 						delitem Satanic_Chain,1;
 						delitem Elven_Ears,1;
 						Zeny -= 20000;
-						getitem Ear_Of_Devil's_Wing,1;
+						getitem Ear_Of_Devils_Wing,1;
 						next;
 						mes "[Hatbyr Mhore]";
 						mes "You'll be wowing everyone on the streets with your fashionable new look that says 'It feels so good to be so bad.' Glad to be of service~!";
@@ -844,7 +844,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	2_M_OLDBLSMITH,{
 						delitem Satanic_Chain,1;
 						delitem Elven_Ears,1;
 						Zeny -= 20000;
-						getitem Ear_Of_Devil's_Wing,1;
+						getitem Ear_Of_Devils_Wing,1;
 						next;
 						mes "[Hatbyr Mhore]";
 						mes "You'll be wowing everyone on the streets with your fashionable new look that says 'It feels so good to be so bad.' Glad to be of service~!";
@@ -898,7 +898,7 @@ yuno,241,52,3	script	Old Blacksmith#hgear	2_M_OLDBLSMITH,{
 						delitem Angelic_Chain,1;
 						delitem Elven_Ears,1;
 						Zeny -= 20000;
-						getitem Ear_Of_Angel's_Wing,1;
+						getitem Ear_Of_Angels_Wing,1;
 						next;
 						mes "[Hatbyr Mhore]";
 						mes "There's no doubt that you'll be the talk of the town sporting these fashionable things.";
@@ -1094,7 +1094,7 @@ xmas,175,156,3	script	Fuzzy Fuzz#1	4_M_05,{
 		mes "- you put some items into Kafra Storage. -";
 		close;
 	}
-	if (countitem(Panda_Cap) > 0 && countitem(Needle_Pouch) > 99  && countitem(Spool) > 99 && countitem(Black_Bear's_Skin) > 299) {
+	if (countitem(Panda_Cap) > 0 && countitem(Needle_Pouch) > 99  && countitem(Spool) > 99 && countitem(Black_Bears_Skin) > 299) {
 		if ((MaxWeight-Weight) < 2000) {
 			mes "[Fuzzy Fuzz]";
 			mes "You brought every material I need, but unfortunately you don't have enough space in your inventory. Try and place some of your items into Kafra Storage first.";
@@ -1120,7 +1120,7 @@ xmas,175,156,3	script	Fuzzy Fuzz#1	4_M_05,{
 		delitem Panda_Cap,1;
 		delitem Needle_Pouch,100;
 		delitem Spool,100;
-		delitem Black_Bear's_Skin,300;
+		delitem Black_Bears_Skin,300;
 		getitem Brown_Bear_Cap,1;
 		close;
 	}
@@ -1471,7 +1471,7 @@ xmas_in,35,30,3	script	Hat Merchant#zero	4_M_NFLOSTMAN,{
 	next;
 	switch(select("Party Hat", "Straw Hat", "Cowboy Hat", "Sombrero", "Beanie")) {
 	case 1:
-		if (countitem(Santa's_Hat) > 0 && countitem(Oil_Paper) > 99 && countitem(Smooth_Paper) > 99) {
+		if (countitem(Santas_Hat) > 0 && countitem(Oil_Paper) > 99 && countitem(Smooth_Paper) > 99) {
 			mes "[Mad Hatter]";
 			mes "Party Hat! It's a Santa Hat I've remade by adding colorful paper for a festive look. Celebrate good times with a Party Hat! Come on!";
 			next;
@@ -1494,7 +1494,7 @@ xmas_in,35,30,3	script	Hat Merchant#zero	4_M_NFLOSTMAN,{
 			mes "^3355FF*Squick Squick Grind Grind*^000000";
 			mes "^3355FF*Swish Swish Rustle Rustle*^000000";
 			next;
-			delitem Santa's_Hat,1;
+			delitem Santas_Hat,1;
 			delitem Oil_Paper,100;
 			delitem Smooth_Paper,100;
 			mes "[Mad Hatter]";
@@ -1809,7 +1809,7 @@ yuno_in03,20,18,6	script	Nehris#1	4_F_JOB_BLACKSMITH,{
 		mes "[Nehris]";
 		mes "This crown is inspired by the the one worn by the 'Isis' monster. It has a elegant look fitting for ancient royalty.";
 		next;
-		if (countitem(Queen's_Hair_Ornament) > 0 && countitem(Emperium) > 0 && countitem(Gold) > 2 && Zeny > 19999) {
+		if (countitem(Queens_Hair_Ornament) > 0 && countitem(Emperium) > 0 && countitem(Gold) > 2 && Zeny > 19999) {
 			mes "[Nehris]";
 			mes "Thank you for";
 			mes "bringing everything.";
@@ -1817,7 +1817,7 @@ yuno_in03,20,18,6	script	Nehris#1	4_F_JOB_BLACKSMITH,{
 			next;
 			mes "^3355FF* Clang Clang! Scrape Scrape! Jingle Jingle! *^000000";
 			next;
-			delitem Queen's_Hair_Ornament,1;
+			delitem Queens_Hair_Ornament,1;
 			delitem Emperium,1;
 			delitem Gold,3;
 			Zeny -= 20000;
diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt
index 8efebb27a..80cea9f6a 100644
--- a/npc/quests/newgears/2005_headgears.txt
+++ b/npc/quests/newgears/2005_headgears.txt
@@ -1650,7 +1650,7 @@ gl_prison1,97,104,1	script	Phendark#LhzHat	PHENDARK,{
 			countitem(Tail_) || countitem(Whip) || countitem(Whip_) ||
 			countitem(Lariat) || countitem(Rapture_Rose) || countitem(Chemeti) ||
 			countitem(Whip_Of_Red_Flame) || countitem(Whip_Of_Ice_Piece) || countitem(Whip_Of_Earth) ||
-			countitem(Jump_Rope) || countitem(Bladed_Whip) || countitem(Queen's_Whip) ||
+			countitem(Jump_Rope) || countitem(Bladed_Whip) || countitem(Queens_Whip) ||
 			countitem(Electric_Wire)
 		))
 			close; // no whip equipped or in inventory
diff --git a/npc/quests/newgears/2006_headgears.txt b/npc/quests/newgears/2006_headgears.txt
index 9daf0f24c..0a90d3a0b 100644
--- a/npc/quests/newgears/2006_headgears.txt
+++ b/npc/quests/newgears/2006_headgears.txt
@@ -577,8 +577,8 @@ hugel,147,103,3	script	Ghenirhemin	4_M_HUGRANFA,{
 //== Hahoe Mask / Mythical Lion Mask / Bride Mask ==========
 payon,135,320,3	script	Chungwolmang	4W_M_01,{
 	if (moza_tal == 2) {
-		if (countitem(Bookclip_In_Memory) > 19 && countitem(Cactus_Needle) > 99 && countitem(Wild_Boar's_Mane) > 99) {
-			//Hahoe_Mask: Bookclip_In_Memory, Cactus_Needle, Wild_Boar's_Mane
+		if (countitem(Bookclip_In_Memory) > 19 && countitem(Cactus_Needle) > 99 && countitem(Wild_Boars_Mane) > 99) {
+			//Hahoe_Mask: Bookclip_In_Memory, Cactus_Needle, Wild_Boars_Mane
 			callsub S_MakeMask,5176,7015,20,952,100,1028,100,0,0;
 		}
 		if (countitem(Slender_Snake) > 499 && countitem(Tooth_Of_Ancient_Fish) > 1 && countitem(Orange_Dyestuffs) > 0) {
diff --git a/npc/quests/newgears/2010_headgears.txt b/npc/quests/newgears/2010_headgears.txt
index ec856c37f..7fb5178b8 100644
--- a/npc/quests/newgears/2010_headgears.txt
+++ b/npc/quests/newgears/2010_headgears.txt
@@ -368,8 +368,8 @@ comodo,236,164,0	script	Hat Girl#Hair_Brush	1_F_04,{
 
 //== 4. Making the new headgear Statue Of Baby Angel(5443) =
 alberta,151,78,0	script	Bebete#Baby_Angel_Status	4W_KID,{
-	// Check if wearing Ear_Of_Angel's_Wing, Angelic_Chain, Flying_Angel
-	if (!isequipped(Ear_Of_Angel's_Wing) && !isequipped(Angelic_Chain) && !isequipped(Flying_Angel)) {
+	// Check if wearing Ear_Of_Angels_Wing, Angelic_Chain, Flying_Angel
+	if (!isequipped(Ear_Of_Angels_Wing) && !isequipped(Angelic_Chain) && !isequipped(Flying_Angel)) {
 		mes "[Bebete]";
 		mes "A fake angel? Go away!!";
 		next;
diff --git a/npc/quests/ninja_quests.txt b/npc/quests/ninja_quests.txt
index b8322b4f5..78f21d38b 100644
--- a/npc/quests/ninja_quests.txt
+++ b/npc/quests/ninja_quests.txt
@@ -897,7 +897,7 @@ que_ng,72,34,3	script	Craftsman Kaibara	4_M_EINOLD,{
 				mes "If you ever happen to gather all these materials one day, feel free to come back.";
 				close;
 			}else{
-				if(countitem(Dragon_Scale) < 400 || countitem(Oridecon) < 5 || countitem(Dragon's_Skin) < 30){
+				if(countitem(Dragon_Scale) < 400 || countitem(Oridecon) < 5 || countitem(Dragons_Skin) < 30){
 					mes "[Kaibara]";
 					mes "It looks like there are not enough ingredients for me to make you a Gokurin.";
 					next;
@@ -1180,7 +1180,7 @@ que_ng,22,62,3	script	Tetsu	4_M_SEAMAN,{
 			break;
 		}
 
-		if(countitem(Steel)<50 || countitem(Harpy's_Feather)<20 || countitem(Oridecon)<5){
+		if (countitem(Steel) < 50 || countitem(Harpys_Feather) < 20 || countitem(Oridecon) < 5) {
 			mes "[Tetsu]";
 			mes "It looks like you haven't brought me enough materials to make you a Fuuma Shuriken Beneki.";
 			next;
diff --git a/npc/quests/partyrelay.txt b/npc/quests/partyrelay.txt
index f426106fc..c9d4e48f9 100644
--- a/npc/quests/partyrelay.txt
+++ b/npc/quests/partyrelay.txt
@@ -2015,7 +2015,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	4_M_JOB_BLACKSMITH,{
 		mes "you've already forgotten.";
 		close;
 	}
-	if ((party_relay == 19) && (.@relaytime >= 14) && (.@relaytime < 17) && (countitem(Thin_N'_Long_Tongue) > 9) && (countitem(Leopard_Talon) > 9) && (countitem(Poison_Toad's_Skin) > 9)) {
+	if ((party_relay == 19) && (.@relaytime >= 14) && (.@relaytime < 17) && (countitem(Thin_N_Long_Tongue) > 9) && (countitem(Leopard_Talon) > 9) && (countitem(Poison_Toads_Skin) > 9)) {
 		mes "[Bafhail]";
 		mes "Well, it looks like you came";
 		mes "at the right time and brought";
@@ -2023,9 +2023,9 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	4_M_JOB_BLACKSMITH,{
 		mes "Please take your next ticket";
 		mes "and this small reward for you.";
 		next;
-		delitem Thin_N'_Long_Tongue,10;
+		delitem Thin_N_Long_Tongue,10;
 		delitem Leopard_Talon,10;
-		delitem Poison_Toad's_Skin,10;
+		delitem Poison_Toads_Skin,10;
 		party_relay = 20;
 		getitem Mission_Certificate7,1;
 		getitem Leaf_Of_Yggdrasil,2;
@@ -2039,7 +2039,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	4_M_JOB_BLACKSMITH,{
 		mes "I'll see you later, then.";
 		close;
 	}
-	else if ((party_relay == 19) && (.@relaytime >= 18) && (.@relaytime < 21) && (countitem(Thin_N'_Long_Tongue) > 9) && (countitem(Leopard_Talon) > 9) && (countitem(Poison_Toad's_Skin) > 9)) {
+	else if ((party_relay == 19) && (.@relaytime >= 18) && (.@relaytime < 21) && (countitem(Thin_N_Long_Tongue) > 9) && (countitem(Leopard_Talon) > 9) && (countitem(Poison_Toads_Skin) > 9)) {
 		mes "[Bafhail]";
 		mes "Well, it looks like you came";
 		mes "at the right time and brought";
@@ -2047,9 +2047,9 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	4_M_JOB_BLACKSMITH,{
 		mes "Please take your next ticket";
 		mes "and this small reward for you.";
 		next;
-		delitem Thin_N'_Long_Tongue,10;
+		delitem Thin_N_Long_Tongue,10;
 		delitem Leopard_Talon,10;
-		delitem Poison_Toad's_Skin,10;
+		delitem Poison_Toads_Skin,10;
 		party_relay = 20;
 		getitem Mission_Certificate7,1;
 		getitem Leaf_Of_Yggdrasil,2;
@@ -2310,7 +2310,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	4_M_JOB_BLACKSMITH,{
 		mes "Standard Time. Don't forget!";
 		close;
 	}
-	if ((party_relay == 7) && ((.@relaytime >= 8) && (.@relaytime < 11)) && (countitem(Porcupine_Spike) > 9) && (countitem(Elder_Pixie's_Beard) > 9) && (countitem(Fish_Tail) > 9)) {
+	if ((party_relay == 7) && ((.@relaytime >= 8) && (.@relaytime < 11)) && (countitem(Porcupine_Spike) > 9) && (countitem(Elder_Pixies_Beard) > 9) && (countitem(Fish_Tail) > 9)) {
 		mes "[Bafhail]";
 		mes "Well, it looks like you came";
 		mes "at the right time and brought";
@@ -2319,7 +2319,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	4_M_JOB_BLACKSMITH,{
 		mes "and this small reward for you.";
 		next;
 		delitem Porcupine_Spike,10;
-		delitem Elder_Pixie's_Beard,10;
+		delitem Elder_Pixies_Beard,10;
 		delitem Fish_Tail,10;
 		party_relay = 9;
 		getitem Mission_Certificate3,1;
@@ -2332,7 +2332,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	4_M_JOB_BLACKSMITH,{
 		mes "Good luck on your travels~";
 		close;
 	}
-	else if ((party_relay == 7) && ((.@relaytime >= 21) && (countitem(Porcupine_Spike) > 9) && (countitem(Elder_Pixie's_Beard) > 9) && (countitem(Fish_Tail) > 9))) {
+	else if ((party_relay == 7) && ((.@relaytime >= 21) && (countitem(Porcupine_Spike) > 9) && (countitem(Elder_Pixies_Beard) > 9) && (countitem(Fish_Tail) > 9))) {
 		mes "[Bafhail]";
 		mes "Well, it looks like you came";
 		mes "at the right time and brought";
@@ -2341,7 +2341,7 @@ payon,204,221,3	script	Bafhail#payon::RelayBafhail	4_M_JOB_BLACKSMITH,{
 		mes "and this small reward for you.";
 		next;
 		delitem Porcupine_Spike,10;
-		delitem Elder_Pixie's_Beard,10;
+		delitem Elder_Pixies_Beard,10;
 		delitem Fish_Tail,10;
 		party_relay = 9;
 		getitem Mission_Certificate3,1;
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index 0f1481282..80a458dea 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -7289,7 +7289,7 @@ mid_camp,143,306,5	script	Breeder Taab#ep13_alba	4_M_DST_MASTER,{
 			}
 		}
 		else if (ep13_alba == 3) {
-			if ((countitem(Monster's_Feed) > 19) && (countitem(Pet_Food) > 29)) {
+			if ((countitem(Monsters_Feed) > 19) && (countitem(Pet_Food) > 29)) {
 				mes "[Taab]";
 				mes "Oh, thanks!";
 				mes "You brought them their";
@@ -7305,7 +7305,7 @@ mid_camp,143,306,5	script	Breeder Taab#ep13_alba	4_M_DST_MASTER,{
 				mes "material to give you.";
 				mes "How about a spiritual reward?";
 				next;
-				delitem Monster's_Feed,20;
+				delitem Monsters_Feed,20;
 				delitem Pet_Food,30;
 				ep13_alba = 6;
 				if (RENEWAL_EXP) {
@@ -8270,7 +8270,7 @@ spl_fild02,314,165,0	script	School of Fish#1::Fishinghole	CLEAR_NPC,{
 		specialeffect2 EF_BUBBLE;
 		specialeffect2 EF_INVENOM;
 		.@fcast = 15;
-		if (isequipped(2550)) //Fisher's_Muffler
+		if (isequipped(2550)) //Fishers_Muffler
 			.@fcast -= 2;
 		if (isequipped(2443)) //Fish_Shoes
 			.@fcast -= 2;
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index 09ef6209e..85b60e7fb 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -458,7 +458,7 @@ spl_fild03,226,151,0	script	School of Fish#5::FishingHole_spl3	CLEAR_NPC,{
 		specialeffect2 EF_BUBBLE;
 		specialeffect2 EF_INVENOM;
 		.@fcast = 15;
-		if (isequipped(2550)) //Fisher's_Muffler
+		if (isequipped(2550)) //Fishers_Muffler
 			.@fcast -= 2;
 		if (isequipped(2443)) //Fish_Shoes
 			.@fcast -= 2;
@@ -6495,7 +6495,7 @@ mid_camp,283,198,5	script	Bazett Teablack#ep13bs	4_M_ALCHE_D,{
 		ep13_2_bs2 = 1;
 		ep13_2_bs3 = 1;
 		ep13_2_bs4 = 1;
-		getitem Bazett's_Order,1;
+		getitem Bazetts_Order,1;
 		changequest 11101,11102;
 		close;
 	}
@@ -6503,7 +6503,7 @@ mid_camp,283,198,5	script	Bazett Teablack#ep13bs	4_M_ALCHE_D,{
 		mes "[Bazett]";
 		mes "How's the search going?";
 		next;
-		if (countitem(Bazett's_Order) < 1) {
+		if (countitem(Bazetts_Order) < 1) {
 			mes "[Bazett]";
 			mes "!!!!!!!";
 			mes "You lost the notes!!?";
@@ -6512,7 +6512,7 @@ mid_camp,283,198,5	script	Bazett Teablack#ep13bs	4_M_ALCHE_D,{
 			mes "[Bazett]";
 			mes "What's done has been done.";
 			mes "I'll give you a new one.";
-			getitem Bazett's_Order,1;
+			getitem Bazetts_Order,1;
 			close;
 		}
 		else {
@@ -6527,7 +6527,7 @@ mid_camp,283,198,5	script	Bazett Teablack#ep13bs	4_M_ALCHE_D,{
 		next;
 		switch(select("Yes.", "Not yet...")) {
 		case 1:
-			if (countitem(Bazett's_Order) < 1) {
+			if (countitem(Bazetts_Order) < 1) {
 				mes "[Bazett]";
 				mes "!!!!!!!";
 				mes "You lost the notes!!?";
@@ -6570,7 +6570,7 @@ mid_camp,283,198,5	script	Bazett Teablack#ep13bs	4_M_ALCHE_D,{
 				mes "[Bazett]";
 				mes "Ah... this isn't much, but it's a coin that the giants use.";
 				mes "Maybe you can buy something from them with this.";
-				delitem Bazett's_Order,1;
+				delitem Bazetts_Order,1;
 				ep13_2_busut = 7;
 				if (ep13_2_bs1 == 3) getitem Manuk_Coin,1;
 				if (ep13_2_bs2 == 3) getitem Manuk_Coin,1;
diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt
index f816efcdc..c2f726023 100644
--- a/npc/quests/quests_alberta.txt
+++ b/npc/quests/quests_alberta.txt
@@ -424,7 +424,7 @@ alberta_in,28,145,4	script	Grampa	2_M_PHARMACIST,{
 			close;
 		case 2:
 			delitem Tiger_Footskin,10;
-			getitem Boy's_Cap,1;
+			getitem Boys_Cap,1;
 			mes "[Grampa]";
 			mes "T... Thank you !!";
 			mes "With this I can revive my youthful splendor!! I must eat this thing right away !";
@@ -2650,7 +2650,7 @@ alberta_in,131,95,5	script	Iromo#ep3_2	4_M_KID1,{
 		mes "I should stay at home.";
 		close;
 	}
-	if ((ep13_2_hiki == 6) && (countitem(Monster's_Feed) > 0) && (countitem(Red_Potion) > 0)) {
+	if ((ep13_2_hiki == 6) && (countitem(Monsters_Feed) > 0) && (countitem(Red_Potion) > 0)) {
 		mes "[Iromo]";
 		mes "...Huh? This smell...";
 		mes "This is the one I like the most.";
@@ -2687,7 +2687,7 @@ alberta_in,131,95,5	script	Iromo#ep3_2	4_M_KID1,{
 		mes "I like cats so I approached him.";
 		mes "Then suddenly he scratched and bit me.";
 		next;
-		delitem Monster's_Feed,1;
+		delitem Monsters_Feed,1;
 		delitem Red_Potion,1;
 		ep13_2_hiki = 7;
 		changequest 10083,10084;
diff --git a/npc/quests/quests_aldebaran.txt b/npc/quests/quests_aldebaran.txt
index 1b58726dd..e276622e9 100644
--- a/npc/quests/quests_aldebaran.txt
+++ b/npc/quests/quests_aldebaran.txt
@@ -79,8 +79,8 @@ aldeba_in,152,166,4	script	Trader#01	4_M_04,{
 			close;
 		}
 	case 2:
-		if ((countitem(Oldman's_Romance) > 0) && (countitem(Feather_Of_Birds) > 299) && (Zeny > 499)) {
-			delitem Oldman's_Romance,1;
+		if ((countitem(Oldmans_Romance) > 0) && (countitem(Feather_Of_Birds) > 299) && (Zeny > 499)) {
+			delitem Oldmans_Romance,1;
 			delitem Feather_Of_Birds,300;
 			Zeny -= 500;
 			mes "[Trader]";
diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt
index c2a20306b..31ebb517a 100644
--- a/npc/quests/quests_amatsu.txt
+++ b/npc/quests/quests_amatsu.txt
@@ -1484,7 +1484,7 @@ ama_in02,170,62,4	script	Soldier#ama2	8_M_JPNSOLDIER,{
 	switch(select("Issue me a Transit Permit", "I want to live in Amatsu", "Nothing")) {
 	case 1:
 		if (event_amatsu == 6) {
-			if (countitem(Lord's_Passable_Ticket) > 0) {
+			if (countitem(Lords_Passable_Ticket) > 0) {
 				mes "[Jiro]";
 				mes "You already have one...";
 				mes "You don't need to have two of them.";
@@ -1497,7 +1497,7 @@ ama_in02,170,62,4	script	Soldier#ama2	8_M_JPNSOLDIER,{
 			next;
 			if (select("Issue one", "Talk to you later") == 1) {
 				Zeny -= 10000;
-				getitem Lord's_Passable_Ticket,1;
+				getitem Lords_Passable_Ticket,1;
 				mes "[Jiro]";
 				mes "There you go.";
 				mes "Don't lose it this time.";
@@ -1678,7 +1678,7 @@ ama_in02,115,177,7	script	Soldier#ama10	8_M_JPNSOLDIER,{
 		close;
 	}
 	if (event_amatsu == 6) {
-		if (countitem(Lord's_Passable_Ticket) > 0) {
+		if (countitem(Lords_Passable_Ticket) > 0) {
 			mes "[Jyuro]";
 			mes "You have the ticket...";
 			mes "Do you want me to send you now, or do you need a little instruction?";
@@ -1734,7 +1734,7 @@ ama_in02,115,177,7	script	Soldier#ama10	8_M_JPNSOLDIER,{
 	mes "A gate? On the top floor of the building??? Surely, you must been be mistaken.";
 	emotion e_swt;
 	next;
-	if (countitem(Lord's_Passable_Ticket) > 0) {
+	if (countitem(Lords_Passable_Ticket) > 0) {
 		if (select("Show him the ticket", "Cancel") == 1) {
 			mes "[Jyuro]";
 			mes "What? That pass is...?";
@@ -1742,7 +1742,7 @@ ama_in02,115,177,7	script	Soldier#ama10	8_M_JPNSOLDIER,{
 			mes "the lord but I guess it has";
 			mes "been issued to the wrong person.";
 			next;
-			delitem Lord's_Passable_Ticket,1;
+			delitem Lords_Passable_Ticket,1;
 			mes "[Jyuro]";
 			mes "I will keep this ticket because";
 			mes "it was issued without permission.";
@@ -1885,7 +1885,7 @@ ama_in02,200,176,4	script	Lord of Palace#ama	8_M_JPNMASTER,{
 			event_amatsu = 6;
 			completequest 8135;
 			delitem Fox_Tail,1;
-			getitem Lord's_Passable_Ticket,1;
+			getitem Lords_Passable_Ticket,1;
 			mes "[Ishida Yoshinaga]";
 			mes "This isn't a big reward but";
 			mes "someday it will be useful for you.";
@@ -1943,7 +1943,7 @@ ama_in01,22,111,0	script	Grandma#ama2	4_F_JPNOBA,{
 		mes "it won't harm me!! Yelp!^000000";
 		next;
 		select("Taaaah!!");
-		if ((BaseJob == Job_Priest || BaseJob != Job_Acolyte && BaseJob != Job_Monk) || (countitem(Holy_Water) < 1 || countitem(Bear's_Foot) < 1 || countitem(Tiger's_Skin) < 1)) {
+		if ((BaseJob == Job_Priest || BaseJob != Job_Acolyte && BaseJob != Job_Monk) || (countitem(Holy_Water) < 1 || countitem(Bears_Foot) < 1 || countitem(Tigers_Skin) < 1)) {
 			if (rand(1,4) == 1)
 				.@fox_kill = 0;
 			else
diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt
index f409782c8..dba9c5d14 100644
--- a/npc/quests/quests_ayothaya.txt
+++ b/npc/quests/quests_ayothaya.txt
@@ -859,7 +859,7 @@ ayothaya,253,99,3	script	Fisherman	4_M_THAIONGBAK,{
 		next;
 		switch(select("Yes.", "No, thanks.")) {
 		case 1:
-			if (countitem(Monster's_Feed) && Zeny > 49) {
+			if (countitem(Monsters_Feed) && Zeny > 49) {
 				mes "^3355FFYou cast your";
 				mes "fishing line";
 				mes "into the water.^000000";
@@ -871,7 +871,7 @@ ayothaya,253,99,3	script	Fisherman	4_M_THAIONGBAK,{
 				next;
 				mes "^3355FFYou've hooked a Phen!^000000";
 				next;
-				delitem Monster's_Feed,1;
+				delitem Monsters_Feed,1;
 				Zeny -= 50;
 				.@randfish = rand(1,100);
 				if (.@randfish > 0 && .@randfish < 40) {
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 480b696b3..0a80c25ae 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -2148,7 +2148,7 @@ lhz_in02,201,210,5	script	Digotz	4_M_LGTMAN,{
 		mes "my fashionable street clothes?";
 		close;
 	}
-	if ((friendship == 12 && countitem(Friend's_Diary) > 0)) {
+	if ((friendship == 12 && countitem(Friends_Diary) > 0)) {
 		mes "[Digotz]";
 		mes "Even if Benkaistein";
 		mes "did come back, I don't";
@@ -2555,7 +2555,7 @@ lighthalzen,337,232,3	script	Maku	4_M_LGTPOOR,{
 		cutin "lhz_macu05",255;
 		end;
 	}
-	if (friendship == 13 && countitem(Friend's_Diary) > 0) {
+	if (friendship == 13 && countitem(Friends_Diary) > 0) {
 		cutin "lhz_macu06",2;
 		mes "[Maku]";
 		mes "Hey, what is that? You want";
@@ -2703,7 +2703,7 @@ lighthalzen,337,232,3	script	Maku	4_M_LGTPOOR,{
 		mes "that I'm grateful or anything.";
 		cutin "lhz_macu07",255;
 		next;
-		delitem Friend's_Diary,1;
+		delitem Friends_Diary,1;
 		friendship = 14;
 		if (RENEWAL_EXP) {
 			if (BaseLevel > 90) getexp 70000,0;
@@ -3175,7 +3175,7 @@ yuno_in04,96,106,5	script	Passionate Student	4_M_SAGE_A,{
 		mes "sure to let you know~";
 		close;
 	}
-	if ((friendship == 11 && countitem(Friend's_Diary) > 0)) {
+	if ((friendship == 11 && countitem(Friends_Diary) > 0)) {
 		mes "[Benkaistein]";
 		mes "Aw nuts, this is";
 		mes "taking much longer";
@@ -3351,7 +3351,7 @@ yuno_in04,168,117,3	script	Book#lhz	HIDDEN_NPC,{
 	}
 	if (friendship == 10) {
 		friendship = 11;
-		getitem Friend's_Diary,1;
+		getitem Friends_Diary,1;
 		mes "^3355FFThis book is labeled,";
 		mes "''Benkaistein's Journal";
 		mes "Vol. 6.'' This is probably";
diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt
index d9c07c597..40fd7b38e 100644
--- a/npc/quests/quests_louyang.txt
+++ b/npc/quests/quests_louyang.txt
@@ -1433,7 +1433,7 @@ lou_in02,265,69,5	script	Doctor#lyang	4_F_CHNDOCTOR,{
 		close;
 	}
 	else if (ch_par == 17) {
-		if (countitem(Leopard_Talon) > 1 && countitem(Hard_Peach) > 9 && countitem(Poison_Toad's_Skin) > 4 && countitem(Browny_Root) > 19 && countitem(Germinating_Sprout) > 9 && countitem(Honey_Jar) > 4) {
+		if (countitem(Leopard_Talon) > 1 && countitem(Hard_Peach) > 9 && countitem(Poison_Toads_Skin) > 4 && countitem(Browny_Root) > 19 && countitem(Germinating_Sprout) > 9 && countitem(Honey_Jar) > 4) {
 			mes "[Hua Tuo]";
 			mes "Hm? Ah, you have returned.";
 			mes "Sorry, I was taking care of my other patients. Have you already gathered the medicines I'll need?";
@@ -1448,7 +1448,7 @@ lou_in02,265,69,5	script	Doctor#lyang	4_F_CHNDOCTOR,{
 			mes "Please take this as a token of my appreciation. It's not much, but this medicine is an old family secret. I hope it will be helpful to you in dangerous situations.";
 			delitem Leopard_Talon,2;
 			delitem Hard_Peach,10;
-			delitem Poison_Toad's_Skin,5;
+			delitem Poison_Toads_Skin,5;
 			delitem Browny_Root,20;
 			delitem Germinating_Sprout,10;
 			delitem Honey_Jar,5;
diff --git a/npc/quests/quests_lutie.txt b/npc/quests/quests_lutie.txt
index 3a74bdd26..4a1143c8f 100644
--- a/npc/quests/quests_lutie.txt
+++ b/npc/quests/quests_lutie.txt
@@ -204,12 +204,12 @@ xmas,115,297,4	script	Vending Machine	HIDDEN_NPC,{
 		}
 		break;
 	case 3:
-		if ((countitem(Poison_Spore) > 849) && (countitem(Burn_Tree) > 299) && (countitem(Thin_N'_Long_Tongue) > 0)) {
+		if ((countitem(Poison_Spore) > 849) && (countitem(Burn_Tree) > 299) && (countitem(Thin_N_Long_Tongue) > 0)) {
 			mes "^3355FFYou gingerly place the items into the snowman's mouth.^000000";
 			next;
 			delitem Poison_Spore,850;
 			delitem Burn_Tree,300;
-			delitem Thin_N'_Long_Tongue,1;
+			delitem Thin_N_Long_Tongue,1;
 			emotion e_oh;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
@@ -268,10 +268,10 @@ xmas,115,297,4	script	Vending Machine	HIDDEN_NPC,{
 		}
 		break;
 	case 6:
-		if (countitem(Alice's_Apron) > 99) {
+		if (countitem(Alices_Apron) > 99) {
 			mes "^3355FFYou gingerly place all 100 Aprons into the snowman's mouth.^000000";
 			next;
-			delitem Alice's_Apron,100;
+			delitem(Alices_Apron, 100);
 			emotion e_oh;
 			mes "^3355FF*Vroooooom~~*";
 			mes "*Bzzzzzt*";
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index 3e3bb3414..09ad94115 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -1438,7 +1438,7 @@ mosk_fild01,86,104,3	script	Aged Stranger#npc	4_M_GUSLIMAN,{
 		mes "Oh... Did you get all the";
 		mes "materials?";
 		next;
-		if (countitem(Log) > 29 && countitem(Tough_Vines) > 19 && countitem(Goat's_Horn) > 19 && countitem(Sea_Otter_Leather) > 9) {
+		if (countitem(Log) > 29 && countitem(Tough_Vines) > 19 && countitem(Goats_Horn) > 19 && countitem(Sea_Otter_Leather) > 9) {
 			mes "[Aged Stranger]";
 			mes "You found the right materials.";
 			mes "Okay, I will start to make the";
@@ -1446,7 +1446,7 @@ mosk_fild01,86,104,3	script	Aged Stranger#npc	4_M_GUSLIMAN,{
 			next;
 			delitem Log,30;
 			delitem Tough_Vines,20;
-			delitem Goat's_Horn,20;
+			delitem Goats_Horn,20;
 			delitem Sea_Otter_Leather,10;
 			mos_whale_edq = 34;
 			mes "[Aged Stranger]";
@@ -4496,7 +4496,7 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	4_F_BABAYAGA,{
 		mes "Did you get";
 		mes "all of the items?";
 		next;
-		setarray .@n, Grasshopper's_Leg,20,Spawn,5,Wing_Of_Red_Bat,20,Starsand_Of_Witch,10,Fine_Grit,10,Sticky_Mucus,10,Detonator,1,Boody_Red,5,Burning_Heart,10;
+		setarray .@n, Grasshoppers_Leg,20,Spawn,5,Wing_Of_Red_Bat,20,Starsand_Of_Witch,10,Fine_Grit,10,Sticky_Mucus,10,Detonator,1,Boody_Red,5,Burning_Heart,10;
 		for (.@i = 0; .@i < getarraysize(.@n); .@i += 2) {
 			if (countitem(.@n[.@i]) < .@n[.@i+1]) {
 				.@f = 1;
@@ -4591,7 +4591,7 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	4_F_BABAYAGA,{
 		mes "Did you get";
 		mes "all of them?";
 		next;
-		setarray .@n, Grasshopper's_Leg,20,Spawn,5,Wing_Of_Red_Bat,20,Starsand_Of_Witch,10,Fine_Grit,10,Detonator,1,Boody_Red,5,Burning_Heart,10;
+		setarray .@n, Grasshoppers_Leg,20,Spawn,5,Wing_Of_Red_Bat,20,Starsand_Of_Witch,10,Fine_Grit,10,Detonator,1,Boody_Red,5,Burning_Heart,10;
 		for (.@i = 0; .@i < getarraysize(.@n); .@i += 2) {
 			if (countitem(.@n[.@i]) < .@n[.@i+1]) {
 				.@f = 1;
diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt
index c02caf857..6fc89a0cf 100644
--- a/npc/quests/quests_umbala.txt
+++ b/npc/quests/quests_umbala.txt
@@ -529,12 +529,12 @@ um_in,44,71,2	script	Utan Shaman	4_F_UMOLDWOMAN,{
 			.@success = 993; //Yellow_Live
 			break;
 		case 2:
-			.@consume = 946; //Snail's_Shell
+			.@consume = 946; //Snails_Shell
 			.@amount = 20;
 			.@success = 991; //Crystal_Blue
 			break;
 		case 3:
-			.@consume = 904; //Scorpion's_Tail
+			.@consume = 904; //Scorpions_Tail
 			.@amount = 20;
 			.@success = 990; //Boody_Red
 			break;
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index d11563b8d..c6c95bc17 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -4516,7 +4516,7 @@ veins,115,59,5	script	Saraman	4_M_EINOLD,{
 		close;
 	}
 	else if (rachel_camel == 8) {
-		if ((countitem(Monster's_Feed) > 4) && (countitem(Yellow_Potion) > 0) && (countitem(Unripe_Apple) > 0) && (countitem(Empty_Bottle) > 0)) {
+		if ((countitem(Monsters_Feed) > 4) && (countitem(Yellow_Potion) > 0) && (countitem(Unripe_Apple) > 0) && (countitem(Empty_Bottle) > 0)) {
 			mes "[Camel Farm Owner Saraman]";
 			mes "Oh good, you're back.";
 			mes "Did you bring everything?";
@@ -4552,7 +4552,7 @@ veins,115,59,5	script	Saraman	4_M_EINOLD,{
 			mes "ingredients. That's a good";
 			mes "amount to collect since that's";
 			mes "what Ms. Ivory usually orders.";
-			delitem Monster's_Feed,5;
+			delitem Monsters_Feed,5;
 			delitem Yellow_Potion,1;
 			delitem Unripe_Apple,1;
 			delitem Empty_Bottle,1;
diff --git a/npc/quests/seals/sleipnir_seal.txt b/npc/quests/seals/sleipnir_seal.txt
index 5722d8e08..d3982699c 100644
--- a/npc/quests/seals/sleipnir_seal.txt
+++ b/npc/quests/seals/sleipnir_seal.txt
@@ -247,10 +247,10 @@ que_god01,98,98,4	script	Manager#G	1_F_04,{
 					else if (.@god_treasure1 < 348) getitem Helm_,1;
 					else if (.@god_treasure1 < 400) getitem Gemmed_Sallet_,1;
 					else if (.@god_treasure1 < 448) getitem Circlet_,1;
-					else if (.@god_treasure1 < 496) getitem Santa's_Hat,1;
-					else if (.@god_treasure1 < 544) getitem Big_Sis'_Ribbon,1;
+					else if (.@god_treasure1 < 496) getitem Santas_Hat,1;
+					else if (.@god_treasure1 < 544) getitem Big_Sis_Ribbon,1;
 					else if (.@god_treasure1 < 592) getitem Sweet_Gents,1;
-					else if (.@god_treasure1 < 640) getitem Oldman's_Romance,1;
+					else if (.@god_treasure1 < 640) getitem Oldmans_Romance,1;
 					else if (.@god_treasure1 < 688) getitem Western_Grace,1;
 					else if (.@god_treasure1 < 736) getitem Fillet,1;
 					else if (.@god_treasure1 < 784) getitem Holy_Bonnet,1;
@@ -287,7 +287,7 @@ que_god01,98,98,4	script	Manager#G	1_F_04,{
 					else getitem Apple_Of_Archer,1;
 				}
 				else if (.@god_treasure < 501) {
-					     if (.@god_treasure1 < 80) getitem Adventurere's_Suit_,1;
+					     if (.@god_treasure1 < 80) getitem Adventureres_Suit_,1;
 					else if (.@god_treasure1 < 160) getitem Mantle_,1;
 					else if (.@god_treasure1 < 240) getitem Coat_,1;
 					else if (.@god_treasure1 < 320) getitem Mink_Coat,1;
@@ -325,7 +325,7 @@ que_god01,98,98,4	script	Manager#G	1_F_04,{
 					else if (.@god_treasure1 < 660) getitem Clip,1;
 					else if (.@god_treasure1 < 770) getitem Rosary,1;
 					else if (.@god_treasure1 < 880) getitem Mitten_Of_Presbyter,1;
-					else getitem Matyr's_Flea_Guard,1;
+					else getitem Matyrs_Flea_Guard,1;
 				}
 				else {
 					     if (.@god_treasure1 < 150) getitem Mr_Scream,1;
@@ -360,7 +360,7 @@ que_god01,98,98,4	script	Manager#G	1_F_04,{
 					else if (.@god_treasure1 < 496) getitem Spinx_Helm,1;
 					else if (.@god_treasure1 < 544) getitem Corsair,1;
 					else if (.@god_treasure1 < 592) getitem Sweet_Gents,1;
-					else if (.@god_treasure1 < 640) getitem Oldman's_Romance,1;
+					else if (.@god_treasure1 < 640) getitem Oldmans_Romance,1;
 					else if (.@god_treasure1 < 688) getitem Western_Grace,1;
 					else if (.@god_treasure1 < 736) getitem Spinx_Helm_,1;
 					else if (.@god_treasure1 < 784) getitem Holy_Bonnet_,1;
diff --git a/npc/quests/skills/hunter_skills.txt b/npc/quests/skills/hunter_skills.txt
index b22360ec6..2d8aaf691 100644
--- a/npc/quests/skills/hunter_skills.txt
+++ b/npc/quests/skills/hunter_skills.txt
@@ -102,7 +102,7 @@ pay_arche,109,169,3	script	Arpesto	4_M_05,{
 			}
 		}
 		else if (qskill_hunter == 1) {
-			if (countitem(Cardinal_Jewel_) > 4 && countitem(Harpy's_Feather) > 4 && countitem(Pet_Food) > 29) {
+			if (countitem(Cardinal_Jewel_) > 4 && countitem(Harpys_Feather) > 4 && countitem(Pet_Food) > 29) {
 				mes "[Arpesto]";
 				mes "Hm? You're back?";
 				mes "Oh, did you bring";
@@ -222,7 +222,7 @@ pay_arche,109,169,3	script	Arpesto	4_M_05,{
 				mes "sure you make good use";
 				mes "of that new skill. Take care~";
 				delitem Cardinal_Jewel_,5;
-				delitem Harpy's_Feather,5;
+				delitem Harpys_Feather,5;
 				delitem Pet_Food,30;
 				qskill_hunter = 100;
 				skill "HT_PHANTASMIC",1,0;
diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt
index ee84bd837..bee16543f 100644
--- a/npc/quests/skills/merchant_skills.txt
+++ b/npc/quests/skills/merchant_skills.txt
@@ -238,7 +238,7 @@ alberta,119,221,6	script	Charlron	1_M_PAY_ELDER,{
 			next;
 			switch (select("That's why I came here.", "What about my cart?", "Two pairs is pitiful?")) {
 			case 1:
-				if ((countitem(Wooden_Block) > 49) && (countitem(Iron) > 9) && (countitem(Animal's_Skin) > 19)) {
+				if ((countitem(Wooden_Block) > 49) && (countitem(Iron) > 9) && (countitem(Animals_Skin) > 19)) {
 					mes "[Charlron]";
 					mes "Haha! Ok, ok!";
 					mes "With the things you brought";
@@ -246,7 +246,7 @@ alberta,119,221,6	script	Charlron	1_M_PAY_ELDER,{
 					next;
 					delitem Wooden_Block,50;
 					delitem Iron,10;
-					delitem Animal's_Skin,20;
+					delitem Animals_Skin,20;
 					skill "MC_CHANGECART",1,0;
 					mes "[Charlron]";
 					mes "Congratulations.";
diff --git a/npc/quests/skills/sage_skills.txt b/npc/quests/skills/sage_skills.txt
index 06f79fba3..420477f4f 100644
--- a/npc/quests/skills/sage_skills.txt
+++ b/npc/quests/skills/sage_skills.txt
@@ -266,7 +266,7 @@ yuno_in03,176,24,3	script	Mischna	4_M_SAGE_C,{
 		close;
 	}
 	else if(SAG_SK == 1) {
-		if (countitem(Scorpion's_Tail) < 10 || countitem(Horn) < 7 || countitem(Colorful_Shell) < 12 || countitem(Snail's_Shell) < 10 || countitem(Scroll) < 4) {
+		if (countitem(Scorpions_Tail) < 10 || countitem(Horn) < 7 || countitem(Colorful_Shell) < 12 || countitem(Snails_Shell) < 10 || countitem(Scroll) < 4) {
 			mes "[Mishuna]";
 			mes "Hm, you still haven't";
 			mes "gathered all of the materials";
@@ -333,10 +333,10 @@ yuno_in03,176,24,3	script	Mischna	4_M_SAGE_C,{
 			mes "Creation skill by reviewing";
 			mes "your copy of Barmundt's scroll.^000000";
 			specialeffect2 EF_ABSORBSPIRITS;
-			delitem Scorpion's_Tail,10; // Scorpion_Tail
+			delitem Scorpions_Tail,10;
 			delitem Horn,7; // Horn
 			delitem Colorful_Shell,12; // Rainbow_Shell
-			delitem Snail's_Shell,10; // Snail's_Shell
+			delitem Snails_Shell,10;
 			delitem Scroll,4; // Blank_Scroll
 			SAG_SK = 2;
 			skill "SA_CREATECON",1,0;
diff --git a/npc/quests/skills/thief_skills.txt b/npc/quests/skills/thief_skills.txt
index 6c56924f1..35cd38998 100644
--- a/npc/quests/skills/thief_skills.txt
+++ b/npc/quests/skills/thief_skills.txt
@@ -175,7 +175,7 @@ moc_prydb1,154,128,4	script	Alcouskou	2_M_THIEFMASTER,{
 				close;
 			}
 	case 2:
-		if ((countitem(Grasshopper's_Leg) > 19) && ((JobLevel > 34) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) {
+		if ((countitem(Grasshoppers_Leg) > 19) && ((JobLevel > 34) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) {
 			mes "[Alcouskou]";
 			mes "Okay! Let's practice!";
 			next;
@@ -192,7 +192,7 @@ moc_prydb1,154,128,4	script	Alcouskou	2_M_THIEFMASTER,{
 			mes "Great! -At this level,";
 			mes "I am sure you can increase";
 			mes "your skill on your own.";
-			delitem Grasshopper's_Leg,20;
+			delitem Grasshoppers_Leg,20;
 			skill "TF_BACKSLIDING",1,0;
 			close;
 		}
@@ -252,7 +252,7 @@ moc_prydb1,154,128,4	script	Alcouskou	2_M_THIEFMASTER,{
 		mes "If not, I cannot teach you.";
 		close;
 	case 3:
-		if ((countitem(Zargon) > 0) && (countitem(Bear's_Foot) > 0) && (countitem(Spawn) > 4) && ((JobLevel > 19) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) {
+		if ((countitem(Zargon) > 0) && (countitem(Bears_Foot) > 0) && (countitem(Spawn) > 4) && ((JobLevel > 19) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) {
 			mes "[Alcouskou]";
 			mes "Wow, you have already prepared?";
 			mes "Great, I see promise in you. -";
@@ -283,7 +283,7 @@ moc_prydb1,154,128,4	script	Alcouskou	2_M_THIEFMASTER,{
 			mes "I hope it aids you in the future.";
 			mes ". . . . . Hope to see you soon";
 			delitem Zargon,1;
-			delitem Bear's_Foot,1;
+			delitem Bears_Foot,1;
 			delitem Spawn,5;
 			skill "TF_PICKSTONE",1,0;
 			close;
diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt
index 2ed7ad703..e5c3c6e68 100644
--- a/npc/quests/the_sign_quest.txt
+++ b/npc/quests/the_sign_quest.txt
@@ -307,7 +307,7 @@ prt_in,227,45,0	script	Archeologist#sign	1_M_SIGN1,{
 		mes "know right away. For now,";
 		mes "please hold on to these pieces.";
 		sign_q = 54;
-		getitem Part_Of_Star's_Sob,1;
+		getitem Part_Of_Stars_Sob,1;
 	}
 	else if (sign_q == 54) {
 		if (rand(1,5) == 4) {
@@ -736,19 +736,19 @@ prt_in,227,45,0	script	Archeologist#sign	1_M_SIGN1,{
 		mes "accept this as a token";
 		mes "of my gratitude. Good luck";
 		mes "on your travels, adventurer.";
-		if (checkweight(Star's_Sob,1) == 0) {
+		if (checkweight(Stars_Sob,1) == 0) {
 				next;
 				mes "^3355FFWait a second! Right now,";
 				mes "you have too many items in your inventory. Please come back after you've freed up more inventory space.^000000";
 				close;
 		}
-		delitem Star's_Sob,1;
+		delitem Stars_Sob,1;
 		sign_q = 202;
 		getexp RENEWAL_EXP?10000:100000,0;
 		getitem Old_Violet_Box,1;
 	}
 	else if (sign_q > 201) {
-		if (countitem(Star's_Sob) == 1) {
+		if (countitem(Stars_Sob) == 1) {
 			mes "I'm sorry...";
 			mes "But I'm taking";
 			mes "back the Sobbing";
@@ -759,7 +759,7 @@ prt_in,227,45,0	script	Archeologist#sign	1_M_SIGN1,{
 			mes "[Metz]";
 			mes "......";
 			mes "Farewell.";
-			delitem Star's_Sob,1;
+			delitem Stars_Sob,1;
 		}
 		else {
 			mes "I guess I can't";
@@ -1305,8 +1305,8 @@ morocc_in,115,154,5	script	Rogue#sign	1_M_SIGNROGUE,{
 				delitem Fluff,100;
 				if (countitem(Poison_Spore) > 49) {
 					delitem Poison_Spore,50;
-					if (countitem(Scorpion's_Tail) > 29) {
-						delitem Scorpion's_Tail,30;
+					if (countitem(Scorpions_Tail) > 29) {
+						delitem Scorpions_Tail,30;
 						if (countitem(Rotten_Bandage) > 19) {
 							delitem Rotten_Bandage,20;
 							if (countitem(Petite_DiablOfs_Horn) > 14) {
@@ -1335,8 +1335,8 @@ morocc_in,115,154,5	script	Rogue#sign	1_M_SIGNROGUE,{
 			mes "...";
 			if (countitem(Poison_Spore) > 49) {
 				delitem Poison_Spore,50;
-				if (countitem(Scorpion's_Tail) > 29) {
-					delitem Scorpion's_Tail,30;
+				if (countitem(Scorpions_Tail) > 29) {
+					delitem Scorpions_Tail,30;
 					if (countitem(Rotten_Bandage) > 19) {
 						delitem Rotten_Bandage,20;
 						if (countitem(Petite_DiablOfs_Horn) > 14) {
@@ -1364,8 +1364,8 @@ morocc_in,115,154,5	script	Rogue#sign	1_M_SIGNROGUE,{
 		case 6:
 			mes "[Arian]";
 			mes "...";
-			if (countitem(Scorpion's_Tail) > 29) {
-				delitem Scorpion's_Tail,30;
+			if (countitem(Scorpions_Tail) > 29) {
+				delitem Scorpions_Tail,30;
 				if (countitem(Rotten_Bandage) > 19) {
 					delitem Rotten_Bandage,20;
 					if (countitem(Petite_DiablOfs_Horn) > 14) {
@@ -1526,7 +1526,7 @@ morocc_in,115,154,5	script	Rogue#sign	1_M_SIGNROGUE,{
 				else getexp 18000,0;
 			}
 			sign_q = 14;
-			getitem Part_Of_Star's_Sob,1;
+			getitem Part_Of_Stars_Sob,1;
 			close;
 		case 14:
 			mes "[Arian]";
@@ -1910,7 +1910,7 @@ payon_in03,11,31,4	script	Daewoon#sign	1_M_SIGNMONK2,{
 			mes "Come and drink with me~";
 		}
 		next;
-		if (countitem(Part_Of_Star's_Sob) > 0) {
+		if (countitem(Part_Of_Stars_Sob) > 0) {
 			.@pay_point = 1;
 			mes "["+ strcharinfo(PC_NAME) +"]";
 			mes "Sure...";
@@ -2381,7 +2381,7 @@ payon_in03,11,31,4	script	Daewoon#sign	1_M_SIGNMONK2,{
 			}
 			if (.@pay_point > 29) {
 				sign_q = 15;
-				getitem Part_Of_Star's_Sob,1;
+				getitem Part_Of_Stars_Sob,1;
 				if (RENEWAL_EXP) {
 					if (BaseLevel < 60) getexp 300,0;
 					else if (BaseLevel < 70) getexp 750,0;
@@ -2425,7 +2425,7 @@ payon_in03,11,31,4	script	Daewoon#sign	1_M_SIGNMONK2,{
 			}
 			else if ((.@pay_point > 26) && (.@pay_point < 30)) {
 				sign_q = 15;
-				getitem Part_Of_Star's_Sob,1;
+				getitem Part_Of_Stars_Sob,1;
 				if (RENEWAL_EXP) {
 					if (BaseLevel < 60) getexp 300,0;
 					else if (BaseLevel < 70) getexp 750,0;
@@ -2826,7 +2826,7 @@ aldeba_in,155,101,3	script	Sir Jore#sign	1_M_SIGNALCHE,7,7,{
 				mes "relying on a rumor...";
 				next;
 				sign_q = 20;
-				getitem Part_Of_Star's_Sob,1;
+				getitem Part_Of_Stars_Sob,1;
 				mes "[Sir Jore]";
 				mes "Thank you very much";
 				mes "for helping me. Now I can";
@@ -3680,7 +3680,7 @@ geffen_in,59,74,4	script	Jesqurienne#sign	1_F_SIGNZISK,{
 		next;
 		mes "[Jesqurienne]";
 		sign_q = 25;
-		getitem Part_Of_Star's_Sob,1;
+		getitem Part_Of_Stars_Sob,1;
 		mes "Here...";
 		mes "My old friend, Metz, told";
 		mes "me to give this to someone";
@@ -4746,7 +4746,7 @@ cmd_in02,88,51,4	script	Strange Guy#sign	1_M_SIGNART,{
 			mes "go find someone named,";
 			mes "um, ''Bakerlan'' in Alberta.";
 			sign_q = 35;
-			getitem Part_Of_Star's_Sob,1;
+			getitem Part_Of_Stars_Sob,1;
 			if (RENEWAL_EXP) {
 				if (BaseLevel < 60) getexp 300,0;
 				else if (BaseLevel < 70) getexp 700,0;
@@ -4783,7 +4783,7 @@ cmd_in02,88,51,4	script	Strange Guy#sign	1_M_SIGNART,{
 			mes "go find someone named,";
 			mes "um, ''Bakerlan'' in Alberta.";
 			sign_q = 35;
-			getitem Part_Of_Star's_Sob,1;
+			getitem Part_Of_Stars_Sob,1;
 			Zeny += 20000;
 			if (RENEWAL_EXP) {
 				if (BaseLevel < 60) getexp 300,0;
@@ -5571,7 +5571,7 @@ alberta_in,125,101,5	script	Wealthy-looking Merchant	1_M_SIGNMCNT,{
 			mes "my time is quite precious.";
 			close;
 		case 2:
-			if (countitem(Part_Of_Star's_Sob) < 5) {
+			if (countitem(Part_Of_Stars_Sob) < 5) {
 				mes "[Bakerlan]";
 				mes "Hmm, I suppose you";
 				mes "still haven't completed";
@@ -5580,7 +5580,7 @@ alberta_in,125,101,5	script	Wealthy-looking Merchant	1_M_SIGNMCNT,{
 				mes "Starlight, you know...";
 				close;
 			}
-			else if (countitem(Part_Of_Star's_Sob) == 5) {
+			else if (countitem(Part_Of_Stars_Sob) == 5) {
 				mes "[Bakerlan]";
 				mes "Ah, now I see that";
 				mes "you speak the truth.";
@@ -5655,7 +5655,7 @@ alberta_in,125,101,5	script	Wealthy-looking Merchant	1_M_SIGNMCNT,{
 		mes "Now bring all of the stone pieces to Metz.";
 		mes "He will tell you what you need to do next.";
 		sign_q = 53;
-		getitem Part_Of_Star's_Sob,1;
+		getitem Part_Of_Stars_Sob,1;
 		if (RENEWAL_EXP) {
 			if (BaseLevel < 60) getexp 500,0;
 			else if (BaseLevel < 70) getexp 800,0;
@@ -6287,7 +6287,7 @@ alde_alche,169,162,7	script	Alchemist#sign	4_M_ALCHE_B,{
 			mes "everything ready...";
 			next;
 			mes "[Melkaba]";
-			if ((countitem(Royal_Jelly) < 10) || (countitem(Honey) < 20) || (countitem(Bear's_Foot) < 30) || (countitem(Leaflet_Of_Hinal) < 1) || (countitem(Ment) < 1) || (countitem(Empty_Bottle) < 1)) {
+			if ((countitem(Royal_Jelly) < 10) || (countitem(Honey) < 20) || (countitem(Bears_Foot) < 30) || (countitem(Leaflet_Of_Hinal) < 1) || (countitem(Ment) < 1) || (countitem(Empty_Bottle) < 1)) {
 				mes "Hmm, you're still";
 				mes "missing some of the";
 				mes "ingredients. Now, listen";
@@ -6358,7 +6358,7 @@ alde_alche,169,162,7	script	Alchemist#sign	4_M_ALCHE_B,{
 						Zeny -= 10000;
 						delitem Royal_Jelly,10;
 						delitem Honey,20;
-						delitem Bear's_Foot,30;
+						delitem Bears_Foot,30;
 						delitem Leaflet_Of_Hinal,1;
 						delitem Ment,1;
 						delitem Empty_Bottle,1;
@@ -6376,7 +6376,7 @@ alde_alche,169,162,7	script	Alchemist#sign	4_M_ALCHE_B,{
 						specialeffect EF_PHARMACY_FAIL;
 						delitem Royal_Jelly,10;
 						delitem Honey,20;
-						delitem Bear's_Foot,30;
+						delitem Bears_Foot,30;
 						delitem Leaflet_Of_Hinal,1;
 						delitem Ment,1;
 						delitem Empty_Bottle,1;
@@ -7279,7 +7279,7 @@ mjo_dun02,88,295,4	script	Flaming Spirit Man	4_M_03,{
 					mes "[Engel]";
 					mes "Right. Let me guide you to a shortcut to the exit of these mines, just in case you don't know your way out of here. Good luck~";
 					delitem Picture_Letter,1;
-					delitem Part_Of_Star's_Sob,7;
+					delitem Part_Of_Stars_Sob,7;
 					sign_q = 57;
 					close2;
 					warp "mjo_dun02",371,344;
@@ -7386,7 +7386,7 @@ mjo_dun02,88,295,4	script	Flaming Spirit Man	4_M_03,{
 			mes "While you were gone, I managed to restore this Sobbing Starlight. Why don't you go ahead and take a look?";
 			next;
 			sign_q = 71;
-			getitem Star's_Sob,1;
+			getitem Stars_Sob,1;
 			specialeffect2 EF_YUFITELHIT;
 			next;
 			mes "[Engel]";
@@ -7506,7 +7506,7 @@ mjo_dun02,88,295,4	script	Flaming Spirit Man	4_M_03,{
 			if (countitem(Golden_Anvil) > 0) delitem Golden_Anvil,1;
 			else if (countitem(Emperium_Anvil) > 0) delitem Emperium_Anvil,1;
 			sign_q = 71;
-			getitem Star's_Sob,1;
+			getitem Stars_Sob,1;
 			specialeffect2 EF_YUFITELHIT;
 			close;
 		}
@@ -8636,7 +8636,7 @@ que_sign01,196,39,4	script	Serin#serin	4_F_01,{
 		.@fail_s3 = rand(1,600);
 		.@fail_s4 = rand(1,500);
 		.@fail_s5 = rand(1,400);
-		if (countitem(Serin's_Gold_Ring_) == 1) {
+		if (countitem(Serins_Gold_Ring_) == 1) {
 			if (((sign_sq == 0) && (.@fail_s3 == 356)) || ((sign_sq == 1) && (.@fail_s2 == 356)) || (.@fail_s1 == 356)) {
 				sign_q = 200;
 				mes "[Serin]";
@@ -8829,7 +8829,7 @@ que_sign01,197,195,4	script	Serin#witch	4_F_01,{
 		}
 	}
 	else if (sign_q == 125) {
-		if (countitem(Serin's_Gold_Ring_) ==1) {
+		if (countitem(Serins_Gold_Ring_) ==1) {
 			mes "[Serin]";
 			mes "If you think that";
 			mes "I can't summon Dark Lord";
@@ -8957,7 +8957,7 @@ que_sign01,197,195,4	script	Serin#witch	4_F_01,{
 		mes "Farewell, now.";
 		mes "And good luck on";
 		mes "your travels, my friend...";
-		delitem Witch's_Potion,1;
+		delitem Witchs_Potion,1;
 		sign_q = 127;
 		close;
 	}
@@ -8977,9 +8977,9 @@ que_sign01,197,195,4	script	Serin#witch	4_F_01,{
 		.@fail_s3 = rand(1,800);
 		.@fail_s4 = rand(1,700);
 		.@fail_s5 = rand(1,600);
-		if (countitem(Serin's_Gold_Ring_) == 1) {
+		if (countitem(Serins_Gold_Ring_) == 1) {
 			if (((sign_sq == 0) && (.@fail_s3 == 356)) || ((sign_sq == 1) && (.@fail_s2 == 356)) || (.@fail_s1 == 356)) {
-				delitem Witch's_Potion,1;
+				delitem Witchs_Potion,1;
 				sign_q = 200;
 				mes "[Serin]";
 				mes "Even though you tried";
@@ -9026,7 +9026,7 @@ que_sign01,197,195,4	script	Serin#witch	4_F_01,{
 		}
 		else {
 			if (((sign_sq == 0) && (.@fail_s5 == 356)) || ((sign_sq == 1) && (.@fail_s4 == 356)) || (.@fail_s3 == 356)) {
-				delitem Witch's_Potion,1;
+				delitem Witchs_Potion,1;
 				sign_q = 200;
 				mes "[Serin]";
 				mes "Even though you tried";
@@ -9219,7 +9219,7 @@ niflheim,313,70,4	script	Pleasant-Featured Lady#s	4_F_01,{
 			mes "I want you to have this ring. It's the only way I can properly express my gratitude for your aid so far.";
 			sign_q = 85;
 			sign_sq = 0;
-			getitem Serin's_Gold_Ring,1;
+			getitem Serins_Gold_Ring,1;
 			close;
 		}
 		else {
@@ -9271,7 +9271,7 @@ niflheim,313,70,4	script	Pleasant-Featured Lady#s	4_F_01,{
 		close;
 	}
 	else if (sign_q == 92) {
-		if (countitem(Serin's_Gold_Ring) > 0) {
+		if (countitem(Serins_Gold_Ring) > 0) {
 			mes "[Serin]";
 			mes "Ah, "+strcharinfo(PC_NAME)+"~";
 			mes "How is everything?";
@@ -9530,7 +9530,7 @@ niflheim,313,70,4	script	Pleasant-Featured Lady#s	4_F_01,{
 		mes "...";
 		mes "......";
 		mes "..........";
-		if (countitem(Serin's_Gold_Ring_) == 1) {
+		if (countitem(Serins_Gold_Ring_) == 1) {
 			next;
 			switch(select("Give Serin her ring.", "Keep the ring.")) {
 			case 1:
@@ -9563,7 +9563,7 @@ niflheim,313,70,4	script	Pleasant-Featured Lady#s	4_F_01,{
 				mes "to forget her sadness. The tears streaked across her cheeks and";
 				mes "the faint smile on her lips tell you that her memories of you";
 				mes "will always remain in her heart.^000000";
-				delitem Serin's_Gold_Ring_,1;
+				delitem Serins_Gold_Ring_,1;
 				getexp RENEWAL_EXP?50000:500000,0;
 				close;
 			case 2:
@@ -9729,23 +9729,23 @@ niflheim,313,70,4	script	Pleasant-Featured Lady#s	4_F_01,{
 		mes "of her soul and memories that";
 		mes "you can still sense somehow.";
 		mes "What could have happened to her?^000000";
-		if (countitem(Serin's_Gold_Ring) > 0) {
+		if (countitem(Serins_Gold_Ring) > 0) {
 			next;
 			mes "^33555FFSuddenly, Serin's";
 			mes "gold ring sparkled";
 			mes "with a soft glow and";
 			mes "faded away.^000000";
-			delitem Serin's_Gold_Ring,1;
+			delitem Serins_Gold_Ring,1;
 			close;
 		}
 		close;
 	}
 	else {
-		if (countitem(Serin's_Gold_Ring) > 0) {
+		if (countitem(Serins_Gold_Ring) > 0) {
 			mes "[Serin]";
 			mes "Thank you...";
 			emotion e_sob;
-			delitem Serin's_Gold_Ring,1;
+			delitem Serins_Gold_Ring,1;
 			next;
 			mes "^3355FFYou returned";
 			mes "Serin's gold ring.^000000";
@@ -9809,7 +9809,7 @@ que_sign01,122,141,4	script	Witch#s	4_F_NFDEADMGCIAN,{
 		}
 	}
 	if (sign_q == 90) {
-		if (countitem(Serin's_Gold_Ring) == 1) {
+		if (countitem(Serins_Gold_Ring) == 1) {
 			mes "That bastard stole";
 			mes "two spell books from me.";
 			mes "You've brought one of them";
@@ -9834,7 +9834,7 @@ que_sign01,122,141,4	script	Witch#s	4_F_NFDEADMGCIAN,{
 		}
 	}
 	else if (sign_q == 91) {
-		if (countitem(Witch's_Spell_Book) > 0) {
+		if (countitem(Witchs_Spell_Book) > 0) {
 			mes "Once that fool stole my spell";
 			mes "books, he was cursed after he";
 			mes "cast those spells without my";
@@ -9912,7 +9912,7 @@ que_sign01,122,141,4	script	Witch#s	4_F_NFDEADMGCIAN,{
 			mes "that the Queen of the Dead";
 			mes "is searching for her lost mother, Angrboda. Now, if you could find where Angrboda has been";
 			mes "sealed away...";
-			delitem Witch's_Spell_Book,1;
+			delitem Witchs_Spell_Book,1;
 			sign_q = 92;
 			close;
 		}
@@ -10023,12 +10023,12 @@ que_sign01,122,141,4	script	Witch#s	4_F_NFDEADMGCIAN,{
 		}
 	}
 	else if (sign_q == 119) {
-		if (countitem(Serin's_Gold_Ring) > 0) {
+		if (countitem(Serins_Gold_Ring) > 0) {
 			mes "This is Serin's gold ring?";
 			mes "Excellent, this has been";
 			mes "strongly infused with her";
 			mes "vibes. It's really tough to find something like this that resonates so strongly with its owner.";
-			delitem Serin's_Gold_Ring,1;
+			delitem Serins_Gold_Ring,1;
 			sign_q = 120;
 			close;
 		}
@@ -10205,8 +10205,8 @@ que_sign01,122,141,4	script	Witch#s	4_F_NFDEADMGCIAN,{
 			mes "of the vouchers I've";
 			mes "given you, alright?";
 			sign_q = 124;
-			getitem Witch's_Potion,1;
-			getitem Serin's_Gold_Ring_,1;
+			getitem Witchs_Potion,1;
+			getitem Serins_Gold_Ring_,1;
 			getitem Seal_Of_Witch,5;
 			close;
 		}
@@ -10241,7 +10241,7 @@ que_sign01,122,141,4	script	Witch#s	4_F_NFDEADMGCIAN,{
 			mes "the Witch's Medals that";
 			mes "I've lent to you, alright?";
 			sign_q = 124;
-			getitem Witch's_Potion,1;
+			getitem Witchs_Potion,1;
 			getitem Seal_Of_Witch,5;
 			close;
 		}
@@ -10254,7 +10254,7 @@ que_sign01,122,141,4	script	Witch#s	4_F_NFDEADMGCIAN,{
 			mes "these preparations...";
 			close;
 		}
-		if (countitem(Serin's_Gold_Ring_) == 1) {
+		if (countitem(Serins_Gold_Ring_) == 1) {
 			mes "You're finally";
 			mes "back. We might not";
 			mes "have enough time to";
@@ -10301,7 +10301,7 @@ que_sign01,122,141,4	script	Witch#s	4_F_NFDEADMGCIAN,{
 		}
 	}
 	else if ((sign_q == 127) || (sign_q == 128)) {
-		if (countitem(Serin's_Gold_Ring_) == 1) {
+		if (countitem(Serins_Gold_Ring_) == 1) {
 			if (countitem(Seal_Of_Witch) < 5) {
 				mes "Hmmm...?";
 				mes "Where are all the";
@@ -10379,7 +10379,7 @@ que_sign01,122,141,4	script	Witch#s	4_F_NFDEADMGCIAN,{
 		mes "you so much for your";
 		mes "help. Once you finish here,";
 		mes "please visit our queen, Lady Hell. I believe she wants to see you for some reason...";
-		if (countitem(Serin's_Gold_Ring_) == 1) sign_q = 129;
+		if (countitem(Serins_Gold_Ring_) == 1) sign_q = 129;
 		else sign_q = 130;
 		getexp RENEWAL_EXP?30000:300000,0;
 		close;
@@ -10408,8 +10408,8 @@ que_sign01,122,141,4	script	Witch#s	4_F_NFDEADMGCIAN,{
 		mes "her for that. Though, it's";
 		mes "ironic that you failed your";
 		mes "ordeals for her sake...";
-		if (countitem(Serin's_Gold_Ring) > 0) delitem Serin's_Gold_Ring,1;
-		if (countitem(Witch's_Potion) > 0) delitem Witch's_Potion,1;
+		if (countitem(Serins_Gold_Ring) > 0) delitem Serins_Gold_Ring,1;
+		if (countitem(Witchs_Potion) > 0) delitem Witchs_Potion,1;
 		sign_q = 201;
 		getexp RENEWAL_EXP?20000:200000,0;
 		close;
@@ -10442,7 +10442,7 @@ OnTouch:
 	callfunc "F_UpdateSignVars";
 	if (sign_q == 83) {
 		if (sign_sq == 2) {
-			if (countitem(Witch's_Spell_Book) > 0) {
+			if (countitem(Witchs_Spell_Book) > 0) {
 				mes "[Kirkena]";
 				mes "W-what's this?";
 				mes "Why is it that";
@@ -10480,7 +10480,7 @@ OnTouch:
 						mes "give you this. It will send";
 						mes "a living human back to one";
 						mes "of the towns in your realm.";
-						delitem Witch's_Spell_Book,1;
+						delitem Witchs_Spell_Book,1;
 						sign_sq = 3;
 						getitem Wing_Of_Crow,1;
 						close;
@@ -10587,7 +10587,7 @@ OnTouch:
 		close;
 	}
 	else if (sign_q == 88) {
-		if (countitem(Serin's_Gold_Ring) > 0) {
+		if (countitem(Serins_Gold_Ring) > 0) {
 			mes "[Kirkena]";
 			mes "As I expected,";
 			mes "there is something behind";
@@ -10865,7 +10865,7 @@ que_sign01,45,227,4	script	Queen of the Dead	2_F_SIGN1,{
 				mes "Now, I shall show";
 				mes "you something truly";
 				mes "interesting...^000000";
-				delitem Star's_Sob,1;
+				delitem Stars_Sob,1;
 				sign_q = 143;
 				close;
 			case 2:
@@ -10913,7 +10913,7 @@ que_sign01,45,227,4	script	Queen of the Dead	2_F_SIGN1,{
 		mes "Sobbing Starlight.^000000";
 		next;
 		sign_q = 144;
-		getitem Lucifer's_Lament,1;
+		getitem Lucifers_Lament,1;
 		mes "[Lady Hell]";
 		mes "^8C1717Although you may also know";
 		mes "this object as God's Tear Drop, keep in mind that history, as you humans know it, may actually be different than the truth.^000000";
@@ -10962,7 +10962,7 @@ niflheim,146,241,0	script	Depressing Man	4_M_JOB_WIZARD,{
 		close;
 	}
 	else if (sign_q == 87) {
-		if (countitem(Serin's_Gold_Ring) > 1) {
+		if (countitem(Serins_Gold_Ring) > 1) {
 			mes "[Gen]";
 			mes "You lookin' for";
 			mes "something? Crayu";
@@ -11736,12 +11736,12 @@ OnTouch:
 						if (sign_q == 83) {
 							if(sign_sq == 0) {
 								sign_sq = 1;
-								getitem Witch's_Spell_Book,1;
+								getitem Witchs_Spell_Book,1;
 							}
 						}
 						else if (sign_q == 90) {
 							sign_q = 91;
-							getitem Witch's_Spell_Book,1;
+							getitem Witchs_Spell_Book,1;
 						}
 						close;
 					}
@@ -11977,11 +11977,11 @@ function	script	F_SignSeal	{
 		mes "more powerful to break the seal...^000000";
 		close;
 	}
-	if (countitem(Girl's_Diary) || countitem(Rapture_Rose)) {
+	if (countitem(Girls_Diary) || countitem(Rapture_Rose)) {
 		if (getarg(0) < 980) F_SealFail; }
 	else if (countitem(Weeder_Knife) || countitem(Combat_Knife) || countitem(Princess_Knife) || countitem(Cursed_Dagger) || countitem(Lariat) || countitem(Kaiser_Knuckle)) {
 		if (getarg(0) < 960) F_SealFail; }
-	else if (countitem(Bow_Of_Roguemaster) || countitem(Nagan) || countitem(Fire_Brand) || countitem(Forturn_Sword) || countitem(Mama's_Knife) || countitem(Bazerald) || countitem(Gungnir) || countitem(Berserk) || countitem(Counter_Dagger)) {
+	else if (countitem(Bow_Of_Roguemaster) || countitem(Nagan) || countitem(Fire_Brand) || countitem(Forturn_Sword) || countitem(Mamas_Knife) || countitem(Bazerald) || countitem(Gungnir) || countitem(Berserk) || countitem(Counter_Dagger)) {
 		if (getarg(0) < 940) F_SealFail; }
 	else if (countitem(Ice_Falchon) || countitem(House_Auger) || countitem(Assasin_Dagger)) {
 		if (getarg(0) < 920) F_SealFail; }
@@ -12003,7 +12003,7 @@ function	script	F_SignSeal	{
 		if (getarg(0) < 760) F_SealFail; }
 	else if (countitem(Sabbath) || countitem(Right_Epsilon) || countitem(Wizardy_Staff)) {
 		if (getarg(0) < 740) F_SealFail; }
-	else if (countitem(Slaughter) || countitem(Tomahawk) || countitem(Crescent_Scythe) || countitem(Longinus's_Spear)) {
+	else if (countitem(Slaughter) || countitem(Tomahawk) || countitem(Crescent_Scythe) || countitem(Longinuss_Spear)) {
 		if (getarg(0) < 720) F_SealFail; }
 	else if (countitem(Guillotine) || countitem(Brionac)) {
 		if (getarg(0) < 700) F_SealFail; }
@@ -12283,7 +12283,7 @@ OnTimer45000:
 
 geffen,119,48,0	script	Fountain#s	HIDDEN_NPC,{
 	callfunc "F_UpdateSignVars";
-	if (countitem(Lucifer's_Lament) > 0) {
+	if (countitem(Lucifers_Lament) > 0) {
 		mes "^3355FFAs you approach the fountain,";
 		mes "a strange light begins to emit from the Lucifer's Lament in your pocket and from something deep within";
 		mes "the fountain's water.^000000";