change *strcharinfo to use constants

19 files changed, 327 insertions, 327 deletions

diff --git a/npc/re/jobs/1-1/acolyte.txt b/npc/re/jobs/1-1/acolyte.txt
index 76474aa05..dae96908b 100644
--- a/npc/re/jobs/1-1/acolyte.txt
+++ b/npc/re/jobs/1-1/acolyte.txt
@@ -147,7 +147,7 @@ prt_fild03,365,255,2	script	Ascetic#aco	4_M_ORIENT02,{
 				mes "Oh...? You must be the one who aspires to become an Acolyte. I've already received news from the Sanctuary that you might be coming.";
 				next;
 				mes "[Father Rubalkabara]";
-				mes "Now, your name was " + strcharinfo(0) + ", right? Excellent, thank you for visiting me.";
+				mes "Now, your name was " + strcharinfo(PC_NAME) + ", right? Excellent, thank you for visiting me.";
 				next;
 				mes "[Father Rubalkabara]";
 				mes "I believe you've been told much about Acolytes from Friar Mareusis. Plus, there's plenty of helpful people in the Prontera Sanctuary.";
@@ -175,7 +175,7 @@ prt_fild03,365,255,2	script	Ascetic#aco	4_M_ORIENT02,{
 				mes "Let's see...";
 				next;
 				mes "[Father Rubalkabara]";
-				mes "Your name is " + strcharinfo(0) + "?";
+				mes "Your name is " + strcharinfo(PC_NAME) + "?";
 				mes "I don't think your name";
 				mes "is on my list. Hmmm...";
 				next;
@@ -224,10 +224,10 @@ moc_fild07,41,355,4	script	Ascetic#2aco	4_F_SISTER,{
 				mes "Ah, you must be one of the Acolyte applicants. I sincerely welcome you.";
 				next;
 				mes "[Mother Mathilda]";
-				mes "What is your name? " + strcharinfo(0) + "? Let's see... Ah, you're on my list.";
+				mes "What is your name? " + strcharinfo(PC_NAME) + "? Let's see... Ah, you're on my list.";
 				next;
 				mes "[Mother Mathilda]";
-				mes "I will send a message to the Sanctuary confirming that you, " + strcharinfo(0) + " visited me and completed your penance.";
+				mes "I will send a message to the Sanctuary confirming that you, " + strcharinfo(PC_NAME) + " visited me and completed your penance.";
 				next;
 				mes "[Mother Mathilda]";
 				mes "Please return to the Prontera Sanctuary and speak to the Priest in charge.";
@@ -244,7 +244,7 @@ moc_fild07,41,355,4	script	Ascetic#2aco	4_F_SISTER,{
 				next;
 				mes "[Mother Mathilda]";
 				mes "Now, what is your name?";
-				mes "" + strcharinfo(0) + "? Let's see...";
+				mes "" + strcharinfo(PC_NAME) + "? Let's see...";
 				next;
 				mes "[Mother Mathilda]";
 				mes "Hmm...";
@@ -301,10 +301,10 @@ prt_fild00,208,218,6	script	Ascetic#3aco	4W_M_02,{
 				mes "So what's your name?";
 				next;
 				mes "[Father Yosuke]";
-				mes "" + strcharinfo(0) + ", huh?";
+				mes "" + strcharinfo(PC_NAME) + ", huh?";
 				next;
 				mes "[Father Yosuke]";
-				mes "Okay. I'll send a message to the Sanctuary that you, " + strcharinfo(0) + ", came to visit me.";
+				mes "Okay. I'll send a message to the Sanctuary that you, " + strcharinfo(PC_NAME) + ", came to visit me.";
 				next;
 				mes "[Father Yosuke]";
 				mes "Now go back to the Santuary and finish becoming an Acolyte, kid.";
@@ -321,7 +321,7 @@ prt_fild00,208,218,6	script	Ascetic#3aco	4W_M_02,{
 				mes "Not bad at all, you've made it all the way here from Prontera. So what's your name, kid?";
 				next;
 				mes "[Father Yosuke]";
-				mes "" + strcharinfo(0) + ", huh? Why isn't your name on my list?";
+				mes "" + strcharinfo(PC_NAME) + ", huh? Why isn't your name on my list?";
 				next;
 				mes "[Father Yosuke]";
 				mes "You probably made a mistake. Go back to the Santuary, and check with the Bishop.";
diff --git a/npc/re/jobs/1-1/archer.txt b/npc/re/jobs/1-1/archer.txt
index 0f2b92025..a7ef0ef10 100644
--- a/npc/re/jobs/1-1/archer.txt
+++ b/npc/re/jobs/1-1/archer.txt
@@ -97,7 +97,7 @@ payon_in02,64,71,4	script	Archer Guildsman#archer	4_M_03,{
 			close;
 		}else{
 			mes "[Archer Guildsman]";
-			mes "You are... "+strcharinfo(0)+". right?";
+			mes "You are... "+strcharinfo(PC_NAME)+". right?";
 			next;
 			if (getskilllv("NV_BASIC") < 9) {
 				mes "[Archer Guildsman]";
diff --git a/npc/re/jobs/1-1/mage.txt b/npc/re/jobs/1-1/mage.txt
index 55107fd00..29593163b 100644
--- a/npc/re/jobs/1-1/mage.txt
+++ b/npc/re/jobs/1-1/mage.txt
@@ -113,7 +113,7 @@ geffen_in,164,124,4	script	Mage Guildsman#mage	2_F_MAGICMASTER,{
 				close;
 			}
 			mes "Alright.. sign the application form.... Wow~ you have good handwriting! Ahh, okay. That's enough.";
-			mes "You are... "+strcharinfo(0)+".";
+			mes "You are... "+strcharinfo(PC_NAME)+".";
 			next;
 			mes "[Mage Guildsman]";
 			mes "Hmm I can see that you've tried hard in your own way. Though it seems to be a little clumsy, but well I think it's okay!";
diff --git a/npc/re/jobs/1-1/thief.txt b/npc/re/jobs/1-1/thief.txt
index 5e2da345c..393b9a13c 100644
--- a/npc/re/jobs/1-1/thief.txt
+++ b/npc/re/jobs/1-1/thief.txt
@@ -158,7 +158,7 @@ moc_prydb1,39,129,2	script	Thief Guide#thief	1_F_04,{
 	}
 	mes "[Thief Guildsman]";
 	mes "Alright, tell me your name. Huh? What?";
-	mes ""+strcharinfo(0)+". So "+strcharinfo(0)+", right...?";
+	mes ""+strcharinfo(PC_NAME)+". So "+strcharinfo(PC_NAME)+", right...?";
 	next;
 	if (getskilllv("NV_BASIC") < 9) {
 		mes "[Thief Guildsman]";
@@ -169,7 +169,7 @@ moc_prydb1,39,129,2	script	Thief Guide#thief	1_F_04,{
 	}
 	mes "[Thief Guildsman]";
 	mes "Hmm.... I found your interesting criminal records from the data of the detective agency. Well you seem to have what it takes to be a good thief.";
-	mes ""+strcharinfo(0)+". I now declare that you have passed the job interview!";
+	mes ""+strcharinfo(PC_NAME)+". I now declare that you have passed the job interview!";
 	next;
 	mes "[Thief Guildsman]";
 	mes "Well, I'm not in charge of making you a Thief. I just accept applications, get it?";
@@ -186,7 +186,7 @@ moc_prydb1,42,133,2	script	Thief Guildsman#thief	2_M_THIEFMASTER,{
 		mes "Let's begin the job-changing ceremony of our guild!";
 		next;
 		mes "[Commander of Thief Guild]";
-		mes "'"+strcharinfo(0)+".'";
+		mes "'"+strcharinfo(PC_NAME)+".'";
 		mes "'For those who are ready, the moonlight shall open the way. Now you are fully ready, I now officially allow you to become a member of the Thief Guild.'";
 		callfunc "Job_Change",Job_Thief;
 		q_job_thief = 0;
diff --git a/npc/re/jobs/2e/kagerou_oboro.txt b/npc/re/jobs/2e/kagerou_oboro.txt
index c239e4a0e..ae28e7b2d 100644
--- a/npc/re/jobs/2e/kagerou_oboro.txt
+++ b/npc/re/jobs/2e/kagerou_oboro.txt
@@ -143,7 +143,7 @@ job_ko,25,115,4	script	Old Man#ko	4_M_KAGE_OLD,{
 			cutin "",255;
 			end;
 		}
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Excuse me...";
 		next;
 		mes "^1A95E6You tried to talk to the old man but there is no response. Just when you are about to turn away...^1A95E6";
@@ -1398,8 +1398,8 @@ OnTouch:
 			mes "< Used 5 LP >";
 			set job_kagero_lp, job_kagero_lp - 5;
 			next;
