diff --git a/cross-project-tests/debuginfo-tests/dexter/dex/debugger/DAP.py b/cross-project-tests/debuginfo-tests/dexter/dex/debugger/DAP.py
index 76aa4286a552..3921e7f407f0 100644
--- a/cross-project-tests/debuginfo-tests/dexter/dex/debugger/DAP.py
+++ b/cross-project-tests/debuginfo-tests/dexter/dex/debugger/DAP.py
@@ -635,7 +635,7 @@ class DAP(DebuggerBase, metaclass=abc.ABCMeta):
     def _post_step_hook(self):
         """Hook to be executed after completing a step request."""
 
-    def step(self):
+    def step_in(self):
         self._flush_breakpoints()
         step_req_id = self.send_message(
             self.make_request("stepIn", {"threadId": self._debugger_state.thread})
diff --git a/cross-project-tests/debuginfo-tests/dexter/dex/debugger/DebuggerBase.py b/cross-project-tests/debuginfo-tests/dexter/dex/debugger/DebuggerBase.py
index d4a555085fac..bf7552bd5fe3 100644
--- a/cross-project-tests/debuginfo-tests/dexter/dex/debugger/DebuggerBase.py
+++ b/cross-project-tests/debuginfo-tests/dexter/dex/debugger/DebuggerBase.py
@@ -184,7 +184,7 @@ class DebuggerBase(object, metaclass=abc.ABCMeta):
         pass
 
     @abc.abstractmethod
-    def step(self):
+    def step_in(self):
         pass
 
     @abc.abstractmethod
diff --git a/cross-project-tests/debuginfo-tests/dexter/dex/debugger/DebuggerControllers/DefaultController.py b/cross-project-tests/debuginfo-tests/dexter/dex/debugger/DebuggerControllers/DefaultController.py
index 709bd76e2050..14270843822f 100644
--- a/cross-project-tests/debuginfo-tests/dexter/dex/debugger/DebuggerControllers/DefaultController.py
+++ b/cross-project-tests/debuginfo-tests/dexter/dex/debugger/DebuggerControllers/DefaultController.py
@@ -128,7 +128,7 @@ class DefaultController(DebuggerControllerBase):
                     break
 
             if in_source_file(self.source_files, step_info):
-                self.debugger.step()
+                self.debugger.step_in()
             else:
                 self.debugger.go()
 
diff --git a/cross-project-tests/debuginfo-tests/dexter/dex/debugger/dbgeng/dbgeng.py b/cross-project-tests/debuginfo-tests/dexter/dex/debugger/dbgeng/dbgeng.py
index 03aa548495ce..bf0a0f198672 100644
--- a/cross-project-tests/debuginfo-tests/dexter/dex/debugger/dbgeng/dbgeng.py
+++ b/cross-project-tests/debuginfo-tests/dexter/dex/debugger/dbgeng/dbgeng.py
@@ -111,7 +111,7 @@ class DbgEng(DebuggerBase):
         # We are, by this point, already launched.
         self.step_info = probe_process.probe_state(self.client)
 
-    def step(self):
+    def step_in(self):
         res = setup.step_once(self.client)
         if not res:
             self.finished = True
@@ -122,7 +122,7 @@ class DbgEng(DebuggerBase):
         # relevant source file -- this is likely to be a problem when setting
         # breakpoints. Until that's fixed, single step instead of running
         # freely. This isn't very efficient, but at least makes progress.
-        self.step()
+        self.step_in()
 
     def _get_step_info(self, watches, step_index):
         frames = self.step_info
diff --git a/cross-project-tests/debuginfo-tests/dexter/dex/debugger/lldb/LLDB.py b/cross-project-tests/debuginfo-tests/dexter/dex/debugger/lldb/LLDB.py
index 2cf955394075..4263fdb5aa01 100644
--- a/cross-project-tests/debuginfo-tests/dexter/dex/debugger/lldb/LLDB.py
+++ b/cross-project-tests/debuginfo-tests/dexter/dex/debugger/lldb/LLDB.py
@@ -204,7 +204,7 @@ class LLDB(DebuggerBase):
         assert num_stopped_threads > 0
         assert self._thread, (self._process, self._thread)
 
-    def step(self):
+    def step_in(self):
         self._thread.StepInto()
         stop_reason = self._thread.GetStopReason()
         # If we (1) completed a step and (2) are sitting at a breakpoint,
diff --git a/cross-project-tests/debuginfo-tests/dexter/dex/debugger/visualstudio/VisualStudio.py b/cross-project-tests/debuginfo-tests/dexter/dex/debugger/visualstudio/VisualStudio.py
index a7f12cde1f04..1a1c8e9a8d9a 100644
--- a/cross-project-tests/debuginfo-tests/dexter/dex/debugger/visualstudio/VisualStudio.py
+++ b/cross-project-tests/debuginfo-tests/dexter/dex/debugger/visualstudio/VisualStudio.py
@@ -308,7 +308,7 @@ class VisualStudio(
         self.context.logger.note("Launching VS debugger...")
         self._fn_go(False)
 
-    def step(self):
+    def step_in(self):
         self._fn_step(False)
 
     def go(self) -> ReturnCode: