diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.cpp
index 8f28a7f94b..ee55fff259 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToLua.cpp
@@ -869,10 +869,10 @@ namespace ScriptCanvas
 
                 const bool hasResults = eventThread->HasReturnValues();
 
-                AZStd::optional<size_t> eventIndex = ebusHandling->m_node->GetEventIndex(eventName);
+                AZStd::optional<size_t> eventIndex = ebusHandling->m_node->GetEventIndex(nameAndEventThread.first);
                 if (!eventIndex)
                 {
-                    AddError(nullptr, aznew Internal::ParseError(ebusHandling->m_node->GetEntityId(), AZStd::string::format("EBus handler did not return a valid index for event %s", eventName.c_str())));
+                    AddError(nullptr, aznew Internal::ParseError(ebusHandling->m_node->GetEntityId(), AZStd::string::format("EBus handler did not return a valid index for event %s", nameAndEventThread.first.c_str())));
                     return;
                 }
 
diff --git a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.h b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.h
index ab00593dbc..cb3c9cdccb 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.h
+++ b/Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.h
@@ -108,15 +108,9 @@ namespace ScriptCanvasTests
 
             auto m_serializeContext = s_application->GetSerializeContext();
             auto m_behaviorContext = s_application->GetBehaviorContext();
-            ScriptCanvasTesting::GlobalBusTraits::Reflect(m_serializeContext);
-            ScriptCanvasTesting::GlobalBusTraits::Reflect(m_behaviorContext);
-            ScriptCanvasTesting::LocalBusTraits::Reflect(m_serializeContext);
-            ScriptCanvasTesting::LocalBusTraits::Reflect(m_behaviorContext);
-            ScriptCanvasTesting::PerformanceStressBusTraits::Reflect(m_serializeContext);
-            ScriptCanvasTesting::PerformanceStressBusTraits::Reflect(m_behaviorContext);
-            ScriptCanvasTesting::NativeHandlingOnlyBusTraits::Reflect(m_serializeContext);
-            ScriptCanvasTesting::NativeHandlingOnlyBusTraits::Reflect(m_behaviorContext);
-            ScriptCanvasTesting::TestTupleMethods::Reflect(m_behaviorContext);
+
+            ScriptCanvasTesting::Reflect(m_serializeContext);
+            ScriptCanvasTesting::Reflect(m_behaviorContext);
 
             ::Nodes::InputMethodSharedDataSlotExampleNode::Reflect(m_serializeContext);
             ::Nodes::InputMethodSharedDataSlotExampleNode::Reflect(m_behaviorContext);
diff --git a/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.cpp b/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.cpp
index dc43bb862d..39f6479c12 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.cpp
@@ -24,6 +24,7 @@ namespace ScriptCanvasTesting
     {
         ScriptCanvasTesting::GlobalBusTraits::Reflect(context);
         ScriptCanvasTesting::LocalBusTraits::Reflect(context);
+        ScriptCanvasTesting::PerformanceStressBusTraits::Reflect(context);
         ScriptCanvasTesting::NativeHandlingOnlyBusTraits::Reflect(context);
         ScriptCanvasTesting::TestTupleMethods::Reflect(context);
 
diff --git a/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestingSystemComponent.cpp b/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestingSystemComponent.cpp
index 281ca211a3..e6bd4f53cf 100644
--- a/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestingSystemComponent.cpp
+++ b/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestingSystemComponent.cpp
@@ -43,11 +43,7 @@ namespace ScriptCanvasTesting
         NodeableTestingLibrary::Reflect(context);
 
         ScriptCanvasTestingNodes::BehaviorContextObjectTest::Reflect(context);
-        ScriptCanvasTesting::GlobalBusTraits::Reflect(context);
-        ScriptCanvasTesting::LocalBusTraits::Reflect(context);
-        ScriptCanvasTesting::PerformanceStressBusTraits::Reflect(context);
-        ScriptCanvasTesting::NativeHandlingOnlyBusTraits::Reflect(context);
-        ScriptCanvasTesting::TestTupleMethods::Reflect(context);
+        ScriptCanvasTesting::Reflect(context);
     }
 
     void ScriptCanvasTestingSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)