diff --git a/configs/arduino-due/src/Makefile b/configs/arduino-due/src/Makefile
index ca77270882f..e5df7cfa768 100644
--- a/configs/arduino-due/src/Makefile
+++ b/configs/arduino-due/src/Makefile
@@ -62,7 +62,7 @@ endif
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += sam_nsh.c
+CSRCS += sam_appinit.c
 endif
 
 include $(TOPDIR)/configs/Board.mk
diff --git a/configs/arduino-due/src/sam_nsh.c b/configs/arduino-due/src/sam_appinit.c
similarity index 98%
rename from configs/arduino-due/src/sam_nsh.c
rename to configs/arduino-due/src/sam_appinit.c
index 243a761f136..ef52d100ccf 100644
--- a/configs/arduino-due/src/sam_nsh.c
+++ b/configs/arduino-due/src/sam_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/arduino-due/src/sam_nsh.c
+ * config/arduino-due/src/sam_appinit.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/cloudctrl/src/Makefile b/configs/cloudctrl/src/Makefile
index 43585509371..820d9b0621f 100644
--- a/configs/cloudctrl/src/Makefile
+++ b/configs/cloudctrl/src/Makefile
@@ -58,7 +58,7 @@ CSRCS += stm32_usb.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += stm32_nsh.c
+CSRCS += stm32_appinit.c
 endif
 
 ifeq ($(CONFIG_MTD_W25),y)
diff --git a/configs/cloudctrl/src/stm32_nsh.c b/configs/cloudctrl/src/stm32_appinit.c
similarity index 99%
rename from configs/cloudctrl/src/stm32_nsh.c
rename to configs/cloudctrl/src/stm32_appinit.c
index d7f267ed49a..6bd5e5a203b 100644
--- a/configs/cloudctrl/src/stm32_nsh.c
+++ b/configs/cloudctrl/src/stm32_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/cloudctrl/src/stm32_nsh.c
+ * config/cloudctrl/src/stm32_appinit.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/cloudctrl/src/stm32_usbmsc.c b/configs/cloudctrl/src/stm32_usbmsc.c
index c9ed8b897d2..797b6c486ae 100644
--- a/configs/cloudctrl/src/stm32_usbmsc.c
+++ b/configs/cloudctrl/src/stm32_usbmsc.c
@@ -72,7 +72,7 @@
 int usbmsc_archinitialize(void)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
-   * already have been initized in board_app_initialize() (see stm32_nsh.c).
+   * already have been initized in board_app_initialize() (see stm32_appinit.c).
    * In this case, there is nothing further to be done here.
    */
 
diff --git a/configs/demo9s12ne64/src/Makefile b/configs/demo9s12ne64/src/Makefile
index aaf5218f756..a20efcd1447 100644
--- a/configs/demo9s12ne64/src/Makefile
+++ b/configs/demo9s12ne64/src/Makefile
@@ -38,7 +38,7 @@
 ASRCS =
 CSRCS = m9s12_boot.c m9s12_leds.c m9s12_buttons.c m9s12_spi.c
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += m9s12_nsh.c
+CSRCS += m9s12_appinit.c
 endif
 
 include $(TOPDIR)/configs/Board.mk
diff --git a/configs/demo9s12ne64/src/m9s12_nsh.c b/configs/demo9s12ne64/src/m9s12_appinit.c
similarity index 98%
rename from configs/demo9s12ne64/src/m9s12_nsh.c
rename to configs/demo9s12ne64/src/m9s12_appinit.c
index bf6b003c3f4..ec3d9ba21cf 100644
--- a/configs/demo9s12ne64/src/m9s12_nsh.c
+++ b/configs/demo9s12ne64/src/m9s12_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/demo9s12ne64/src/m9s12_nsh.c
+ * config/demo9s12ne64/src/m9s12_appinit.c
  *
  *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/ea3131/src/Makefile b/configs/ea3131/src/Makefile
index 7279a56af16..8ffe55a2dde 100644
--- a/configs/ea3131/src/Makefile
+++ b/configs/ea3131/src/Makefile
@@ -55,7 +55,7 @@ CSRCS += lpc31_spi.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += lpc31_nsh.c
+CSRCS += lpc31_appinit.c
 endif
 
 ifeq ($(CONFIG_PAGING),y)
diff --git a/configs/ea3131/src/lpc31_nsh.c b/configs/ea3131/src/lpc31_appinit.c
similarity index 99%
rename from configs/ea3131/src/lpc31_nsh.c
rename to configs/ea3131/src/lpc31_appinit.c
index 4f4eff2271a..58e58709ca8 100644
--- a/configs/ea3131/src/lpc31_nsh.c
+++ b/configs/ea3131/src/lpc31_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/ea3131/src/lpc31_nsh.c
+ * config/ea3131/src/lpc31_appinit.c
  *
  *   Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/ea3152/src/Makefile b/configs/ea3152/src/Makefile
index f7a8bbdfc57..2b51a9331e8 100644
--- a/configs/ea3152/src/Makefile
+++ b/configs/ea3152/src/Makefile
@@ -50,7 +50,7 @@ ifeq ($(CONFIG_LPC31_SPI),y)
 CSRCS += lpc31_spi.c
 endif
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += lpc31_nsh.c
+CSRCS += lpc31_appinit.c
 endif
 ifeq ($(CONFIG_PAGING),y)
 CSRCS += lpc31_fillpage.c
diff --git a/configs/ea3152/src/lpc31_nsh.c b/configs/ea3152/src/lpc31_appinit.c
similarity index 99%
rename from configs/ea3152/src/lpc31_nsh.c
rename to configs/ea3152/src/lpc31_appinit.c
index 2b7061575df..e77cdb63ef3 100644
--- a/configs/ea3152/src/lpc31_nsh.c
+++ b/configs/ea3152/src/lpc31_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/ea3152/src/lpc31_nsh.c
+ * config/ea3152/src/lpc31_appinit.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/eagle100/src/Makefile b/configs/eagle100/src/Makefile
index f7286c53e93..d4a48022504 100644
--- a/configs/eagle100/src/Makefile
+++ b/configs/eagle100/src/Makefile
@@ -38,7 +38,7 @@
 ASRCS =
 CSRCS = lm_boot.c lm_leds.c lm_ethernet.c lm_ssi.c
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += lm_nsh.c
+CSRCS += lm_appinit.c
 endif
 
 include $(TOPDIR)/configs/Board.mk
diff --git a/configs/eagle100/src/lm_nsh.c b/configs/eagle100/src/lm_appinit.c
similarity index 99%
rename from configs/eagle100/src/lm_nsh.c
rename to configs/eagle100/src/lm_appinit.c
index 5ba0e629696..c4cf32b5238 100644
--- a/configs/eagle100/src/lm_nsh.c
+++ b/configs/eagle100/src/lm_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/eagle100/src/lm_nsh.c
+ * config/eagle100/src/lm_appinit.c
  *
  *   Copyright (C) 2009, 2012, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/ekk-lm3s9b96/src/Makefile b/configs/ekk-lm3s9b96/src/Makefile
index 9f4a781c3a6..b39dbb14903 100644
--- a/configs/ekk-lm3s9b96/src/Makefile
+++ b/configs/ekk-lm3s9b96/src/Makefile
@@ -39,7 +39,7 @@
 ASRCS =
 CSRCS = lm_boot.c lm_leds.c lm_ethernet.c lm_ssi.c
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += lm_nsh.c
+CSRCS += lm_appinit.c
 endif
 
 include $(TOPDIR)/configs/Board.mk
diff --git a/configs/ekk-lm3s9b96/src/lm_nsh.c b/configs/ekk-lm3s9b96/src/lm_appinit.c
similarity index 98%
rename from configs/ekk-lm3s9b96/src/lm_nsh.c
rename to configs/ekk-lm3s9b96/src/lm_appinit.c
index 59745b5208f..313bdc9783f 100644
--- a/configs/ekk-lm3s9b96/src/lm_nsh.c
+++ b/configs/ekk-lm3s9b96/src/lm_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/ekk-lm3s9b96/src/lm_nsh.c
+ * config/ekk-lm3s9b96/src/lm_appinit.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/hymini-stm32v/src/Makefile b/configs/hymini-stm32v/src/Makefile
index 587bff4dabe..5aef11195a8 100644
--- a/configs/hymini-stm32v/src/Makefile
+++ b/configs/hymini-stm32v/src/Makefile
@@ -48,7 +48,7 @@ endif
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += stm32_nsh.c
+CSRCS += stm32_appinit.c
 endif
 
 ifeq ($(CONFIG_INPUT),y)
diff --git a/configs/hymini-stm32v/src/stm32_nsh.c b/configs/hymini-stm32v/src/stm32_appinit.c
similarity index 99%
rename from configs/hymini-stm32v/src/stm32_nsh.c
rename to configs/hymini-stm32v/src/stm32_appinit.c
index 631d31577b3..df8adca9070 100644
--- a/configs/hymini-stm32v/src/stm32_nsh.c
+++ b/configs/hymini-stm32v/src/stm32_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/hymini-stm32v/src/stm32_nsh.c
+ * config/hymini-stm32v/src/stm32_appinit.c
  *
  *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/hymini-stm32v/src/stm32_usbmsc.c b/configs/hymini-stm32v/src/stm32_usbmsc.c
index 94302b0f434..497c54c9db4 100644
--- a/configs/hymini-stm32v/src/stm32_usbmsc.c
+++ b/configs/hymini-stm32v/src/stm32_usbmsc.c
@@ -89,7 +89,7 @@
 int usbmsc_archinitialize(void)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