-			set $20110808_sko01$, strcharinfo(0);
-			mes strcharinfo(0)+" was here.";
+			set $20110808_sko01$, strcharinfo(PC_NAME);
+			mes strcharinfo(PC_NAME)+" was here.";
 			mes "You left your name.";
 			next;
 		} else {
@@ -1969,7 +1969,7 @@ job_ko,127,125,4	script	Red Leopard Joe#ko	4_M_JOB_ASSASSIN,{
 		mes "Don't like it that I'm not the first one you visited but that is not important.";
 		next;
 		mes "[Red Leopard Joe]";
-		mes "Alright, " + strcharinfo(0) + "!";
+		mes "Alright, " + strcharinfo(PC_NAME) + "!";
 		mes "Welcome to the workshop where weapons are created for the family.";
 		next;
 		mes "[Red Leopard Joe]";
@@ -2158,7 +2158,7 @@ job_ko,127,125,4	script	Red Leopard Joe#ko	4_M_JOB_ASSASSIN,{
 		if (questprogress(5143) == 1) completequest 5143;
 		if (questprogress(5144) == 1) completequest 5144;
 		mes "[Red Leopard Joe]";
-		mes "'" + strcharinfo(0) + "'";
+		mes "'" + strcharinfo(PC_NAME) + "'";
 		mes "Passed the weapon test!!";
 		close2;
 		enable_items;
@@ -2555,9 +2555,9 @@ job_ko,148,46,4	script	Guide Gion#ko2	4_M_KAGE_OLD,{
 		mes "[Guide Gion]";
 		mes "The Test of Battle will be put off for a while. Don't worry because this does not have affect to other tests.";
 		next;
-		mapannounce "job_ko","[Gion] My Friend " + strcharinfo(0) + " made it to " + (Sex == SEX_MALE ? "Kagerou" : "Oboro") + " Path. Congratulations!!",bc_map;
+		mapannounce "job_ko","[Gion] My Friend " + strcharinfo(PC_NAME) + " made it to " + (Sex == SEX_MALE ? "Kagerou" : "Oboro") + " Path. Congratulations!!",bc_map;
 		mes "[Guide Gion]";
-		mes "My friend " + strcharinfo(0) + " made it to " + (Sex == SEX_MALE ? "Kagerou" : "Oboro") + " Path. Congratulations!!";
+		mes "My friend " + strcharinfo(PC_NAME) + " made it to " + (Sex == SEX_MALE ? "Kagerou" : "Oboro") + " Path. Congratulations!!";
 		next;
 		cutin "job_ko02",2;
 		mes "[Guide Gion]";
@@ -2570,14 +2570,14 @@ job_ko,148,46,4	script	Guide Gion#ko2	4_M_KAGE_OLD,{
 		donpcevent "Red Leopard Joe#ko2::OnEnable";
 		cutin "job_ko04",2;
 		mes "[Guide Gion]";
-		mes "I'm sorry I almost forgot about you two. Do you have anything to share with " + strcharinfo(0) + "?";
+		mes "I'm sorry I almost forgot about you two. Do you have anything to share with " + strcharinfo(PC_NAME) + "?";
 		next;
 		cutin "",255;
 		mes "[Cougar]";
 		mes "Hmm... Embarrassing... to speak so suddenly...";
 		next;
 		mes "[Cougar]";
-		mes strcharinfo(0) + ", you are now a proud member of our family. Always hold your head high and...";
+		mes strcharinfo(PC_NAME) + ", you are now a proud member of our family. Always hold your head high and...";
 		next;
 		mes "[Cougar]";
 		mes "^777777(Gai's voice fades out.)^000000.";
@@ -2620,7 +2620,7 @@ job_ko,148,46,4	script	Guide Gion#ko2	4_M_KAGE_OLD,{
 		for (set .@i,5131; .@i<=5146; set .@i,.@i+1)
 			if (questprogress(.@i)) erasequest .@i;
 		set job_kagero,9;
-		getnameditem .@item,strcharinfo(0);
+		getnameditem .@item,strcharinfo(PC_NAME);
 		jobchange(Sex == SEX_MALE ? Job_Kagerou : Job_Oboro);
 		donpcevent "Summon Target#ko::OnEnable";
 		mes "[Guide Gion]";
diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt
index 9caa1f538..1a03af44c 100644
--- a/npc/re/jobs/3-1/archbishop.txt
+++ b/npc/re/jobs/3-1/archbishop.txt
@@ -212,7 +212,7 @@ umbala,139,227,3	script	Priest#arch	1_M_PASTOR,{
 		mes "hahahahaha.";
 		mes "huhuhuhu. humhum.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Hello. are you... Priest Dayan?";
 		next;
 		mes "[Priest]";
@@ -220,13 +220,13 @@ umbala,139,227,3	script	Priest#arch	1_M_PASTOR,{
 		next;
 		mes "He turns his head towards you.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Aren't you Priest Dayan?";
 		next;
 		mes "[Priest]";
 		mes "muttering...";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Priest! Da~yan! Right!?";
 		next;
 		mes "[Priest Dayan]";
@@ -240,11 +240,11 @@ umbala,139,227,3	script	Priest#arch	1_M_PASTOR,{
 		mes "I forgot to wear my hearing aid. hehe.";
 		mes "Anyway, why have you come here?";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Hmm, I wanted to tell you...";
 		next;
 		input .@inputstr$;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "" + .@inputstr$ + "";
 		next;
 		if (.@inputstr$ != "I'm here for the Holy Pilgrimage") {
@@ -259,7 +259,7 @@ umbala,139,227,3	script	Priest#arch	1_M_PASTOR,{
 		next;
 		mes "He cups his ears towards you.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "^FF0000I'm here for the Holy Pilgrimage!^000000";
 		mes "^FF0000I'm here for the Holy Pilgrimage!^000000";
 		mes "^FF0000I'm here for the Holy Pilgrimage!^000000";
@@ -383,7 +383,7 @@ umbala,139,227,3	script	Priest#arch	1_M_PASTOR,{
 		mes "I can feel that you have a fresh energy.";
 		mes "Maybe you did pray truthfully.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "I feel light-hearted. Like I was just reborn...";
 		next;
 		mes "[Priest Dayan]";
@@ -391,7 +391,7 @@ umbala,139,227,3	script	Priest#arch	1_M_PASTOR,{
 		mes "A smile from a peaceful mind will easily rid people of their wariness.";
 		mes "Please, inspire people with love and energy.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Thanks for your kind words.";
 		next;
 		mes "[Priest Dayan]";
@@ -409,7 +409,7 @@ umbala,139,227,3	script	Priest#arch	1_M_PASTOR,{
 		mes "I think she is exhausted due to praying too much.";
 		mes "I hope the air of Yggdrasil will be helpful to her.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Don't worry.";
 		mes "I'll go and meet her.";
 		next;
@@ -429,32 +429,32 @@ umbala,139,227,3	script	Priest#arch	1_M_PASTOR,{
 yggdrasil01,220,47,0	script	#arch_pilgrimage	HIDDEN_WARP_NPC,5,5,{
 OnTouch:
 	if (job_arch == 2) {
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Is it the spring of Hvergelmir.";
 		mes "This place is a very vivid and peaceful place.";
 		mes "It's proper to pray.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Time to genuflect...";
 		mes "Time to start...";
 		mes "Hmm, what did that priest say to me?";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Hmm... What is the first way?";
 		next;
 		switch(select("The way of silence.", "The way of confession.", "The way of meditation.")) {
 		case 1:
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "The way of silence...?";
 			mes "I don't think so.";
 			close;
 		case 2:
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "The way of confession...?";
 			mes "I don't think so.";
 			close;
 		case 3:
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "The way of meditation...?";
 			mes "Yes, it's the way of meditation.";
 			next;
@@ -481,17 +481,17 @@ OnTouch:
 		mes "^3131FF[Priest Dayan]^000000";
 		mes "^3131FFDon't be afraid of pain. That is a necessity and will be a first step to enter a way to liquidate past wounds.^000000";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Pain... What kind of faults have I had?";
 		input .@inputstr$;
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "I confess my guilt to the Almighty God Odin.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "^3131FF" + .@inputstr$ + ".^000000";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Oh benevolent Odin, Take mercy on me and pity me because I'm remiss in the discharge of my duties as a minister.";
 		mes "Please, lead the way and save a foolish minister with your wisdom.";
 		next;
@@ -518,7 +518,7 @@ OnTouch:
 		mes "^3131FFYou're drinking the Holy Water.^000000";
 		next;
 		if (countitem(Holy_Water) == 0) {
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "Oh no! I forgot to bring a Holy Water!";
 			close;
 		}
@@ -548,19 +548,19 @@ OnTouch:
 		mes "A chord crashes out in the spring of Hvergelmir and a waterfall sound gives you a refreshing feeling. -";
 		specialeffect2 EF_GLORIA;
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "~Descendants of Heimdal gather under the Ash tree Yggdrasil.~";
 		mes "~The Curdan bird which sits on a branch brings me the wisdom of whole world.~";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "~The Curdan wolf protects me from all threats in the world.~";
 		specialeffect2 EF_GLORIA;
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "~The host of ballascalf, rise up from your seat. The whole world shouts for joy.~";
 		mes "~The father of light, the poet of wisdom, sing for me.~";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "~The host of a glittering glass, give me a holy prediction.~";
 		specialeffect2 EF_GLORIA;
 		next;
@@ -568,7 +568,7 @@ OnTouch:
 		specialeffect2 EF_BLESSING;
 		specialeffect2 EF_RESURRECTION;
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "That was refreshing.";
 		mes "I guess I should go back to Priest Dayan.";
 		job_arch = 3;
@@ -576,7 +576,7 @@ OnTouch:
 		warp "umbala",138,219;
 		end;
 	} else if (job_arch == 3) {
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "The song is over. It's time to go back to Priest Dayan.";
 		close2;
 		warp "umbala",138,219;
@@ -593,7 +593,7 @@ hu_in01,205,204,7	script	Praying Nun#benew	1_F_PRIEST,{
 			mes "- You don't feel like disturbing her -";
 			close;
 		}
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Umm, hello sister?";
 		next;
 		mes "[Vinue]";
@@ -601,7 +601,7 @@ hu_in01,205,204,7	script	Praying Nun#benew	1_F_PRIEST,{
 		mes "It's not time to have a service yet...";
 		mes "Are you here to pray, "+ (Sex == SEX_MALE ? "brother" : "sister") +"?";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "I came here to say hello from Priest Dayan from Prontera.";
 		next;
 		mes "[Vinue]";
@@ -609,11 +609,11 @@ hu_in01,205,204,7	script	Praying Nun#benew	1_F_PRIEST,{
 		mes "Is he good?";
 		mes "He is so cute even though he's old.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "He told me that he was worried because when he saw you last time, you seemed sad.";
 		mes "He asks you to go on a Holy Pilgrimage.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Umbala has the vital power of nature!";
 		next;
 		mes "[Vinue]";
@@ -643,7 +643,7 @@ hu_in01,205,204,7	script	Praying Nun#benew	1_F_PRIEST,{
 		mes "[Vinue]";
 		mes "At first, it was a dream that Valkyrie was sad and in darkness.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Valkyrie?";
 		next;
 		mes "[Vinue]";
@@ -657,7 +657,7 @@ hu_in01,205,204,7	script	Praying Nun#benew	1_F_PRIEST,{
 		mes "[Vinue]";
 		mes "What a cruel performance! I suddenly can't breathe properly and then I wake up.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "To have to see the death of Valkyrie, must be a tormenting dream.";
 		next;
 		mes "[Vinue]";
@@ -667,7 +667,7 @@ hu_in01,205,204,7	script	Praying Nun#benew	1_F_PRIEST,{
 		mes "[Vinue]";
 		mes "I've been wanting to pray at Odin's shrine to make the dream go away. But that shrine became a den of evil a long time ago.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "The shrine?";
 		mes "Nobody tried to subdue the evil?";
 		next;
@@ -678,7 +678,7 @@ hu_in01,205,204,7	script	Praying Nun#benew	1_F_PRIEST,{
 		mes "[Vinue]";
 		mes "These days, there are a lot of people because of the development of the Odin shrine, but their situation is not so good.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Is the dream related with the evil in the Odin shrine?";
 		next;
 		mes "[Vinue]";
@@ -698,7 +698,7 @@ hu_in01,205,204,7	script	Praying Nun#benew	1_F_PRIEST,{
 		mes "But, it'll be scary inside!";
 		mes "There are lots of devils inside!";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "But I can't pretend to ignore a Sister who is in trouble?";
 		mes "I'm a minister who copes with lots of asceticism!";
 		mes "Entrust me.";
@@ -707,13 +707,13 @@ hu_in01,205,204,7	script	Praying Nun#benew	1_F_PRIEST,{
 		mes "Ah... I'm so worried....";
 		mes "I'll never forget your warm heart.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "How do I get to Odin shrine?";
 		next;
 		mes "[Vinue]";
 		mes "There is a ferry on the right side of the church.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Ok, wait for good news!";
 		next;
 		mes "[Vinue]";
@@ -806,7 +806,7 @@ job3_arch01,29,34,3	script	Valkyrie#arch	4_F_VALKYRIE2,{
 			mes "You are a descendant of Heimdal living in pain as a mortal, why are you in here?";
 			mes "Are you here to ridicule my grim fate?";
 			next;
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "No way!";
 			mes "But it's true that I'm here for you.";
 			next;
@@ -822,7 +822,7 @@ job3_arch01,29,34,3	script	Valkyrie#arch	4_F_VALKYRIE2,{
 			mes "I was already expelled from Asgard.";
 			mes "My duty is protecting this small island from humans trying to take it from the Gods and even I don't have any energy to do so.";
 			next;
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "It's not that kind of problem.";
 			mes "But someone who perceives your painful situation has sent me here.";
 			next;
@@ -875,11 +875,11 @@ job3_arch01,29,34,3	script	Valkyrie#arch	4_F_VALKYRIE2,{
 			mes "[Valkyrie Anguhilde]";
 			mes "Mortal one, what is your name?";
 			next;
-			mes "[" + strcharinfo(0) + "]";
-			mes "My name is " + strcharinfo(0) + ".";
+			mes "[" + strcharinfo(PC_NAME) + "]";
+			mes "My name is " + strcharinfo(PC_NAME) + ".";
 			next;
 			mes "[Valkyrie Anguhilde]";
-			mes "" + strcharinfo(0) + ",";
+			mes "" + strcharinfo(PC_NAME) + ",";
 			mes "You told me that you want to help me, right? Even though it disgraces me, I am asking for your help.";
 			next;
 			mes "[Valkyrie Anguhilde]";
@@ -919,7 +919,7 @@ job3_arch01,29,34,3	script	Valkyrie#arch	4_F_VALKYRIE2,{
 			if ($@archbs == 0) {
 				$@archbs = 1;
 				mes "[Valkyrie Anguhilde]";
-				mes "" + strcharinfo(0) + " Did you finish preparing for your way of asceticism?";
+				mes "" + strcharinfo(PC_NAME) + " Did you finish preparing for your way of asceticism?";
 				next;
 				if (getmapusers("job3_arch02") > 0) {
 					mes "[Valkyrie Anguhilde]";
diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt
index 3f34e03f7..d56aff87d 100644
--- a/npc/re/jobs/3-1/guillotine_cross.txt
+++ b/npc/re/jobs/3-1/guillotine_cross.txt
@@ -43,10 +43,10 @@ que_job01,75,96,3	script	Guild Member#3rdgc01	4_M_MOCASS1,{
 				mes "Finally, it's time...";
 				mes "Hey, what's your name?";
 				next;
-				switch(select(strcharinfo(0),".....")) {
+				switch(select(strcharinfo(PC_NAME),".....")) {
 				case 1:
 					mes "[Ahcart]";
-					mes strcharinfo(0)+"?";
+					mes strcharinfo(PC_NAME)+"?";
 					mes "Got it. I'll remember your name.";
 					mes "A master told me that you are a person with ability.";
 					break;
@@ -168,7 +168,7 @@ que_job01,75,96,3	script	Guild Member#3rdgc01	4_M_MOCASS1,{
 }
 
 function	script	func_3rdgc	{
-	.@n$ = "["+strcharinfo(0)+"]";
+	.@n$ = "["+strcharinfo(PC_NAME)+"]";
 	mes .@n$;
 	mes "Let me collect all the information...";
 	.@i = 0;
@@ -302,8 +302,8 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	4_F_DESERT,{
 				mes "Oh? You are a person of this world.";
 				mes "Your name is...";
 				next;
-				mes "["+strcharinfo(0)+"]";
-				mes strcharinfo(0)+".";
+				mes "["+strcharinfo(PC_NAME)+"]";
+				mes strcharinfo(PC_NAME)+".";
 				next;
 				mes "[Daora]";
 				if (job_3rd_gc == 3) {
@@ -630,7 +630,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	4_F_DESERT,{
 						mes "[Daora]";
 						mes "My glass, you don't need it?";
 						next;
-						mes "["+strcharinfo(0)+"]";
+						mes "["+strcharinfo(PC_NAME)+"]";
 						mes "Yes. I already have enough information.";
 						mes "If that is a stuff has a long story behind it,";
 						mes "we have only one way.";
@@ -903,7 +903,7 @@ job3_guil01,16,20,4	script	Mayshell#3rdgc03	4_F_KHELLISIA,{
 		mes "We saw a stranger in this village, we are quite sure that he is the person who we are looking for your task.";
 		next;
 		mes "[Mayshell]";
-		mes strcharinfo(0)+".";
+		mes strcharinfo(PC_NAME)+".";
 		mes "Time is not waiting for you.";
 		mes "Go ahead. Spill blood with the blade of a knife that stands for a stoic life.";
 		job_3rd_gc = 5;
@@ -915,7 +915,7 @@ job3_guil01,16,20,4	script	Mayshell#3rdgc03	4_F_KHELLISIA,{
 		next;
 		mes "[Mayshell]";
 		mes "It's a test to watch you.";
-		mes "Let me see, "+strcharinfo(0)+"...";
+		mes "Let me see, "+strcharinfo(PC_NAME)+"...";
 		mes "Go out and think about what you have to do first.";
 		next;
 		mes "[Mayshell]";
@@ -1511,7 +1511,7 @@ ve_in,246,303,3	script	Young Merchant#3rdgc05	4_M_RACHMAN2,{
 							mes "I'm a man of ability.";
 							next;
 							select("Where did you see her?");
-							mes "["+strcharinfo(0)+"]";
+							mes "["+strcharinfo(PC_NAME)+"]";
 							mes "A few days have passed already.";
 							mes "I want to find her as soon as possible.";
 							mes "You said you saw that child? Where did you see her?";
@@ -1798,10 +1798,10 @@ veins,187,143,5	script	Peddler#3rdgc07	4_F_HUGRANMA,{
 					mes "You're an adventurer, so I'm asking you.";
 					next;
 					select("I'll send her your message.", "Hmm...");
-					mes "["+strcharinfo(0)+"]";
+					mes "["+strcharinfo(PC_NAME)+"]";
 					mes "- Even though I don't have time to spare, the girl mentioned by the peddler is suspicious. -";
 					next;
-					mes "["+strcharinfo(0)+"]";
+					mes "["+strcharinfo(PC_NAME)+"]";
 					mes "- A girl who has no clear residence and buys expensive food. I have to find out. -";
 					next;
 					mes "[Peddler]";
@@ -2160,19 +2160,19 @@ OnTouch:
 				mes "- Estillda is in shock because she thinks that she's in trouble. -";
 				next;
 				select("Calm her down.");
-				mes "["+strcharinfo(0)+"]";
+				mes "["+strcharinfo(PC_NAME)+"]";
 				mes "Just relax for a second.";
 				mes "I totally understand what you're saying.";
 				mes "You won't get into any trouble.";
 				next;
-				mes "["+strcharinfo(0)+"]";
+				mes "["+strcharinfo(PC_NAME)+"]";
 				mes "I'm looking for a guy who committed a crime and ran away.";
 				mes "I have to catch him.";
 				next;
-				mes "["+strcharinfo(0)+"]";
+				mes "["+strcharinfo(PC_NAME)+"]";
 				mes "So who made you get those supplies?";
 				next;
-				mes "["+strcharinfo(0)+"]";
+				mes "["+strcharinfo(PC_NAME)+"]";
 				mes "If you cooperate with me, I'm going to protect you until this is all done.";
 				mes "The Assassin Guild will protect you.";
 				next;
@@ -2189,7 +2189,7 @@ OnTouch:
 				mes "Ah, these are mine.";
 				mes "I got a lot of zeny.";
 				next;
-				mes "["+strcharinfo(0)+"]";
+				mes "["+strcharinfo(PC_NAME)+"]";
 				mes "Then go straight this way and pretend that nothing happened.";
 				next;
 				mes "- I demand that she walks as usual and tell her how to get to Daora's pub. -";
@@ -2290,7 +2290,7 @@ job3_guil01,79,15,1	script	Estillda#3rdgc11	4_F_SHABBY,{
 				mes "Sorry. I'm sorry.";
 				mes "I'm going to do what you want...";
 				next;
-				mes "["+strcharinfo(0)+"]";
+				mes "["+strcharinfo(PC_NAME)+"]";
 				mes "Your attitude is a problem.";
 				mes "Let's take up the main subject.";
 				break;
@@ -2319,13 +2319,13 @@ job3_guil01,79,15,1	script	Estillda#3rdgc11	4_F_SHABBY,{
 			mes "In a couple of hours.";
 			mes "At a warehouse underground in the south.";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Thanks for your cooperation.";
 			mes "Your house is in Rachel?";
 			mes "Estillda is your real name?";
 			mes "Yes, I'm going to draw his rations in Rachel.";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "To go back home without an accident.";
 			job_3rd_gc = 12;
 			changequest 7106,7107;
@@ -2467,7 +2467,7 @@ OnTouch:
 	mes "When did I give you a clue?!";
 	next;
 	select("You lost your head...");
-	mes "["+strcharinfo(0)+"]";
+	mes "["+strcharinfo(PC_NAME)+"]";
 	mes "Is this the correct target?";
 	mes "Can you talk with me for a sec?";
 	next;
@@ -2475,7 +2475,7 @@ OnTouch:
 	mes "No way!!!!";
 	mes "You... I'll make you close your eyes forever!";
 	next;
-	mes "["+strcharinfo(0)+"]";
+	mes "["+strcharinfo(PC_NAME)+"]";
 	mes "What?!";
 	close2;
 	donpcevent "A man with black clothes::OnDisable";
@@ -2522,7 +2522,7 @@ job3_guil02,49,43,5	script	Dandelion#3rdgc12	4_M_DSTMANDEAD,{
 		next;
 		mes "- He puts something in his mouth and swallows. -";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "What is that?!";
 		mes "What do you have in your mouth...?";
 		mes "Why did you do that?";
diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt
index 91adb9b49..0308884fd 100644
--- a/npc/re/jobs/3-1/ranger.txt
+++ b/npc/re/jobs/3-1/ranger.txt
@@ -452,7 +452,7 @@ tur_dun01,91,169,3	script	Test Instructor#jr02	4_M_JOB_HUNTER,{
 				next;
 				break;
 			case 2:
-				mes "["+strcharinfo(0)+"]";
+				mes "["+strcharinfo(PC_NAME)+"]";
 				mes "No thanks... anyway...";
 				next;
 				mes "[Test Instructor, Teardrop]";
@@ -561,7 +561,7 @@ tur_dun01,91,169,3	script	Test Instructor#jr02	4_M_JOB_HUNTER,{
 					if (countitem(Bow__) > 0) {
 						mes "[Test Instructor, Teardrop]";
 						mes "Okay. I'll respect your opinion.";
-						mes "I'll cancel the job change request from "+strcharinfo(0)+".";
+						mes "I'll cancel the job change request from "+strcharinfo(PC_NAME)+".";
 						delitem Bow__,1;
 						job_ranger01 = 0;
 						for(.@i = 8254; .@i <= 8262; ++.@i)
@@ -723,7 +723,7 @@ job3_rang01,30,44,3	script	Test Waiting Room#jr_03	4_M_ORIENT01,{
 			if (countitem(Bow__) > 0) {
 				mes "[Staff DTS]";
 				mes "Okay. I'll respect your opinion.";
-				mes "I'll cancel the job change request from "+strcharinfo(0)+".";
+				mes "I'll cancel the job change request from "+strcharinfo(PC_NAME)+".";
 				delitem Bow__,1;
 				job_ranger01 = 0;
 				for(.@i = 8254; .@i <= 8262; ++.@i)
diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt
index fb875278d..caa540585 100644
--- a/npc/re/jobs/3-1/rune_knight.txt
+++ b/npc/re/jobs/3-1/rune_knight.txt
@@ -146,7 +146,7 @@ prt_in,162,24,3	script	Splendid-Looking Knight	4_M_KNIGHT_SILVER,2,2,{
 glast_01,44,363,3	script	Guide, Jungberg	4_M_KNIGHT_BLACK,2,2,{
 	mes "[Guide, Jungberg]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
-		mes "Oh, you must be "+strcharinfo(0)+".";
+		mes "Oh, you must be "+strcharinfo(PC_NAME)+".";
 		mes "Welcome.";
 		next;
 		mes "[Guide, Jungberg]";
@@ -217,7 +217,7 @@ glast_01,44,363,3	script	Guide, Jungberg	4_M_KNIGHT_BLACK,2,2,{
 				mes "Um... Are you the Rune Knight candidate that Manuel talked about?";
 				next;
 				mes "[Guide, Jungberg]";
-				mes "Your name is "+strcharinfo(0)+", right? I can see clearly that you are qualified to become our comrade.";
+				mes "Your name is "+strcharinfo(PC_NAME)+", right? I can see clearly that you are qualified to become our comrade.";
 				next;
 				mes "[Guide, Jungberg]";
 				mes "Good. I don't have to ask any more about your qualification to join our brethren....1.S... Now I'll give you your first assignment.";
@@ -270,7 +270,7 @@ glast_01,44,363,3	script	Guide, Jungberg	4_M_KNIGHT_BLACK,2,2,{
 gl_knt02,150,55,3	script	Rune Knight Staff	4_M_01,2,2,{
 	mes "[Rune Knight Staff]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
-		mes "Welcome, "+strcharinfo(0)+". Are you going to the gathering place?";
+		mes "Welcome, "+strcharinfo(PC_NAME)+". Are you going to the gathering place?";
 		next;
 		switch(select("Yes, take me there.", "I'm on other business.", "Cancel.")) {
 		case 1:
@@ -348,7 +348,7 @@ job3_rune01,80,60,3	script	Rune Knight Captain	4_M_KNIGHT_SILVER,2,2,{
 			job_rune_edq = 24;
 			close;
 		}
-		mes "Hey, long time no see, "+strcharinfo(0)+". I don't think you've got any important matters to discuss but make yourself comfortable.";
+		mes "Hey, long time no see, "+strcharinfo(PC_NAME)+". I don't think you've got any important matters to discuss but make yourself comfortable.";
 		close;
 	}
 	if (BaseJob == Job_Knight) {
@@ -361,7 +361,7 @@ job3_rune01,80,60,3	script	Rune Knight Captain	4_M_KNIGHT_SILVER,2,2,{
 			mes "Hey, are you the Rune Knight candidate that Manuel recommended? I am Captain Tigris from the Rune Knights, and your name is?";
 			next;
 			mes "[Captain Tigris]";
-			mes "Oh, I've heard it before but I've forgotten it. Right, were you "+strcharinfo(0)+"? I truly welcome you from the heart for coming here.";
+			mes "Oh, I've heard it before but I've forgotten it. Right, were you "+strcharinfo(PC_NAME)+"? I truly welcome you from the heart for coming here.";
 			next;
 			mes "[Captain Tigris]";
 			mes "Let's see. How many candidates have come to this room? Hey, Lunarea, which candidate is this one here?";
@@ -709,7 +709,7 @@ L_Test:
 job3_rune01,55,50,3	script	Rune Knight, Renoa	4_M_KNIGHT_GOLD,2,2,{
 	mes "[Rune Knight, Renoa]";
 	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
-		mes "Congratulations for becoming one of us. Junior Rune Knight, "+strcharinfo(0)+".";
+		mes "Congratulations for becoming one of us. Junior Rune Knight, "+strcharinfo(PC_NAME)+".";
 		next;
 		mes "[Rune Knight, Renoa]";
 		mes "Soon you'll see the way we need to go clearly.";
diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt
index ea926b0b1..cc7874f38 100644
--- a/npc/re/jobs/3-2/genetic.txt
+++ b/npc/re/jobs/3-2/genetic.txt
@@ -258,9 +258,9 @@ job3_gen01,25,58,3	script	Devries#gen	4_LGTSCIENCE,{
 		mes "[Devries]";
 		mes "What's your name, young alchemist?";
 		next;
-		select("I'm "+strcharinfo(0)+".");
+		select("I'm "+strcharinfo(PC_NAME)+".");
 		mes "[Devries]";
-		mes "Oh, "+strcharinfo(0)+"!";
+		mes "Oh, "+strcharinfo(PC_NAME)+"!";
 		mes "That's a very unusual name. Pleased to meet you.";
 		next;
 		mes "[Devries]";
@@ -553,18 +553,18 @@ job3_gen01,25,58,3	script	Devries#gen	4_LGTSCIENCE,{
 		mes "<I'm sure it will be a great inspiration for other Alchemists.>";
 		next;
 		mes "<Come to think of it, you've attached a paper?>";
-		mes "<It was a new plant which makes plants grow super-fast, discovered by an Alchemist named, "+strcharinfo(0)+">";
+		mes "<It was a new plant which makes plants grow super-fast, discovered by an Alchemist named, "+strcharinfo(PC_NAME)+">";
 		next;
 		mes "<Myself and many other Alchemists from the Alchemist union are taking great interest in this.>";
 		next;
 		mes "<We are looking forward to more volumes of study papers and outcomes, especially from other Geneticists who?ve heard this news.>";
 		next;
 		mes "<Miss. Devries>";
-		mes "<I think that "+strcharinfo(0)+" has enough ability and talent to be a Geneticist.>";
+		mes "<I think that "+strcharinfo(PC_NAME)+" has enough ability and talent to be a Geneticist.>";
 		next;
-		mes "<Please tell "+strcharinfo(0)+" as soon as possible that we are expecting remarkable activities as a Geneticist from now on.>";
+		mes "<Please tell "+strcharinfo(PC_NAME)+" as soon as possible that we are expecting remarkable activities as a Geneticist from now on.>";
 		next;
-		mes "<The Alchemist Union is very proud of Miss Devries, Miss Demi Calberine and "+strcharinfo(0)+" who are excellent talented people.>";
+		mes "<The Alchemist Union is very proud of Miss Devries, Miss Demi Calberine and "+strcharinfo(PC_NAME)+" who are excellent talented people.>";
 		mes "<We hope that you yield good fruits in the future as well.>";
 		next;
 		mes "[Devries]";
@@ -723,7 +723,7 @@ job3_gen01,7,50,3	script	Testing Table#gen	CLEAR_NPC,{
 		}
 		if (!questprogress(2209) && !questprogress(2210) && !questprogress(2211) && !questprogress(2212)
 		 && !questprogress(2213) && !questprogress(2213) && !questprogress(2214)) {
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Hmm, I need to gather plant materials first.";
 			close;
 		}
@@ -747,7 +747,7 @@ job3_gen01,7,50,3	script	Testing Table#gen	CLEAR_NPC,{
 		select("Testing Seed - Type A", "Testing Seed - Type B", "Testing Seed - Type C", "Testing Seed - Type D");
 		mes "I've put the prepared materials into the chosen testing seed.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Good. Now I can let Miss Devries take a look at this seed!";
 		if (!questprogress(2209) && !questprogress(2210) && !questprogress(2211)) {
 			job_gen = 61;
@@ -866,7 +866,7 @@ job3_gen01,91,48,3	script	Demi Calberine#gen	4_F_SCIENCE,{
 		mes "Oh, by the way what made you come here?";
 		mes "Did you come here to order something";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I'm a Geneticist applicant.";
 		mes "I heard that you were very knowledgeable about portable mini cannons and stuff.";
 		next;
@@ -874,7 +874,7 @@ job3_gen01,91,48,3	script	Demi Calberine#gen	4_F_SCIENCE,{
 		mes "Yep, I deal with many kinds of cannons.";
 		mes "Nowadays, there are those who want to remodel their carts, so I've been installing several additional functions such as mini cannons to their carts.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Cart remodeling?";
 		next;
 		mes "[Demi Calberine]";
diff --git a/npc/re/jobs/3-2/minstrel.txt b/npc/re/jobs/3-2/minstrel.txt
index ca5b7e261..a9f30975c 100644
--- a/npc/re/jobs/3-2/minstrel.txt
+++ b/npc/re/jobs/3-2/minstrel.txt
@@ -59,7 +59,7 @@ alberta,196,133,4	script	Bard#job_min	4_M_BARD,{
 			mes "[Old Man passing by]";
 			mes "Eeeee~ that's not real song...";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Clap.";
 			mes "I can feel the rhythm.";
 			mes "Can I hear one more song?";
@@ -68,7 +68,7 @@ alberta,196,133,4	script	Bard#job_min	4_M_BARD,{
 			mes "Hum?";
 			mes "Judging by your outfit I think you are good at singing, why don't you sing us a song?";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "??!!";
 			next;
 			mes "[Bard]";
@@ -76,7 +76,7 @@ alberta,196,133,4	script	Bard#job_min	4_M_BARD,{
 			mes "Just kidding.";
 			mes "Were you serious? Haha.";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "...";
 			next;
 			mes "[Karian]";
@@ -95,8 +95,8 @@ alberta,196,133,4	script	Bard#job_min	4_M_BARD,{
 			mes "[Karian]";
 			mes "No man can survive after hearing ^f57d7dthe voice of a Siren^000000.";
 			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "I'm "+strcharinfo(0)+".";
+			mes "["+strcharinfo(PC_NAME)+"]";
+			mes "I'm "+strcharinfo(PC_NAME)+".";
 			mes "Are you here in Alberta to travel?";
 			next;
 			mes "[Karian]";
@@ -107,7 +107,7 @@ alberta,196,133,4	script	Bard#job_min	4_M_BARD,{
 			mes "Yes!";
 			mes "I'm looking for '^f57d7dMaestro Song^000000'.";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "^f57d7d'Maestro Song'^000000, you mean the poet of legend?";
 			next;
 			mes "[Karian]";
@@ -115,7 +115,7 @@ alberta,196,133,4	script	Bard#job_min	4_M_BARD,{
 			mes "According to a rumor that I heard, he is a rich noble.";
 			mes "But other than that fact, I can't get any more information.";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Why can't you get any more information?";
 			next;
 			mes "[Karian]";
@@ -127,7 +127,7 @@ alberta,196,133,4	script	Bard#job_min	4_M_BARD,{
 			mes "If you are interested, why don't help me find out where ^f57d7d'Maestro Song'^000000 is?";
 			next;
 			if(select("Ok.", "No.") == 2) {
-				mes "["+strcharinfo(0)+"]";
+				mes "["+strcharinfo(PC_NAME)+"]";
 				mes "I'm not interested.";
 				next;
 				mes "[Karian]";
@@ -135,7 +135,7 @@ alberta,196,133,4	script	Bard#job_min	4_M_BARD,{
 				mes "See you later~";
 				close;
 			}
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Ok, I will.";
 			job_min = 1;
 			setquest 11135;
@@ -144,7 +144,7 @@ alberta,196,133,4	script	Bard#job_min	4_M_BARD,{
 			mes "It's good to travel by yourself but sometimes you feel that you want to have friends around.";
 			next;
 			mes "[Karian]";
-			mes "Then "+strcharinfo(0)+".";
+			mes "Then "+strcharinfo(PC_NAME)+".";
 			mes "Can you collect some ^f57d7dInformation on 'Maestro Song'^000000 in ^f57d7dProntera^000000?";
 			mes "Because I have something to investigate in Alberta.";
 			next;
@@ -164,7 +164,7 @@ alberta,196,133,4	script	Bard#job_min	4_M_BARD,{
 		mes "It's good to travel by yourself but sometimes you feel that you want to have friends around.";
 		next;
 		mes "[Karian]";
-		mes "Then "+strcharinfo(0)+".";
+		mes "Then "+strcharinfo(PC_NAME)+".";
 		mes "Can you collect some ^f57d7dInformation on 'Maestro Song'^000000 in ^f57d7dProntera^000000?";
 		mes "Because I have something to investigate in Alberta.";
 		next;
@@ -181,7 +181,7 @@ alberta,196,133,4	script	Bard#job_min	4_M_BARD,{
 		close;
 	} else if (job_min == 4) {
 		mes "[Karian]";
-		mes strcharinfo(0)+"! Did you already go to Prontera?";
+		mes strcharinfo(PC_NAME)+"! Did you already go to Prontera?";
 		mes "Did you get any useful information?";
 		next;
 		mes "[Karian]";
@@ -219,7 +219,7 @@ alberta,196,133,4	script	Bard#job_min	4_M_BARD,{
 		mes "make them feel as if they are in the land of dreams.";
 		next;
 		mes "[Karian]";
-		mes "Ah!!! "+strcharinfo(0)+" Long time no see!";
+		mes "Ah!!! "+strcharinfo(PC_NAME)+" Long time no see!";
 		mes "What? What am I doing here?";
 		next;
 		mes "[Karian]";
@@ -387,14 +387,14 @@ hu_in01,267,5,3	script	Karian#job_min2	4_M_BARD,{
 		mes "Eeeeh it's so painful.";
 		mes "I don't want to feel like this ever again.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Are you ok?";
 		next;
 		mes "[Karian]";
 		mes "...";
 		mes "No...";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I'm feeling ok.";
 		mes "So, I'm going to find out information in town, you can take a rest.";
 		next;
@@ -402,7 +402,7 @@ hu_in01,267,5,3	script	Karian#job_min2	4_M_BARD,{
 		mes "Sorry, blech! I still feel bad...";
 		mes "You can get good information from the ^f57d7dPub^000000. Owww...";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "You don't have to tell me everything. I can take care of it.";
 		next;
 		mes "[Karian]";
@@ -426,7 +426,7 @@ hu_in01,267,5,3	script	Karian#job_min2	4_M_BARD,{
 	} else if (job_min == 9) {
 		mes "Owww...";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "How do you feel?";
 		next;
 		mes "[Karian]";
@@ -437,7 +437,7 @@ hu_in01,267,5,3	script	Karian#job_min2	4_M_BARD,{
 		mes "Did you get anything?";
 		mes "I'm sorry that I can't be more helpful to you.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "No, it's ok.";
 		mes "I met a man in the Pub, he said that he got a song from 'Maestro Song'.";
 		next;
@@ -447,7 +447,7 @@ hu_in01,267,5,3	script	Karian#job_min2	4_M_BARD,{
 		mes ".....";
 		mes "Bleech...";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Hey! Are you sure that you are ok?";
 		next;
 		mes "[Karian]";
@@ -455,28 +455,28 @@ hu_in01,267,5,3	script	Karian#job_min2	4_M_BARD,{
 		mes "It's just bad memories.";
 		mes "So did you hear something?";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I heard a song named ^f57d7d'Metallic Sound'^000000.";
 		next;
 		mes "[Karian]";
 		mes "What?!?!?!?!!!!!";
 		mes "You heard that?!";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Why? Do you know that song?";
 		next;
 		mes "[Karian]";
 		mes "Ahh...";
 		mes "Y-yes...";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Hmm...";
 		next;
 		mes "[Karian]";
 		mes "I met him before.";
 		mes "He has a great voice...";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Yes.";
 		mes "I blacked out as I heard that song.";
 		next;
@@ -485,7 +485,7 @@ hu_in01,267,5,3	script	Karian#job_min2	4_M_BARD,{
 		mes "And he...";
 		mes "What else?";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Ah!!";
 		mes "^f57d7d'Maestro Song'^000000 went to ^f57d7dThanatos Tower^000000.";
 		mes "I don't know why he went there.";
@@ -537,18 +537,18 @@ hu_in01,361,103,3	script	Tone-deaf person	4_M_CASMAN1,{
 		mes "Hum!! Hey you, you were listening to my song.";
 		mes "You look like a "+((Class == Job_Clown)?"Clown":"Bard")+", how about you sing for me as rewarding my song?";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "What?!";
 		next;
 		mes "[Tone-deaf person]";
 		mes "Sing for me.";
 		mes "Come on~";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Ok...";
 		mes "Hum hum...";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "You are standing in the middle of Asgard's field.";
 		mes "You hand the fruit of heaven over to me~";
 		mes "You are loved by every god~";
@@ -587,7 +587,7 @@ hu_in01,361,103,3	script	Tone-deaf person	4_M_CASMAN1,{
 		mes "But ^f57d7d'Maestro Song'^000000 didn't get discouraged by my song.";
 		mes "Of course he isn't good enough to me.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Did you meet ^f57d7d'Maestro Song'^000000?";
 		next;
 		mes "[Tone-deaf person]";
@@ -607,14 +607,14 @@ hu_in01,361,103,3	script	Tone-deaf person	4_M_CASMAN1,{
 		mes "[Tone-deaf person]";
 		mes "He said that he will go to Thanatos.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Did you get a song?";
 		next;
 		mes "[Tone-deaf person]";
 		mes "Yes!";
 		mes "He conceded my ability!";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Can I hear the song?";
 		next;
 		mes "[Tone-deaf person]";
@@ -666,19 +666,19 @@ hu_in01,361,103,3	script	Tone-deaf person	4_M_CASMAN1,{
 		mes "Clap";
 		mes "Hey~";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Eeeee...";
 		next;
 		mes "[Tone-deaf person]";
 		mes "I think you are qualified, but you seem to need more training.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "......";
 		next;
 		mes "-You're so exhausted.-";
 		mes "-So go back to the hotel.-";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Thank you for your song.";
 		mes "I have to go back...";
 		next;
@@ -691,7 +691,7 @@ hu_in01,361,103,3	script	Tone-deaf person	4_M_CASMAN1,{
 		changequest 11141,11142;
 		close;
 	} else if (job_min == 9) {
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "......";
 		next;
 		mes "-I'm so exhausted.-";
@@ -731,7 +731,7 @@ OnTouch:
 	if (job_min == 10 || (job_min == 11 && countitem(Mins_Receipt) == 0)) {
 		mes "-There is a piece of paper on the ground.-";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "What is this?";
 		next;
 		mes "[Karian]";
@@ -751,7 +751,7 @@ OnTouch:
 		mes "- Directions : Around Juno's plaza.";
 		getitem Mins_Receipt,1;
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Photo exchange receipt?";
 		mes "How did he drop it...";
 		next;
@@ -856,7 +856,7 @@ yuno,143,170,6	script	Mr. Click#job_min	4_M_ALCHE_A,{
 		mes "I can take a picture for you.";
 		mes "Do you want to take a pic?";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "No...";
 		mes "Do you remember this receipt?";
 		next;
@@ -894,7 +894,7 @@ yuno,143,170,6	script	Mr. Click#job_min	4_M_ALCHE_A,{
 		mes "[Mr. Click]";
 		mes "Here, take a look.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "The picture!";
 		mes "Let me see it!";
 		next;
@@ -902,13 +902,13 @@ yuno,143,170,6	script	Mr. Click#job_min	4_M_ALCHE_A,{
 		mes "Hurry.";
 		donpcevent "Karian#cmd2::OnEnable";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "...";
 		next;
 		mes "[Karian]";
 		mes "Oh~ Good pic, isn't it?";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I expected I would see the face of 'Maestro Song', but he's wearing a mask...";
 		mes "He's wearing a mask?!";
 		mes "We came here for this?";
@@ -921,7 +921,7 @@ yuno,143,170,6	script	Mr. Click#job_min	4_M_ALCHE_A,{
 		mes "-In front of Thanatos tower.";
 		mes "-Maestro Song.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "What does it mean?";
 		next;
 		mes "[Karian]";
@@ -934,7 +934,7 @@ yuno,143,170,6	script	Mr. Click#job_min	4_M_ALCHE_A,{
 		mes "[Karian]";
 		mes "We might be able to get something there.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Then why would he need 33?";
 		next;
 		mes "[Karian]";
@@ -943,7 +943,7 @@ yuno,143,170,6	script	Mr. Click#job_min	4_M_ALCHE_A,{
 		mes "[Karian]";
 		mes "Umm... Then I'll pass by Einbroch and go to Lighthalzen. Why don't you go to the place where Teddy Bears are?";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Ok. Then let's meet at Lighthalzen's hotel.";
 		mes "I'll get the 33 Teddy Bears.";
 		donpcevent "Karian#cmd2::OnDisable";
@@ -961,7 +961,7 @@ yuno,143,170,6	script	Mr. Click#job_min	4_M_ALCHE_A,{
 		mes "[Karian]";
 		mes "Then I'll pass by Einbroch and go to Lighthalzen. Why don't you go to the place where Teddy Bears are?";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Then let's meet at Lighthalzen's hotel.";
 		mes "I'll get the 33 Teddy Bears.";
 		donpcevent "Karian#cmd2::OnDisable";
@@ -985,14 +985,14 @@ OnTouch:
 			mes "Why do you have lots of teddy bears?";
 			mes "Where did you get them old man?";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Hey, I'm not an old man.";
 			next;
 			mes "[Little Girl]";
 			mes "And my name isn't 'Hey'!";
 			mes "My name is 'Rion'!";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Sorry~ sorry~";
 			mes "What if I give you a teddy bear.";
 			next;
@@ -1004,7 +1004,7 @@ OnTouch:
 			mes "[Rion]";
 			mes "A man who I saw before didn't give me teddy bears even though he had lots of them!";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Is he the guy in this pic?";
 			next;
 			mes "[Rion]";
@@ -1020,16 +1020,16 @@ OnTouch:
 			mes "[Rion]";
 			mes "My mother works here.";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Ice Cave?";
 			next;
 			mes "[Rion]";
 			mes "Mother said that it's freezing.";
 			next;
 			mes "[Karian]";
-			mes "Hey~ "+strcharinfo(0)+"~";
+			mes "Hey~ "+strcharinfo(PC_NAME)+"~";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Ah, Karian. Did you just get here?";
 			next;
 			mes "[Karian]";
@@ -1037,14 +1037,14 @@ OnTouch:
 			mes "It was much farther away than I'd expected.";
 			donpcevent "Karian#cmd3::OnEnable";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "You... walked here?";
 			next;
 			mes "[Karian]";
 			mes "...";
 			mes "I didn't want to take the airship again...";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Oh... got it.";
 			mes "Then did you get anything in Einbroch?";
 			next;
@@ -1052,13 +1052,13 @@ OnTouch:
 			mes "I think 'Maestro Song' went to Einbroch, but he left soon because of air.";
 			mes "How about you? Did you find something about the teddy bears?";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "'Maestro Song' might be in an Ice Cave.";
 			next;
 			mes "[Karian]";
 			mes "Might be?";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "This little... ah... Rion saw him.";
 			next;
 			mes "[Karian]";
@@ -1066,10 +1066,10 @@ OnTouch:
 			mes "Huu... legs hurt.";
 			mes "Ok, let's go to there.";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Okay.";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Thanks, Rion.";
 			mes "I'll give you all the teddy bears I have.";
 			next;
@@ -1077,7 +1077,7 @@ OnTouch:
 			mes "Really?!";
 			mes "Waaah!!!!!!!!!";
 			mes "I'm so happy!!!";
-			mes "Thank you, "+strcharinfo(0)+".";
+			mes "Thank you, "+strcharinfo(PC_NAME)+".";
 			job_min = 13;
 			changequest 11145,11146;
 			donpcevent "Karian#cmd3::OnDisable";
@@ -1245,7 +1245,7 @@ OnTouch:
 		mes "Huu!!";
 		mes "Wake up!";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Where am I...?";
 		job_min = 15;
 		close;
@@ -1259,7 +1259,7 @@ ra_in01,358,130,4	script	Old Woman#job_min	4_F_CAVE1,{
 		mes "Huu!!";
 		mes "Wake up!";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Where am I...?";
 		job_min = 15;
 		close;
@@ -1270,17 +1270,17 @@ ra_in01,358,130,4	script	Old Woman#job_min	4_F_CAVE1,{
 		mes "[Old Woman]";
 		mes "You're lucky that my husband found you when he did.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Sorry.";
 		next;
 		mes "[Old Woman]";
 		mes "Anyway!! Be careful!";
 		mes "You don't believe your youth alone will protect you.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I'll be careful.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Do you know that song written on the wall of the Ice cave?";
 		next;
 		mes "[Old Woman]";
@@ -1296,7 +1296,7 @@ ra_in01,358,130,4	script	Old Woman#job_min	4_F_CAVE1,{
 		mes "[Old Woman]";
 		mes "And then he decided to go to Comodo.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Comodo?";
 		next;
 		mes "[Old Woman]";
@@ -1313,7 +1313,7 @@ ra_in01,358,130,4	script	Old Woman#job_min	4_F_CAVE1,{
 		mes "Eee I don't want to go on an airship again!";
 		donpcevent "Karian#cmd4::OnEnable";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Take it easy...";
 		mes "Is there another way to go there?";
 		next;
@@ -1357,7 +1357,7 @@ function Choice;
 		mes "Maestro Song, Go to Comodo by boat!";
 		mes "Be ambitious!";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Will it be okay...";
 		next;
 		mes "[Karian]";
@@ -1381,7 +1381,7 @@ function Choice;
 		mes "-You should see-";
 		mes "-other small boats.-";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Hmm...";
 		mes "I didn't think that there was anyone who would cross over this sea with a boat.";
 		mes "You sure I'll see other boats?";
@@ -1390,7 +1390,7 @@ function Choice;
 		mes "They will be headed the other direction.";
 		donpcevent "Karian#cmd5::OnDisable";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Where are you going?";
 		next;
 		mes "[Karian]";
@@ -1405,7 +1405,7 @@ function Choice;
 		mes "-You suddenly feel like-";
 		mes "-you're sitting in water.-";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Hey! There's a water leak!!";
 		next;
 		mes "[Karian]";
@@ -1492,30 +1492,30 @@ function Choice;
 comodo,184,108,0	script	#jmComodo Almost Dead	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
 	if (job_min == 17) {
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I'm... I'm alive~";
 		next;
 		mes "[Karian]";
 		mes "That was a close call.";
 		donpcevent "Karian#cmd6::OnEnable";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "You're the one that insisted that we ride on that boat. That's how we ended up like this in the first place!";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "We wouldn't have suffered like this if we just took the Airship.";
 		next;
 		mes "[Karian]";
 		mes "But I told you that I don't ride airships!";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I can't believe this!";
 		next;
 		mes "[Karian]";
 		mes "Well, let's forget about the past!";
 		mes "Since we're in Comodo, let's just have some fun okay?";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Then what should we do about looking for 'Maestro Song'??";
 		next;
 		mes "[Karian]";
@@ -1601,11 +1601,11 @@ comodo,159,316,4	script	Woman Roasting Meat	4_F_GODEMOM,{
 moc_fild16,206,232,0	script	#jmTransfer news	HIDDEN_WARP_NPC,3,3,{
 OnTouch:
 	if (job_min == 20) {
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Um? What is this?";
 		mes "Something covered by sand?";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Ah It's!!";
 		mes "I think 'Maestro Song' dropped it!";
 		next;
@@ -1613,17 +1613,17 @@ OnTouch:
 		mes "What?! How do you know?";
 		donpcevent "Karian#cmd7::OnEnable";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "The lyrics from the man I met in Hugel on the receipt...";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "and this poem written on this paper.";
 		mes "The calligraphy style is the same.";
 		next;
 		mes "[Karian]";
 		mes "I want to see clock tower...";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "But this poem can't be a clue...";
 		mes "...";
 		mes "What?";
@@ -1632,14 +1632,14 @@ OnTouch:
 		mes "......";
 		mes "I want to see clock tower.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Clock tower?";
 		mes "What are you saying all of a sudden?";
 		next;
 		mes "[Karian]";
 		mes "The... huge clock tower in Al De Baran.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I know but...";
 		next;
 		mes "[Karian]";
@@ -1658,7 +1658,7 @@ OnTouch:
 			mes "[Karian]";
 			break;
 		case 2:
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Ok that's not a bad idea...";
 			next;
 			mes "[Karian]";
@@ -1677,7 +1677,7 @@ OnTouch:
 aldebaran,140,130,0	script	#jmAldebaran Clock Tower	HIDDEN_WARP_NPC,3,3,{
 OnTouch:
 	if (job_min == 21) {
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Anyway why do you want to visit this place?";
 		next;
 		mes "[Karian]";
@@ -1750,7 +1750,7 @@ OnTouch:
 		mes "[Karian]";
 		mes "I'm so tired.";
 		mes "I want to take a rest~";
-		mes "Come here, "+strcharinfo(0)+".";
+		mes "Come here, "+strcharinfo(PC_NAME)+".";
 		job_min = 23;
 		close;
 	}
@@ -1824,10 +1824,10 @@ OnTouch:
 			mes "How'd you do that?";
 			close;
 		}
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "-It's a poem that you picked up in the desert.-";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "-How does Karian know-";
 		mes "-that song's not a poem?-";
 		next;
@@ -1878,7 +1878,7 @@ prt_in,94,172,4	script	Karian#job_min3	4_M_MINSTREL1,{
 		mes "[Karian]";
 		mes "I gave it to my friend but he kept it precious...";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Did you give it to him?";
 		mes "Wait a second!";
 		mes "Just who are you?";
@@ -1887,7 +1887,7 @@ prt_in,94,172,4	script	Karian#job_min3	4_M_MINSTREL1,{
 		mes "Yes! I'm 'Maestro Song'!";
 		mes "Are you surprised!?";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "......";
 		next;
 		mes "[Maestro Song]";
diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt
index 0d87db5d2..5cead2250 100644
--- a/npc/re/jobs/3-2/royal_guard.txt
+++ b/npc/re/jobs/3-2/royal_guard.txt
@@ -87,20 +87,20 @@ prt_castle,48,161,3	script	Middle-aged Gentleman#rg	1_M_LIBRARYMASTER,{
 		mes "Do you want to argue with me? Do you know who I am?";
 		next;
 		if(select("Not really, who are you?", "Sorry, I won't hurt your feelings.") == 2) {
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Sorry. I had to be sure. I didn't know that you are from the royal palace.";
 			next;
 			mes "[Middle-aged Gentleman]";
 			mes "That's enough. Don't make this mistake again.";
 			close;
 		}
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I'm a member here and have the authority to find out what your business is here.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "You are a stranger and I'm not sure if you belong here.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "If you tell me your identity, I will apologize.";
 		next;
 		mes "[Middle-aged Gentleman]";
diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt
index 04c0abc11..9cdd3f732 100644
--- a/npc/re/jobs/3-2/shadow_chaser.txt
+++ b/npc/re/jobs/3-2/shadow_chaser.txt
@@ -1072,7 +1072,7 @@ s_atelier,167,129,3	script	Manager#sc06_yuno	1_M_SIGNART,{
 			changequest 7176,7177;
 			close;
 		}
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I'm sorry.";
 		mes "I found one more key but I didn't bring it.";
 		mes "I'll bring it soon.";
@@ -1115,11 +1115,11 @@ s_atelier,167,129,3	script	Manager#sc06_yuno	1_M_SIGNART,{
 	mes "An assistant sells some paint and tool.";
 	close;
 L_Code:
-	mes "["+strcharinfo(0)+"]";
+	mes "["+strcharinfo(PC_NAME)+"]";
 	mes "Paul said...";
 	next;
 	input .@inputstr$;
-	mes "["+strcharinfo(0)+"]";
+	mes "["+strcharinfo(PC_NAME)+"]";
 	mes "Paul said...";
 	mes "'"+.@inputstr$+"' .";
 	next;
@@ -1698,12 +1698,12 @@ tur_dun03,38,209,1	script	Blue Flame#sc_f01	4_NFWISP,{
 		.@dap01$ = "blue fire in turtle island third floor";
 		.@dap02$ = "BLUE FIRE IN TURTLE ISLAND THIRD FLOOR";
 		if (.@inputstr$ != .@dap01$ && .@inputstr$ != .@dap02$) {
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "What was it?";
 			mes "I guess I have to make sure I don't use any capital letters.";
 			close;
 		}
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "^4d4dff"+.@inputstr$+"^000000";
 		mes "It's clearly pointing to this.";
 		next;
@@ -1846,16 +1846,16 @@ niflheim,230,276,1	script	Red Flame#sc_f03	4_NFWISP,{
 		close;
 	}
 	else if (job_sha == 21) {
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "The poem that Haled told me was pointing to Niflheim.";
 		mes "There is a flame that looks like the one from turtle island and ice dungeon.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "The end of living tree's roots.";
 		mes "Tears of all living people.";
 		mes "Sign of all dead people.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "They are us but also not us.";
 		next;
 		mes "[Someone's voice]";
@@ -1974,7 +1974,7 @@ job3_sha01,22,78,0	script	????#keybox01	CLEAR_NPC,{
 		mes "And "+.@Codes1$[.@i]+".";
 		next;
 		select("What does it mean?");
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Is it also code.";
 		mes "It must be!";
 		mes "Ah, something is showing up again...?";
@@ -2030,13 +2030,13 @@ job3_sha01,25,28,0	script	????#keybox02	CLEAR_NPC,{
 		mes "When you touched that number, then it moved.";
 		mes "You find the empty space.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I guess I have to put the number in the empty space...";
 		mes "I have two empty squares to put two numbers.";
 		mes "What will it be good for?";
 		next;
 		select("I think it's related with the word given by Paul.");
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I got "+.@Words$[.@i]+".";
 		mes "Now I have to convert it into a number...";
 		next;
@@ -2049,12 +2049,12 @@ job3_sha01,25,28,0	script	????#keybox02	CLEAR_NPC,{
 				next;
 				mes "You got the Key of Illusion.";
 				next;
-				mes "["+strcharinfo(0)+"]";
+				mes "["+strcharinfo(PC_NAME)+"]";
 				mes "It's not a treasure.";
 				mes "The Key of Illusion? Is it related with the Shadow of Illusion?";
 				mes "I got the Key of Deception after I handled Deception...";
 				next;
-				mes "["+strcharinfo(0)+"]";
+				mes "["+strcharinfo(PC_NAME)+"]";
 				mes "Anyway, Paul will be disappointed.";
 				mes "Key again...";
 				mes "How can I escape from here...?";
@@ -2071,12 +2071,12 @@ job3_sha01,25,28,0	script	????#keybox02	CLEAR_NPC,{
 			mes "When you enter the number, it goes back to the first.";
 			close;
 		case 2:
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Hmm.";
 			mes "I can't get it...";
 			mes "Is it the same code as the Prontera workplace...?";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "According to that method...";
 			mes "A means 11 and B means 12.";
 			close;
@@ -2106,10 +2106,10 @@ job3_sha01,73,80,0	script	????#keybox03	CLEAR_NPC,{
 			mes " 19 8 1 11 5";
 			mes "-----------------";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "I think it's another code.";
 		} else {
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Let me think again...";
 			mes "20 21 18 14";
 			mes "1 14 4 ";
@@ -2117,14 +2117,14 @@ job3_sha01,73,80,0	script	????#keybox03	CLEAR_NPC,{
 			mes "...";
 		}
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "It's the same as before.";
 		mes "There's no code, so 1 should be A.";
 		mes "And the answer is...";
 		next;
 		input .@inputstr$;
 		if (.@inputstr$ == "turn and shake" || .@inputstr$ == "TURN AND SHAKE") {
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Turn... Turn... and";
 			mes "Shake? Shake?";
 			mes "For what?";
@@ -2139,7 +2139,7 @@ job3_sha01,73,80,0	script	????#keybox03	CLEAR_NPC,{
 						mes "Even though you shake the roof but";
 						mes "nothing happens.";
 						next;
-						mes "["+strcharinfo(0)+"]";
+						mes "["+strcharinfo(PC_NAME)+"]";
 						mes "That's not it.";
 						mes "Hmm...";
 						next;
@@ -2148,7 +2148,7 @@ job3_sha01,73,80,0	script	????#keybox03	CLEAR_NPC,{
 						mes "You tried to shake the house but";
 						mes "it doesn't do anything.";
 						next;
-						mes "["+strcharinfo(0)+"]";
+						mes "["+strcharinfo(PC_NAME)+"]";
 						mes "It's wrong.";
 						mes "Put it back";
 						mes "and try it again.";
@@ -2165,7 +2165,7 @@ job3_sha01,73,80,0	script	????#keybox03	CLEAR_NPC,{
 						mes "Nothing happens.";
 						mes "You think there is something inside, but it won't come out.";
 						next;
-						mes "["+strcharinfo(0)+"]";
+						mes "["+strcharinfo(PC_NAME)+"]";
 						mes "That's not it.";
 						mes "Hmm...";
 						next;
@@ -2175,7 +2175,7 @@ job3_sha01,73,80,0	script	????#keybox03	CLEAR_NPC,{
 						mes "You can hear a noise,";
 						mes "but nothing's coming out.";
 						next;
-						mes "["+strcharinfo(0)+"]";
+						mes "["+strcharinfo(PC_NAME)+"]";
 						mes "That's not it.";
 						mes "Hmm...";
 						next;
@@ -2189,7 +2189,7 @@ job3_sha01,73,80,0	script	????#keybox03	CLEAR_NPC,{
 						next;
 						mes "- You got the Key of Pleasure. -";
 						next;
-						mes "["+strcharinfo(0)+"]";
+						mes "["+strcharinfo(PC_NAME)+"]";
 						mes "What? A key again!";
 						mes "Haled will be disappointed.";
 						mes "I better go back.";
@@ -2203,14 +2203,14 @@ job3_sha01,73,80,0	script	????#keybox03	CLEAR_NPC,{
 					mes "You tried to turn the small handle";
 					mes "but it doesn't work.";
 					next;
-					mes "["+strcharinfo(0)+"]";
+					mes "["+strcharinfo(PC_NAME)+"]";
 					mes "What should I do now?";
 					next;
 					break;
 				}
 			}
 		}
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "..."+.@inputstr$+"...?";
 		if (job_sha == 23) {
 			mes "What does that mean?";
@@ -2243,7 +2243,7 @@ job3_sha01,71,27,0	script	????#keybox04	CLEAR_NPC,{
 		next;
 		select("Place the key in the holes.");
 		if (countitem(Cheat_Key) && countitem(Virtual_Key) && countitem(Mirth_Key)) {
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "At first, Deception...";
 			mes "then Illusion...";
 			mes "and Pleasure...";
@@ -2260,23 +2260,23 @@ job3_sha01,71,27,0	script	????#keybox04	CLEAR_NPC,{
 			getitem Master_Brush,1;
 			changequest 7178,7179;
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "What???";
 			mes "A brush!!!!";
 			mes "This isn't treasure!!!";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Ahahhah!!!!";
 			mes "*sniff*";
 			mes "It's not treasure!";
 			next;
 			select("Now I'm pissed off.");
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "*Sigh*";
 			mes "Guess I should bring this to ^4d4dffVicente^000000!";
 			close;
 		}
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I didn't bring all of the keys.";
 		mes "How could I be so stupid?";
 		close;
diff --git a/npc/re/jobs/3-2/sorcerer.txt b/npc/re/jobs/3-2/sorcerer.txt
index a75480f24..0af118a0d 100644
--- a/npc/re/jobs/3-2/sorcerer.txt
+++ b/npc/re/jobs/3-2/sorcerer.txt
@@ -80,7 +80,7 @@ gef_tower,102,34,5	script	Merito	2_M_SAGE_B,{
 			close;
 		}
 		mes "[Merito]";
-		mes "So, you are [" + strcharinfo(0) + "].";
+		mes "So, you are [" + strcharinfo(PC_NAME) + "].";
 		next;
 		mes "[Merito]";
 		mes "Give me a second to register your name.";
@@ -91,7 +91,7 @@ gef_tower,102,34,5	script	Merito	2_M_SAGE_B,{
 		mes "Good, then I'll give you a short explanation about the Sorcerer.";
 		next;
 		mes "[Merito]";
-		mes "[" + strcharinfo(0) + "], can you handle magic skillfully?";
+		mes "[" + strcharinfo(PC_NAME) + "], can you handle magic skillfully?";
 		next;
 		if(select("Yes, I can.", "No, I'm not really good at it.") == 2) {
 			mes "[Merito]";
@@ -188,7 +188,7 @@ gef_tower,113,161,5	script	Karacas	4_M_SAGE_A,{
 		mes "The list... has already arrived.";
 		next;
 		mes "[Karacas]";
-		mes "So, you are [" + strcharinfo(0) + "]... right?";
+		mes "So, you are [" + strcharinfo(PC_NAME) + "]... right?";
 		next;
 		if(select("Yes, I am.", "No, I'm not!") == 2) {
 			mes "[Karacas]";
@@ -355,14 +355,14 @@ gef_tower,113,161,5	script	Karacas	4_M_SAGE_A,{
 		mes "Originally my teacher needs to check the Sorcerer job change but after he went out to find the spirit of fish, I can't see him. So I'll check it myself.";
 		next;
 		mes "[Karacas]";
-		mes "Dear [" + strcharinfo(0) + "],";
+		mes "Dear [" + strcharinfo(PC_NAME) + "],";
 		mes "you went around the rough wilds to open the door as a Sorcerer and passed all the requirements that our Academy has given.";
 		next;
 		mes "[Karacas]";
 		mes "Of course it is just a beginning, we don't know which spirit you're going to commune with or what kind of hardships await you.";
 		next;
 		mes "[Karacas]";
-		mes "But with the ability you've shown until now, you will be capable to do anything from now on. Dear [" + strcharinfo(0) + "]";
+		mes "But with the ability you've shown until now, you will be capable to do anything from now on. Dear [" + strcharinfo(PC_NAME) + "]";
 		next;
 		mes "[Kalakas]";
 		if (BaseLevel < 99 || JobLevel < 50 || SkillPoint) {
@@ -380,7 +380,7 @@ gef_tower,113,161,5	script	Karacas	4_M_SAGE_A,{
 		mes "Moreover, I formally acknowledge that you've completed all the job transfer tests of the Sorcerer Academy.";
 		next;
 		mes "[Karacas]";
-		mes "Congratulations, [" + strcharinfo(0) + "]";
+		mes "Congratulations, [" + strcharinfo(PC_NAME) + "]";
 		jobchange roclass(eaclass()|EAJL_THIRD);
 		getitem Wind_Whisper,1;
 		getitem Green_Apple_Ring,1;
diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt
index f1353e282..3eae13edf 100644
--- a/npc/re/jobs/3-2/sura.txt
+++ b/npc/re/jobs/3-2/sura.txt
@@ -112,7 +112,7 @@ ve_in,237,125,0	script	King Crab#job_shu	1_M_PAY_ELDER,{
 		mes "Huh! The boss is really mad!";
 		mes "I can beat you up with one blow...";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Hey! How dare you use violence against a lady!?";
 		next;
 		mes "[???]";
@@ -236,7 +236,7 @@ OnTimer600000:
 ve_in,97,149,0	script	#Suraryokan	HIDDEN_WARP_NPC,3,3,{
 OnTouch:
 	if (job_shu == 1) {
-		.@n$ = "["+strcharinfo(0)+"]";
+		.@n$ = "["+strcharinfo(PC_NAME)+"]";
 		mes "[???]";
 		mes "Who is it?!";
 		next;
@@ -298,7 +298,7 @@ ve_in,98,159,0	script	Fighter#job_shu	4_F_SURA,{
 		mes "Training is so tough and I have a long way to go!";
 		close;
 	} else if (job_shu == 2) {
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I want to know about the skill you used a while ago.";
 		next;
 		mes "[???]";
@@ -307,7 +307,7 @@ ve_in,98,159,0	script	Fighter#job_shu	4_F_SURA,{
 		mes ".........";
 		mes "............ A rookie like you doesn't need to know.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Rookie?!";
 		mes "I have steadily practiced martial arts.";
 		mes "I am confident that I will never lose.";
@@ -315,35 +315,35 @@ ve_in,98,159,0	script	Fighter#job_shu	4_F_SURA,{
 		mes "[???]";
 		mes "So you can beat me, too?";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "No...";
 		mes "I guess that's too much...";
 		mes "Frankly speaking, I was quite amazed by you.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I had thought that I was strong enough but after seeing you fight, I realized that I was full of conceit.";
 		next;
 		mes "[???]";
 		mes "Huuuh~ No matter how strong you are,";
 		mes "you cannot avoid reaching for your true limit.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "You are just the person that I expected.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I think you would know";
 		mes "how to overcome this limitation.";
 		next;
 		mes "[???]";
 		mes "Stop it.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "What? Why?";
 		next;
 		mes "[???]";
 		mes "Are you a human?";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "What?";
 		mes "Of course, I am a human.";
 		next;
@@ -351,7 +351,7 @@ ve_in,98,159,0	script	Fighter#job_shu	4_F_SURA,{
 		mes "To become stronger is too hard for a mere human.";
 		mes "If you want to, just buy better equipment.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Then, what are you?";
 		mes "You mean you're not a human being?";
 		next;
@@ -360,7 +360,7 @@ ve_in,98,159,0	script	Fighter#job_shu	4_F_SURA,{
 		mes "is impossible for a human.";
 		mes "It's a ghost's way...";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Ghost?";
 		next;
 		mes "[???]";
@@ -380,7 +380,7 @@ ve_in,98,159,0	script	Fighter#job_shu	4_F_SURA,{
 			mes "[???]";
 			mes "You'll regret it, so just be satisfied with your present life.";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Well, now that I've met you, I won't live my life this way anymore!";
 			next;
 			mes "[???]";
@@ -468,14 +468,14 @@ yuno_fild07,254,176,7	script	Buddy#job_shu	4_M_MONK,{
 		mes "[Buddy]";
 		mes "I don't know why you're here but please don't stand behind me unless you want to die.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "'Bruno' sent me here.";
 		next;
 		mes "[Buddy]";
 		mes "Ah! My colleague introduced me to you!";
 		mes "Anyway, why are you here to see me?";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "I asked Bruno about her strength, and she recommended me to you.";
 		next;
 		mes "[Buddy]";
@@ -497,7 +497,7 @@ yuno_fild07,254,176,7	script	Buddy#job_shu	4_M_MONK,{
 		end;
 	} else if (job_shu == 100) {
 		mes "[Buddy]";
-		mes "Ah, long time no see, "+strcharinfo(0)+".";
+		mes "Ah, long time no see, "+strcharinfo(PC_NAME)+".";
 		mes "Are you here to meet my master?";
 		next;
 		switch(select("Yes", "No")) {
@@ -515,7 +515,7 @@ yuno_fild07,254,176,7	script	Buddy#job_shu	4_M_MONK,{
 		}
 	}
 	mes "[Buddy]";
-	mes strcharinfo(0)+", didn't you meet the master yet?";
+	mes strcharinfo(PC_NAME)+", didn't you meet the master yet?";
 	next;
 	mes "[Buddy]";
 	mes "My master doesn't like noise, so please ^f57d7dwait in the living room silently.^000000";
@@ -702,7 +702,7 @@ OnEnable:
 sword_1-1,222,169,5	script	Bruno#job_shu	4_F_SURA,{
 	if (job_shu > 4) {
 		mes "[Bruno]";
-		mes "Hey~ "+strcharinfo(0)+", what's up?";
+		mes "Hey~ "+strcharinfo(PC_NAME)+", what's up?";
 		next;
 		switch(select("Let's have conversation.", "Go outside.")) {
 		case 1:
@@ -794,14 +794,14 @@ sword_1-1,223,167,2	script	Master#job_shu	4_M_SURA,{
 		mes "Master! This is a wolf fur coat.";
 		mes "Put it on when it's cold.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Ahhk! That is the wolf I... caught... Uhh.";
 		next;
 		mes "- Whack -";
 		next;
 		mes "[Bruno]";
 		mes "Ho ho ho~";
-		mes "Do you have something to say, "+strcharinfo(0)+"?";
+		mes "Do you have something to say, "+strcharinfo(PC_NAME)+"?";
 		mes "You became a member of our family, let's get along together ~";
 		next;
 		mes "[Master]";
diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt
index 6f131f2bc..30449e2fa 100644
--- a/npc/re/jobs/3-2/wanderer.txt
+++ b/npc/re/jobs/3-2/wanderer.txt
@@ -237,7 +237,7 @@ xmas,132,143,5	script	Performance Manager#wnd	4_M_06,{
 			}
 			if (.@loop) break;
 		}
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "I see that you are worried that the performance is going down the drain.";
 		mes "You wanted to make a successful performance to meet the fan's expectations.";
 		next;
@@ -250,7 +250,7 @@ xmas,132,143,5	script	Performance Manager#wnd	4_M_06,{
 		mes "Why is <Nollio> taking this kind of attitude towards me?";
 		mes "Did I make any mistakes? After making a contract with them, I did everything they demanded of me!";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "It's because...";
 		input .@inputstr$;
 		mes "^3131FF" + .@inputstr$ + "^000000";
@@ -382,7 +382,7 @@ comodo,140,86,5	script	Cheerless Maestro	4_M_MINSTREL,{
 		job_wan = 3;
 		close;
 	} else if (job_wan == 3) {
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "(Would it be possible for me to make him tell me what happened with Nollio?)";
 		next;
 		switch(select("Use Dazzler", "Use Lullaby", "Use Lucky Luck")) {
@@ -390,10 +390,10 @@ comodo,140,86,5	script	Cheerless Maestro	4_M_MINSTREL,{
 			if (getskilllv("DC_UGLYDANCE") == 5 || rand(100) >= 80) {
 				mes "- You get closer to Song's ear. -";
 				next;
-				mes "[" + strcharinfo(0) + "]";
+				mes "[" + strcharinfo(PC_NAME) + "]";
 				mes "Okay-";
 				next;
-				mes "[" + strcharinfo(0) + "]";
+				mes "[" + strcharinfo(PC_NAME) + "]";
 				mes "Oi-!!!!!";
 				specialeffect EF_STUNATTACK;
 				next;
@@ -402,22 +402,22 @@ comodo,140,86,5	script	Cheerless Maestro	4_M_MINSTREL,{
 				mes "You almost damaged my eardrum.";
 				emotion e_an;
 				next;
-				mes "[" + strcharinfo(0) + "]";
+				mes "[" + strcharinfo(PC_NAME) + "]";
 				mes "Hey, cheer up!!!";
 				next;
 				mes "[Guitar Song]";
 				mes "What are you talking about?";
 				next;
-				mes "[" + strcharinfo(0) + "]";
+				mes "[" + strcharinfo(PC_NAME) + "]";
 				mes "You should know, people are addicted to your music?";
 				mes "So many people are supporting you with anticipation.";
 				mes "Would you break your promise and let people down? Not giving people any reason?";
 				next;
 			} else {
-				mes "[" + strcharinfo(0) + "]";
+				mes "[" + strcharinfo(PC_NAME) + "]";
 				mes "Okay-";
 				next;
-				mes "[" + strcharinfo(0) + "]";
+				mes "[" + strcharinfo(PC_NAME) + "]";
 				mes "Aaaaahhh!!!!!";
 				next;
 				mes "[Guitar Song]";
@@ -436,7 +436,7 @@ comodo,140,86,5	script	Cheerless Maestro	4_M_MINSTREL,{
 				mes "- You cannot use this skill without learning it. -";
 				close;
 			}
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "Looks like I will not get answer even if I force him.";
 			close;
 		case 3:
@@ -445,43 +445,43 @@ comodo,140,86,5	script	Cheerless Maestro	4_M_MINSTREL,{
 				close;
 			}
 			emotion e_what,1;
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "Ah, ah my Guitar Song~";
 			next;
 			mes "[Guitar Song]";
 			mes "What? I've got goose bumps.";
 			next;
 			emotion e_what,1;
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "I've been watching <Nollio> for years.";
 			next;
 			mes "[Guitar Song]";
 			mes "I know that we are that popular! Ha ha ha!";
 			next;
 			emotion e_what,1;
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "I've seen other Maestro's performances but there was no one better then Guitar Song.";
 			next;
 			mes "[Guitar Song]";
 			mes "He he he! Yes, I know I am super great!";
 			next;
 			emotion e_no1,1;
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "Oh... When I hear Guitar Song's performance for the first time I has a crush on you immediately.";
 			next;
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "It felt like hearing mommy's lullaby~ It was so beautiful and moving... You are the best artist of our time.";
 			next;
 			specialeffect EF_STEAL;
 			mes "[Guitar Song]";
 			mes "Ha ha ha. I know that well, but it feels good to hear a compliment from you!";
 			next;
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "So I was looking forward to seeing your performance in Lutie this time.";
 			mes "But after I heard the performance got cancelled, I felt so sad.";
 			next;
 			emotion e_sob,1;
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "Now I can't hear Guitar Song's melody~~";
 			mes "I wanted to dance to your music like a beautiful butterfly.";
 			mes "Is there no way for my dream to be true now? Sob sob...";
@@ -490,11 +490,11 @@ comodo,140,86,5	script	Cheerless Maestro	4_M_MINSTREL,{
 			mes "Huh huh! No, that is not...";
 			next;
 			emotion e_sob,1;
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "I am really happy to meet you in person, but I hope to see your performance in the beautiful snowy town, Lutie.. Sob sob...";
 			next;
 			emotion e_sob,1;
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "Why in the world don't you show us the performance, Guitar Song?";
 			mes "Don't you like me? Sob sob..";
 			next;
@@ -502,7 +502,7 @@ comodo,140,86,5	script	Cheerless Maestro	4_M_MINSTREL,{
 			mes "[Guitar Song]";
 			mes "No, it's not that kind of reason!";
 			next;
-			mes "[" + strcharinfo(0) + "]";
+			mes "[" + strcharinfo(PC_NAME) + "]";
 			mes "Then please tell me, I really love your music... but now I feel so blue...";
 			emotion e_what;
 			next;
@@ -522,7 +522,7 @@ comodo,140,86,5	script	Cheerless Maestro	4_M_MINSTREL,{
 		mes "[Guitar Song]";
 		mes "Pshaw.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Why did she get mad so suddenly?";
 		next;
 		emotion e_swt;
@@ -531,7 +531,7 @@ comodo,140,86,5	script	Cheerless Maestro	4_M_MINSTREL,{
 		mes "That's what she's like.";
 		mes "She suddenly disappeared and sent me a letter telling me that the team would be disbanded.";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Where is Dancer Kim now?";
 		next;
 		mes "[Guitar Song]";
@@ -645,7 +645,7 @@ hu_in01,305,251,5	script	Vacant Looking Lady#wnd	4_F_CAPEGIRL,{
 		mes "[Vacant Looking Lady]";
 		mes "Are you also ignoring my wounded self-respect as a woman?";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "No! He is really a caring man!";
 		mes "But I don't think you disbanded your precious team just because of that.";
 		next;
@@ -714,7 +714,7 @@ hu_in01,305,251,5	script	Vacant Looking Lady#wnd	4_F_CAPEGIRL,{
 		mes "But in this situation...";
 		mes "Do I really have a way to change it?";
 		next;
-		mes "[" + strcharinfo(0) + "]";
+		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "Exercise is the best way!";
 		mes "If you work hard, your bossy will be lighter than before!";
 		next;
@@ -999,8 +999,8 @@ xmas,147,135,5	script	Dancer Kim#xmas	4_F_WANDERER,{
 		mes "Introducing!";
 		next;
 		mes "[Dancer Kim]";
-		mapannounce "xmas","Dancer Kim: Introducing the rising Wanderer! " + strcharinfo(0) + "!",bc_map,"0xffff00"; //FW_NORMAL 12 0 0
-		mes "This rising Wanderer star, " + strcharinfo(0) + "!";
+		mapannounce "xmas","Dancer Kim: Introducing the rising Wanderer! " + strcharinfo(PC_NAME) + "!",bc_map,"0xffff00"; //FW_NORMAL 12 0 0
+		mes "This rising Wanderer star, " + strcharinfo(PC_NAME) + "!";
 		jobchange roclass(eaclass()|EAJL_THIRD);
 		job_wan = 10;
 		getitem Green_Apple_Ring,1;
@@ -1017,7 +1017,7 @@ xmas,147,135,5	script	Dancer Kim#xmas	4_F_WANDERER,{
 		mes "The goddess must be jealous to see your beauty.";
 		next;
 		mes "[Dancer Kim]";
-		mes "" + strcharinfo(0) + "! I hope to see your beautiful exploits in the future.";
+		mes "" + strcharinfo(PC_NAME) + "! I hope to see your beautiful exploits in the future.";
 		mes "Also, I hope you to meet your precious Maestro.";
 		mes "Let's perform together later, shall we? Ha ha.";
 		next;
diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt
index 0d8f3a7e2..f7539087f 100644
--- a/npc/re/jobs/novice/academy.txt
+++ b/npc/re/jobs/novice/academy.txt
@@ -165,8 +165,8 @@ iz_int,91,81,3	script	Lumin#iz_int	4_M_NOV_RUMIN,{
 		mes ".....";
 		next;
 		select("Should I introduce myself?", "My name is ~!");
-		mes "["+strcharinfo(0)+"]";
-		mes "I am "+strcharinfo(0)+"!";
+		mes "["+strcharinfo(PC_NAME)+"]";
+		mes "I am "+strcharinfo(PC_NAME)+"!";
 		next;
 		mes "[Lu]";
 		mes ".....";
@@ -203,7 +203,7 @@ izlude,198,213,3	script	Captain Carocc#iz	4_M_REINDEER,5,5,{
 		if (questprogress(4269) == 2) {
 			if (questprogress(7471) == 2 || questprogress(7472) > 0) {
 				mes "[Carocc]";
-				mes "Oh, "+strcharinfo(0)+"!";
+				mes "Oh, "+strcharinfo(PC_NAME)+"!";
 				mes "Why are you here at the wharf?";
 				mes "I guess you are doing well at the academy.";
 				next;
@@ -367,7 +367,7 @@ izlude,198,213,3	script	Captain Carocc#iz	4_M_REINDEER,5,5,{
 					close;
 				} else {
 					mes "[Carocc]";
-					mes "Oh, " + strcharinfo(0) + "!";
+					mes "Oh, " + strcharinfo(PC_NAME) + "!";
 					mes "Still being dilligent?";
 					mes "I've been busy, also.";
 					mes "I was reparing the ship.";
@@ -1211,7 +1211,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 				mes "I am OK with 6 to 4.";
 				cutin "nov_lumin02.bmp", 2;
 				next;
-				mes "[" + strcharinfo(0) + "]";
+				mes "[" + strcharinfo(PC_NAME) + "]";
 				mes "This guy...";
 				next;
 			}
@@ -1219,7 +1219,7 @@ izlude,120,207,4	script	Information Staff#0	8W_SOLDIER,{
 			mes "[Information Staff]";
 			mes "Ahhh, you two calm down.";
 			mes "Lumin took them all.";
-			mes ""+ strcharinfo(0) + " I will give you one set separately.";
+			mes ""+ strcharinfo(PC_NAME) + " I will give you one set separately.";
 			next;
 			mes "[Information Staff]";
 			mes "Think of the reason, it was my fault to leave one person's but sent both of you.";
@@ -1517,7 +1517,7 @@ izlude,179,75,3	script	Airship#iz	4_BULLETIN_BOARD2,3,3,{
 					cutin "nov_lumin02.bmp", 2;
 					next;
 					cutin "", 255;
-					mes "[" + strcharinfo(0) + "]";
+					mes "[" + strcharinfo(PC_NAME) + "]";
 					mes "Are you even listening to me?!";
 					setquest 7475;
 					viewpoint 2,179,75,1,0xFF0000;
@@ -1660,7 +1660,7 @@ izlude,207,167,3	script	Arena#iz	4_BULLETIN_BOARD2,3,3,{
 					cutin "nov_lumin02.bmp", 2;
 					next;
 					cutin "", 255;
-					mes "[" + strcharinfo(0) + "]";
+					mes "[" + strcharinfo(PC_NAME) + "]";
 					mes "Are you even listening to me?!";
 					setquest 7476;
 					viewpoint 2,207,167,3,0xFF0000;
@@ -1811,7 +1811,7 @@ izlude,45,94,3	script	Bulletin Board#iz	4_BULLETIN_BOARD2,3,3,{
 					cutin "nov_lumin02.bmp", 2;
 					next;
 					cutin "", 255;
-					mes "[" + strcharinfo(0) + "]";
+					mes "[" + strcharinfo(PC_NAME) + "]";
 					mes "Are you even listening to me?!";
 					setquest 7477;
 					viewpoint 2,45,94,2,0xFF0000;
@@ -2427,7 +2427,7 @@ iz_ac01,100,39,5	script	Academy Receptionist#1	4_F_01,{
 
 	if (questprogress(4269) == 2) {
 		mes "[Receptionist]";
-		mes "Hello, " + strcharinfo(0) +".";
+		mes "Hello, " + strcharinfo(PC_NAME) +".";
 		mes "How are you today?";
 		mes "I am in charge guiding you here in the Academy.";
 	} else {
@@ -2451,7 +2451,7 @@ iz_ac01,100,39,5	script	Academy Receptionist#1	4_F_01,{
 					close;
 				}
 				mes "[Receptionist]";
-				mes "Let me see... Your name is... " + strcharinfo(0) + ".";
+				mes "Let me see... Your name is... " + strcharinfo(PC_NAME) + ".";
 				mes "I will make a new registration for you.";
 				mes "You can choose the course freely and each course has individual features.";
 				next;
@@ -3731,8 +3731,8 @@ iz_ac01,147,50,3	script	Dacquoise#ac	4_COOK,{
 			mes "[Dacquoise]";
 			mes "What's your name stranger?";
 			next;
-			mes "["+strcharinfo(0)+"]";
-			mes ""+strcharinfo(0)+", hello.";
+			mes "["+strcharinfo(PC_NAME)+"]";
+			mes ""+strcharinfo(PC_NAME)+", hello.";
 			next;
 			emotion e_no1;
 			mes "[Dacquoise]";
@@ -4040,7 +4040,7 @@ iz_ac01,147,50,3	script	Dacquoise#ac	4_COOK,{
 				mes "So what do you want to cook?";
 				next;
 				mes "[Mille Feuille]";
-				mes "Oh? That kid is back again. "+strcharinfo(0)+" right? So what do you want?";
+				mes "Oh? That kid is back again. "+strcharinfo(PC_NAME)+" right? So what do you want?";
 				next;
 			} else {
 				mes "[Dacquoise]";
@@ -5041,14 +5041,14 @@ new_1-3,99,169,3	script	Friendly Poring#ac	4_PORING,{
 			mes "Steady on now guv'na...";
 			mes "What did you do to Unskilled Poring!?!? Novice!!!!!!";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "I used the unripe apples that you gave me, then they turned into eggs.";
 			next;
 			emotion e_sob, 0, "Friendly Poring#ac";
 			mes "[Poring]";
 			mes "Oh, guess I didn't expect they'd be turned into pets so easily!";
 			next;
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Yeah, don't worry, I'll make sure to";
 			mes "give them a good home.";
 			completequest 2296;
@@ -5297,7 +5297,7 @@ iz_ac01,95,46,5	script	Kafra Guide Trainer#ac	4_F_KAFRA1,{
 					mes "Please check your accumulated customer points~!";
 				} else {
 					mes "[Kafra Guide Trainer]";
-					mes ""+strcharinfo(0)+", your accummulated points are "+RESRVPTS+" points.";
+					mes ""+strcharinfo(PC_NAME)+", your accummulated points are "+RESRVPTS+" points.";
 					next;
 					mes "[Kafra Guide Trainer]";
 					mes "You can exchange your";
@@ -7917,11 +7917,11 @@ iz_ac02,131,82,4	script	Lusa's Desk#ac	CLEAR_NPC,{
 					next;
 				}
 			} else if (.@gun_quest_01 == 1) {
-				mes "["+strcharinfo(0)+"]";
+				mes "["+strcharinfo(PC_NAME)+"]";
 				mes "I am already doing this task currently. Lusa said if I ever wanted to abondon the assignment that I should talk to her.";
 				next;
 			} else if (.@gun_quest_01 == 2) {
-				mes "["+strcharinfo(0)+"]";
+				mes "["+strcharinfo(PC_NAME)+"]";
 				mes "I have already completed this assignment. I should talk to Lusa for my reward.";
 				next;
 			}
@@ -7938,11 +7938,11 @@ iz_ac02,131,82,4	script	Lusa's Desk#ac	CLEAR_NPC,{
 					next;
 				}
 			} else if (.@gun_quest_02 == 1) {
-				mes "["+strcharinfo(0)+"]";
+				mes "["+strcharinfo(PC_NAME)+"]";
 				mes "I am already doing this task currently. Lusa said if I ever wanted to abondon the assignment that I should talk to her.";
 				next;
 			} else if (.@gun_quest_02 == 2) {
-				mes "["+strcharinfo(0)+"]";
+				mes "["+strcharinfo(PC_NAME)+"]";
 				mes "I have already completed this assignment. I should talk to Lusa for my reward.";
 				next;
 			}
@@ -7959,11 +7959,11 @@ iz_ac02,131,82,4	script	Lusa's Desk#ac	CLEAR_NPC,{
 					next;
 				}
 			} else if (.@gun_quest_03 == 1) {
-				mes "["+strcharinfo(0)+"]";
+				mes "["+strcharinfo(PC_NAME)+"]";
 				mes "I am already doing this task currently. Lusa said if I ever wanted to abondon the assignment that I should talk to her.";
 				next;
 			} else if (.@gun_quest_03 == 2) {
-				mes "["+strcharinfo(0)+"]";
+				mes "["+strcharinfo(PC_NAME)+"]";
 				mes "I have already completed this assignment. I should talk to Lusa for my reward.";
 				next;
 			}
@@ -7980,11 +7980,11 @@ iz_ac02,131,82,4	script	Lusa's Desk#ac	CLEAR_NPC,{
 					next;
 				}
 			} else if (.@gun_quest_04 == 1) {
-				mes "["+strcharinfo(0)+"]";
+				mes "["+strcharinfo(PC_NAME)+"]";
 				mes "I am already doing this task currently. Lusa said if I ever wanted to abondon the assignment that I should talk to her.";
 				next;
 			} else if (.@gun_quest_04 == 2) {
-				mes "["+strcharinfo(0)+"]";
+				mes "["+strcharinfo(PC_NAME)+"]";
 				mes "I have already completed this assignment. I should talk to Lusa for my reward.";
 				next;
 			}
@@ -9528,7 +9528,7 @@ iz_ac02,50,169,3	script	Salim Hamid#ac	1_M_MERCHANT,{
 	} else {
 		cutin "aca_salim02",2;
 		mes "[Salim Hamid]";
-		mes "Hahaha. "+strcharinfo(0)+" you have completed the Merchant theory course at the Criatura Academy.";
+		mes "Hahaha. "+strcharinfo(PC_NAME)+" you have completed the Merchant theory course at the Criatura Academy.";
 		next;
 		mes "[Salim Hamid]";
 		mes "When you want to test the other battle skills in the Merchant's Manual,";
@@ -9538,7 +9538,7 @@ iz_ac02,50,169,3	script	Salim Hamid#ac	1_M_MERCHANT,{
 		mes "You can fully experience the battle related practice through him.";
 		next;
 		mes "[Salim Hamid]";
-		mes "The guide for the next course "+strcharinfo(0)+" will be serviced when you reach job level 10. Good luck.";
+		mes "The guide for the next course "+strcharinfo(PC_NAME)+" will be serviced when you reach job level 10. Good luck.";
 		close2;
 		cutin "", 255;
 		end;
@@ -9603,14 +9603,14 @@ iz_ac02,50,169,3	script	Salim Hamid#ac	1_M_MERCHANT,{
 		cutin "aca_salim01.bmp", 2;
 		mes "[Salim Hamid]";
 		mes "Ummm~ Your name is...";
-		mes "^0000ff"+ strcharinfo(0) +"^000000...... right?";
+		mes "^0000ff"+ strcharinfo(PC_NAME) +"^000000...... right?";
 		next;
 		mes "[Salim Hamid]";
 		mes "First to observe the Merchant course, you need to have the Merchant mindset. A trader with less than 100 zeny could not be called a Merchant.";
 		next;
 		cutin "aca_salim02.bmp", 2;
 		mes "[Salim Hamid]";
-		mes ""+ strcharinfo(0) +"^000000 come back to me with 100 Zeny in hand before the next class.";
+		mes ""+ strcharinfo(PC_NAME) +"^000000 come back to me with 100 Zeny in hand before the next class.";
 		next;
 		mes "[Salim Hamid]";
 		mes "Of course, that money won't be taken. It is only A test to see your basic mindset to being a Merchant. Good luck.";
@@ -9683,14 +9683,14 @@ iz_ac02,50,169,3	script	Salim Hamid#ac	1_M_MERCHANT,{
 		next;
 		cutin "aca_salim02",2;
 		mes "[Salim Hamid]";
-		mes "By any chance, "+strcharinfo(0)+" do you have mind to learn more about Merchants here?";
+		mes "By any chance, "+strcharinfo(PC_NAME)+" do you have mind to learn more about Merchants here?";
 		next;
 		if(select("I will look around at more jobs.", "Let me do it a little more.") == 1) {
 			mes "[Salim Hamid]";
 			mes "Yes, your open mind is good for you. As this academy has many other lecturers besides Merchants.";
 			next;
 			mes "[Salim Hamid]";
-			mes "Whenever you feel like learning again, come back to me "+strcharinfo(0)+".";
+			mes "Whenever you feel like learning again, come back to me "+strcharinfo(PC_NAME)+".";
 			close2;
 			cutin "", 255;
 			end;
@@ -9726,7 +9726,7 @@ iz_ac02,50,169,3	script	Salim Hamid#ac	1_M_MERCHANT,{
 				next;
 				if(select("I already know all of them.", "Please make another explanation.") == 1) {
 					mes "[Salim Hamid]";
-					mes "Yes, you are "+strcharinfo(0)+" I am pleased to meet a quick-to-learn student like you. It also saves my time.";
+					mes "Yes, you are "+strcharinfo(PC_NAME)+" I am pleased to meet a quick-to-learn student like you. It also saves my time.";
 					next;
 				} else {
 					mes "[Salim Hamid]";
@@ -9788,7 +9788,7 @@ iz_ac02,50,169,3	script	Salim Hamid#ac	1_M_MERCHANT,{
 	}
 	if (questprogress(12306) < 1) {
 		mes "[Salim Hamid]";
-		mes "You came back again. "+strcharinfo(0)+" this time, shall we have a practical training by doing a simple errand?";
+		mes "You came back again. "+strcharinfo(PC_NAME)+" this time, shall we have a practical training by doing a simple errand?";
 		next;
 		mes "[Salim Hamid]";
 		mes "Can you see the noisy vending machine at the corner of this classroom? It was originally a soft drink vending machine but swallows coin very much...";
@@ -9927,7 +9927,7 @@ iz_ac02,53,171,3	script	Steward Aydin#ac	4_M_MANAGER,{
 					mes "It is simple to use Overcharge and Discount.";
 					next;
 					mes "[Steward Aydin]";
-					mes "These two skills are passive skills. If you become familiar with these, "+strcharinfo(0)+" these will automatically perform in trading with merchant NPC without your operation.";
+					mes "These two skills are passive skills. If you become familiar with these, "+strcharinfo(PC_NAME)+" these will automatically perform in trading with merchant NPC without your operation.";
 					next;
 					mes "[Steward Aydin]";
 					mes "Once you've learned Overcharge, when selling commodities to a merchant NPC, you can gain the sales money composed of the regular sales price plus additional money as per the Overcharge skill level.";
@@ -10017,7 +10017,7 @@ iz_ac02,52,136,3	script	Guest Lecturer Mayssel#0	4_F_MAYSEL,{
 			mes "He is also one of the students in this class.";
 			next;
 			mes "[Mayssel]";
-			mes "Hello " + strcharinfo(0) + "";
+			mes "Hello " + strcharinfo(PC_NAME) + "";
 			mes "I am Mayssel  the section chief of the Veins section of the Assassin Guild.";
 			mes "I came here to give you some information about the Thief class.";
 			next;
@@ -10082,7 +10082,7 @@ iz_ac02,52,136,3	script	Guest Lecturer Mayssel#0	4_F_MAYSEL,{
 			next;
 			mes "[Mayssel]";
 			mes "I see...";
-			mes "" + strcharinfo(0) + " Sorry but you can learn about the Shadow Chaser class from them.";
+			mes "" + strcharinfo(PC_NAME) + " Sorry but you can learn about the Shadow Chaser class from them.";
 			cutin "gc_mayssel03.bmp", 1;
 			next;
 			cutin "gc_mayssel01.bmp", 1;
diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt
index a20bb81f8..811593c81 100644
--- a/npc/re/jobs/novice/novice.txt
+++ b/npc/re/jobs/novice/novice.txt
@@ -2616,7 +2616,7 @@ L_Supplies:
 	mes "You will now";
 	mes "be teleported.";
 	mes "Good luck,";
-	mes "^A62A2A"+strcharinfo(0)+"^000000";
+	mes "^A62A2A"+strcharinfo(PC_NAME)+"^000000";
 	mes "and farewell.";
 	close2;
 	return;
@@ -2691,7 +2691,7 @@ new_5-4,100,29,1	duplicate(NvHanson)	Final Tester#nv5	1_ETC_01
 		case 2:
 			mes "[Lark]";
 			mes "I will ask you a few simple questions.";
-			mes "Through this test, we will check "+strcharinfo(0)+"'s personality and propensity so that we can find the most appropriate job for you.";
+			mes "Through this test, we will check "+strcharinfo(PC_NAME)+"'s personality and propensity so that we can find the most appropriate job for you.";
 			next;
 			mes "[Lark]";
 			mes "There are 3 different types of tests and a total of 30 questions.";
@@ -3312,7 +3312,7 @@ new_5-4,100,29,1	duplicate(NvHanson)	Final Tester#nv5	1_ETC_01
 		break;
 	}
 	callfunc "F_NvErase",1;
-	.@str$ = "^A62A2A'"+strcharinfo(0)+"^000000'! Take care and may Freya bless you on your journey.";
+	.@str$ = "^A62A2A'"+strcharinfo(PC_NAME)+"^000000'! Take care and may Freya bless you on your journey.";
 	switch(.@who_job) {
 	case 1:
 		mes "[Lark]";
diff --git a/npc/re/jobs/novice/supernovice_ex.txt b/npc/re/jobs/novice/supernovice_ex.txt
index 56d70a140..04c9395c1 100644
--- a/npc/re/jobs/novice/supernovice_ex.txt
+++ b/npc/re/jobs/novice/supernovice_ex.txt
@@ -160,7 +160,7 @@ beach_dun2,119,92,4	script	Fishing Novice#sp2	4_M_SIT_NOVICE,{
 		mes "Too ~ hard. Hey, little kid!";
 		mes "What's your name?";
 		next;
-		select(strcharinfo(0)+", how about you?");
+		select(strcharinfo(PC_NAME)+", how about you?");
 		mes "[Nodor]";
 		mes "My name is Nodor! Nodor.";
 		next;
@@ -288,7 +288,7 @@ beach_dun2,119,92,4	script	Fishing Novice#sp2	4_M_SIT_NOVICE,{
 		close;
 	}
 	else if (questprogress(5094) || questprogress(5095) || questprogress(5096) || questprogress(5097)) {
-		mes "["+strcharinfo(0)+"]";
+		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "Hey, Nodor!";
 		next;
 		emotion e_omg;
@@ -363,7 +363,7 @@ beach_dun2,119,92,4	script	Fishing Novice#sp2	4_M_SIT_NOVICE,{
 			next;
 		}
 		else {
-			mes "["+strcharinfo(0)+"]";
+			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Tsk*... Ok...";
 			next;
 		}
@@ -390,7 +390,7 @@ beach_dun2,119,92,4	script	Fishing Novice#sp2	4_M_SIT_NOVICE,{
 		next;
 		changequest 5098,5099;
 		mes "[Nodor]";
-		mes "Hey- Super Novice "+strcharinfo(0)+"!";
+		mes "Hey- Super Novice "+strcharinfo(PC_NAME)+"!";
 		next;
 		mes "[Nodor]";
 		mes "You can give some to my bro. He's up in the airship.";
@@ -588,7 +588,7 @@ beach_dun2,119,92,4	script	Fishing Novice#sp2	4_M_SIT_NOVICE,{
 		next;
 		specialeffect2 EF_RECOVERY;
 		mes "[Nodor]";
-		mes "Let Super Novice "+strcharinfo(0)+" be blessed with the Super Novice Guardian!";
+		mes "Let Super Novice "+strcharinfo(PC_NAME)+" be blessed with the Super Novice Guardian!";
 		EXSUPNOV_Q = 6;
 		close;
 	}
@@ -697,7 +697,7 @@ airplane,33,47,5	script	Nudor#sp2	4_F_NOVICE,{
 		next;
 		mes "[Nudor]";
 		mes "Ooooops!";
-		mes strcharinfo(0)+", hush --- !!";
+		mes strcharinfo(PC_NAME)+", hush --- !!";
 		next;
 		mes "[Nudor]";
 		mes "Don't tell Nodor about this~~";