diff --git a/include/execinfo.h b/include/execinfo.h
index 9907184f7c7..b7e0492beeb 100644
--- a/include/execinfo.h
+++ b/include/execinfo.h
@@ -34,7 +34,7 @@ extern "C"
 #define EXTERN extern
 #endif
 
-#if defined(CONFIG_EABI_UNWINDER)
+#if defined(CONFIG_UNWINDER)
 
 /* Store up to SIZE return address of the current program state in
  * ARRAY and return the exact number of values stored.
diff --git a/libs/libc/debug/Kconfig b/libs/libc/debug/Kconfig
index fd13b04587c..36366ed4cd6 100644
--- a/libs/libc/debug/Kconfig
+++ b/libs/libc/debug/Kconfig
@@ -9,8 +9,8 @@
 
 menu "Library Debugging"
 
-config EABI_UNWINDER
-	bool "EABI Stack Unwinder"
+config UNWINDER
+	bool "Stack Unwinder"
 	default "n"
 	---help---
 		This option enables stack unwinding support in NuttX
diff --git a/libs/libc/debug/Make.defs b/libs/libc/debug/Make.defs
index 8b64610b73b..81ac7d19e4b 100644
--- a/libs/libc/debug/Make.defs
+++ b/libs/libc/debug/Make.defs
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_EABI_UNWINDER),y)
+ifeq ($(CONFIG_UNWINDER),y)
 
 CSRCS += lib_backtrace.c lib_dumpstack.c