-   * already have been initialized in board_app_initialize() (see stm32_nsh.c).
+   * already have been initialized in board_app_initialize() (see stm32_appinit.c).
    * In this case, there is nothing further to be done here.
    */
 
diff --git a/configs/kwikstik-k40/src/Makefile b/configs/kwikstik-k40/src/Makefile
index 59a2fe64082..5c297a492a9 100644
--- a/configs/kwikstik-k40/src/Makefile
+++ b/configs/kwikstik-k40/src/Makefile
@@ -47,7 +47,7 @@ CSRCS += k40_buttons.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += k40_nsh.c
+CSRCS += k40_appinit.c
 endif
 
 ifeq ($(CONFIG_USBDEV),y)
diff --git a/configs/kwikstik-k40/src/k40_nsh.c b/configs/kwikstik-k40/src/k40_appinit.c
similarity index 99%
rename from configs/kwikstik-k40/src/k40_nsh.c
rename to configs/kwikstik-k40/src/k40_appinit.c
index fa97b0765ca..1fb77c36346 100644
--- a/configs/kwikstik-k40/src/k40_nsh.c
+++ b/configs/kwikstik-k40/src/k40_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/kwikstik-k40/src/k40_nsh.c
+ * config/kwikstik-k40/src/k40_appinit.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/kwikstik-k40/src/k40_usbmsc.c b/configs/kwikstik-k40/src/k40_usbmsc.c
index bc2666e62de..358712d6190 100644
--- a/configs/kwikstik-k40/src/k40_usbmsc.c
+++ b/configs/kwikstik-k40/src/k40_usbmsc.c
@@ -85,7 +85,7 @@
 int usbmsc_archinitialize(void)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
-   * already have been initialized in board_app_initialize() (see k40_nsh.c).
+   * already have been initialized in board_app_initialize() (see k40_appinit.c).
    * In this case, there is nothing further to be done here.
    */
 
diff --git a/configs/lincoln60/src/Makefile b/configs/lincoln60/src/Makefile
index 9f9af80c0f1..0c0eeb4fd00 100644
--- a/configs/lincoln60/src/Makefile
+++ b/configs/lincoln60/src/Makefile
@@ -39,7 +39,7 @@ ASRCS =
 CSRCS = lpc17_boot.c lpc17_leds.c
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += lpc17_nsh.c
+CSRCS += lpc17_appinit.c
 endif
 
 ifeq ($(CONFIG_USBMSC),y)
diff --git a/configs/lincoln60/src/lpc17_nsh.c b/configs/lincoln60/src/lpc17_appinit.c
similarity index 98%
rename from configs/lincoln60/src/lpc17_nsh.c
rename to configs/lincoln60/src/lpc17_appinit.c
index 9ad00a0b66f..a10646e7517 100644
--- a/configs/lincoln60/src/lpc17_nsh.c
+++ b/configs/lincoln60/src/lpc17_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/lincoln60/src/lpc17_nsh.c
+ * config/lincoln60/src/lpc17_appinit.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/lm3s6432-s2e/src/Makefile b/configs/lm3s6432-s2e/src/Makefile
index 792180ba688..48bd97d6dd1 100644
--- a/configs/lm3s6432-s2e/src/Makefile
+++ b/configs/lm3s6432-s2e/src/Makefile
@@ -38,7 +38,7 @@
 ASRCS =
 CSRCS = lm_boot.c lm_leds.c lm_ethernet.c lm_ssi.c
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += lm_nsh.c
+CSRCS += lm_appinit.c
 endif
 
 include $(TOPDIR)/configs/Board.mk
diff --git a/configs/lm3s6432-s2e/src/lm_nsh.c b/configs/lm3s6432-s2e/src/lm_appinit.c
similarity index 98%
rename from configs/lm3s6432-s2e/src/lm_nsh.c
rename to configs/lm3s6432-s2e/src/lm_appinit.c
index fd4a62e5979..ff747854259 100644
--- a/configs/lm3s6432-s2e/src/lm_nsh.c
+++ b/configs/lm3s6432-s2e/src/lm_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/lm3s6432-s2e/src/lm_nsh.c
+ * config/lm3s6432-s2e/src/lm_appinit.c
  *
  *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/lm3s6965-ek/src/Makefile b/configs/lm3s6965-ek/src/Makefile
index 17fbd08f9a9..5c1ddd2505e 100644
--- a/configs/lm3s6965-ek/src/Makefile
+++ b/configs/lm3s6965-ek/src/Makefile
@@ -39,7 +39,7 @@ ASRCS =
 CSRCS = lm_boot.c lm_leds.c lm_ethernet.c lm_ssi.c
 
 ifeq ($(CONFIG_LIB_BOARDCTL),y)
-CSRCS += lm_nsh.c
+CSRCS += lm_appinit.c
 endif
 
 ifeq ($(CONFIG_NX_LCDDRIVER),y)
diff --git a/configs/lm3s6965-ek/src/lm_nsh.c b/configs/lm3s6965-ek/src/lm_appinit.c
similarity index 99%
rename from configs/lm3s6965-ek/src/lm_nsh.c
rename to configs/lm3s6965-ek/src/lm_appinit.c
index a62b19d93a2..5f570e01dc3 100644
--- a/configs/lm3s6965-ek/src/lm_nsh.c
+++ b/configs/lm3s6965-ek/src/lm_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/lm3s6965-ek/src/lm_nsh.c
+ * config/lm3s6965-ek/src/lm_appinit.c
  *
  *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/lm3s8962-ek/src/Makefile b/configs/lm3s8962-ek/src/Makefile
index a49ed3f602c..8839324ae3e 100644
--- a/configs/lm3s8962-ek/src/Makefile
+++ b/configs/lm3s8962-ek/src/Makefile
@@ -39,7 +39,7 @@ ASRCS =
 CSRCS = lm_boot.c lm_leds.c lm_ethernet.c lm_ssi.c
 
 ifeq ($(CONFIG_LIB_BOARDCTL),y)
-CSRCS += lm_nsh.c
+CSRCS += lm_appinit.c
 endif
 
 ifeq ($(CONFIG_NX_LCDDRIVER),y)
diff --git a/configs/lm3s8962-ek/src/lm_nsh.c b/configs/lm3s8962-ek/src/lm_appinit.c
similarity index 99%
rename from configs/lm3s8962-ek/src/lm_nsh.c
rename to configs/lm3s8962-ek/src/lm_appinit.c
index 4cc002447ed..c66172af5a4 100644
--- a/configs/lm3s8962-ek/src/lm_nsh.c
+++ b/configs/lm3s8962-ek/src/lm_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/lm3s8962-ek/src/lm_nsh.c
+ * config/lm3s8962-ek/src/lm_appinit.c
  *
  *   Copyright (C) 2010, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/lm4f120-launchpad/src/Makefile b/configs/lm4f120-launchpad/src/Makefile
index 523122e3ca7..7beba52544f 100644
--- a/configs/lm4f120-launchpad/src/Makefile
+++ b/configs/lm4f120-launchpad/src/Makefile
@@ -43,7 +43,7 @@ CSRCS += lm4f_autoleds.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += lm4f_nsh.c
+CSRCS += lm4f_appinit.c
 endif
 
 include $(TOPDIR)/configs/Board.mk
