diff --git a/NxWidgets/Kconfig b/NxWidgets/Kconfig
index 9e4c4ec9a..4f6b84b73 100644
--- a/NxWidgets/Kconfig
+++ b/NxWidgets/Kconfig
@@ -52,7 +52,7 @@ if NX_MULTIUSER
 config NXWIDGET_SERVERINIT
 	bool "Start server"
 	default y
-	depends on !NUTTX_KERNEL
+	depends on !BUILD_PROTECTED && !BUILD_KERNEL
 	---help---
 		If this option is selected, then the NxWidgets::CNxServer class will
 		bring up the NX server when it is initialized.  If this option is
@@ -779,7 +779,7 @@ comment "Touchscreen Device Settings"
 config NXWM_TOUCHSCREEN_DEVINIT
 	bool "Touchscreen Device Initialization"
 	default y
-	depends on !NUTTX_KERNEL
+	depends on !BUILD_PROTECTED && !BUILD_KERNEL
 	---help---
 		It this option is selected, then the NxWM:CTouchscreen listener
 		thread will call a function arch_tcinitialize(NXWM_TOUCHSCREEN_DEVNO)
diff --git a/examples/README.txt b/examples/README.txt
index e6bf986c2..29219daaf 100644
--- a/examples/README.txt
+++ b/examples/README.txt
@@ -75,7 +75,8 @@ examples/buttons
   NOTE: This test exercises internal button driver interfaces.  As such, it
   relies on internal OS interfaces that are not normally available to a
   user-space program.  As a result, this example cannot be used if a
-  NuttX is built as a protected, supervisor kernel (CONFIG_NUTTX_KERNEL).
+  NuttX is built as a protected, supervisor kernel (CONFIG_BUILD_PROTECTED
+  or CONFIG_BUILD_KERNEL).
 
 examples/can
 ^^^^^^^^^^^^
@@ -291,8 +292,9 @@ examples/flash_test
     * CONFIG_MTD_SMART=y - SMART block driver support
     * CONFIG_NSH_BUILTIN_APPS=y - This example can only be built as an NSH
       command
-    * CONFIG_NUTTX_KERNEL=n - This test uses internal OS interfaces and so
-      is not available in the NUTTX kernel build
+    * CONFIG_BUILD_PROTECTED=n and CONFIG_BUILD_KERNEL=n- This test uses
+      internal OS interfaces and so is not available in the NUTTX kernel
+      builds
 
 examples/ftpc
 ^^^^^^^^^^^^^
@@ -582,7 +584,8 @@ examples/lcdrw
   NOTE: This test exercises internal lcd driver interfaces.  As such, it
   relies on internal OS interfaces that are not normally available to a
   user-space program.  As a result, this example cannot be used if a
-  NuttX is built as a protected, supervisor kernel (CONFIG_NUTTX_KERNEL).
+  NuttX is built as a protected, supervisor kernel (CONFIG_BUILD_PROTECTED
+  or CONFIG_BUILD_KERNEL).
 
 examples/mm
 ^^^^^^^^^^^
@@ -1387,7 +1390,8 @@ examples/relays
   NOTE: This test exercises internal relay driver interfaces.  As such, it
   relies on internal OS interfaces that are not normally available to a
   user-space program.  As a result, this example cannot be used if a
-  NuttX is built as a protected, supervisor kernel (CONFIG_NUTTX_KERNEL).
+  NuttX is built as a protected, supervisor kernel (CONFIG_BUILD_PROTECTED
+  or CONFIG_BUILD_KERNEL).
 
 examples/rgmp
 ^^^^^^^^^^^^^
diff --git a/examples/buttons/buttons_main.c b/examples/buttons/buttons_main.c
index 34b6c8055..987ab8559 100644
--- a/examples/buttons/buttons_main.c
+++ b/examples/buttons/buttons_main.c
@@ -37,7 +37,8 @@
  * NOTE: This test exercises internal button driver interfaces.  As such, it
  * it relies on internal OS interfaces that are not normally available to a
  * user-space program.  As a result, this example cannot be used if a
