diff --git a/npc/re/guild3/agit_main_te.txt b/npc/re/guild3/agit_main_te.txt
index 74d5f2f486..c48947cd71 100644
--- a/npc/re/guild3/agit_main_te.txt
+++ b/npc/re/guild3/agit_main_te.txt
@@ -70,13 +70,13 @@ OnAgitInit3:
 			monster .@map$,.@emproom[0],.@emproom[1],"Guardian Knight of Emperium",1219,2,.@npc_name$ +"::OnMyMobDead";
 			monster .@map$,.@emproom[0],.@emproom[1],"Raydric Archer",1276,5,.@npc_name$ +"::OnMyMobDead";
 		}
-		disablenpc "Kafra Employee#"+ .@map$;
+		disablenpc "Kafra Employee#"+ replacestr(.@map$, "cas", "");
 	}
 	else {
 		requestguildinfo .@guild_id;
 		donpcevent "::OnFlagTE" + strnpcinfo(2);// Guild emblem on flags.
 		if (getcastledata(.@map$,9)  == 0)
-			disablenpc "Kafra Employee#"+ .@map$;
+			disablenpc "Kafra Employee#"+ replacestr(.@map$, "cas", "");
 
 		// Load purchased Guardian in castles.
 		if (.@map$ == "te_aldecas1") donpcevent "Clode::OnSpawnGuardians";
@@ -169,8 +169,9 @@ OnAgitBreak:
 OnGuildBreak:
 	.@map$ = strnpcinfo(4);
 	if (.@map$ == "") end;
-	killmonster .@map$, "Kafra Employee#"+ strnpcinfo(4) +"::OnGuardianDied";
-	disablenpc "Kafra Employee#"+ .@map$;
+	.@tmp$ = replacestr(.@map$, "cas", "");
+	killmonster .@map$, "Kafra Employee#"+ .@tmp$ +"::OnGuardianDied";
+	disablenpc "Kafra Employee#"+ .@tmp$;
 	setcastledata .@map$,1,0;
 	sleep 7000;
 	announce "Guild Base [" + getcastlename(.@map$) + "] has been abandoned.",bc_all;
@@ -291,7 +292,7 @@ OnMyMobDead:
 		}
 	}
 	else {
-		mes "I am instructed to only offer my services to the ^ff0000"+.@guildname$+"^000000 Guild. Please try another Kafra Employee around here. Sorry for the inconvenience.";
+		mes "I am instructed to only offer my services to the ^ff0000"+ .@guildname$ +"^000000 Guild. Please try another Kafra Employee around here. Sorry for the inconvenience.";
 		close2;
 	}
 	cutin "",255;
@@ -415,7 +416,7 @@ function GuardianData;
 		else {
 			Zeny = Zeny - 10000;
 			setcastledata .@map$,(.@s+10),1;
-			guardian .@map$, .@x[.@s], .@y[.@s], .@name$[.@s], .@mob_id[.@s], "Kafra Employee#"+ strnpcinfo(4) +"::OnGuardianDied", .@s;
+			guardian .@map$, .@x[.@s], .@y[.@s], .@name$[.@s], .@mob_id[.@s], "Kafra Employee#"+ replacestr(.@map$, "cas", "") +"::OnGuardianDied", .@s;
 			mes "We completed the summoning of the Guardian. Our defenses are now increased with it in place.";
 		}
 		close;
@@ -443,7 +444,7 @@ function GuardianData;
 			mes "Oh, my goodness! This is nonsense!";
 			next;
 			cutin "",255;
-			disablenpc "Kafra Employee#" + .@map$;
+			disablenpc "Kafra Employee#" + replacestr(.@map$, "cas", "");
 			setcastledata .@map$,9,0;
 			mes .@npc_name$;
 			mes "....";
@@ -468,7 +469,7 @@ function GuardianData;
 			close;
 		}
 		Zeny = Zeny - 10000;
-		enablenpc "Kafra Employee#" + .@map$;
+		enablenpc "Kafra Employee#" + replacestr(.@map$, "cas", "");
 		setcastledata .@map$,9,1;
 
 		mes "We obtained a contract with the kafra Main Office, and hired a Kafra Employee.";
