diff --git a/RiveRuntime.xcodeproj/xcshareddata/xcschemes/RiveRuntime.xcscheme b/RiveRuntime.xcodeproj/xcshareddata/xcschemes/RiveRuntime.xcscheme
index d49ac5bf..18fefe9f 100644
--- a/RiveRuntime.xcodeproj/xcshareddata/xcschemes/RiveRuntime.xcscheme
+++ b/RiveRuntime.xcodeproj/xcshareddata/xcschemes/RiveRuntime.xcscheme
@@ -42,6 +42,16 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C9C73ED924FC478900EF9516"
+               BuildableName = "RiveRuntimeTests.xctest"
+               BlueprintName = "RiveRuntimeTests"
+               ReferencedContainer = "container:RiveRuntime.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
diff --git a/RiveRuntime.xcodeproj/xcshareddata/xcschemes/RiveRuntimeTests.xcscheme b/RiveRuntime.xcodeproj/xcshareddata/xcschemes/RiveRuntimeTests.xcscheme
deleted file mode 100644
index 88b032ea..00000000
--- a/RiveRuntime.xcodeproj/xcshareddata/xcschemes/RiveRuntimeTests.xcscheme
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1250"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C9C73ED924FC478900EF9516"
-               BuildableName = "RiveRuntimeTests.xctest"
-               BlueprintName = "RiveRuntimeTests"
-               ReferencedContainer = "container:RiveRuntime.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/Source/Views/RiveView.swift b/Source/Views/RiveView.swift
index 4a8ada62..7f6fc366 100644
--- a/Source/Views/RiveView.swift
+++ b/Source/Views/RiveView.swift
@@ -44,7 +44,7 @@ public protocol InputsDelegate: AnyObject {
 
 /// Delegate for new input states
 public protocol StateChangeDelegate: AnyObject {
-    func stateChange(_ stateName: String)
+    func stateChange(_ stateMachineName: String, _ stateName: String)
 }
 
 /// Playback states for a Rive file
@@ -490,7 +490,7 @@ extension RiveView {
                 
                 
                 stateMachine.stateChanges().forEach{
-                    stateChangeName in stateChangeDelegate?.stateChange(stateChangeName)}
+                    stateChangeName in stateChangeDelegate?.stateChange(stateMachine.name(), stateChangeName)}
                 
                 if !stillPlaying {
                     _pause(stateMachine)
diff --git a/Tests/RiveDelegatesTest.swift b/Tests/RiveDelegatesTest.swift
index a6372f19..2c976e6c 100644
--- a/Tests/RiveDelegatesTest.swift
+++ b/Tests/RiveDelegatesTest.swift
@@ -37,7 +37,8 @@ class MrDelegate: LoopDelegate, PlayDelegate, PauseDelegate, StopDelegate, State
     var linearAnimaitonPauses = [String]()
     var linearAnimaitonStops = [String]()
     var loops = [String]()
-    var states = [String]()
+    var stateMachineNames = [String]()
+    var stateMachineStates = [String]()
     
     func loop(_ animationName: String, type: Int) {
         loops.append(animationName)
@@ -72,8 +73,9 @@ class MrDelegate: LoopDelegate, PlayDelegate, PauseDelegate, StopDelegate, State
         
     }
     
-    func stateChange(_ stateName: String) {
-        states.append(stateName)
+    func stateChange(_ stateMachineName:String, _ stateName: String) {
+        stateMachineNames.append(stateMachineName)
+        stateMachineStates.append(stateName)
     }
     
     
@@ -245,11 +247,13 @@ class DelegatesTest: XCTestCase {
     
         view.advance(delta:0.1)
         XCTAssertEqual(delegate.stateMachinePlays.count, 1)
-        XCTAssertEqual(delegate.states.count, 1)
-        XCTAssertEqual(delegate.states[0], "go right")
+        XCTAssertEqual(delegate.stateMachineStates.count, 1)
+        XCTAssertEqual(delegate.stateMachineNames[0], "State Machine 2")
+        XCTAssertEqual(delegate.stateMachineStates[0], "go right")
         view.advance(delta:1.1)
-        XCTAssertEqual(delegate.states.count, 2)
-        XCTAssertEqual(delegate.states[1], "ExitState")
+        XCTAssertEqual(delegate.stateMachineStates.count, 2)
+        XCTAssertEqual(delegate.stateMachineNames[1], "State Machine 2")
+        XCTAssertEqual(delegate.stateMachineStates[1], "ExitState")
         // takes an extra advance to trigger
         view.advance(delta:0)
         XCTAssertEqual(delegate.stateMachinePauses.count, 1)
@@ -264,7 +268,7 @@ class DelegatesTest: XCTestCase {
         )
     
         view.advance(delta:0.0)
-        XCTAssertEqual(delegate.states.count, 0)
+        XCTAssertEqual(delegate.stateMachineStates.count, 0)
         
         // lets just start, expect 1 change.
         view.fireState("State Machine 1", inputName: "right")
@@ -273,51 +277,53 @@ class DelegatesTest: XCTestCase {
         // how the 
         view.advance(delta:0.0)
         view.advance(delta:0.4)
-        XCTAssertEqual(delegate.states.count, 1)
-        XCTAssertEqual(delegate.states[0], "go right")
-        delegate.states.removeAll()
+        XCTAssertEqual(delegate.stateMachineStates.count, 1)
+        XCTAssertEqual(delegate.stateMachineStates[0], "go right")
+        XCTAssertEqual(delegate.stateMachineNames.count, 1)
+        XCTAssertEqual(delegate.stateMachineNames[0], "State Machine 1")
+        delegate.stateMachineStates.removeAll()
         
         
         // should be in same animation still. no state change
         view.advance(delta:0.4)
-        XCTAssertEqual(0, delegate.states.count)
+        XCTAssertEqual(0, delegate.stateMachineStates.count)
         XCTAssertEqual(true, view.isPlaying)
 
         // animation came to an end inside this time period, this still means no state change
         view.advance(delta:0.4)
         XCTAssertEqual(false, view.isPlaying)
-        XCTAssertEqual(0, delegate.states.count)
+        XCTAssertEqual(0, delegate.stateMachineStates.count)
 
         // animation is just kinda stuck there. no change no happening.
         view.advance(delta:0.4)
         XCTAssertEqual(false, view.isPlaying)
-        XCTAssertEqual(0, delegate.states.count)
+        XCTAssertEqual(0, delegate.stateMachineStates.count)
 
         // ok lets change thigns up again.
         view.fireState("State Machine 1", inputName: "change")
         view.advance(delta:0.0)
         view.advance(delta:0.4)
         XCTAssertEqual(true, view.isPlaying)
-        XCTAssertEqual(1, delegate.states.count)
+        XCTAssertEqual(1, delegate.stateMachineStates.count)
         
-        XCTAssertEqual("change!", delegate.states[0])
-        delegate.states.removeAll()
+        XCTAssertEqual("change!", delegate.stateMachineStates[0])
+        delegate.stateMachineStates.removeAll()
 
         // as before lets advance inside the animation -> no change
         view.advance(delta:0.4)
         XCTAssertEqual(true, view.isPlaying)
-        XCTAssertEqual(0, delegate.states.count)
+        XCTAssertEqual(0, delegate.stateMachineStates.count)
 
         // as before lets advance beyond the end of the animaiton, in this case change to exit!
         view.advance(delta:0.4)
         XCTAssertEqual(false, view.isPlaying)
-        XCTAssertEqual(1, delegate.states.count)
-        XCTAssertEqual("ExitState", delegate.states[0])
-        delegate.states.removeAll()
+        XCTAssertEqual(1, delegate.stateMachineStates.count)
+        XCTAssertEqual("ExitState", delegate.stateMachineStates[0])
+        delegate.stateMachineStates.removeAll()
 
         // chill on exit. no change.
         view.advance(delta:0.4)
         XCTAssertEqual(false, view.isPlaying)
-        XCTAssertEqual(0, delegate.states.count)
+        XCTAssertEqual(0, delegate.stateMachineStates.count)
     }
 }