diff --git a/tools/gdb/.gitignore b/tools/gdb/.gitignore
deleted file mode 100644
index 12681cb30e7..00000000000
--- a/tools/gdb/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-dist/
-nuttxgdb.egg-info/
diff --git a/tools/pynuttx/.gitignore b/tools/pynuttx/.gitignore
new file mode 100644
index 00000000000..1abceb8f415
--- /dev/null
+++ b/tools/pynuttx/.gitignore
@@ -0,0 +1,2 @@
+dist/
+nxgdb.egg-info/
diff --git a/tools/gdb/gdbinit.py b/tools/pynuttx/gdbinit.py
similarity index 90%
rename from tools/gdb/gdbinit.py
rename to tools/pynuttx/gdbinit.py
index 2342dcb36fa..a965fa34850 100644
--- a/tools/gdb/gdbinit.py
+++ b/tools/pynuttx/gdbinit.py
@@ -1,5 +1,5 @@
 ############################################################################
-# tools/gdb/gdbinit.py
+# tools/pynuttx/gdbinit.py
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -29,9 +29,9 @@ if __name__ == "__main__":
     if here not in sys.path:
         sys.path.insert(0, here)
 
-    if "nuttxgdb" in sys.modules:
+    if "nxgdb" in sys.modules:
         for key in list(sys.modules.keys()):
-            if key.startswith("nuttxgdb"):
+            if key.startswith("nxgdb"):
                 del sys.modules[key]
 
-    import nuttxgdb  # noqa: F401
+    import nxgdb  # noqa: F401
diff --git a/tools/gdb/nuttxgdb/__init__.py b/tools/pynuttx/nxgdb/__init__.py
similarity index 96%
rename from tools/gdb/nuttxgdb/__init__.py
rename to tools/pynuttx/nxgdb/__init__.py
index 59a9850d270..254cf268e4f 100644
--- a/tools/gdb/nuttxgdb/__init__.py
+++ b/tools/pynuttx/nxgdb/__init__.py
@@ -1,5 +1,5 @@
 ############################################################################
-# tools/gdb/nuttxgdb/__init__.py
+# tools/pynuttx/nxgdb/__init__.py
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -29,7 +29,7 @@ import gdb
 if __name__ == "__main__":
     import sys
 
-    gdb.write("Use nuttx/tools/gdb/gdbinit.py instead")
+    gdb.write("Use nuttx/tools/pynuttx/gdbinit.py instead")
     sys.exit(1)
 
 here = path.dirname(path.abspath(__file__))
diff --git a/tools/gdb/nuttxgdb/debug.py b/tools/pynuttx/nxgdb/debug.py
similarity index 96%
rename from tools/gdb/nuttxgdb/debug.py
rename to tools/pynuttx/nxgdb/debug.py
index 5303bd2a163..35858b61d2c 100644
--- a/tools/gdb/nuttxgdb/debug.py
+++ b/tools/pynuttx/nxgdb/debug.py
@@ -1,5 +1,7 @@
 ############################################################################
-# tools/gdb/nuttxgdb/debug.py
+# tools/pynuttx/nxgdb/debug.py
+#
+# SPDX-License-Identifier: Apache-2.0
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/tools/gdb/nuttxgdb/diagnose.py b/tools/pynuttx/nxgdb/diagnose.py
similarity index 98%
rename from tools/gdb/nuttxgdb/diagnose.py
rename to tools/pynuttx/nxgdb/diagnose.py
index 139925618fc..0a0f694fb44 100644
--- a/tools/gdb/nuttxgdb/diagnose.py
+++ b/tools/pynuttx/nxgdb/diagnose.py
@@ -1,5 +1,5 @@
 ############################################################################
-# tools/gdb/nuttx_gdb/diagnose.py
+# tools/pynuttx/nxgdb/diagnose.py
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/tools/gdb/nuttxgdb/dmesg.py b/tools/pynuttx/nxgdb/dmesg.py
similarity index 98%
rename from tools/gdb/nuttxgdb/dmesg.py
rename to tools/pynuttx/nxgdb/dmesg.py
index bb291a82762..8f4a487c5f9 100644
--- a/tools/gdb/nuttxgdb/dmesg.py
+++ b/tools/pynuttx/nxgdb/dmesg.py
@@ -1,5 +1,5 @@
 ############################################################################
