Adjusted some NPC names (#3896)

* follow up https://github.com/rathena/rathena/pull/3224

Signed-off-by: zackdreaver <zackdreaver@gmail.com>

* Changed "Cougar" to "Kuuga" in Ninja and KagerouOboro job change NPC

Signed-off-by: zackdreaver <zackdreaver@gmail.com>

* Changed "Gaebolg" to "Geoborg" in some NPC dialogues

Signed-off-by: zackdreaver <zackdreaver@gmail.com>

* changed "Kuuga" to "Kuuga Gai", thanks to @ Daegaladh

Signed-off-by: zackdreaver <zackdreaver@gmail.com>

* changed "Guide Gion" to "Leader Gion"

Signed-off-by: zackdreaver <zackdreaver@gmail.com>

* changed "Wildcat Joe" to "Red Leopard Joe"

Signed-off-by: zackdreaver <zackdreaver@gmail.com>

* changed "family" to "Clan"

Signed-off-by: zackdreaver <zackdreaver@gmail.com>

* revert 705ecc5069ca4abe1e1b1bcc25e048b3a7691eeb

Signed-off-by: zackdreaver <zackdreaver@gmail.com>

* adjusted capital letter

Signed-off-by: zackdreaver <zackdreaver@gmail.com>

npc/jobs/1-1e/ninja.txt

@@ -74,9 +74,9 @@ alberta,30,65,3	script	Akagi	730,{
 	}
 }
 
