diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt
index 849aca258e..756690c9dc 100644
--- a/npc/instances/EndlessTower.txt
+++ b/npc/instances/EndlessTower.txt
@@ -205,7 +205,6 @@ alberta,214,77,6	script	Captain Janssen	709,{
 e_tower,81,105,0	script	Tower Protection Stone	406,{
 
 	set .@party_id,getcharid(1);
-	set .@p_name$,getpartyname(.@party_id);
 	set .@md_name$,"Endless Tower";
 
 	set .@etower_timer,checkquest(60200,PLAYTIME); // 1 week
@@ -222,7 +221,7 @@ e_tower,81,105,0	script	Tower Protection Stone	406,{
 			switch(select("Generate dungeon "+.@md_name$+":Enter the dungeon:Return to Alberta:Cancel")) {
 			case 1:
 				if (instance_create(.@md_name$) < 0) {
-					mes "Party Name: "+.@p_name$;
+					mes "Party Name: "+ getpartyname(.@party_id);
 					mes "Party Leader: "+strcharinfo(0);
 					mes "^0000ff"+.@md_name$+" ^000000- Reservation Failed!";
 					close;
@@ -304,7 +303,7 @@ L_Enter:
 		mes "You can enter the dungeon after making the party.";
 		close;
 	case 0:
-		mapannounce "e_tower", strcharinfo(0)+" of the party, "+.@p_name$+", is entering the dungeon, Endless Tower.",bc_map,"0x00ff99",FW_NORMAL,12;
+		mapannounce "e_tower", strcharinfo(0) +" of the party, "+ getpartyname( getcharid(1) ) +", is entering the dungeon, Endless Tower.",bc_map,"0x00ff99",FW_NORMAL,12;
 		if (getarg(1)) {
 			set etower_timer,gettimetick(2);
 			setquest 60200;
diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt
index 2633263095..6965be8b1c 100644
--- a/npc/instances/OrcsMemory.txt
+++ b/npc/instances/OrcsMemory.txt
@@ -38,7 +38,6 @@
 gef_fild10,242,202,0	script	Dimensional Gorge Piece	406,{
 
 	set .@party_id,getcharid(1);
-	set .@p_name$,getpartyname(.@party_id);
 	set .@md_name$,"Orc's Memory";
 
 	if (!instance_check_party(.@party_id,2,30,80)) {
@@ -54,7 +53,7 @@ gef_fild10,242,202,0	script	Dimensional Gorge Piece	406,{
 			switch(select("Reserve the "+.@md_name$+":Enter the Dungeon:Cancel")) {
 			case 1:
 				if (instance_create(.@md_name$) < 0) {
-					mes "Party Name: "+.@p_name$;
+					mes "Party Name: "+ getpartyname(.@party_id);
 					mes "Party Leader: "+strcharinfo(0);
 					mes "^0000ff"+.@md_name$+" ^000000 - Reservation Failed.";
 					close;
@@ -97,7 +96,7 @@ L_Enter:
 		mes "Only a member of the party can enter the Memorial Dungeon.";
 		close;
 	case 0:
-		mapannounce "gef_fild10",.@p_name$+" party's member "+strcharinfo(0)+" has entered the Orc's Memory.",bc_map,"0x00ff99";
+		mapannounce "gef_fild10", getpartyname( getcharid(1) ) +" party's member "+strcharinfo(0)+" has entered the Orc's Memory.",bc_map,"0x00ff99";
 		if (checkquest(12059) == -1) setquest 12059;
 		//warp "1@orcs",179,15;
 		if (getarg(0) == 0) close;