-# tools/gdb/nuttxgdb/dmesg.py
+# tools/pynuttx/nxgdb/dmesg.py
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/tools/gdb/nuttxgdb/fs.py b/tools/pynuttx/nxgdb/fs.py
similarity index 99%
rename from tools/gdb/nuttxgdb/fs.py
rename to tools/pynuttx/nxgdb/fs.py
index ea527cbf835..8ecf5017b67 100644
--- a/tools/gdb/nuttxgdb/fs.py
+++ b/tools/pynuttx/nxgdb/fs.py
@@ -1,5 +1,5 @@
 ############################################################################
-# tools/gdb/nuttxgdb/fs.py
+# tools/pynuttx/nxgdb/fs.py
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/tools/gdb/nuttxgdb/gcore.py b/tools/pynuttx/nxgdb/gcore.py
similarity index 99%
rename from tools/gdb/nuttxgdb/gcore.py
rename to tools/pynuttx/nxgdb/gcore.py
index 3a303762870..8a2deabfaee 100644
--- a/tools/gdb/nuttxgdb/gcore.py
+++ b/tools/pynuttx/nxgdb/gcore.py
@@ -1,5 +1,5 @@
 ############################################################################
-# tools/gdb/nuttxgdb/gcore.py
+# tools/pynuttx/nxgdb/gcore.py
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/tools/gdb/nuttxgdb/lists.py b/tools/pynuttx/nxgdb/lists.py
similarity index 99%
rename from tools/gdb/nuttxgdb/lists.py
rename to tools/pynuttx/nxgdb/lists.py
index 0f61925be28..0c6222f1fb3 100644
--- a/tools/gdb/nuttxgdb/lists.py
+++ b/tools/pynuttx/nxgdb/lists.py
@@ -1,5 +1,5 @@
 ############################################################################
-# tools/gdb/nuttxgdb/lists.py
+# tools/pynuttx/nxgdb/lists.py
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/tools/gdb/nuttxgdb/macros.py b/tools/pynuttx/nxgdb/macros.py
similarity index 98%
rename from tools/gdb/nuttxgdb/macros.py
rename to tools/pynuttx/nxgdb/macros.py
index bc07ec67616..d1d9fa78265 100644
--- a/tools/gdb/nuttxgdb/macros.py
+++ b/tools/pynuttx/nxgdb/macros.py
@@ -1,5 +1,5 @@
 ############################################################################
-# tools/gdb/nuttxgdb/macros.py
+# tools/pynuttx/nxgdb/macros.py
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -194,7 +194,7 @@ def do_expand(expr, macro_map):
 
 
 # NOTE: Implement a fully functional parser which can
-# preprocess all the C macros according to ISO 9899 standard
+# preprocess all the C marcos according to ISO 9899 standard
 # may be an overkill, what we really care about are those
 # macros that can be evaluated to a constant value.
 #
diff --git a/tools/gdb/nuttxgdb/memcheck.py b/tools/pynuttx/nxgdb/memcheck.py
similarity index 98%
rename from tools/gdb/nuttxgdb/memcheck.py
rename to tools/pynuttx/nxgdb/memcheck.py
index 8f91c002aad..4cb1c51d6a4 100644
--- a/tools/gdb/nuttxgdb/memcheck.py
+++ b/tools/pynuttx/nxgdb/memcheck.py
@@ -1,5 +1,7 @@
 ############################################################################
-# tools/gdb/nuttxgdb/memcheck.py
+# tools/pynuttx/nxgdb/memcheck.py
+#
+# SPDX-License-Identifier: Apache-2.0
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/tools/gdb/nuttxgdb/memdump.py b/tools/pynuttx/nxgdb/memdump.py
similarity index 99%
rename from tools/gdb/nuttxgdb/memdump.py
rename to tools/pynuttx/nxgdb/memdump.py
index 342e7d2e821..50bafaebee5 100644
--- a/tools/gdb/nuttxgdb/memdump.py
+++ b/tools/pynuttx/nxgdb/memdump.py
@@ -1,5 +1,5 @@
 ############################################################################
