diff --git a/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp b/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp
index 2f3fc3cb8b..809f664a10 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp
@@ -585,24 +585,21 @@ namespace AzFramework
         EBUS_EVENT_PTR(m_notificationBus, AZ::TransformNotificationBus, OnParentChanged, oldParent, parentId);
         m_parentChangedEvent.Signal(oldParent, parentId);
 
-        if (GetEntity() != nullptr)
+        if (oldParent != parentId) // Don't send removal notification while activating.
         {
-            if (oldParent != parentId) // Don't send removal notification while activating.
+            EBUS_EVENT_ID(oldParent, AZ::TransformNotificationBus, OnChildRemoved, GetEntityId());
+            auto oldParentTransform = AZ::TransformBus::FindFirstHandler(oldParent);
+            if (oldParentTransform)
             {
-                EBUS_EVENT_ID(oldParent, AZ::TransformNotificationBus, OnChildRemoved, GetEntityId());
-                auto oldParentTransform = AZ::TransformBus::FindFirstHandler(oldParent);
-                if (oldParentTransform)
-                {
-                    oldParentTransform->NotifyChildChangedEvent(AZ::ChildChangeType::Removed, GetEntityId());
-                }
+                oldParentTransform->NotifyChildChangedEvent(AZ::ChildChangeType::Removed, GetEntityId());
             }
+        }
 
-            EBUS_EVENT_ID(parentId, AZ::TransformNotificationBus, OnChildAdded, GetEntityId());
-            auto newParentTransform = AZ::TransformBus::FindFirstHandler(parentId);
-            if (newParentTransform)
-            {
-                newParentTransform->NotifyChildChangedEvent(AZ::ChildChangeType::Added, GetEntityId());
-            }
+        EBUS_EVENT_ID(parentId, AZ::TransformNotificationBus, OnChildAdded, GetEntityId());
+        auto newParentTransform = AZ::TransformBus::FindFirstHandler(parentId);
+        if (newParentTransform)
+        {
+            newParentTransform->NotifyChildChangedEvent(AZ::ChildChangeType::Added, GetEntityId());
         }
     }
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorInfoRemover.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorInfoRemover.cpp
index 3f6d698bbe..9488b68ee8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorInfoRemover.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/EditorInfoRemover.cpp
@@ -37,13 +37,13 @@ namespace AzToolsFramework::Prefab::PrefabConversionUtils
         }
 
         prefabProcessorContext.ListPrefabs(
-            [this, &serializeContext, &prefabProcessorContext]([[maybe_unused]] AZStd::string_view prefabName, PrefabDocument& prefab)
+            [this, &serializeContext, &prefabProcessorContext](PrefabDocument& prefab)
             {
                 auto result = RemoveEditorInfo(prefab, serializeContext, prefabProcessorContext);
                 if (!result)
                 {
                     AZ_Error(
-                        "Prefab", false, "Converting to runtime Prefab '%.*s' failed, Error: %s .", AZ_STRING_ARG(prefabName),
+                        "Prefab", false, "Converting to runtime Prefab '%s' failed, Error: %s .", prefab.GetName().c_str(),
                         result.GetError().c_str());
                     return;
                 } 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabCatchmentProcessor.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabCatchmentProcessor.cpp
index 4658eea49f..40cd52cac8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabCatchmentProcessor.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabCatchmentProcessor.cpp
@@ -25,9 +25,9 @@ namespace AzToolsFramework::Prefab::PrefabConversionUtils
     {
         AZ::DataStream::StreamType serializationFormat = m_serializationFormat == SerializationFormats::Binary ?
             AZ::DataStream::StreamType::ST_BINARY : AZ::DataStream::StreamType::ST_XML;
-        context.ListPrefabs([&context, serializationFormat](AZStd::string_view prefabName, PrefabDocument& prefab)
+        context.ListPrefabs([&context, serializationFormat](PrefabDocument& prefab)
             {
-                ProcessPrefab(context, prefabName, prefab, serializationFormat);
+                ProcessPrefab(context, prefab, serializationFormat);
             });
     }
 
@@ -45,12 +45,12 @@ namespace AzToolsFramework::Prefab::PrefabConversionUtils
         }
     }
 
-    void PrefabCatchmentProcessor::ProcessPrefab(PrefabProcessorContext& context, AZStd::string_view prefabName, PrefabDocument& prefab,
+    void PrefabCatchmentProcessor::ProcessPrefab(PrefabProcessorContext& context, PrefabDocument& prefab,
         AZ::DataStream::StreamType serializationFormat)
     {
         using namespace AzToolsFramework::Prefab::SpawnableUtils;
 
-        AZStd::string uniqueName = prefabName;
+        AZStd::string uniqueName = prefab.GetName();
         uniqueName += AzFramework::Spawnable::DotFileExtension;
 
         auto serializer = [serializationFormat](AZStd::vector<uint8_t>& output, const ProcessedObjectStore& object) -> bool
@@ -67,7 +67,7 @@ namespace AzToolsFramework::Prefab::PrefabConversionUtils
         Instance& instance = prefab.GetInstance();
         // Resolve entity aliases that store PrefabDOM information to use the spawnable instead. This is done before the entities are
         // moved from the instance as they'd otherwise can't be found.
-        context.ResolveSpawnableEntityAliases(prefabName, *spawnable, instance);
+        context.ResolveSpawnableEntityAliases(prefab.GetName(), *spawnable, instance);
 
         AzFramework::Spawnable::EntityList& entities = spawnable->GetEntities();
         instance.DetachAllEntitiesInHierarchy(
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabCatchmentProcessor.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabCatchmentProcessor.h
index a3556d73b7..39a94c86b8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabCatchmentProcessor.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabCatchmentProcessor.h
@@ -40,8 +40,7 @@ namespace AzToolsFramework::Prefab::PrefabConversionUtils
         static void Reflect(AZ::ReflectContext* context);
 
     protected:
-        static void ProcessPrefab(PrefabProcessorContext& context, AZStd::string_view prefabName, PrefabDocument& prefab,
-            AZ::DataStream::StreamType serializationFormat);
+        static void ProcessPrefab(PrefabProcessorContext& context, PrefabDocument& prefab, AZ::DataStream::StreamType serializationFormat);
 
         SerializationFormats m_serializationFormat{ SerializationFormats::Binary };
     };
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabProcessorContext.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabProcessorContext.cpp
index 0fd428fa3b..2e8da9f9a1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabProcessorContext.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabProcessorContext.cpp
@@ -45,12 +45,12 @@ namespace AzToolsFramework::Prefab::PrefabConversionUtils
         return false;
     }
 
-    void PrefabProcessorContext::ListPrefabs(const AZStd::function<void(AZStd::string_view, PrefabDocument&)>& callback)
+    void PrefabProcessorContext::ListPrefabs(const AZStd::function<void(PrefabDocument&)>& callback)
     {
         m_isIterating = true;
         for (PrefabDocument& document : m_prefabs)
         {
-            callback(document.GetName(), document);
+            callback(document);
         }
 
         m_isIterating = false;
@@ -60,11 +60,11 @@ namespace AzToolsFramework::Prefab::PrefabConversionUtils
         m_pendingPrefabAdditions.clear();
     }
 
-    void PrefabProcessorContext::ListPrefabs(const AZStd::function<void(AZStd::string_view, const PrefabDocument&)>& callback) const
+    void PrefabProcessorContext::ListPrefabs(const AZStd::function<void(const PrefabDocument&)>& callback) const
     {
         for (const PrefabDocument& document : m_prefabs)
         {
-            callback(document.GetName(), document);
+            callback(document);
         }
     }
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabProcessorContext.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabProcessorContext.h
index 8dde89b9e1..d07761271b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabProcessorContext.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/PrefabProcessorContext.h
@@ -46,8 +46,8 @@ namespace AzToolsFramework::Prefab::PrefabConversionUtils
         virtual ~PrefabProcessorContext() = default;
 
         virtual bool AddPrefab(PrefabDocument&& document);
-        virtual void ListPrefabs(const AZStd::function<void(AZStd::string_view, PrefabDocument&)>& callback);
-        virtual void ListPrefabs(const AZStd::function<void(AZStd::string_view, const PrefabDocument&)>& callback) const;
+        virtual void ListPrefabs(const AZStd::function<void(PrefabDocument&)>& callback);
+        virtual void ListPrefabs(const AZStd::function<void(const PrefabDocument&)>& callback) const;
         virtual bool HasPrefabs() const;
 
         virtual bool RegisterSpawnableProductAssetDependency(