- * NuttX is built as a protected, supervisor kernel (CONFIG_NUTTX_KERNEL).
+ * NuttX is built as a protected, supervisor kernel (CONFIG_BUILD_PROTECTED or
+ * CONFIG_BUILD_KERNEL).
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/examples/elf/tests/errno/Makefile b/examples/elf/tests/errno/Makefile
index 44e50744b..d0f6f8256 100644
--- a/examples/elf/tests/errno/Makefile
+++ b/examples/elf/tests/errno/Makefile
@@ -54,7 +54,7 @@ endif
 
 LIBS =
 ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-ifeq ($(CONFIG_NUTTX_KERNEL),y)
+ifeq ($(CONFIG_BUILD_PROTECTED),y)
 LIBS += -luc
 else
 LIBS += -lc
diff --git a/examples/elf/tests/hello/Makefile b/examples/elf/tests/hello/Makefile
index a5fc71e31..bcb227979 100644
--- a/examples/elf/tests/hello/Makefile
+++ b/examples/elf/tests/hello/Makefile
@@ -54,7 +54,7 @@ endif
 
 LIBS =
 ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-ifeq ($(CONFIG_NUTTX_KERNEL),y)
+ifeq ($(CONFIG_BUILD_PROTECTED),y)
 LIBS += -luc
 else
 LIBS += -lc
diff --git a/examples/elf/tests/helloxx/Makefile b/examples/elf/tests/helloxx/Makefile
index f0b204ca5..8882e21a5 100644
--- a/examples/elf/tests/helloxx/Makefile
+++ b/examples/elf/tests/helloxx/Makefile
@@ -54,7 +54,7 @@ endif
 
 LIBS =
 ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-ifeq ($(CONFIG_NUTTX_KERNEL),y)
+ifeq ($(CONFIG_BUILD_PROTECTED),y)
 LIBS += -luc
 else
 LIBS += -lc
diff --git a/examples/elf/tests/longjmp/Makefile b/examples/elf/tests/longjmp/Makefile
index f85f95434..802d84df1 100644
--- a/examples/elf/tests/longjmp/Makefile
+++ b/examples/elf/tests/longjmp/Makefile
@@ -54,7 +54,7 @@ endif
 
 LIBS =
 ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-ifeq ($(CONFIG_NUTTX_KERNEL),y)
+ifeq ($(CONFIG_BUILD_PROTECTED),y)
 LIBS += -luc
 else
 LIBS += -lc
diff --git a/examples/elf/tests/mutex/Makefile b/examples/elf/tests/mutex/Makefile
index 70848c0f8..197bb41a9 100644
--- a/examples/elf/tests/mutex/Makefile
+++ b/examples/elf/tests/mutex/Makefile
@@ -54,7 +54,7 @@ endif
 
 LIBS =
 ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-ifeq ($(CONFIG_NUTTX_KERNEL),y)
+ifeq ($(CONFIG_BUILD_PROTECTED),y)
 LIBS += -luc
 else
 LIBS += -lc
diff --git a/examples/elf/tests/pthread/Makefile b/examples/elf/tests/pthread/Makefile
index 1b02b017c..0aa524506 100644
--- a/examples/elf/tests/pthread/Makefile
+++ b/examples/elf/tests/pthread/Makefile
@@ -54,7 +54,7 @@ endif
 
 LIBS =
 ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-ifeq ($(CONFIG_NUTTX_KERNEL),y)
+ifeq ($(CONFIG_BUILD_PROTECTED),y)
 LIBS += -luc
 else
 LIBS += -lc
diff --git a/examples/elf/tests/signal/Makefile b/examples/elf/tests/signal/Makefile
index abb596f6c..80b843e32 100644
--- a/examples/elf/tests/signal/Makefile
+++ b/examples/elf/tests/signal/Makefile
@@ -54,7 +54,7 @@ endif
 
 LIBS =
 ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-ifeq ($(CONFIG_NUTTX_KERNEL),y)