-# tools/gdb/nuttxgdb/memdump.py
+# tools/pynuttx/nxgdb/memdump.py
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/tools/gdb/nuttxgdb/memleak.py b/tools/pynuttx/nxgdb/memleak.py
similarity index 99%
rename from tools/gdb/nuttxgdb/memleak.py
rename to tools/pynuttx/nxgdb/memleak.py
index 4c80edd7386..9ffdfbda481 100644
--- a/tools/gdb/nuttxgdb/memleak.py
+++ b/tools/pynuttx/nxgdb/memleak.py
@@ -1,5 +1,7 @@
 ############################################################################
-# tools/gdb/nuttxgdb/memleak.py
+# tools/pynuttx/nxgdb/memleak.py
+#
+# SPDX-License-Identifier: Apache-2.0
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/tools/gdb/nuttxgdb/mm.py b/tools/pynuttx/nxgdb/mm.py
similarity index 99%
rename from tools/gdb/nuttxgdb/mm.py
rename to tools/pynuttx/nxgdb/mm.py
index bb923ecd5e1..7104a1ce73a 100644
--- a/tools/gdb/nuttxgdb/mm.py
+++ b/tools/pynuttx/nxgdb/mm.py
@@ -1,5 +1,7 @@
 ############################################################################
-# tools/gdb/nuttxgdb/mm.py
+# tools/pynuttx/nxgdb/mm.py
+#
+# SPDX-License-Identifier: Apache-2.0
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/tools/gdb/nuttxgdb/net.py b/tools/pynuttx/nxgdb/net.py
similarity index 99%
rename from tools/gdb/nuttxgdb/net.py
rename to tools/pynuttx/nxgdb/net.py
index 256267af503..ffb23a113d4 100644
--- a/tools/gdb/nuttxgdb/net.py
+++ b/tools/pynuttx/nxgdb/net.py
@@ -1,5 +1,5 @@
 ############################################################################
-# tools/gdb/nuttxgdb/net.py
+# tools/pynuttx/nxgdb/net.py
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/tools/gdb/nuttxgdb/prefix.py b/tools/pynuttx/nxgdb/prefix.py
similarity index 97%
rename from tools/gdb/nuttxgdb/prefix.py
rename to tools/pynuttx/nxgdb/prefix.py
index 903d69bf25c..1f3ce210e84 100644
--- a/tools/gdb/nuttxgdb/prefix.py
+++ b/tools/pynuttx/nxgdb/prefix.py
@@ -1,5 +1,5 @@
 ############################################################################
-# tools/gdb/nuttx_gdb/prefix.py
+# tools/pynuttx/nxgdb/prefix.py
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/tools/gdb/nuttxgdb/profile.py b/tools/pynuttx/nxgdb/profile.py
similarity index 98%
rename from tools/gdb/nuttxgdb/profile.py
rename to tools/pynuttx/nxgdb/profile.py
index bf466f5742e..1d16abef454 100644
--- a/tools/gdb/nuttxgdb/profile.py
+++ b/tools/pynuttx/nxgdb/profile.py
@@ -1,5 +1,5 @@
 ############################################################################
-# tools/gdb/nuttxgdb/profile.py
+# tools/pynuttx/nxgdb/profile.py
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/tools/gdb/nuttxgdb/protocols/fs.py b/tools/pynuttx/nxgdb/protocols/fs.py
similarity index 95%
rename from tools/gdb/nuttxgdb/protocols/fs.py
rename to tools/pynuttx/nxgdb/protocols/fs.py
index 787bcb578bf..b36d6c554f2 100644
--- a/tools/gdb/nuttxgdb/protocols/fs.py
+++ b/tools/pynuttx/nxgdb/protocols/fs.py
@@ -1,5 +1,7 @@
 ############################################################################
