diff --git a/drivers/serial/serial_gdbstub.c b/drivers/serial/serial_gdbstub.c
index d603c77f43..b2d3362e1d 100644
--- a/drivers/serial/serial_gdbstub.c
+++ b/drivers/serial/serial_gdbstub.c
@@ -77,7 +77,7 @@ static int uart_gdbstub_panic_callback(FAR struct notifier_block *nb,
          "target-charset ASCII\" -ex \"target remote /dev/ttyUSB0\"\n");
 
   gdb_console_message(uart_gdbstub->state, "Enter panic gdbstub mode!\n");
-  gdb_process(uart_gdbstub->state, GDBSTUB_STOPREASON_CTRLC, NULL);
+  gdb_process(uart_gdbstub->state, GDB_STOPREASON_CTRLC, NULL);
   return 0;
 }
 
@@ -94,7 +94,7 @@ static int uart_gdbstub_ctrlc(FAR struct uart_dev_s *dev,
                               FAR unsigned int *status)
 {
   uart_disablerxint(dev);
-  gdb_process(g_uart_gdbstub->state, GDBSTUB_STOPREASON_CTRLC, NULL);
+  gdb_process(g_uart_gdbstub->state, GDB_STOPREASON_CTRLC, NULL);
   uart_enablerxint(dev);
   return 0;
 }
diff --git a/libs/libc/gdbstub/lib_gdbstub.c b/libs/libc/gdbstub/lib_gdbstub.c
index 2f1c7e2154..b38298f5df 100644
--- a/libs/libc/gdbstub/lib_gdbstub.c
+++ b/libs/libc/gdbstub/lib_gdbstub.c
@@ -1532,7 +1532,7 @@ static void gdb_debugpoint_callback(int type, FAR void *addr,
         break;
       case DEBUGPOINT_STEPPOINT:
         stopreason = GDB_STOPREASON_STEPPOINT;
-        up_debugpoint_remove(DEBUGPOINT_STEPPOINT, NULL, 0);
+        gdb_debugpoint_remove(GDB_STOPREASON_STEPPOINT, NULL, 0);
         break;
       default:
         return;
@@ -1628,12 +1628,12 @@ static int gdb_debugpoint(FAR struct gdb_state_s *state, bool enable)
 
   if (enable)
     {
-      ret = gdbstub_debugpoint_add(type, (FAR void *)addr, size,
-                                   gdbstub_debugpoint_callback, state);
+      ret = gdb_debugpoint_add(type, (FAR void *)addr, size,
+                                   gdb_debugpoint_callback, state);
     }
   else
     {
-      ret = gdbstub_debugpoint_remove(type, (FAR void *)addr, size);
+      ret = gdb_debugpoint_remove(type, (FAR void *)addr, size);
     }
 
   if (ret < 0)
@@ -1664,8 +1664,8 @@ static int gdb_debugpoint(FAR struct gdb_state_s *state, bool enable)
 
 static int gdb_step(FAR struct gdb_state_s *state)
 {
-  int ret = up_debugpoint_add(DEBUGPOINT_STEPPOINT, NULL, 0,
-                              gdbstub_debugpoint_callback, state);
+  int ret = gdb_debugpoint_add(GDB_STOPREASON_STEPPOINT, NULL, 0,
+                              gdb_debugpoint_callback, state);
 
   if (ret < 0)
     {