diff --git a/Documentation/README.html b/Documentation/README.html
index 3c28df7eab3..865cd9d8466 100644
--- a/Documentation/README.html
+++ b/Documentation/README.html
@@ -8,7 +8,7 @@
NuttX README Files
- Last Updated: August 13, 2018
+ Last Updated: August 18, 2018
|
@@ -457,6 +457,7 @@ apps/
| |- i2c/README.txt
| |- inifile/README.txt
| |- install/README.txt
+ | |- nsh/README.txt
| |- nxplayer/README.txt
| |- symtab/README.txt
| |- usbmsc/README.txt
diff --git a/README.txt b/README.txt
index 82c5a5d66d9..2f0d18ac32f 100644
--- a/README.txt
+++ b/README.txt
@@ -2106,21 +2106,21 @@ apps/
| |- tiff/README.txt
| `- traveler/tools/tcledit/README.txt
|- interpreters/
- | |- bas
+ | |- bas/
| | `- README.txt
- | |- ficl
+ | |- ficl/
| | `- README.txt
| `- README.txt
|- modbus/
| `- README.txt
|- netutils/
- | |- discover
+ | |- discover/
| | `- README.txt
- | |- ftpc
+ | |- ftpc/
| | `- README.txt
- | |- json
+ | |- json/
| | `- README.txt
- | |- telnetd
+ | |- telnetd/
| | `- README.txt
| `- README.txt
|- nshlib/
@@ -2128,28 +2128,30 @@ apps/
|- NxWidgets/
| `- README.txt
|- system/
- | |- cdcacm
+ | |- cdcacm/
| | `- README.txt
- | |- i2c
+ | |- i2c/
| | `- README.txt
- | |- inifile
+ | |- inifile/
| | `- README.txt
- | |- install
+ | |- install/
| | `- README.txt
- | |- nxplayer
+ | |- nsh/
+ | | `- README.txt
+ | |- nxplayer/
| | `- README.txt
| |- symtab/
| | `- README.txt
- | |- usbmsc
+ | |- usbmsc/
| | `- README.txt
- | `- zmodem
+ | `- zmodem/
| `- README.txt
`- wireless
- |- bluetooth
- | `- btsak
+ |- bluetooth/
+ | `- btsak/
| `- README.txt
`- ieee802154
- `- i8sak
+ `- i8sak/
`- README.txt
Additional README.txt files in the other, related repositories:
diff --git a/configs/arduino-due/nsh/defconfig b/configs/arduino-due/nsh/defconfig
index b3644e86861..4bc45a5b1b9 100644
--- a/configs/arduino-due/nsh/defconfig
+++ b/configs/arduino-due/nsh/defconfig
@@ -11,8 +11,8 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=6965
CONFIG_BUILTIN=y
CONFIG_CXX_NEWLONG=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/arduino-mega2560/nsh/defconfig b/configs/arduino-mega2560/nsh/defconfig
index 7c53995c0af..bd704b8a510 100644
--- a/configs/arduino-mega2560/nsh/defconfig
+++ b/configs/arduino-mega2560/nsh/defconfig
@@ -17,7 +17,7 @@ CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POLL=y
CONFIG_DISABLE_PTHREAD=y
CONFIG_DISABLE_SIGNALS=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HOST_WINDOWS=y
CONFIG_IDLETHREAD_STACKSIZE=128
CONFIG_INTELHEX_BINARY=y
diff --git a/configs/avr32dev1/nsh/defconfig b/configs/avr32dev1/nsh/defconfig
index fb75fdffa2c..db1f5412985 100644
--- a/configs/avr32dev1/nsh/defconfig
+++ b/configs/avr32dev1/nsh/defconfig
@@ -17,7 +17,7 @@ CONFIG_AVR32_USART1=y
CONFIG_BOARD_LOOPSPERMSEC=1140
CONFIG_DISABLE_POLL=y
CONFIG_ENDIAN_BIG=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_FAT=y
CONFIG_HOST_WINDOWS=y
CONFIG_INTELHEX_BINARY=y
diff --git a/configs/b-l475e-iot01a/nsh/defconfig b/configs/b-l475e-iot01a/nsh/defconfig
index 11cb7a2eec0..8c884e18659 100644
--- a/configs/b-l475e-iot01a/nsh/defconfig
+++ b/configs/b-l475e-iot01a/nsh/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH="arm"
CONFIG_BOARD_LOOPSPERMSEC=8025
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/b-l475e-iot01a/spirit-6lowpan/defconfig b/configs/b-l475e-iot01a/spirit-6lowpan/defconfig
index 54a4f4039de..c64891fb47c 100644
--- a/configs/b-l475e-iot01a/spirit-6lowpan/defconfig
+++ b/configs/b-l475e-iot01a/spirit-6lowpan/defconfig
@@ -21,8 +21,8 @@ CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_7=0xfe00
CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_8=0xa900
CONFIG_EXAMPLES_NETTEST_TARGET2=y
CONFIG_EXAMPLES_NETTEST=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_UDP_CLIENT_PORTNO=61617
CONFIG_EXAMPLES_UDP_DEVNAME="wpan0"
CONFIG_EXAMPLES_UDP_SERVER_PORTNO=61616
diff --git a/configs/b-l475e-iot01a/spirit-starhub/defconfig b/configs/b-l475e-iot01a/spirit-starhub/defconfig
index 4ac0045dcd6..9b8094ffcf7 100644
--- a/configs/b-l475e-iot01a/spirit-starhub/defconfig
+++ b/configs/b-l475e-iot01a/spirit-starhub/defconfig
@@ -13,8 +13,8 @@ CONFIG_ARCH="arm"
CONFIG_BOARD_LOOPSPERMSEC=8025
CONFIG_BUILTIN=y
CONFIG_DRIVERS_WIRELESS=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_UDP_BROADCAST=y
CONFIG_EXAMPLES_UDP_CLIENT_PORTNO=61617
CONFIG_EXAMPLES_UDP_DEVNAME="wpan0"
diff --git a/configs/b-l475e-iot01a/spirit-starpoint/defconfig b/configs/b-l475e-iot01a/spirit-starpoint/defconfig
index 0d04285c956..a32eec9cfb7 100644
--- a/configs/b-l475e-iot01a/spirit-starpoint/defconfig
+++ b/configs/b-l475e-iot01a/spirit-starpoint/defconfig
@@ -21,8 +21,8 @@ CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_7=0xfe00
CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_8=0xa900
CONFIG_EXAMPLES_NETTEST_TARGET2=y
CONFIG_EXAMPLES_NETTEST=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_UDP_BROADCAST=y
CONFIG_EXAMPLES_UDP_CLIENT_PORTNO=61617
CONFIG_EXAMPLES_UDP_DEVNAME="wpan0"
diff --git a/configs/bambino-200e/knsh/defconfig b/configs/bambino-200e/knsh/defconfig
index acfd4d83736..fb75a5eccf2 100644
--- a/configs/bambino-200e/knsh/defconfig
+++ b/configs/bambino-200e/knsh/defconfig
@@ -14,7 +14,7 @@ CONFIG_BOARD_LOOPSPERMSEC=18535
CONFIG_BUILD_PROTECTED=y
CONFIG_CDCACM=y
CONFIG_DEBUG_SYMBOLS=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/bambino-200e/max31855/defconfig b/configs/bambino-200e/max31855/defconfig
index 4553b524635..8d0a69af966 100644
--- a/configs/bambino-200e/max31855/defconfig
+++ b/configs/bambino-200e/max31855/defconfig
@@ -14,7 +14,7 @@ CONFIG_BUILTIN=y
CONFIG_CDCACM=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_EXAMPLES_MAX31855=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_TIMER=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
diff --git a/configs/bambino-200e/netnsh/defconfig b/configs/bambino-200e/netnsh/defconfig
index 582eb441a58..6a0063d4601 100644
--- a/configs/bambino-200e/netnsh/defconfig
+++ b/configs/bambino-200e/netnsh/defconfig
@@ -10,7 +10,7 @@ CONFIG_ARCH_STDARG_H=y
CONFIG_BOARD_LOOPSPERMSEC=18535
CONFIG_BUILTIN=y
CONFIG_DISCOVER_DESCR="BAMBINO"
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_LIBM=y
CONFIG_LPC43_BOOT_SPIFI=y
diff --git a/configs/bambino-200e/nsh/defconfig b/configs/bambino-200e/nsh/defconfig
index 6e3e309af1a..c1fb0887e0f 100644
--- a/configs/bambino-200e/nsh/defconfig
+++ b/configs/bambino-200e/nsh/defconfig
@@ -12,7 +12,7 @@ CONFIG_BOARD_LOOPSPERMSEC=18535
CONFIG_BUILTIN=y
CONFIG_CDCACM=y
CONFIG_DEBUG_SYMBOLS=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_TIMER=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
diff --git a/configs/bambino-200e/usbnsh/defconfig b/configs/bambino-200e/usbnsh/defconfig
index 306637f167d..75882c64d85 100644
--- a/configs/bambino-200e/usbnsh/defconfig
+++ b/configs/bambino-200e/usbnsh/defconfig
@@ -13,7 +13,7 @@ CONFIG_BUILTIN=y
CONFIG_CDCACM_CONSOLE=y
CONFIG_CDCACM=y
CONFIG_DEBUG_SYMBOLS=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_LPC43_BOOT_SPIFI=y
CONFIG_LPC43_TMR0=y
diff --git a/configs/c5471evm/nsh/defconfig b/configs/c5471evm/nsh/defconfig
index 473627b7f04..74615dbc121 100644
--- a/configs/c5471evm/nsh/defconfig
+++ b/configs/c5471evm/nsh/defconfig
@@ -13,7 +13,7 @@ CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_IDLETHREAD_STACKSIZE=4096
CONFIG_MAX_TASKS=16
CONFIG_NET_BROADCAST=y
diff --git a/configs/clicker2-stm32/README.txt b/configs/clicker2-stm32/README.txt
index ce9d9be82a0..3d5b5648e5d 100644
--- a/configs/clicker2-stm32/README.txt
+++ b/configs/clicker2-stm32/README.txt
@@ -720,7 +720,7 @@ Configurations
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
- CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+ CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
usbnsh:
diff --git a/configs/clicker2-stm32/knsh/defconfig b/configs/clicker2-stm32/knsh/defconfig
index 7b8d95e7447..85624e08bb1 100644
--- a/configs/clicker2-stm32/knsh/defconfig
+++ b/configs/clicker2-stm32/knsh/defconfig
@@ -11,8 +11,8 @@ CONFIG_BOARD_INITIALIZE=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILD_PROTECTED=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_FS_WRITABLE=y
CONFIG_HAVE_CXX=y
diff --git a/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig b/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig
index 056929f56c5..c77d1e3e83a 100644
--- a/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig
+++ b/configs/clicker2-stm32/mrf24j40-6lowpan/defconfig
@@ -28,8 +28,8 @@ CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_7=0xfe00
CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_8=0x0800
CONFIG_EXAMPLES_NETTEST_SERVER_PORTNO=61616
CONFIG_EXAMPLES_NETTEST_TARGET2=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_UDP=y
CONFIG_EXAMPLES_UDP_CLIENT_PORTNO=61617
CONFIG_EXAMPLES_UDP_DEVNAME="wpan0"
diff --git a/configs/clicker2-stm32/mrf24j40-mac/defconfig b/configs/clicker2-stm32/mrf24j40-mac/defconfig
index ce3af0c0d04..cb7e03f3a63 100644
--- a/configs/clicker2-stm32/mrf24j40-mac/defconfig
+++ b/configs/clicker2-stm32/mrf24j40-mac/defconfig
@@ -12,8 +12,8 @@ CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
CONFIG_DRIVERS_IEEE802154=y
CONFIG_DRIVERS_WIRELESS=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_FS_WRITABLE=y
CONFIG_HAVE_CXX=y
diff --git a/configs/clicker2-stm32/mrf24j40-starhub/defconfig b/configs/clicker2-stm32/mrf24j40-starhub/defconfig
index fcb80eb7c36..cd42fa5e943 100644
--- a/configs/clicker2-stm32/mrf24j40-starhub/defconfig
+++ b/configs/clicker2-stm32/mrf24j40-starhub/defconfig
@@ -20,8 +20,8 @@ CONFIG_CDCACM_RXBUFSIZE=256
CONFIG_CDCACM_TXBUFSIZE=256
CONFIG_DRIVERS_IEEE802154=y
CONFIG_DRIVERS_WIRELESS=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/clicker2-stm32/mrf24j40-starpoint/defconfig b/configs/clicker2-stm32/mrf24j40-starpoint/defconfig
index 79df886e219..fd7990aee0a 100644
--- a/configs/clicker2-stm32/mrf24j40-starpoint/defconfig
+++ b/configs/clicker2-stm32/mrf24j40-starpoint/defconfig
@@ -28,8 +28,8 @@ CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_7=0xfe00
CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_8=0x0800
CONFIG_EXAMPLES_NETTEST_SERVER_PORTNO=61616
CONFIG_EXAMPLES_NETTEST_TARGET2=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_UDP=y
CONFIG_EXAMPLES_UDP_CLIENT_PORTNO=61617
CONFIG_EXAMPLES_UDP_DEVNAME="wpan0"
diff --git a/configs/clicker2-stm32/nsh/defconfig b/configs/clicker2-stm32/nsh/defconfig
index 5eaceff8f2a..4244e94e4ff 100644
--- a/configs/clicker2-stm32/nsh/defconfig
+++ b/configs/clicker2-stm32/nsh/defconfig
@@ -10,8 +10,8 @@ CONFIG_BOARD_INITIALIZE=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_FS_WRITABLE=y
CONFIG_HAVE_CXX=y
diff --git a/configs/clicker2-stm32/usbnsh/defconfig b/configs/clicker2-stm32/usbnsh/defconfig
index 13c11707808..3d65c6938f2 100644
--- a/configs/clicker2-stm32/usbnsh/defconfig
+++ b/configs/clicker2-stm32/usbnsh/defconfig
@@ -16,8 +16,8 @@ CONFIG_CDCACM_CONSOLE=y
CONFIG_CDCACM_RXBUFSIZE=256
CONFIG_CDCACM_TXBUFSIZE=256
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/clicker2-stm32/xbee-6lowpan/defconfig b/configs/clicker2-stm32/xbee-6lowpan/defconfig
index 0099a026f35..549e8e18a7a 100644
--- a/configs/clicker2-stm32/xbee-6lowpan/defconfig
+++ b/configs/clicker2-stm32/xbee-6lowpan/defconfig
@@ -29,8 +29,8 @@ CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_7=0xfe00
CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_8=0x0800
CONFIG_EXAMPLES_NETTEST_SERVER_PORTNO=61616
CONFIG_EXAMPLES_NETTEST_TARGET2=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_UDP=y
CONFIG_EXAMPLES_UDP_CLIENT_PORTNO=61617
CONFIG_EXAMPLES_UDP_DEVNAME="wpan0"
diff --git a/configs/cloudctrl/nsh/defconfig b/configs/cloudctrl/nsh/defconfig
index 65bea0be591..6d7b67cfba0 100644
--- a/configs/cloudctrl/nsh/defconfig
+++ b/configs/cloudctrl/nsh/defconfig
@@ -12,7 +12,7 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_ETH0_PHY_DM9161=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/dk-tm4c129x/ipv6/defconfig b/configs/dk-tm4c129x/ipv6/defconfig
index a8f8b62e7d3..ddaf458d560 100644
--- a/configs/dk-tm4c129x/ipv6/defconfig
+++ b/configs/dk-tm4c129x/ipv6/defconfig
@@ -16,7 +16,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=11401
CONFIG_BUILTIN=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HOST_WINDOWS=y
CONFIG_I2CTOOL_MAXBUS=6
CONFIG_I2CTOOL_MINBUS=6
diff --git a/configs/dk-tm4c129x/nsh/defconfig b/configs/dk-tm4c129x/nsh/defconfig
index 14f9e811056..b9763f04553 100644
--- a/configs/dk-tm4c129x/nsh/defconfig
+++ b/configs/dk-tm4c129x/nsh/defconfig
@@ -14,7 +14,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=11401
CONFIG_BUILTIN=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HOST_WINDOWS=y
CONFIG_I2CTOOL_MAXBUS=6
CONFIG_I2CTOOL_MINBUS=6
diff --git a/configs/ea3131/nsh/defconfig b/configs/ea3131/nsh/defconfig
index 6d16f30e5cd..c0c6598f083 100644
--- a/configs/ea3131/nsh/defconfig
+++ b/configs/ea3131/nsh/defconfig
@@ -15,7 +15,7 @@ CONFIG_ARM_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=16945
CONFIG_BOOT_RUNFROMISRAM=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_FAT=y
CONFIG_HOST_WINDOWS=y
CONFIG_LPC31_UART=y
diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig
index 7fc0452ba70..66e8c3c42e8 100644
--- a/configs/ea3131/pgnsh/defconfig
+++ b/configs/ea3131/pgnsh/defconfig
@@ -12,7 +12,7 @@ CONFIG_BOARD_LOOPSPERMSEC=16945
CONFIG_BOOT_RUNFROMISRAM=y
CONFIG_BUILD_2PASS=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_FAT=y
CONFIG_HOST_WINDOWS=y
CONFIG_LPC31_SPI=y
diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig
index 4116e2f91ec..40d9cfbd900 100644
--- a/configs/eagle100/nsh/defconfig
+++ b/configs/eagle100/nsh/defconfig
@@ -9,7 +9,7 @@ CONFIG_ARCH_CHIP_LM=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_FAT=y
CONFIG_HOST_WINDOWS=y
CONFIG_MAX_TASKS=16
diff --git a/configs/efm32-g8xx-stk/nsh/defconfig b/configs/efm32-g8xx-stk/nsh/defconfig
index 0d32ba1468e..71f9faae0d5 100644
--- a/configs/efm32-g8xx-stk/nsh/defconfig
+++ b/configs/efm32-g8xx-stk/nsh/defconfig
@@ -13,7 +13,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_POLL=y
CONFIG_EFM32_GPIO_IRQ=y
CONFIG_EFM32_LEUART0=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HOST_WINDOWS=y
CONFIG_LEUART0_SERIAL_CONSOLE=y
CONFIG_MAX_TASKS=16
diff --git a/configs/efm32gg-stk3700/nsh/defconfig b/configs/efm32gg-stk3700/nsh/defconfig
index ec83ed81c35..2ef021d6640 100644
--- a/configs/efm32gg-stk3700/nsh/defconfig
+++ b/configs/efm32gg-stk3700/nsh/defconfig
@@ -13,7 +13,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_POLL=y
CONFIG_EFM32_GPIO_IRQ=y
CONFIG_EFM32_LEUART0=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HOST_WINDOWS=y
CONFIG_LEUART0_BAUD=9600
CONFIG_LEUART0_SERIAL_CONSOLE=y
diff --git a/configs/ekk-lm3s9b96/nsh/defconfig b/configs/ekk-lm3s9b96/nsh/defconfig
index 4c1a102a850..8df0dd9fdfd 100644
--- a/configs/ekk-lm3s9b96/nsh/defconfig
+++ b/configs/ekk-lm3s9b96/nsh/defconfig
@@ -10,7 +10,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_OABI_TOOLCHAIN=y
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_FAT=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
diff --git a/configs/esp32-core/nsh/defconfig b/configs/esp32-core/nsh/defconfig
index 0a69edc306a..69ffc560400 100644
--- a/configs/esp32-core/nsh/defconfig
+++ b/configs/esp32-core/nsh/defconfig
@@ -12,8 +12,8 @@ CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
CONFIG_ESP32_UART0=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/esp32-core/smp/defconfig b/configs/esp32-core/smp/defconfig
index 7164867a89d..38eb035bf8f 100644
--- a/configs/esp32-core/smp/defconfig
+++ b/configs/esp32-core/smp/defconfig
@@ -12,8 +12,8 @@ CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
CONFIG_ESP32_UART0=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_SMP=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
diff --git a/configs/ez80f910200zco/nsh/defconfig b/configs/ez80f910200zco/nsh/defconfig
index 8bbd7bc6d37..96a4c72fd22 100644
--- a/configs/ez80f910200zco/nsh/defconfig
+++ b/configs/ez80f910200zco/nsh/defconfig
@@ -10,7 +10,7 @@ CONFIG_ARCH="z80"
CONFIG_BOARD_LOOPSPERMSEC=1250
CONFIG_DISABLE_MQUEUE=y
CONFIG_ETH0_PHY_AM79C874=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EZ80_EMAC=y
CONFIG_EZ80_PHYCONFIG=1
CONFIG_EZ80_RAMADDR=0xf7c000
diff --git a/configs/fire-stm32v2/nsh/defconfig b/configs/fire-stm32v2/nsh/defconfig
index a6c639d9cfe..4973e6b8808 100644
--- a/configs/fire-stm32v2/nsh/defconfig
+++ b/configs/fire-stm32v2/nsh/defconfig
@@ -13,7 +13,7 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_ENC28J60=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/flipnclick-pic32mz/nsh/defconfig b/configs/flipnclick-pic32mz/nsh/defconfig
index 7087220d9fc..3ee27b4cf99 100644
--- a/configs/flipnclick-pic32mz/nsh/defconfig
+++ b/configs/flipnclick-pic32mz/nsh/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH="mips"
CONFIG_BOARD_LOOPSPERMSEC=7245
CONFIG_BUILTIN=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/flipnclick-pic32mz/nxlines/defconfig b/configs/flipnclick-pic32mz/nxlines/defconfig
index bf09c0b9ac4..cafc0010ee7 100644
--- a/configs/flipnclick-pic32mz/nxlines/defconfig
+++ b/configs/flipnclick-pic32mz/nxlines/defconfig
@@ -12,7 +12,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH="mips"
CONFIG_BOARD_LOOPSPERMSEC=7245
CONFIG_BUILTIN=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_NXLINES_BORDERWIDTH=4
CONFIG_EXAMPLES_NXLINES_BPP=1
CONFIG_EXAMPLES_NXLINES_LINEWIDTH=4
diff --git a/configs/flipnclick-sam3x/nsh/defconfig b/configs/flipnclick-sam3x/nsh/defconfig
index 1b4446781b3..627fc1bfa8b 100644
--- a/configs/flipnclick-sam3x/nsh/defconfig
+++ b/configs/flipnclick-sam3x/nsh/defconfig
@@ -9,8 +9,8 @@ CONFIG_ARCH_CHIP_SAM3X=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=6965
CONFIG_BUILTIN=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/flipnclick-sam3x/nxlines/defconfig b/configs/flipnclick-sam3x/nxlines/defconfig
index 9cac0ee94be..744e9aff3d1 100644
--- a/configs/flipnclick-sam3x/nxlines/defconfig
+++ b/configs/flipnclick-sam3x/nxlines/defconfig
@@ -10,8 +10,8 @@ CONFIG_ARCH_CHIP_SAM3X=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=6965
CONFIG_BUILTIN=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_NXLINES=y
CONFIG_EXAMPLES_NXLINES_BORDERWIDTH=4
CONFIG_EXAMPLES_NXLINES_BPP=1
diff --git a/configs/freedom-k28f/nsh/defconfig b/configs/freedom-k28f/nsh/defconfig
index d7535a6bc23..7bd8b4afc45 100644
--- a/configs/freedom-k28f/nsh/defconfig
+++ b/configs/freedom-k28f/nsh/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=10401
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_HOST_WINDOWS=y
CONFIG_INTELHEX_BINARY=y
diff --git a/configs/freedom-k64f/netnsh/defconfig b/configs/freedom-k64f/netnsh/defconfig
index a5758e2b6b7..b4ce4d204e7 100644
--- a/configs/freedom-k64f/netnsh/defconfig
+++ b/configs/freedom-k64f/netnsh/defconfig
@@ -10,7 +10,7 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_ETH0_PHY_KSZ8081=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
diff --git a/configs/freedom-k64f/nsh/defconfig b/configs/freedom-k64f/nsh/defconfig
index 1bfa7baa232..3a32e851c94 100644
--- a/configs/freedom-k64f/nsh/defconfig
+++ b/configs/freedom-k64f/nsh/defconfig
@@ -14,7 +14,7 @@ CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POLL=y
CONFIG_DISABLE_POSIX_TIMERS=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_PWM=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
diff --git a/configs/freedom-k66f/netnsh/defconfig b/configs/freedom-k66f/netnsh/defconfig
index 06301039064..58c5b168257 100644
--- a/configs/freedom-k66f/netnsh/defconfig
+++ b/configs/freedom-k66f/netnsh/defconfig
@@ -15,7 +15,7 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_ETH0_PHY_KSZ8081=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
diff --git a/configs/freedom-k66f/nsh/defconfig b/configs/freedom-k66f/nsh/defconfig
index 8fe49603805..33aba8a074f 100644
--- a/configs/freedom-k66f/nsh/defconfig
+++ b/configs/freedom-k66f/nsh/defconfig
@@ -25,7 +25,7 @@ CONFIG_EXAMPLES_BUTTONS_NAME0="SW2"
CONFIG_EXAMPLES_BUTTONS_NAME1="SW3"
CONFIG_EXAMPLES_BUTTONS_NAMES=y
CONFIG_EXAMPLES_BUTTONS_QTD=2
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_PWM=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
diff --git a/configs/freedom-kl25z/nsh/defconfig b/configs/freedom-kl25z/nsh/defconfig
index 9efa53594f9..5fb7788e531 100644
--- a/configs/freedom-kl25z/nsh/defconfig
+++ b/configs/freedom-kl25z/nsh/defconfig
@@ -19,7 +19,7 @@ CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_PWM=y
CONFIG_KL_TPM0_PWM=y
CONFIG_KL_TPM0=y
diff --git a/configs/freedom-kl26z/nsh/defconfig b/configs/freedom-kl26z/nsh/defconfig
index 556498ee062..89f3202b56f 100644
--- a/configs/freedom-kl26z/nsh/defconfig
+++ b/configs/freedom-kl26z/nsh/defconfig
@@ -19,7 +19,7 @@ CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_PWM=y
CONFIG_KL_TPM0_PWM=y
CONFIG_KL_TPM0=y
diff --git a/configs/hymini-stm32v/nsh/defconfig b/configs/hymini-stm32v/nsh/defconfig
index 5e348957a5c..14d8b780f5f 100644
--- a/configs/hymini-stm32v/nsh/defconfig
+++ b/configs/hymini-stm32v/nsh/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BINFMT_DISABLE=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FS_FAT=y
CONFIG_MAX_TASKS=16
diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig
index d97cf14a806..733e63f7622 100644
--- a/configs/hymini-stm32v/nsh2/defconfig
+++ b/configs/hymini-stm32v/nsh2/defconfig
@@ -16,7 +16,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_NX=y
CONFIG_EXAMPLES_NXHELLO=y
CONFIG_EXAMPLES_NXHELLO_BPP=16
diff --git a/configs/hymini-stm32v/usbnsh/defconfig b/configs/hymini-stm32v/usbnsh/defconfig
index 74a6499ba02..5ad65f72c10 100644
--- a/configs/hymini-stm32v/usbnsh/defconfig
+++ b/configs/hymini-stm32v/usbnsh/defconfig
@@ -16,7 +16,7 @@ CONFIG_CDCACM_CONSOLE=y
CONFIG_CDCACM_RXBUFSIZE=256
CONFIG_CDCACM_TXBUFSIZE=256
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_LIB_BOARDCTL=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
diff --git a/configs/imxrt1050-evk/knsh/defconfig b/configs/imxrt1050-evk/knsh/defconfig
index 440871cf47e..3a33421b30b 100644
--- a/configs/imxrt1050-evk/knsh/defconfig
+++ b/configs/imxrt1050-evk/knsh/defconfig
@@ -13,7 +13,7 @@ CONFIG_ARMV7M_USEBASEPRI=y
CONFIG_ARM_MPU=y
CONFIG_BOARD_LOOPSPERMSEC=104926
CONFIG_BUILD_PROTECTED=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_LPUART1=y
diff --git a/configs/imxrt1050-evk/libcxxtest/defconfig b/configs/imxrt1050-evk/libcxxtest/defconfig
index 9d20dd1b696..c8c2129311f 100644
--- a/configs/imxrt1050-evk/libcxxtest/defconfig
+++ b/configs/imxrt1050-evk/libcxxtest/defconfig
@@ -31,8 +31,8 @@ CONFIG_RAM_START=0x20200000
CONFIG_START_DAY=14
CONFIG_START_MONTH=3
CONFIG_USER_ENTRYPOINT="nsh_main"
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HAVE_CXX=y
CONFIG_LIBC_FLOATINGPOINT=y
diff --git a/configs/imxrt1050-evk/netnsh/defconfig b/configs/imxrt1050-evk/netnsh/defconfig
index 2089eb2603a..eaef88a565c 100644
--- a/configs/imxrt1050-evk/netnsh/defconfig
+++ b/configs/imxrt1050-evk/netnsh/defconfig
@@ -12,7 +12,7 @@ CONFIG_ARMV7M_USEBASEPRI=y
CONFIG_BOARD_LOOPSPERMSEC=104926
CONFIG_BUILTIN=y
CONFIG_ETH0_PHY_KSZ8081=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_ENET=y
diff --git a/configs/imxrt1050-evk/nsh/defconfig b/configs/imxrt1050-evk/nsh/defconfig
index 972840f3b2d..34d9f7659f0 100644
--- a/configs/imxrt1050-evk/nsh/defconfig
+++ b/configs/imxrt1050-evk/nsh/defconfig
@@ -10,7 +10,7 @@ CONFIG_ARMV7M_ICACHE=y
CONFIG_ARMV7M_USEBASEPRI=y
CONFIG_BOARD_LOOPSPERMSEC=104926
CONFIG_BUILTIN=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_IMXRT_LPUART1=y
diff --git a/configs/launchxl-tms57004/nsh/defconfig b/configs/launchxl-tms57004/nsh/defconfig
index 37b291c579c..4e7ad5440ca 100644
--- a/configs/launchxl-tms57004/nsh/defconfig
+++ b/configs/launchxl-tms57004/nsh/defconfig
@@ -13,7 +13,7 @@ CONFIG_ARCH="arm"
CONFIG_ARMV7R_TOOLCHAIN_BUILDROOT=y
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/lc823450-xgevk/audio/defconfig b/configs/lc823450-xgevk/audio/defconfig
index 58fed79d875..802e694c8fd 100644
--- a/configs/lc823450-xgevk/audio/defconfig
+++ b/configs/lc823450-xgevk/audio/defconfig
@@ -30,7 +30,7 @@ CONFIG_DRIVERS_AUDIO=y
CONFIG_DVFS=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_EXAMPLES_I2SLOOP=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_NXHELLO=y
CONFIG_EXAMPLES_NXHELLO_BPP=1
CONFIG_EXAMPLES_OSTEST=y
diff --git a/configs/lc823450-xgevk/bt/defconfig b/configs/lc823450-xgevk/bt/defconfig
index 246eb317ef4..55eadaae702 100644
--- a/configs/lc823450-xgevk/bt/defconfig
+++ b/configs/lc823450-xgevk/bt/defconfig
@@ -32,7 +32,7 @@ CONFIG_DRIVERS_AUDIO=y
CONFIG_DVFS=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_EXAMPLES_I2SLOOP=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_NXHELLO=y
CONFIG_EXAMPLES_NXHELLO_BPP=1
CONFIG_EXAMPLES_OSTEST=y
diff --git a/configs/lc823450-xgevk/knsh/defconfig b/configs/lc823450-xgevk/knsh/defconfig
index b6989faf73e..a0630d2b879 100644
--- a/configs/lc823450-xgevk/knsh/defconfig
+++ b/configs/lc823450-xgevk/knsh/defconfig
@@ -22,7 +22,7 @@ CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_ZERO=y
CONFIG_DISABLE_POSIX_TIMERS=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_FS_WRITABLE=y
CONFIG_HRT_TIMER=y
diff --git a/configs/lc823450-xgevk/krndis/defconfig b/configs/lc823450-xgevk/krndis/defconfig
index 1ca7557a224..35b1d7eb423 100644
--- a/configs/lc823450-xgevk/krndis/defconfig
+++ b/configs/lc823450-xgevk/krndis/defconfig
@@ -36,10 +36,10 @@ CONFIG_ELF=y
CONFIG_EXAMPLES_HELLO=m
CONFIG_EXAMPLES_HELLOXX=m
CONFIG_EXAMPLES_I2SLOOP=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_SYMTAB=y
-CONFIG_EXAMPLES_NSH_SYMTAB_ARRAYNAME="g_symtab"
-CONFIG_EXAMPLES_NSH_SYMTAB_COUNTNAME="g_nsymbols"
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_SYMTAB=y
+CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME="g_symtab"
+CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols"
CONFIG_EXAMPLES_NXHELLO=y
CONFIG_EXAMPLES_NXHELLO_BPP=1
CONFIG_EXAMPLES_OSTEST=y
diff --git a/configs/lc823450-xgevk/nsh/defconfig b/configs/lc823450-xgevk/nsh/defconfig
index 4ad0e01414c..620a823508a 100644
--- a/configs/lc823450-xgevk/nsh/defconfig
+++ b/configs/lc823450-xgevk/nsh/defconfig
@@ -25,7 +25,7 @@ CONFIG_EXAMPLES_ADC=y
CONFIG_EXAMPLES_ADC_GROUPSIZE=6
CONFIG_EXAMPLES_ADC_SWTRIG=y
CONFIG_EXAMPLES_HELLO=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_NXHELLO=y
CONFIG_EXAMPLES_NXHELLO_BPP=1
CONFIG_EXAMPLES_OSTEST=y
diff --git a/configs/lc823450-xgevk/rndis/defconfig b/configs/lc823450-xgevk/rndis/defconfig
index 91c64f82c5a..86478af5582 100644
--- a/configs/lc823450-xgevk/rndis/defconfig
+++ b/configs/lc823450-xgevk/rndis/defconfig
@@ -34,10 +34,10 @@ CONFIG_ELF=y
CONFIG_EXAMPLES_HELLO=m
CONFIG_EXAMPLES_HELLOXX=m
CONFIG_EXAMPLES_I2SLOOP=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_SYMTAB=y
-CONFIG_EXAMPLES_NSH_SYMTAB_ARRAYNAME="g_symtab"
-CONFIG_EXAMPLES_NSH_SYMTAB_COUNTNAME="g_nsymbols"
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_SYMTAB=y
+CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME="g_symtab"
+CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols"
CONFIG_EXAMPLES_NXHELLO=y
CONFIG_EXAMPLES_NXHELLO_BPP=1
CONFIG_EXAMPLES_OSTEST=y
diff --git a/configs/lc823450-xgevk/usb/defconfig b/configs/lc823450-xgevk/usb/defconfig
index 7a6011ccd26..513a2b6d14c 100644
--- a/configs/lc823450-xgevk/usb/defconfig
+++ b/configs/lc823450-xgevk/usb/defconfig
@@ -26,7 +26,7 @@ CONFIG_EXAMPLES_ADC=y
CONFIG_EXAMPLES_ADC_GROUPSIZE=6
CONFIG_EXAMPLES_ADC_SWTRIG=y
CONFIG_EXAMPLES_HELLO=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_NXHELLO=y
CONFIG_EXAMPLES_NXHELLO_BPP=1
CONFIG_EXAMPLES_OSTEST=y
diff --git a/configs/lincoln60/netnsh/defconfig b/configs/lincoln60/netnsh/defconfig
index 0c69865d7a4..97683106e56 100644
--- a/configs/lincoln60/netnsh/defconfig
+++ b/configs/lincoln60/netnsh/defconfig
@@ -10,7 +10,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=7982
CONFIG_ETH0_PHY_KSZ8041=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_FAT=y
CONFIG_HOST_WINDOWS=y
CONFIG_LPC17_EMACRAM_SIZE=7296
diff --git a/configs/lincoln60/nsh/defconfig b/configs/lincoln60/nsh/defconfig
index f4ddfe10492..03186aeabcd 100644
--- a/configs/lincoln60/nsh/defconfig
+++ b/configs/lincoln60/nsh/defconfig
@@ -9,7 +9,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y
CONFIG_BOARD_LOOPSPERMSEC=7982
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_FAT=y
CONFIG_LPC17_SSP0=y
CONFIG_LPC17_UART0=y
diff --git a/configs/lm3s6432-s2e/nsh/defconfig b/configs/lm3s6432-s2e/nsh/defconfig
index 7a2d42ff20e..b8a38b354e6 100644
--- a/configs/lm3s6432-s2e/nsh/defconfig
+++ b/configs/lm3s6432-s2e/nsh/defconfig
@@ -10,7 +10,7 @@ CONFIG_ARCH_CHIP_LM=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
CONFIG_NET=y
diff --git a/configs/lm3s6965-ek/discover/defconfig b/configs/lm3s6965-ek/discover/defconfig
index b2d431b9b60..4af9f369c9f 100644
--- a/configs/lm3s6965-ek/discover/defconfig
+++ b/configs/lm3s6965-ek/discover/defconfig
@@ -10,7 +10,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_OABI_TOOLCHAIN=y
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_FAT=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig
index b2d431b9b60..4af9f369c9f 100644
--- a/configs/lm3s6965-ek/nsh/defconfig
+++ b/configs/lm3s6965-ek/nsh/defconfig
@@ -10,7 +10,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_OABI_TOOLCHAIN=y
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_FAT=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
diff --git a/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig
index 9bd07a755e4..4d1199af704 100644
--- a/configs/lm3s8962-ek/nsh/defconfig
+++ b/configs/lm3s8962-ek/nsh/defconfig
@@ -9,7 +9,7 @@ CONFIG_ARCH_CHIP_LM=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_FAT=y
CONFIG_HOST_WINDOWS=y
CONFIG_MAX_TASKS=16
diff --git a/configs/lm4f120-launchpad/nsh/defconfig b/configs/lm4f120-launchpad/nsh/defconfig
index 7937f142d63..fda8081ae3a 100644
--- a/configs/lm4f120-launchpad/nsh/defconfig
+++ b/configs/lm4f120-launchpad/nsh/defconfig
@@ -13,7 +13,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=4531
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
CONFIG_NFILE_DESCRIPTORS=8
diff --git a/configs/lpc4330-xplorer/nsh/defconfig b/configs/lpc4330-xplorer/nsh/defconfig
index e832989d960..3105ebc9c44 100644
--- a/configs/lpc4330-xplorer/nsh/defconfig
+++ b/configs/lpc4330-xplorer/nsh/defconfig
@@ -10,7 +10,7 @@ CONFIG_ARCH_STDARG_H=y
CONFIG_ARCH="arm"
CONFIG_ARMV7M_TOOLCHAIN_CODEREDW=y
CONFIG_BOARD_LOOPSPERMSEC=18535
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/lpc4337-ws/nsh/defconfig b/configs/lpc4337-ws/nsh/defconfig
index b85a47cd8e5..99887152fca 100644
--- a/configs/lpc4337-ws/nsh/defconfig
+++ b/configs/lpc4337-ws/nsh/defconfig
@@ -21,7 +21,7 @@ CONFIG_CDCACM_TXBUFSIZE=2048
CONFIG_CDCACM_VENDORID=0x03EB
CONFIG_CDCACM_VENDORSTR="nuttx"
CONFIG_CDCACM=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/lpc4357-evb/nsh/defconfig b/configs/lpc4357-evb/nsh/defconfig
index c7b30aca2d0..fc613cd4b48 100644
--- a/configs/lpc4357-evb/nsh/defconfig
+++ b/configs/lpc4357-evb/nsh/defconfig
@@ -9,7 +9,7 @@ CONFIG_ARCH_CHIP_LPC43XX=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_STDARG_H=y
CONFIG_BOARD_LOOPSPERMSEC=18535
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/lpc4370-link2/nsh/defconfig b/configs/lpc4370-link2/nsh/defconfig
index 67acac49b84..046c4780cec 100644
--- a/configs/lpc4370-link2/nsh/defconfig
+++ b/configs/lpc4370-link2/nsh/defconfig
@@ -20,7 +20,7 @@ CONFIG_CDCACM_TXBUFSIZE=2048
CONFIG_CDCACM_VENDORID=0x03EB
CONFIG_CDCACM_VENDORSTR="nuttx"
CONFIG_CDCACM=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/lpcxpresso-lpc1115/nsh/defconfig b/configs/lpcxpresso-lpc1115/nsh/defconfig
index b73807677e8..cb8d7b37785 100644
--- a/configs/lpcxpresso-lpc1115/nsh/defconfig
+++ b/configs/lpcxpresso-lpc1115/nsh/defconfig
@@ -20,7 +20,7 @@ CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_MAX_TASKS=4
CONFIG_MAX_WDOGPARMS=2
CONFIG_MM_SMALL=y
diff --git a/configs/lpcxpresso-lpc1768/nsh/defconfig b/configs/lpcxpresso-lpc1768/nsh/defconfig
index b75f03d1a3a..19c8fd0ef1a 100644
--- a/configs/lpcxpresso-lpc1768/nsh/defconfig
+++ b/configs/lpcxpresso-lpc1768/nsh/defconfig
@@ -13,7 +13,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_CODEREDL=y
CONFIG_BOARD_LOOPSPERMSEC=8079
CONFIG_ETH0_PHY_LAN8720=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_FAT=y
CONFIG_INTELHEX_BINARY=y
CONFIG_LPC17_EMACRAM_SIZE=7296
diff --git a/configs/lpcxpresso-lpc54628/fb/defconfig b/configs/lpcxpresso-lpc54628/fb/defconfig
index afc8562724e..38affac9f95 100644
--- a/configs/lpcxpresso-lpc54628/fb/defconfig
+++ b/configs/lpcxpresso-lpc54628/fb/defconfig
@@ -11,7 +11,7 @@ CONFIG_BOARD_LOOPSPERMSEC=21082
CONFIG_BUILTIN=y
CONFIG_DRIVERS_VIDEO=y
CONFIG_EXAMPLES_FB=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_PDCURSES=y
CONFIG_EXAMPLES_TOUCHSCREEN=y
CONFIG_FAT_LCNAMES=y
diff --git a/configs/lpcxpresso-lpc54628/netnsh/defconfig b/configs/lpcxpresso-lpc54628/netnsh/defconfig
index 887c1591aa7..721f8396bdb 100644
--- a/configs/lpcxpresso-lpc54628/netnsh/defconfig
+++ b/configs/lpcxpresso-lpc54628/netnsh/defconfig
@@ -13,7 +13,7 @@ CONFIG_BUILTIN=y
CONFIG_BUTTONS=y
CONFIG_BUTTONS_LOWER=y
CONFIG_ETH0_PHY_LAN8720=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_FS_WRITABLE=y
CONFIG_INPUT=y
diff --git a/configs/lpcxpresso-lpc54628/nsh/defconfig b/configs/lpcxpresso-lpc54628/nsh/defconfig
index bdcaa769d36..d1c5d49d424 100644
--- a/configs/lpcxpresso-lpc54628/nsh/defconfig
+++ b/configs/lpcxpresso-lpc54628/nsh/defconfig
@@ -14,7 +14,7 @@ CONFIG_BUILTIN=y
CONFIG_BUTTONS_LOWER=y
CONFIG_BUTTONS=y
CONFIG_EXAMPLES_BUTTONS=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/maple/nsh/defconfig b/configs/maple/nsh/defconfig
index fa29fcf02eb..a867c64290f 100644
--- a/configs/maple/nsh/defconfig
+++ b/configs/maple/nsh/defconfig
@@ -24,7 +24,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_LIB_RAND_ORDER=2
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
diff --git a/configs/maple/nx/defconfig b/configs/maple/nx/defconfig
index 22fbdfdcf01..4570be6e152 100644
--- a/configs/maple/nx/defconfig
+++ b/configs/maple/nx/defconfig
@@ -30,7 +30,7 @@ CONFIG_CDCACM_RXBUFSIZE=256
CONFIG_CDCACM_TXBUFSIZE=256
CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_NX=y
CONFIG_EXAMPLES_NXHELLO=y
CONFIG_EXAMPLES_NXHELLO_BPP=1
diff --git a/configs/maple/usbnsh/defconfig b/configs/maple/usbnsh/defconfig
index 6a17b604d1f..c2aa24038ea 100644
--- a/configs/maple/usbnsh/defconfig
+++ b/configs/maple/usbnsh/defconfig
@@ -29,7 +29,7 @@ CONFIG_CDCACM_RXBUFSIZE=256
CONFIG_CDCACM_TXBUFSIZE=256
CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_I2C=y
CONFIG_LIB_BOARDCTL=y
CONFIG_LIB_RAND_ORDER=2
diff --git a/configs/mbed/nsh/defconfig b/configs/mbed/nsh/defconfig
index e18d0df7aad..24a54e7e1c7 100644
--- a/configs/mbed/nsh/defconfig
+++ b/configs/mbed/nsh/defconfig
@@ -15,7 +15,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=7982
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_FAT=y
CONFIG_LPC17_SSP0=y
CONFIG_LPC17_UART0=y
diff --git a/configs/mcb1700/nsh/defconfig b/configs/mcb1700/nsh/defconfig
index ca728f422c5..154ea908360 100644
--- a/configs/mcb1700/nsh/defconfig
+++ b/configs/mcb1700/nsh/defconfig
@@ -15,7 +15,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=7982
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_FAT=y
CONFIG_LPC17_SSP0=y
CONFIG_LPC17_UART0=y
diff --git a/configs/mcu123-lpc214x/nsh/defconfig b/configs/mcu123-lpc214x/nsh/defconfig
index 52501e351fd..714cc0aa1bb 100644
--- a/configs/mcu123-lpc214x/nsh/defconfig
+++ b/configs/mcu123-lpc214x/nsh/defconfig
@@ -10,7 +10,7 @@ CONFIG_ARCH="arm"
CONFIG_ARM_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=3270
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/metro-m4/nsh/defconfig b/configs/metro-m4/nsh/defconfig
index 8064bf426fb..782d23745ad 100644
--- a/configs/metro-m4/nsh/defconfig
+++ b/configs/metro-m4/nsh/defconfig
@@ -10,8 +10,8 @@ CONFIG_BOARD_LOOPSPERMSEC=3410
CONFIG_BUILTIN=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_MAX_TASKS=16
diff --git a/configs/mikroe-stm32f4/fulldemo/defconfig b/configs/mikroe-stm32f4/fulldemo/defconfig
index 931c3af78a4..e0faf5677a5 100644
--- a/configs/mikroe-stm32f4/fulldemo/defconfig
+++ b/configs/mikroe-stm32f4/fulldemo/defconfig
@@ -29,8 +29,8 @@ CONFIG_DEV_LOOP=y
CONFIG_DEV_ZERO=y
CONFIG_DISABLE_POLL=y
CONFIG_DRIVERS_AUDIO=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_NX=y
CONFIG_EXAMPLES_NX_BPP=16
CONFIG_EXAMPLES_TOUCHSCREEN=y
diff --git a/configs/mikroe-stm32f4/kostest/defconfig b/configs/mikroe-stm32f4/kostest/defconfig
index eb3e37f14ac..b81deba0db3 100644
--- a/configs/mikroe-stm32f4/kostest/defconfig
+++ b/configs/mikroe-stm32f4/kostest/defconfig
@@ -21,7 +21,7 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_LOOP=y
CONFIG_DEV_ZERO=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_OSTEST=y
CONFIG_FS_FAT=y
CONFIG_FS_ROMFS=y
diff --git a/configs/mikroe-stm32f4/nsh/defconfig b/configs/mikroe-stm32f4/nsh/defconfig
index ce65009601c..0b9f95b6076 100644
--- a/configs/mikroe-stm32f4/nsh/defconfig
+++ b/configs/mikroe-stm32f4/nsh/defconfig
@@ -16,8 +16,8 @@ CONFIG_BUILTIN=y
CONFIG_DEV_LOOP=y
CONFIG_DEV_ZERO=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_FAT=y
CONFIG_FS_ROMFS=y
CONFIG_HAVE_CXX=y
diff --git a/configs/mikroe-stm32f4/usbnsh/defconfig b/configs/mikroe-stm32f4/usbnsh/defconfig
index 645cfd70488..75d2b502a7a 100644
--- a/configs/mikroe-stm32f4/usbnsh/defconfig
+++ b/configs/mikroe-stm32f4/usbnsh/defconfig
@@ -20,8 +20,8 @@ CONFIG_CDCACM_TXBUFSIZE=256
CONFIG_DEV_LOOP=y
CONFIG_DEV_ZERO=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_FAT=y
CONFIG_FS_ROMFS=y
CONFIG_HAVE_CXX=y
diff --git a/configs/mirtoo/nsh/defconfig b/configs/mirtoo/nsh/defconfig
index d90fc1929a6..a7cc95870da 100644
--- a/configs/mirtoo/nsh/defconfig
+++ b/configs/mirtoo/nsh/defconfig
@@ -16,7 +16,7 @@ CONFIG_BOARD_LOOPSPERMSEC=8079
CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HOST_WINDOWS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_INTELHEX_BINARY=y
diff --git a/configs/mirtoo/nxffs/defconfig b/configs/mirtoo/nxffs/defconfig
index 77f87dcdf24..5a86c16e5d7 100644
--- a/configs/mirtoo/nxffs/defconfig
+++ b/configs/mirtoo/nxffs/defconfig
@@ -17,7 +17,7 @@ CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POLL=y
CONFIG_DISABLE_PTHREAD=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_NXFFS=y
CONFIG_HOST_WINDOWS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
diff --git a/configs/misoc/hello/defconfig b/configs/misoc/hello/defconfig
index d0a41a527fd..11d4efbb822 100644
--- a/configs/misoc/hello/defconfig
+++ b/configs/misoc/hello/defconfig
@@ -19,7 +19,7 @@ CONFIG_EXAMPLES_NETTEST_INIT=y
CONFIG_EXAMPLES_NETTEST_IPADDR=0xc0a80132
CONFIG_EXAMPLES_NETTEST_NOMAC=y
CONFIG_EXAMPLES_NETTEST_PERFORMANCE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_OSTEST=y
CONFIG_EXAMPLES_TCPECHO=y
CONFIG_EXAMPLES_TELNETD=y
diff --git a/configs/misoc/nsh/defconfig b/configs/misoc/nsh/defconfig
index d7b5fdc07b1..e771934da6c 100644
--- a/configs/misoc/nsh/defconfig
+++ b/configs/misoc/nsh/defconfig
@@ -16,7 +16,7 @@ CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y
CONFIG_DISABLE_PTHREAD=y
CONFIG_EXAMPLES_HELLO=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_OSTEST=y
CONFIG_MAX_TASKS=4
CONFIG_MAX_WDOGPARMS=2
diff --git a/configs/moteino-mega/nsh/defconfig b/configs/moteino-mega/nsh/defconfig
index a246ed1ab57..af334597833 100644
--- a/configs/moteino-mega/nsh/defconfig
+++ b/configs/moteino-mega/nsh/defconfig
@@ -16,7 +16,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POLL=y
CONFIG_DISABLE_PTHREAD=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HOST_MACOS=y
CONFIG_IDLETHREAD_STACKSIZE=512
CONFIG_INTELHEX_BINARY=y
diff --git a/configs/moxa/nsh/defconfig b/configs/moxa/nsh/defconfig
index 334adbd8ffa..b824e215dd9 100644
--- a/configs/moxa/nsh/defconfig
+++ b/configs/moxa/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_BOOT_RUNFROMISRAM=y
CONFIG_BUILTIN=y
CONFIG_CXX_NEWLONG=y
CONFIG_DEFAULT_SMALL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_BINFS=y
CONFIG_FS_ROMFS=y
CONFIG_FS_UNIONFS=y
diff --git a/configs/nr5m100-nexys4/nsh/defconfig b/configs/nr5m100-nexys4/nsh/defconfig
index 16eca5b32cb..6a699af8e0f 100644
--- a/configs/nr5m100-nexys4/nsh/defconfig
+++ b/configs/nr5m100-nexys4/nsh/defconfig
@@ -16,8 +16,8 @@ CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_ZERO=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_WRITABLE=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/nrf52-pca10040/nsh/defconfig b/configs/nrf52-pca10040/nsh/defconfig
index aaeea6ea734..2d193f9a73d 100644
--- a/configs/nrf52-pca10040/nsh/defconfig
+++ b/configs/nrf52-pca10040/nsh/defconfig
@@ -9,7 +9,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_STDARG_H=y
CONFIG_ARCH="arm"
CONFIG_BOARD_LOOPSPERMSEC=5500
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/nrf52-pca10040/wdog/defconfig b/configs/nrf52-pca10040/wdog/defconfig
index aa442486f6d..dca6901a78f 100644
--- a/configs/nrf52-pca10040/wdog/defconfig
+++ b/configs/nrf52-pca10040/wdog/defconfig
@@ -10,7 +10,7 @@ CONFIG_ARCH_STDARG_H=y
CONFIG_ARCH="arm"
CONFIG_BOARD_LOOPSPERMSEC=5500
CONFIG_BUILTIN=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_WATCHDOG=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
diff --git a/configs/ntosd-dm320/nsh/defconfig b/configs/ntosd-dm320/nsh/defconfig
index 1b09038c09e..914a808ad45 100644
--- a/configs/ntosd-dm320/nsh/defconfig
+++ b/configs/ntosd-dm320/nsh/defconfig
@@ -11,7 +11,7 @@ CONFIG_BOOT_RUNFROMSDRAM=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DM9X_BASE=0xd0000300
CONFIG_DM9X_IRQ=27
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_FAT=y
CONFIG_FS_ROMFS=y
CONFIG_IDLETHREAD_STACKSIZE=4096
diff --git a/configs/nucleo-144/f722-nsh/defconfig b/configs/nucleo-144/f722-nsh/defconfig
index e9f63fe3a2e..c08a455a29b 100644
--- a/configs/nucleo-144/f722-nsh/defconfig
+++ b/configs/nucleo-144/f722-nsh/defconfig
@@ -16,7 +16,7 @@ CONFIG_BOARD_LOOPSPERMSEC=43103
CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_MAX_TASKS=16
diff --git a/configs/nucleo-144/f746-evalos/defconfig b/configs/nucleo-144/f746-evalos/defconfig
index 94ada7523b0..5a4e1b29585 100644
--- a/configs/nucleo-144/f746-evalos/defconfig
+++ b/configs/nucleo-144/f746-evalos/defconfig
@@ -21,8 +21,8 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_HELLOXX=y
CONFIG_EXAMPLES_LEDS=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_MAX_TASKS=16
diff --git a/configs/nucleo-144/f746-nsh/defconfig b/configs/nucleo-144/f746-nsh/defconfig
index 814533e7c5e..10f2d16b9ff 100644
--- a/configs/nucleo-144/f746-nsh/defconfig
+++ b/configs/nucleo-144/f746-nsh/defconfig
@@ -16,7 +16,7 @@ CONFIG_BOARD_LOOPSPERMSEC=43103
CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_MAX_TASKS=16
diff --git a/configs/nucleo-144/f767-evalos/defconfig b/configs/nucleo-144/f767-evalos/defconfig
index a2c60b7d2ec..75f5dac1bef 100644
--- a/configs/nucleo-144/f767-evalos/defconfig
+++ b/configs/nucleo-144/f767-evalos/defconfig
@@ -21,8 +21,8 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_HELLOXX=y
CONFIG_EXAMPLES_LEDS=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_MAX_TASKS=16
diff --git a/configs/nucleo-144/f767-nsh/defconfig b/configs/nucleo-144/f767-nsh/defconfig
index ba26dab1ab0..9542c0e03d3 100644
--- a/configs/nucleo-144/f767-nsh/defconfig
+++ b/configs/nucleo-144/f767-nsh/defconfig
@@ -16,7 +16,7 @@ CONFIG_BOARD_LOOPSPERMSEC=43103
CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_MAX_TASKS=16
diff --git a/configs/nucleo-f072rb/README.txt b/configs/nucleo-f072rb/README.txt
index 5f9a494cea3..75e5caca237 100644
--- a/configs/nucleo-f072rb/README.txt
+++ b/configs/nucleo-f072rb/README.txt
@@ -325,6 +325,6 @@ Configurations
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
- CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+ CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
And also support for C++ constructors under apps/platform.
diff --git a/configs/nucleo-f072rb/nsh/defconfig b/configs/nucleo-f072rb/nsh/defconfig
index 40ace02e44b..683861a0ae2 100644
--- a/configs/nucleo-f072rb/nsh/defconfig
+++ b/configs/nucleo-f072rb/nsh/defconfig
@@ -16,7 +16,7 @@ CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_MAX_TASKS=8
CONFIG_MAX_WDOGPARMS=2
diff --git a/configs/nucleo-f091rc/README.txt b/configs/nucleo-f091rc/README.txt
index 8c3fc3bd353..ad3c68ed89b 100644
--- a/configs/nucleo-f091rc/README.txt
+++ b/configs/nucleo-f091rc/README.txt
@@ -311,6 +311,6 @@ Configurations
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
- CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+ CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
And also support for C++ constructors under apps/platform.
diff --git a/configs/nucleo-f091rc/nsh/defconfig b/configs/nucleo-f091rc/nsh/defconfig
index 4ae67fd0be9..d6658beecf0 100644
--- a/configs/nucleo-f091rc/nsh/defconfig
+++ b/configs/nucleo-f091rc/nsh/defconfig
@@ -18,7 +18,7 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_MAX_TASKS=8
CONFIG_MAX_WDOGPARMS=2
diff --git a/configs/nucleo-f334r8/adc/defconfig b/configs/nucleo-f334r8/adc/defconfig
index 01157d95c79..b513990358d 100644
--- a/configs/nucleo-f334r8/adc/defconfig
+++ b/configs/nucleo-f334r8/adc/defconfig
@@ -23,7 +23,7 @@ CONFIG_DISABLE_PTHREAD=y
CONFIG_DISABLE_SIGNALS=y
CONFIG_EXAMPLES_ADC=y
CONFIG_EXAMPLES_ADC_SWTRIG=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FDCLONE_STDIO=y
CONFIG_INTELHEX_BINARY=y
CONFIG_MAX_TASKS=4
diff --git a/configs/nucleo-f334r8/highpri/defconfig b/configs/nucleo-f334r8/highpri/defconfig
index 593667a92cd..2ebe478b69e 100644
--- a/configs/nucleo-f334r8/highpri/defconfig
+++ b/configs/nucleo-f334r8/highpri/defconfig
@@ -19,7 +19,7 @@ CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POLL=y
CONFIG_DISABLE_POSIX_TIMERS=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FDCLONE_STDIO=y
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_FLOATINGPOINT=y
diff --git a/configs/nucleo-f334r8/nsh/defconfig b/configs/nucleo-f334r8/nsh/defconfig
index 1486c62b2bd..e8cbb2bc777 100644
--- a/configs/nucleo-f334r8/nsh/defconfig
+++ b/configs/nucleo-f334r8/nsh/defconfig
@@ -22,7 +22,7 @@ CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_DISABLE_PTHREAD=y
CONFIG_DISABLE_SIGNALS=y
CONFIG_EXAMPLES_HELLO=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FDCLONE_STDIO=y
CONFIG_INTELHEX_BINARY=y
CONFIG_MAX_TASKS=4
diff --git a/configs/nucleo-f410rb/nsh/defconfig b/configs/nucleo-f410rb/nsh/defconfig
index 39ac60186a1..fc791ef980d 100644
--- a/configs/nucleo-f410rb/nsh/defconfig
+++ b/configs/nucleo-f410rb/nsh/defconfig
@@ -18,7 +18,7 @@ CONFIG_BOARD_LOOPSPERMSEC=8499
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_HELLO=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HAVE_CXX=y
CONFIG_HEAP_COLORATION=y
CONFIG_INTELHEX_BINARY=y
diff --git a/configs/nucleo-f4x1re/f401-nsh/defconfig b/configs/nucleo-f4x1re/f401-nsh/defconfig
index 500d8454ff2..9b9f46a0772 100644
--- a/configs/nucleo-f4x1re/f401-nsh/defconfig
+++ b/configs/nucleo-f4x1re/f401-nsh/defconfig
@@ -16,8 +16,8 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y
CONFIG_BOARD_LOOPSPERMSEC=8499
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_INTELHEX_BINARY=y
diff --git a/configs/nucleo-f4x1re/f411-nsh/defconfig b/configs/nucleo-f4x1re/f411-nsh/defconfig
index 48681dde4bb..f48df9ed6ac 100644
--- a/configs/nucleo-f4x1re/f411-nsh/defconfig
+++ b/configs/nucleo-f4x1re/f411-nsh/defconfig
@@ -16,8 +16,8 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y
CONFIG_BOARD_LOOPSPERMSEC=8499
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_INTELHEX_BINARY=y
diff --git a/configs/nucleo-h743zi/nsh/defconfig b/configs/nucleo-h743zi/nsh/defconfig
index 253bd16f084..22ad84923a1 100644
--- a/configs/nucleo-h743zi/nsh/defconfig
+++ b/configs/nucleo-h743zi/nsh/defconfig
@@ -16,8 +16,8 @@ CONFIG_BOARD_LOOPSPERMSEC=43103
CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_EXPERIMENTAL=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/nucleo-l432kc/nsh/defconfig b/configs/nucleo-l432kc/nsh/defconfig
index c24042b8e38..d5dd1ec6c00 100644
--- a/configs/nucleo-l432kc/nsh/defconfig
+++ b/configs/nucleo-l432kc/nsh/defconfig
@@ -17,8 +17,8 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_ALARM=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_OSTEST=y
CONFIG_EXAMPLES_RANDOM=y
CONFIG_HAVE_CXX=y
diff --git a/configs/nucleo-l452re/nsh/defconfig b/configs/nucleo-l452re/nsh/defconfig
index 636a9dbe5b5..f7d71c1c7aa 100644
--- a/configs/nucleo-l452re/nsh/defconfig
+++ b/configs/nucleo-l452re/nsh/defconfig
@@ -20,8 +20,8 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_EXAMPLES_ADC=y
CONFIG_EXAMPLES_ADC_SWTRIG=y
CONFIG_EXAMPLES_ALARM=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_OSTEST=y
CONFIG_EXAMPLES_RANDOM=y
CONFIG_FS_PROCFS=y
diff --git a/configs/nucleo-l476rg/nsh/defconfig b/configs/nucleo-l476rg/nsh/defconfig
index a34e5c90fcb..316ece2987e 100644
--- a/configs/nucleo-l476rg/nsh/defconfig
+++ b/configs/nucleo-l476rg/nsh/defconfig
@@ -17,8 +17,8 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_ALARM=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_OSTEST=y
CONFIG_EXAMPLES_RANDOM=y
CONFIG_HAVE_CXX=y
diff --git a/configs/nucleo-l476rg/nxdemo/defconfig b/configs/nucleo-l476rg/nxdemo/defconfig
index 8a5b2c88f4a..2ac03e7744b 100644
--- a/configs/nucleo-l476rg/nxdemo/defconfig
+++ b/configs/nucleo-l476rg/nxdemo/defconfig
@@ -17,8 +17,8 @@ CONFIG_BOARD_LOOPSPERMSEC=8499
CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_NXHELLO=y
CONFIG_EXAMPLES_NXHELLO_BPP=1
CONFIG_HAVE_CXX=y
diff --git a/configs/nucleo-l496zg/nsh/defconfig b/configs/nucleo-l496zg/nsh/defconfig
index 81e00fd89a1..df741714667 100644
--- a/configs/nucleo-l496zg/nsh/defconfig
+++ b/configs/nucleo-l496zg/nsh/defconfig
@@ -20,8 +20,8 @@ CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_ADC=y
CONFIG_EXAMPLES_ADC_SWTRIG=y
CONFIG_EXAMPLES_ALARM=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_OSTEST=y
CONFIG_EXAMPLES_RANDOM=y
CONFIG_FS_PROCFS=y
diff --git a/configs/nutiny-nuc120/nsh/defconfig b/configs/nutiny-nuc120/nsh/defconfig
index 89f38088d7e..3ab8060a620 100644
--- a/configs/nutiny-nuc120/nsh/defconfig
+++ b/configs/nutiny-nuc120/nsh/defconfig
@@ -18,7 +18,7 @@ CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HOST_WINDOWS=y
CONFIG_INTELHEX_BINARY=y
CONFIG_MAX_TASKS=8
diff --git a/configs/olimex-efm32g880f128-stk/nsh/defconfig b/configs/olimex-efm32g880f128-stk/nsh/defconfig
index 2900678bb00..92da2796032 100644
--- a/configs/olimex-efm32g880f128-stk/nsh/defconfig
+++ b/configs/olimex-efm32g880f128-stk/nsh/defconfig
@@ -13,7 +13,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_POLL=y
CONFIG_EFM32_GPIO_IRQ=y
CONFIG_EFM32_LEUART1=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HOST_WINDOWS=y
CONFIG_LEUART1_SERIAL_CONSOLE=y
CONFIG_MAX_TASKS=16
diff --git a/configs/olimex-lpc-h3131/README.txt b/configs/olimex-lpc-h3131/README.txt
index 9aff9821b31..510f24cb267 100644
--- a/configs/olimex-lpc-h3131/README.txt
+++ b/configs/olimex-lpc-h3131/README.txt
@@ -753,7 +753,7 @@ Configurations
These settings disable NSH:
Application Configuration -> Examples
- CONFIG_EXAMPLES_NSH=n
+ CONFIG_SYSTEM_NSH=n
Application Configuration -> NSH Library
CONFIG_NSH_LIBRARY=y
diff --git a/configs/olimex-lpc-h3131/nsh/defconfig b/configs/olimex-lpc-h3131/nsh/defconfig
index d71ff55d5a6..48d89480221 100644
--- a/configs/olimex-lpc-h3131/nsh/defconfig
+++ b/configs/olimex-lpc-h3131/nsh/defconfig
@@ -15,7 +15,7 @@ CONFIG_ARM_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=4287
CONFIG_BOOT_RUNFROMISRAM=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/olimex-lpc1766stk/ftpc/defconfig b/configs/olimex-lpc1766stk/ftpc/defconfig
index f58051f8fa3..5d242a16984 100644
--- a/configs/olimex-lpc1766stk/ftpc/defconfig
+++ b/configs/olimex-lpc1766stk/ftpc/defconfig
@@ -13,7 +13,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=8111
CONFIG_BUILTIN=y
CONFIG_ETH0_PHY_KS8721=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/olimex-lpc1766stk/hidmouse/defconfig b/configs/olimex-lpc1766stk/hidmouse/defconfig
index bd2b954f4a8..46612ed40f4 100644
--- a/configs/olimex-lpc1766stk/hidmouse/defconfig
+++ b/configs/olimex-lpc1766stk/hidmouse/defconfig
@@ -12,7 +12,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=8111
CONFIG_BUILTIN=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_TOUCHSCREEN=y
CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/mouse0"
CONFIG_EXAMPLES_TOUCHSCREEN_MOUSE=y
diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig
index 41b01d63639..d72a13782ad 100644
--- a/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/configs/olimex-lpc1766stk/nsh/defconfig
@@ -16,7 +16,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=8111
CONFIG_BUILTIN=y
CONFIG_ETH0_PHY_KS8721=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/olimex-lpc1766stk/zmodem/defconfig b/configs/olimex-lpc1766stk/zmodem/defconfig
index 7570d4e0bac..7789da443e3 100644
--- a/configs/olimex-lpc1766stk/zmodem/defconfig
+++ b/configs/olimex-lpc1766stk/zmodem/defconfig
@@ -15,7 +15,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=8111
CONFIG_BUILTIN=y
CONFIG_ETH0_PHY_KS8721=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/olimex-lpc2378/nsh/defconfig b/configs/olimex-lpc2378/nsh/defconfig
index ab136e9efcc..1e2178d25d4 100644
--- a/configs/olimex-lpc2378/nsh/defconfig
+++ b/configs/olimex-lpc2378/nsh/defconfig
@@ -8,7 +8,7 @@ CONFIG_ARCH="arm"
CONFIG_ARM_TOOLCHAIN_CODESOURCERYL=y
CONFIG_BOARD_LOOPSPERMSEC=3270
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_LPC2378_UART0=y
CONFIG_LPC2378_UART2=y
diff --git a/configs/olimex-stm32-e407/netnsh/defconfig b/configs/olimex-stm32-e407/netnsh/defconfig
index 1616b9e2a38..469cd6b8035 100644
--- a/configs/olimex-stm32-e407/netnsh/defconfig
+++ b/configs/olimex-stm32-e407/netnsh/defconfig
@@ -12,8 +12,8 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_ETH0_PHY_LAN8720=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_INTELHEX_BINARY=y
diff --git a/configs/olimex-stm32-e407/nsh/defconfig b/configs/olimex-stm32-e407/nsh/defconfig
index 6d533045f7d..99695280073 100644
--- a/configs/olimex-stm32-e407/nsh/defconfig
+++ b/configs/olimex-stm32-e407/nsh/defconfig
@@ -14,8 +14,8 @@ CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_EXAMPLES_HELLOXX=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/olimex-stm32-e407/usbnsh/defconfig b/configs/olimex-stm32-e407/usbnsh/defconfig
index d93419db540..34e1ddaaad5 100644
--- a/configs/olimex-stm32-e407/usbnsh/defconfig
+++ b/configs/olimex-stm32-e407/usbnsh/defconfig
@@ -17,8 +17,8 @@ CONFIG_CDCACM_TXBUFSIZE=256
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_EXAMPLES_HELLOXX=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/olimex-stm32-h405/usbnsh/defconfig b/configs/olimex-stm32-h405/usbnsh/defconfig
index 9627d5f5a2d..0370ced294b 100644
--- a/configs/olimex-stm32-h405/usbnsh/defconfig
+++ b/configs/olimex-stm32-h405/usbnsh/defconfig
@@ -25,8 +25,8 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_ADC=y
CONFIG_EXAMPLES_CAN=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_INTELHEX_BINARY=y
diff --git a/configs/olimex-stm32-h407/nsh/defconfig b/configs/olimex-stm32-h407/nsh/defconfig
index f2c840a57c4..ed10a905d2d 100644
--- a/configs/olimex-stm32-h407/nsh/defconfig
+++ b/configs/olimex-stm32-h407/nsh/defconfig
@@ -15,8 +15,8 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/olimex-stm32-h407/nsh_uext/defconfig b/configs/olimex-stm32-h407/nsh_uext/defconfig
index 3ded0fa9600..6356fd00e57 100644
--- a/configs/olimex-stm32-h407/nsh_uext/defconfig
+++ b/configs/olimex-stm32-h407/nsh_uext/defconfig
@@ -15,7 +15,7 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_INTELHEX_BINARY=y
CONFIG_MAX_TASKS=16
diff --git a/configs/olimex-stm32-p107/nsh/defconfig b/configs/olimex-stm32-p107/nsh/defconfig
index ba7d717167c..c5bcbea5943 100644
--- a/configs/olimex-stm32-p107/nsh/defconfig
+++ b/configs/olimex-stm32-p107/nsh/defconfig
@@ -15,7 +15,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_CAN=y
CONFIG_ETH0_PHY_KS8721=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_INTELHEX_BINARY=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
diff --git a/configs/olimex-stm32-p207/nsh/defconfig b/configs/olimex-stm32-p207/nsh/defconfig
index a98ef1e1bf4..affa5625230 100644
--- a/configs/olimex-stm32-p207/nsh/defconfig
+++ b/configs/olimex-stm32-p207/nsh/defconfig
@@ -19,8 +19,8 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_ETH0_PHY_KS8721=y
CONFIG_EXAMPLES_ADC=y
CONFIG_EXAMPLES_ADC_GROUPSIZE=1
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_INTELHEX_BINARY=y
diff --git a/configs/olimex-stm32-p407/knsh/defconfig b/configs/olimex-stm32-p407/knsh/defconfig
index 454b21099fb..f605c74fd05 100644
--- a/configs/olimex-stm32-p407/knsh/defconfig
+++ b/configs/olimex-stm32-p407/knsh/defconfig
@@ -11,8 +11,8 @@ CONFIG_BOARD_INITIALIZE=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILD_PROTECTED=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/olimex-stm32-p407/module/defconfig b/configs/olimex-stm32-p407/module/defconfig
index 7fbd9f4b3dd..ddee5ae87b1 100644
--- a/configs/olimex-stm32-p407/module/defconfig
+++ b/configs/olimex-stm32-p407/module/defconfig
@@ -12,7 +12,7 @@ CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_MODULE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/olimex-stm32-p407/nsh/defconfig b/configs/olimex-stm32-p407/nsh/defconfig
index b79f3e41fe8..e2ffbbc4b9c 100644
--- a/configs/olimex-stm32-p407/nsh/defconfig
+++ b/configs/olimex-stm32-p407/nsh/defconfig
@@ -10,8 +10,8 @@ CONFIG_BOARD_INITIALIZE=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/olimex-stm32-p407/zmodem/defconfig b/configs/olimex-stm32-p407/zmodem/defconfig
index 02e924b6123..0b917c995be 100644
--- a/configs/olimex-stm32-p407/zmodem/defconfig
+++ b/configs/olimex-stm32-p407/zmodem/defconfig
@@ -10,8 +10,8 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/olimex-strp711/nsh/defconfig b/configs/olimex-strp711/nsh/defconfig
index 134d9bb41a2..b4c988cd6e1 100644
--- a/configs/olimex-strp711/nsh/defconfig
+++ b/configs/olimex-strp711/nsh/defconfig
@@ -10,7 +10,7 @@ CONFIG_ARCH="arm"
CONFIG_ARM_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=1431
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_FAT=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_MAX_TASKS=16
diff --git a/configs/olimexino-stm32/can/defconfig b/configs/olimexino-stm32/can/defconfig
index a010ce30e82..045ec8cc922 100644
--- a/configs/olimexino-stm32/can/defconfig
+++ b/configs/olimexino-stm32/can/defconfig
@@ -34,7 +34,7 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEFAULT_SMALL=y
CONFIG_EXAMPLES_CAN=y
CONFIG_EXAMPLES_HELLOXX=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FAT_MAXFNAME=12
diff --git a/configs/olimexino-stm32/composite/defconfig b/configs/olimexino-stm32/composite/defconfig
index 5daf126ca02..1acac22b278 100644
--- a/configs/olimexino-stm32/composite/defconfig
+++ b/configs/olimexino-stm32/composite/defconfig
@@ -54,7 +54,7 @@ CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEFAULT_SMALL=y
CONFIG_EXAMPLES_HELLOXX=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FAT_MAXFNAME=12
diff --git a/configs/olimexino-stm32/nsh/defconfig b/configs/olimexino-stm32/nsh/defconfig
index e0197286b7b..872c27f4b3c 100644
--- a/configs/olimexino-stm32/nsh/defconfig
+++ b/configs/olimexino-stm32/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEFAULT_SMALL=y
CONFIG_EXAMPLES_HELLOXX=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FAT_MAXFNAME=12
diff --git a/configs/olimexino-stm32/smallnsh/defconfig b/configs/olimexino-stm32/smallnsh/defconfig
index 5c95f2a102a..11d964edef1 100644
--- a/configs/olimexino-stm32/smallnsh/defconfig
+++ b/configs/olimexino-stm32/smallnsh/defconfig
@@ -24,7 +24,7 @@ CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEFAULT_SMALL=y
CONFIG_EXAMPLES_CAN=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FDCLONE_STDIO=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/open1788/knsh/defconfig b/configs/open1788/knsh/defconfig
index e7911009382..0344013e768 100644
--- a/configs/open1788/knsh/defconfig
+++ b/configs/open1788/knsh/defconfig
@@ -17,7 +17,7 @@ CONFIG_BOARD_LOOPSPERMSEC=11934
CONFIG_BUILD_PROTECTED=y
CONFIG_DEV_LOOP=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/open1788/nsh/defconfig b/configs/open1788/nsh/defconfig
index 68e8ce5a0e5..96edd19b089 100644
--- a/configs/open1788/nsh/defconfig
+++ b/configs/open1788/nsh/defconfig
@@ -13,7 +13,7 @@ CONFIG_BCH=y
CONFIG_BOARD_LOOPSPERMSEC=11934
CONFIG_BUILTIN=y
CONFIG_DEV_LOOP=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/open1788/pdcurses/defconfig b/configs/open1788/pdcurses/defconfig
index a1b0136c8c7..7e30ccc3b7d 100644
--- a/configs/open1788/pdcurses/defconfig
+++ b/configs/open1788/pdcurses/defconfig
@@ -14,7 +14,7 @@ CONFIG_DJOYSTICK=y
CONFIG_DRIVERS_VIDEO=y
CONFIG_EXAMPLES_DJOYSTICK=y
CONFIG_EXAMPLES_FB=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_PDCURSES=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
diff --git a/configs/or1k/nsh/defconfig b/configs/or1k/nsh/defconfig
index c65c12e6904..cd1365f7a5c 100644
--- a/configs/or1k/nsh/defconfig
+++ b/configs/or1k/nsh/defconfig
@@ -58,7 +58,7 @@ CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POLL=y
CONFIG_DISABLE_PTHREAD=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_OSTEST=y
CONFIG_EXPERIMENTAL=y
CONFIG_FS_PROCFS_REGISTER=y
diff --git a/configs/pcblogic-pic32mx/nsh/defconfig b/configs/pcblogic-pic32mx/nsh/defconfig
index 0ac537a3d96..ed759a12f84 100644
--- a/configs/pcblogic-pic32mx/nsh/defconfig
+++ b/configs/pcblogic-pic32mx/nsh/defconfig
@@ -13,7 +13,7 @@ CONFIG_ARCH="mips"
CONFIG_BOARD_LOOPSPERMSEC=8079
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HOST_WINDOWS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_INTELHEX_BINARY=y
diff --git a/configs/pcduino-a10/nsh/defconfig b/configs/pcduino-a10/nsh/defconfig
index 9c2d547b909..225001760dd 100644
--- a/configs/pcduino-a10/nsh/defconfig
+++ b/configs/pcduino-a10/nsh/defconfig
@@ -18,8 +18,8 @@ CONFIG_BOOT_RUNFROMSDRAM=y
CONFIG_BUILTIN=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/photon/nsh/defconfig b/configs/photon/nsh/defconfig
index bc1845ee1ae..67cdbbd2474 100644
--- a/configs/photon/nsh/defconfig
+++ b/configs/photon/nsh/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/photon/rgbled/defconfig b/configs/photon/rgbled/defconfig
index d6bd30fbbf0..df0c71adbed 100644
--- a/configs/photon/rgbled/defconfig
+++ b/configs/photon/rgbled/defconfig
@@ -15,7 +15,7 @@ CONFIG_BUILTIN=y
CONFIG_CDCACM=y
CONFIG_CDCACM_CONSOLE=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_RGBLED=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
diff --git a/configs/photon/usbnsh/defconfig b/configs/photon/usbnsh/defconfig
index a48b3643281..8fb1d2519e3 100644
--- a/configs/photon/usbnsh/defconfig
+++ b/configs/photon/usbnsh/defconfig
@@ -14,7 +14,7 @@ CONFIG_BUILTIN=y
CONFIG_CDCACM=y
CONFIG_CDCACM_CONSOLE=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/photon/wlan/defconfig b/configs/photon/wlan/defconfig
index 4e3727b68a1..55f9f186588 100644
--- a/configs/photon/wlan/defconfig
+++ b/configs/photon/wlan/defconfig
@@ -20,7 +20,7 @@ CONFIG_DFU_VID=0x2b04
CONFIG_DISABLE_POLL=y
CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/pic32mx-starterkit/nsh/defconfig b/configs/pic32mx-starterkit/nsh/defconfig
index a5cab10bf48..3e92c5ada15 100644
--- a/configs/pic32mx-starterkit/nsh/defconfig
+++ b/configs/pic32mx-starterkit/nsh/defconfig
@@ -12,7 +12,7 @@ CONFIG_ARCH="mips"
CONFIG_BOARD_LOOPSPERMSEC=7245
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/pic32mx-starterkit/nsh2/defconfig b/configs/pic32mx-starterkit/nsh2/defconfig
index ef5c5d04d7b..07bdcbcce8d 100644
--- a/configs/pic32mx-starterkit/nsh2/defconfig
+++ b/configs/pic32mx-starterkit/nsh2/defconfig
@@ -15,7 +15,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=7245
CONFIG_BUILTIN=y
CONFIG_ETH0_PHY_DP83848C=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/pic32mx7mmb/nsh/defconfig b/configs/pic32mx7mmb/nsh/defconfig
index 09d680b2942..3ce33779ccc 100644
--- a/configs/pic32mx7mmb/nsh/defconfig
+++ b/configs/pic32mx7mmb/nsh/defconfig
@@ -14,7 +14,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=7245
CONFIG_BUILTIN=y
CONFIG_ETH0_PHY_LAN8720=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/pic32mz-starterkit/nsh/defconfig b/configs/pic32mz-starterkit/nsh/defconfig
index af11ce1ebca..58591a7139e 100644
--- a/configs/pic32mz-starterkit/nsh/defconfig
+++ b/configs/pic32mz-starterkit/nsh/defconfig
@@ -12,7 +12,7 @@ CONFIG_ARCH="mips"
CONFIG_BOARD_LOOPSPERMSEC=7245
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/pizero/nsh/defconfig b/configs/pizero/nsh/defconfig
index cc6b37816fe..1fbd8c50212 100644
--- a/configs/pizero/nsh/defconfig
+++ b/configs/pizero/nsh/defconfig
@@ -15,7 +15,7 @@ CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BOOT_RUNFROMSDRAM=y
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/qemu-i486/nsh/defconfig b/configs/qemu-i486/nsh/defconfig
index 1e237776545..81bdfc83d68 100644
--- a/configs/qemu-i486/nsh/defconfig
+++ b/configs/qemu-i486/nsh/defconfig
@@ -18,7 +18,7 @@ CONFIG_ARCH="x86"
CONFIG_BOARD_LOOPSPERMSEC=999
CONFIG_BOOT_RUNFROMEXTSRAM=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_FAT=y
CONFIG_FS_ROMFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
diff --git a/configs/sabre-6quad/nsh/defconfig b/configs/sabre-6quad/nsh/defconfig
index 5a33629f675..cd4c5556b2f 100644
--- a/configs/sabre-6quad/nsh/defconfig
+++ b/configs/sabre-6quad/nsh/defconfig
@@ -15,8 +15,8 @@ CONFIG_BOARD_LOOPSPERMSEC=99369
CONFIG_BOOT_RUNFROMSDRAM=y
CONFIG_BUILTIN=y
CONFIG_DEV_ZERO=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/sabre-6quad/smp/defconfig b/configs/sabre-6quad/smp/defconfig
index f1094ab9b83..23f98dc1680 100644
--- a/configs/sabre-6quad/smp/defconfig
+++ b/configs/sabre-6quad/smp/defconfig
@@ -14,8 +14,8 @@ CONFIG_BOARD_LOOPSPERMSEC=99369
CONFIG_BOOT_RUNFROMSDRAM=y
CONFIG_BUILTIN=y
CONFIG_DEV_ZERO=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_SMP=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig
index bc09efde70a..7e405e5ffe3 100644
--- a/configs/sam3u-ek/knsh/defconfig
+++ b/configs/sam3u-ek/knsh/defconfig
@@ -16,7 +16,7 @@ CONFIG_ARM_MPU=y
CONFIG_BOARD_LOOPSPERMSEC=8720
CONFIG_BUILD_PROTECTED=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_FAT=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig
index d4a3c5df7a5..cbda362f250 100644
--- a/configs/sam3u-ek/nsh/defconfig
+++ b/configs/sam3u-ek/nsh/defconfig
@@ -14,7 +14,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=8720
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_FAT=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
diff --git a/configs/sam4cmp-db/nsh/defconfig b/configs/sam4cmp-db/nsh/defconfig
index f1a486edea7..5e6eb19f213 100644
--- a/configs/sam4cmp-db/nsh/defconfig
+++ b/configs/sam4cmp-db/nsh/defconfig
@@ -10,7 +10,7 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_OSTEST=y
CONFIG_EXAMPLES_SMP=y
CONFIG_FS_PROCFS=y
diff --git a/configs/sam4e-ek/nsh/defconfig b/configs/sam4e-ek/nsh/defconfig
index 652f366f1b7..884c6599e63 100644
--- a/configs/sam4e-ek/nsh/defconfig
+++ b/configs/sam4e-ek/nsh/defconfig
@@ -14,7 +14,7 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y
CONFIG_BOARD_LOOPSPERMSEC=11990
CONFIG_BUILTIN=y
CONFIG_ETH0_PHY_KSZ8051=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/sam4e-ek/usbnsh/defconfig b/configs/sam4e-ek/usbnsh/defconfig
index 3a35cdb453e..254526bf7cf 100644
--- a/configs/sam4e-ek/usbnsh/defconfig
+++ b/configs/sam4e-ek/usbnsh/defconfig
@@ -22,7 +22,7 @@ CONFIG_CDCACM_EPBULKOUT=2
CONFIG_CDCACM_RXBUFSIZE=256
CONFIG_CDCACM_TXBUFSIZE=256
CONFIG_ETH0_PHY_KSZ8051=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/sam4l-xplained/nsh/defconfig b/configs/sam4l-xplained/nsh/defconfig
index e013ff86397..9a95fcf3a09 100644
--- a/configs/sam4l-xplained/nsh/defconfig
+++ b/configs/sam4l-xplained/nsh/defconfig
@@ -15,8 +15,8 @@ CONFIG_BUILTIN=y
CONFIG_CXX_NEWLONG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_MAX_TASKS=16
diff --git a/configs/sam4s-xplained-pro/nsh/defconfig b/configs/sam4s-xplained-pro/nsh/defconfig
index eb9473a9dcd..2971d700045 100644
--- a/configs/sam4s-xplained-pro/nsh/defconfig
+++ b/configs/sam4s-xplained-pro/nsh/defconfig
@@ -25,8 +25,8 @@ CONFIG_DEV_ZERO=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_CPUHOG=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_SERIALBLASTER=y
CONFIG_EXAMPLES_SERIALRX=y
CONFIG_EXAMPLES_SERIALRX_BUFSIZE=4096
diff --git a/configs/sam4s-xplained/nsh/defconfig b/configs/sam4s-xplained/nsh/defconfig
index 7d662a1b0be..b778ccdcc4b 100644
--- a/configs/sam4s-xplained/nsh/defconfig
+++ b/configs/sam4s-xplained/nsh/defconfig
@@ -17,8 +17,8 @@ CONFIG_CXX_NEWLONG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_MAX_TASKS=16
diff --git a/configs/sama5d2-xult/nsh/defconfig b/configs/sama5d2-xult/nsh/defconfig
index ccdc9556a28..d443dc96441 100644
--- a/configs/sama5d2-xult/nsh/defconfig
+++ b/configs/sama5d2-xult/nsh/defconfig
@@ -20,8 +20,8 @@ CONFIG_BOARD_LOOPSPERMSEC=65775
CONFIG_BOOT_RUNFROMSDRAM=y
CONFIG_BUILTIN=y
CONFIG_DEV_ZERO=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/sama5d3-xplained/nsh/defconfig b/configs/sama5d3-xplained/nsh/defconfig
index 432ae31ffa1..7ae7b01c25f 100644
--- a/configs/sama5d3-xplained/nsh/defconfig
+++ b/configs/sama5d3-xplained/nsh/defconfig
@@ -18,8 +18,8 @@ CONFIG_BOOT_RUNFROMSDRAM=y
CONFIG_BUILTIN=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/sama5d3x-ek/demo/defconfig b/configs/sama5d3x-ek/demo/defconfig
index bea76e69ab0..f0bc7a47d5e 100644
--- a/configs/sama5d3x-ek/demo/defconfig
+++ b/configs/sama5d3x-ek/demo/defconfig
@@ -16,8 +16,8 @@ CONFIG_BOARD_LOOPSPERMSEC=49341
CONFIG_BUILTIN=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FLASH_SIZE=134217728
diff --git a/configs/sama5d3x-ek/nsh/defconfig b/configs/sama5d3x-ek/nsh/defconfig
index 5799eced6ba..ac31658b11e 100644
--- a/configs/sama5d3x-ek/nsh/defconfig
+++ b/configs/sama5d3x-ek/nsh/defconfig
@@ -16,8 +16,8 @@ CONFIG_BOARD_LOOPSPERMSEC=49341
CONFIG_BUILTIN=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FLASH_SIZE=134217728
diff --git a/configs/sama5d3x-ek/nxplayer/defconfig b/configs/sama5d3x-ek/nxplayer/defconfig
index 01bdaeccfe8..147f71a29cf 100644
--- a/configs/sama5d3x-ek/nxplayer/defconfig
+++ b/configs/sama5d3x-ek/nxplayer/defconfig
@@ -21,8 +21,8 @@ CONFIG_BOARD_LOOPSPERMSEC=49341
CONFIG_BUILTIN=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FLASH_SIZE=134217728
diff --git a/configs/sama5d4-ek/ipv6/defconfig b/configs/sama5d4-ek/ipv6/defconfig
index 41ef09e250b..d1493ece31a 100644
--- a/configs/sama5d4-ek/ipv6/defconfig
+++ b/configs/sama5d4-ek/ipv6/defconfig
@@ -26,8 +26,8 @@ CONFIG_BUILTIN=y
CONFIG_DEV_ZERO=y
CONFIG_DRIVERS_AUDIO=y
CONFIG_ETH0_PHY_KSZ8081=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_NX_BPP=16
CONFIG_EXAMPLES_NX=y
CONFIG_EXAMPLES_TOUCHSCREEN=y
diff --git a/configs/sama5d4-ek/knsh/defconfig b/configs/sama5d4-ek/knsh/defconfig
index 5f5e106dc71..8bbe12c4427 100644
--- a/configs/sama5d4-ek/knsh/defconfig
+++ b/configs/sama5d4-ek/knsh/defconfig
@@ -33,8 +33,8 @@ CONFIG_BUILD_KERNEL=y
CONFIG_DEV_ZERO=y
CONFIG_ELF=y
CONFIG_EXAMPLES_HELLO=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_PROGNAME="init"
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_PROGNAME="init"
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig
index 3dd25013f6b..42eb191b711 100644
--- a/configs/sama5d4-ek/nsh/defconfig
+++ b/configs/sama5d4-ek/nsh/defconfig
@@ -25,8 +25,8 @@ CONFIG_BUILTIN=y
CONFIG_DEV_ZERO=y
CONFIG_DRIVERS_AUDIO=y
CONFIG_ETH0_PHY_KSZ8081=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_NX_BPP=16
CONFIG_EXAMPLES_NX=y
CONFIG_EXAMPLES_TOUCHSCREEN=y
diff --git a/configs/sama5d4-ek/ramtest/defconfig b/configs/sama5d4-ek/ramtest/defconfig
index e0aca17bbd2..e3073020f76 100644
--- a/configs/sama5d4-ek/ramtest/defconfig
+++ b/configs/sama5d4-ek/ramtest/defconfig
@@ -15,8 +15,8 @@ CONFIG_BOOT_RUNFROMISRAM=y
CONFIG_BUILTIN=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/samd20-xplained/nsh/defconfig b/configs/samd20-xplained/nsh/defconfig
index 074234a642b..9eaea6e1c65 100644
--- a/configs/samd20-xplained/nsh/defconfig
+++ b/configs/samd20-xplained/nsh/defconfig
@@ -29,8 +29,8 @@ CONFIG_BOARD_LOOPSPERMSEC=3410
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
diff --git a/configs/samd21-xplained/nsh/defconfig b/configs/samd21-xplained/nsh/defconfig
index 2c49e6ad34c..ed7396746dc 100644
--- a/configs/samd21-xplained/nsh/defconfig
+++ b/configs/samd21-xplained/nsh/defconfig
@@ -29,8 +29,8 @@ CONFIG_BOARD_LOOPSPERMSEC=3410
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
diff --git a/configs/same70-xplained/mrf24j40-starhub/defconfig b/configs/same70-xplained/mrf24j40-starhub/defconfig
index 60a97293133..6463650cde0 100644
--- a/configs/same70-xplained/mrf24j40-starhub/defconfig
+++ b/configs/same70-xplained/mrf24j40-starhub/defconfig
@@ -27,8 +27,8 @@ CONFIG_BUILTIN=y
CONFIG_DRIVERS_IEEE802154=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_ETH0_PHY_KSZ8061=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/same70-xplained/netnsh/defconfig b/configs/same70-xplained/netnsh/defconfig
index 89e90c05a70..4ea601442dd 100644
--- a/configs/same70-xplained/netnsh/defconfig
+++ b/configs/same70-xplained/netnsh/defconfig
@@ -27,7 +27,7 @@ CONFIG_AT24XX_SIZE=2
CONFIG_BOARD_LOOPSPERMSEC=51262
CONFIG_BUILTIN=y
CONFIG_ETH0_PHY_KSZ8081=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/same70-xplained/nsh/defconfig b/configs/same70-xplained/nsh/defconfig
index c40a07ba006..9b69c9ccb89 100644
--- a/configs/same70-xplained/nsh/defconfig
+++ b/configs/same70-xplained/nsh/defconfig
@@ -28,7 +28,7 @@ CONFIG_AT24XX_SIZE=2
CONFIG_BOARD_LOOPSPERMSEC=51262
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/saml21-xplained/nsh/defconfig b/configs/saml21-xplained/nsh/defconfig
index 6891f02d4b3..7db939f5af3 100644
--- a/configs/saml21-xplained/nsh/defconfig
+++ b/configs/saml21-xplained/nsh/defconfig
@@ -29,8 +29,8 @@ CONFIG_BOARD_LOOPSPERMSEC=4356
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
diff --git a/configs/samv71-xult/knsh/defconfig b/configs/samv71-xult/knsh/defconfig
index cab285571a9..9c171a28d04 100644
--- a/configs/samv71-xult/knsh/defconfig
+++ b/configs/samv71-xult/knsh/defconfig
@@ -27,7 +27,7 @@ CONFIG_AT24XX_SIZE=2
CONFIG_BOARD_LOOPSPERMSEC=51262
CONFIG_BUILD_PROTECTED=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/samv71-xult/module/defconfig b/configs/samv71-xult/module/defconfig
index c84da61f9d8..39a8f072fd8 100644
--- a/configs/samv71-xult/module/defconfig
+++ b/configs/samv71-xult/module/defconfig
@@ -22,7 +22,7 @@ CONFIG_BOARD_LOOPSPERMSEC=51262
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_MODULE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/samv71-xult/mrf24j40-starhub/defconfig b/configs/samv71-xult/mrf24j40-starhub/defconfig
index 5e76c988dff..8ce8179408f 100644
--- a/configs/samv71-xult/mrf24j40-starhub/defconfig
+++ b/configs/samv71-xult/mrf24j40-starhub/defconfig
@@ -26,8 +26,8 @@ CONFIG_BUILTIN=y
CONFIG_DRIVERS_IEEE802154=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_ETH0_PHY_KSZ8061=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/samv71-xult/mxtxplnd/defconfig b/configs/samv71-xult/mxtxplnd/defconfig
index f3d04b42294..0436f58892c 100644
--- a/configs/samv71-xult/mxtxplnd/defconfig
+++ b/configs/samv71-xult/mxtxplnd/defconfig
@@ -27,7 +27,7 @@ CONFIG_AT24XX_SIZE=2
CONFIG_BOARD_LOOPSPERMSEC=51262
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_NXLINES_BPP=16
CONFIG_EXAMPLES_NXLINES=y
CONFIG_EXAMPLES_TOUCHSCREEN=y
diff --git a/configs/samv71-xult/netnsh/defconfig b/configs/samv71-xult/netnsh/defconfig
index 29990c89c0c..c2760455e72 100644
--- a/configs/samv71-xult/netnsh/defconfig
+++ b/configs/samv71-xult/netnsh/defconfig
@@ -27,7 +27,7 @@ CONFIG_BOARD_LOOPSPERMSEC=51262
CONFIG_BUILTIN=y
CONFIG_DEBUG_CUSTOMOPT=y
CONFIG_ETH0_PHY_KSZ8061=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/samv71-xult/nsh/defconfig b/configs/samv71-xult/nsh/defconfig
index 4c168333d84..90d50afa416 100644
--- a/configs/samv71-xult/nsh/defconfig
+++ b/configs/samv71-xult/nsh/defconfig
@@ -27,7 +27,7 @@ CONFIG_AT24XX_SIZE=2
CONFIG_BOARD_LOOPSPERMSEC=51262
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/samv71-xult/vnc/defconfig b/configs/samv71-xult/vnc/defconfig
index e9e3a2ec6c9..1bb6e0ee412 100644
--- a/configs/samv71-xult/vnc/defconfig
+++ b/configs/samv71-xult/vnc/defconfig
@@ -28,7 +28,7 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_ETH0_PHY_KSZ8061=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_NXIMAGE=y
CONFIG_EXAMPLES_NXIMAGE_BPP=8
CONFIG_FAT_LCNAMES=y
diff --git a/configs/shenzhou/nsh/defconfig b/configs/shenzhou/nsh/defconfig
index d2acf21c2a0..eb726d666e6 100644
--- a/configs/shenzhou/nsh/defconfig
+++ b/configs/shenzhou/nsh/defconfig
@@ -10,7 +10,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_ETH0_PHY_DM9161=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/shenzhou/thttpd/defconfig b/configs/shenzhou/thttpd/defconfig
index 6d8418439f7..9f74ce57852 100644
--- a/configs/shenzhou/thttpd/defconfig
+++ b/configs/shenzhou/thttpd/defconfig
@@ -10,7 +10,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_ETH0_PHY_DM9161=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_THTTPD=y
CONFIG_EXAMPLES_THTTPD_DRIPADDR=0xc0a80001
CONFIG_EXAMPLES_THTTPD_NOMAC=y
diff --git a/configs/sim/bas/defconfig b/configs/sim/bas/defconfig
index b934f57d67b..c1397f64022 100644
--- a/configs/sim/bas/defconfig
+++ b/configs/sim/bas/defconfig
@@ -10,7 +10,7 @@ CONFIG_BOOT_RUNFROMEXTSRAM=y
CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/sim/bluetooth/defconfig b/configs/sim/bluetooth/defconfig
index a4c1d9a36bb..69ece9dbb53 100644
--- a/configs/sim/bluetooth/defconfig
+++ b/configs/sim/bluetooth/defconfig
@@ -24,7 +24,7 @@ CONFIG_DRIVERS_BLUETOOTH=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_EXAMPLES_HELLO_STACKSIZE=8192
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FSUTILS_PASSWD=y
diff --git a/configs/sim/ipforward/defconfig b/configs/sim/ipforward/defconfig
index 17a8fac6a11..d3db17e5fae 100644
--- a/configs/sim/ipforward/defconfig
+++ b/configs/sim/ipforward/defconfig
@@ -19,7 +19,7 @@ CONFIG_DEV_ZERO=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_IPFORWARD=y
CONFIG_EXAMPLES_IPFORWARD_STACKSIZE=8192
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FSUTILS_PASSWD=y
diff --git a/configs/sim/minibasic/defconfig b/configs/sim/minibasic/defconfig
index 86e910e09e0..25ebb2adc64 100644
--- a/configs/sim/minibasic/defconfig
+++ b/configs/sim/minibasic/defconfig
@@ -15,7 +15,7 @@ CONFIG_DEV_ZERO=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_EXAMPLES_HELLO_STACKSIZE=8192
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FSUTILS_PASSWD=y
diff --git a/configs/sim/nsh/defconfig b/configs/sim/nsh/defconfig
index fa7c8e7eac3..dece8b25ed5 100644
--- a/configs/sim/nsh/defconfig
+++ b/configs/sim/nsh/defconfig
@@ -16,7 +16,7 @@ CONFIG_DEV_ZERO=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_EXAMPLES_HELLO_STACKSIZE=8192
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FSUTILS_PASSWD=y
diff --git a/configs/sim/nsh2/defconfig b/configs/sim/nsh2/defconfig
index 237cb840c81..74fd37c0e42 100644
--- a/configs/sim/nsh2/defconfig
+++ b/configs/sim/nsh2/defconfig
@@ -9,7 +9,7 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
CONFIG_DISABLE_POSIX_TIMERS=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_NX=y
CONFIG_EXAMPLES_NXHELLO_FONTID=6
CONFIG_EXAMPLES_NXHELLO=y
diff --git a/configs/sim/pf_ieee802154/defconfig b/configs/sim/pf_ieee802154/defconfig
index c9e5d977f2f..482f3f7b2d3 100644
--- a/configs/sim/pf_ieee802154/defconfig
+++ b/configs/sim/pf_ieee802154/defconfig
@@ -19,7 +19,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=2048
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
CONFIG_DRIVERS_WIRELESS=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_PFIEEE802154=y
CONFIG_EXAMPLES_PFIEEE802154_STACKSIZE1=8192
CONFIG_EXAMPLES_PFIEEE802154_STACKSIZE2=8192
diff --git a/configs/sim/pktradio/defconfig b/configs/sim/pktradio/defconfig
index ff62fb1d51a..17a5bf4a947 100644
--- a/configs/sim/pktradio/defconfig
+++ b/configs/sim/pktradio/defconfig
@@ -29,7 +29,7 @@ CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_7=0xfe00
CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_8=0x00a9
CONFIG_EXAMPLES_NETTEST_SERVER_PORTNO=61616
CONFIG_EXAMPLES_NETTEST_STACKSIZE1=4096
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_UDPBLASTER=y
CONFIG_EXAMPLES_UDPBLASTER_HOSTIPv6_1=0xfe80
CONFIG_EXAMPLES_UDPBLASTER_HOSTIPv6_6=0x00ff
diff --git a/configs/sim/sixlowpan/defconfig b/configs/sim/sixlowpan/defconfig
index 98093bb8b33..b7675f9221d 100644
--- a/configs/sim/sixlowpan/defconfig
+++ b/configs/sim/sixlowpan/defconfig
@@ -29,7 +29,7 @@ CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_7=0xfe00
CONFIG_EXAMPLES_NETTEST_SERVERIPv6ADDR_8=0xcda9
CONFIG_EXAMPLES_NETTEST_SERVER_PORTNO=61616
CONFIG_EXAMPLES_NETTEST_STACKSIZE1=4096
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_UDPBLASTER=y
CONFIG_EXAMPLES_UDPBLASTER_HOSTIPv6_1=0xfe80
CONFIG_EXAMPLES_UDPBLASTER_HOSTIPv6_6=0x00ff
diff --git a/configs/sim/udgram/defconfig b/configs/sim/udgram/defconfig
index 64f8e6f20a8..42d50a015f0 100644
--- a/configs/sim/udgram/defconfig
+++ b/configs/sim/udgram/defconfig
@@ -14,7 +14,7 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_HELLO=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_UDGRAM_CLIENT_STACKSIZE=8192
CONFIG_EXAMPLES_UDGRAM_SERVER_STACKSIZE=8192
CONFIG_EXAMPLES_UDGRAM=y
diff --git a/configs/sim/unionfs/defconfig b/configs/sim/unionfs/defconfig
index db40dd3088a..6ea5c1e55a3 100644
--- a/configs/sim/unionfs/defconfig
+++ b/configs/sim/unionfs/defconfig
@@ -10,7 +10,7 @@ CONFIG_BOOT_RUNFROMEXTSRAM=y
CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_UNIONFS_RAMDEVNO_A=4
CONFIG_EXAMPLES_UNIONFS_RAMDEVNO_B=5
CONFIG_EXAMPLES_UNIONFS=y
diff --git a/configs/sim/userfs/defconfig b/configs/sim/userfs/defconfig
index 29733393ddf..564df31d46b 100644
--- a/configs/sim/userfs/defconfig
+++ b/configs/sim/userfs/defconfig
@@ -15,7 +15,7 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_LOOP=y
CONFIG_DEV_ZERO=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_USERFS=y
CONFIG_EXAMPLES_USERFS_STACKSIZE=8192
CONFIG_FAT_LCNAMES=y
diff --git a/configs/sim/ustream/defconfig b/configs/sim/ustream/defconfig
index cb4d1dcd549..78ee466a65b 100644
--- a/configs/sim/ustream/defconfig
+++ b/configs/sim/ustream/defconfig
@@ -14,7 +14,7 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_HELLO=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_USTREAM=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
diff --git a/configs/stm3210e-eval/nsh/defconfig b/configs/stm3210e-eval/nsh/defconfig
index f369712f970..c0496500ae0 100644
--- a/configs/stm3210e-eval/nsh/defconfig
+++ b/configs/stm3210e-eval/nsh/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FS_FAT=y
CONFIG_HOST_WINDOWS=y
diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig
index 78f33f27c23..aeed39c96b3 100644
--- a/configs/stm3210e-eval/nsh2/defconfig
+++ b/configs/stm3210e-eval/nsh2/defconfig
@@ -21,7 +21,7 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_NX=y
CONFIG_EXAMPLES_NXHELLO=y
CONFIG_EXAMPLES_NXHELLO_BGCOLOR=0x0011
diff --git a/configs/stm3210e-eval/pm/defconfig b/configs/stm3210e-eval/pm/defconfig
index 6d7b1a5f945..4c27eeb973d 100644
--- a/configs/stm3210e-eval/pm/defconfig
+++ b/configs/stm3210e-eval/pm/defconfig
@@ -23,7 +23,7 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_NX=y
CONFIG_EXAMPLES_NXHELLO=y
CONFIG_EXAMPLES_NXHELLO_BGCOLOR=0x0011
diff --git a/configs/stm3220g-eval/nsh/defconfig b/configs/stm3220g-eval/nsh/defconfig
index 7c8bbad5262..513ae941584 100644
--- a/configs/stm3220g-eval/nsh/defconfig
+++ b/configs/stm3220g-eval/nsh/defconfig
@@ -11,8 +11,8 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=10926
CONFIG_BUILTIN=y
CONFIG_ETH0_PHY_DP83848C=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/stm3220g-eval/nsh2/defconfig b/configs/stm3220g-eval/nsh2/defconfig
index d5742cd7b01..ed25c4d44a5 100644
--- a/configs/stm3220g-eval/nsh2/defconfig
+++ b/configs/stm3220g-eval/nsh2/defconfig
@@ -14,8 +14,8 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=10926
CONFIG_BUILTIN=y
CONFIG_ETH0_PHY_DP83848C=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/stm3240g-eval/fb/defconfig b/configs/stm3240g-eval/fb/defconfig
index b4fb6c9df82..065c010bd5c 100644
--- a/configs/stm3240g-eval/fb/defconfig
+++ b/configs/stm3240g-eval/fb/defconfig
@@ -11,7 +11,7 @@ CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
CONFIG_DRIVERS_VIDEO=y
CONFIG_EXAMPLES_FB=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_PDCURSES=y
CONFIG_FS_PROCFS=y
CONFIG_GRAPHICS_PDCURSES=y
diff --git a/configs/stm3240g-eval/nsh/defconfig b/configs/stm3240g-eval/nsh/defconfig
index 77ba70c8693..90256d5df72 100644
--- a/configs/stm3240g-eval/nsh/defconfig
+++ b/configs/stm3240g-eval/nsh/defconfig
@@ -11,8 +11,8 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_ETH0_PHY_DP83848C=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/stm3240g-eval/nsh2/defconfig b/configs/stm3240g-eval/nsh2/defconfig
index e693014af61..ba60d508deb 100644
--- a/configs/stm3240g-eval/nsh2/defconfig
+++ b/configs/stm3240g-eval/nsh2/defconfig
@@ -15,8 +15,8 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_ETH0_PHY_DP83848C=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/stm32_tiny/nsh/defconfig b/configs/stm32_tiny/nsh/defconfig
index a898706c196..0d2bf6b3077 100644
--- a/configs/stm32_tiny/nsh/defconfig
+++ b/configs/stm32_tiny/nsh/defconfig
@@ -22,7 +22,7 @@ CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_EXAMPLES_NRF24L01TERM=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
CONFIG_NFILE_DESCRIPTORS=8
diff --git a/configs/stm32_tiny/usbnsh/defconfig b/configs/stm32_tiny/usbnsh/defconfig
index a193b5a85cc..59c18bcfc1f 100644
--- a/configs/stm32_tiny/usbnsh/defconfig
+++ b/configs/stm32_tiny/usbnsh/defconfig
@@ -27,7 +27,7 @@ CONFIG_CDCACM_RXBUFSIZE=256
CONFIG_CDCACM_TXBUFSIZE=256
CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_LIB_BOARDCTL=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
diff --git a/configs/stm32butterfly2/nsh/defconfig b/configs/stm32butterfly2/nsh/defconfig
index cf2f84be5f2..cb86c71b9cd 100644
--- a/configs/stm32butterfly2/nsh/defconfig
+++ b/configs/stm32butterfly2/nsh/defconfig
@@ -23,7 +23,7 @@ CONFIG_EXAMPLES_HIDKBD=y
CONFIG_EXAMPLES_HIDKBD_DEFPRIO=50
CONFIG_EXAMPLES_HIDKBD_STACKSIZE=1024
CONFIG_EXAMPLES_MOUNT=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/stm32butterfly2/nshnet/defconfig b/configs/stm32butterfly2/nshnet/defconfig
index c6e917472e1..7051ec42787 100644
--- a/configs/stm32butterfly2/nshnet/defconfig
+++ b/configs/stm32butterfly2/nshnet/defconfig
@@ -22,7 +22,7 @@ CONFIG_ETH0_PHY_DP83848C=y
CONFIG_EXAMPLES_ADC=y
CONFIG_EXAMPLES_ADC_SWTRIG=y
CONFIG_EXAMPLES_MOUNT=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_USBSERIAL=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
diff --git a/configs/stm32butterfly2/nshusbdev/defconfig b/configs/stm32butterfly2/nshusbdev/defconfig
index 05f9a9469bc..0f5d7fcfc41 100644
--- a/configs/stm32butterfly2/nshusbdev/defconfig
+++ b/configs/stm32butterfly2/nshusbdev/defconfig
@@ -20,7 +20,7 @@ CONFIG_CLOCK_MONOTONIC=y
CONFIG_EXAMPLES_ADC=y
CONFIG_EXAMPLES_ADC_SWTRIG=y
CONFIG_EXAMPLES_MOUNT=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_USBSERIAL=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
diff --git a/configs/stm32butterfly2/nshusbhost/defconfig b/configs/stm32butterfly2/nshusbhost/defconfig
index cf2f84be5f2..cb86c71b9cd 100644
--- a/configs/stm32butterfly2/nshusbhost/defconfig
+++ b/configs/stm32butterfly2/nshusbhost/defconfig
@@ -23,7 +23,7 @@ CONFIG_EXAMPLES_HIDKBD=y
CONFIG_EXAMPLES_HIDKBD_DEFPRIO=50
CONFIG_EXAMPLES_HIDKBD_STACKSIZE=1024
CONFIG_EXAMPLES_MOUNT=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/stm32f051-discovery/nsh/defconfig b/configs/stm32f051-discovery/nsh/defconfig
index 1fd28ffcd7f..3aff2a6701a 100644
--- a/configs/stm32f051-discovery/nsh/defconfig
+++ b/configs/stm32f051-discovery/nsh/defconfig
@@ -16,7 +16,7 @@ CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_MAX_TASKS=8
CONFIG_MAX_WDOGPARMS=2
CONFIG_MM_SMALL=y
diff --git a/configs/stm32f072-discovery/nsh/defconfig b/configs/stm32f072-discovery/nsh/defconfig
index 19cb0914aca..2c261c4887f 100644
--- a/configs/stm32f072-discovery/nsh/defconfig
+++ b/configs/stm32f072-discovery/nsh/defconfig
@@ -16,7 +16,7 @@ CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_MAX_TASKS=8
CONFIG_MAX_WDOGPARMS=2
CONFIG_MM_SMALL=y
diff --git a/configs/stm32f103-minimum/apds9960/defconfig b/configs/stm32f103-minimum/apds9960/defconfig
index b78c75beba7..deb65497508 100644
--- a/configs/stm32f103-minimum/apds9960/defconfig
+++ b/configs/stm32f103-minimum/apds9960/defconfig
@@ -20,7 +20,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
CONFIG_EXAMPLES_APDS9960=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_I2C_DRIVER=y
CONFIG_IDLETHREAD_STACKSIZE=512
CONFIG_MAX_TASKS=16
diff --git a/configs/stm32f103-minimum/audio_tone/defconfig b/configs/stm32f103-minimum/audio_tone/defconfig
index 47855343f04..a6451af4c0c 100644
--- a/configs/stm32f103-minimum/audio_tone/defconfig
+++ b/configs/stm32f103-minimum/audio_tone/defconfig
@@ -22,7 +22,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
CONFIG_DRIVERS_AUDIO=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
CONFIG_NFILE_DESCRIPTORS=8
diff --git a/configs/stm32f103-minimum/buttons/defconfig b/configs/stm32f103-minimum/buttons/defconfig
index 562f269e2ee..2006d622ec5 100644
--- a/configs/stm32f103-minimum/buttons/defconfig
+++ b/configs/stm32f103-minimum/buttons/defconfig
@@ -26,7 +26,7 @@ CONFIG_BUTTONS=y
CONFIG_BUTTONS_LOWER=y
CONFIG_DEFAULT_SMALL=y
CONFIG_EXAMPLES_BUTTONS=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_INPUT=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
diff --git a/configs/stm32f103-minimum/hello/defconfig b/configs/stm32f103-minimum/hello/defconfig
index c6d661ef776..7134b4d15ec 100644
--- a/configs/stm32f103-minimum/hello/defconfig
+++ b/configs/stm32f103-minimum/hello/defconfig
@@ -22,7 +22,7 @@ CONFIG_DISABLE_POLL=y
CONFIG_DISABLE_PTHREAD=y
CONFIG_DISABLE_SIGNALS=y
CONFIG_EXAMPLES_HELLO=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FDCLONE_STDIO=y
CONFIG_MAX_TASKS=4
CONFIG_MAX_WDOGPARMS=2
diff --git a/configs/stm32f103-minimum/jlx12864g/defconfig b/configs/stm32f103-minimum/jlx12864g/defconfig
index 331ffdffec6..c5c59776b64 100644
--- a/configs/stm32f103-minimum/jlx12864g/defconfig
+++ b/configs/stm32f103-minimum/jlx12864g/defconfig
@@ -20,7 +20,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_NXHELLO=y
CONFIG_EXAMPLES_NXHELLO_BPP=1
CONFIG_EXAMPLES_NXHELLO_LISTENER_STACKSIZE=1536
diff --git a/configs/stm32f103-minimum/mcp2515/defconfig b/configs/stm32f103-minimum/mcp2515/defconfig
index faa4df62b2c..f14751626a3 100644
--- a/configs/stm32f103-minimum/mcp2515/defconfig
+++ b/configs/stm32f103-minimum/mcp2515/defconfig
@@ -26,7 +26,7 @@ CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_CAN=y
CONFIG_EXAMPLES_CAN_READ=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
CONFIG_MCP2515_PHASESEG1=3
diff --git a/configs/stm32f103-minimum/nrf24/defconfig b/configs/stm32f103-minimum/nrf24/defconfig
index 9bd7b7d0d6d..5af781280c7 100644
--- a/configs/stm32f103-minimum/nrf24/defconfig
+++ b/configs/stm32f103-minimum/nrf24/defconfig
@@ -21,7 +21,7 @@ CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_EXAMPLES_NRF24L01TERM=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
CONFIG_NFILE_DESCRIPTORS=8
diff --git a/configs/stm32f103-minimum/nsh/defconfig b/configs/stm32f103-minimum/nsh/defconfig
index 5342ee1ae12..085cc78afc1 100644
--- a/configs/stm32f103-minimum/nsh/defconfig
+++ b/configs/stm32f103-minimum/nsh/defconfig
@@ -19,7 +19,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
CONFIG_NFILE_DESCRIPTORS=8
diff --git a/configs/stm32f103-minimum/pwm/defconfig b/configs/stm32f103-minimum/pwm/defconfig
index c91c2b6085d..a0cf99fbbd5 100644
--- a/configs/stm32f103-minimum/pwm/defconfig
+++ b/configs/stm32f103-minimum/pwm/defconfig
@@ -19,7 +19,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_PWM=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
diff --git a/configs/stm32f103-minimum/rfid-rc522/defconfig b/configs/stm32f103-minimum/rfid-rc522/defconfig
index 0cf8b6ae38b..e9124b0c8a5 100644
--- a/configs/stm32f103-minimum/rfid-rc522/defconfig
+++ b/configs/stm32f103-minimum/rfid-rc522/defconfig
@@ -21,7 +21,7 @@ CONFIG_BUILTIN=y
CONFIG_CL_MFRC522=y
CONFIG_DEFAULT_SMALL=y
CONFIG_DRIVERS_CONTACTLESS=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_RFID_READUID=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
diff --git a/configs/stm32f103-minimum/rgbled/defconfig b/configs/stm32f103-minimum/rgbled/defconfig
index c54470da67d..d27d4ad1903 100644
--- a/configs/stm32f103-minimum/rgbled/defconfig
+++ b/configs/stm32f103-minimum/rgbled/defconfig
@@ -19,7 +19,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_RGBLED=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
diff --git a/configs/stm32f103-minimum/usbnsh/defconfig b/configs/stm32f103-minimum/usbnsh/defconfig
index ff012c90ef9..ff6fa5e4727 100644
--- a/configs/stm32f103-minimum/usbnsh/defconfig
+++ b/configs/stm32f103-minimum/usbnsh/defconfig
@@ -27,7 +27,7 @@ CONFIG_CDCACM_RXBUFSIZE=256
CONFIG_CDCACM_TXBUFSIZE=256
CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_LIB_BOARDCTL=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
diff --git a/configs/stm32f103-minimum/userled/defconfig b/configs/stm32f103-minimum/userled/defconfig
index cadfb4ef2fc..c0d67329bce 100644
--- a/configs/stm32f103-minimum/userled/defconfig
+++ b/configs/stm32f103-minimum/userled/defconfig
@@ -22,7 +22,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
CONFIG_EXAMPLES_LEDS=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
CONFIG_NFILE_DESCRIPTORS=8
diff --git a/configs/stm32f103-minimum/veml6070/defconfig b/configs/stm32f103-minimum/veml6070/defconfig
index 62e7c4659f7..3230a107cb7 100644
--- a/configs/stm32f103-minimum/veml6070/defconfig
+++ b/configs/stm32f103-minimum/veml6070/defconfig
@@ -20,7 +20,7 @@ CONFIG_BOARD_INITIALIZE=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
CONFIG_NFILE_DESCRIPTORS=8
diff --git a/configs/stm32f334-disco/buckboost/defconfig b/configs/stm32f334-disco/buckboost/defconfig
index 68a0c389dda..69154adcd08 100644
--- a/configs/stm32f334-disco/buckboost/defconfig
+++ b/configs/stm32f334-disco/buckboost/defconfig
@@ -21,7 +21,7 @@ CONFIG_DISABLE_POLL=y
CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_DISABLE_PTHREAD=y
CONFIG_DRIVERS_SMPS=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_SMPS=y
CONFIG_EXAMPLES_SMPS_DEVPATH="/dev/smps0"
CONFIG_EXAMPLES_SMPS_IN_VOLTAGE_LIMIT=10000
diff --git a/configs/stm32f334-disco/nsh/defconfig b/configs/stm32f334-disco/nsh/defconfig
index a38ae7df199..b6317ccf70f 100644
--- a/configs/stm32f334-disco/nsh/defconfig
+++ b/configs/stm32f334-disco/nsh/defconfig
@@ -23,7 +23,7 @@ CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_DISABLE_PTHREAD=y
CONFIG_DISABLE_SIGNALS=y
CONFIG_EXAMPLES_HELLO=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FDCLONE_STDIO=y
CONFIG_INTELHEX_BINARY=y
CONFIG_MAX_TASKS=4
diff --git a/configs/stm32f334-disco/powerled/defconfig b/configs/stm32f334-disco/powerled/defconfig
index 40c7779b918..df2b8114c63 100644
--- a/configs/stm32f334-disco/powerled/defconfig
+++ b/configs/stm32f334-disco/powerled/defconfig
@@ -23,7 +23,7 @@ CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POLL=y
CONFIG_DISABLE_PTHREAD=y
CONFIG_DRIVERS_POWERLED=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_POWERLED=y
CONFIG_EXAMPLES_POWERLED_CURRENT_LIMIT=100
CONFIG_EXAMPLES_POWERLED_DEVPATH="/dev/powerled0"
diff --git a/configs/stm32f3discovery/nsh/defconfig b/configs/stm32f3discovery/nsh/defconfig
index 0833fa366da..3e29a5a9e30 100644
--- a/configs/stm32f3discovery/nsh/defconfig
+++ b/configs/stm32f3discovery/nsh/defconfig
@@ -15,8 +15,8 @@ CONFIG_CDCACM=y
CONFIG_CDCACM_RXBUFSIZE=256
CONFIG_CDCACM_TXBUFSIZE=256
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
diff --git a/configs/stm32f3discovery/usbnsh/defconfig b/configs/stm32f3discovery/usbnsh/defconfig
index 77b17f33603..b85919a18a0 100644
--- a/configs/stm32f3discovery/usbnsh/defconfig
+++ b/configs/stm32f3discovery/usbnsh/defconfig
@@ -18,8 +18,8 @@ CONFIG_CDCACM_CONSOLE=y
CONFIG_CDCACM_RXBUFSIZE=256
CONFIG_CDCACM_TXBUFSIZE=256
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
diff --git a/configs/stm32f411e-disco/nsh/defconfig b/configs/stm32f411e-disco/nsh/defconfig
index 21d2fc486b8..991b21ee2bf 100644
--- a/configs/stm32f411e-disco/nsh/defconfig
+++ b/configs/stm32f411e-disco/nsh/defconfig
@@ -17,7 +17,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=8499
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HAVE_CXX=y
CONFIG_INTELHEX_BINARY=y
CONFIG_MAX_TASKS=16
diff --git a/configs/stm32f429i-disco/extflash/defconfig b/configs/stm32f429i-disco/extflash/defconfig
index f5fe74fec67..89f8ec9df68 100644
--- a/configs/stm32f429i-disco/extflash/defconfig
+++ b/configs/stm32f429i-disco/extflash/defconfig
@@ -12,8 +12,8 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_ZERO=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/stm32f429i-disco/fb/defconfig b/configs/stm32f429i-disco/fb/defconfig
index 6502345de87..ac16a40a692 100644
--- a/configs/stm32f429i-disco/fb/defconfig
+++ b/configs/stm32f429i-disco/fb/defconfig
@@ -16,8 +16,8 @@ CONFIG_DISABLE_POLL=y
CONFIG_DRIVERS_VIDEO=y
CONFIG_EXAMPLES_FB=y
CONFIG_EXAMPLES_FBOVERLAY=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_TOUCHSCREEN=y
CONFIG_FB_OVERLAY_BLIT=y
CONFIG_FB_SYNC=y
diff --git a/configs/stm32f429i-disco/lcd/defconfig b/configs/stm32f429i-disco/lcd/defconfig
index 4d031e51c68..81d4558bf9a 100644
--- a/configs/stm32f429i-disco/lcd/defconfig
+++ b/configs/stm32f429i-disco/lcd/defconfig
@@ -16,8 +16,8 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_CUSTOMOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_NX=y
CONFIG_EXAMPLES_NX_BPP=16
CONFIG_FS_PROCFS=y
diff --git a/configs/stm32f429i-disco/lvgl/defconfig b/configs/stm32f429i-disco/lvgl/defconfig
index 03bb982420a..cebadd2e835 100644
--- a/configs/stm32f429i-disco/lvgl/defconfig
+++ b/configs/stm32f429i-disco/lvgl/defconfig
@@ -17,8 +17,8 @@ CONFIG_DISABLE_POLL=y
CONFIG_DRIVERS_VIDEO=y
CONFIG_EXAMPLES_FB=y
CONFIG_EXAMPLES_LVGLDEMO=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_TOUCHSCREEN=y
CONFIG_FB_OVERLAY=y
CONFIG_FS_PROCFS=y
diff --git a/configs/stm32f429i-disco/nsh/defconfig b/configs/stm32f429i-disco/nsh/defconfig
index 7f8538402b3..3cbe5c2a3be 100644
--- a/configs/stm32f429i-disco/nsh/defconfig
+++ b/configs/stm32f429i-disco/nsh/defconfig
@@ -11,8 +11,8 @@ CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/stm32f429i-disco/usbmsc/defconfig b/configs/stm32f429i-disco/usbmsc/defconfig
index f180f3f4c63..f2782ddc36a 100644
--- a/configs/stm32f429i-disco/usbmsc/defconfig
+++ b/configs/stm32f429i-disco/usbmsc/defconfig
@@ -11,8 +11,8 @@ CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
diff --git a/configs/stm32f429i-disco/usbnsh/defconfig b/configs/stm32f429i-disco/usbnsh/defconfig
index 24bfce4eb86..3847c7358c8 100644
--- a/configs/stm32f429i-disco/usbnsh/defconfig
+++ b/configs/stm32f429i-disco/usbnsh/defconfig
@@ -17,8 +17,8 @@ CONFIG_CDCACM_TXBUFSIZE=256
CONFIG_DEV_LOOP=y
CONFIG_DEV_ZERO=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
diff --git a/configs/stm32f4discovery/audio/defconfig b/configs/stm32f4discovery/audio/defconfig
index 262172600ed..e6089e2f93b 100644
--- a/configs/stm32f4discovery/audio/defconfig
+++ b/configs/stm32f4discovery/audio/defconfig
@@ -18,8 +18,8 @@ CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
CONFIG_DRIVERS_AUDIO=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/stm32f4discovery/canard/defconfig b/configs/stm32f4discovery/canard/defconfig
index 662bea313b1..4ba8c253066 100644
--- a/configs/stm32f4discovery/canard/defconfig
+++ b/configs/stm32f4discovery/canard/defconfig
@@ -15,8 +15,8 @@ CONFIG_CANUTILS_LIBCANARD=y
CONFIG_CAN_EXTID=y
CONFIG_CLOCK_MONOTONIC=y
CONFIG_EXAMPLES_LIBCANARD=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/stm32f4discovery/hciuart/defconfig b/configs/stm32f4discovery/hciuart/defconfig
index fcfe5a75a1e..7daa4eb74d1 100644
--- a/configs/stm32f4discovery/hciuart/defconfig
+++ b/configs/stm32f4discovery/hciuart/defconfig
@@ -23,8 +23,8 @@ CONFIG_BTSAK=y
CONFIG_BUILTIN=y
CONFIG_DRIVERS_BLUETOOTH=y
CONFIG_DRIVERS_WIRELESS=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_FS_WRITABLE=y
CONFIG_HAVE_CXX=y
diff --git a/configs/stm32f4discovery/ipv6/defconfig b/configs/stm32f4discovery/ipv6/defconfig
index 7cfe9fe3ef8..43c55312efe 100644
--- a/configs/stm32f4discovery/ipv6/defconfig
+++ b/configs/stm32f4discovery/ipv6/defconfig
@@ -16,8 +16,8 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_ETH0_PHY_LAN8720=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/stm32f4discovery/max31855/defconfig b/configs/stm32f4discovery/max31855/defconfig
index aac15ee71d6..d369f1c763d 100644
--- a/configs/stm32f4discovery/max31855/defconfig
+++ b/configs/stm32f4discovery/max31855/defconfig
@@ -15,8 +15,8 @@ CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_MAX31855=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/stm32f4discovery/max7219/defconfig b/configs/stm32f4discovery/max7219/defconfig
index 843ebf74b0e..c2fac017ab8 100644
--- a/configs/stm32f4discovery/max7219/defconfig
+++ b/configs/stm32f4discovery/max7219/defconfig
@@ -33,7 +33,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DEFAULT_SMALL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_NXHELLO=y
CONFIG_EXAMPLES_NXHELLO_BPP=1
CONFIG_EXAMPLES_NXHELLO_LISTENER_STACKSIZE=1536
diff --git a/configs/stm32f4discovery/module/defconfig b/configs/stm32f4discovery/module/defconfig
index 20ea4d74b28..8fa978ca49e 100644
--- a/configs/stm32f4discovery/module/defconfig
+++ b/configs/stm32f4discovery/module/defconfig
@@ -13,8 +13,8 @@ CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_MODULE=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_FS_ROMFS=y
CONFIG_HAVE_CXX=y
diff --git a/configs/stm32f4discovery/netnsh/defconfig b/configs/stm32f4discovery/netnsh/defconfig
index a669d6f80af..0fbb4b0dfda 100644
--- a/configs/stm32f4discovery/netnsh/defconfig
+++ b/configs/stm32f4discovery/netnsh/defconfig
@@ -16,8 +16,8 @@ CONFIG_BOARDCTL_RESET=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_ETH0_PHY_LAN8720=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/stm32f4discovery/nsh/defconfig b/configs/stm32f4discovery/nsh/defconfig
index aa0e606c9f3..6386ec15ea4 100644
--- a/configs/stm32f4discovery/nsh/defconfig
+++ b/configs/stm32f4discovery/nsh/defconfig
@@ -13,8 +13,8 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/stm32f4discovery/pm/defconfig b/configs/stm32f4discovery/pm/defconfig
index 96a7e00477d..827b4c3e25a 100644
--- a/configs/stm32f4discovery/pm/defconfig
+++ b/configs/stm32f4discovery/pm/defconfig
@@ -14,8 +14,8 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/stm32f4discovery/pseudoterm/defconfig b/configs/stm32f4discovery/pseudoterm/defconfig
index b4aeb9179f6..d85756b4bfd 100644
--- a/configs/stm32f4discovery/pseudoterm/defconfig
+++ b/configs/stm32f4discovery/pseudoterm/defconfig
@@ -11,8 +11,8 @@ CONFIG_ARCH_CHIP_STM32F407VG=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_PTYTEST=y
CONFIG_EXAMPLES_PTYTEST_POLL=y
CONFIG_FS_PROCFS=y
diff --git a/configs/stm32f4discovery/rgbled/defconfig b/configs/stm32f4discovery/rgbled/defconfig
index eb32837ad08..1d238f90b97 100644
--- a/configs/stm32f4discovery/rgbled/defconfig
+++ b/configs/stm32f4discovery/rgbled/defconfig
@@ -13,8 +13,8 @@ CONFIG_BOARD_INITIALIZE=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_RGBLED=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
diff --git a/configs/stm32f4discovery/rndis/defconfig b/configs/stm32f4discovery/rndis/defconfig
index 7718f7c594e..30939972960 100644
--- a/configs/stm32f4discovery/rndis/defconfig
+++ b/configs/stm32f4discovery/rndis/defconfig
@@ -18,8 +18,8 @@ CONFIG_BUILTIN=y
CONFIG_CLOCK_MONOTONIC=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/stm32f4discovery/testlibcxx/defconfig b/configs/stm32f4discovery/testlibcxx/defconfig
index 604583fc7d5..65c5f3fafd6 100644
--- a/configs/stm32f4discovery/testlibcxx/defconfig
+++ b/configs/stm32f4discovery/testlibcxx/defconfig
@@ -13,8 +13,8 @@ CONFIG_C99_BOOL8=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_HELLOXX=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
diff --git a/configs/stm32f4discovery/usbmsc/defconfig b/configs/stm32f4discovery/usbmsc/defconfig
index 336b985654e..90dad0cb71e 100644
--- a/configs/stm32f4discovery/usbmsc/defconfig
+++ b/configs/stm32f4discovery/usbmsc/defconfig
@@ -10,8 +10,8 @@ CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/stm32f4discovery/usbnsh/defconfig b/configs/stm32f4discovery/usbnsh/defconfig
index dbff9c38758..b22ecb694e3 100644
--- a/configs/stm32f4discovery/usbnsh/defconfig
+++ b/configs/stm32f4discovery/usbnsh/defconfig
@@ -16,8 +16,8 @@ CONFIG_CDCACM_CONSOLE=y
CONFIG_CDCACM_RXBUFSIZE=256
CONFIG_CDCACM_TXBUFSIZE=256
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/stm32f4discovery/xen1210/defconfig b/configs/stm32f4discovery/xen1210/defconfig
index b2a7a2d2280..a91f0595250 100644
--- a/configs/stm32f4discovery/xen1210/defconfig
+++ b/configs/stm32f4discovery/xen1210/defconfig
@@ -13,8 +13,8 @@ CONFIG_BOARD_INITIALIZE=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/stm32f746-ws/nsh/defconfig b/configs/stm32f746-ws/nsh/defconfig
index 3c9c024ceca..79541835a2f 100644
--- a/configs/stm32f746-ws/nsh/defconfig
+++ b/configs/stm32f746-ws/nsh/defconfig
@@ -24,7 +24,7 @@ CONFIG_C99_BOOL8=y
CONFIG_CDCACM_EPINTIN_HSSIZE=512
CONFIG_CDCACM=y
CONFIG_DEBUG_SYMBOLS=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_DMAMEMORY=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
diff --git a/configs/stm32f746g-disco/fb/defconfig b/configs/stm32f746g-disco/fb/defconfig
index 9039548192f..b094ad1c1f5 100644
--- a/configs/stm32f746g-disco/fb/defconfig
+++ b/configs/stm32f746g-disco/fb/defconfig
@@ -23,8 +23,8 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
CONFIG_DRIVERS_VIDEO=y
CONFIG_EXAMPLES_FB=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
diff --git a/configs/stm32f746g-disco/lvgl/defconfig b/configs/stm32f746g-disco/lvgl/defconfig
index 7e81974f8f5..b14735cf3b2 100644
--- a/configs/stm32f746g-disco/lvgl/defconfig
+++ b/configs/stm32f746g-disco/lvgl/defconfig
@@ -24,8 +24,8 @@ CONFIG_DISABLE_POLL=y
CONFIG_DRIVERS_VIDEO=y
CONFIG_EXAMPLES_FB=y
CONFIG_EXAMPLES_LVGLDEMO=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_TOUCHSCREEN=y
CONFIG_FT5X06_SINGLEPOINT=y
CONFIG_FT5X06_SWAPXY=y
diff --git a/configs/stm32f746g-disco/nsh-ethernet/defconfig b/configs/stm32f746g-disco/nsh-ethernet/defconfig
index 7bbe3d82bc8..7cba78473ca 100644
--- a/configs/stm32f746g-disco/nsh-ethernet/defconfig
+++ b/configs/stm32f746g-disco/nsh-ethernet/defconfig
@@ -15,8 +15,8 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
CONFIG_ETH0_PHY_LAN8742A=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS_REGISTER=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXXINITIALIZE=y
diff --git a/configs/stm32f746g-disco/nsh/defconfig b/configs/stm32f746g-disco/nsh/defconfig
index e57514cf2fc..a515f72bb96 100644
--- a/configs/stm32f746g-disco/nsh/defconfig
+++ b/configs/stm32f746g-disco/nsh/defconfig
@@ -17,8 +17,8 @@ CONFIG_BOARD_LOOPSPERMSEC=43103
CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HOST_WINDOWS=y
diff --git a/configs/stm32f746g-disco/nxdemo/defconfig b/configs/stm32f746g-disco/nxdemo/defconfig
index b18d0223a8d..bcf01d5a73a 100644
--- a/configs/stm32f746g-disco/nxdemo/defconfig
+++ b/configs/stm32f746g-disco/nxdemo/defconfig
@@ -52,7 +52,7 @@ CONFIG_VIDEO_FB=y
CONFIG_WDOG_INTRESERVE=0
#CONFIG_EXAMPLES_FB=y
-#CONFIG_EXAMPLES_NSH=y
+#CONFIG_SYSTEM_NSH=y
#CONFIG_HOST_WINDOWS=y
#CONFIG_LCD=y
#CONFIG_TASK_NAME_SIZE=0
@@ -77,8 +77,8 @@ CONFIG_NX_DISABLE_16BPP=n
CONFIG_NX_DISABLE_24BPP=y
CONFIG_NX_DISABLE_32BPP=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_NXHELLO=y
CONFIG_EXAMPLES_NXHELLO_BPP=16
diff --git a/configs/stm32f746g-disco/nxterm/defconfig b/configs/stm32f746g-disco/nxterm/defconfig
index c44c6ae7ee2..eeb06d156db 100644
--- a/configs/stm32f746g-disco/nxterm/defconfig
+++ b/configs/stm32f746g-disco/nxterm/defconfig
@@ -52,7 +52,7 @@ CONFIG_VIDEO_FB=y
CONFIG_WDOG_INTRESERVE=0
#CONFIG_EXAMPLES_FB=y
-#CONFIG_EXAMPLES_NSH=y
+#CONFIG_SYSTEM_NSH=y
#CONFIG_HOST_WINDOWS=y
#CONFIG_LCD=y
#CONFIG_TASK_NAME_SIZE=0
@@ -82,7 +82,7 @@ CONFIG_NXFONTS_DISABLE_16BPP=n
CONFIG_NXTERM=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_NXTERM=y
diff --git a/configs/stm32f769i-disco/nsh-ethernet/defconfig b/configs/stm32f769i-disco/nsh-ethernet/defconfig
index 936529c215a..05133ef1ca1 100644
--- a/configs/stm32f769i-disco/nsh-ethernet/defconfig
+++ b/configs/stm32f769i-disco/nsh-ethernet/defconfig
@@ -14,8 +14,8 @@ CONFIG_ARMV7M_LAZYFPU=y
CONFIG_BOARD_LOOPSPERMSEC=43103
CONFIG_BUILTIN=y
CONFIG_ETH0_PHY_LAN8742A=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS_REGISTER=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
diff --git a/configs/stm32f769i-disco/nsh/defconfig b/configs/stm32f769i-disco/nsh/defconfig
index 8d5cc7fdfb4..010205e6ad2 100644
--- a/configs/stm32f769i-disco/nsh/defconfig
+++ b/configs/stm32f769i-disco/nsh/defconfig
@@ -13,8 +13,8 @@ CONFIG_ARMV7M_LAZYFPU=y
CONFIG_BOARD_LOOPSPERMSEC=43103
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_HAVE_CXX=y
CONFIG_INTELHEX_BINARY=y
diff --git a/configs/stm32l476-mdk/nsh/defconfig b/configs/stm32l476-mdk/nsh/defconfig
index fdf6b589aeb..ba552f54537 100644
--- a/configs/stm32l476-mdk/nsh/defconfig
+++ b/configs/stm32l476-mdk/nsh/defconfig
@@ -18,7 +18,7 @@ CONFIG_BUILTIN=y
CONFIG_DEV_LOOP=y
CONFIG_DEV_ZERO=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
CONFIG_FS_ROMFS=y
diff --git a/configs/stm32l476vg-disco/knsh/defconfig b/configs/stm32l476vg-disco/knsh/defconfig
index d738e31f99d..9fe55affba2 100644
--- a/configs/stm32l476vg-disco/knsh/defconfig
+++ b/configs/stm32l476vg-disco/knsh/defconfig
@@ -20,8 +20,8 @@ CONFIG_BUILD_PROTECTED=y
CONFIG_DEV_LOOP=y
CONFIG_DEV_ZERO=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
CONFIG_FS_TMPFS=y
diff --git a/configs/stm32l476vg-disco/nsh/defconfig b/configs/stm32l476vg-disco/nsh/defconfig
index fe553e52769..36e00008fbf 100644
--- a/configs/stm32l476vg-disco/nsh/defconfig
+++ b/configs/stm32l476vg-disco/nsh/defconfig
@@ -21,8 +21,8 @@ CONFIG_DEV_ZERO=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_ALARM=y
CONFIG_EXAMPLES_MEDIA=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
CONFIG_FS_ROMFS=y
diff --git a/configs/stm32l4r9ai-disco/nsh/defconfig b/configs/stm32l4r9ai-disco/nsh/defconfig
index 84212c09786..ea365b092f5 100644
--- a/configs/stm32l4r9ai-disco/nsh/defconfig
+++ b/configs/stm32l4r9ai-disco/nsh/defconfig
@@ -21,8 +21,8 @@ CONFIG_DEV_ZERO=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_ALARM=y
CONFIG_EXAMPLES_MEDIA=y
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_FS_PROCFS_REGISTER=y
CONFIG_FS_ROMFS=y
diff --git a/configs/stm32ldiscovery/nsh/defconfig b/configs/stm32ldiscovery/nsh/defconfig
index 51482cf46d9..e3d32288f60 100644
--- a/configs/stm32ldiscovery/nsh/defconfig
+++ b/configs/stm32ldiscovery/nsh/defconfig
@@ -17,7 +17,7 @@ CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HOST_WINDOWS=y
CONFIG_INTELHEX_BINARY=y
CONFIG_MAX_TASKS=8
diff --git a/configs/stm32vldiscovery/nsh/defconfig b/configs/stm32vldiscovery/nsh/defconfig
index 64635cb54fb..0b7136ea9e6 100644
--- a/configs/stm32vldiscovery/nsh/defconfig
+++ b/configs/stm32vldiscovery/nsh/defconfig
@@ -25,7 +25,7 @@ CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_IDLETHREAD_STACKSIZE=128
CONFIG_INTELHEX_BINARY=y
CONFIG_MAX_TASKS=4
diff --git a/configs/sure-pic32mx/nsh/defconfig b/configs/sure-pic32mx/nsh/defconfig
index ca4dce38a41..755db840eb2 100644
--- a/configs/sure-pic32mx/nsh/defconfig
+++ b/configs/sure-pic32mx/nsh/defconfig
@@ -13,7 +13,7 @@ CONFIG_ARCH="mips"
CONFIG_BOARD_LOOPSPERMSEC=5580
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HOST_WINDOWS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_INTELHEX_BINARY=y
diff --git a/configs/sure-pic32mx/usbnsh/defconfig b/configs/sure-pic32mx/usbnsh/defconfig
index 8d131e13936..39c1522cbef 100644
--- a/configs/sure-pic32mx/usbnsh/defconfig
+++ b/configs/sure-pic32mx/usbnsh/defconfig
@@ -19,7 +19,7 @@ CONFIG_CDCACM_RXBUFSIZE=256
CONFIG_CDCACM_TXBUFSIZE=256
CONFIG_CDCACM=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HOST_WINDOWS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_INTELHEX_BINARY=y
diff --git a/configs/teensy-2.0/nsh/defconfig b/configs/teensy-2.0/nsh/defconfig
index 3425d8922bf..8caae577be2 100644
--- a/configs/teensy-2.0/nsh/defconfig
+++ b/configs/teensy-2.0/nsh/defconfig
@@ -17,7 +17,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POLL=y
CONFIG_DISABLE_PTHREAD=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HOST_WINDOWS=y
CONFIG_IDLETHREAD_STACKSIZE=512
CONFIG_INTELHEX_BINARY=y
diff --git a/configs/teensy-3.x/nsh/defconfig b/configs/teensy-3.x/nsh/defconfig
index 1db6b7fae3e..c4ff9459dd5 100644
--- a/configs/teensy-3.x/nsh/defconfig
+++ b/configs/teensy-3.x/nsh/defconfig
@@ -16,7 +16,7 @@ CONFIG_BUILTIN=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HOST_WINDOWS=y
CONFIG_INTELHEX_BINARY=y
CONFIG_KINETIS_SERIALBRK_BSDCOMPAT=y
diff --git a/configs/teensy-3.x/usbnsh/defconfig b/configs/teensy-3.x/usbnsh/defconfig
index c6d0af76ea3..697a94956cf 100644
--- a/configs/teensy-3.x/usbnsh/defconfig
+++ b/configs/teensy-3.x/usbnsh/defconfig
@@ -14,7 +14,7 @@ CONFIG_BOARD_LOOPSPERMSEC=6024
CONFIG_BUILTIN=y
CONFIG_CDCACM=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_INTELHEX_BINARY=y
CONFIG_KINETIS_SERIALBRK_BSDCOMPAT=y
CONFIG_KINETIS_UART0=y
diff --git a/configs/teensy-lc/nsh/defconfig b/configs/teensy-lc/nsh/defconfig
index 570602426a3..9fde43ecf65 100644
--- a/configs/teensy-lc/nsh/defconfig
+++ b/configs/teensy-lc/nsh/defconfig
@@ -24,7 +24,7 @@ CONFIG_DEFAULT_SMALL=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_INTELHEX_BINARY=y
diff --git a/configs/tm4c123g-launchpad/nsh/defconfig b/configs/tm4c123g-launchpad/nsh/defconfig
index ef0f7e1ae91..9dbe18cfc8a 100644
--- a/configs/tm4c123g-launchpad/nsh/defconfig
+++ b/configs/tm4c123g-launchpad/nsh/defconfig
@@ -14,7 +14,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=4531
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
CONFIG_NFILE_DESCRIPTORS=8
diff --git a/configs/tm4c1294-launchpad/ipv6/defconfig b/configs/tm4c1294-launchpad/ipv6/defconfig
index e0f27ab8ad6..24d4dda4d84 100644
--- a/configs/tm4c1294-launchpad/ipv6/defconfig
+++ b/configs/tm4c1294-launchpad/ipv6/defconfig
@@ -13,7 +13,7 @@ CONFIG_ARCH_CHIP_TM4C=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=11401
CONFIG_BUILTIN=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_I2C=y
CONFIG_I2CTOOL_MAXBUS=6
CONFIG_I2CTOOL_MINBUS=6
diff --git a/configs/tm4c1294-launchpad/nsh/defconfig b/configs/tm4c1294-launchpad/nsh/defconfig
index eb3a4a2e3f2..a318872b63c 100644
--- a/configs/tm4c1294-launchpad/nsh/defconfig
+++ b/configs/tm4c1294-launchpad/nsh/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARCH_CHIP_TM4C=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=11401
CONFIG_BUILTIN=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_I2C=y
CONFIG_I2CTOOL_MAXBUS=6
CONFIG_I2CTOOL_MINBUS=6
diff --git a/configs/tms570ls31x-usb-kit/nsh/defconfig b/configs/tms570ls31x-usb-kit/nsh/defconfig
index bbfefc30dda..752720e8d84 100644
--- a/configs/tms570ls31x-usb-kit/nsh/defconfig
+++ b/configs/tms570ls31x-usb-kit/nsh/defconfig
@@ -12,7 +12,7 @@ CONFIG_ARCH="arm"
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
CONFIG_ELF=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/twr-k60n512/nsh/defconfig b/configs/twr-k60n512/nsh/defconfig
index 3ff94beab39..debb0c5787b 100644
--- a/configs/twr-k60n512/nsh/defconfig
+++ b/configs/twr-k60n512/nsh/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARMV7M_OABI_TOOLCHAIN=y
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=9535
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_FAT=y
CONFIG_INTELHEX_BINARY=y
CONFIG_KINETIS_UART3=y
diff --git a/configs/twr-k64f120m/netnsh/defconfig b/configs/twr-k64f120m/netnsh/defconfig
index b751f3597d8..b3d1ecc415f 100644
--- a/configs/twr-k64f120m/netnsh/defconfig
+++ b/configs/twr-k64f120m/netnsh/defconfig
@@ -8,7 +8,7 @@ CONFIG_ARCH_CHIP_MK64FN1M0VMD12=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=9535
CONFIG_ETH0_PHY_KSZ8041=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LFN=y
CONFIG_FS_AUTOMOUNTER=y
CONFIG_FS_FAT=y
diff --git a/configs/twr-k64f120m/nsh/defconfig b/configs/twr-k64f120m/nsh/defconfig
index 8a7f55fc6dd..c523145fe80 100644
--- a/configs/twr-k64f120m/nsh/defconfig
+++ b/configs/twr-k64f120m/nsh/defconfig
@@ -8,7 +8,7 @@ CONFIG_ARCH_CHIP_MK64FN1M0VMD12=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=9535
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LFN=y
CONFIG_FS_AUTOMOUNTER=y
CONFIG_FS_FAT=y
diff --git a/configs/u-blox-c027/nsh/defconfig b/configs/u-blox-c027/nsh/defconfig
index 849b91f7e8d..514342c8ae4 100644
--- a/configs/u-blox-c027/nsh/defconfig
+++ b/configs/u-blox-c027/nsh/defconfig
@@ -20,7 +20,7 @@ CONFIG_EXAMPLES_CHAT_PRESET0="\"\" ATE1 OK AT+CMEE=2 OK AT+UPSD=0,0 OK AT+UPSD=0
CONFIG_EXAMPLES_CHAT_PRESET1="\"\" AT+UPSDA=0,3 OK AT+UPSND=0,8 OK AT+UPSND=0,0 OK \\c"
CONFIG_EXAMPLES_CHAT_PRESET2="\"\" AT+USOCR=6 OK AT+USOCO=0,\\\"195.34.89.241\\\",7 PAUSE 10 OK AT+USORD=0,32 u-blox \\c"
CONFIG_EXAMPLES_CHAT_PRESET3="\"\" AT+USOWR=0,5,\\\"NuttX\\\" PAUSE 10 OK AT+USORD=0,5 NuttX AT+USOCL=0"
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_PPPD=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
diff --git a/configs/ubw32/nsh/defconfig b/configs/ubw32/nsh/defconfig
index f462066f626..0e5cf7a494f 100644
--- a/configs/ubw32/nsh/defconfig
+++ b/configs/ubw32/nsh/defconfig
@@ -14,7 +14,7 @@ CONFIG_ARCH="mips"
CONFIG_BOARD_LOOPSPERMSEC=8079
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/us7032evb1/nsh/defconfig b/configs/us7032evb1/nsh/defconfig
index e7806d48cc2..e733e693568 100644
--- a/configs/us7032evb1/nsh/defconfig
+++ b/configs/us7032evb1/nsh/defconfig
@@ -15,7 +15,7 @@ CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_DISABLE_PTHREAD=y
CONFIG_DISABLE_SIGNALS=y
CONFIG_ENDIAN_BIG=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_MAX_TASKS=8
CONFIG_MAX_WDOGPARMS=2
CONFIG_MOTOROLA_SREC=y
diff --git a/configs/viewtool-stm32f107/ft80x/defconfig b/configs/viewtool-stm32f107/ft80x/defconfig
index b861d541c99..0bab9775f4d 100644
--- a/configs/viewtool-stm32f107/ft80x/defconfig
+++ b/configs/viewtool-stm32f107/ft80x/defconfig
@@ -9,7 +9,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_EXAMPLES_FT80X=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_HOST_WINDOWS=y
CONFIG_INTELHEX_BINARY=y
diff --git a/configs/viewtool-stm32f107/netnsh/defconfig b/configs/viewtool-stm32f107/netnsh/defconfig
index c7f01516dba..366b367a136 100644
--- a/configs/viewtool-stm32f107/netnsh/defconfig
+++ b/configs/viewtool-stm32f107/netnsh/defconfig
@@ -11,7 +11,7 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_ETH0_PHY_DP83848C=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_HOST_WINDOWS=y
CONFIG_INTELHEX_BINARY=y
diff --git a/configs/viewtool-stm32f107/nsh/defconfig b/configs/viewtool-stm32f107/nsh/defconfig
index 29bd696974a..3c53c3e324c 100644
--- a/configs/viewtool-stm32f107/nsh/defconfig
+++ b/configs/viewtool-stm32f107/nsh/defconfig
@@ -9,7 +9,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FS_PROCFS=y
CONFIG_HOST_WINDOWS=y
CONFIG_INTELHEX_BINARY=y
diff --git a/configs/viewtool-stm32f107/tcpblaster/defconfig b/configs/viewtool-stm32f107/tcpblaster/defconfig
index 42ae7f14e14..952a686c1f2 100644
--- a/configs/viewtool-stm32f107/tcpblaster/defconfig
+++ b/configs/viewtool-stm32f107/tcpblaster/defconfig
@@ -10,7 +10,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_ETH0_PHY_DP83848C=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_EXAMPLES_TCPBLASTER=y
CONFIG_FS_PROCFS=y
CONFIG_INTELHEX_BINARY=y
diff --git a/configs/xmc4500-relax/nsh/defconfig b/configs/xmc4500-relax/nsh/defconfig
index ac6d4065580..9e8817aba4d 100644
--- a/configs/xmc4500-relax/nsh/defconfig
+++ b/configs/xmc4500-relax/nsh/defconfig
@@ -19,7 +19,7 @@ CONFIG_AT24XX_SIZE=2
CONFIG_BOARD_LOOPSPERMSEC=8000
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/z16f2800100zcog/nsh/defconfig b/configs/z16f2800100zcog/nsh/defconfig
index 7d313ea636c..2f61ae5bdd8 100644
--- a/configs/z16f2800100zcog/nsh/defconfig
+++ b/configs/z16f2800100zcog/nsh/defconfig
@@ -14,7 +14,7 @@ CONFIG_BOARD_LOOPSPERMSEC=1250
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
CONFIG_ENDIAN_BIG=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_HOST_WINDOWS=y
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
diff --git a/configs/z80sim/nsh/defconfig b/configs/z80sim/nsh/defconfig
index 703f6452c9d..cd130c27267 100644
--- a/configs/z80sim/nsh/defconfig
+++ b/configs/z80sim/nsh/defconfig
@@ -23,7 +23,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POLL=y
CONFIG_DISABLE_PTHREAD=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_MAX_TASKS=8
CONFIG_MAX_WDOGPARMS=2
CONFIG_NFILE_DESCRIPTORS=6
diff --git a/configs/zkit-arm-1769/nsh/defconfig b/configs/zkit-arm-1769/nsh/defconfig
index e6c697d60d3..9cf4f3fda84 100644
--- a/configs/zkit-arm-1769/nsh/defconfig
+++ b/configs/zkit-arm-1769/nsh/defconfig
@@ -17,7 +17,7 @@ CONFIG_ARMV7M_OABI_TOOLCHAIN=y
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=8079
CONFIG_ETH0_PHY_DP83848C=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
diff --git a/configs/zp214xpa/nsh/defconfig b/configs/zp214xpa/nsh/defconfig
index 741880ba83e..bf00862794b 100644
--- a/configs/zp214xpa/nsh/defconfig
+++ b/configs/zp214xpa/nsh/defconfig
@@ -8,7 +8,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH="arm"
CONFIG_BOARD_LOOPSPERMSEC=3270
CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH=y
+CONFIG_SYSTEM_NSH=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2
diff --git a/tools/cfgdefine.c b/tools/cfgdefine.c
index b427b06415a..27670f6bd4c 100644
--- a/tools/cfgdefine.c
+++ b/tools/cfgdefine.c
@@ -86,9 +86,9 @@ static const char *dequote_list[] =
/* apps/ definitions */
"CONFIG_EXAMPLES_HELLO_PROGNAME", /* Name of installed hello example program */
- "CONFIG_EXAMPLES_NSH_PROGNAME", /* Name of installed NSH example program */
- "CONFIG_EXAMPLES_NSH_SYMTAB_ARRAYNAME", /* Symbol table array name */
- "CONFIG_EXAMPLES_NSH_SYMTAB_COUNTNAME", /* Name of the variable holding the number of symbols */
+ "CONFIG_SYSTEM_NSH_PROGNAME", /* Name of installed NSH example program */
+ "CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME", /* Symbol table array name */
+ "CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME", /* Name of the variable holding the number of symbols */
"CONFIG_THTTPD_INDEX_NAMES", /* List of index file names */
NULL /* Marks the end of the list */
};