diff --git a/configs/lm4f120-launchpad/src/lm4f_nsh.c b/configs/lm4f120-launchpad/src/lm4f_appinit.c
similarity index 97%
rename from configs/lm4f120-launchpad/src/lm4f_nsh.c
rename to configs/lm4f120-launchpad/src/lm4f_appinit.c
index ca29d5fa3c2..b557f771f57 100644
--- a/configs/lm4f120-launchpad/src/lm4f_nsh.c
+++ b/configs/lm4f120-launchpad/src/lm4f_appinit.c
@@ -1,6 +1,6 @@
 /****************************************************************************
- * config/lm4f120-launchpad/src/lm4f_nsh.c
- * arch/arm/src/board/lm4f_nsh.c
+ * config/lm4f120-launchpad/src/lm4f_appinit.c
+ * arch/arm/src/board/lm4f_appinit.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/lpc4330-xplorer/src/Makefile b/configs/lpc4330-xplorer/src/Makefile
index 9401227b7c2..972b28127a0 100644
--- a/configs/lpc4330-xplorer/src/Makefile
+++ b/configs/lpc4330-xplorer/src/Makefile
@@ -39,7 +39,7 @@ ASRCS =
 CSRCS = lpc43_boot.c
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += lpc43_nsh.c
+CSRCS += lpc43_appinit.c
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)
diff --git a/configs/lpc4330-xplorer/src/lpc43_nsh.c b/configs/lpc4330-xplorer/src/lpc43_appinit.c
similarity index 99%
rename from configs/lpc4330-xplorer/src/lpc43_nsh.c
rename to configs/lpc4330-xplorer/src/lpc43_appinit.c
index bccc3e5bfa9..6377c62de57 100644
--- a/configs/lpc4330-xplorer/src/lpc43_nsh.c
+++ b/configs/lpc4330-xplorer/src/lpc43_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/lpc4330-xplorer/src/lpc43_nsh.c
+ * config/lpc4330-xplorer/src/lpc43_appinit.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/lpc4357-evb/src/Makefile b/configs/lpc4357-evb/src/Makefile
index 2e02f71ffb3..0212fea639b 100644
--- a/configs/lpc4357-evb/src/Makefile
+++ b/configs/lpc4357-evb/src/Makefile
@@ -39,7 +39,7 @@ ASRCS =
 CSRCS = lpc43_boot.c
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += lpc43_nsh.c
+CSRCS += lpc43_appinit.c
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)
diff --git a/configs/lpc4357-evb/src/lpc43_nsh.c b/configs/lpc4357-evb/src/lpc43_appinit.c
similarity index 99%
rename from configs/lpc4357-evb/src/lpc43_nsh.c
rename to configs/lpc4357-evb/src/lpc43_appinit.c
index dbb0873da92..2555797f22c 100644
--- a/configs/lpc4357-evb/src/lpc43_nsh.c
+++ b/configs/lpc4357-evb/src/lpc43_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/lpc4357-evb/src/lpc43_nsh.c
+ * config/lpc4357-evb/src/lpc43_appinit.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/lpcxpresso-lpc1768/src/Makefile b/configs/lpcxpresso-lpc1768/src/Makefile
index b06b116f1fc..c7a44a8284f 100644
--- a/configs/lpcxpresso-lpc1768/src/Makefile
+++ b/configs/lpcxpresso-lpc1768/src/Makefile
@@ -39,7 +39,7 @@ ASRCS =
 CSRCS = lpc17_boot.c lpc17_leds.c lpc17_ssp.c lpc17_adc.c lpc17_dac.c lpc17_pwm.c
 
 ifeq ($(CONFIG_LIB_BOARDCTL),y)
-CSRCS += lpc17_nsh.c
+CSRCS += lpc17_appinit.c
 endif
 
 ifeq ($(CONFIG_NX_LCDDRIVER),y)
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_nsh.c b/configs/lpcxpresso-lpc1768/src/lpc17_appinit.c
similarity index 99%
rename from configs/lpcxpresso-lpc1768/src/lpc17_nsh.c
rename to configs/lpcxpresso-lpc1768/src/lpc17_appinit.c
index 65b422e782e..3e222645f20 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_nsh.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/lpcxpresso-lpc1768/src/lpc17_nsh.c
+ * config/lpcxpresso-lpc1768/src/lpc17_appinit.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/mbed/src/Makefile b/configs/mbed/src/Makefile
index 23720ddfc80..453cd262ad4 100644
--- a/configs/mbed/src/Makefile
+++ b/configs/mbed/src/Makefile
@@ -39,7 +39,7 @@ ASRCS =
 CSRCS = lpc17_boot.c lpc17_leds.c lpc17_adc.c lpc17_dac.c lpc17_pwm.c
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += lpc17_nsh.c
+CSRCS += lpc17_appinit.c
 endif
 ifeq ($(CONFIG_USBMSC),y)
 CSRCS += lpc17_usbmsc.c
diff --git a/configs/mbed/src/lpc17_nsh.c b/configs/mbed/src/lpc17_appinit.c
similarity index 98%
rename from configs/mbed/src/lpc17_nsh.c
rename to configs/mbed/src/lpc17_appinit.c
index 6bbb16d5ed2..505ae45545f 100644
--- a/configs/mbed/src/lpc17_nsh.c
+++ b/configs/mbed/src/lpc17_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/mbed/src/lpc17_nsh.c
+ * config/mbed/src/lpc17_appinit.c
  *
  *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/mcu123-lpc214x/src/Makefile b/configs/mcu123-lpc214x/src/Makefile
index 349988fe2bc..1161d5e5bff 100644
--- a/configs/mcu123-lpc214x/src/Makefile
+++ b/configs/mcu123-lpc214x/src/Makefile
@@ -39,7 +39,7 @@ ASRCS =
 CSRCS = lpc2148_spi1.c lpc2148_leds.c
 
 ifeq ($(CONFIG_LIB_BOARDCTL),y)
-CSRCS += lpc2148_nsh.c
+CSRCS += lpc2148_appinit.c
 endif
 
 ifeq ($(CONFIG_USBMSC),y)
diff --git a/configs/mcu123-lpc214x/src/lpc2148_nsh.c b/configs/mcu123-lpc214x/src/lpc2148_appinit.c
similarity index 99%
rename from configs/mcu123-lpc214x/src/lpc2148_nsh.c
rename to configs/mcu123-lpc214x/src/lpc2148_appinit.c
index 90e434439c8..3a6a94f282d 100644
--- a/configs/mcu123-lpc214x/src/lpc2148_nsh.c
+++ b/configs/mcu123-lpc214x/src/lpc2148_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/mcu123-lpc214x/src/lpc2148_nsh.c
+ * config/mcu123-lpc214x/src/lpc2148_appinit.c
  *
  *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/mcu123-lpc214x/src/lpc2148_composite.c b/configs/mcu123-lpc214x/src/lpc2148_composite.c
index cb4b23fe405..ee85dc4eb39 100644
--- a/configs/mcu123-lpc214x/src/lpc2148_composite.c
+++ b/configs/mcu123-lpc214x/src/lpc2148_composite.c
@@ -79,7 +79,7 @@
 int composite_archinitialize(void)
 {
   /* If system/composite is built as an NSH command, then SD slot should
-   * already have been initialized in board_app_initialize() (see lpc2148_nsh.c).
+   * already have been initialized in board_app_initialize() (see lpc2148_appinit.c).
    * In this case, there is nothing further to be done here.
    *
    * NOTE: CONFIG_NSH_BUILTIN_APPS is not a fool-proof indication that NSH
diff --git a/configs/mikroe-stm32f4/src/Makefile b/configs/mikroe-stm32f4/src/Makefile
index 7e4741017f1..a181145e051 100644
--- a/configs/mikroe-stm32f4/src/Makefile
+++ b/configs/mikroe-stm32f4/src/Makefile
@@ -63,7 +63,7 @@ CSRCS += stm32_watchdog.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += stm32_nsh.c
+CSRCS += stm32_appinit.c
 endif
 
 ifeq ($(CONFIG_ARCH_CUSTOM_PMINIT),y)
diff --git a/configs/mikroe-stm32f4/src/stm32_nsh.c b/configs/mikroe-stm32f4/src/stm32_appinit.c
similarity index 99%
rename from configs/mikroe-stm32f4/src/stm32_nsh.c
rename to configs/mikroe-stm32f4/src/stm32_appinit.c
index ec3cebc3570..4ac23362d30 100644
--- a/configs/mikroe-stm32f4/src/stm32_nsh.c
+++ b/configs/mikroe-stm32f4/src/stm32_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/mikroe_stm32f4/src/stm32_nsh.c
+ * config/mikroe_stm32f4/src/stm32_appinit.c
  *
  *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/mirtoo/src/Makefile b/configs/mirtoo/src/Makefile
index 8de21701830..076addb99a0 100644
--- a/configs/mirtoo/src/Makefile
+++ b/configs/mirtoo/src/Makefile
@@ -47,7 +47,7 @@ CSRCS += pic32_adc.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += pic32_nsh.c
+CSRCS += pic32_appinit.c
 endif
 
 include $(TOPDIR)/configs/Board.mk
diff --git a/configs/mirtoo/src/pic32_nsh.c b/configs/mirtoo/src/pic32_appinit.c
similarity index 99%
rename from configs/mirtoo/src/pic32_nsh.c
rename to configs/mirtoo/src/pic32_appinit.c
index c2bd1dc9ffa..459e97b844a 100644
--- a/configs/mirtoo/src/pic32_nsh.c
+++ b/configs/mirtoo/src/pic32_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/mirtoo/src/pic32_nsh.c
+ * config/mirtoo/src/pic32_appinit.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/moxa/src/Makefile b/configs/moxa/src/Makefile
index 60543b6e53c..077c774d200 100644
--- a/configs/moxa/src/Makefile
+++ b/configs/moxa/src/Makefile
@@ -39,7 +39,7 @@ ASRCS =
 CSRCS = moxart_boot.c
 
 ifeq ($(CONFIG_NSH_LIBRARY),y)
-CSRCS += moxart_nsh.c
+CSRCS += moxart_appinit.c
 endif
 
 include $(TOPDIR)/configs/Board.mk
diff --git a/configs/moxa/src/moxart_nsh.c b/configs/moxa/src/moxart_appinit.c
similarity index 98%
rename from configs/moxa/src/moxart_nsh.c
rename to configs/moxa/src/moxart_appinit.c
index 0e8c2ff91ec..32da3be6307 100644
--- a/configs/moxa/src/moxart_nsh.c
+++ b/configs/moxa/src/moxart_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/moxart/src/moxart_nsh.c
+ * config/moxart/src/moxart_appinit.c
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Anton D. Kachalov <mouse@mayc.ru>
diff --git a/configs/ne64badge/src/Makefile b/configs/ne64badge/src/Makefile
index 28db5cf58b5..5520951fa5e 100644
--- a/configs/ne64badge/src/Makefile
+++ b/configs/ne64badge/src/Makefile
@@ -38,7 +38,7 @@
 ASRCS =
 CSRCS = m9s12_boot.c m9s12_leds.c m9s12_buttons.c m9s12_spi.c
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += m9s12_nsh.c
+CSRCS += m9s12_appinit.c
 endif
 
 include $(TOPDIR)/configs/Board.mk
diff --git a/configs/ne64badge/src/m9s12_nsh.c b/configs/ne64badge/src/m9s12_appinit.c
similarity index 98%
rename from configs/ne64badge/src/m9s12_nsh.c
rename to configs/ne64badge/src/m9s12_appinit.c
index 96a698c8d78..ba61f1eaf3c 100644
--- a/configs/ne64badge/src/m9s12_nsh.c
+++ b/configs/ne64badge/src/m9s12_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/ne64badge/src/m9s12_nsh.c
+ * config/ne64badge/src/m9s12_appinit.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/nucleo-f4x1re/src/Makefile b/configs/nucleo-f4x1re/src/Makefile
index 685988dbc9c..c5d250f03dd 100644
--- a/configs/nucleo-f4x1re/src/Makefile
+++ b/configs/nucleo-f4x1re/src/Makefile
@@ -63,7 +63,7 @@ endif
 endif
 
 ifeq ($(CONFIG_NSH_LIBRARY),y)
-CSRCS += stm32_nsh.c
+CSRCS += stm32_appinit.c
 endif
 
 include $(TOPDIR)/configs/Board.mk
diff --git a/configs/nucleo-f4x1re/src/stm32_nsh.c b/configs/nucleo-f4x1re/src/stm32_appinit.c
similarity index 99%
rename from configs/nucleo-f4x1re/src/stm32_nsh.c
rename to configs/nucleo-f4x1re/src/stm32_appinit.c
index ec915e5f993..7f0d889d475 100644
--- a/configs/nucleo-f4x1re/src/stm32_nsh.c
+++ b/configs/nucleo-f4x1re/src/stm32_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/nucleo-f4x1re/src/stm32_nsh.c
+ * configs/nucleo-f4x1re/src/stm32_appinit.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/nucleus2g/src/Makefile b/configs/nucleus2g/src/Makefile
index 868e68d3f2d..2e0311d06c1 100644
--- a/configs/nucleus2g/src/Makefile
+++ b/configs/nucleus2g/src/Makefile
@@ -39,7 +39,7 @@ ASRCS =
 CSRCS = lpc17_boot.c lpc17_leds.c lpc17_ssp.c lpc17_outputs.c
 
 ifeq ($(CONFIG_LIB_BOARDCTL),y)
-CSRCS += lpc17_nsh.c
+CSRCS += lpc17_appinit.c
 endif
 
 ifeq ($(CONFIG_USBMSC),y)
diff --git a/configs/nucleus2g/src/lpc17_nsh.c b/configs/nucleus2g/src/lpc17_appinit.c
similarity index 99%
rename from configs/nucleus2g/src/lpc17_nsh.c
rename to configs/nucleus2g/src/lpc17_appinit.c
index eea93ced8b8..7cb82f8ca26 100644
--- a/configs/nucleus2g/src/lpc17_nsh.c
+++ b/configs/nucleus2g/src/lpc17_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/nucleus2g/src/lpc17_nsh.c
+ * config/nucleus2g/src/lpc17_appinit.c
  *
  *   Copyright (C) 2010-2011, 2013, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/olimex-lpc-h3131/src/Makefile b/configs/olimex-lpc-h3131/src/Makefile
index 12ec7fa71bb..15ee6134c46 100644
--- a/configs/olimex-lpc-h3131/src/Makefile
+++ b/configs/olimex-lpc-h3131/src/Makefile
@@ -55,7 +55,7 @@ CSRCS += lpc31_mmcsd.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += lpc31_nsh.c
+CSRCS += lpc31_appinit.c
 endif
 
 ifeq ($(CONFIG_LPC31_USBOTG),y)
diff --git a/configs/olimex-lpc-h3131/src/lpc31_nsh.c b/configs/olimex-lpc-h3131/src/lpc31_appinit.c
similarity index 98%
rename from configs/olimex-lpc-h3131/src/lpc31_nsh.c
rename to configs/olimex-lpc-h3131/src/lpc31_appinit.c
index 413b85521bf..d24c412ffd6 100644
--- a/configs/olimex-lpc-h3131/src/lpc31_nsh.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/olimex-lpc-h3131/src/lpc31_nsh.c
+ * configs/olimex-lpc-h3131/src/lpc31_appinit.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/olimex-lpc1766stk/src/Makefile b/configs/olimex-lpc1766stk/src/Makefile
index 0fe8d8a40ba..7e6270200d3 100644
--- a/configs/olimex-lpc1766stk/src/Makefile
+++ b/configs/olimex-lpc1766stk/src/Makefile
@@ -39,7 +39,7 @@ ASRCS =
 CSRCS = lpc17_boot.c lpc17_leds.c lpc17_ssp.c
 
 ifeq ($(CONFIG_LIB_BOARDCTL),y)
-CSRCS += lpc17_nsh.c
+CSRCS += lpc17_appinit.c
 endif
 
 ifeq ($(CONFIG_USBMSC),y)
diff --git a/configs/olimex-lpc1766stk/src/lpc17_nsh.c b/configs/olimex-lpc1766stk/src/lpc17_appinit.c
similarity index 99%
rename from configs/olimex-lpc1766stk/src/lpc17_nsh.c
rename to configs/olimex-lpc1766stk/src/lpc17_appinit.c
index 946895fa753..b1794caaf49 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_nsh.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/olimex-lpc1766stk/src/lpc17_nsh.c
+ * config/olimex-lpc1766stk/src/lpc17_appinit.c
  *
  *   Copyright (C) 2010, 2013-2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/olimex-lpc2378/src/Makefile b/configs/olimex-lpc2378/src/Makefile
index 9ed1c7b44b7..c5c442a37ac 100644
--- a/configs/olimex-lpc2378/src/Makefile
+++ b/configs/olimex-lpc2378/src/Makefile
@@ -44,7 +44,7 @@ ASRCS =
 CSRCS = lpc2378_leds.c
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += lpc2378_nsh.c
+CSRCS += lpc2378_appinit.c
 endif
 
 include $(TOPDIR)/configs/Board.mk
diff --git a/configs/olimex-lpc2378/src/lpc2378_nsh.c b/configs/olimex-lpc2378/src/lpc2378_appinit.c
similarity index 98%
rename from configs/olimex-lpc2378/src/lpc2378_nsh.c
rename to configs/olimex-lpc2378/src/lpc2378_appinit.c
index fe438037299..6f7e8b194f6 100644
--- a/configs/olimex-lpc2378/src/lpc2378_nsh.c
+++ b/configs/olimex-lpc2378/src/lpc2378_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/olimex-lpc2378/src/lpc2378_nsh.c
+ * config/olimex-lpc2378/src/lpc2378_appinit.c
  *
  *   Copyright (C) 2010 Rommel Marcelo. All rights reserved.
  *   Author: Rommel Marcelo
diff --git a/configs/olimex-stm32-h405/src/Makefile b/configs/olimex-stm32-h405/src/Makefile
index 16a8595e4a4..c7133219c5d 100644
--- a/configs/olimex-stm32-h405/src/Makefile
+++ b/configs/olimex-stm32-h405/src/Makefile
@@ -53,7 +53,7 @@ CSRCS += stm32_usb.c
 endif
 
 ifeq ($(CONFIG_NSH_LIBRARY),y)
-CSRCS += stm32_nsh.c
+CSRCS += stm32_appinit.c
 endif
 
 ifeq ($(CONFIG_ADC),y)
diff --git a/configs/olimex-stm32-h405/src/stm32_nsh.c b/configs/olimex-stm32-h405/src/stm32_appinit.c
similarity index 98%
rename from configs/olimex-stm32-h405/src/stm32_nsh.c
rename to configs/olimex-stm32-h405/src/stm32_appinit.c
index 9fc44bc9085..feb4d13ebb0 100644
--- a/configs/olimex-stm32-h405/src/stm32_nsh.c
+++ b/configs/olimex-stm32-h405/src/stm32_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/olimex-stm32-h405/src/stm32_nsh.c
+ * config/olimex-stm32-h405/src/stm32_appinit.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/olimex-stm32-h407/src/Makefile b/configs/olimex-stm32-h407/src/Makefile
index 5c1266b5bc2..e09a9b33c4e 100644
--- a/configs/olimex-stm32-h407/src/Makefile
+++ b/configs/olimex-stm32-h407/src/Makefile
@@ -49,7 +49,7 @@ CSRCS +=  stm32_buttons.c
 endif
 
 ifeq ($(CONFIG_NSH_LIBRARY),y)
-CSRCS += stm32_nsh.c
+CSRCS += stm32_appinit.c
 endif
 
 ifeq ($(CONFIG_ARCH_IDLE_CUSTOM),y)
diff --git a/configs/olimex-stm32-h407/src/stm32_nsh.c b/configs/olimex-stm32-h407/src/stm32_appinit.c
similarity index 99%
rename from configs/olimex-stm32-h407/src/stm32_nsh.c
rename to configs/olimex-stm32-h407/src/stm32_appinit.c
index f343c6838cd..afff0c11ea1 100644
--- a/configs/olimex-stm32-h407/src/stm32_nsh.c
+++ b/configs/olimex-stm32-h407/src/stm32_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/olimex-stm32-h407/src/stm32_nsh.c
+ * config/olimex-stm32-h407/src/stm32_appinit.c
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/olimex-stm32-p207/src/Makefile b/configs/olimex-stm32-p207/src/Makefile
index a43a3bd8418..ffd5a70b1aa 100644
--- a/configs/olimex-stm32-p207/src/Makefile
+++ b/configs/olimex-stm32-p207/src/Makefile
@@ -53,7 +53,7 @@ CSRCS += stm32_usb.c
 endif
 
 ifeq ($(CONFIG_NSH_LIBRARY),y)
-CSRCS += stm32_nsh.c
+CSRCS += stm32_appinit.c
 endif
 
 ifeq ($(CONFIG_ADC),y)
diff --git a/configs/olimex-stm32-p207/src/stm32_nsh.c b/configs/olimex-stm32-p207/src/stm32_appinit.c
similarity index 99%
rename from configs/olimex-stm32-p207/src/stm32_nsh.c
rename to configs/olimex-stm32-p207/src/stm32_appinit.c
index d11e940e939..cdc42a08735 100644
--- a/configs/olimex-stm32-p207/src/stm32_nsh.c
+++ b/configs/olimex-stm32-p207/src/stm32_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/olimex-stm32-p207/src/stm32_nsh.c
+ * config/olimex-stm32-p207/src/stm32_appinit.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/olimex-strp711/src/Makefile b/configs/olimex-strp711/src/Makefile
index 8c7285a21e6..2091c94ad97 100644
--- a/configs/olimex-strp711/src/Makefile
+++ b/configs/olimex-strp711/src/Makefile
@@ -38,7 +38,7 @@
 ASRCS =
 CSRCS = str71_spi.c str71_leds.c str71_buttons.c
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += str71_nsh.c
+CSRCS += str71_appinit.c
 endif
 ifeq ($(CONFIG_ENC28J60),y)
 CSRCS += str71_enc28j60.c
diff --git a/configs/olimex-strp711/src/str71_nsh.c b/configs/olimex-strp711/src/str71_appinit.c
similarity index 99%
rename from configs/olimex-strp711/src/str71_nsh.c
rename to configs/olimex-strp711/src/str71_appinit.c
index 8e7f949c4cd..72779fd866e 100644
--- a/configs/olimex-strp711/src/str71_nsh.c
+++ b/configs/olimex-strp711/src/str71_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/olimex-strp711/src/str71_nsh.c
+ * config/olimex-strp711/src/str71_appinit.c
  *
  *   Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/open1788/src/Makefile b/configs/open1788/src/Makefile
index 8172a2027f6..656c9754c59 100644
--- a/configs/open1788/src/Makefile
+++ b/configs/open1788/src/Makefile
@@ -57,7 +57,7 @@ ifeq ($(CONFIG_LPC17_LCD),y)
 endif
 
 ifeq ($(CONFIG_NSH_LIBRARY),y)
-  CSRCS += lpc17_nsh.c
+  CSRCS += lpc17_appinit.c
 endif
 
 ifeq ($(CONFIG_ARCH_LEDS),y)
diff --git a/configs/open1788/src/lpc17_nsh.c b/configs/open1788/src/lpc17_appinit.c
similarity index 99%
rename from configs/open1788/src/lpc17_nsh.c
rename to configs/open1788/src/lpc17_appinit.c
index 9dbad32472e..47ff42c792b 100644
--- a/configs/open1788/src/lpc17_nsh.c
+++ b/configs/open1788/src/lpc17_appinit.c
@@ -1,6 +1,6 @@
 /****************************************************************************
- * config/open1788/src/lpc17_nsh.c
- * arch/arm/src/board/lpc17_nsh.c
+ * config/open1788/src/lpc17_appinit.c
+ * arch/arm/src/board/lpc17_appinit.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/pcblogic-pic32mx/src/Makefile b/configs/pcblogic-pic32mx/src/Makefile
index bc7ab00f5bb..ca2f8c53759 100644
--- a/configs/pcblogic-pic32mx/src/Makefile
+++ b/configs/pcblogic-pic32mx/src/Makefile
@@ -39,7 +39,7 @@ ASRCS =
 CSRCS = pic32mx_boot.c
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += pic32mx_nsh.c
+CSRCS += pic32mx_appinit.c
 endif
 
 ifeq ($(CONFIG_LCD_LCD1602),y)
diff --git a/configs/pcblogic-pic32mx/src/pic32mx_nsh.c b/configs/pcblogic-pic32mx/src/pic32mx_appinit.c
similarity index 98%
rename from configs/pcblogic-pic32mx/src/pic32mx_nsh.c
rename to configs/pcblogic-pic32mx/src/pic32mx_appinit.c
index 684dbdf8a0d..97baa0009ea 100644
--- a/configs/pcblogic-pic32mx/src/pic32mx_nsh.c
+++ b/configs/pcblogic-pic32mx/src/pic32mx_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/pcblocic-pic32mx/src/pic32mx_nsh.c
+ * config/pcblocic-pic32mx/src/pic32mx_appinit.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/pic32mx-starterkit/src/Makefile b/configs/pic32mx-starterkit/src/Makefile
index d7ebe18d4bf..f58f7500c6e 100644
--- a/configs/pic32mx-starterkit/src/Makefile
+++ b/configs/pic32mx-starterkit/src/Makefile
@@ -46,7 +46,7 @@ endif
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += pic32mx_nsh.c
+CSRCS += pic32mx_appinit.c
 endif
 
 ifeq ($(CONFIG_USBMSC),y)
diff --git a/configs/pic32mx-starterkit/src/pic32mx_nsh.c b/configs/pic32mx-starterkit/src/pic32mx_appinit.c
similarity index 99%
rename from configs/pic32mx-starterkit/src/pic32mx_nsh.c
rename to configs/pic32mx-starterkit/src/pic32mx_appinit.c
index 7d877f73fc0..57268cfa456 100644
--- a/configs/pic32mx-starterkit/src/pic32mx_nsh.c
+++ b/configs/pic32mx-starterkit/src/pic32mx_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/pic32mx-starterkit/src/pic32mx_nsh.c
+ * config/pic32mx-starterkit/src/pic32mx_appinit.c
  *
  *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/pic32mx-starterkit/src/pic32mx_usbmsc.c b/configs/pic32mx-starterkit/src/pic32mx_usbmsc.c
index 417350307f0..81b9b1bb67a 100644
--- a/configs/pic32mx-starterkit/src/pic32mx_usbmsc.c
+++ b/configs/pic32mx-starterkit/src/pic32mx_usbmsc.c
@@ -62,7 +62,7 @@ int usbmsc_archinitialize(void)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initialized in board_app_initialize() (see
-   * pic32mx_nsh.c).  In this case, there is nothing further to be done here.
+   * pic32mx_appinit.c).  In this case, there is nothing further to be done here.
    */
 
 #ifndef CONFIG_NSH_BUILTIN_APPS
