diff --git a/Separate cell name quest.esp b/Separate cell name quest.esp
new file mode 100644
index 00000000..97a82930
Binary files /dev/null and b/Separate cell name quest.esp differ
diff --git a/scripts/_00e_playerhousing_cellnamesc.pex b/scripts/_00e_playerhousing_cellnamesc.pex
index b9749415..53ba8029 100644
Binary files a/scripts/_00e_playerhousing_cellnamesc.pex and b/scripts/_00e_playerhousing_cellnamesc.pex differ
diff --git a/source/scripts/_00e_playerhousing_cellnamesc.psc b/source/scripts/_00e_playerhousing_cellnamesc.psc
index 17cd75c2..c3ad6f5f 100644
--- a/source/scripts/_00e_playerhousing_cellnamesc.psc
+++ b/source/scripts/_00e_playerhousing_cellnamesc.psc
@@ -1,18 +1,15 @@
 Scriptname _00E_PlayerHousing_CellNameSC extends ReferenceAlias 
-{controls the name of the player house, the name of the rhalata temple and also contains a mannequin failsafe}
+{controls the names of the player houses, and the name of the rhalata temple}
+
 ;=====================================================================================
 ;              							EVENTS                  					 
 ;=====================================================================================
 
 Event OnPlayerLoadGame()
-	resetName()
-EndEvent
-
-Function resetName()
 	If sHouseNobleQuarterName != ""
 		CapitalCityPlayerHouseUpper.SetName(sHouseNobleQuarterName)
 	Else
-		if CapitalCityPlayerHouseUpper.GetActorOwner() == Player
+		if CapitalCityPlayerHouseUpper.GetActorOwner() == (GetReference() as Actor).GetActorBase()
 			CapitalCityPlayerHouseUpper.SetName(_00E_sPlayerHouseNobleQuarterName.GetName())
 		EndIf
 	EndIf
@@ -20,15 +17,15 @@ Function resetName()
 	If sHouseMarketQuarterName != ""
 		CapitalCityPlayerhouse.SetName(sHouseMarketQuarterName)
 	Else
-		If CapitalCityPlayerhouse.GetActorOwner() == Player
+		If CapitalCityPlayerhouse.GetActorOwner() == (GetReference() as Actor).GetActorBase()
 			CapitalCityPlayerhouse.SetName(_00E_sPlayerHouseMarketQuarterName.GetName())
 		EndIf
 	EndIf
 	
-	If FS_NQR03.GetStage() >= 35
+	If FS_NQR03.GetCurrentStageID() >= 35
 		FS_NQR03_RhalataTemple.SetName(_00E_sRhalataTempleName.GetName())
 	EndIf
-Endfunction
+EndEvent
 
 
 ;=====================================================================================
@@ -38,8 +35,6 @@ Endfunction
 string Property sHouseMarketQuarterName Auto
 string Property sHouseNobleQuarterName Auto
 
-ActorBase Property Player Auto
-
 Message Property _00E_sPlayerHouseMarketQuarterName Auto
 Message Property _00E_sPlayerHouseNobleQuarterName Auto
 Message Property _00E_sRhalataTempleName Auto
@@ -47,4 +42,4 @@ Message Property _00E_sRhalataTempleName Auto
 Cell Property CapitalCityPlayerHouseUpper Auto
 Cell Property CapitalCityPlayerhouse Auto
 Cell Property FS_NQR03_RhalataTemple Auto
-Quest Property FS_NQR03 Auto
\ No newline at end of file
+Quest Property FS_NQR03 Auto