-que_ng,30,65,3	script	Cougar#nq	730,{
+que_ng,30,65,3	script	Kuuga Gai#nq	730,{
 	if (Upper == 2) {
-		mes "[Cougar]";
+		mes "[Kuuga Gai]";
 		mes "I... I've never";
 		mes "seen a baby as";
 		mes "powerful as you!";
@@ -86,7 +86,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 	}
 	if (Class == Job_Novice) {
 		if (JobLevel < 10) {
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Hm? Have you come to";
 			mes "learn how to be a Ninja?";
 			mes "You're not quite experienced";
@@ -100,7 +100,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "Excuse me.";
 			mes "H-hello?";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "...............................";
 			mes "How did you do that?";
 			next;
@@ -108,7 +108,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "Do what? I didn't";
 			mes "do anything, I don't think...";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "H-How are you able to";
 			mes "see me? I'm supposed to";
 			mes "be invisible to the naked eye.";
@@ -121,7 +121,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "Calm down, there's no";
 			mes "need to get violent!";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "What...?";
 			mes "How did you dodge";
 			mes "all of my attacks?";
@@ -134,7 +134,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "to change my job";
 			mes "to a Ninja.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "...Oh. Is that all?";
 			mes "Hmm, you've got great";
 			mes "potential, but I can't help";
@@ -142,14 +142,14 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "enemies, and I can't let my";
 			mes "guard down for even a second.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "That Wildcat Joe is";
 			mes "completely ruthless...!";
 			mes "He could strike at any time!";
 			mes "He'll do anything to achieve";
 			mes "victory over his enemies!";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Wait, wait, I just";
 			mes "thought of something.";
 			mes "Maybe you can help me out.";
@@ -158,7 +158,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "really want to be a Ninja.";
 			next;
 			if(select("Sure.:No, thanks.") == 2) {
-				mes "[Cougar]";
+				mes "[Kuuga Gai]";
 				mes "Hm? Well, alright.";
 				mes "Still, I don't see";
 				mes "why we can't help";
@@ -166,7 +166,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 				mes "little predicament...";
 				close;
 			}
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Great! Now, I wanted to";
 			mes "ask Wildcat Joe if he'd";
 			mes "agree to a temporary truce.";
@@ -174,7 +174,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "are out of weapons, so we";
 			mes "should get well equipped first.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Please take this letter,";
 			mes "and deliver it to Wildcat";
 			mes "Joe in Einbroch. He's a master";
@@ -182,7 +182,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "eye out for him. Ah, and look";
 			mes "for him in a high place.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Yeah, Wildcat Joe";
 			mes "always did have a thing";
 			mes "for hiding in high places.";
@@ -194,7 +194,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			close;
 		}
 		else if (NINJ_Q == 1) {
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Even if this task";
 			mes "isn't that urgent,";
 			mes "please hurry over to";
@@ -203,7 +203,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			close;
 		}
 		else if (NINJ_Q == 2) {
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Did you deliver that";
 			mes "letter to Wildcat Joe?";
 			mes "I still need to know his";
@@ -213,14 +213,14 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			close;
 		}
 		else if (NINJ_Q == 3) {
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Ah, you've returned.";
 			mes "So did Wildcat Joe send";
 			mes "you back here with his";
 			mes "response? Great, great,";
 			mes "please let me read it.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "What...?! How could he";
 			mes "reject my proposal for";
 			mes "a truce?! This can only";
@@ -228,14 +228,14 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "Kunai. Nuts! I have to catch";
 			mes "up to him, or I'm a goner!";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Listen, you've got to help";
 			mes "me out again! I need you to";
 			mes "gather some materials so that";
 			mes "I can craft my own Kunai to fight Wildcat Joe. Then, I'll go ahead";
 			mes "and change your job to a Ninja.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "All you need";
 			mes "to bring me is";
 			mes "^3355FF5 Cyfars^000000 and";
@@ -249,7 +249,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "asked me to gather";
 			mes "those same materials.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Curses! Then that means...";
 			mes "You actually helped Joe";
 			mes "in crafting his Kunai! No!";
@@ -262,7 +262,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 		}
 		else if (NINJ_Q == 4) {
 			if (countitem(7053) < 5 || countitem(1010) < 1) {
-				mes "[Cougar]";
+				mes "[Kuuga Gai]";
 				mes "Hurry and bring";
 				mes "^3355FF5 Cyfars^000000 and";
 				mes "^3355FF1 Phracon^000000 to me,";
@@ -272,7 +272,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 				close;
 			}
 			if (SkillPoint != 0) {
-				mes "[Cougar]";
+				mes "[Kuuga Gai]";
 				mes "Whoa, whoa...";
 				mes "You still have some";
 				mes "leftover Skill Points.";
@@ -281,7 +281,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 				mes "change jobs, right?";
 				close;
 			}
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Ah, you're back with";
 			mes "everything that I need.";
 			mes "You've come earlier than";
@@ -289,14 +289,14 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "as promised, I'll turn";
 			mes "you into a Ninja.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Let me formally introduce";
-			mes "myself. I am High Ninja Cougar";
+			mes "myself. I am High Ninja Kuuga Gai";
 			mes "in the Touga Ninja Corps, and";
 			mes "I'm in charge of the search";
 			mes "party to find Sir Kazma.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "Sir Kazma is the chief";
 			mes "of my village, but he's";
 			mes "run away. This has resulted";
@@ -304,7 +304,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "the Ninja Corps. Things are";
 			mes "pretty unstable right now...";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "I initially didn't want to";
 			mes "accept you as a Ninja because";
 			mes "of this complicated situation.";
@@ -312,14 +312,14 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "you're truly worthy of joining";
 			mes "the Ninja ranks.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "According to his letter, even";
 			mes "Joe thinks highly of you. Just";
 			mes "remember that, as a Ninja, your";
 			mes "mission is your highest priority. But don't let mission objectives";
 			mes "supercede your conscience.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "''Secrecy above all else.''";
 			mes "To keep our secrets in the";
 			mes "shadows, you can only buy";
@@ -327,7 +327,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "authorized dealers. Please";
 			mes "keep that in mind.";
 			next;
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "As of today, you are";
 			mes "now a proud member of the";
 			mes "Touga Ninja Corps. Be as";
@@ -342,7 +342,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			close;
 		}
 		else {
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "How have you been?";
 			mes "Train hard: you want";
 			mes "to be able to vanish";
@@ -353,7 +353,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 		}
 	} else {
 		if (BaseClass == Job_Ninja) {
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "How have you been?";
 			mes "Train hard: you want";
 			mes "to be able to vanish";
@@ -362,7 +362,7 @@ que_ng,30,65,3	script	Cougar#nq	730,{
 			mes "the respect of any Ninja~";
 			close;
 		} else {
-			mes "[Cougar]";
+			mes "[Kuuga Gai]";
 			mes "What...?";
 			mes "How were you able";
 			mes "to find me hidden";
@@ -459,7 +459,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	 	881,{
 		mes "?????!!";
 		next;
 		mes "[Suspicious Man]";
-		mes "Why? Didn't you bring Cougar's letter for me?";
+		mes "Why? Didn't you bring Kuuga Gai's letter for me?";
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "Are you...";
@@ -468,7 +468,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	 	881,{
 		mes "[Suspicious Man]";
 		mes "...Yes, but I prefer to";
 		mes "be called Red Leopard Joe.";
-		mes "Cougar sent you to me, right?";
+		mes "Kuuga Gai sent you to me, right?";
 		mes "He's the only one who calls";
 		mes "me that. So you want to be";
 		mes "a Ninja, eh? Hmm, alright.";
@@ -494,7 +494,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	 	881,{
 		mes "[Red Leopard Joe]";
 		mes "For now, let me read";
 		mes "this letter. Let's see...";
-		mes "Hm. I thought that Cougar";
+		mes "Hm. I thought that Kuuga Gai";
 		mes "would want to challenge me";
 		mes "again, but he actually wants";
 		mes "a temporary truce? Hah!";
@@ -521,7 +521,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	 	881,{
 		mes "[Red Leopard Joe]";
 		mes "Here you go.";
 		mes "Please bring this";
-		mes "letter to Cougar.";
+		mes "letter to Kuuga Gai.";
 		mes "It'll take a while to";
 		mes "return to Amatsu, so let";
 		mes "me send you there directly...";
@@ -538,7 +538,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	 	881,{
 		mes "Eh? I'm not sure what";
 		mes "happened, but it seems";
 		mes "that you haven't delivered";
-		mes "my response to Cougar yet.";
+		mes "my response to Kuuga Gai yet.";
 		mes "Shall I directly send you";
 		mes "to Amatsu right now?";
 		next;
@@ -558,7 +558,7 @@ einbroch,184,194,3	script	Suspicious Man#nq	 	881,{
 	}
 	else if (NINJ_Q == 4) {
 		mes "[Red Leopard Joe]";
-		mes "Cougar asked you to";
+		mes "Kuuga Gai asked you to";
 		mes "gather some materials";
 		mes "too? Oh well, I suppose";
 		mes "that I can't blame him.";

npc/quests/quests_nameless.txt

@@ -36,8 +36,8 @@
 //= - Variable in use: rumour_nd (Max: 22)
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [L0ne_W0lf]
-//= 1.1 Made quest accessable to "Failed" gaebolg quest. [L0ne_W0lf]
-//= 1.1a Touch up to other Gaebolg fail-points. [L0ne_W0lf]
+//= 1.1 Made quest accessable to "Failed" Geoborg quest. [L0ne_W0lf]
+//= 1.1a Touch up to other Geoborg fail-points. [L0ne_W0lf]
 //= 1.2 Some final tuning to Nameless Island quest. [Koca]
 //= 1.3 Should fix any more issues with "Creature" npc. [L0ne_W0lf]
 //= 1.4 Changed the way Out_from_Monastery works slightly. [L0ne_W0lf]
@@ -1003,7 +1003,7 @@ nameless_i,127,207,0	script	Dead Crow#Aru	111,{
 		mes "^3355FFThis grass must be the";
 		mes "main ingredient of the";
 		mes "poison used to kill the";
-		mes "Gaebolg family princes.^000000";
+		mes "Geoborg family princes.^000000";
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "Looks like I just hit";

npc/quests/quests_prontera.txt

@@ -4,7 +4,7 @@
 //= Collection of Prontera-based quests.
 //= * Culvert Access
 //= * Ph.D Hat Quest
-//= * Gaebolg Family Curse
+//= * Geoborg Family Curse
 //===== Comments: ============================================
 //= Culvert Access:
 //= - [Official Conversion]
@@ -12,7 +12,7 @@
 //= Ph.D Hat Quest:
 //= - [Official Conversion]
 //= - n/a
-//= Gaebolg Family Curse:
+//= Geoborg Family Curse:
 //= - [Official Conversion]
 //= - Variable in use: prt_curse (max 61)
 //===== Changelogs: ==========================================
@@ -22,7 +22,7 @@
 //= 1.3 Removed Duplicates [Silent]
 //= 1.4 Moved Culvert from cities/prontera.txt [Evera]
 //= 1.5 Culvert has been rescripted from the ground up. [L0ne_W0lf]
-//= 1.6 Added Gaebolg Family Curse quest. [L0ne_W0lf]
+//= 1.6 Added Geoborg Family Curse quest. [L0ne_W0lf]
 //= 1.6a Fixed a couple spelling mistakes. [L0ne_W0lf]
 //= 1.7 Updated "Ph.D Quest" Dialogs. [Samuray22]
 //= 1.7b Fixed some minor typos. [SinSloth]
@@ -34,7 +34,7 @@
 //= 2.0b Corrected a Typo error. (bugreport:950) [Samuray22]
 //= 2.1 Added missing checkweights. [L0ne_W0lf]
 //= 2.2 Added Nameless Island quest addition. [L0ne_W0lf]
-//= 2.3 Bamph will now talk to those who failed the Gaebolg quest. [L0ne_W0lf]
+//= 2.3 Bamph will now talk to those who failed the Geoborg quest. [L0ne_W0lf]
 //= 2.3a Touch up to Bamph fo other fail-points. [L0ne_W0lf]
 //= 2.3b Hopefully the last change needed for Nameless quest. [L0ne_W0lf]
 //= 2.4 Updated Headgear Quest. [L0ne_W0lf]
@@ -245,7 +245,7 @@ prt_in,38,108,4	script	Teacher	53,{
 	}
 }
 
-// Gaebolg Family Curse :: prt_curse
+// Geoborg Family Curse :: prt_curse
 //============================================================
 prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 	callsub S_CheckWeight; //Check Player's weight
@@ -800,7 +800,7 @@ yuno,311,195,3	script	Historian#prt01	754,{
 		mes "With the return of peace,";
 		mes "the 7 warriors established";
 		mes "the Rune-Midgarts Kingdom,";
-		mes "choosing Tristram Gaebolg III";
+		mes "choosing Tristram Geoborg III";
 		mes "as the kingdom's first ruler. ";
 		next;
 		mes "[Historian]";
@@ -1197,7 +1197,7 @@ morocc_in,45,126,3	script	Historian#prt02	702,{
 		mes "^333333(As a historian, Rodafrian";
 		mes "might be able to help me in";
 		mes "investigating the curse of the";
-		mes "Gaebolgs. The priests told me";
+		mes "Geoborgs. The priests told me";
 		mes "not to tell anybody, though.";
 		mes "Should I take this risk?)^000000";
 		next;
@@ -1230,7 +1230,7 @@ morocc_in,45,126,3	script	Historian#prt02	702,{
 			next;
 			mes "[Historian Rodafrian]";
 			mes "Anyway, your report about";
-			mes "the Gaebolg family will be";
+			mes "the Geoborg family will be";
 			mes "greatly appreciated by the";
 			mes "Rekenber Historical Research";
 			mes "Group. But first, I need to";
@@ -1239,7 +1239,7 @@ morocc_in,45,126,3	script	Historian#prt02	702,{
 			mes "[Historian Rodafrian]";
 			mes "Anyway, keep this information";
 			mes "a secret between me and you";
-			mes "for now. Then, when I reveal the secret curse of the Gaebolg royal";
+			mes "for now. Then, when I reveal the secret curse of the Geoborg royal";
 			mes "family, I'll finally outshine that Karlomoff! Bwahahahahaha!";
 			next;
 			mes "["+strcharinfo(0)+"]";
@@ -2293,7 +2293,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		next;
 		mes "[Father Bamph]";
 		mes "Finally, the first Tristram of";
-		mes "the Gaebolg family defeated";
+		mes "the Geoborg family defeated";
 		mes "Jormungand together with 6";
 		mes "other warriors, but only after";
 		mes "it killed his beloved father.";
@@ -2308,7 +2308,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "[Father Bamph]";
 		mes "To this day...";
 		mes "^FF0000Every first prince of";
-		mes "the Gaebolg family dies";
+		mes "the Geoborg family dies";
 		mes "at a young age^000000. That is";
 		mes "Jormungand's curse and";
 		mes "the royal family's secret.";
@@ -2431,7 +2431,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "Oh, my. I learned the song";
 		mes "when I was a young boy from";
 		mes "my father. However, your version seems to reveal the secret curse";
-		mes "of the Gaebolgs. Please tell me, where did you hear that song?";
+		mes "of the Geoborgs. Please tell me, where did you hear that song?";
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "Well, I first heard this";
@@ -3072,7 +3072,7 @@ prt_church,16,114,4	script	Father Bamph#tomb	60,{
 	if (prt_curse == 18) {
 		mes "[Father Bamph]";
 		mes "There are the bodies";
-		mes "of the Gaebolg princes";
+		mes "of the Geoborg princes";
 		mes "that were killed during";
 		mes "the exorcism. Please take";
 		mes "a look at the body to the left.";
@@ -3550,13 +3550,13 @@ OnTouch:
 		mes "["+strcharinfo(0)+"]";
 		mes "Long ago, the giant serpent";
 		mes "Jormungand threatened mankind.";
-		mes "7 warriors defeated Jormungand, led by Tristram III of the Gaebolg";
-		mes "family, but Jormungand cursed the Gaebolg bloodline in its defeat.";
+		mes "7 warriors defeated Jormungand, led by Tristram III of the Geoborg";
+		mes "family, but Jormungand cursed the Geoborg bloodline in its defeat.";
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "Ever since, the curse kills";
 		mes "the first born prince of the";
-		mes "Gaebolg family at an early age.";
+		mes "Geoborg family at an early age.";
 		mes "However, all of the princes of";
 		mes "this generation were killed.";
 		next;

npc/re/merchants/renters.txt

@@ -153,110 +153,110 @@ prontera,125,208,5	script	Peco Peco Remover	105,{
 	close;
 }
 
-// Magic Gear Renter :: madogear
+// Mado Gear Renter :: madogear
 //============================================================
 -	script	::mgm	-1,{
-	mes "[Mado Gear Armourer]";
+	mes "[Mado Gear Armorer]";
 	if (Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) {
 		mes "Welcome, Mechanic.";
 		mes "Would you like to rent a Pushcart or";
-		mes "ride a Magic Gear?";
+		mes "ride a Mado Gear?";
 		next;
-		switch(select("Rent a Pushcart:Ride a Magic Gear:Buy Emergency Magic Gear:Upgrade Cooling Device:Cancel")) {
+		switch(select("Rent a Pushcart:Ride a Mado Gear:Buy Emergency Mado Gear:Upgrade Cooling Device:Cancel")) {
 		case 1:
 			if (checkcart()) {
-				mes "[Mado Gear Armourer]";
+				mes "[Mado Gear Armorer]";
 				mes "I'm sorry, but you already";
 				mes "have a Pushcart.";
 				close;
 			}
 			setcart;
-			mes "[Mado Gear Armourer]";
+			mes "[Mado Gear Armorer]";
 			mes "There you go!";
 			close;
 		case 2:
 			if (checkmadogear()) {
-				mes "[Mado Gear Armourer]";
+				mes "[Mado Gear Armorer]";
 				mes "I'm sorry, but you're already";
-				mes "riding a Magic Gear.";
+				mes "riding a Mado Gear.";
 				close;
 			}
 			else if (!getskilllv("NC_MADOLICENCE")) {
-				mes "[Mado Gear Armourer]";
-				mes "Please learn the skill to get the Magic Gear License first.";
+				mes "[Mado Gear Armorer]";
+				mes "Please learn the skill to get the Mado Gear License first.";
 				close;
 			}
 			else if(ismounting()) {
-				mes "[Mado Gear Armourer]";
+				mes "[Mado Gear Armorer]";
 				mes "Please remove your cash mount.";
 				close;
 			}
 			setmadogear;
-			mes "[Mado Gear Armourer]";
+			mes "[Mado Gear Armorer]";
 			mes "Have fun, and please come again!";
 			close;
 		case 3:
-			mes "[Mado Gear Armourer]";
-			mes "Emergency Magic Gear is really useful for emergency situations and it is sold at 1,000,000 Zeny.";
+			mes "[Mado Gear Armorer]";
+			mes "Emergency Mado Gear is really useful for emergency situations and it is sold at 1,000,000 Zeny.";
 			next;
 			if (select("Purchase:Cancel") == 2) {
-				mes "[Mado Gear Armourer]";
+				mes "[Mado Gear Armorer]";
 				mes "I see. Please feel free to ask me";
 				mes "if you change your mind.";
 				close;
 			}
 			if (countitem(23277) > 0) {
-				mes "[Mado Gear Armourer]";
-				mes "I'm sorry, but you already have an Emergency Magic Gear.";
+				mes "[Mado Gear Armorer]";
+				mes "I'm sorry, but you already have an Emergency Mado Gear.";
 				close;
 			}
 			if (Zeny < 1000000) {
-				mes "[Mado Gear Armourer]";
-				mes "I'm sorry, but you don't have enough Zeny to purchase the Emergency Magic Gear.";
+				mes "[Mado Gear Armorer]";
+				mes "I'm sorry, but you don't have enough Zeny to purchase the Emergency Mado Gear.";
 				close;
 			}
 			Zeny -= 1000000;
 			getitem 23277,1; //Mado_Box
-			mes "[Mado Gear Armourer]";
+			mes "[Mado Gear Armorer]";
 			mes "There you go!";
 			close;
 		case 4:
-			mes "[Mado Gear Armourer]";
+			mes "[Mado Gear Armorer]";
 			mes "Which device do you want to upgrade?";
 			next;
 			if (select("Cooling Device:High Quality Cooler") == 1) {
-				mes "[Mado Gear Armourer]";
+				mes "[Mado Gear Armorer]";
 				mes "Upgrading Cooling Device to High Quality Cooler needs 1 Cooling Device and 2,000,000 Zeny.";
 				next;
 				.@itemid = 2804;
 				.@cost = 2000000;
 			} else {
-				mes "[Mado Gear Armourer]";
+				mes "[Mado Gear Armorer]";
 				mes "Upgrading High Quality Cooler to Special Cooler needs 1 High Quality Cooler and 4,000,000 Zeny.";
 				next;
 				.@itemid = 2809;
 				.@cost = 4000000;
 			}
 			if (select("Upgrade:Cancel") == 2) {
-				mes "[Mado Gear Armourer]";
+				mes "[Mado Gear Armorer]";
 				mes "I see. Please feel free to ask me";
 				mes "if you change your mind.";
 				close;
 			}
 			if (!countitem(.@itemid)) {
-				mes "[Mado Gear Armourer]";
+				mes "[Mado Gear Armorer]";
 				mes "I'm sorry, but you don't have the " + getitemname(.@itemid) + ".";
 				close;
 			}
 			if (Zeny < .@cost) {
-				mes "[Mado Gear Armourer]";
+				mes "[Mado Gear Armorer]";
 				mes "I'm sorry, but you don't have enough Zeny to upgrade the device.";
 				close;
 			}
 			Zeny -= .@cost;
 			delitem .@itemid,1;
 			getitem (.@itemid == 2804 ? 2809 : 2810),1; //High_Quality_Cooler,Special_Cooler
-			mes "[Mado Gear Armourer]";
+			mes "[Mado Gear Armorer]";
 			mes "Here you are! Your very own " + getitemname(.@itemid) + ".";
 			close;
 		case 5:
@@ -264,16 +264,16 @@ prontera,125,208,5	script	Peco Peco Remover	105,{
 		}
 	}
 	mes "How may I help you?";
-	mes "Magic Gears are only available for Mechanics.";
+	mes "Mado Gears are only available for Mechanics.";
 	close;
 }
-prontera,163,178,3	duplicate(mgm)	Mado Gear Armourer#prt	105
-geffen,103,55,5	duplicate(mgm)	Mado Gear Armourer#gef	105
-payon,166,106,5	duplicate(mgm)	Mado Gear Armourer#pay	105
-aldebaran,133,112,5	duplicate(mgm)	Mado Gear Armourer#alde	105
-yuno,167,187,3	duplicate(mgm)	Mado Gear Armourer#yuno	105
-rachel,106,134,5	duplicate(mgm)	Mado Gear Armourer#ra	105
-dicastes01,187,207,3	duplicate(mgm)	Mado Gear Armourer#dic	105
-manuk,273,212,5	duplicate(mgm)	Mado Gear Armourer#man	105
-splendide,180,174,5	duplicate(mgm)	Mado Gear Armourer#spl	105
-mid_camp,242,243,3	duplicate(mgm)	Mado Gear Armourer#mid	105
+prontera,163,178,3	duplicate(mgm)	Mado Gear Armorer#prt	105
+geffen,103,55,5	duplicate(mgm)	Mado Gear Armorer#gef	105
+payon,166,106,5	duplicate(mgm)	Mado Gear Armorer#pay	105
+aldebaran,133,112,5	duplicate(mgm)	Mado Gear Armorer#alde	105
+yuno,167,187,3	duplicate(mgm)	Mado Gear Armorer#yuno	105
+rachel,106,134,5	duplicate(mgm)	Mado Gear Armorer#ra	105
+dicastes01,187,207,3	duplicate(mgm)	Mado Gear Armorer#dic	105
+manuk,273,212,5	duplicate(mgm)	Mado Gear Armorer#man	105
+splendide,180,174,5	duplicate(mgm)	Mado Gear Armorer#spl	105
+mid_camp,242,243,3	duplicate(mgm)	Mado Gear Armorer#mid	105