diff --git a/configs/pic32mx7mmb/src/Makefile b/configs/pic32mx7mmb/src/Makefile
index 9b855fe380c..4523aebef08 100644
--- a/configs/pic32mx7mmb/src/Makefile
+++ b/configs/pic32mx7mmb/src/Makefile
@@ -46,7 +46,7 @@ endif
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += pic32_nsh.c
+CSRCS += pic32_appinit.c
 endif
 
 ifeq ($(CONFIG_USBMSC),y)
diff --git a/configs/pic32mx7mmb/src/pic32_nsh.c b/configs/pic32mx7mmb/src/pic32_appinit.c
similarity index 99%
rename from configs/pic32mx7mmb/src/pic32_nsh.c
rename to configs/pic32mx7mmb/src/pic32_appinit.c
index bd3010bb35d..26562593aef 100644
--- a/configs/pic32mx7mmb/src/pic32_nsh.c
+++ b/configs/pic32mx7mmb/src/pic32_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/pic32mx7mmb/src/pic32_nsh.c
+ * config/pic32mx7mmb/src/pic32_appinit.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/pic32mx7mmb/src/pic32_usbmsc.c b/configs/pic32mx7mmb/src/pic32_usbmsc.c
index a5eb2a13505..9b6d499ea33 100644
--- a/configs/pic32mx7mmb/src/pic32_usbmsc.c
+++ b/configs/pic32mx7mmb/src/pic32_usbmsc.c
@@ -61,7 +61,7 @@
 int usbmsc_archinitialize(void)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
