diff --git a/testing/README.txt b/testing/README.txt
index 4eb2aa2c0..1b9c2602d 100644
--- a/testing/README.txt
+++ b/testing/README.txt
@@ -27,8 +27,8 @@ testing/cxxtest
 
   Example Configuration Options
   -----------------------------
-    CONFIG_TESTINGCXXTEST=y - Eanbles the example
-    CONFIG_TESTINGCXXTEST_CXXINITIALIZE=y - By default, if CONFIG_HAVE_CXX
+    CONFIG_TESTING_CXXTEST=y - Eanbles the example
+    CONFIG_TESTING_CXXTEST_CXXINITIALIZE=y - By default, if CONFIG_HAVE_CXX
       and CONFIG_HAVE_CXXINITIALIZE are defined, then this example
       will call the NuttX function to initialize static C++ constructors.
       This option may be disabled, however, if that static initialization
diff --git a/testing/cxxtest/Kconfig b/testing/cxxtest/Kconfig
index 1b51c5015..9951ca1a6 100644
--- a/testing/cxxtest/Kconfig
+++ b/testing/cxxtest/Kconfig
@@ -3,16 +3,16 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-config TESTINGCXXTEST
+config TESTING_CXXTEST
 	tristate "C++ test program"
 	default n
 	depends on HAVE_CXX
 	---help---
 		Enable the C++ test program
 
-if TESTINGCXXTEST
+if TESTING_CXXTEST
 
-config TESTINGCXXTEST_CXXINITIALIZE
+config TESTING_CXXTEST_CXXINITIALIZE
 	bool "C++ Initialization"
 	default y
 	depends on HAVE_CXX && HAVE_CXXINITIALIZE
diff --git a/testing/cxxtest/Make.defs b/testing/cxxtest/Make.defs
index 66858bb41..49d07a7c8 100644
--- a/testing/cxxtest/Make.defs
+++ b/testing/cxxtest/Make.defs
@@ -34,6 +34,6 @@
 #
 ############################################################################
 
-ifneq ($(CONFIG_TESTINGCXXTEST),)
+ifneq ($(CONFIG_TESTING_CXXTEST),)
 CONFIGURED_APPS += testing
 endif
diff --git a/testing/cxxtest/Makefile b/testing/cxxtest/Makefile
index 3bead4c44..0dcc1308b 100644
--- a/testing/cxxtest/Makefile
+++ b/testing/cxxtest/Makefile
@@ -48,6 +48,6 @@ APPNAME = cxxtest
 PRIORITY = SCHED_PRIORITY_DEFAULT
 STACKSIZE = 4096
 
-MODULE = CONFIG_TESTINGCXXTEST
+MODULE = CONFIG_TESTING_CXXTEST
 
 include $(APPDIR)/Application.mk
diff --git a/testing/cxxtest/README.txt b/testing/cxxtest/README.txt
index 425457f06..00abab505 100644
--- a/testing/cxxtest/README.txt
+++ b/testing/cxxtest/README.txt
@@ -15,8 +15,8 @@ README
 
   Example Configuration Options
   -----------------------------
-    CONFIG_TESTINGCXXTEST=y - Eanbles the example
-    CONFIG_TESTINGCXXTEST_CXXINITIALIZE=y - By default, if CONFIG_HAVE_CXX
+    CONFIG_TESTING_CXXTEST=y - Eanbles the example
+    CONFIG_TESTING_CXXTEST_CXXINITIALIZE=y - By default, if CONFIG_HAVE_CXX
       and CONFIG_HAVE_CXXINITIALIZE are defined, then this example
       will call the NuttX function to initialize static C++ constructors.
       This option may be disabled, however, if that static initialization
diff --git a/testing/cxxtest/cxxtest_main.cxx b/testing/cxxtest/cxxtest_main.cxx
index b2e1486f8..3986c87bd 100644
--- a/testing/cxxtest/cxxtest_main.cxx
+++ b/testing/cxxtest/cxxtest_main.cxx
@@ -61,7 +61,7 @@ using namespace std;
 
 #if !defined(CONFIG_HAVE_CXX) || !defined(CONFIG_HAVE_CXXINITIALIZE)
 #  warning Support for static initializers is NOT enabled
-#  undef CONFIG_TESTINGCXXTEST_CXXINITIALIZE
+#  undef CONFIG_TESTING_CXXTEST_CXXINITIALIZE
 #endif
 
 //***************************************************************************
@@ -250,7 +250,7 @@ extern "C"
     // If C++ initialization for static constructors is supported, then do
     // that first
 
-#ifdef CONFIG_TESTINGCXXTEST_CXXINITIALIZE
+#ifdef CONFIG_TESTING_CXXTEST_CXXINITIALIZE
     up_cxxinitialize();
 #endif