diff --git a/docs/python_api/examples/renderdoc/iter_actions.rst b/docs/python_api/examples/renderdoc/iter_actions.rst
index d0affff06..8efba6bde 100644
--- a/docs/python_api/examples/renderdoc/iter_actions.rst
+++ b/docs/python_api/examples/renderdoc/iter_actions.rst
@@ -7,7 +7,7 @@ The actions returned from :py:meth:`~renderdoc.ReplayController.GetRootActions`
 
 The first way illustrated in this sample is to walk the tree using :py:attr:`~renderdoc.ActionDescription.children`, which contains the list of child actions at any point in the tree. There is also :py:attr:`~renderdoc.ActionDescription.parent` which points to the parent action.
 
-The second is to use :py:attr:`~renderdoc.ActionDescription.previous` and :py:attr:`~renderdoc.ActionDescription.next`, which point to the previous and next action respectively in a linear fashion, regardless of nesting depth.
+The second is to use :py:attr:`~renderdoc.ActionDescription.previousAction` and :py:attr:`~renderdoc.ActionDescription.nextAction`, which point to the previous and next action respectively in a linear fashion, regardless of nesting depth.
 
 In the example we use this iteration to determine the number of passes, using the action flags to denote the start of each pass by a starting clear call.
 
diff --git a/qrenderdoc/Code/QRDUtils.cpp b/qrenderdoc/Code/QRDUtils.cpp
index c3b3f5cab..70989546f 100644
--- a/qrenderdoc/Code/QRDUtils.cpp
+++ b/qrenderdoc/Code/QRDUtils.cpp
@@ -2026,7 +2026,7 @@ void CombineUsageEvents(ICaptureContext &ctx, const rdcarray<EventUsage> &usage,
 
     // if the usage is different from the last, add a new entry,
     // or if the previous action link is broken.
-    if(u.usage != us || action == NULL || action->previous == 0 ||
+    if(u.usage != us || action == NULL || action->previousAction == 0 ||
        (splitByMarker && (parentEID != newParentEID)))
     {
       distinct = true;
@@ -2037,7 +2037,7 @@ void CombineUsageEvents(ICaptureContext &ctx, const rdcarray<EventUsage> &usage,
       // last event was where we were - otherwise it's a new
       // distinct set of actions and should have a separate
       // entry in the context menu
-      const ActionDescription *prev = action->previous;
+      const ActionDescription *prev = action->previousAction;
 
       while(prev != NULL && prev->eventId > end)
       {
@@ -2054,7 +2054,7 @@ void CombineUsageEvents(ICaptureContext &ctx, const rdcarray<EventUsage> &usage,
         if(!(prev->flags & (ActionFlags::Dispatch | ActionFlags::MeshDispatch |
                             ActionFlags::Drawcall | ActionFlags::CmdList)))
         {
-          prev = prev->previous;
+          prev = prev->previousAction;
         }
         else
         {
diff --git a/qrenderdoc/Windows/EventBrowser.cpp b/qrenderdoc/Windows/EventBrowser.cpp
index 7b90c3959..af36922b3 100644
--- a/qrenderdoc/Windows/EventBrowser.cpp
+++ b/qrenderdoc/Windows/EventBrowser.cpp
@@ -4179,8 +4179,8 @@ void EventBrowser::events_currentChanged(const QModelIndex &current, const QMode
   if(action && action->IsFakeMarker())
     action = &action->children.back();
 
-  ui->stepPrev->setEnabled(action && action->previous);
-  ui->stepNext->setEnabled(action && action->next);
+  ui->stepPrev->setEnabled(action && action->previousAction);
+  ui->stepNext->setEnabled(action && action->nextAction);
 
   // special case for the first action in the frame
   if(selectedEID == 0)
@@ -5345,7 +5345,7 @@ void EventBrowser::on_stepNext_clicked()
   const ActionDescription *action = m_Ctx.CurAction();
 
   if(action)
-    action = action->next;
+    action = action->nextAction;
 
   // special case for the first 'virtual' action at EID 0
   if(m_Ctx.CurEvent() == 0)
@@ -5359,7 +5359,7 @@ void EventBrowser::on_stepNext_clicked()
 
     // if it failed, possibly the next action is filtered out. Step along the list until we find one
     // which isn't
-    action = action->next;
+    action = action->nextAction;
   }
 }
 
@@ -5371,7 +5371,7 @@ void EventBrowser::on_stepPrev_clicked()
   const ActionDescription *action = m_Ctx.CurAction();
 
   if(action)
-    action = action->previous;
+    action = action->previousAction;
 
   while(action)
   {
@@ -5381,7 +5381,7 @@ void EventBrowser::on_stepPrev_clicked()
 
     // if it failed, possibly the previous action is filtered out. Step along the list until we find
     // one which isn't
-    action = action->previous;
+    action = action->previousAction;
   }
 
   // special case for the first 'virtual' action at EID 0
diff --git a/renderdoc/api/replay/data_types.h b/renderdoc/api/replay/data_types.h
index 8f314895d..da1fb7c40 100644
--- a/renderdoc/api/replay/data_types.h
+++ b/renderdoc/api/replay/data_types.h
@@ -2339,12 +2339,12 @@ frame.
 
 :type: ActionDescription
 )");
-  const ActionDescription *previous = NULL;
+  const ActionDescription *previousAction = NULL;
   DOCUMENT(R"(The next action in the frame, or ``None`` if this is the last action in the frame.
 
 :type: ActionDescription
 )");
-  const ActionDescription *next = NULL;
+  const ActionDescription *nextAction = NULL;
 
   DOCUMENT(R"(An 8-tuple of the :class:`ResourceId` ids for the color outputs, which can be used
 for very coarse bucketing of actions into similar passes by their outputs.
diff --git a/renderdoc/driver/d3d11/d3d11_replay.cpp b/renderdoc/driver/d3d11/d3d11_replay.cpp
index 2061b260c..ef9b6ffa8 100644
--- a/renderdoc/driver/d3d11/d3d11_replay.cpp
+++ b/renderdoc/driver/d3d11/d3d11_replay.cpp
@@ -1721,9 +1721,9 @@ rdcarray<uint32_t> D3D11Replay::GetPassEvents(uint32_t eventId)
   const ActionDescription *action = m_pDevice->GetAction(eventId);
 
   const ActionDescription *start = action;
-  while(start && start->previous && !(start->previous->flags & ActionFlags::Clear))
+  while(start && start->previousAction && !(start->previousAction->flags & ActionFlags::Clear))
   {
-    const ActionDescription *prev = start->previous;
+    const ActionDescription *prev = start->previousAction;
 
     if(start->outputs != prev->outputs || start->depthOut != prev->depthOut)
       break;
@@ -1739,7 +1739,7 @@ rdcarray<uint32_t> D3D11Replay::GetPassEvents(uint32_t eventId)
     if(start->flags & ActionFlags::Drawcall)
       passEvents.push_back(start->eventId);
 
-    start = start->next;
+    start = start->nextAction;
   }
 
   return passEvents;
diff --git a/renderdoc/driver/d3d12/d3d12_replay.cpp b/renderdoc/driver/d3d12/d3d12_replay.cpp
index 4e832f754..9376d7703 100644
--- a/renderdoc/driver/d3d12/d3d12_replay.cpp
+++ b/renderdoc/driver/d3d12/d3d12_replay.cpp
@@ -3353,11 +3353,11 @@ rdcarray<uint32_t> D3D12Replay::GetPassEvents(uint32_t eventId)
 
     // if we've come to the start of the log we were outside of a list
     // to start with
-    if(start->previous == NULL)
+    if(start->previousAction == NULL)
       return passEvents;
 
     // step back
-    const ActionDescription *prev = start->previous;
+    const ActionDescription *prev = start->previousAction;
 
     // if the previous is a clear, we're done
     if(prev->flags & ActionFlags::Clear)
@@ -3383,7 +3383,7 @@ rdcarray<uint32_t> D3D12Replay::GetPassEvents(uint32_t eventId)
     if(start->flags & (ActionFlags::MeshDispatch | ActionFlags::Drawcall | ActionFlags::PassBoundary))
       passEvents.push_back(start->eventId);
 
-    start = start->next;
+    start = start->nextAction;
   }
 
   return passEvents;
diff --git a/renderdoc/driver/gl/gl_replay.cpp b/renderdoc/driver/gl/gl_replay.cpp
index 649464ac8..174e3a0df 100644
--- a/renderdoc/driver/gl/gl_replay.cpp
+++ b/renderdoc/driver/gl/gl_replay.cpp
@@ -142,9 +142,9 @@ rdcarray<uint32_t> GLReplay::GetPassEvents(uint32_t eventId)
   const ActionDescription *action = m_pDriver->GetAction(eventId);
 
   const ActionDescription *start = action;
-  while(start && start->previous && !(start->previous->flags & ActionFlags::Clear))
+  while(start && start->previousAction && !(start->previousAction->flags & ActionFlags::Clear))
   {
-    const ActionDescription *prev = start->previous;
+    const ActionDescription *prev = start->previousAction;
 
     if(start->outputs != prev->outputs || start->depthOut != prev->depthOut)
       break;
@@ -160,7 +160,7 @@ rdcarray<uint32_t> GLReplay::GetPassEvents(uint32_t eventId)
     if(start->flags & ActionFlags::Drawcall)
       passEvents.push_back(start->eventId);
 
-    start = start->next;
+    start = start->nextAction;
   }
 
   return passEvents;
diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp
index e89340ab6..f31ad27cb 100644
--- a/renderdoc/driver/vulkan/vk_replay.cpp
+++ b/renderdoc/driver/vulkan/vk_replay.cpp
@@ -247,11 +247,11 @@ rdcarray<uint32_t> VulkanReplay::GetPassEvents(uint32_t eventId)
 
     // if we've come to the start of the log we were outside of a render pass
     // to start with
-    if(start->previous == NULL)
+    if(start->previousAction == NULL)
       return passEvents;
 
     // step back
-    start = start->previous;
+    start = start->previousAction;
   }
 
   // store all the action eventIDs up to the one specified at the start
@@ -267,7 +267,7 @@ rdcarray<uint32_t> VulkanReplay::GetPassEvents(uint32_t eventId)
     if(start->flags & (ActionFlags::MeshDispatch | ActionFlags::Drawcall | ActionFlags::PassBoundary))
       passEvents.push_back(start->eventId);
 
-    start = start->next;
+    start = start->nextAction;
   }
 
   return passEvents;
diff --git a/renderdoc/replay/renderdoc_serialise.inl b/renderdoc/replay/renderdoc_serialise.inl
index b781215c3..00f94f899 100644
--- a/renderdoc/replay/renderdoc_serialise.inl
+++ b/renderdoc/replay/renderdoc_serialise.inl
@@ -576,7 +576,7 @@ void DoSerialise(SerialiserType &ser, ActionDescription &el)
   SERIALISE_MEMBER(copyDestinationSubresource);
 
   if(ser.IsReading())
-    el.parent = el.previous = el.next = NULL;
+    el.parent = el.previousAction = el.nextAction = NULL;
 
   SERIALISE_MEMBER(outputs);
   SERIALISE_MEMBER(depthOut);
diff --git a/renderdoc/replay/replay_driver.cpp b/renderdoc/replay/replay_driver.cpp
index 95c160c87..252244e58 100644
--- a/renderdoc/replay/replay_driver.cpp
+++ b/renderdoc/replay/replay_driver.cpp
@@ -121,8 +121,8 @@ static ActionDescription *SetupActionPointers(rdcarray<ActionDescription *> &act
     else
     {
       if(previous)
-        previous->next = action;
-      action->previous = previous;
+        previous->nextAction = action;
+      action->previousAction = previous;
 
       {
         // we also allow non-contiguous EIDs for fake markers that have high EIDs
@@ -167,7 +167,7 @@ void SetupActionPointers(rdcarray<ActionDescription *> &actionTable,
     {
       // point the previous pointer to the last non-marker action we got. If we haven't hit one yet
       // because this is near the start, this will just be NULL.
-      action->previous = previous;
+      action->previousAction = previous;
 
       // because there can be multiple markers consecutively we want to point all of their nexts to
       // the next action we encounter. Accumulate this list, though in most cases it will only be 1
@@ -181,7 +181,7 @@ void SetupActionPointers(rdcarray<ActionDescription *> &actionTable,
 
       // all previous markers point to this one
       for(ActionDescription *m : markers)
-        m->next = action;
+        m->nextAction = action;
 
       markers.clear();
     }
diff --git a/util/test/rdtest/shared/Draw_Zoo.py b/util/test/rdtest/shared/Draw_Zoo.py
index fe1af012d..8b59bb535 100644
--- a/util/test/rdtest/shared/Draw_Zoo.py
+++ b/util/test/rdtest/shared/Draw_Zoo.py
@@ -178,7 +178,7 @@ class Draw_Zoo(rdtest.TestCase):
     def check_capture_action(self, marker: rd.ActionDescription):
         self.props: rd.APIProperties = self.controller.GetAPIProperties()
 
-        action: rd.ActionDescription = marker.next
+        action: rd.ActionDescription = marker.nextAction
 
         rdtest.log.begin_section("Non-indexed, non-instanced cases")
 
@@ -192,7 +192,7 @@ class Draw_Zoo(rdtest.TestCase):
         self.check_action(action, ref)
         self.check(action.vertexOffset == 0)
         self.check(self.pipe.GetVBuffers()[0].byteOffset == 0)
-        action = action.next
+        action = action.nextAction
 
         # Vertex offset in the action
         ref = {
@@ -204,7 +204,7 @@ class Draw_Zoo(rdtest.TestCase):
         self.check_action(action, ref)
         self.check(action.vertexOffset > 0)
         self.check(self.pipe.GetVBuffers()[0].byteOffset == 0)
-        action = action.next
+        action = action.nextAction
 
         # Vertex offset in action and in vertex binding
         ref = {
@@ -216,7 +216,7 @@ class Draw_Zoo(rdtest.TestCase):
         self.check_action(action, ref)
         self.check(action.vertexOffset > 0)
         self.check(self.pipe.GetVBuffers()[0].byteOffset > 0)
-        action = action.next
+        action = action.nextAction
 
         rdtest.log.end_section("Non-indexed, non-instanced cases")
 
@@ -235,7 +235,7 @@ class Draw_Zoo(rdtest.TestCase):
         self.check(action.vertexOffset == 0)
         self.check(self.pipe.GetVBuffers()[0].byteOffset == 0)
         self.check(self.pipe.GetIBuffer().byteOffset == 0)
-        action = action.next
+        action = action.nextAction
 
         # first index in the action
         ref = {
@@ -250,7 +250,7 @@ class Draw_Zoo(rdtest.TestCase):
         self.check(action.vertexOffset == 0)
         self.check(self.pipe.GetVBuffers()[0].byteOffset == 0)
         self.check(self.pipe.GetIBuffer().byteOffset == 0)
-        action = action.next
+        action = action.nextAction
 
         # first index and base vertex in the action
         ref = {
@@ -265,7 +265,7 @@ class Draw_Zoo(rdtest.TestCase):
         self.check(action.vertexOffset == 0)
         self.check(self.pipe.GetVBuffers()[0].byteOffset == 0)
         self.check(self.pipe.GetIBuffer().byteOffset == 0)
-        action = action.next
+        action = action.nextAction
 
         # first index and base vertex in the action, and vertex binding offset
         ref = {
@@ -280,7 +280,7 @@ class Draw_Zoo(rdtest.TestCase):
         self.check(action.vertexOffset == 0)
         self.check(self.pipe.GetVBuffers()[0].byteOffset > 0)
         self.check(self.pipe.GetIBuffer().byteOffset == 0)
-        action = action.next
+        action = action.nextAction
 
         # first index and base vertex in the action, and vertex & index binding offset
         ref = {
@@ -297,7 +297,7 @@ class Draw_Zoo(rdtest.TestCase):
         # OpenGL doesn't support offset on index buffer bindings
         if self.props.pipelineType != rd.GraphicsAPI.OpenGL:
             self.check(self.pipe.GetIBuffer().byteOffset > 0)
-        action = action.next
+        action = action.nextAction
 
         # Skip indexed strips for now
         ref = {
@@ -316,7 +316,7 @@ class Draw_Zoo(rdtest.TestCase):
         }
 
         self.check_action(action, ref)
-        action = action.next
+        action = action.nextAction
 
         ref = {
             'base': 30,
@@ -334,7 +334,7 @@ class Draw_Zoo(rdtest.TestCase):
         }
 
         self.check_action(action, ref)
-        action = action.next
+        action = action.nextAction
 
         rdtest.log.end_section("indexed, non-instanced")
 
@@ -353,7 +353,7 @@ class Draw_Zoo(rdtest.TestCase):
         self.check_action(action, ref)
         self.check(action.instanceOffset == 0)
         self.check(self.pipe.GetVBuffers()[1].byteOffset == 0)
-        action = action.next
+        action = action.nextAction
 
         # instance offset in the action
         ref = {
@@ -368,7 +368,7 @@ class Draw_Zoo(rdtest.TestCase):
         self.check_action(action, ref)
         self.check(action.instanceOffset > 0)
         self.check(self.pipe.GetVBuffers()[1].byteOffset == 0)
-        action = action.next
+        action = action.nextAction
 
         # instance offset in the action and offset on the instanced VB
         ref = {
@@ -383,7 +383,7 @@ class Draw_Zoo(rdtest.TestCase):
         self.check_action(action, ref)
         self.check(action.instanceOffset > 0)
         self.check(self.pipe.GetVBuffers()[1].byteOffset > 0)
-        action = action.next
+        action = action.nextAction
 
         rdtest.log.end_section("non-indexed, instanced")
 
@@ -402,7 +402,7 @@ class Draw_Zoo(rdtest.TestCase):
         self.check_action(action, ref)
         self.check(action.instanceOffset == 0)
         self.check(self.pipe.GetVBuffers()[1].byteOffset == 0)
-        action = action.next
+        action = action.nextAction
 
         # instance offset in the action
         ref = {
@@ -417,7 +417,7 @@ class Draw_Zoo(rdtest.TestCase):
         self.check_action(action, ref)
         self.check(action.instanceOffset > 0)
         self.check(self.pipe.GetVBuffers()[1].byteOffset == 0)
-        action = action.next
+        action = action.nextAction
 
         # instance offset in the action and offset on the instanced VB
         ref = {
@@ -432,6 +432,6 @@ class Draw_Zoo(rdtest.TestCase):
         self.check_action(action, ref)
         self.check(action.instanceOffset > 0)
         self.check(self.pipe.GetVBuffers()[1].byteOffset > 0)
-        action = action.next
+        action = action.nextAction
 
         rdtest.log.end_section("indexed, instanced")
diff --git a/util/test/rdtest/shared/Mesh_Zoo.py b/util/test/rdtest/shared/Mesh_Zoo.py
index 1fbfb3a43..dbe4a6b0b 100644
--- a/util/test/rdtest/shared/Mesh_Zoo.py
+++ b/util/test/rdtest/shared/Mesh_Zoo.py
@@ -69,7 +69,7 @@ class Mesh_Zoo():
     def check_capture(self, capture_filename: str, controller: rd.ReplayController):
         self.controller = controller
 
-        self.controller.SetFrameEvent(self.find_action("Quad").next.eventId, False)
+        self.controller.SetFrameEvent(self.find_action("Quad").nextAction.eventId, False)
 
         self.out: rd.ReplayOutput = self.controller.CreateOutput(rd.CreateHeadlessWindowingData(200, 200),
                                                             rd.ReplayOutputType.Mesh)
@@ -348,7 +348,7 @@ class Mesh_Zoo():
 
         rdtest.log.success("Both instance picking is as expected")
 
-        self.controller.SetFrameEvent(self.find_action("Points").next.eventId, False)
+        self.controller.SetFrameEvent(self.find_action("Points").nextAction.eventId, False)
 
         # Only one instance, just check we can see the points
         self.cfg.curInstance = 0
@@ -378,7 +378,7 @@ class Mesh_Zoo():
 
         rdtest.log.success("Point solid and lit rendering works as expected")
 
-        self.controller.SetFrameEvent(self.find_action("Lines").next.eventId, False)
+        self.controller.SetFrameEvent(self.find_action("Lines").nextAction.eventId, False)
 
         self.cache_output()
         self.cfg.visualisationMode = rd.Visualisation.Lit
@@ -386,7 +386,7 @@ class Mesh_Zoo():
 
         rdtest.log.success("Lines solid and lit rendering works as expected")
 
-        self.controller.SetFrameEvent(self.find_action("Stride 0").next.eventId, False)
+        self.controller.SetFrameEvent(self.find_action("Stride 0").nextAction.eventId, False)
 
         self.cfg.position = self.controller.GetPostVSData(0, 0, self.cfg.type)
         self.cfg.position.nearPlane = 1.0
@@ -401,7 +401,7 @@ class Mesh_Zoo():
         self.check_vertex(105, 65, (rd.ReplayOutput.NoResult, rd.ReplayOutput.NoResult))
         self.check_vertex(115, 135, (rd.ReplayOutput.NoResult, rd.ReplayOutput.NoResult))
 
-        self.controller.SetFrameEvent(self.find_action("Empty").next.eventId, False)
+        self.controller.SetFrameEvent(self.find_action("Empty").nextAction.eventId, False)
 
         self.cfg.position = self.controller.GetPostVSData(0, 0, self.cfg.type)
         self.cfg.position.nearPlane = 1.0
diff --git a/util/test/rdtest/shared/Overlay_Test.py b/util/test/rdtest/shared/Overlay_Test.py
index 12959cbad..778f0f636 100644
--- a/util/test/rdtest/shared/Overlay_Test.py
+++ b/util/test/rdtest/shared/Overlay_Test.py
@@ -35,9 +35,9 @@ class Overlay_Test(rdtest.TestCase):
                 marker_name += fmt
                 test_marker: rd.ActionDescription = self.find_action(marker_name, base_event)
 
-                self.controller.SetFrameEvent(test_marker.next.eventId, True)
+                self.controller.SetFrameEvent(test_marker.nextAction.eventId, True)
 
-                rdtest.log.print("Checking overlays at event {}: {}".format(test_marker.next.eventId, marker_name))
+                rdtest.log.print("Checking overlays at event {}: {}".format(test_marker.nextAction.eventId, marker_name))
 
                 pipe: rd.PipeState = self.controller.GetPipelineState()
 
@@ -423,7 +423,7 @@ class Overlay_Test(rdtest.TestCase):
 
             # Shader with discard
             test_marker: rd.ActionDescription = self.find_action("Discard " + marker_name, base_event)
-            self.controller.SetFrameEvent(test_marker.next.eventId, True)
+            self.controller.SetFrameEvent(test_marker.nextAction.eventId, True)
             pipe: rd.PipeState = self.controller.GetPipelineState()
             tex.overlay = rd.DebugOverlay.Depth
             out.SetTextureDisplay(tex)
@@ -434,7 +434,7 @@ class Overlay_Test(rdtest.TestCase):
             # Check the viewport overlay especially
             view_marker: rd.ActionDescription = self.find_action("Viewport Test " + fmt, base_event)
 
-            self.controller.SetFrameEvent(view_marker.next.eventId, True)
+            self.controller.SetFrameEvent(view_marker.nextAction.eventId, True)
 
             pipe: rd.PipeState = self.controller.GetPipelineState()
 
@@ -553,7 +553,7 @@ class Overlay_Test(rdtest.TestCase):
             # Check the sample mask test
             mask_marker: rd.ActionDescription = self.find_action("Sample Mask Test " + fmt, base_event)
 
-            self.controller.SetFrameEvent(mask_marker.next.eventId, True)
+            self.controller.SetFrameEvent(mask_marker.nextAction.eventId, True)
 
             col_tex: rd.ResourceId = pipe.GetOutputTargets()[0].resource
 
@@ -583,7 +583,7 @@ class Overlay_Test(rdtest.TestCase):
             test_marker: rd.ActionDescription = self.find_action("Normal Test " + fmt, base_event)
 
             # Now check clear-before-X by hand, for colour and for depth
-            self.controller.SetFrameEvent(test_marker.next.eventId, True)
+            self.controller.SetFrameEvent(test_marker.nextAction.eventId, True)
 
             col_tex: rd.ResourceId = pipe.GetOutputTargets()[0].resource
 
@@ -722,7 +722,7 @@ class Overlay_Test(rdtest.TestCase):
         for mip in [2, 3]:
             sub_marker: rd.ActionDescription = self.find_action("Subresources mip {}".format(mip), base_event)
 
-            self.controller.SetFrameEvent(sub_marker.next.eventId, True)
+            self.controller.SetFrameEvent(sub_marker.nextAction.eventId, True)
 
             pipe: rd.PipeState = self.controller.GetPipelineState()
 
diff --git a/util/test/rdtest/shared/Pixel_History.py b/util/test/rdtest/shared/Pixel_History.py
index 22ba33a29..5056eb6f7 100644
--- a/util/test/rdtest/shared/Pixel_History.py
+++ b/util/test/rdtest/shared/Pixel_History.py
@@ -69,7 +69,7 @@ class Pixel_History(rdtest.TestCase):
 
     def batch_test(self, base_eid: int):
         test_marker = self.find_action("Simple Test", base_eid)
-        self.controller.SetFrameEvent(test_marker.next.eventId, True)
+        self.controller.SetFrameEvent(test_marker.nextAction.eventId, True)
 
         pipe = self.controller.GetPipelineState()
 
@@ -433,7 +433,7 @@ class Pixel_History(rdtest.TestCase):
 
         rdtest.log.print("Testing stencil/scissor checks")
         test_marker = self.find_action("Stencil Mask", base_eid)
-        self.controller.SetFrameEvent(test_marker.next.eventId, True)
+        self.controller.SetFrameEvent(test_marker.nextAction.eventId, True)
 
         x, y = self.relative_xy(106, 248)
         rdtest.log.print("Testing pixel {}, {}".format(x, y))
@@ -474,7 +474,7 @@ class Pixel_History(rdtest.TestCase):
 
         rdtest.log.print("Testing depth test for per fragment reporting")
         test_marker = self.find_action("Depth Test", base_eid)
-        self.controller.SetFrameEvent(test_marker.next.eventId, True)
+        self.controller.SetFrameEvent(test_marker.nextAction.eventId, True)
 
         x, y = self.relative_xy(275, 258)
         rdtest.log.print("Testing pixel {}, {}".format(x, y))
@@ -581,7 +581,7 @@ class Pixel_History(rdtest.TestCase):
         # For pixel 60, 130 inside the light green triangle which is 300 draws of 1 instance of 1 triangle
         rdtest.log.print("Testing Lots of Drawcalls")
         test_marker = self.find_action("300 Instances", base_eid)
-        self.controller.SetFrameEvent(test_marker.next.eventId, True)
+        self.controller.SetFrameEvent(test_marker.nextAction.eventId, True)
         x, y = self.relative_xy(60, 130)
         rdtest.log.print("Testing pixel {}, {}".format(x, y))
         modifs = self.controller.PixelHistory(tex, x, y, sub, comp)
@@ -612,7 +612,7 @@ class Pixel_History(rdtest.TestCase):
 
         rdtest.log.print("Testing Sample colouring")
         test_marker = self.find_action("Sample Colouring", base_eid)
-        self.controller.SetFrameEvent(test_marker.next.eventId, True)
+        self.controller.SetFrameEvent(test_marker.nextAction.eventId, True)
         x, y = self.relative_xy(330, 200)
         rdtest.log.print("Testing pixel {}, {}".format(x, y))
         modifs = self.controller.PixelHistory(tex, x, y, sub, comp)
@@ -689,7 +689,7 @@ class Pixel_History(rdtest.TestCase):
 
         rdtest.log.print("Testing depth-equal testing")
         test_marker = self.find_action("Depth Equal Pass", base_eid)
-        self.controller.SetFrameEvent(test_marker.next.eventId, True)
+        self.controller.SetFrameEvent(test_marker.nextAction.eventId, True)
 
         x, y = self.relative_xy(200, 250)
         rdtest.log.print("Testing pixel {}, {}".format(x, y))
@@ -731,7 +731,7 @@ class Pixel_History(rdtest.TestCase):
 
         rdtest.log.print("Testing colour masking")
         test_marker = self.find_action("Colour Masked", base_eid)
-        self.controller.SetFrameEvent(test_marker.next.eventId, True)
+        self.controller.SetFrameEvent(test_marker.nextAction.eventId, True)
 
         x, y = self.relative_xy(60, 80)
         rdtest.log.print("Testing pixel {}, {}".format(x, y))
@@ -756,7 +756,7 @@ class Pixel_History(rdtest.TestCase):
 
             # don't have compute writes in secondaries and some tests like D3D MSAA won't have compute writes
             if test_marker is not None and not self.is_secondary and base_eid in self.get_hierarchy(test_marker.eventId):
-                self.controller.SetFrameEvent(test_marker.next.eventId, True)
+                self.controller.SetFrameEvent(test_marker.nextAction.eventId, True)
                 x, y = self.relative_xy(225, 85)
                 rdtest.log.print("Testing pixel {}, {}".format(x, y))
                 modifs = self.controller.PixelHistory(tex, x, y, sub, comp)
@@ -783,7 +783,7 @@ class Pixel_History(rdtest.TestCase):
 
             rdtest.log.print("Testing overflowed writes")
             test_marker = self.find_action("Overflowing", base_eid)
-            self.controller.SetFrameEvent(test_marker.next.eventId, True)
+            self.controller.SetFrameEvent(test_marker.nextAction.eventId, True)
 
             x, y = self.relative_xy(105, 50)
             rdtest.log.print("Testing pixel {}, {}".format(x, y))
@@ -830,7 +830,7 @@ class Pixel_History(rdtest.TestCase):
 
         rdtest.log.print("Testing per-fragment discards")
         test_marker = self.find_action("Per-Fragment discarding", base_eid)
-        self.controller.SetFrameEvent(test_marker.next.eventId, True)
+        self.controller.SetFrameEvent(test_marker.nextAction.eventId, True)
 
         x, y = self.relative_xy(60, 160)
         rdtest.log.print("Testing pixel {}, {}".format(x, y))
@@ -880,7 +880,7 @@ class Pixel_History(rdtest.TestCase):
             x, y = self.relative_xy(120, 110)
             rdtest.log.print("Testing D3D no-output shader {}, {}".format(x, y))
             test_marker = self.find_action("No Output Shader", base_eid)
-            self.controller.SetFrameEvent(test_marker.next.eventId, True)
+            self.controller.SetFrameEvent(test_marker.nextAction.eventId, True)
 
             modifs = self.controller.PixelHistory(tex, x, y, sub, comp)
             events = [
diff --git a/util/test/tests/D3D11/D3D11_PrimitiveID.py b/util/test/tests/D3D11/D3D11_PrimitiveID.py
index 29bf9133e..6c7f00f13 100644
--- a/util/test/tests/D3D11/D3D11_PrimitiveID.py
+++ b/util/test/tests/D3D11/D3D11_PrimitiveID.py
@@ -56,19 +56,19 @@ class D3D11_PrimitiveID(rdtest.TestCase):
         test_marker: rd.ActionDescription = self.find_action("Test")
 
         # Draw 1: No GS, PS without prim
-        action = test_marker.next
+        action = test_marker.nextAction
         success &= self.test_action(action, 100, 80, rd.ReplayController.NoPreference, [0], [0, 1, 0, 1])
 
         # Draw 2: No GS, PS with prim
-        action = action.next
+        action = action.nextAction
         success &= self.test_action(action, 300, 80, rd.ReplayController.NoPreference, [0], [0, 1, 0, 1])
 
         # Draw 3: GS, PS without prim
-        action = action.next
+        action = action.nextAction
         success &= self.test_action(action, 125, 250, rd.ReplayController.NoPreference, [0], [0, 1, 0, 1])
 
         # Draw 4: GS, PS with prim
-        action = action.next
+        action = action.nextAction
         success &= self.test_action(action, 325, 250, 2, [2], [0.5, 1, 0, 1])
         success &= self.test_action(action, 325, 250, 3, [3], [0.75, 1, 0, 1])
         # No expected output here, since it's nondeterministic which primitive gets selected
diff --git a/util/test/tests/D3D11/D3D11_Refcount_Check.py b/util/test/tests/D3D11/D3D11_Refcount_Check.py
index 365d18ed1..1beb09406 100644
--- a/util/test/tests/D3D11/D3D11_Refcount_Check.py
+++ b/util/test/tests/D3D11/D3D11_Refcount_Check.py
@@ -22,7 +22,7 @@ class D3D11_Refcount_Check(rdtest.TestCase):
 
         self.check(action is not None)
 
-        action = action.next
+        action = action.nextAction
 
         self.controller.SetFrameEvent(action.eventId, False)
 
diff --git a/util/test/tests/D3D11/D3D11_Shader_Debug_Zoo.py b/util/test/tests/D3D11/D3D11_Shader_Debug_Zoo.py
index 5b33390bd..e43dd194c 100644
--- a/util/test/tests/D3D11/D3D11_Shader_Debug_Zoo.py
+++ b/util/test/tests/D3D11/D3D11_Shader_Debug_Zoo.py
@@ -13,7 +13,7 @@ class D3D11_Shader_Debug_Zoo(rdtest.TestCase):
         for idx, action in enumerate([self.find_action("Main Test"), self.find_action("Optimised Test")]):
             name = action.customName
 
-            action = action.next
+            action = action.nextAction
 
             self.controller.SetFrameEvent(action.eventId, False)
 
@@ -54,7 +54,7 @@ class D3D11_Shader_Debug_Zoo(rdtest.TestCase):
             rdtest.log.end_section(name)
 
         rdtest.log.begin_section("Flow tests")
-        action = self.find_action("Flow Test").next
+        action = self.find_action("Flow Test").nextAction
         self.controller.SetFrameEvent(action.eventId, False)
         pipe: rd.PipeState = self.controller.GetPipelineState()
 
@@ -80,7 +80,7 @@ class D3D11_Shader_Debug_Zoo(rdtest.TestCase):
         rdtest.log.end_section("Flow tests")
 
         rdtest.log.begin_section("MSAA tests")
-        action = self.find_action("MSAA Test").next
+        action = self.find_action("MSAA Test").nextAction
         self.controller.SetFrameEvent(action.eventId, False)
         pipe: rd.PipeState = self.controller.GetPipelineState()
         for (x,y) in [(4, 4), (4, 5), (3, 4), (3, 5)]:
diff --git a/util/test/tests/D3D11/D3D11_Shader_Editing.py b/util/test/tests/D3D11/D3D11_Shader_Editing.py
index 5b44ef450..91ec73228 100644
--- a/util/test/tests/D3D11/D3D11_Shader_Editing.py
+++ b/util/test/tests/D3D11/D3D11_Shader_Editing.py
@@ -8,14 +8,14 @@ class D3D11_Shader_Editing(rdtest.TestCase):
     demos_test_name = 'D3D11_Shader_Editing'
 
     def check_capture(self):
-        eid = self.find_action("Draw 1").next.eventId
+        eid = self.find_action("Draw 1").nextAction.eventId
         self.controller.SetFrameEvent(eid, False)
 
         pipe: rd.PipeState = self.controller.GetPipelineState()
 
         psrefl1: rd.ShaderReflection = pipe.GetShaderReflection(rd.ShaderStage.Pixel)
 
-        eid = self.find_action("Draw 2").next.eventId
+        eid = self.find_action("Draw 2").nextAction.eventId
         self.controller.SetFrameEvent(eid, False)
 
         pipe: rd.PipeState = self.controller.GetPipelineState()
diff --git a/util/test/tests/D3D11/D3D11_Shader_ISA.py b/util/test/tests/D3D11/D3D11_Shader_ISA.py
index b75917699..7d6cbd11c 100644
--- a/util/test/tests/D3D11/D3D11_Shader_ISA.py
+++ b/util/test/tests/D3D11/D3D11_Shader_ISA.py
@@ -13,7 +13,7 @@ class D3D11_Shader_ISA(rdtest.TestCase):
 
         is_amd = 'AMD' in action.customName
 
-        self.controller.SetFrameEvent(action.next.eventId, False)
+        self.controller.SetFrameEvent(action.nextAction.eventId, False)
 
         pipe: rd.PipeState = self.controller.GetPipelineState()
 
diff --git a/util/test/tests/D3D11/D3D11_Shader_Linkage_Zoo.py b/util/test/tests/D3D11/D3D11_Shader_Linkage_Zoo.py
index 11a150d16..c89625021 100644
--- a/util/test/tests/D3D11/D3D11_Shader_Linkage_Zoo.py
+++ b/util/test/tests/D3D11/D3D11_Shader_Linkage_Zoo.py
@@ -11,7 +11,7 @@ class D3D11_Shader_Linkage_Zoo(rdtest.TestCase):
 
         test_marker: rd.ActionDescription = self.find_action("draw")
         while test_marker is not None:
-            action = test_marker.next
+            action = test_marker.nextAction
             event_name = test_marker.customName
             test_marker: rd.ActionDescription = self.find_action("draw", action.eventId)
 
diff --git a/util/test/tests/D3D12/D3D12_AMD_Shader_Extensions.py b/util/test/tests/D3D12/D3D12_AMD_Shader_Extensions.py
index 3187a6819..305c41e2d 100644
--- a/util/test/tests/D3D12/D3D12_AMD_Shader_Extensions.py
+++ b/util/test/tests/D3D12/D3D12_AMD_Shader_Extensions.py
@@ -11,7 +11,7 @@ class D3D12_AMD_Shader_Extensions(rdtest.TestCase):
             action = self.find_action(pass_type + " Draw")
 
             if action is not None:
-                self.controller.SetFrameEvent(action.next.eventId, False)
+                self.controller.SetFrameEvent(action.nextAction.eventId, False)
 
                 pipe = self.controller.GetPipelineState()
                 tex = pipe.GetOutputTargets()[0].resource
@@ -39,7 +39,7 @@ class D3D12_AMD_Shader_Extensions(rdtest.TestCase):
 
                 action = self.find_action(pass_type + " Dispatch")
 
-                self.controller.SetFrameEvent(action.next.eventId, False)
+                self.controller.SetFrameEvent(action.nextAction.eventId, False)
 
                 # find the cpuMax and gpuMax actions
                 cpuMax = self.find_action(pass_type + " cpuMax")
diff --git a/util/test/tests/D3D12/D3D12_Annotations.py b/util/test/tests/D3D12/D3D12_Annotations.py
index d18b5bf76..5887e14d8 100644
--- a/util/test/tests/D3D12/D3D12_Annotations.py
+++ b/util/test/tests/D3D12/D3D12_Annotations.py
@@ -38,7 +38,7 @@ class D3D12_Annotations(rdtest.Annotations):
         # Check loose event annotation attached to a barrier
         with rdtest.log.auto_section('Loose Event'):
             marker = self.find_action("Loose")
-            action = marker.next
+            action = marker.nextAction
             annots = action.events[0].annotations
             self.check_eq(annot("loose.int").type.basetype, rd.SDBasic.SignedInteger)
             self.check_eq(annot("loose.int").AsInt(), 1)
@@ -46,7 +46,7 @@ class D3D12_Annotations(rdtest.Annotations):
         # Check loose event annotation attached to vkEndCommandBuffer
         with rdtest.log.auto_section('CommandList Close Event'):
             marker = self.find_action("Loose")
-            action = marker.next
+            action = marker.nextAction
             annots = action.events[-1].annotations
             self.check_eq(annot("loose.int").type.basetype, rd.SDBasic.SignedInteger)
             self.check_eq(annot("loose.int").AsInt(), 2)
@@ -55,7 +55,7 @@ class D3D12_Annotations(rdtest.Annotations):
         # Check loose event annotation in an empty command buffer
         with rdtest.log.auto_section('Empty Command Buffer'):
             marker = self.find_action("Empty")
-            action = marker.next
+            action = marker.nextAction
             annots = action.events[0].annotations
             self.check_eq(annot("empty.int").type.basetype, rd.SDBasic.SignedInteger)
             self.check_eq(annot("empty.int").AsInt(), 1)
diff --git a/util/test/tests/D3D12/D3D12_Blend_Pixel_History.py b/util/test/tests/D3D12/D3D12_Blend_Pixel_History.py
index 35a47925a..ae4463bf0 100644
--- a/util/test/tests/D3D12/D3D12_Blend_Pixel_History.py
+++ b/util/test/tests/D3D12/D3D12_Blend_Pixel_History.py
@@ -52,11 +52,11 @@ class D3D12_Blend_Pixel_History(rdtest.TestCase):
         if tex_details.mips > 1:
             sub.mip = rt.firstMip
 
-        red_eid = self.find_action("Red: ").next.eventId
-        red_last_eid = self.find_action("End of red").next.eventId
-        green_eid = self.find_action("Green: ").next.eventId
-        blue_eid = self.find_action("Blue: ").next.eventId
-        all_eid = self.find_action("All of the above in a single drawcall").next.eventId
+        red_eid = self.find_action("Red: ").nextAction.eventId
+        red_last_eid = self.find_action("End of red").nextAction.eventId
+        green_eid = self.find_action("Green: ").nextAction.eventId
+        blue_eid = self.find_action("Blue: ").nextAction.eventId
+        all_eid = self.find_action("All of the above in a single drawcall").nextAction.eventId
 
         # Pixel inside of all of the triangles
         x, y = 200, 150
diff --git a/util/test/tests/D3D12/D3D12_Buffer_Truncation.py b/util/test/tests/D3D12/D3D12_Buffer_Truncation.py
index 51f22f985..a5bb9eefd 100644
--- a/util/test/tests/D3D12/D3D12_Buffer_Truncation.py
+++ b/util/test/tests/D3D12/D3D12_Buffer_Truncation.py
@@ -9,7 +9,7 @@ class D3D12_Buffer_Truncation(rdtest.Buffer_Truncation):
     def check_capture(self):
         rdtest.log.begin_section("SM5")
         self.draw_action = self.find_action("SM5")
-        self.draw_action = self.draw_action.next
+        self.draw_action = self.draw_action.nextAction
         super().check_capture()
         rdtest.log.end_section("SM5")
 
@@ -18,7 +18,7 @@ class D3D12_Buffer_Truncation(rdtest.Buffer_Truncation):
             rdtest.log.print("No SM6.0 action to test")
             return
         rdtest.log.begin_section("SM6.0")
-        self.draw_action = self.draw_action.next
+        self.draw_action = self.draw_action.nextAction
         super().check_capture()
         rdtest.log.end_section("SM6.0")
 
@@ -27,6 +27,6 @@ class D3D12_Buffer_Truncation(rdtest.Buffer_Truncation):
             rdtest.log.print("No SM6.6 action to test")
             return
         rdtest.log.begin_section("SM6.6")
-        self.draw_action = self.draw_action.next
+        self.draw_action = self.draw_action.nextAction
         super().check_capture()
         rdtest.log.end_section("SM6.6")
\ No newline at end of file
diff --git a/util/test/tests/D3D12/D3D12_CBuffer_Zoo.py b/util/test/tests/D3D12/D3D12_CBuffer_Zoo.py
index f16744273..f0b26758c 100644
--- a/util/test/tests/D3D12/D3D12_CBuffer_Zoo.py
+++ b/util/test/tests/D3D12/D3D12_CBuffer_Zoo.py
@@ -10,7 +10,7 @@ class D3D12_CBuffer_Zoo(rdtest.TestCase):
 
         self.check(action is not None)
 
-        self.controller.SetFrameEvent(action.next.eventId, False)
+        self.controller.SetFrameEvent(action.nextAction.eventId, False)
 
         pipe: rd.PipeState = self.controller.GetPipelineState()
 
@@ -35,7 +35,7 @@ class D3D12_CBuffer_Zoo(rdtest.TestCase):
             return
 
         rdtest.log.begin_section("SM6.0 Draw")
-        self.controller.SetFrameEvent(action.next.eventId, False)
+        self.controller.SetFrameEvent(action.nextAction.eventId, False)
 
         pipe: rd.PipeState = self.controller.GetPipelineState()
 
@@ -55,7 +55,7 @@ class D3D12_CBuffer_Zoo(rdtest.TestCase):
             return
 
         rdtest.log.begin_section("SM6.6 Draw")
-        self.controller.SetFrameEvent(action.next.eventId, False)
+        self.controller.SetFrameEvent(action.nextAction.eventId, False)
 
         pipe: rd.PipeState = self.controller.GetPipelineState()
 
diff --git a/util/test/tests/D3D12/D3D12_Execute_Indirect.py b/util/test/tests/D3D12/D3D12_Execute_Indirect.py
index 08d18c059..9fa3188a0 100644
--- a/util/test/tests/D3D12/D3D12_Execute_Indirect.py
+++ b/util/test/tests/D3D12/D3D12_Execute_Indirect.py
@@ -311,7 +311,7 @@ class D3D12_Execute_Indirect(rdtest.TestCase):
                     self.check_pixel_history_succeeds(x, 190)
                 if drawNum > 1:
                     self.check_pixel_history_succeeds(x, 170)
-                action = action.next
+                action = action.nextAction
 
         with rdtest.log.auto_section('Checking Count Buffer Draws'):
             base = self.find_action("Count Buffer Draws")
@@ -354,7 +354,7 @@ class D3D12_Execute_Indirect(rdtest.TestCase):
                             self.check_pixel_history_succeeds(x, 165)
                         if drawNum > 3:
                             self.check_pixel_history_succeeds(x, 185)
-                        action = action.next
+                        action = action.nextAction
 
         with rdtest.log.auto_section('Two Single Draws QuadOverdraw (Pass) replayed correctly'):
             for drawNum in range(2):
diff --git a/util/test/tests/D3D12/D3D12_List_Alloc_Tests.py b/util/test/tests/D3D12/D3D12_List_Alloc_Tests.py
index 122f137fb..6af9d4b91 100644
--- a/util/test/tests/D3D12/D3D12_List_Alloc_Tests.py
+++ b/util/test/tests/D3D12/D3D12_List_Alloc_Tests.py
@@ -13,7 +13,7 @@ class D3D12_List_Alloc_Tests(rdtest.TestCase):
 
         self.check(action is not None)
 
-        action = action.next
+        action = action.nextAction
 
         self.controller.SetFrameEvent(action.eventId, False)
 
diff --git a/util/test/tests/D3D12/D3D12_Mesh_Shader.py b/util/test/tests/D3D12/D3D12_Mesh_Shader.py
index 2f8fa086a..ffa00b4f3 100644
--- a/util/test/tests/D3D12/D3D12_Mesh_Shader.py
+++ b/util/test/tests/D3D12/D3D12_Mesh_Shader.py
@@ -61,7 +61,7 @@ class D3D12_Mesh_Shader(rdtest.TestCase):
 
         action = self.find_action("Mesh Shaders")
 
-        action = action.next
+        action = action.nextAction
         name = f"Pure Mesh Shader Test EID:{action.eventId}"
         rdtest.log.begin_section(name)
         self.controller.SetFrameEvent(action.eventId, False)
@@ -78,7 +78,7 @@ class D3D12_Mesh_Shader(rdtest.TestCase):
         rdtest.log.end_section(name)
 
         y += 100
-        action = action.next
+        action = action.nextAction
         name = f"Amplification Shader with Global Payload EID:{action.eventId}"
         rdtest.log.begin_section(name)
         self.controller.SetFrameEvent(action.eventId, False)
@@ -96,7 +96,7 @@ class D3D12_Mesh_Shader(rdtest.TestCase):
         rdtest.log.end_section(name)
 
         y += 100
-        action = action.next
+        action = action.nextAction
         name = f"Amplification Shader with Local Payload EID:{action.eventId}"
         rdtest.log.begin_section(name)
         self.controller.SetFrameEvent(action.eventId, False)
diff --git a/util/test/tests/D3D12/D3D12_Overlay_Test.py b/util/test/tests/D3D12/D3D12_Overlay_Test.py
index 05a2b78d4..33f572711 100644
--- a/util/test/tests/D3D12/D3D12_Overlay_Test.py
+++ b/util/test/tests/D3D12/D3D12_Overlay_Test.py
@@ -25,7 +25,7 @@ class D3D12_Overlay_Test(rdtest.Overlay_Test):
 
             # Don't check any pixel values, but ensure all overlays at least work with no viewport/scissor bound
             sub_marker: rd.ActionDescription = self.find_action("NoView draw", base_event)
-            self.controller.SetFrameEvent(sub_marker.next.eventId, True)
+            self.controller.SetFrameEvent(sub_marker.nextAction.eventId, True)
 
             pipe: rd.PipeState = self.controller.GetPipelineState()
 
diff --git a/util/test/tests/D3D12/D3D12_Parameter_Zoo.py b/util/test/tests/D3D12/D3D12_Parameter_Zoo.py
index f7a7153c0..f5ab997a8 100644
--- a/util/test/tests/D3D12/D3D12_Parameter_Zoo.py
+++ b/util/test/tests/D3D12/D3D12_Parameter_Zoo.py
@@ -12,7 +12,7 @@ class D3D12_Parameter_Zoo(rdtest.TestCase):
 
         self.check(action is not None)
 
-        action = action.next
+        action = action.nextAction
 
         self.controller.SetFrameEvent(action.eventId, False)
 
@@ -99,7 +99,7 @@ class D3D12_Parameter_Zoo(rdtest.TestCase):
         rdtest.log.success("Overlay color is as expected")
 
         action = self.find_action("No Sig Draw")
-        action = action.next
+        action = action.nextAction
         
         self.controller.SetFrameEvent(action.eventId, False)
 
@@ -110,14 +110,14 @@ class D3D12_Parameter_Zoo(rdtest.TestCase):
         rdtest.log.success("No sig draw worked as expected")
 
         action = self.find_action("No Sig Dispatch")
-        action = action.next
+        action = action.nextAction
         
         self.controller.SetFrameEvent(action.eventId, False)
 
         # nothing to actually check here
 
         action = self.find_action("Temp heap Draw")
-        action = action.next
+        action = action.nextAction
         
         self.controller.SetFrameEvent(action.eventId, False)
 
diff --git a/util/test/tests/D3D12/D3D12_PrimitiveID.py b/util/test/tests/D3D12/D3D12_PrimitiveID.py
index 070ff22ac..cf4c8da93 100644
--- a/util/test/tests/D3D12/D3D12_PrimitiveID.py
+++ b/util/test/tests/D3D12/D3D12_PrimitiveID.py
@@ -81,20 +81,20 @@ class D3D12_PrimitiveID(rdtest.TestCase):
 
             y = 40 + i * 150
             # Draw 1: No GS, PS without prim
-            action = test_marker.next
+            action = test_marker.nextAction
             success &= self.test_action(action, 100, y, rd.ReplayController.NoPreference, [0], [0, 1, 0, 1])
 
             # Draw 2: No GS, PS with prim
-            action = action.next
+            action = action.nextAction
             success &= self.test_action(action, 300, y, rd.ReplayController.NoPreference, [0], [0, 1, 0, 1])
 
             # Draw 3: GS, PS without prim
             y = 125 + i * 150
-            action = action.next
+            action = action.nextAction
             success &= self.test_action(action, 125, y, rd.ReplayController.NoPreference, [0], [0, 1, 0, 1])
 
             # Draw 4: GS, PS with prim
-            action = action.next
+            action = action.nextAction
             success &= self.test_action(action, 325, y, 2, [2], [0.5, 1, 0, 1])
             success &= self.test_action(action, 325, y, 3, [3], [0.75, 1, 0, 1])
             # No expected output here, since it's nondeterministic which primitive gets selected
diff --git a/util/test/tests/D3D12/D3D12_Reflection_Zoo.py b/util/test/tests/D3D12/D3D12_Reflection_Zoo.py
index b2cee7432..5c84f00e5 100644
--- a/util/test/tests/D3D12/D3D12_Reflection_Zoo.py
+++ b/util/test/tests/D3D12/D3D12_Reflection_Zoo.py
@@ -10,7 +10,7 @@ class D3D12_Reflection_Zoo(rdtest.TestCase):
 
         self.check(action is not None)
 
-        self.controller.SetFrameEvent(action.next.eventId, False)
+        self.controller.SetFrameEvent(action.nextAction.eventId, False)
 
         pipe: rd.PipeState = self.controller.GetPipelineState()
 
@@ -33,7 +33,7 @@ class D3D12_Reflection_Zoo(rdtest.TestCase):
             rdtest.log.print("No SM6.0 DXIL action to test")
             return
 
-        self.controller.SetFrameEvent(action.next.eventId, False)
+        self.controller.SetFrameEvent(action.nextAction.eventId, False)
 
         pipe: rd.PipeState = self.controller.GetPipelineState()
 
@@ -53,7 +53,7 @@ class D3D12_Reflection_Zoo(rdtest.TestCase):
             rdtest.log.print("No SM6.7 DXIL action to test")
             return
 
-        self.controller.SetFrameEvent(action.next.eventId, False)
+        self.controller.SetFrameEvent(action.nextAction.eventId, False)
 
         pipe: rd.PipeState = self.controller.GetPipelineState()
 
diff --git a/util/test/tests/D3D12/D3D12_RenderTarget_Binds.py b/util/test/tests/D3D12/D3D12_RenderTarget_Binds.py
index a67f57d8a..c1a73bc51 100644
--- a/util/test/tests/D3D12/D3D12_RenderTarget_Binds.py
+++ b/util/test/tests/D3D12/D3D12_RenderTarget_Binds.py
@@ -19,7 +19,7 @@ class D3D12_RenderTarget_Binds(rdtest.TestCase):
 
         rdtest.log.success("Picked value for clear is as expected")
 
-        action = action.next
+        action = action.nextAction
 
         self.controller.SetFrameEvent(action.eventId, False)
 
@@ -35,7 +35,7 @@ class D3D12_RenderTarget_Binds(rdtest.TestCase):
 
         rdtest.log.success("RTVs at first action are as expected")
 
-        action = action.next
+        action = action.nextAction
 
         self.controller.SetFrameEvent(action.eventId, False)
 
@@ -51,7 +51,7 @@ class D3D12_RenderTarget_Binds(rdtest.TestCase):
 
         rdtest.log.success("RTVs at second action are as expected")
 
-        action = action.next
+        action = action.nextAction
 
         self.controller.SetFrameEvent(action.eventId, False)
 
@@ -67,7 +67,7 @@ class D3D12_RenderTarget_Binds(rdtest.TestCase):
 
         rdtest.log.success("RTVs at third action are as expected")
 
-        action = action.next
+        action = action.nextAction
 
         self.controller.SetFrameEvent(action.eventId, False)
 
diff --git a/util/test/tests/D3D12/D3D12_Resource_Mapping_Zoo.py b/util/test/tests/D3D12/D3D12_Resource_Mapping_Zoo.py
index 6387cf571..482d6a033 100644
--- a/util/test/tests/D3D12/D3D12_Resource_Mapping_Zoo.py
+++ b/util/test/tests/D3D12/D3D12_Resource_Mapping_Zoo.py
@@ -47,18 +47,18 @@ class D3D12_Resource_Mapping_Zoo(rdtest.TestCase):
 
         rdtest.log.begin_section("SM5.x tests")
         test_marker: rd.ActionDescription = self.find_action("sm_5_0")
-        action = test_marker.next
+        action = test_marker.nextAction
         self.controller.SetFrameEvent(action.eventId, False)
         failed = not self.test_debug_pixel(200, 200, "sm_5_0") or failed
 
         test_marker: rd.ActionDescription = self.find_action("sm_5_1")
-        action = test_marker.next
+        action = test_marker.nextAction
         self.controller.SetFrameEvent(action.eventId, False)
         failed = not self.test_debug_pixel(200, 200, "sm_5_1") or failed
 
         rdtest.log.begin_section("Resource array tests")
         test_marker: rd.ActionDescription = self.find_action("ResArray")
-        action = test_marker.next
+        action = test_marker.nextAction
         self.controller.SetFrameEvent(action.eventId, False)
 
         for y in range(4):
@@ -69,7 +69,7 @@ class D3D12_Resource_Mapping_Zoo(rdtest.TestCase):
 
         rdtest.log.begin_section("Bindless tests")
         test_marker: rd.ActionDescription = self.find_action("Bindless")
-        action = test_marker.next
+        action = test_marker.nextAction
         self.controller.SetFrameEvent(action.eventId, False)
 
         for y in range(4):
@@ -86,18 +86,18 @@ class D3D12_Resource_Mapping_Zoo(rdtest.TestCase):
         
         rdtest.log.begin_section("SM6.0 tests")
 
-        action = test_marker.next
+        action = test_marker.nextAction
         self.controller.SetFrameEvent(action.eventId, False)
         failed = not self.test_debug_pixel(200, 200, "SM6.0") or failed
 
         test_marker: rd.ActionDescription = self.find_action("SM6.0 Table")
-        action = test_marker.next
+        action = test_marker.nextAction
         self.controller.SetFrameEvent(action.eventId, False)
         failed = not self.test_debug_pixel(200, 200, "SM6.0 Table") or failed
 
         rdtest.log.begin_section("Resource array tests")
         test_marker: rd.ActionDescription = self.find_action("SM6.0 ResArray")
-        action = test_marker.next
+        action = test_marker.nextAction
         self.controller.SetFrameEvent(action.eventId, False)
 
         for y in range(4):
@@ -108,7 +108,7 @@ class D3D12_Resource_Mapping_Zoo(rdtest.TestCase):
 
         rdtest.log.begin_section("Bindless tests")
         test_marker: rd.ActionDescription = self.find_action("SM6.0 Bindless")
-        action = test_marker.next
+        action = test_marker.nextAction
         self.controller.SetFrameEvent(action.eventId, False)
 
         for y in range(4):
@@ -125,18 +125,18 @@ class D3D12_Resource_Mapping_Zoo(rdtest.TestCase):
 
         rdtest.log.begin_section("SM6.6 tests")
 
-        action = test_marker.next
+        action = test_marker.nextAction
         self.controller.SetFrameEvent(action.eventId, False)
         failed = not self.test_debug_pixel(200, 200, "SM6.6") or failed
 
         test_marker: rd.ActionDescription = self.find_action("SM6.6 Table")
-        action = test_marker.next
+        action = test_marker.nextAction
         self.controller.SetFrameEvent(action.eventId, False)
         failed = not self.test_debug_pixel(200, 200, "SM6.6 Table") or failed
 
         rdtest.log.begin_section("Resource array tests")
         test_marker: rd.ActionDescription = self.find_action("SM6.6 ResArray")
-        action = test_marker.next
+        action = test_marker.nextAction
         self.controller.SetFrameEvent(action.eventId, False)
 
         for y in range(4):
@@ -147,7 +147,7 @@ class D3D12_Resource_Mapping_Zoo(rdtest.TestCase):
 
         rdtest.log.begin_section("Bindless tests")
         test_marker: rd.ActionDescription = self.find_action("SM6.6 Bindless")
-        action = test_marker.next
+        action = test_marker.nextAction
         self.controller.SetFrameEvent(action.eventId, False)
 
         for y in range(4):
diff --git a/util/test/tests/D3D12/D3D12_Shader_DebugData_Zoo.py b/util/test/tests/D3D12/D3D12_Shader_DebugData_Zoo.py
index 1c0ae119a..3e84d5721 100644
--- a/util/test/tests/D3D12/D3D12_Shader_DebugData_Zoo.py
+++ b/util/test/tests/D3D12/D3D12_Shader_DebugData_Zoo.py
@@ -89,7 +89,7 @@ class D3D12_Shader_DebugData_Zoo(rdtest.TestCase):
                 rdtest.log.print(f"Skipping Graphics tests for {shaderModels[sm]}")
                 rdtest.log.end_section(shaderModels[sm] + " tests")
                 continue
-            action = test_marker.next
+            action = test_marker.nextAction
             self.controller.SetFrameEvent(action.eventId, False)
 
             pipe: rd.PipeState = self.controller.GetPipelineState()
@@ -243,7 +243,7 @@ class D3D12_Shader_DebugData_Zoo(rdtest.TestCase):
                 rdtest.log.print(f"Skipping Compute tests for {csShaderModels[sm]}")
                 rdtest.log.end_section(section)
                 continue
-            action = test_marker.next
+            action = test_marker.nextAction
             self.controller.SetFrameEvent(action.eventId, False)
             pipe: rd.PipeState = self.controller.GetPipelineState()
             if not pipe.GetShaderReflection(rd.ShaderStage.Compute).debugInfo.debuggable:
diff --git a/util/test/tests/D3D12/D3D12_Shader_Debug_Zoo.py b/util/test/tests/D3D12/D3D12_Shader_Debug_Zoo.py
index b8947beee..fb38a7510 100644
--- a/util/test/tests/D3D12/D3D12_Shader_Debug_Zoo.py
+++ b/util/test/tests/D3D12/D3D12_Shader_Debug_Zoo.py
@@ -130,7 +130,7 @@ class D3D12_Shader_Debug_Zoo(rdtest.TestCase):
                     if (test_marker is None):
                         rdtest.log.print(f"Skipping Graphics tests for {sectionName}")
                         continue
-                    action = test_marker.next
+                    action = test_marker.nextAction
                     self.controller.SetFrameEvent(action.eventId, False)
 
                     pipe: rd.PipeState = self.controller.GetPipelineState()
@@ -195,7 +195,7 @@ class D3D12_Shader_Debug_Zoo(rdtest.TestCase):
         for marker in msaaMarkers:
             rdtest.log.begin_section(marker)
             test_marker: rd.ActionDescription = self.find_action(marker)
-            action = test_marker.next
+            action = test_marker.nextAction
             self.controller.SetFrameEvent(action.eventId, False)
             pipe: rd.PipeState = self.controller.GetPipelineState()
             for (x,y) in [(4, 4), (4, 5), (3, 4), (3, 5)]:
@@ -236,7 +236,7 @@ class D3D12_Shader_Debug_Zoo(rdtest.TestCase):
             if test_marker is None:
                 rdtest.log.print(f"Skipping Vertex Sample tests for {shaderModels[sm]}")
                 continue
-            action = test_marker.next
+            action = test_marker.nextAction
             self.controller.SetFrameEvent(action.eventId, False)
             pipe: rd.PipeState = self.controller.GetPipelineState()
 
@@ -284,7 +284,7 @@ class D3D12_Shader_Debug_Zoo(rdtest.TestCase):
         rdtest.log.end_section("VertexSample tests")
 
         test_marker: rd.ActionDescription = self.find_action("Banned")
-        action = test_marker.next
+        action = test_marker.nextAction
         self.controller.SetFrameEvent(action.eventId, False)
         pipe: rd.PipeState = self.controller.GetPipelineState()
 
@@ -340,7 +340,7 @@ class D3D12_Shader_Debug_Zoo(rdtest.TestCase):
                 rdtest.log.print(f"Skipping Compute tests for {csShaderModels[sm]}")
                 rdtest.log.end_section(section)
                 continue
-            action = test_marker.next
+            action = test_marker.nextAction
             self.controller.SetFrameEvent(action.eventId, False)
             pipe: rd.PipeState = self.controller.GetPipelineState()
             if not pipe.GetShaderReflection(rd.ShaderStage.Compute).debugInfo.debuggable:
diff --git a/util/test/tests/D3D12/D3D12_Shader_Editing.py b/util/test/tests/D3D12/D3D12_Shader_Editing.py
index ddb3adc66..07bf339f0 100644
--- a/util/test/tests/D3D12/D3D12_Shader_Editing.py
+++ b/util/test/tests/D3D12/D3D12_Shader_Editing.py
@@ -8,14 +8,14 @@ class D3D12_Shader_Editing(rdtest.TestCase):
     demos_test_name = 'D3D12_Shader_Editing'
 
     def check_capture(self):
-        eid = self.find_action("Draw 1").next.eventId
+        eid = self.find_action("Draw 1").nextAction.eventId
         self.controller.SetFrameEvent(eid, False)
 
         pipe: rd.PipeState = self.controller.GetPipelineState()
 
         psrefl1: rd.ShaderReflection = pipe.GetShaderReflection(rd.ShaderStage.Pixel)
 
-        eid = self.find_action("Draw 2").next.eventId
+        eid = self.find_action("Draw 2").nextAction.eventId
         self.controller.SetFrameEvent(eid, False)
 
         pipe: rd.PipeState = self.controller.GetPipelineState()
diff --git a/util/test/tests/D3D12/D3D12_Shader_ISA.py b/util/test/tests/D3D12/D3D12_Shader_ISA.py
index 8653f9080..de6f0a560 100644
--- a/util/test/tests/D3D12/D3D12_Shader_ISA.py
+++ b/util/test/tests/D3D12/D3D12_Shader_ISA.py
@@ -13,7 +13,7 @@ class D3D12_Shader_ISA(rdtest.TestCase):
 
         is_amd = 'AMD' in action.customName
 
-        self.controller.SetFrameEvent(action.next.eventId, False)
+        self.controller.SetFrameEvent(action.nextAction.eventId, False)
 
         pipe: rd.PipeState = self.controller.GetPipelineState()
 
diff --git a/util/test/tests/D3D12/D3D12_Shader_Linkage_Zoo.py b/util/test/tests/D3D12/D3D12_Shader_Linkage_Zoo.py
index 090133939..d1bb03da7 100644
--- a/util/test/tests/D3D12/D3D12_Shader_Linkage_Zoo.py
+++ b/util/test/tests/D3D12/D3D12_Shader_Linkage_Zoo.py
@@ -15,7 +15,7 @@ class D3D12_Shader_Linkage_Zoo(rdtest.TestCase):
 
         test_marker: rd.ActionDescription = self.find_action("draw")
         while test_marker is not None:
-            action = test_marker.next
+            action = test_marker.nextAction
             event_name = test_marker.customName
             test_marker: rd.ActionDescription = self.find_action("draw", action.eventId)
 
diff --git a/util/test/tests/D3D12/D3D12_Sharing.py b/util/test/tests/D3D12/D3D12_Sharing.py
index 91bf649b4..9662ce924 100644
--- a/util/test/tests/D3D12/D3D12_Sharing.py
+++ b/util/test/tests/D3D12/D3D12_Sharing.py
@@ -10,7 +10,7 @@ class D3D12_Sharing(rdtest.TestCase):
         for marker in markers:
             action = self.find_action(marker)
 
-            action: rd.ActionDescription = action.next
+            action: rd.ActionDescription = action.nextAction
 
             self.controller.SetFrameEvent(action.eventId, False)
 
diff --git a/util/test/tests/D3D12/D3D12_Swapchain_Zoo.py b/util/test/tests/D3D12/D3D12_Swapchain_Zoo.py
index 31a8f07c1..d4277cef2 100644
--- a/util/test/tests/D3D12/D3D12_Swapchain_Zoo.py
+++ b/util/test/tests/D3D12/D3D12_Swapchain_Zoo.py
@@ -9,13 +9,13 @@ class D3D12_Swapchain_Zoo(rdtest.TestCase):
         action1 = self.find_action("Draw 1")
         action2 = self.find_action("Draw 2")
 
-        self.controller.SetFrameEvent(action1.next.eventId, False)
+        self.controller.SetFrameEvent(action1.nextAction.eventId, False)
 
         self.check_triangle(back=[0.0, 0.0, 0.0, 1.0])
 
         rdtest.log.success("Triangle in first action (on first window) is OK")
 
-        self.controller.SetFrameEvent(action2.next.eventId, False)
+        self.controller.SetFrameEvent(action2.nextAction.eventId, False)
 
         self.check_triangle(back=[0.0, 0.0, 0.0, 1.0])
 
diff --git a/util/test/tests/D3D12/D3D12_VRS.py b/util/test/tests/D3D12/D3D12_VRS.py
index 97739aab5..c28595c7a 100644
--- a/util/test/tests/D3D12/D3D12_VRS.py
+++ b/util/test/tests/D3D12/D3D12_VRS.py
@@ -49,7 +49,7 @@ class D3D12_VRS(rdtest.TestCase):
             
             action = self.find_action("Default", pass_action.eventId)
             self.check(action is not None)
-            self.controller.SetFrameEvent(action.next.eventId, False)
+            self.controller.SetFrameEvent(action.nextAction.eventId, False)
 
             num_checks = 0
 
@@ -58,14 +58,14 @@ class D3D12_VRS(rdtest.TestCase):
             num_checks += 1
 
             action = self.find_action("Base", pass_action.eventId)
-            self.controller.SetFrameEvent(action.next.eventId, False)
+            self.controller.SetFrameEvent(action.nextAction.eventId, False)
             self.check(self.get_shading_rates() == ("2x2", "2x2"),
                        "{} shading rates unexpected: {}".format(action.customName, self.get_shading_rates()))
             num_checks += 1
 
             action = self.find_action("Vertex", pass_action.eventId)
             if action is not None:
-                self.controller.SetFrameEvent(action.next.eventId, False)
+                self.controller.SetFrameEvent(action.nextAction.eventId, False)
                 self.check(self.get_shading_rates() == ("1x1", "2x2"),
                            "{} shading rates unexpected: {}".format(action.customName, self.get_shading_rates()))
                 num_checks += 1
@@ -73,7 +73,7 @@ class D3D12_VRS(rdtest.TestCase):
 
             action = self.find_action("Image", pass_action.eventId)
             if action is not None:
-                self.controller.SetFrameEvent(action.next.eventId, False)
+                self.controller.SetFrameEvent(action.nextAction.eventId, False)
                 self.check(self.get_shading_rates() == ("2x2", "1x1"),
                            "{} shading rates unexpected: {}".format(action.customName, self.get_shading_rates()))
                 num_checks += 1
@@ -81,21 +81,21 @@ class D3D12_VRS(rdtest.TestCase):
 
             action = self.find_action("Base + Vertex", pass_action.eventId)
             if action is not None:
-                self.controller.SetFrameEvent(action.next.eventId, False)
+                self.controller.SetFrameEvent(action.nextAction.eventId, False)
                 self.check(self.get_shading_rates() == ("2x2", "2x2"),
                            "{} shading rates unexpected: {}".format(action.customName, self.get_shading_rates()))
                 num_checks += 1
 
             action = self.find_action("Base + Image", pass_action.eventId)
             if action is not None:
-                self.controller.SetFrameEvent(action.next.eventId, False)
+                self.controller.SetFrameEvent(action.nextAction.eventId, False)
                 self.check(self.get_shading_rates() == ("2x2", "2x2"),
                            "{} shading rates unexpected: {}".format(action.customName, self.get_shading_rates()))
                 num_checks += 1
 
             action = self.find_action("Vertex + Image", pass_action.eventId)
             if action is not None:
-                self.controller.SetFrameEvent(action.next.eventId, False)
+                self.controller.SetFrameEvent(action.nextAction.eventId, False)
                 self.check(self.get_shading_rates() == ("2x2", "2x2"),
                            "{} shading rates unexpected: {}".format(action.customName, self.get_shading_rates()))
                 num_checks += 1
diff --git a/util/test/tests/D3D12/D3D12_Vertex_UAV.py b/util/test/tests/D3D12/D3D12_Vertex_UAV.py
index a56b616e0..04d302ad1 100644
--- a/util/test/tests/D3D12/D3D12_Vertex_UAV.py
+++ b/util/test/tests/D3D12/D3D12_Vertex_UAV.py
@@ -20,7 +20,7 @@ class D3D12_Vertex_UAV(rdtest.TestCase):
 
                 rdtest.log.print("Checking quad overdraw on {}".format(name))
 
-                self.controller.SetFrameEvent(marker.next.eventId, True)
+                self.controller.SetFrameEvent(marker.nextAction.eventId, True)
 
                 pipe: rd.PipeState = self.controller.GetPipelineState()
 
diff --git a/util/test/tests/GL/GL_Buffer_Updates.py b/util/test/tests/GL/GL_Buffer_Updates.py
index 7c11736fa..65dbc3e6d 100644
--- a/util/test/tests/GL/GL_Buffer_Updates.py
+++ b/util/test/tests/GL/GL_Buffer_Updates.py
@@ -26,7 +26,7 @@ class GL_Buffer_Updates(rdtest.TestCase):
 
                 self.check_pixel_value(tex, x, y, [0.0, 1.0, 0.0, 1.0])
 
-            action = action.next
+            action = action.nextAction
 
         rdtest.log.success("Draws are all green")
 
diff --git a/util/test/tests/GL/GL_Depth_Bounds.py b/util/test/tests/GL/GL_Depth_Bounds.py
index f04ade449..08ce95a2d 100644
--- a/util/test/tests/GL/GL_Depth_Bounds.py
+++ b/util/test/tests/GL/GL_Depth_Bounds.py
@@ -8,7 +8,7 @@ class GL_Depth_Bounds(rdtest.TestCase):
     demos_test_name = 'GL_Depth_Bounds'
 
     def check_capture(self):
-        eid = self.find_action("Test").next.eventId
+        eid = self.find_action("Test").nextAction.eventId
         self.controller.SetFrameEvent(eid, False)
 
         glpipe = self.controller.GetGLPipelineState()
diff --git a/util/test/tests/GL/GL_Draw_Zoo.py b/util/test/tests/GL/GL_Draw_Zoo.py
index 1b421da0e..90f4c3268 100644
--- a/util/test/tests/GL/GL_Draw_Zoo.py
+++ b/util/test/tests/GL/GL_Draw_Zoo.py
@@ -13,7 +13,7 @@ class GL_Draw_Zoo(rdtest.Draw_Zoo):
 
         self.check(action is not None)
 
-        action = action.next
+        action = action.nextAction
 
         self.controller.SetFrameEvent(action.eventId, True)
 
@@ -29,7 +29,7 @@ class GL_Draw_Zoo(rdtest.Draw_Zoo):
 
         self.check(action is not None)
 
-        action = action.next
+        action = action.nextAction
 
         self.controller.SetFrameEvent(action.eventId, True)
 
@@ -43,7 +43,7 @@ class GL_Draw_Zoo(rdtest.Draw_Zoo):
         action = self.find_action("GL_ClearDepth")
         self.check(action is not None)
         
-        action = action.next
+        action = action.nextAction
         
         self.check(action.flags & (rd.ActionFlags.Clear|rd.ActionFlags.ClearDepthStencil) == (rd.ActionFlags.Clear|rd.ActionFlags.ClearDepthStencil))
         
diff --git a/util/test/tests/GL/GL_Entry_Points.py b/util/test/tests/GL/GL_Entry_Points.py
index 87ab2d06c..9df040bcc 100644
--- a/util/test/tests/GL/GL_Entry_Points.py
+++ b/util/test/tests/GL/GL_Entry_Points.py
@@ -19,7 +19,7 @@ class GL_Entry_Points(rdtest.TestCase):
             marker: rd.ActionDescription = self.find_action(test)
             if marker is None:
                 raise rdtest.TestFailureException('Failed to find action {}'.format(test))
-            action: rd.ActionDescription = marker.next
+            action: rd.ActionDescription = marker.nextAction
 
             calls = []
 
diff --git a/util/test/tests/GL/GL_Mesh_Zoo.py b/util/test/tests/GL/GL_Mesh_Zoo.py
index 210990cde..30d7ba5d8 100644
--- a/util/test/tests/GL/GL_Mesh_Zoo.py
+++ b/util/test/tests/GL/GL_Mesh_Zoo.py
@@ -13,7 +13,7 @@ class GL_Mesh_Zoo(rdtest.TestCase):
         self.zoo_helper.check_capture(self.capture_filename, self.controller)
 
         # Test GL-only thing with geometry shader only and completely no-op vertex shader
-        action = self.zoo_helper.find_action("Geom Only").next
+        action = self.zoo_helper.find_action("Geom Only").nextAction
         self.controller.SetFrameEvent(action.eventId, False)
 
         pos: rd.MeshFormat = self.controller.GetPostVSData(0, 0, rd.MeshDataStage.VSOut)
@@ -41,7 +41,7 @@ class GL_Mesh_Zoo(rdtest.TestCase):
         self.check_mesh_data(gsout_ref, self.get_postvs(action, rd.MeshDataStage.GSOut))
 
         # Test GL-only thing with geometry shader only and completely no-op vertex shader
-        multibase = self.zoo_helper.find_action("Multi Draw").next.parent
+        multibase = self.zoo_helper.find_action("Multi Draw").nextAction.parent
         self.controller.SetFrameEvent(multibase.children[-1].eventId, False)
 
         baseVertex = [10, 11]
diff --git a/util/test/tests/GL/GL_Parameter_Zoo.py b/util/test/tests/GL/GL_Parameter_Zoo.py
index e10bbb5b7..753496065 100644
--- a/util/test/tests/GL/GL_Parameter_Zoo.py
+++ b/util/test/tests/GL/GL_Parameter_Zoo.py
@@ -112,7 +112,7 @@ class GL_Parameter_Zoo(rdtest.TestCase):
         action = self.find_action("NoScissor")
 
         self.check(action is not None)
-        action = action.next
+        action = action.nextAction
         pipe: rd.PipeState = self.controller.GetPipelineState()
 
         tex = rd.TextureDisplay()
diff --git a/util/test/tests/GL/GL_Queries_In_Use.py b/util/test/tests/GL/GL_Queries_In_Use.py
index a6087ba4a..06e89500d 100644
--- a/util/test/tests/GL/GL_Queries_In_Use.py
+++ b/util/test/tests/GL/GL_Queries_In_Use.py
@@ -12,7 +12,7 @@ class GL_Queries_In_Use(rdtest.TestCase):
 
         tex_details = self.get_texture(last_action.copyDestination)
 
-        action = self.find_action("XFB Draw").next
+        action = self.find_action("XFB Draw").nextAction
 
         self.controller.SetFrameEvent(action.eventId, False)
 
@@ -49,7 +49,7 @@ class GL_Queries_In_Use(rdtest.TestCase):
 
         results = self.controller.FetchCounters([rd.GPUCounter.RasterizedPrimitives, rd.GPUCounter.VSInvocations, rd.GPUCounter.FSInvocations])
 
-        action = self.find_action("Counters Draw").next
+        action = self.find_action("Counters Draw").nextAction
 
         results = [r for r in results if r.eventId == action.eventId]
 
diff --git a/util/test/tests/GL/GL_Shader_ISA.py b/util/test/tests/GL/GL_Shader_ISA.py
index 81ab7c5c2..ad5764bfa 100644
--- a/util/test/tests/GL/GL_Shader_ISA.py
+++ b/util/test/tests/GL/GL_Shader_ISA.py
@@ -13,7 +13,7 @@ class GL_Shader_ISA(rdtest.TestCase):
 
         is_amd = 'AMD' in action.customName
 
-        self.controller.SetFrameEvent(action.next.eventId, False)
+        self.controller.SetFrameEvent(action.nextAction.eventId, False)
 
         pipe: rd.PipeState = self.controller.GetPipelineState()
 
diff --git a/util/test/tests/GL/GL_VAO_0.py b/util/test/tests/GL/GL_VAO_0.py
index 0209215aa..8ebef0d54 100644
--- a/util/test/tests/GL/GL_VAO_0.py
+++ b/util/test/tests/GL/GL_VAO_0.py
@@ -50,7 +50,7 @@ class GL_VAO_0(rdtest.TestCase):
 
             self.check_mesh_data(postvs_ref, postvs_data)
 
-            action = action.next
+            action = action.nextAction
 
         action = self.find_action("Instanced")
 
diff --git a/util/test/tests/Iter_Test.py b/util/test/tests/Iter_Test.py
index d42d9af2d..1ee4abc72 100644
--- a/util/test/tests/Iter_Test.py
+++ b/util/test/tests/Iter_Test.py
@@ -476,7 +476,7 @@ class Iter_Test(rdtest.TestCase):
                     rdtest.log.error(f"Fatal error detected: {fatal.Message()}")
                     break
 
-            action = action.next
+            action = action.nextAction
 
         self.texout.Shutdown()
 
diff --git a/util/test/tests/Vulkan/VK_Annotations.py b/util/test/tests/Vulkan/VK_Annotations.py
index 27911c480..4afc49d9e 100644
--- a/util/test/tests/Vulkan/VK_Annotations.py
+++ b/util/test/tests/Vulkan/VK_Annotations.py
@@ -37,7 +37,7 @@ class VK_Annotations(rdtest.Annotations):
         # Check loose event annotation attached to a barrier
         with rdtest.log.auto_section('Loose Event'):
             marker = self.find_action("Loose")
-            action = marker.next
+            action = marker.nextAction
             annots = action.events[0].annotations
             self.check_eq(annot("loose.int").type.basetype, rd.SDBasic.SignedInteger)
             self.check_eq(annot("loose.int").AsInt(), 1)
@@ -45,7 +45,7 @@ class VK_Annotations(rdtest.Annotations):
         # Check loose event annotation attached to vkEndCommandBuffer
         with rdtest.log.auto_section('vkEndCommandBuffer Event'):
             marker = self.find_action("Loose")
-            action = marker.next
+            action = marker.nextAction
             annots = action.events[-1].annotations
             self.check_eq(annot("loose.int").type.basetype, rd.SDBasic.SignedInteger)
             self.check_eq(annot("loose.int").AsInt(), 2)
@@ -54,7 +54,7 @@ class VK_Annotations(rdtest.Annotations):
         # Check loose event annotation in an empty command buffer
         with rdtest.log.auto_section('Empty Command Buffer'):
             marker = self.find_action("Empty")
-            action = marker.next
+            action = marker.nextAction
             annots = action.events[0].annotations
             self.check_eq(annot("empty.int").type.basetype, rd.SDBasic.SignedInteger)
             self.check_eq(annot("empty.int").AsInt(), 1)
diff --git a/util/test/tests/Vulkan/VK_Blend_Pixel_History.py b/util/test/tests/Vulkan/VK_Blend_Pixel_History.py
index 07b25c3c1..17c10d29e 100644
--- a/util/test/tests/Vulkan/VK_Blend_Pixel_History.py
+++ b/util/test/tests/Vulkan/VK_Blend_Pixel_History.py
@@ -56,11 +56,11 @@ class VK_Blend_Pixel_History(rdtest.TestCase):
         if tex_details.mips > 1:
             sub.mip = rt.firstMip
 
-        red_eid = self.find_action("Red: ").next.eventId
-        red_last_eid = self.find_action("End of red").next.eventId
-        green_eid = self.find_action("Green: ").next.eventId
-        blue_eid = self.find_action("Blue: ").next.eventId
-        all_eid = self.find_action("All of the above in a single drawcall").next.eventId
+        red_eid = self.find_action("Red: ").nextAction.eventId
+        red_last_eid = self.find_action("End of red").nextAction.eventId
+        green_eid = self.find_action("Green: ").nextAction.eventId
+        blue_eid = self.find_action("Blue: ").nextAction.eventId
+        all_eid = self.find_action("All of the above in a single drawcall").nextAction.eventId
 
         # Pixel inside of all of the triangles
         x, y = 200, 150
diff --git a/util/test/tests/Vulkan/VK_CBuffer_Zoo.py b/util/test/tests/Vulkan/VK_CBuffer_Zoo.py
index 8ee1e202b..564044d94 100644
--- a/util/test/tests/Vulkan/VK_CBuffer_Zoo.py
+++ b/util/test/tests/Vulkan/VK_CBuffer_Zoo.py
@@ -78,7 +78,7 @@ class VK_CBuffer_Zoo(rdtest.TestCase):
         rdtest.log.success("Specialization constants are as expected")
 
         # Move to the HLSL action
-        action = action.next
+        action = action.nextAction
 
         self.check(action is not None)
 
diff --git a/util/test/tests/Vulkan/VK_Counters.py b/util/test/tests/Vulkan/VK_Counters.py
index 0199214d0..7d51b400a 100644
--- a/util/test/tests/Vulkan/VK_Counters.py
+++ b/util/test/tests/Vulkan/VK_Counters.py
@@ -20,7 +20,7 @@ class VK_Counters(rdtest.TestCase):
             descs[c] = self.controller.DescribeCounter(c)
 
         action = self.find_action("Draw")
-        durationAction = action.next
+        durationAction = action.nextAction
 
         # filter to only results from the draw
         results = [r for r in results if r.eventId == action.eventId or r.eventId == durationAction.eventId]
diff --git a/util/test/tests/Vulkan/VK_Descriptor_Buffer.py b/util/test/tests/Vulkan/VK_Descriptor_Buffer.py
index f00e5efb2..5ec1bca92 100644
--- a/util/test/tests/Vulkan/VK_Descriptor_Buffer.py
+++ b/util/test/tests/Vulkan/VK_Descriptor_Buffer.py
@@ -22,7 +22,7 @@ class VK_Descriptor_Buffer(rdtest.TestCase):
 
                 eid = draw.eventId
 
-                self.controller.SetFrameEvent(draw.next.eventId, False)
+                self.controller.SetFrameEvent(draw.nextAction.eventId, False)
 
                 pipe = self.controller.GetPipelineState()
 
diff --git a/util/test/tests/Vulkan/VK_Discard_Zoo.py b/util/test/tests/Vulkan/VK_Discard_Zoo.py
index 79085a037..2a3b36dd1 100644
--- a/util/test/tests/Vulkan/VK_Discard_Zoo.py
+++ b/util/test/tests/Vulkan/VK_Discard_Zoo.py
@@ -23,7 +23,7 @@ class VK_Discard_Zoo(rdtest.Discard_Zoo):
 
         self.check(action is not None)
 
-        self.controller.SetFrameEvent(action.next.eventId, True)
+        self.controller.SetFrameEvent(action.nextAction.eventId, True)
 
         # At the start they should be cleared
 
@@ -36,7 +36,7 @@ class VK_Discard_Zoo(rdtest.Discard_Zoo):
 
         action = self.find_action("TestMiddle")
 
-        self.controller.SetFrameEvent(action.next.eventId, True)
+        self.controller.SetFrameEvent(action.nextAction.eventId, True)
 
         for y in range(0, rpcol.height-1, 17):
             for x in range(0, rpcol.width-1, 17):
@@ -68,7 +68,7 @@ class VK_Discard_Zoo(rdtest.Discard_Zoo):
 
         action = self.find_action("TestEnd")
 
-        self.controller.SetFrameEvent(action.next.eventId, True)
+        self.controller.SetFrameEvent(action.nextAction.eventId, True)
 
         for y in range(0, rpcol.height-1, 17):
             for x in range(0, rpcol.width-1, 17):
@@ -103,7 +103,7 @@ class VK_Discard_Zoo(rdtest.Discard_Zoo):
 
         action = self.find_action("UndefinedLoad_Before")
 
-        self.controller.SetFrameEvent(action.next.eventId, True)
+        self.controller.SetFrameEvent(action.nextAction.eventId, True)
 
         # check that they are cleared again
         for y in range(0, rpcol.height-1, 17):
@@ -115,7 +115,7 @@ class VK_Discard_Zoo(rdtest.Discard_Zoo):
 
         action = self.find_action("UndefinedLoad_After")
 
-        self.controller.SetFrameEvent(action.next.eventId, True)
+        self.controller.SetFrameEvent(action.nextAction.eventId, True)
 
         # check that they are all undefined pattern - initial layout affects the whole resource
         for y in range(0, rpcol.height-1, 17):
@@ -146,7 +146,7 @@ class VK_Discard_Zoo(rdtest.Discard_Zoo):
         tex_id = pipe.GetOutputTargets()[0].resource
 
         self.check_pixel_value(tex_id, 0.5, 0.5, [0.0, 1.0, 0.0, 1.0])
-        self.controller.SetFrameEvent(action.next.eventId, True)
+        self.controller.SetFrameEvent(action.nextAction.eventId, True)
         self.check_pixel_value(tex_id, 0.5, 0.5, [0.0, 1.0, 0.0, 1.0])
 
         rdtest.log.success("Output value from draw is correct at draw and after it")
diff --git a/util/test/tests/Vulkan/VK_Dynamic_Rendering.py b/util/test/tests/Vulkan/VK_Dynamic_Rendering.py
index 70f32f4cb..65c84aa94 100644
--- a/util/test/tests/Vulkan/VK_Dynamic_Rendering.py
+++ b/util/test/tests/Vulkan/VK_Dynamic_Rendering.py
@@ -11,7 +11,7 @@ class VK_Dynamic_Rendering(rdtest.TestCase):
                                                             rd.ReplayOutputType.Texture)
 
         for cmdLevel in [0, 1]:
-            action = self.find_action("Draw {}".format(cmdLevel)).next
+            action = self.find_action("Draw {}".format(cmdLevel)).nextAction
 
             self.check(action is not None)
 
diff --git a/util/test/tests/Vulkan/VK_Indirect.py b/util/test/tests/Vulkan/VK_Indirect.py
index c7be4a021..ef6e82789 100644
--- a/util/test/tests/Vulkan/VK_Indirect.py
+++ b/util/test/tests/Vulkan/VK_Indirect.py
@@ -370,13 +370,13 @@ class VK_Indirect(rdtest.TestCase):
 
             # Rewind to the start of the capture
             action: rd.ActionDescription = dispatches.children[0]
-            while action.previous is not None:
-                action = action.previous
+            while action.previousAction is not None:
+                action = action.previousAction
 
             # Ensure we can select all actions
             while action is not None:
                 self.controller.SetFrameEvent(action.eventId, False)
-                action = action.next
+                action = action.nextAction
 
             rdtest.log.success("Selected all {} actions".format(level))
 
diff --git a/util/test/tests/Vulkan/VK_KHR_Buffer_Address.py b/util/test/tests/Vulkan/VK_KHR_Buffer_Address.py
index 669da2e69..bd15983e5 100644
--- a/util/test/tests/Vulkan/VK_KHR_Buffer_Address.py
+++ b/util/test/tests/Vulkan/VK_KHR_Buffer_Address.py
@@ -15,7 +15,7 @@ class VK_KHR_Buffer_Address(rdtest.TestCase):
         for test_name in ["Draw 1", "Draw 2", "Draw 3", "Draw 4"]:
             rdtest.log.print("Test {}".format(test_name))
             action: rd.ActionDescription = self.find_action(test_name)
-            action = action.next
+            action = action.nextAction
             self.controller.SetFrameEvent(action.eventId, True)
             pipe: rd.PipeState = self.controller.GetPipelineState()
 
diff --git a/util/test/tests/Vulkan/VK_Line_Raster.py b/util/test/tests/Vulkan/VK_Line_Raster.py
index c18e8e40f..15d28d18e 100644
--- a/util/test/tests/Vulkan/VK_Line_Raster.py
+++ b/util/test/tests/Vulkan/VK_Line_Raster.py
@@ -30,7 +30,7 @@ class VK_Line_Raster(rdtest.TestCase):
 
         self.check(action is not None)
 
-        action = action.previous
+        action = action.previousAction
 
         self.controller.SetFrameEvent(action.eventId, False)
 
diff --git a/util/test/tests/Vulkan/VK_Mesh_Shader.py b/util/test/tests/Vulkan/VK_Mesh_Shader.py
index b42dbb538..86c3f9c6e 100644
--- a/util/test/tests/Vulkan/VK_Mesh_Shader.py
+++ b/util/test/tests/Vulkan/VK_Mesh_Shader.py
@@ -51,7 +51,7 @@ class VK_Mesh_Shader(rdtest.TestCase):
 
         action = self.find_action("Mesh Shaders")
 
-        action = action.next
+        action = action.nextAction
         name = f"Pure Mesh Shader Test EID:{action.eventId}"
         with rdtest.log.auto_section(name):
             self.controller.SetFrameEvent(action.eventId, False)
@@ -67,7 +67,7 @@ class VK_Mesh_Shader(rdtest.TestCase):
             self.check_debug_pixel(x, y)
 
         y -= 100
-        action = action.next
+        action = action.nextAction
         name = f"Task Shader with Local Payload EID:{action.eventId}"
         with rdtest.log.auto_section(name):
             self.controller.SetFrameEvent(action.eventId, False)
@@ -85,7 +85,7 @@ class VK_Mesh_Shader(rdtest.TestCase):
         
         name = f"Mesh Shader with Points output"
         with rdtest.log.auto_section(name):
-            action = action.next
+            action = action.nextAction
             self.controller.SetFrameEvent(action.eventId, False)
             x = 290
             y = 90
diff --git a/util/test/tests/Vulkan/VK_Mesh_Zoo.py b/util/test/tests/Vulkan/VK_Mesh_Zoo.py
index d30b09c4c..45e896f6a 100644
--- a/util/test/tests/Vulkan/VK_Mesh_Zoo.py
+++ b/util/test/tests/Vulkan/VK_Mesh_Zoo.py
@@ -16,9 +16,9 @@ class VK_Mesh_Zoo(rdtest.TestCase):
         xfbDraw = self.find_action("XFB")
 
         if xfbDraw is not None:
-            self.controller.SetFrameEvent(xfbDraw.next.eventId, False)
+            self.controller.SetFrameEvent(xfbDraw.nextAction.eventId, False)
 
-            postgs_data = self.get_postvs(xfbDraw.next, rd.MeshDataStage.GSOut, 0, 4)
+            postgs_data = self.get_postvs(xfbDraw.nextAction, rd.MeshDataStage.GSOut, 0, 4)
 
             postgs_ref = {
                 0: {
diff --git a/util/test/tests/Vulkan/VK_Multi_View.py b/util/test/tests/Vulkan/VK_Multi_View.py
index d1a64b9e1..f8cb14e3d 100644
--- a/util/test/tests/Vulkan/VK_Multi_View.py
+++ b/util/test/tests/Vulkan/VK_Multi_View.py
@@ -17,7 +17,7 @@ class VK_Multi_View(rdtest.TestCase):
             label = self.find_action(test_name)
             if label is None:
                 continue
-            action = label.next
+            action = label.nextAction
             self.controller.SetFrameEvent(action.eventId, True)
 
             pipe: rd.PipeState = self.controller.GetPipelineState()
@@ -53,7 +53,7 @@ class VK_Multi_View(rdtest.TestCase):
             label = self.find_action(test_name)
             if label is None:
                 continue
-            action = label.next
+            action = label.nextAction
             self.controller.SetFrameEvent(action.eventId, True)
 
             pipe: rd.PipeState = self.controller.GetPipelineState()
diff --git a/util/test/tests/Vulkan/VK_Overlay_Test.py b/util/test/tests/Vulkan/VK_Overlay_Test.py
index 1f35f0a83..31b220b80 100644
--- a/util/test/tests/Vulkan/VK_Overlay_Test.py
+++ b/util/test/tests/Vulkan/VK_Overlay_Test.py
@@ -11,7 +11,7 @@ class VK_Overlay_Test(rdtest.Overlay_Test):
         out = self.controller.CreateOutput(rd.CreateHeadlessWindowingData(100, 100), rd.ReplayOutputType.Texture)
 
         setup_marker = self.find_action("Setup")
-        self.controller.SetFrameEvent(setup_marker.next.eventId, True)
+        self.controller.SetFrameEvent(setup_marker.nextAction.eventId, True)
 
         pipe = self.controller.GetPipelineState()
 
@@ -24,10 +24,10 @@ class VK_Overlay_Test(rdtest.Overlay_Test):
         out.Display()
 
         # Select the next setup action
-        self.controller.SetFrameEvent(setup_marker.next.eventId, True)
+        self.controller.SetFrameEvent(setup_marker.nextAction.eventId, True)
 
         # Select the real action for the first time
-        self.controller.SetFrameEvent(self.find_action("Normal Test").next.eventId, True)
+        self.controller.SetFrameEvent(self.find_action("Normal Test").nextAction.eventId, True)
 
         self.check_pixel_value(tex.resourceId, 180, 150, [0.0, 0.0, 0.0, 0.0])
         self.check_pixel_value(tex.resourceId, 50, 50, [0.0, 0.0, 0.0, 0.0])
@@ -44,7 +44,7 @@ class VK_Overlay_Test(rdtest.Overlay_Test):
         # Don't check any pixel values, but ensure all overlays at least work with rasterizer discard and no
         # viewport/scissor bound
         sub_marker = self.find_action("Discard Test")
-        self.controller.SetFrameEvent(sub_marker.next.eventId, True)
+        self.controller.SetFrameEvent(sub_marker.nextAction.eventId, True)
 
         pipe = self.controller.GetPipelineState()
 
diff --git a/util/test/tests/Vulkan/VK_Parameter_Zoo.py b/util/test/tests/Vulkan/VK_Parameter_Zoo.py
index 14c7e154d..4a087056b 100644
--- a/util/test/tests/Vulkan/VK_Parameter_Zoo.py
+++ b/util/test/tests/Vulkan/VK_Parameter_Zoo.py
@@ -13,7 +13,7 @@ class VK_Parameter_Zoo(rdtest.TestCase):
 
         self.check(action is not None)
 
-        action = action.next
+        action = action.nextAction
 
         self.controller.SetFrameEvent(action.eventId, False)
 
@@ -28,7 +28,7 @@ class VK_Parameter_Zoo(rdtest.TestCase):
         # Find the action that contains resource references
         action = self.find_action("References")
         self.check(action is not None)
-        action = action.next
+        action = action.nextAction
         self.controller.SetFrameEvent(action.eventId, False)
 
         vkpipe: rd.VKState = self.controller.GetVulkanPipelineState()
@@ -119,7 +119,7 @@ class VK_Parameter_Zoo(rdtest.TestCase):
         if descriptor_update_template and push_descriptor:
             action = self.find_action("PushTemplReferences")
             self.check(action is not None)
-            action = action.next
+            action = action.nextAction
             self.controller.SetFrameEvent(action.eventId, False)
 
             vkpipe: rd.VKState = self.controller.GetVulkanPipelineState()
@@ -174,7 +174,7 @@ class VK_Parameter_Zoo(rdtest.TestCase):
 
             self.check(action is not None)
 
-            action = action.next
+            action = action.nextAction
 
             self.controller.SetFrameEvent(action.eventId, False)
 
@@ -234,7 +234,7 @@ class VK_Parameter_Zoo(rdtest.TestCase):
 
             rdtest.log.print(f"Checking {action.customName}")
 
-            self.controller.SetFrameEvent(action.next.eventId, False)
+            self.controller.SetFrameEvent(action.nextAction.eventId, False)
 
             self.check_triangle(fore=[1.0, 0.0, 1.0, 1.0])
 
@@ -275,7 +275,7 @@ class VK_Parameter_Zoo(rdtest.TestCase):
 
         self.check(action is not None)
 
-        action = action.next
+        action = action.nextAction
 
         self.controller.SetFrameEvent(action.eventId, False)
 
@@ -329,7 +329,7 @@ class VK_Parameter_Zoo(rdtest.TestCase):
 
         action = self.find_action("Dynamic Array Draw")
 
-        action = action.next
+        action = action.nextAction
 
         self.controller.SetFrameEvent(action.eventId, False)
 
diff --git a/util/test/tests/Vulkan/VK_Sample_Locations.py b/util/test/tests/Vulkan/VK_Sample_Locations.py
index 2d72e077f..1263425a8 100644
--- a/util/test/tests/Vulkan/VK_Sample_Locations.py
+++ b/util/test/tests/Vulkan/VK_Sample_Locations.py
@@ -7,7 +7,7 @@ class VK_Sample_Locations(rdtest.TestCase):
 
     def check_capture(self):
         action: rd.ActionDescription = self.find_action("Degenerate")
-        self.controller.SetFrameEvent(action.next.eventId, True)
+        self.controller.SetFrameEvent(action.nextAction.eventId, True)
         pipe: rd.VKState = self.controller.GetVulkanPipelineState()
 
         if pipe.multisample.rasterSamples != 4:
@@ -34,7 +34,7 @@ class VK_Sample_Locations(rdtest.TestCase):
                                               .format(sampleLoc.customLocations[1], sampleLoc.customLocations[2]))
 
         action: rd.ActionDescription = self.find_action("Rotated")
-        self.controller.SetFrameEvent(action.next.eventId, True)
+        self.controller.SetFrameEvent(action.nextAction.eventId, True)
         pipe: rd.VKState = self.controller.GetVulkanPipelineState()
 
         if pipe.multisample.rasterSamples != 4:
diff --git a/util/test/tests/Vulkan/VK_Secondary_CmdBuf.py b/util/test/tests/Vulkan/VK_Secondary_CmdBuf.py
index ffd2cc381..61868cafd 100644
--- a/util/test/tests/Vulkan/VK_Secondary_CmdBuf.py
+++ b/util/test/tests/Vulkan/VK_Secondary_CmdBuf.py
@@ -22,9 +22,9 @@ class VK_Secondary_CmdBuf(rdtest.TestCase):
 
         resources = self.controller.GetResources()
 
-        self.check(action is not None and action.next is not None)
+        self.check(action is not None and action.nextAction is not None)
 
-        self.controller.SetFrameEvent(action.next.eventId, False)
+        self.controller.SetFrameEvent(action.nextAction.eventId, False)
 
         pipe: rd.PipeState = self.controller.GetPipelineState()
 
@@ -47,9 +47,9 @@ class VK_Secondary_CmdBuf(rdtest.TestCase):
 
         action = self.find_action("Secondary")
 
-        self.check(action is not None and action.next is not None)
+        self.check(action is not None and action.nextAction is not None)
 
-        self.controller.SetFrameEvent(action.next.eventId, False)
+        self.controller.SetFrameEvent(action.nextAction.eventId, False)
 
         pipe: rd.PipeState = self.controller.GetPipelineState()
 
diff --git a/util/test/tests/Vulkan/VK_Shader_Editing.py b/util/test/tests/Vulkan/VK_Shader_Editing.py
index d9573a5da..d066d0424 100644
--- a/util/test/tests/Vulkan/VK_Shader_Editing.py
+++ b/util/test/tests/Vulkan/VK_Shader_Editing.py
@@ -9,14 +9,14 @@ class VK_Shader_Editing(rdtest.TestCase):
     demos_test_name = 'VK_Shader_Editing'
 
     def check_capture(self):
-        eid = self.find_action("Draw 1").next.eventId
+        eid = self.find_action("Draw 1").nextAction.eventId
         self.controller.SetFrameEvent(eid, False)
 
         pipe: rd.PipeState = self.controller.GetPipelineState()
 
         fsrefl1: rd.ShaderReflection = pipe.GetShaderReflection(rd.ShaderStage.Fragment)
 
-        eid = self.find_action("Draw 2").next.eventId
+        eid = self.find_action("Draw 2").nextAction.eventId
         self.controller.SetFrameEvent(eid, False)
 
         pipe: rd.PipeState = self.controller.GetPipelineState()
diff --git a/util/test/tests/Vulkan/VK_Shader_ISA.py b/util/test/tests/Vulkan/VK_Shader_ISA.py
index 1f0ed8a82..1e2905b52 100644
--- a/util/test/tests/Vulkan/VK_Shader_ISA.py
+++ b/util/test/tests/Vulkan/VK_Shader_ISA.py
@@ -13,7 +13,7 @@ class VK_Shader_ISA(rdtest.TestCase):
 
         is_amd = 'AMD' in action.customName
 
-        self.controller.SetFrameEvent(action.next.eventId, False)
+        self.controller.SetFrameEvent(action.nextAction.eventId, False)
 
         pipe: rd.PipeState = self.controller.GetPipelineState()
 
diff --git a/util/test/tests/Vulkan/VK_Spec_Constants.py b/util/test/tests/Vulkan/VK_Spec_Constants.py
index d575933b4..3ccc43e32 100644
--- a/util/test/tests/Vulkan/VK_Spec_Constants.py
+++ b/util/test/tests/Vulkan/VK_Spec_Constants.py
@@ -141,4 +141,4 @@ class VK_Spec_Constants(rdtest.TestCase):
 
             rdtest.log.success("Draw with {} colors picked value is as expected".format(num_colors))
 
-            action = action.next
+            action = action.nextAction
diff --git a/util/test/tests/Vulkan/VK_VRS.py b/util/test/tests/Vulkan/VK_VRS.py
index aeb880bd2..5176feb54 100644
--- a/util/test/tests/Vulkan/VK_VRS.py
+++ b/util/test/tests/Vulkan/VK_VRS.py
@@ -49,7 +49,7 @@ class VK_VRS(rdtest.TestCase):
             
             action = self.find_action("Default", pass_action.eventId)
             self.check(action is not None)
-            self.controller.SetFrameEvent(action.next.eventId, False)
+            self.controller.SetFrameEvent(action.nextAction.eventId, False)
 
             num_checks = 0
 
@@ -58,14 +58,14 @@ class VK_VRS(rdtest.TestCase):
             num_checks += 1
 
             action = self.find_action("Base", pass_action.eventId)
-            self.controller.SetFrameEvent(action.next.eventId, False)
+            self.controller.SetFrameEvent(action.nextAction.eventId, False)
             self.check(self.get_shading_rates() == ("2x2", "2x2"),
                        "{} shading rates unexpected: {}".format(action.customName, self.get_shading_rates()))
             num_checks += 1
 
             action = self.find_action("Vertex", pass_action.eventId)
             if action is not None:
-                self.controller.SetFrameEvent(action.next.eventId, False)
+                self.controller.SetFrameEvent(action.nextAction.eventId, False)
                 self.check(self.get_shading_rates() == ("1x1", "2x2"),
                            "{} shading rates unexpected: {}".format(action.customName, self.get_shading_rates()))
                 num_checks += 1
@@ -73,7 +73,7 @@ class VK_VRS(rdtest.TestCase):
 
             action = self.find_action("Image", pass_action.eventId)
             if action is not None:
-                self.controller.SetFrameEvent(action.next.eventId, False)
+                self.controller.SetFrameEvent(action.nextAction.eventId, False)
                 self.check(self.get_shading_rates() == ("2x2", "1x1"),
                            "{} shading rates unexpected: {}".format(action.customName, self.get_shading_rates()))
                 num_checks += 1
@@ -81,21 +81,21 @@ class VK_VRS(rdtest.TestCase):
 
             action = self.find_action("Base + Vertex", pass_action.eventId)
             if action is not None:
-                self.controller.SetFrameEvent(action.next.eventId, False)
+                self.controller.SetFrameEvent(action.nextAction.eventId, False)
                 self.check(self.get_shading_rates() == ("2x2", "2x2"),
                            "{} shading rates unexpected: {}".format(action.customName, self.get_shading_rates()))
                 num_checks += 1
 
             action = self.find_action("Base + Image", pass_action.eventId)
             if action is not None:
-                self.controller.SetFrameEvent(action.next.eventId, False)
+                self.controller.SetFrameEvent(action.nextAction.eventId, False)
                 self.check(self.get_shading_rates() == ("2x2", "2x2"),
                            "{} shading rates unexpected: {}".format(action.customName, self.get_shading_rates()))
                 num_checks += 1
 
             action = self.find_action("Vertex + Image", pass_action.eventId)
             if action is not None:
-                self.controller.SetFrameEvent(action.next.eventId, False)
+                self.controller.SetFrameEvent(action.nextAction.eventId, False)
                 self.check(self.get_shading_rates() == ("2x2", "2x2"),
                            "{} shading rates unexpected: {}".format(action.customName, self.get_shading_rates()))
                 num_checks += 1
diff --git a/util/test/tests/Vulkan/VK_Vertex_Attr_Zoo.py b/util/test/tests/Vulkan/VK_Vertex_Attr_Zoo.py
index 10926a9de..be560bb15 100644
--- a/util/test/tests/Vulkan/VK_Vertex_Attr_Zoo.py
+++ b/util/test/tests/Vulkan/VK_Vertex_Attr_Zoo.py
@@ -125,7 +125,7 @@ class VK_Vertex_Attr_Zoo(rdtest.TestCase):
         rdtest.log.success("Triangle picked value is as expected")
 
         # Step to the next action with awkward struct/array outputs
-        self.controller.SetFrameEvent(action.next.eventId, False)
+        self.controller.SetFrameEvent(action.nextAction.eventId, False)
 
         ref = {
             0: {