+ifeq ($(CONFIG_BUILD_PROTECTED),y)
 LIBS += -luc
 else
 LIBS += -lc
diff --git a/examples/elf/tests/struct/Makefile b/examples/elf/tests/struct/Makefile
index b0fa3e474..27595dfaa 100644
--- a/examples/elf/tests/struct/Makefile
+++ b/examples/elf/tests/struct/Makefile
@@ -56,7 +56,7 @@ endif
 
 LIBS =
 ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-ifeq ($(CONFIG_NUTTX_KERNEL),y)
+ifeq ($(CONFIG_BUILD_PROTECTED),y)
 LIBS += -luc
 else
 LIBS += -lc
diff --git a/examples/elf/tests/task/Makefile b/examples/elf/tests/task/Makefile
index dcf758dfd..6a93da9e3 100644
--- a/examples/elf/tests/task/Makefile
+++ b/examples/elf/tests/task/Makefile
@@ -54,7 +54,7 @@ endif
 
 LIBS =
 ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-ifeq ($(CONFIG_NUTTX_KERNEL),y)
+ifeq ($(CONFIG_BUILD_PROTECTED),y)
 LIBS += -luc
 else
 LIBS += -lc
diff --git a/examples/flash_test/Kconfig b/examples/flash_test/Kconfig
index 49b56dccc..e681226a9 100644
--- a/examples/flash_test/Kconfig
+++ b/examples/flash_test/Kconfig
@@ -6,7 +6,7 @@
 config EXAMPLES_FLASH_TEST
 	bool "SMART FLASH block device test"
 	default n
-	depends on !NUTTX_KERNEL && MTD_SMART && NSH_BUILTIN_APPS
+	depends on (!BUILD_PROTECTED && !BUILD_KERNEL) && MTD_SMART && NSH_BUILTIN_APPS
 	---help---
 		This logic performs a SMART flash block device test.  This test
 		performs a sector allocate, read, write, free and garbage collection
diff --git a/examples/i2schar/Kconfig b/examples/i2schar/Kconfig
index 953318cfe..0deb0ebce 100644
--- a/examples/i2schar/Kconfig
+++ b/examples/i2schar/Kconfig
@@ -78,7 +78,7 @@ config EXAMPLES_I2SCHAR_BUFSIZE
 config EXAMPLES_I2SCHAR_DEVINIT
 	bool "Architecture-specific device initialization"
 	default 256
-	depends on !NUTTX_KERNEL
+	depends on !BUILD_PROTECTED && !BUILD_KERNEL
 	---help---
 		Define if architecture-specific I2S device initialize is available.
 		If defined, the the platform specific code must provide a function
diff --git a/examples/mtdpart/Kconfig b/examples/mtdpart/Kconfig
index 6f8e6e490..cd8533e68 100644
--- a/examples/mtdpart/Kconfig
+++ b/examples/mtdpart/Kconfig
@@ -6,7 +6,7 @@
 config EXAMPLES_MTDPART
 	bool "MTD partition test"
 	default n
-	depends on MTD_PARTITION && !NUTTX_KERNEL
+	depends on MTD_PARTITION && !BUILD_PROTECTED && !BUILD_KERNEL
 	---help---
 		Enable the MTD partition test example.
 
diff --git a/nshlib/Kconfig b/nshlib/Kconfig
index b51b2931e..0add860d6 100644
--- a/nshlib/Kconfig
+++ b/nshlib/Kconfig
@@ -301,7 +301,7 @@ config NSH_DISABLE_NSFMOUNT
 config NSH_DISABLE_PS
 	bool "Disable ps"
 	default n
-	depends on !NUTTX_KERNEL
+	depends on !BUILD_PROTECTED && !BUILD_KERNEL
 
 config NSH_DISABLE_PING
 	bool "Disable ping"