@@ -685,10 +686,11 @@ function GuardianData {
 OnSpawnGuardians:
 	GuardianData( .@mob_id, .@x, .@y, .@name$ );
 	.@map$ = strnpcinfo(4);
-	killmonster .@map$, "Kafra Employee#"+ strnpcinfo(4) +"::OnGuardianDied";
+	.@tmp$ = replacestr(.@map$, "cas", "");
+	killmonster .@map$, "Kafra Employee#"+ .@tmp$ +"::OnGuardianDied";
 	for ( .@i = 0; .@i < MAX_GUARDIANS; .@i++ ) {
 		if (getcastledata( .@map$,(.@i+10) ))
-			guardian .@map$, .@x[.@i], .@y[.@i], .@name$[.@i], .@mob_id[.@i], "Kafra Employee#"+ strnpcinfo(4) +"::OnGuardianDied",.@i;
+			guardian .@map$, .@x[.@i], .@y[.@i], .@name$[.@i], .@mob_id[.@i], "Kafra Employee#"+ .@tmp$ +"::OnGuardianDied",.@i;
 	}
 }
 
diff --git a/npc/re/guild3/te_aldecas1.txt b/npc/re/guild3/te_aldecas1.txt
index 3c1f75853d..a711ea399d 100644
--- a/npc/re/guild3/te_aldecas1.txt
+++ b/npc/re/guild3/te_aldecas1.txt
@@ -45,7 +45,7 @@ te_alde_gld,51,87,8	duplicate(Glaris#18)	Glaris#21	GUILD_FLAG
 
 // Guild kafra
 //============================================================
-te_aldecas1,218,170,0	duplicate(Kafra_Staff_TE)	Kafra Employee#te_aldecas1	4_F_KAFRA1
+te_aldecas1,218,170,0	duplicate(Kafra_Staff_TE)	Kafra Employee#te_alde1	4_F_KAFRA1
 
 // Lever 1 (warp outside treasure)
 //============================================================
diff --git a/npc/re/guild3/te_aldecas2.txt b/npc/re/guild3/te_aldecas2.txt
index 456e2e4742..ecb62c09bf 100644
--- a/npc/re/guild3/te_aldecas2.txt
+++ b/npc/re/guild3/te_aldecas2.txt
@@ -40,7 +40,7 @@ te_alde_gld,99,244,4	duplicate(Defolty#15)	Defolty#16	GUILD_FLAG
 
 // Guild kafra
 //============================================================
-te_aldecas2,84,74,0	duplicate(Kafra_Staff_TE)	Kafra Employee#te_aldecas2	4_F_KAFRA1
+te_aldecas2,84,74,0	duplicate(Kafra_Staff_TE)	Kafra Employee#te_alde2	4_F_KAFRA1
 
 // Lever 1 (warp outside treasure)
 //============================================================
diff --git a/npc/re/guild3/te_aldecas3.txt b/npc/re/guild3/te_aldecas3.txt
index 728e6948bf..4d90a31eb9 100644
--- a/npc/re/guild3/te_aldecas3.txt
+++ b/npc/re/guild3/te_aldecas3.txt
@@ -43,7 +43,7 @@ te_alde_gld,138,83,0	duplicate(Sorin#18)	Sorin#19	GUILD_FLAG
 
 // Guild kafra
 //============================================================
-te_aldecas3,118,76,0	duplicate(Kafra_Staff_TE)	Kafra Employee#te_aldecas3	4_F_KAFRA1
+te_aldecas3,118,76,0	duplicate(Kafra_Staff_TE)	Kafra Employee#te_alde3	4_F_KAFRA1
 
 // Lever 1 (warp outside treasure)
 //============================================================
diff --git a/npc/re/guild3/te_aldecas4.txt b/npc/re/guild3/te_aldecas4.txt
index c3909e897d..1a192e0ddd 100644
--- a/npc/re/guild3/te_aldecas4.txt
+++ b/npc/re/guild3/te_aldecas4.txt
@@ -45,7 +45,7 @@ te_alde_gld,239,239,2	duplicate(Bennit#18)	Bennit#20	GUILD_FLAG
 
 // Guild kafra
 //============================================================
-te_aldecas4,45,88,0	duplicate(Kafra_Staff_TE)	Kafra Employee#te_aldecas4	4_F_KAFRA1
+te_aldecas4,45,88,0	duplicate(Kafra_Staff_TE)	Kafra Employee#te_alde4	4_F_KAFRA1
 
 // Lever 1 (warp outside treasure)
 //============================================================
diff --git a/npc/re/guild3/te_aldecas5.txt b/npc/re/guild3/te_aldecas5.txt
index 9ad0e0949f..b0141f68a9 100644
--- a/npc/re/guild3/te_aldecas5.txt
+++ b/npc/re/guild3/te_aldecas5.txt
@@ -44,7 +44,7 @@ te_alde_gld,265,87,6	duplicate(W#17)	W#18	GUILD_FLAG
 
 // Guild kafra
 //============================================================
-te_aldecas5,31,190,0	duplicate(Kafra_Staff_TE)	Kafra Employee#te_aldecas5	4_F_KAFRA1
+te_aldecas5,31,190,0	duplicate(Kafra_Staff_TE)	Kafra Employee#te_alde5	4_F_KAFRA1
 
 // Lever 1 (warp outside treasure)
 //============================================================
diff --git a/npc/re/guild3/te_prtcas01.txt b/npc/re/guild3/te_prtcas01.txt
index 6c076a81e2..1d470eb2bc 100644
--- a/npc/re/guild3/te_prtcas01.txt
+++ b/npc/re/guild3/te_prtcas01.txt
@@ -38,7 +38,7 @@ te_prt_gld,135,60,6	duplicate(Gaebolg#11)	Gaebolg#14	GUILD_FLAG
 
 // Guild kafra
 //============================================================
-te_prtcas01,96,173,0	duplicate(Kafra_Staff_TE)	Kafra Employee#te_prtcas01	4_F_KAFRA1
+te_prtcas01,96,173,0	duplicate(Kafra_Staff_TE)	Kafra Employee#te_prt01	4_F_KAFRA1
 
 // Lever 1 (warp outside treasure)
 //============================================================
diff --git a/npc/re/guild3/te_prtcas02.txt b/npc/re/guild3/te_prtcas02.txt
index f57b9cab11..75b1cc70c8 100644
--- a/npc/re/guild3/te_prtcas02.txt
+++ b/npc/re/guild3/te_prtcas02.txt
@@ -40,7 +40,7 @@ te_prt_gld,236,128,8	duplicate(Richard#13)	Richard#16	GUILD_FLAG
 
 // Guild kafra
 //============================================================
-te_prtcas02,71,36,4	duplicate(Kafra_Staff_TE)	Kafra Employee#te_prtcas02	4_F_KAFRA1
+te_prtcas02,71,36,4	duplicate(Kafra_Staff_TE)	Kafra Employee#te_prt02	4_F_KAFRA1
 
 // Lever 1 (warp outside treasure)
 //============================================================
diff --git a/npc/re/guild3/te_prtcas03.txt b/npc/re/guild3/te_prtcas03.txt
index 9ce8703ab9..1d162d3e09 100644
--- a/npc/re/guild3/te_prtcas03.txt
+++ b/npc/re/guild3/te_prtcas03.txt
@@ -38,7 +38,7 @@ te_prt_gld,158,136,4	duplicate(Wigner#11)	Wigner#14	GUILD_FLAG
 
 // Guild kafra
 //============================================================
-te_prtcas03,181,215,4	duplicate(Kafra_Staff_TE)	Kafra Employee#te_prtcas03	4_F_KAFRA1
+te_prtcas03,181,215,4	duplicate(Kafra_Staff_TE)	Kafra Employee#te_prt03	4_F_KAFRA1
 
 // Lever 1 (warp outside treasure)
 //============================================================
diff --git a/npc/re/guild3/te_prtcas04.txt b/npc/re/guild3/te_prtcas04.txt
index acebf06822..9e11c6ccb2 100644
--- a/npc/re/guild3/te_prtcas04.txt
+++ b/npc/re/guild3/te_prtcas04.txt
@@ -38,7 +38,7 @@ te_prt_gld,122,236,6	duplicate(Heine#11)	Heine#14	GUILD_FLAG
 
 // Guild kafra
 //============================================================
-te_prtcas04,258,247,4	duplicate(Kafra_Staff_TE)	Kafra Employee#te_prtcas04	4_F_KAFRA1
+te_prtcas04,258,247,4	duplicate(Kafra_Staff_TE)	Kafra Employee#te_prt04	4_F_KAFRA1
 
 // Lever 1 (warp outside treasure)
 //============================================================
diff --git a/npc/re/guild3/te_prtcas05.txt b/npc/re/guild3/te_prtcas05.txt
index f6df6b7394..316f2e9641 100644
--- a/npc/re/guild3/te_prtcas05.txt
+++ b/npc/re/guild3/te_prtcas05.txt
@@ -36,7 +36,7 @@ te_prt_gld,197,236,2	duplicate(Nerious#9)	Nerious#12	GUILD_FLAG
 
 // Guild kafra
 //============================================================
-te_prtcas05,52,41,4	duplicate(Kafra_Staff_TE)	Kafra Employee#te_prtcas05	4_F_KAFRA1
+te_prtcas05,52,41,4	duplicate(Kafra_Staff_TE)	Kafra Employee#te_prt05	4_F_KAFRA1
 
 // Lever 1 (warp outside treasure)
 //============================================================