-# tools/gdb/nuttxgdb/protocols/fs.py
+# tools/pynuttx/nxgdb/protocols/fs.py
+#
+# SPDX-License-Identifier: Apache-2.0
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/tools/gdb/nuttxgdb/protocols/mm.py b/tools/pynuttx/nxgdb/protocols/mm.py
similarity index 98%
rename from tools/gdb/nuttxgdb/protocols/mm.py
rename to tools/pynuttx/nxgdb/protocols/mm.py
index 96d9ae66a67..3935b1b09f4 100644
--- a/tools/gdb/nuttxgdb/protocols/mm.py
+++ b/tools/pynuttx/nxgdb/protocols/mm.py
@@ -1,6 +1,8 @@
 ############################################################################
 # tools/gdb/nuttxgdb/protocols/mm.py
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
diff --git a/tools/gdb/nuttxgdb/protocols/thread.py b/tools/pynuttx/nxgdb/protocols/thread.py
similarity index 97%
rename from tools/gdb/nuttxgdb/protocols/thread.py
rename to tools/pynuttx/nxgdb/protocols/thread.py
index 9572b0feaaf..71e970bea8f 100644
--- a/tools/gdb/nuttxgdb/protocols/thread.py
+++ b/tools/pynuttx/nxgdb/protocols/thread.py
@@ -1,5 +1,7 @@
 ############################################################################
-# tools/gdb/nuttxgdb/protocols/thread.py
+# tools/pynuttx/nxgdb/protocols/thread.py
+#
+# SPDX-License-Identifier: Apache-2.0
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/tools/gdb/nuttxgdb/protocols/value.py b/tools/pynuttx/nxgdb/protocols/value.py
similarity index 96%
rename from tools/gdb/nuttxgdb/protocols/value.py
rename to tools/pynuttx/nxgdb/protocols/value.py
index 6167e5fc8a0..2964b94be36 100644
--- a/tools/gdb/nuttxgdb/protocols/value.py
+++ b/tools/pynuttx/nxgdb/protocols/value.py
@@ -1,5 +1,7 @@
 ############################################################################
-# tools/gdb/nuttxgdb/protocols/value.py
+# tools/pynuttx/nxgdb/protocols/value.py
+#
+# SPDX-License-Identifier: Apache-2.0
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/tools/gdb/nuttxgdb/protocols/wdog.py b/tools/pynuttx/nxgdb/protocols/wdog.py
similarity index 96%
rename from tools/gdb/nuttxgdb/protocols/wdog.py
rename to tools/pynuttx/nxgdb/protocols/wdog.py
index dc8cecfc665..a8bf968d993 100644
--- a/tools/gdb/nuttxgdb/protocols/wdog.py
+++ b/tools/pynuttx/nxgdb/protocols/wdog.py
@@ -1,5 +1,5 @@
 ############################################################################
-# tools/gdb/nuttxgdb/protocols/wdog.py
+# tools/pynuttx/nxgdb/protocols/wdog.py
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/tools/gdb/nuttxgdb/protocols/wqueue.py b/tools/pynuttx/nxgdb/protocols/wqueue.py
similarity index 97%
rename from tools/gdb/nuttxgdb/protocols/wqueue.py
rename to tools/pynuttx/nxgdb/protocols/wqueue.py
index 479175478df..9c5e5808a58 100644
--- a/tools/gdb/nuttxgdb/protocols/wqueue.py
+++ b/tools/pynuttx/nxgdb/protocols/wqueue.py
@@ -1,5 +1,5 @@
 ############################################################################
-# tools/gdb/nuttxgdb/protocols/wqueue.py
+# tools/pynuttx/nxgdb/protocols/wqueue.py
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/tools/gdb/nuttxgdb/rpmsg.py b/tools/pynuttx/nxgdb/rpmsg.py
similarity index 98%
rename from tools/gdb/nuttxgdb/rpmsg.py
rename to tools/pynuttx/nxgdb/rpmsg.py
index 4bb805c97c3..a00e2249351 100644
--- a/tools/gdb/nuttxgdb/rpmsg.py
+++ b/tools/pynuttx/nxgdb/rpmsg.py
@@ -1,5 +1,7 @@
 ############################################################################