-   * already have been initialized in board_app_initialize() (see pic32_nsh.c).
+   * already have been initialized in board_app_initialize() (see pic32_appinit.c).
    * In this case, there is nothing further to be done here.
    */
 
diff --git a/configs/pic32mz-starterkit/src/Makefile b/configs/pic32mz-starterkit/src/Makefile
index 128c862fb92..d83d38d1485 100644
--- a/configs/pic32mz-starterkit/src/Makefile
+++ b/configs/pic32mz-starterkit/src/Makefile
@@ -49,7 +49,7 @@ CSRCS += pic32mz_buttons.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += pic32mz_nsh.c
+CSRCS += pic32mz_appinit.c
 endif
 
 include $(TOPDIR)/configs/Board.mk
diff --git a/configs/pic32mz-starterkit/src/pic32mz_nsh.c b/configs/pic32mz-starterkit/src/pic32mz_appinit.c
similarity index 98%
rename from configs/pic32mz-starterkit/src/pic32mz_nsh.c
rename to configs/pic32mz-starterkit/src/pic32mz_appinit.c
index 3cbc502f2d7..3f9261310e4 100644
--- a/configs/pic32mz-starterkit/src/pic32mz_nsh.c
+++ b/configs/pic32mz-starterkit/src/pic32mz_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/pic32mz-starterkit/src/pic32mz_nsh.c
+ * config/pic32mz-starterkit/src/pic32mz_appinit.c
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/sam3u-ek/src/Makefile b/configs/sam3u-ek/src/Makefile
index 997897e9e54..f28f2346634 100644
--- a/configs/sam3u-ek/src/Makefile
+++ b/configs/sam3u-ek/src/Makefile
@@ -43,7 +43,7 @@ CSRCS += sam_lcd.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += sam_nsh.c
+CSRCS += sam_appinit.c
 endif
 
 ifeq ($(CONFIG_SAM34_HSMCI),y)
diff --git a/configs/sam3u-ek/src/sam_nsh.c b/configs/sam3u-ek/src/sam_appinit.c
similarity index 99%
rename from configs/sam3u-ek/src/sam_nsh.c
rename to configs/sam3u-ek/src/sam_appinit.c
index 2a36eb50e0d..481cc8ffbc1 100644
--- a/configs/sam3u-ek/src/sam_nsh.c
+++ b/configs/sam3u-ek/src/sam_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/sam3u-ek/src/sam_nsh.c
+ * config/sam3u-ek/src/sam_appinit.c
  *
  *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/sam4e-ek/src/Makefile b/configs/sam4e-ek/src/Makefile