diff --git a/nshlib/nsh.h b/nshlib/nsh.h
index 23b030072..a17b0a901 100644
--- a/nshlib/nsh.h
+++ b/nshlib/nsh.h
@@ -546,11 +546,11 @@
 #    define IOBUFFERSIZE (PATH_MAX + 1)
 #endif
 
-/* Certain commands are not availalbe in a kernel build because they depend
+/* Certain commands are not available in a kernel builds because they depend
  * on interfaces that are not exported by the kernel.
  */
 
-#ifdef CONFIG_NUTTX_KERNEL
+#if defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)
 #  undef CONFIG_NSH_DISABLE_DF
 #  define CONFIG_NSH_DISABLE_DF 1
 #endif
diff --git a/nshlib/nsh_command.c b/nshlib/nsh_command.c
index ef141b80a..3950b3379 100644
--- a/nshlib/nsh_command.c
+++ b/nshlib/nsh_command.c
@@ -292,7 +292,7 @@ static const struct cmdmap_s g_cmdmap[] =
 
 #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_FS_READABLE)
 # ifndef CONFIG_NSH_DISABLE_MOUNT
-#  ifdef CONFIG_NUTTX_KERNEL
+#if defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)
   { "mount",    cmd_mount,    5, 5, "-t <fstype> [<block-device>] <mount-point>" },
 #    else
   { "mount",    cmd_mount,    1, 5, "[-t <fstype> [<block-device>] <mount-point>]" },
diff --git a/nshlib/nsh_mntcmds.c b/nshlib/nsh_mntcmds.c
index 584c1258a..55d9df9b6 100644
--- a/nshlib/nsh_mntcmds.c
+++ b/nshlib/nsh_mntcmds.c
@@ -88,7 +88,7 @@
 
 #if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_MOUNTPOINT) && \
     defined(CONFIG_FS_READABLE) && !defined(CONFIG_NSH_DISABLE_MOUNT)
