diff --git a/NewHorizons/Builder/Body/CometTailBuilder.cs b/NewHorizons/Builder/Body/CometTailBuilder.cs
index 781c44bc..2af94def 100644
--- a/NewHorizons/Builder/Body/CometTailBuilder.cs
+++ b/NewHorizons/Builder/Body/CometTailBuilder.cs
@@ -74,7 +74,7 @@ namespace NewHorizons.Builder.Body
 
             if (string.IsNullOrEmpty(cometTailModule.primaryBody))
                 cometTailModule.primaryBody = !string.IsNullOrEmpty(config.Orbit.primaryBody) ? config.Orbit.primaryBody
-                    : (primaryBody._name == AstroObject.Name.CustomString ? primaryBody.GetCustomName() : primaryBody._name.ToString());
+                    : primaryBody.GetKey();
 
             var rootObj = new GameObject("CometRoot");
             rootObj.SetActive(false);
diff --git a/NewHorizons/Utility/NewHorizonExtensions.cs b/NewHorizons/Utility/NewHorizonExtensions.cs
index 9f4da941..216ea14a 100644
--- a/NewHorizons/Utility/NewHorizonExtensions.cs
+++ b/NewHorizons/Utility/NewHorizonExtensions.cs
@@ -445,6 +445,11 @@ namespace NewHorizons.Utility
             return globalMusicController._endTimesSource.clip.length;
         }
 
+        public static string GetKey(this AstroObject ao)
+        {
+            return ao._name == AstroObject.Name.CustomString ? ao.GetCustomName() : ao._name.ToString();
+        }
+
         public static CodeMatcher LogInstructions(this CodeMatcher matcher, string prefix)
         {
             matcher.InstructionEnumeration().LogInstructions(prefix);
diff --git a/NewHorizons/Utility/OuterWilds/AstroObjectLocator.cs b/NewHorizons/Utility/OuterWilds/AstroObjectLocator.cs
index 9e3a8a01..dd3c9564 100644
--- a/NewHorizons/Utility/OuterWilds/AstroObjectLocator.cs
+++ b/NewHorizons/Utility/OuterWilds/AstroObjectLocator.cs
@@ -65,7 +65,7 @@ namespace NewHorizons.Utility.OuterWilds
 
         public static void RegisterCustomAstroObject(AstroObject ao)
         {
-            var key = ao._name == AstroObject.Name.CustomString ? ao.GetCustomName() : ao._name.ToString();
+            var key = ao.GetKey();
 
             if (_customAstroObjectDictionary.ContainsKey(key))
             {
@@ -81,7 +81,7 @@ namespace NewHorizons.Utility.OuterWilds
 
         public static void DeregisterCustomAstroObject(AstroObject ao)
         {
-            var key = ao._name == AstroObject.Name.CustomString ? ao.GetCustomName() : ao._name.ToString();
+            var key = ao.GetKey();
             _customAstroObjectDictionary.Remove(key);
         }