diff --git a/NewHorizons/Utility/AstroObjectLocator.cs b/NewHorizons/Utility/AstroObjectLocator.cs
index 8c48e1bf..5c54394f 100644
--- a/NewHorizons/Utility/AstroObjectLocator.cs
+++ b/NewHorizons/Utility/AstroObjectLocator.cs
@@ -69,24 +69,26 @@ namespace NewHorizons.Utility
             else
             {
                 Logger.Log($"Registering [{ao.name}] as [{key}]");
-                _customAstroObjectDictionary.Add(key, ao);
+                _customAstroObjectDictionary.Add(key, ao);
+                _customAstroObjectDictionary.Add(ao.name, ao);
             }
         }
 
         public static void DeregisterCustomAstroObject(AstroObject ao)
         {
             var key = ao._name == AstroObject.Name.CustomString ? ao.GetCustomName() : ao._name.ToString();
-            _customAstroObjectDictionary.Remove(key);
+            _customAstroObjectDictionary.Remove(key);
+            _customAstroObjectDictionary.Remove(ao.name);
         }
 
         public static AstroObject[] GetAllAstroObjects()
         {
-            return _customAstroObjectDictionary.Values.ToArray();
+            return _customAstroObjectDictionary.Values.Distinct().ToArray();
         }
 
         public static GameObject[] GetMoons(AstroObject primary)
         {
-            return _customAstroObjectDictionary.Values.Where(x => x._primaryBody == primary).Select(x => x.gameObject).ToArray();
+            return _customAstroObjectDictionary.Values.Distinct().Where(x => x._primaryBody == primary).Select(x => x.gameObject).ToArray();
         }
 
         public static GameObject[] GetChildren(AstroObject primary)
diff --git a/NewHorizons/Utility/DebugUtilities/DebugPropPlacer.cs b/NewHorizons/Utility/DebugUtilities/DebugPropPlacer.cs
index b2d71191..228aa9da 100644
--- a/NewHorizons/Utility/DebugUtilities/DebugPropPlacer.cs
+++ b/NewHorizons/Utility/DebugUtilities/DebugPropPlacer.cs
@@ -144,13 +144,10 @@ namespace NewHorizons.Utility.DebugUtilities
 
         public static string GetAstroObjectName(string bodyName)
         {
-            if (bodyName.EndsWith("_Body")) bodyName = bodyName.Substring(0, bodyName.Length-"_Body".Length);
-
             var astroObject = AstroObjectLocator.GetAstroObject(bodyName);
             if (astroObject == null) return null;
 
             var astroObjectName = astroObject.name;
-            if (astroObjectName.EndsWith("_Body")) astroObjectName = astroObjectName.Substring(0, astroObjectName.Length-"_Body".Length);
 
             return astroObjectName;
         }
@@ -202,7 +199,7 @@ namespace NewHorizons.Utility.DebugUtilities
 
             string bodyName = GetAstroObjectName(bodyGameObjectName);
             
-            Logger.Log("Adding prop to " + Main.Instance.CurrentStarSystem + "::" + bodyName);
+            Logger.Log($"Adding prop to {Main.Instance.CurrentStarSystem}::{bodyName}  (passed name: {bodyGameObjectName})");
             
 
             detailInfo = detailInfo == null ? new DetailInfo() : detailInfo;