diff --git a/system/debug/CMakeLists.txt b/system/debugpoint/CMakeLists.txt
similarity index 84%
rename from system/debug/CMakeLists.txt
rename to system/debugpoint/CMakeLists.txt
index 4492f509ca..2741ebf877 100644
--- a/system/debug/CMakeLists.txt
+++ b/system/debugpoint/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ##############################################################################
-# apps/system/debug/CMakeLists.txt
+# apps/system/debugpoint/CMakeLists.txt
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
@@ -18,14 +18,14 @@
 #
 # ##############################################################################
 
-if(CONFIG_SYSTEM_DEBUG)
+if(CONFIG_SYSTEM_DEBUGPOINT)
   nuttx_add_application(
     NAME
-    ${CONFIG_SYSTEM_DEBUG_PROGNAME}
+    ${CONFIG_SYSTEM_DEBUGPOINT_PROGNAME}
     SRCS
     debug.c
     STACKSIZE
-    ${CONFIG_SYSTEM_DEBUG_STACKSIZE}
+    ${CONFIG_SYSTEM_DEBUGPOINT_STACKSIZE}
     PRIORITY
-    ${CONFIG_SYSTEM_DEBUG_PRIORITY})
+    ${CONFIG_SYSTEM_DEBUGPOINT_PRIORITY})
 endif()
diff --git a/system/debug/Kconfig b/system/debugpoint/Kconfig
similarity index 71%
rename from system/debug/Kconfig
rename to system/debugpoint/Kconfig
index 991e6ded3a..7329745a77 100644
--- a/system/debug/Kconfig
+++ b/system/debugpoint/Kconfig
@@ -3,30 +3,30 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-config SYSTEM_DEBUG
+config SYSTEM_DEBUGPOINT
 	tristate "Debugpoint utility"
 	default n
 	depends on ARCH_HAVE_DEBUG
 	depends on LIB_GDBSTUB
 	---help---
-		Enable the DEBUG test program. It is a simple
+		Enable the DEBUGPOINT test program. It is a simple
 		utility for testing the debug point support and
 		add debug points to the system by command line.
 
-if SYSTEM_DEBUG
+if SYSTEM_DEBUGPOINT
 
-config SYSTEM_DEBUG_PROGNAME
+config SYSTEM_DEBUGPOINT_PROGNAME
 	string "Program name"
-	default "debug"
+	default "debugpoint"
 	---help---
 		This is the name of the program that will be used when the NSH ELF
 		program is installed.
 
-config SYSTEM_DEBUG_PRIORITY
+config SYSTEM_DEBUGPOINT_PRIORITY
 	int "Task priority"
 	default 100
 
-config SYSTEM_DEBUG_STACKSIZE
+config SYSTEM_DEBUGPOINT_STACKSIZE
 	int "Stack size"
 	default DEFAULT_TASK_STACKSIZE
 
diff --git a/system/debug/Make.defs b/system/debugpoint/Make.defs
similarity index 88%
rename from system/debug/Make.defs
rename to system/debugpoint/Make.defs
index 5188b3cd8f..590a9aa62f 100644
--- a/system/debug/Make.defs
+++ b/system/debugpoint/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/system/debug/Make.defs
+# apps/system/debugpoint/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -18,6 +18,6 @@
 #
 ############################################################################
 
-ifneq ($(CONFIG_SYSTEM_DEBUG),)
-CONFIGURED_APPS += $(APPDIR)/system/debug
+ifneq ($(CONFIG_SYSTEM_DEBUGPOINT),)
+CONFIGURED_APPS += $(APPDIR)/system/debugpoint
 endif
diff --git a/system/debug/Makefile b/system/debugpoint/Makefile
similarity index 85%
rename from system/debug/Makefile
rename to system/debugpoint/Makefile
index 8e89cbeba8..9a6b6506be 100644
--- a/system/debug/Makefile
+++ b/system/debugpoint/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/system/debug/Makefile
+# apps/system/debugpoint/Makefile
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -22,9 +22,9 @@ include $(APPDIR)/Make.defs
 
 # debug built-in application info
 
-PROGNAME = $(CONFIG_SYSTEM_DEBUG_PROGNAME)
-PRIORITY = $(CONFIG_SYSTEM_DEBUG_PRIORITY)
-STACKSIZE = $(CONFIG_SYSTEM_DEBUG_STACKSIZE)
+PROGNAME = $(CONFIG_SYSTEM_DEBUGPOINT_PROGNAME)
+PRIORITY = $(CONFIG_SYSTEM_DEBUGPOINT_PRIORITY)
+STACKSIZE = $(CONFIG_SYSTEM_DEBUGPOINT_STACKSIZE)
 MODULE = $(CONFIG_SYSTEM_DEBUG)
 
 # source files
diff --git a/system/debug/debug.c b/system/debugpoint/debug.c
similarity index 99%
rename from system/debug/debug.c
rename to system/debugpoint/debug.c
index 9b62cb5c99..06341ad782 100644
--- a/system/debug/debug.c
+++ b/system/debugpoint/debug.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/system/debug/debug.c
+ * apps/system/debugpoint/debug.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with