-#ifndef CONFIG_NUTTX_KERNEL
+#if !defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)
 static const char* get_fstype(FAR struct statfs *statbuf)
 {
   FAR const char *fstype;
@@ -227,7 +227,7 @@ static int df_man_readable_handler(FAR const char *mountpoint,
 
   usedlabel = labels[which];
 
-#ifndef CONFIG_NUTTX_KERNEL
+#if !defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)
   nsh_output(vtbl, "%-10s %6ld%c %8ld%c  %8ld%c %s\n", get_fstype(statbuf),
              size, sizelabel, used, usedlabel, free, freelabel,
              mountpoint);
@@ -249,7 +249,7 @@ static int df_man_readable_handler(FAR const char *mountpoint,
 
 #if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_MOUNTPOINT) && \
     defined(CONFIG_FS_READABLE) && !defined(CONFIG_NSH_DISABLE_MOUNT)
-#ifndef CONFIG_NUTTX_KERNEL
+#if !defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)
 static int mount_handler(FAR const char *mountpoint,
                          FAR struct statfs *statbuf, FAR void *arg)
 {
@@ -274,7 +274,7 @@ static int mount_handler(FAR const char *mountpoint,
 
 #if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_MOUNTPOINT) && \
     defined(CONFIG_FS_READABLE) && !defined(CONFIG_NSH_DISABLE_MOUNT)
-#ifndef CONFIG_NUTTX_KERNEL
+#if !defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)
 static inline int mount_show(FAR struct nsh_vtbl_s *vtbl, FAR const char *progname)
 {
   return foreach_mountpoint(mount_handler, (FAR void *)vtbl);
@@ -297,7 +297,7 @@ int cmd_df(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 #ifdef CONFIG_NSH_CMDOPT_DF_H
   if (argc > 1 && strcmp(argv[1], "-h") == 0)
     {
-#ifndef CONFIG_NUTTX_KERNEL
+#if !defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)
       nsh_output(vtbl, "Filesystem    Size      Used  Available Mounted on\n");
 #else
       nsh_output(vtbl, "Size      Used  Available Mounted on\n");
@@ -333,7 +333,7 @@ int cmd_mount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 
   /* The mount command behaves differently if no parameters are provided */
 
-#ifndef CONFIG_NUTTX_KERNEL
+#if !defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)
   if (argc < 2)
     {
       return mount_show(vtbl, argv[0]);
diff --git a/nshlib/nsh_routecmds.c b/nshlib/nsh_routecmds.c
index b8a6c4784..30489332a 100644
--- a/nshlib/nsh_routecmds.c
+++ b/nshlib/nsh_routecmds.c
@@ -321,11 +321,14 @@ errout:
  *
  ****************************************************************************/
 
-#if !defined(CONFIG_NSH_DISABLE_DELROUTE) && !defined(CONFIG_NUTTX_KERNEL)
+#if !defined(CONFIG_NSH_DISABLE_DELROUTE) && \
+    !defined(CONFIG_BUILD_PROTECTED) && \
+    !defined(CONFIG_BUILD_KERNEL)
+
 /* Perhaps... someday.  This would current depend on using the internal
- * OS interface net_foreachroute and internal OS data structrues defined
+ * OS interface net_foreachroute and internal OS data structures defined
  * in nuttx/net/net_route.h
  */
-#endif /* !CONFIG_NSH_DISABLE_DELROUTE && !CONFIG_NUTTX_KERNEL */
+#endif /* !CONFIG_NSH_DISABLE_DELROUTE && !CONFIG_BUILD_PROTECTED && !CONFIG_BUILD_KERNEL */
 
 #endif /* CONFIG_NET && CONFIG_NET_ROUTE */
diff --git a/system/flash_eraseall/Kconfig b/system/flash_eraseall/Kconfig
index 032df07bd..5ecc6eb26 100644
--- a/system/flash_eraseall/Kconfig
+++ b/system/flash_eraseall/Kconfig
@@ -6,7 +6,7 @@
 config SYSTEM_FLASH_ERASEALL
 	bool "FLASH eraseall tool"
 	default n
-	depends on MTD && NSH_BUILTIN_APPS && !NUTTX_KERNEL
+	depends on MTD && NSH_BUILTIN_APPS && !BUILD_PROTECTED && !BUILD_KERNEL
 	---help---
 		Enable support for the FLASH eraseall tool.
 
diff --git a/system/i2c/README.txt b/system/i2c/README.txt
index bb4abc831..a47b7eb0e 100644
--- a/system/i2c/README.txt
+++ b/system/i2c/README.txt
@@ -361,7 +361,8 @@ The I2C tools requires the following in your NuttX configuration:
    NOTE 2: This I2C tool uses direct I2C device interfaces.  As such, it
    relies on internal OS interfaces that are not normally available to a
    user-space program.  As a result, the I2C tool cannot be used if a
-   NuttX is built as a protected, supervisor kernel (CONFIG_NUTTX_KERNEL).
+   NuttX is built as a protected, supervisor kernel (CONFIG_BUILD_PROTECTED
+   or CONFIG_BUILD_KERNEL).
 
 3. I2C driver configuration
 
diff --git a/system/usbmsc/README.txt b/system/usbmsc/README.txt
index 6734a4ed8..9207dfb6b 100755
--- a/system/usbmsc/README.txt
+++ b/system/usbmsc/README.txt
@@ -73,4 +73,5 @@ system/usbmsc
   NOTE 2: This add-on used internal USB device driver interfaces.  As such,
   it relies on internal OS interfaces that are not normally available to a
   user-space program.  As a result, this add-on cannot be used if a
-  NuttX is built as a protected, supervisor kernel (CONFIG_NUTTX_KERNEL).
+  NuttX is built as a protected, supervisor kernel (CONFIG_BUILD_PROTECTED
+  or CONFIG_BUILD_KERNEL).