-# tools/gdb/rpmsg.py
+# tools/pynuttx/rpmsg.py
+#
+# SPDX-License-Identifier: Apache-2.0
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/tools/gdb/nuttxgdb/stack.py b/tools/pynuttx/nxgdb/stack.py
similarity index 99%
rename from tools/gdb/nuttxgdb/stack.py
rename to tools/pynuttx/nxgdb/stack.py
index 53c936e29f2..132cb9a84d3 100644
--- a/tools/gdb/nuttxgdb/stack.py
+++ b/tools/pynuttx/nxgdb/stack.py
@@ -1,5 +1,5 @@
 ############################################################################
-# tools/gdb/nuttxgdb/stack.py
+# tools/pynuttx/nxgdb/stack.py
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/tools/gdb/nuttxgdb/thread.py b/tools/pynuttx/nxgdb/thread.py
similarity index 99%
rename from tools/gdb/nuttxgdb/thread.py
rename to tools/pynuttx/nxgdb/thread.py
index ef08489bf10..a1e98f40d89 100644
--- a/tools/gdb/nuttxgdb/thread.py
+++ b/tools/pynuttx/nxgdb/thread.py
@@ -1,5 +1,5 @@
 ############################################################################
-# tools/gdb/nuttxgdb/thread.py
+# tools/pynuttx/nxgdb/thread.py
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/tools/gdb/nuttxgdb/utils.py b/tools/pynuttx/nxgdb/utils.py
similarity index 99%
rename from tools/gdb/nuttxgdb/utils.py
rename to tools/pynuttx/nxgdb/utils.py
index b79f5850e16..e33530f9773 100644
--- a/tools/gdb/nuttxgdb/utils.py
+++ b/tools/pynuttx/nxgdb/utils.py
@@ -1,5 +1,5 @@
 ############################################################################
-# tools/gdb/nuttxgdb/utils.py
+# tools/pynuttx/nxgdb/utils.py
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/tools/gdb/nuttxgdb/wdog.py b/tools/pynuttx/nxgdb/wdog.py
similarity index 98%
rename from tools/gdb/nuttxgdb/wdog.py
rename to tools/pynuttx/nxgdb/wdog.py
index f25d3c26b65..bd248f82745 100644
--- a/tools/gdb/nuttxgdb/wdog.py
+++ b/tools/pynuttx/nxgdb/wdog.py
@@ -1,5 +1,5 @@
 ############################################################################
-# tools/gdb/nuttxgdb/wdog.py
+# tools/pynuttx/nxgdb/wdog.py
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/tools/gdb/nuttxgdb/wqueue.py b/tools/pynuttx/nxgdb/wqueue.py
similarity index 99%
rename from tools/gdb/nuttxgdb/wqueue.py
rename to tools/pynuttx/nxgdb/wqueue.py
index a768411f393..52abf553a25 100644
--- a/tools/gdb/nuttxgdb/wqueue.py
+++ b/tools/pynuttx/nxgdb/wqueue.py
@@ -1,5 +1,5 @@
 ############################################################################
-# tools/gdb/nuttxgdb/wqueue.py
+# tools/pynuttx/nxgdb/wqueue.py
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/tools/gdb/pyproject.toml b/tools/pynuttx/pyproject.toml
similarity index 92%
rename from tools/gdb/pyproject.toml
rename to tools/pynuttx/pyproject.toml
index b8b271cbd90..d8dc6577236 100644
--- a/tools/gdb/pyproject.toml
+++ b/tools/pynuttx/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 version = "0.0.1"
-name = 'nuttxgdb'
+name = 'nxgdb'
 description = 'NuttX RTOS GDB extensions'
 readme = "README.md"
 license = { file = 'LICENSE' }
@@ -19,4 +19,4 @@ dependencies = ["matplotlib", "numpy", "pyelftools"]
 requires-python = ">=3.8"
 
 [tool.setuptools.package-dir]
-nuttxgdb = "nuttxgdb"
+nxgdb = "nxgdb"
diff --git a/tools/gdb/requirements.txt b/tools/pynuttx/requirements.txt
similarity index 100%
rename from tools/gdb/requirements.txt
rename to tools/pynuttx/requirements.txt