diff --git a/Documentation/guides/gdbwithpython.rst b/Documentation/guides/gdbwithpython.rst
index b12f27186f..deea4fe02b 100644
--- a/Documentation/guides/gdbwithpython.rst
+++ b/Documentation/guides/gdbwithpython.rst
@@ -14,7 +14,7 @@ Usage
 
 1. Compile NuttX with CONFIG_DEBUG_SYMBOLS=y enabled and change `CONFIG_DEBUG_SYMBOLS_LEVEL` to -g3.
 2. Use GDB to debug the NuttX ELF binary (on a real device, a simulator, or with a coredump).
-3. Add the following argument to the GDB command line: `-ix="nuttx/tools/gdb/gdbinit.py"`
+3. Add the following argument to the GDB command line: `-ix="nuttx/tools/pynuttx/gdbinit.py"`
 4. GDB will automatically load the Python script, enabling the use of custom commands.
 
 How to write a GDB python script
diff --git a/Documentation/guides/qemugdb.rst b/Documentation/guides/qemugdb.rst
index 8a6921009a..2af541e505 100644
--- a/Documentation/guides/qemugdb.rst
+++ b/Documentation/guides/qemugdb.rst
@@ -53,7 +53,7 @@ Start GDB to connect to QEMU
 
     .. code-block:: console
 
-      $ gdb-multiarch nuttx -ex "source tools/gdb/gdbinit.py" -ex "target remote 127.0.0.1:1234"
+      $ gdb-multiarch nuttx -ex "source tools/pynuttx/gdbinit.py" -ex "target remote 127.0.0.1:1234"
       Reading symbols from nuttx...
       Registering NuttX GDB commands from ~/nuttx/nuttx/tools/gdb/nuttxgdb
       set pagination off
diff --git a/Documentation/platforms/risc-v/qemu-rv/boards/rv-virt/index.rst b/Documentation/platforms/risc-v/qemu-rv/boards/rv-virt/index.rst
index 4d8bd0381b..7329f198a8 100644
--- a/Documentation/platforms/risc-v/qemu-rv/boards/rv-virt/index.rst
+++ b/Documentation/platforms/risc-v/qemu-rv/boards/rv-virt/index.rst
@@ -424,7 +424,7 @@ After building the kernel (and the applications, in kernel mode), use the toolch
 to debug RISC-V applications. For instance, if you are using the xPack's prebuilt toolchain,
 you can use the following command to start GDB::
 
-    $ riscv-none-elf-gdb-py3 -ix tools/gdb/gdbinit.py --tui nuttx
+    $ riscv-none-elf-gdb-py3 -ix tools/pynuttx/gdbinit.py --tui nuttx
 
 To use QEMU for debugging, one should add the parameters ``-s -S`` to the QEMU command line.
 
diff --git a/Documentation/quickstart/debugging.rst b/Documentation/quickstart/debugging.rst
index 1101e0747c..96c6eed850 100644
--- a/Documentation/quickstart/debugging.rst
+++ b/Documentation/quickstart/debugging.rst
@@ -244,12 +244,12 @@ The benefit is that it works also for the sim build where ``openocd`` is
 not applicable. For this to work, you will need to enable PROC filesystem support
 which will expose required task information (``CONFIG_FS_PROCFS=y``).
 
-To use this approach, you can load the ``nuttx/tools/gdb/gdbinit.py`` file. An
+To use this approach, you can load the ``nuttx/tools/pynuttx/gdbinit.py`` file. An
 easy way to do this is to add an extra command:
 
 .. code-block:: console
 
-  $ gdb nuttx -ix=tools/gdb/gdbinit.py
+  $ gdb nuttx -ix=tools/pynuttx/gdbinit.py
 
 gdb can need to set the current elf support architecture, for example,
 the prefix is arm-ebai-none-.