diff --git a/Enderal - Forgotten Stories.esm b/Enderal - Forgotten Stories.esm
index 1acf5f98..509c6862 100644
Binary files a/Enderal - Forgotten Stories.esm and b/Enderal - Forgotten Stories.esm differ
diff --git a/Skyrim.esm b/Skyrim.esm
index a02a06aa..d93d9572 100644
Binary files a/Skyrim.esm and b/Skyrim.esm differ
diff --git a/scripts/_00E_DonkeyNameAlias.pex b/scripts/_00E_DonkeyNameAlias.pex
new file mode 100644
index 00000000..b68012be
Binary files /dev/null and b/scripts/_00E_DonkeyNameAlias.pex differ
diff --git a/scripts/_00E_HorseNameAlias.pex b/scripts/_00E_HorseNameAlias.pex
new file mode 100644
index 00000000..709283c6
Binary files /dev/null and b/scripts/_00E_HorseNameAlias.pex differ
diff --git a/scripts/_00E_NQ06_DonkeyAlias.pex b/scripts/_00E_NQ06_DonkeyAlias.pex
deleted file mode 100644
index f0709f68..00000000
Binary files a/scripts/_00E_NQ06_DonkeyAlias.pex and /dev/null differ
diff --git a/scripts/playerhorsescript.pex b/scripts/playerhorsescript.pex
index 68157071..7924c3cc 100644
Binary files a/scripts/playerhorsescript.pex and b/scripts/playerhorsescript.pex differ
diff --git a/source/scripts/_00E_DonkeyNameAlias.psc b/source/scripts/_00E_DonkeyNameAlias.psc
new file mode 100644
index 00000000..2b6c1cd7
--- /dev/null
+++ b/source/scripts/_00E_DonkeyNameAlias.psc
@@ -0,0 +1,19 @@
+Scriptname _00E_DonkeyNameAlias extends ReferenceAlias Hidden 
+
+Event OnPlayerLoadGame()
+
+	If _00E_MuleOwned.GetValue() as Int != 0
+
+ 		if NQ06_Freda.sMuleName != ""
+			_00E_NQ06Bonni.SetName(NQ06_Freda.sMuleName)
+		endif
+
+	EndIf
+
+EndEvent
+
+GlobalVariable Property _00E_MuleOwned  Auto  
+
+_00E_NQ06_Functions Property NQ06_Freda  Auto  
+
+ActorBase Property _00E_NQ06Bonni  Auto  
diff --git a/source/scripts/_00E_HorseNameAlias.psc b/source/scripts/_00E_HorseNameAlias.psc
new file mode 100644
index 00000000..d5a7ac0d
--- /dev/null
+++ b/source/scripts/_00E_HorseNameAlias.psc
@@ -0,0 +1,19 @@
+Scriptname _00E_HorseNameAlias extends ReferenceAlias Hidden 
+
+Event OnPlayerLoadGame()
+
+	If _00E_HorseOwned.GetValue() as Int != 0
+
+ 		if NQ06_Freda.sHorseName != ""
+			(PlayerHorseAlias.GetReference() as Actor).GetActorBase().SetName(NQ06_Freda.sHorseName)
+		endif
+
+	EndIf
+
+EndEvent
+
+GlobalVariable Property _00E_HorseOwned  Auto  
+
+_00E_NQ06_Functions Property NQ06_Freda  Auto 
+
+ReferenceAlias Property PlayerHorseAlias  Auto  
diff --git a/source/scripts/_00E_NQ06_DonkeyAlias.psc b/source/scripts/_00E_NQ06_DonkeyAlias.psc
deleted file mode 100644
index ea671087..00000000
--- a/source/scripts/_00E_NQ06_DonkeyAlias.psc
+++ /dev/null
@@ -1,17 +0,0 @@
-Scriptname _00E_NQ06_DonkeyAlias extends ReferenceAlias Hidden 
-
-GlobalVariable Property _00E_MuleOwned  Auto  
-
-Event OnPlayerLoadGame()
-
-	If (_00E_MuleOwned.GetValue() as Int) > 0
-
-		String sMuleName = (GetOwningQuest() as _00E_NQ06_Functions).sMuleName
-
- 		if sMuleName != ""
-			(GetReference() as Actor).GetActorBase().SetName(sMuleName)
-		endif
-
-	EndIf
-
-EndEvent
diff --git a/source/scripts/playerhorsescript.psc b/source/scripts/playerhorsescript.psc
index 66a51398..f80575bb 100644
--- a/source/scripts/playerhorsescript.psc
+++ b/source/scripts/playerhorsescript.psc
@@ -2,7 +2,7 @@ Scriptname PlayerHorseScript extends ReferenceAlias
 
 Event OnDeath(Actor akKiller)
 	MySelf = GetActorReference()
-	_00E_HorseOwned.SetValue(0)
+	_00E_HorseOwned.SetValue(0 as float)
 EndEvent
 
 Event OnUnload()
@@ -14,24 +14,10 @@ Event OnUnload()
 		; added a new horse that can be bought at the stables
 		Myself = StablesPosition.PlaceActorAtMe(LvlHorseSaddled)
 		Alias_HorseRef.ForceRefTo(MySelf)
-		Alias_HorseRef.GetRef().SetFactionOwner(StablesFaction)
+		Alias_HorseRef.GetReference().SetFactionOwner(StablesFaction)
 	EndIf
 EndEvent
 
-Event OnPlayerLoadGame()
-
-	If (_00E_HorseOwned.GetValue() as Int) > 0
-
-		String sHorseName = (GetOwningQuest() as _00E_NQ06_Functions).sHorseName
-
- 		if sHorseName != ""
-			(GetReference() as Actor).GetActorBase().SetName(sHorseName)
-		endif
-
-	EndIf
-
-EndEvent
-
 Actor Property MySelf  Auto  
 
 ObjectReference Property StablesPosition  Auto