index fe3c1d9d55c..03882e37c86 100644
--- a/configs/sam4e-ek/src/Makefile
+++ b/configs/sam4e-ek/src/Makefile
@@ -39,7 +39,7 @@ ASRCS =
 CSRCS = sam_boot.c sam_leds.c sam_buttons.c sam_udp.c
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += sam_nsh.c
+CSRCS += sam_appinit.c
 endif
 
 ifeq ($(CONFIG_SAM34_HSMCI),y)
diff --git a/configs/sam4e-ek/src/sam_nsh.c b/configs/sam4e-ek/src/sam_appinit.c
similarity index 98%
rename from configs/sam4e-ek/src/sam_nsh.c
rename to configs/sam4e-ek/src/sam_appinit.c
index ca9fbe9de5b..0a577dc9250 100644
--- a/configs/sam4e-ek/src/sam_nsh.c
+++ b/configs/sam4e-ek/src/sam_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/sam4e-ek/src/sam_nsh.c
+ * config/sam4e-ek/src/sam_appinit.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/sam4l-xplained/src/Makefile b/configs/sam4l-xplained/src/Makefile
index 1ec24e9ddc8..de2a6b63ca0 100644
--- a/configs/sam4l-xplained/src/Makefile
+++ b/configs/sam4l-xplained/src/Makefile
@@ -53,7 +53,7 @@ CSRCS += sam_buttons.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += sam_nsh.c
+CSRCS += sam_appinit.c
 endif
 
 ifeq ($(CONFIG_SAM34_LCDCA),y)
diff --git a/configs/sam4l-xplained/src/sam_nsh.c b/configs/sam4l-xplained/src/sam_appinit.c
similarity index 98%
rename from configs/sam4l-xplained/src/sam_nsh.c
rename to configs/sam4l-xplained/src/sam_appinit.c
index 074d584031d..48c072c98af 100644
--- a/configs/sam4l-xplained/src/sam_nsh.c
+++ b/configs/sam4l-xplained/src/sam_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/sam4l-xplained/src/sam_nsh.c
+ * config/sam4l-xplained/src/sam_appinit.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/sam4s-xplained-pro/src/Makefile b/configs/sam4s-xplained-pro/src/Makefile
index 46606d2c357..b34afd6d73c 100644
--- a/configs/sam4s-xplained-pro/src/Makefile
+++ b/configs/sam4s-xplained-pro/src/Makefile
@@ -39,7 +39,7 @@ ASRCS =
 CSRCS = sam_boot.c
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += sam_nsh.c
+CSRCS += sam_appinit.c
 endif
 
 ifeq ($(CONFIG_SAM34_HSMCI),y)
diff --git a/configs/sam4s-xplained-pro/src/sam_nsh.c b/configs/sam4s-xplained-pro/src/sam_appinit.c
similarity index 99%
rename from configs/sam4s-xplained-pro/src/sam_nsh.c
rename to configs/sam4s-xplained-pro/src/sam_appinit.c
index 2bc418ef189..e85b97ae934 100644
--- a/configs/sam4s-xplained-pro/src/sam_nsh.c
+++ b/configs/sam4s-xplained-pro/src/sam_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/sam4s-xplained-pro/src/sam_nsh.c
+ * config/sam4s-xplained-pro/src/sam_appinit.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/sama5d2-xult/src/Makefile b/configs/sama5d2-xult/src/Makefile
index 68fa8f13fdf..47065d68210 100644
--- a/configs/sama5d2-xult/src/Makefile
+++ b/configs/sama5d2-xult/src/Makefile
@@ -39,7 +39,7 @@ ASRCS =
 CSRCS = sam_boot.c sam_userleds.c
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += sam_nsh.c sam_bringup.c
+CSRCS += sam_appinit.c sam_bringup.c
 else
 ifeq ($(CONFIG_BOARD_INITIALIZE),y)
 CSRCS += sam_bringup.c
diff --git a/configs/sama5d2-xult/src/sam_nsh.c b/configs/sama5d2-xult/src/sam_appinit.c
similarity index 98%
rename from configs/sama5d2-xult/src/sam_nsh.c
rename to configs/sama5d2-xult/src/sam_appinit.c
index d71647dc223..8472bc995cd 100644
--- a/configs/sama5d2-xult/src/sam_nsh.c
+++ b/configs/sama5d2-xult/src/sam_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/sama5d2-xult/src/sam_nsh.c
+ * config/sama5d2-xult/src/sam_appinit.c
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/sama5d3-xplained/src/Makefile b/configs/sama5d3-xplained/src/Makefile
index 93c2602d667..6d74b3320fe 100644
--- a/configs/sama5d3-xplained/src/Makefile
+++ b/configs/sama5d3-xplained/src/Makefile
@@ -85,7 +85,7 @@ endif
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += sam_nsh.c
+CSRCS += sam_appinit.c
 endif
 
 ifeq ($(CONFIG_ADC),y)
diff --git a/configs/sama5d3-xplained/src/sam_nsh.c b/configs/sama5d3-xplained/src/sam_appinit.c
similarity index 99%
rename from configs/sama5d3-xplained/src/sam_nsh.c
rename to configs/sama5d3-xplained/src/sam_appinit.c
index 876024742b0..1215fea5950 100644
--- a/configs/sama5d3-xplained/src/sam_nsh.c
+++ b/configs/sama5d3-xplained/src/sam_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/sama5d3-xplained/src/sam_nsh.c
+ * config/sama5d3-xplained/src/sam_appinit.c
  *
  *   Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/sama5d3x-ek/src/Makefile b/configs/sama5d3x-ek/src/Makefile
index af3e3c0b82b..e5b1a49df2b 100644
--- a/configs/sama5d3x-ek/src/Makefile
+++ b/configs/sama5d3x-ek/src/Makefile
@@ -107,7 +107,7 @@ endif
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += sam_nsh.c
+CSRCS += sam_appinit.c
 endif
 
 ifeq ($(CONFIG_ADC),y)
diff --git a/configs/sama5d3x-ek/src/sam_nsh.c b/configs/sama5d3x-ek/src/sam_appinit.c
similarity index 99%
rename from configs/sama5d3x-ek/src/sam_nsh.c
rename to configs/sama5d3x-ek/src/sam_appinit.c
index cabdffc79b1..56589915ce7 100644
--- a/configs/sama5d3x-ek/src/sam_nsh.c
+++ b/configs/sama5d3x-ek/src/sam_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/sama5d3x-ek/src/sam_nsh.c
+ * config/sama5d3x-ek/src/sam_appinit.c
  *
  *   Copyright (C) 2013-2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/samd20-xplained/src/Makefile b/configs/samd20-xplained/src/Makefile
index b536a070da0..af59a559954 100644
--- a/configs/samd20-xplained/src/Makefile
+++ b/configs/samd20-xplained/src/Makefile
@@ -53,7 +53,7 @@ CSRCS += sam_buttons.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += sam_nsh.c
+CSRCS += sam_appinit.c
 endif
 
 ifeq ($(CONFIG_SAMD20_XPLAINED_IOMODULE),y)
diff --git a/configs/samd20-xplained/src/sam_nsh.c b/configs/samd20-xplained/src/sam_appinit.c
similarity index 99%
rename from configs/samd20-xplained/src/sam_nsh.c
rename to configs/samd20-xplained/src/sam_appinit.c
index 0f5480c79de..e010822c73b 100644
--- a/configs/samd20-xplained/src/sam_nsh.c
+++ b/configs/samd20-xplained/src/sam_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/samd20-xplained/src/sam_nsh.c
+ * config/samd20-xplained/src/sam_appinit.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/samd21-xplained/src/Makefile b/configs/samd21-xplained/src/Makefile
index 03d16e1ac79..ce6b6480a98 100644
--- a/configs/samd21-xplained/src/Makefile
+++ b/configs/samd21-xplained/src/Makefile
@@ -53,7 +53,7 @@ CSRCS += sam_buttons.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += sam_nsh.c
+CSRCS += sam_appinit.c
 endif
 
 ifeq ($(CONFIG_SAMD21_XPLAINED_IOMODULE),y)
diff --git a/configs/samd21-xplained/src/sam_nsh.c b/configs/samd21-xplained/src/sam_appinit.c
similarity index 99%
rename from configs/samd21-xplained/src/sam_nsh.c
rename to configs/samd21-xplained/src/sam_appinit.c
index 07914679464..f7225ead2f8 100644
--- a/configs/samd21-xplained/src/sam_nsh.c
+++ b/configs/samd21-xplained/src/sam_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/samd21-xplained/src/sam_nsh.c
+ * config/samd21-xplained/src/sam_appinit.c
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/saml21-xplained/src/Makefile b/configs/saml21-xplained/src/Makefile
index 12279c258d3..e27139e5792 100644
--- a/configs/saml21-xplained/src/Makefile
+++ b/configs/saml21-xplained/src/Makefile
@@ -53,7 +53,7 @@ CSRCS += sam_buttons.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += sam_nsh.c
+CSRCS += sam_appinit.c
 endif
 
 ifeq ($(CONFIG_SAML21_XPLAINED_IOMODULE),y)
diff --git a/configs/saml21-xplained/src/sam_nsh.c b/configs/saml21-xplained/src/sam_appinit.c
similarity index 99%
rename from configs/saml21-xplained/src/sam_nsh.c
rename to configs/saml21-xplained/src/sam_appinit.c
index b40d92f2e18..ef2d68b28c9 100644
--- a/configs/saml21-xplained/src/sam_nsh.c
+++ b/configs/saml21-xplained/src/sam_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/saml21-xplained/src/sam_nsh.c
+ * config/saml21-xplained/src/sam_appinit.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/shenzhou/src/Makefile b/configs/shenzhou/src/Makefile
index 1b20a3a2829..6168fe3975e 100644
--- a/configs/shenzhou/src/Makefile
+++ b/configs/shenzhou/src/Makefile
@@ -57,7 +57,7 @@ CSRCS += stm32_usb.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += stm32_nsh.c
+CSRCS += stm32_appinit.c
 endif
 
 ifeq ($(CONFIG_MTD_W25),y)
diff --git a/configs/shenzhou/src/stm32_nsh.c b/configs/shenzhou/src/stm32_appinit.c
similarity index 99%
rename from configs/shenzhou/src/stm32_nsh.c
rename to configs/shenzhou/src/stm32_appinit.c
index 9a6e2863c20..24c15b99ab3 100644
--- a/configs/shenzhou/src/stm32_nsh.c
+++ b/configs/shenzhou/src/stm32_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/shenzhou/src/stm32_nsh.c
+ * config/shenzhou/src/stm32_appinit.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/shenzhou/src/stm32_composite.c b/configs/shenzhou/src/stm32_composite.c
index 235da6748f7..7ef4754ba17 100644
--- a/configs/shenzhou/src/stm32_composite.c
+++ b/configs/shenzhou/src/stm32_composite.c
@@ -71,7 +71,7 @@ int composite_archinitialize(void)
 {
   /* If system/composite is built as an NSH command, then SD slot should
    * already have been initialized in board_app_initialize() (see
-   * stm32_nsh.c).  In this case, there is nothing further to be done here.
+   * stm32_appinit.c).  In this case, there is nothing further to be done here.
    *
    * NOTE: CONFIG_NSH_BUILTIN_APPS is not a fool-proof indication that NSH
    * was built.
diff --git a/configs/shenzhou/src/stm32_usbmsc.c b/configs/shenzhou/src/stm32_usbmsc.c
index b7ce927e9ad..96606cf0a32 100644
--- a/configs/shenzhou/src/stm32_usbmsc.c
+++ b/configs/shenzhou/src/stm32_usbmsc.c
@@ -72,7 +72,7 @@ int usbmsc_archinitialize(void)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initialized in board_app_initialize() (see
-   * stm32_nsh.c).  In this case, there is nothing further to be done here.
+   * stm32_appinit.c).  In this case, there is nothing further to be done here.
    */
 
 #ifndef CONFIG_NSH_BUILTIN_APPS
diff --git a/configs/spark/src/Makefile b/configs/spark/src/Makefile
index b5c23bd39d0..052bde93973 100644
--- a/configs/spark/src/Makefile
+++ b/configs/spark/src/Makefile
@@ -50,7 +50,7 @@ CSRCS +=  stm32_buttons.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += stm32_nsh.c
+CSRCS += stm32_appinit.c
 endif
 
 ifeq ($(CONFIG_USBDEV),y)
diff --git a/configs/spark/src/stm32_nsh.c b/configs/spark/src/stm32_appinit.c
similarity index 99%
rename from configs/spark/src/stm32_nsh.c
rename to configs/spark/src/stm32_appinit.c
index 0b50bd383a5..951fc55567f 100644
--- a/configs/spark/src/stm32_nsh.c
+++ b/configs/spark/src/stm32_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/spark/src/stm32_nsh.c
+ * config/spark/src/stm32_appinit.c
  *
  *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm32_tiny/src/Makefile b/configs/stm32_tiny/src/Makefile
index 64fec8342bb..5b29a4aa089 100644
--- a/configs/stm32_tiny/src/Makefile
+++ b/configs/stm32_tiny/src/Makefile
@@ -48,7 +48,7 @@ CSRCS += stm32_wireless.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += stm32_nsh.c
+CSRCS += stm32_appinit.c
 endif
 
 ifeq ($(CONFIG_WATCHDOG),y)
diff --git a/configs/stm32_tiny/src/stm32_nsh.c b/configs/stm32_tiny/src/stm32_appinit.c
similarity index 98%
rename from configs/stm32_tiny/src/stm32_nsh.c
rename to configs/stm32_tiny/src/stm32_appinit.c
index 425b0a2e20d..2f117d2c2e7 100644
--- a/configs/stm32_tiny/src/stm32_nsh.c
+++ b/configs/stm32_tiny/src/stm32_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/stm32_tiny/src/stm32_nsh.c
+ * config/stm32_tiny/src/stm32_appinit.c
  *
  *   Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm32f3discovery/src/Makefile b/configs/stm32f3discovery/src/Makefile
index 0fbe50724a0..ffcb57a981e 100644
--- a/configs/stm32f3discovery/src/Makefile
+++ b/configs/stm32f3discovery/src/Makefile
@@ -65,7 +65,7 @@ CSRCS += stm32_watchdog.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += stm32_nsh.c
+CSRCS += stm32_appinit.c
 endif
 
 include $(TOPDIR)/configs/Board.mk
diff --git a/configs/stm32f3discovery/src/stm32_nsh.c b/configs/stm32f3discovery/src/stm32_appinit.c
similarity index 98%
rename from configs/stm32f3discovery/src/stm32_nsh.c
rename to configs/stm32f3discovery/src/stm32_appinit.c
index d0b847ce2f6..445dfbc2c4d 100644
--- a/configs/stm32f3discovery/src/stm32_nsh.c
+++ b/configs/stm32f3discovery/src/stm32_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/stm32f3discovery/src/stm32_nsh.c
+ * config/stm32f3discovery/src/stm32_appinit.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm32f429i-disco/src/Makefile b/configs/stm32f429i-disco/src/Makefile
index b459a3be8d6..aec191fdc2b 100644
--- a/configs/stm32f429i-disco/src/Makefile
+++ b/configs/stm32f429i-disco/src/Makefile
@@ -49,7 +49,7 @@ CSRCS +=  stm32_buttons.c
 endif
 
 ifeq ($(CONFIG_NSH_LIBRARY),y)
-CSRCS += stm32_nsh.c
+CSRCS += stm32_appinit.c
 endif
 
 ifeq ($(CONFIG_ARCH_IDLE_CUSTOM),y)
diff --git a/configs/stm32f429i-disco/src/stm32_nsh.c b/configs/stm32f429i-disco/src/stm32_appinit.c
similarity index 99%
rename from configs/stm32f429i-disco/src/stm32_nsh.c
rename to configs/stm32f429i-disco/src/stm32_appinit.c
index 397f753d97c..8f42fbab182 100644
--- a/configs/stm32f429i-disco/src/stm32_nsh.c
+++ b/configs/stm32f429i-disco/src/stm32_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/stm32f429i-disco/src/stm32_nsh.c
+ * config/stm32f429i-disco/src/stm32_appinit.c
  *
  *   Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm32f4discovery/src/Makefile b/configs/stm32f4discovery/src/Makefile
index 93bcf84d5c2..5361b01b447 100644
--- a/configs/stm32f4discovery/src/Makefile
+++ b/configs/stm32f4discovery/src/Makefile
@@ -89,7 +89,7 @@ CSRCS += stm32_watchdog.c
 endif
 
 ifeq ($(CONFIG_NSH_LIBRARY),y)
-CSRCS += stm32_nsh.c
+CSRCS += stm32_appinit.c
 endif
 
 ifeq ($(CONFIG_ARCH_CUSTOM_PMINIT),y)
diff --git a/configs/stm32f4discovery/src/stm32_nsh.c b/configs/stm32f4discovery/src/stm32_appinit.c
similarity index 98%
rename from configs/stm32f4discovery/src/stm32_nsh.c
rename to configs/stm32f4discovery/src/stm32_appinit.c
index 8b4c94c6ffb..4ce0e55bdb0 100644
--- a/configs/stm32f4discovery/src/stm32_nsh.c
+++ b/configs/stm32f4discovery/src/stm32_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/stm32f4discovery/src/stm32_nsh.c
+ * config/stm32f4discovery/src/stm32_appinit.c
  *
  *   Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm32ldiscovery/src/Makefile b/configs/stm32ldiscovery/src/Makefile
index a7fcf91b8f9..e9120815c0a 100644
--- a/configs/stm32ldiscovery/src/Makefile
+++ b/configs/stm32ldiscovery/src/Makefile
@@ -65,7 +65,7 @@ CSRCS += stm32_watchdog.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += stm32_nsh.c
+CSRCS += stm32_appinit.c
 endif
 
 include $(TOPDIR)/configs/Board.mk
diff --git a/configs/stm32ldiscovery/src/stm32_nsh.c b/configs/stm32ldiscovery/src/stm32_appinit.c
similarity index 100%
rename from configs/stm32ldiscovery/src/stm32_nsh.c
rename to configs/stm32ldiscovery/src/stm32_appinit.c
diff --git a/configs/sure-pic32mx/src/Makefile b/configs/sure-pic32mx/src/Makefile
index c5d918c3886..30bb00d0a0c 100644
--- a/configs/sure-pic32mx/src/Makefile
+++ b/configs/sure-pic32mx/src/Makefile
@@ -63,7 +63,7 @@ CSRCS += pic32mx_lcd1602.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += pic32mx_nsh.c
+CSRCS += pic32mx_appinit.c
 endif
 
 include $(TOPDIR)/configs/Board.mk
diff --git a/configs/sure-pic32mx/src/pic32mx_nsh.c b/configs/sure-pic32mx/src/pic32mx_appinit.c
similarity index 99%
rename from configs/sure-pic32mx/src/pic32mx_nsh.c
rename to configs/sure-pic32mx/src/pic32mx_appinit.c
index a59d09d05b1..cb7c3086a64 100644
--- a/configs/sure-pic32mx/src/pic32mx_nsh.c
+++ b/configs/sure-pic32mx/src/pic32mx_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/sure-pic32mx/src/pic32mx_nsh.c
+ * config/sure-pic32mx/src/pic32mx_appinit.c
  *
  *   Copyright (C) 2011-2013, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/teensy-3.x/src/Makefile b/configs/teensy-3.x/src/Makefile
index 33232755f8a..e58254757a6 100644
--- a/configs/teensy-3.x/src/Makefile
+++ b/configs/teensy-3.x/src/Makefile
@@ -45,7 +45,7 @@ CSRCS += k20_userleds.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += k20_nsh.c
+CSRCS += k20_appinit.c
 endif
 
 include $(TOPDIR)/configs/Board.mk
diff --git a/configs/teensy-3.x/src/k20_nsh.c b/configs/teensy-3.x/src/k20_appinit.c
similarity index 98%
rename from configs/teensy-3.x/src/k20_nsh.c
rename to configs/teensy-3.x/src/k20_appinit.c
index 4199f45b9b9..d5cf13fe619 100644
--- a/configs/teensy-3.x/src/k20_nsh.c
+++ b/configs/teensy-3.x/src/k20_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/teensy-3.x/src/k20_nsh.c
+ * config/teensy-3.x/src/k20_appinit.c
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/tm4c123g-launchpad/src/Makefile b/configs/tm4c123g-launchpad/src/Makefile
index a3bc4f9acfa..663467d25a3 100644
--- a/configs/tm4c123g-launchpad/src/Makefile
+++ b/configs/tm4c123g-launchpad/src/Makefile
@@ -43,7 +43,7 @@ CSRCS += tm4c_autoleds.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += tm4c_nsh.c
+CSRCS += tm4c_appinit.c
 endif
 
 ifeq ($(CONFIG_TIVA_TIMER),y)
diff --git a/configs/tm4c123g-launchpad/src/tm4c_nsh.c b/configs/tm4c123g-launchpad/src/tm4c_appinit.c
similarity index 98%
rename from configs/tm4c123g-launchpad/src/tm4c_nsh.c
rename to configs/tm4c123g-launchpad/src/tm4c_appinit.c
index e101b31cc77..0763742bf1a 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_nsh.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/tm4c123g-launchpad/src/tm4c_nsh.c
+ * config/tm4c123g-launchpad/src/tm4c_appinit.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/twr-k60n512/src/Makefile b/configs/twr-k60n512/src/Makefile
index 026834b66a9..a01825d472a 100644
--- a/configs/twr-k60n512/src/Makefile
+++ b/configs/twr-k60n512/src/Makefile
@@ -47,7 +47,7 @@ CSRCS += k60_buttons.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += k60_nsh.c
+CSRCS += k60_appinit.c
 endif
 
 ifeq ($(CONFIG_USBDEV),y)
diff --git a/configs/twr-k60n512/src/k60_nsh.c b/configs/twr-k60n512/src/k60_appinit.c
similarity index 99%
rename from configs/twr-k60n512/src/k60_nsh.c
rename to configs/twr-k60n512/src/k60_appinit.c
index 7cc44c9a805..6c6795c2ad8 100644
--- a/configs/twr-k60n512/src/k60_nsh.c
+++ b/configs/twr-k60n512/src/k60_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/twr-k60n512/src/k60_nsh.c
+ * config/twr-k60n512/src/k60_appinit.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/twr-k60n512/src/k60_usbmsc.c b/configs/twr-k60n512/src/k60_usbmsc.c
index 9a934581afc..1b658a6d083 100644
--- a/configs/twr-k60n512/src/k60_usbmsc.c
+++ b/configs/twr-k60n512/src/k60_usbmsc.c
@@ -85,7 +85,7 @@
 int usbmsc_archinitialize(void)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
-   * already have been initialized in board_app_initialize() (see k60_nsh.c).
+   * already have been initialized in board_app_initialize() (see k60_appinit.c).
    * In this case, there is nothing further to be done here.
    */
 
diff --git a/configs/u-blox-c027/src/Makefile b/configs/u-blox-c027/src/Makefile
index 3b18848d80e..844046486e3 100644
--- a/configs/u-blox-c027/src/Makefile
+++ b/configs/u-blox-c027/src/Makefile
@@ -39,7 +39,7 @@ ASRCS =
 CSRCS = lpc17_boot.c lpc17_leds.c lpc17_ssp.c lpc17_adc.c lpc17_dac.c lpc17_pwm.c
 
 ifeq ($(CONFIG_LIB_BOARDCTL),y)
-CSRCS += lpc17_nsh.c
+CSRCS += lpc17_appinit.c
 endif
 
 ifeq ($(CONFIG_MODEM_U_BLOX),y)
diff --git a/configs/u-blox-c027/src/lpc17_nsh.c b/configs/u-blox-c027/src/lpc17_appinit.c
similarity index 99%
rename from configs/u-blox-c027/src/lpc17_nsh.c
rename to configs/u-blox-c027/src/lpc17_appinit.c
index 3aef3be821b..1b534e8c9c3 100644
--- a/configs/u-blox-c027/src/lpc17_nsh.c
+++ b/configs/u-blox-c027/src/lpc17_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/u-blox-c027/src/lpc17_nsh.c
+ * config/u-blox-c027/src/lpc17_appinit.c
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/ubw32/src/Makefile b/configs/ubw32/src/Makefile
index b3cd1971b15..e0e0cc29e20 100644
--- a/configs/ubw32/src/Makefile
+++ b/configs/ubw32/src/Makefile
@@ -43,7 +43,7 @@ CSRCS += pic32_buttons.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += pic32_nsh.c
+CSRCS += pic32_appinit.c
 endif
 
 ifeq ($(CONFIG_PIC32MX_USBDEV),y)
diff --git a/configs/ubw32/src/pic32_nsh.c b/configs/ubw32/src/pic32_appinit.c
similarity index 99%
rename from configs/ubw32/src/pic32_nsh.c
rename to configs/ubw32/src/pic32_appinit.c
index 2fb67821485..612e3aa70f9 100644
--- a/configs/ubw32/src/pic32_nsh.c
+++ b/configs/ubw32/src/pic32_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/ubw32/src/pic32_nsh.c
+ * config/ubw32/src/pic32_appinit.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/viewtool-stm32f107/src/Makefile b/configs/viewtool-stm32f107/src/Makefile
index 964811b1dd9..7897b9ea2f7 100644
--- a/configs/viewtool-stm32f107/src/Makefile
+++ b/configs/viewtool-stm32f107/src/Makefile
@@ -67,7 +67,7 @@ CSRCS += stm32_ssd1289.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += stm32_nsh.c
+CSRCS += stm32_appinit.c
 endif
 
 ifeq ($(CONFIG_USBMSC),y)
diff --git a/configs/viewtool-stm32f107/src/stm32_nsh.c b/configs/viewtool-stm32f107/src/stm32_appinit.c
similarity index 98%
rename from configs/viewtool-stm32f107/src/stm32_nsh.c
rename to configs/viewtool-stm32f107/src/stm32_appinit.c
index 58ae04622c4..1ef129a8ebe 100644
--- a/configs/viewtool-stm32f107/src/stm32_nsh.c
+++ b/configs/viewtool-stm32f107/src/stm32_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/viewtool-stm32f107/src/stm32_nsh.c
+ * config/viewtool-stm32f107/src/stm32_appinit.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/viewtool-stm32f107/src/stm32_usbmsc.c b/configs/viewtool-stm32f107/src/stm32_usbmsc.c
index 199a1126293..370c4bd3c5d 100644
--- a/configs/viewtool-stm32f107/src/stm32_usbmsc.c
+++ b/configs/viewtool-stm32f107/src/stm32_usbmsc.c
@@ -72,7 +72,7 @@
 int usbmsc_archinitialize(void)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
-   * already have been initialized in board_app_initialize() (see stm32_nsh.c).
+   * already have been initialized in board_app_initialize() (see stm32_appinit.c).
    * In this case, there is nothing further to be done here.
    */
 
diff --git a/configs/zkit-arm-1769/src/Makefile b/configs/zkit-arm-1769/src/Makefile
index 3477cac14c7..f6f3d7354d5 100644
--- a/configs/zkit-arm-1769/src/Makefile
+++ b/configs/zkit-arm-1769/src/Makefile
@@ -44,7 +44,7 @@ ASRCS =
 CSRCS = lpc17_boot.c lpc17_leds.c lpc17_ssp.c lpc17_buttons.c lpc17_lcd.c
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += lpc17_nsh.c
+CSRCS += lpc17_appinit.c
 endif
 
 ifeq ($(CONFIG_USBMSC),y)
diff --git a/configs/zkit-arm-1769/src/lpc17_nsh.c b/configs/zkit-arm-1769/src/lpc17_appinit.c
similarity index 98%
rename from configs/zkit-arm-1769/src/lpc17_nsh.c
rename to configs/zkit-arm-1769/src/lpc17_appinit.c
index 3ba78f485ef..585d986b41d 100644
--- a/configs/zkit-arm-1769/src/lpc17_nsh.c
+++ b/configs/zkit-arm-1769/src/lpc17_appinit.c
@@ -1,10 +1,10 @@
 /****************************************************************************
- * config/zkit-arm-1769/src/lpc17_nsh.c
+ * config/zkit-arm-1769/src/lpc17_appinit.c
  *
  *   Copyright (C) 2013 Zilogic Systems. All rights reserved.
  *   Author: BabuSubashChandar <code@zilogic.com>
  *
- * Based on config/lpcxpresso-lpc1768/src/lpc17_nsh.c
+ * Based on config/lpcxpresso-lpc1768/src/lpc17_appinit.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>