diff --git a/ChangeLog b/ChangeLog
index 67d50634b29..5807df015f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5629,4 +5629,5 @@
 	  and STM32 Kconfigs into the common network driver Kconfig (2013-9-25).
 	* arch/arm/src/sam_emac.c:  EMAC driver is basically functional.  More
 	  testing is needed (as always) (2013-9-25).
-
+	* configs:  Changes to many defconfig files resulting from moving
+	  apps/examples/usbmsc to apps/system/usbmsc (2013-9-25).
diff --git a/Documentation/README.html b/Documentation/README.html
index 748c5162203..759e7181662 100644
--- a/Documentation/README.html
+++ b/Documentation/README.html
@@ -265,6 +265,7 @@
  |   `- system/
  |       |- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/apps/system/i2c/README.txt"><b><i>i2c/README.txt</i></b></a>
  |       |- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/apps/system/install/README.txt">install/README.txt</a>
+ |       |- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/apps/system/usbmsc/README.txt">usbmsc/README.txt</a>
  |       `- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/apps/system/zmodem/README.txt">zmodem/README.txt</a>
  `- NxWidgets
      |- Doxygen
diff --git a/README.txt b/README.txt
index 76d2b9b1906..0d681179c6d 100644
--- a/README.txt
+++ b/README.txt
@@ -191,7 +191,7 @@ Notes about Header Files
     header file then you should also define CONFIG_ARCH_MATH_H=y in your
     NuttX Configuration file.  If CONFIG_ARCH_MATH_H is selected, then the
     top-level Makefile will copy the stub math.h header file from
-    include/nuttx/matn.h to include/math.h where it will become the system
+    include/nuttx/math.h to include/math.h where it will become the system
     math.h header file.  The stub math.h header file does nothing other
     than to include that archicture-specific math.h header file as the
     system math.h header file.
@@ -1200,6 +1200,8 @@ apps
  |   |  `- README.txt
  |   |- install
  |   |  `- README.txt
+ |   |- usbmsc
+ |   |  `- README.txt
  |   `- zmodem
  |      `- README.txt
  `- README.txt
diff --git a/configs/amber/hello/defconfig b/configs/amber/hello/defconfig
index 2092d160f76..734ee564f6c 100644
--- a/configs/amber/hello/defconfig
+++ b/configs/amber/hello/defconfig
@@ -398,16 +398,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information
diff --git a/configs/arduino-due/nsh/defconfig b/configs/arduino-due/nsh/defconfig
index e3f68950fed..7707fefdc33 100644
--- a/configs/arduino-due/nsh/defconfig
+++ b/configs/arduino-due/nsh/defconfig
@@ -530,7 +530,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/arduino-due/ostest/defconfig b/configs/arduino-due/ostest/defconfig
index c9fc0c54b97..b77e2bdef23 100644
--- a/configs/arduino-due/ostest/defconfig
+++ b/configs/arduino-due/ostest/defconfig
@@ -521,7 +521,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/cloudctrl/nsh/defconfig b/configs/cloudctrl/nsh/defconfig
index 585f3accab9..81b97f617e7 100644
--- a/configs/cloudctrl/nsh/defconfig
+++ b/configs/cloudctrl/nsh/defconfig
@@ -556,7 +556,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/cloudctrl/src/up_usbmsc.c b/configs/cloudctrl/src/up_usbmsc.c
index 454cfccf565..57888986b9b 100644
--- a/configs/cloudctrl/src/up_usbmsc.c
+++ b/configs/cloudctrl/src/up_usbmsc.c
@@ -53,8 +53,8 @@
  ****************************************************************************/
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
+#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
+#  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
 #endif
 
 /* Debug ********************************************************************/
@@ -91,13 +91,13 @@
 
 int usbmsc_archinitialize(void)
 {
-  /* If examples/usbmsc is built as an NSH command, then SD slot should
+  /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initized in nsh_archinitialize() (see up_nsh.c).  In
    * this case, there is nothing further to be done here.
    */
 
 #ifndef CONFIG_NSH_BUILTIN_APPS
-  return stm32_sdinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1);
+  return stm32_sdinitialize(CONFIG_SYSTEM_USBMSC_DEVMINOR1);
 #else
   return OK;
 #endif
diff --git a/configs/ea3131/README.txt b/configs/ea3131/README.txt
index c5d7436a425..40cafa402f9 100644
--- a/configs/ea3131/README.txt
+++ b/configs/ea3131/README.txt
@@ -648,6 +648,6 @@ Where <subdir> is one of the following:
 
   usbmsc:
     This configuration directory exercises the USB mass storage
-    class driver at examples/usbmsc.  See examples/README.txt for
+    class driver at system/usbmsc.  See examples/README.txt for
     more information.
 
diff --git a/configs/ea3131/src/up_usbmsc.c b/configs/ea3131/src/up_usbmsc.c
index b91bc359816..80f8eee9bbd 100644
--- a/configs/ea3131/src/up_usbmsc.c
+++ b/configs/ea3131/src/up_usbmsc.c
@@ -57,15 +57,15 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
+#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
+#  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
 #endif
 
-#ifndef CONFIG_EXAMPLES_USBMSC_DEVPATH1
-#  define CONFIG_EXAMPLES_USBMSC_DEVPATH1  "/dev/ram"
+#ifndef CONFIG_SYSTEM_USBMSC_DEVPATH1
+#  define CONFIG_SYSTEM_USBMSC_DEVPATH1  "/dev/ram"
 #endif
 
-static const char g_source[] = CONFIG_EXAMPLES_USBMSC_DEVPATH1;
+static const char g_source[] = CONFIG_SYSTEM_USBMSC_DEVPATH1;
 static struct fat_format_s g_fmt = FAT_FORMAT_INITIALIZER;
 
 #define USBMSC_NSECTORS        64
@@ -99,7 +99,7 @@ int usbmsc_archinitialize(void)
 
   /* Register a RAMDISK device to manage this RAM image */
   
-  ret = ramdisk_register(CONFIG_EXAMPLES_USBMSC_DEVMINOR1,
+  ret = ramdisk_register(CONFIG_SYSTEM_USBMSC_DEVMINOR1,
                          pbuffer,
                          USBMSC_NSECTORS,
                          USBMSC_SECTORSIZE,
diff --git a/configs/ea3131/usbmsc/appconfig b/configs/ea3131/usbmsc/appconfig
index 985ad9e4715..b5284670cc5 100644
--- a/configs/ea3131/usbmsc/appconfig
+++ b/configs/ea3131/usbmsc/appconfig
@@ -35,5 +35,5 @@
 
 # Path to example in apps/examples containing the user_start entry point
 
-CONFIGURED_APPS += examples/usbmsc
+CONFIGURED_APPS += system/usbmsc
 
diff --git a/configs/ea3131/usbmsc/defconfig b/configs/ea3131/usbmsc/defconfig
index 243d26449bc..ea9826652e8 100644
--- a/configs/ea3131/usbmsc/defconfig
+++ b/configs/ea3131/usbmsc/defconfig
@@ -397,16 +397,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/ram0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/ram0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information
diff --git a/configs/ea3131/usbserial/defconfig b/configs/ea3131/usbserial/defconfig
index 8295b3dc81b..8f50fa5fa48 100644
--- a/configs/ea3131/usbserial/defconfig
+++ b/configs/ea3131/usbserial/defconfig
@@ -396,16 +396,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/ram0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/ram0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information
diff --git a/configs/ea3152/src/up_usbmsc.c b/configs/ea3152/src/up_usbmsc.c
index 311ecb7418e..66fb1169426 100644
--- a/configs/ea3152/src/up_usbmsc.c
+++ b/configs/ea3152/src/up_usbmsc.c
@@ -57,15 +57,15 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
+#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
+#  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
 #endif
 
-#ifndef CONFIG_EXAMPLES_USBMSC_DEVPATH1
-#  define CONFIG_EXAMPLES_USBMSC_DEVPATH1  "/dev/ram"
+#ifndef CONFIG_SYSTEM_USBMSC_DEVPATH1
+#  define CONFIG_SYSTEM_USBMSC_DEVPATH1  "/dev/ram"
 #endif
 
-static const char g_source[] = CONFIG_EXAMPLES_USBMSC_DEVPATH1;
+static const char g_source[] = CONFIG_SYSTEM_USBMSC_DEVPATH1;
 static struct fat_format_s g_fmt = FAT_FORMAT_INITIALIZER;
 
 #define USBMSC_NSECTORS        64
@@ -99,7 +99,7 @@ int usbmsc_archinitialize(void)
 
   /* Register a RAMDISK device to manage this RAM image */
   
-  ret = ramdisk_register(CONFIG_EXAMPLES_USBMSC_DEVMINOR1,
+  ret = ramdisk_register(CONFIG_SYSTEM_USBMSC_DEVMINOR1,
                          pbuffer,
                          USBMSC_NSECTORS,
                          USBMSC_SECTORSIZE,
diff --git a/configs/ekk-lm3s9b96/nsh/defconfig b/configs/ekk-lm3s9b96/nsh/defconfig
index 54e88333832..85e605ea22b 100644
--- a/configs/ekk-lm3s9b96/nsh/defconfig
+++ b/configs/ekk-lm3s9b96/nsh/defconfig
@@ -515,7 +515,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WGET is not set
diff --git a/configs/ekk-lm3s9b96/ostest/defconfig b/configs/ekk-lm3s9b96/ostest/defconfig
index 4ac8b479802..dd16055bc24 100644
--- a/configs/ekk-lm3s9b96/ostest/defconfig
+++ b/configs/ekk-lm3s9b96/ostest/defconfig
@@ -450,7 +450,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig
index 1bdd83568cb..fff3f1f9eeb 100644
--- a/configs/ez80f910200kitg/ostest/defconfig
+++ b/configs/ez80f910200kitg/ostest/defconfig
@@ -388,7 +388,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/ez80f910200zco/ostest/defconfig b/configs/ez80f910200zco/ostest/defconfig
index 812912a82ef..83cfeebf965 100644
--- a/configs/ez80f910200zco/ostest/defconfig
+++ b/configs/ez80f910200zco/ostest/defconfig
@@ -396,7 +396,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/fire-stm32v2/nsh/defconfig b/configs/fire-stm32v2/nsh/defconfig
index 0d0f50d10e7..c702ab026e0 100644
--- a/configs/fire-stm32v2/nsh/defconfig
+++ b/configs/fire-stm32v2/nsh/defconfig
@@ -772,20 +772,20 @@ CONFIG_EXAMPLES_NSH=y
 #
 # USB Mass Storage Class Example
 #
-CONFIG_EXAMPLES_USBMSC=y
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_DEVMINOR2=1
-CONFIG_EXAMPLES_USBMSC_DEVPATH2="/dev/mmcsd1"
-CONFIG_EXAMPLES_USBMSC_DEVMINOR3=2
-CONFIG_EXAMPLES_USBMSC_DEVPATH3="/dev/mmcsd2"
-# CONFIG_EXAMPLES_USBMSC_DEBUGMM is not set
-# CONFIG_EXAMPLES_USBMSC_TRACEINIT is not set
-# CONFIG_EXAMPLES_USBMSC_TRACECLASS is not set
-# CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS is not set
-# CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER is not set
-# CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS is not set
+CONFIG_SYSTEM_USBMSC=y
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_DEVMINOR2=1
+CONFIG_SYSTEM_USBMSC_DEVPATH2="/dev/mmcsd1"
+CONFIG_SYSTEM_USBMSC_DEVMINOR3=2
+CONFIG_SYSTEM_USBMSC_DEVPATH3="/dev/mmcsd2"
+# CONFIG_SYSTEM_USBMSC_DEBUGMM is not set
+# CONFIG_SYSTEM_USBMSC_TRACEINIT is not set
+# CONFIG_SYSTEM_USBMSC_TRACECLASS is not set
+# CONFIG_SYSTEM_USBMSC_TRACETRANSFERS is not set
+# CONFIG_SYSTEM_USBMSC_TRACECONTROLLER is not set
+# CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS is not set
 
 #
 # USB Serial Terminal Example
diff --git a/configs/fire-stm32v2/src/up_usbmsc.c b/configs/fire-stm32v2/src/up_usbmsc.c
index 3a1ebe0e088..41f966e9db1 100644
--- a/configs/fire-stm32v2/src/up_usbmsc.c
+++ b/configs/fire-stm32v2/src/up_usbmsc.c
@@ -52,8 +52,8 @@
  ****************************************************************************/
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
+#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
+#  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
 #endif
 
 /* Debug ********************************************************************/
@@ -90,13 +90,13 @@
 
 int usbmsc_archinitialize(void)
 {
-  /* If examples/usbmsc is built as an NSH command, then SD slot should
+  /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initized in nsh_archinitialize() (see up_nsh.c).  In
    * this case, there is nothing further to be done here.
    */
 
 #ifndef CONFIG_NSH_BUILTIN_APPS
-  return stm32_sdinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1);
+  return stm32_sdinitialize(CONFIG_SYSTEM_USBMSC_DEVMINOR1);
 #else
   return OK;
 #endif
diff --git a/configs/freedom-kl25z/nsh/defconfig b/configs/freedom-kl25z/nsh/defconfig
index 3a81553660a..e3347a0a1f3 100644
--- a/configs/freedom-kl25z/nsh/defconfig
+++ b/configs/freedom-kl25z/nsh/defconfig
@@ -487,7 +487,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/freedom-kl25z/ostest/defconfig b/configs/freedom-kl25z/ostest/defconfig
index e4e1bd7b6d0..ff325869ff6 100644
--- a/configs/freedom-kl25z/ostest/defconfig
+++ b/configs/freedom-kl25z/ostest/defconfig
@@ -470,7 +470,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=1
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/hymini-stm32v/README.txt b/configs/hymini-stm32v/README.txt
index e2059b07484..37a9c69fc8b 100644
--- a/configs/hymini-stm32v/README.txt
+++ b/configs/hymini-stm32v/README.txt
@@ -610,7 +610,7 @@ Where <subdir> is one of the following:
     ----------- ----------------------- --------------------------------
     Built-in    None                    apps/examples/nx
     Apps                                apps/examples/nxhello
-                                        apps/examples/usbmsc (4)
+                                        apps/system/usbmsc (4)
                                         apps/examples/buttons
                                         apps/examples/nximage
     =========== ======================= ================================
diff --git a/configs/hymini-stm32v/buttons/defconfig b/configs/hymini-stm32v/buttons/defconfig
index ab5bb0c839c..66d154d3fef 100644
--- a/configs/hymini-stm32v/buttons/defconfig
+++ b/configs/hymini-stm32v/buttons/defconfig
@@ -543,7 +543,7 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/hymini-stm32v/nsh/defconfig b/configs/hymini-stm32v/nsh/defconfig
index ee0272c012a..d5704e16714 100755
--- a/configs/hymini-stm32v/nsh/defconfig
+++ b/configs/hymini-stm32v/nsh/defconfig
@@ -553,7 +553,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig
index 2b58eed3505..067169b269e 100644
--- a/configs/hymini-stm32v/nsh2/defconfig
+++ b/configs/hymini-stm32v/nsh2/defconfig
@@ -723,20 +723,20 @@ CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-CONFIG_EXAMPLES_USBMSC=y
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_DEVMINOR2=1
-CONFIG_EXAMPLES_USBMSC_DEVPATH2="/dev/mmcsd1"
-CONFIG_EXAMPLES_USBMSC_DEVMINOR3=2
-CONFIG_EXAMPLES_USBMSC_DEVPATH3="/dev/mmcsd2"
-# CONFIG_EXAMPLES_USBMSC_DEBUGMM is not set
-# CONFIG_EXAMPLES_USBMSC_TRACEINIT is not set
-# CONFIG_EXAMPLES_USBMSC_TRACECLASS is not set
-# CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS is not set
-# CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER is not set
-# CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS is not set
+CONFIG_SYSTEM_USBMSC=y
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_DEVMINOR2=1
+CONFIG_SYSTEM_USBMSC_DEVPATH2="/dev/mmcsd1"
+CONFIG_SYSTEM_USBMSC_DEVMINOR3=2
+CONFIG_SYSTEM_USBMSC_DEVPATH3="/dev/mmcsd2"
+# CONFIG_SYSTEM_USBMSC_DEBUGMM is not set
+# CONFIG_SYSTEM_USBMSC_TRACEINIT is not set
+# CONFIG_SYSTEM_USBMSC_TRACECLASS is not set
+# CONFIG_SYSTEM_USBMSC_TRACETRANSFERS is not set
+# CONFIG_SYSTEM_USBMSC_TRACECONTROLLER is not set
+# CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/hymini-stm32v/ostest/defconfig b/configs/hymini-stm32v/ostest/defconfig
index b270796c23f..f29463a90ac 100644
--- a/configs/hymini-stm32v/ostest/defconfig
+++ b/configs/hymini-stm32v/ostest/defconfig
@@ -537,7 +537,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/hymini-stm32v/src/up_usbmsc.c b/configs/hymini-stm32v/src/up_usbmsc.c
index e7fc419079f..105aed5b54d 100644
--- a/configs/hymini-stm32v/src/up_usbmsc.c
+++ b/configs/hymini-stm32v/src/up_usbmsc.c
@@ -60,8 +60,8 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
+#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
+#  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
 #endif
 
 /* SLOT number(s) could depend on the board configuration */
@@ -109,7 +109,7 @@
 
 int usbmsc_archinitialize(void)
 {
-  /* If examples/usbmsc is built as an NSH command, then SD slot should
+  /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initialized in nsh_archinitialize() (see up_nsh.c).  In
    * this case, there is nothing further to be done here.
    */
@@ -136,9 +136,9 @@ int usbmsc_archinitialize(void)
 
   message("usbmsc_archinitialize: "
           "Bind SDIO to the MMC/SD driver, minor=%d\n",
-          CONFIG_EXAMPLES_USBMSC_DEVMINOR1);
+          CONFIG_SYSTEM_USBMSC_DEVMINOR1);
 
-  ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1, sdio);
+  ret = mmcsd_slotinitialize(CONFIG_SYSTEM_USBMSC_DEVMINOR1, sdio);
   if (ret != OK)
     {
       message("usbmsc_archinitialize: "
diff --git a/configs/hymini-stm32v/usbmsc/appconfig b/configs/hymini-stm32v/usbmsc/appconfig
index e0143e96959..e9743554613 100644
--- a/configs/hymini-stm32v/usbmsc/appconfig
+++ b/configs/hymini-stm32v/usbmsc/appconfig
@@ -35,5 +35,5 @@
 
 # Path to example in apps/examples containing the user_start entry point
 
-CONFIGURED_APPS += examples/usbmsc
+CONFIGURED_APPS += system/usbmsc
 
diff --git a/configs/hymini-stm32v/usbmsc/defconfig b/configs/hymini-stm32v/usbmsc/defconfig
index be2aed65795..2a1aa3ae69c 100755
--- a/configs/hymini-stm32v/usbmsc/defconfig
+++ b/configs/hymini-stm32v/usbmsc/defconfig
@@ -462,17 +462,17 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_DEBUGMM=n
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_DEBUGMM=n
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/watchdog
diff --git a/configs/hymini-stm32v/usbnsh/defconfig b/configs/hymini-stm32v/usbnsh/defconfig
index f2b74f3dd01..433605d665a 100644
--- a/configs/hymini-stm32v/usbnsh/defconfig
+++ b/configs/hymini-stm32v/usbnsh/defconfig
@@ -586,7 +586,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/kwikstik-k40/ostest/defconfig b/configs/kwikstik-k40/ostest/defconfig
index fa5663bc16d..0b1e1fed8b7 100755
--- a/configs/kwikstik-k40/ostest/defconfig
+++ b/configs/kwikstik-k40/ostest/defconfig
@@ -484,7 +484,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/kwikstik-k40/src/up_usbmsc.c b/configs/kwikstik-k40/src/up_usbmsc.c
index bbdbbba9436..53bdbb4020d 100644
--- a/configs/kwikstik-k40/src/up_usbmsc.c
+++ b/configs/kwikstik-k40/src/up_usbmsc.c
@@ -56,8 +56,8 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
+#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
+#  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
 #endif
 
 /* SLOT number(s) could depend on the board configuration */
@@ -105,7 +105,7 @@
 
 int usbmsc_archinitialize(void)
 {
-  /* If examples/usbmsc is built as an NSH command, then SD slot should
+  /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initized in nsh_archinitialize() (see up_nsh.c).  In
    * this case, there is nothing further to be done here.
    */
diff --git a/configs/lincoln60/ostest/defconfig b/configs/lincoln60/ostest/defconfig
index 43e4fe6f863..fbd5c0bdfb1 100644
--- a/configs/lincoln60/ostest/defconfig
+++ b/configs/lincoln60/ostest/defconfig
@@ -465,16 +465,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information
diff --git a/configs/lm3s6965-ek/discover/defconfig b/configs/lm3s6965-ek/discover/defconfig
index 7fe3518c088..b1813fc3ad8 100644
--- a/configs/lm3s6965-ek/discover/defconfig
+++ b/configs/lm3s6965-ek/discover/defconfig
@@ -490,7 +490,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WGET is not set
diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig
index 7fe3518c088..b1813fc3ad8 100755
--- a/configs/lm3s6965-ek/nsh/defconfig
+++ b/configs/lm3s6965-ek/nsh/defconfig
@@ -490,7 +490,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WGET is not set
diff --git a/configs/lm3s6965-ek/nx/defconfig b/configs/lm3s6965-ek/nx/defconfig
index cd804e861c5..c4f3819d2be 100755
--- a/configs/lm3s6965-ek/nx/defconfig
+++ b/configs/lm3s6965-ek/nx/defconfig
@@ -508,7 +508,7 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/lm3s6965-ek/ostest/defconfig b/configs/lm3s6965-ek/ostest/defconfig
index 3a08679f9ce..090547d3073 100755
--- a/configs/lm3s6965-ek/ostest/defconfig
+++ b/configs/lm3s6965-ek/ostest/defconfig
@@ -433,7 +433,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/lm3s6965-ek/tcpecho/defconfig b/configs/lm3s6965-ek/tcpecho/defconfig
index e45f4748e8a..87fc3f38968 100644
--- a/configs/lm3s6965-ek/tcpecho/defconfig
+++ b/configs/lm3s6965-ek/tcpecho/defconfig
@@ -537,7 +537,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 CONFIG_EXAMPLES_TCPECHO=y
 CONFIG_EXAMPLES_TCPECHO_PORT=80
diff --git a/configs/lm4f120-launchpad/nsh/defconfig b/configs/lm4f120-launchpad/nsh/defconfig
index 953802df40d..187e4683f68 100755
--- a/configs/lm4f120-launchpad/nsh/defconfig
+++ b/configs/lm4f120-launchpad/nsh/defconfig
@@ -456,7 +456,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/lm4f120-launchpad/ostest/defconfig b/configs/lm4f120-launchpad/ostest/defconfig
index 2ab53f2e313..94e4e7ab108 100755
--- a/configs/lm4f120-launchpad/ostest/defconfig
+++ b/configs/lm4f120-launchpad/ostest/defconfig
@@ -453,7 +453,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/lpcxpresso-lpc1768/README.txt b/configs/lpcxpresso-lpc1768/README.txt
index 9e4c224cb2a..0dbabcc1cbf 100644
--- a/configs/lpcxpresso-lpc1768/README.txt
+++ b/configs/lpcxpresso-lpc1768/README.txt
@@ -802,7 +802,7 @@ Where <subdir> is one of the following:
 
   usbmsc:
     This configuration directory exercises the USB mass storage
-    class driver at apps/examples/usbmsc.  See apps/examples/README.txt
+    class driver at apps/system/usbmsc.  See apps/examples/README.txt
     for more information.
 
     NOTE: At present, the value for the SD SPI frequency is too
diff --git a/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/configs/lpcxpresso-lpc1768/dhcpd/defconfig
index 4a42bf0d600..400f5d0b952 100755
--- a/configs/lpcxpresso-lpc1768/dhcpd/defconfig
+++ b/configs/lpcxpresso-lpc1768/dhcpd/defconfig
@@ -463,16 +463,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information
diff --git a/configs/lpcxpresso-lpc1768/nsh/defconfig b/configs/lpcxpresso-lpc1768/nsh/defconfig
index f4790c43527..dcf7200c4ef 100755
--- a/configs/lpcxpresso-lpc1768/nsh/defconfig
+++ b/configs/lpcxpresso-lpc1768/nsh/defconfig
@@ -473,16 +473,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information
diff --git a/configs/lpcxpresso-lpc1768/nx/defconfig b/configs/lpcxpresso-lpc1768/nx/defconfig
index f7fc9b6c82a..ed7d045f8a4 100755
--- a/configs/lpcxpresso-lpc1768/nx/defconfig
+++ b/configs/lpcxpresso-lpc1768/nx/defconfig
@@ -506,16 +506,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/nx
diff --git a/configs/lpcxpresso-lpc1768/ostest/defconfig b/configs/lpcxpresso-lpc1768/ostest/defconfig
index 4300982bcf2..934dafe4c64 100755
--- a/configs/lpcxpresso-lpc1768/ostest/defconfig
+++ b/configs/lpcxpresso-lpc1768/ostest/defconfig
@@ -451,16 +451,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information
diff --git a/configs/lpcxpresso-lpc1768/src/up_usbmsc.c b/configs/lpcxpresso-lpc1768/src/up_usbmsc.c
index 8266952a27d..291f244d912 100644
--- a/configs/lpcxpresso-lpc1768/src/up_usbmsc.c
+++ b/configs/lpcxpresso-lpc1768/src/up_usbmsc.c
@@ -54,8 +54,8 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
+#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
+#  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
 #endif
 
 /* PORT and SLOT number probably depend on the board configuration */
@@ -129,7 +129,7 @@ int usbmsc_archinitialize(void)
   message("usbmsc_archinitialize: Binding SPI port %d to MMC/SD slot %d\n",
           LPC17XX_MMCSDSPIPORTNO, LPC17XX_MMCSDSLOTNO);
 
-  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1, LPC17XX_MMCSDSLOTNO, spi);
+  ret = mmcsd_spislotinitialize(CONFIG_SYSTEM_USBMSC_DEVMINOR1, LPC17XX_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
       message("usbmsc_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
diff --git a/configs/lpcxpresso-lpc1768/thttpd/defconfig b/configs/lpcxpresso-lpc1768/thttpd/defconfig
index b4fde8c1555..608421ca183 100755
--- a/configs/lpcxpresso-lpc1768/thttpd/defconfig
+++ b/configs/lpcxpresso-lpc1768/thttpd/defconfig
@@ -490,16 +490,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information
diff --git a/configs/lpcxpresso-lpc1768/usbmsc/appconfig b/configs/lpcxpresso-lpc1768/usbmsc/appconfig
index df394f27dcc..db4fda850b3 100644
--- a/configs/lpcxpresso-lpc1768/usbmsc/appconfig
+++ b/configs/lpcxpresso-lpc1768/usbmsc/appconfig
@@ -35,5 +35,5 @@
 
 # Path to example in apps/examples containing the user_start entry point
 
-CONFIGURED_APPS += examples/usbmsc
+CONFIGURED_APPS += system/usbmsc
 
diff --git a/configs/lpcxpresso-lpc1768/usbmsc/defconfig b/configs/lpcxpresso-lpc1768/usbmsc/defconfig
index 0f8656e7ad1..460b23b7914 100755
--- a/configs/lpcxpresso-lpc1768/usbmsc/defconfig
+++ b/configs/lpcxpresso-lpc1768/usbmsc/defconfig
@@ -447,16 +447,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information
diff --git a/configs/maple/nsh/defconfig b/configs/maple/nsh/defconfig
index 7d32bd5beac..6afab7da4e5 100644
--- a/configs/maple/nsh/defconfig
+++ b/configs/maple/nsh/defconfig
@@ -626,7 +626,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/maple/usbnsh/defconfig b/configs/maple/usbnsh/defconfig
index 406a73d2a1b..733d397ee73 100644
--- a/configs/maple/usbnsh/defconfig
+++ b/configs/maple/usbnsh/defconfig
@@ -647,7 +647,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/mcu123-lpc214x/README.txt b/configs/mcu123-lpc214x/README.txt
index e9e6c3710e3..bf25c21e21a 100644
--- a/configs/mcu123-lpc214x/README.txt
+++ b/configs/mcu123-lpc214x/README.txt
@@ -392,7 +392,7 @@ usbmsc:
 -------
 
   This configuration directory exercises the USB mass storage
-  class driver at examples/usbmsc.  See examples/README.txt for
+  class driver at system/usbmsc.  See examples/README.txt for
   more information.
 
   Default toolchain:  Buildroot
diff --git a/configs/mcu123-lpc214x/composite/defconfig b/configs/mcu123-lpc214x/composite/defconfig
index 912214a245a..3bffaa96652 100644
--- a/configs/mcu123-lpc214x/composite/defconfig
+++ b/configs/mcu123-lpc214x/composite/defconfig
@@ -383,16 +383,16 @@ CONFIG_EXAMPLES_USBSERIAL_ONLYSMALL=n
 CONFIG_EXAMPLES_USBSERIAL_ONLYBIG=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=y
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=y
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=y
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=y
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=y
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=y
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/composite
diff --git a/configs/mcu123-lpc214x/nsh/defconfig b/configs/mcu123-lpc214x/nsh/defconfig
index c97f2f3b234..97c94d6f118 100644
--- a/configs/mcu123-lpc214x/nsh/defconfig
+++ b/configs/mcu123-lpc214x/nsh/defconfig
@@ -446,7 +446,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/mcu123-lpc214x/src/up_usbmsc.c b/configs/mcu123-lpc214x/src/up_usbmsc.c
index 38f29bc1e4e..5f9a4e509f6 100644
--- a/configs/mcu123-lpc214x/src/up_usbmsc.c
+++ b/configs/mcu123-lpc214x/src/up_usbmsc.c
@@ -54,8 +54,8 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
+#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
+#  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
 #endif
 
 /* PORT and SLOT number probably depend on the board configuration */
@@ -129,7 +129,7 @@ int usbmsc_archinitialize(void)
   message("usbmsc_archinitialize: Binding SPI port %d to MMC/SD slot %d\n",
           LPC214X_MMCSDSPIPORTNO, LPC214X_MMCSDSLOTNO);
 
-  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1, LPC214X_MMCSDSLOTNO, spi);
+  ret = mmcsd_spislotinitialize(CONFIG_SYSTEM_USBMSC_DEVMINOR1, LPC214X_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
       message("usbmsc_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
diff --git a/configs/mcu123-lpc214x/usbmsc/appconfig b/configs/mcu123-lpc214x/usbmsc/appconfig
index 2011b65196e..79867f26b6f 100644
--- a/configs/mcu123-lpc214x/usbmsc/appconfig
+++ b/configs/mcu123-lpc214x/usbmsc/appconfig
@@ -35,5 +35,5 @@
 
 # Path to example in apps/examples containing the user_start entry point
 
-CONFIGURED_APPS += examples/usbmsc
+CONFIGURED_APPS += system/usbmsc
 
diff --git a/configs/mcu123-lpc214x/usbmsc/defconfig b/configs/mcu123-lpc214x/usbmsc/defconfig
index 6a19f399c72..647d932f781 100644
--- a/configs/mcu123-lpc214x/usbmsc/defconfig
+++ b/configs/mcu123-lpc214x/usbmsc/defconfig
@@ -340,16 +340,16 @@ CONFIG_EXAMPLES_USBSERIAL_ONLYSMALL=n
 CONFIG_EXAMPLES_USBSERIAL_ONLYBIG=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=y
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=y
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=y
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=y
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=y
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=y
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information
diff --git a/configs/micropendous3/hello/defconfig b/configs/micropendous3/hello/defconfig
index 50c72ba6c8a..7da8dd76904 100644
--- a/configs/micropendous3/hello/defconfig
+++ b/configs/micropendous3/hello/defconfig
@@ -393,16 +393,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information
diff --git a/configs/mikroe-stm32f4/fulldemo/defconfig b/configs/mikroe-stm32f4/fulldemo/defconfig
index d867dc2b580..d3389e780f3 100644
--- a/configs/mikroe-stm32f4/fulldemo/defconfig
+++ b/configs/mikroe-stm32f4/fulldemo/defconfig
@@ -793,7 +793,7 @@ CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/mikroe-stm32f4/kostest/defconfig b/configs/mikroe-stm32f4/kostest/defconfig
index 4dbae123775..6efe6dc91f4 100644
--- a/configs/mikroe-stm32f4/kostest/defconfig
+++ b/configs/mikroe-stm32f4/kostest/defconfig
@@ -693,7 +693,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/mikroe-stm32f4/nsh/defconfig b/configs/mikroe-stm32f4/nsh/defconfig
index bddbda9aeab..c82c3ea521d 100644
--- a/configs/mikroe-stm32f4/nsh/defconfig
+++ b/configs/mikroe-stm32f4/nsh/defconfig
@@ -620,7 +620,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/mikroe-stm32f4/nx/defconfig b/configs/mikroe-stm32f4/nx/defconfig
index 06bbc63e4bc..683937ce98a 100644
--- a/configs/mikroe-stm32f4/nx/defconfig
+++ b/configs/mikroe-stm32f4/nx/defconfig
@@ -618,7 +618,7 @@ CONFIG_EXAMPLES_NX_BPP=16
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/mikroe-stm32f4/nxlines/defconfig b/configs/mikroe-stm32f4/nxlines/defconfig
index 920ebc05892..e556f5c5d71 100644
--- a/configs/mikroe-stm32f4/nxlines/defconfig
+++ b/configs/mikroe-stm32f4/nxlines/defconfig
@@ -620,7 +620,7 @@ CONFIG_EXAMPLES_NXLINES_BPP=16
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/mikroe-stm32f4/nxtext/defconfig b/configs/mikroe-stm32f4/nxtext/defconfig
index aa38f79fd89..dfef029bb13 100644
--- a/configs/mikroe-stm32f4/nxtext/defconfig
+++ b/configs/mikroe-stm32f4/nxtext/defconfig
@@ -630,7 +630,7 @@ CONFIG_EXAMPLES_NXTEXT_DEFAULT_FONT=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/mikroe-stm32f4/usbnsh/defconfig b/configs/mikroe-stm32f4/usbnsh/defconfig
index f12e4acd82e..90729405ad6 100644
--- a/configs/mikroe-stm32f4/usbnsh/defconfig
+++ b/configs/mikroe-stm32f4/usbnsh/defconfig
@@ -668,7 +668,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/mirtoo/nsh/defconfig b/configs/mirtoo/nsh/defconfig
index 7314c0197e9..831e0854092 100644
--- a/configs/mirtoo/nsh/defconfig
+++ b/configs/mirtoo/nsh/defconfig
@@ -473,16 +473,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information
diff --git a/configs/mirtoo/nxffs/defconfig b/configs/mirtoo/nxffs/defconfig
index acdde84161f..1765354fe55 100644
--- a/configs/mirtoo/nxffs/defconfig
+++ b/configs/mirtoo/nxffs/defconfig
@@ -516,16 +516,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information
diff --git a/configs/mirtoo/ostest/defconfig b/configs/mirtoo/ostest/defconfig
index f68a3437403..be73f160843 100644
--- a/configs/mirtoo/ostest/defconfig
+++ b/configs/mirtoo/ostest/defconfig
@@ -449,16 +449,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information
diff --git a/configs/nucleus2g/README.txt b/configs/nucleus2g/README.txt
index 153d7fa4f7c..f2e9bef51f4 100644
--- a/configs/nucleus2g/README.txt
+++ b/configs/nucleus2g/README.txt
@@ -545,6 +545,6 @@ Where <subdir> is one of the following:
 
   usbmsc:
     This configuration directory exercises the USB mass storage
-    class driver at examples/usbmsc.  See examples/README.txt for
+    class driver at system/usbmsc.  See examples/README.txt for
     more information.
 
diff --git a/configs/nucleus2g/src/up_usbmsc.c b/configs/nucleus2g/src/up_usbmsc.c
index 3031106a066..ca8f6f7b733 100644
--- a/configs/nucleus2g/src/up_usbmsc.c
+++ b/configs/nucleus2g/src/up_usbmsc.c
@@ -54,8 +54,8 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
+#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
+#  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
 #endif
 
 /* PORT and SLOT number probably depend on the board configuration */
@@ -129,7 +129,7 @@ int usbmsc_archinitialize(void)
   message("usbmsc_archinitialize: Binding SPI port %d to MMC/SD slot %d\n",
           LPC17XX_MMCSDSPIPORTNO, LPC17XX_MMCSDSLOTNO);
 
-  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1, LPC17XX_MMCSDSLOTNO, spi);
+  ret = mmcsd_spislotinitialize(CONFIG_SYSTEM_USBMSC_DEVMINOR1, LPC17XX_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
       message("usbmsc_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
diff --git a/configs/nucleus2g/usbmsc/appconfig b/configs/nucleus2g/usbmsc/appconfig
index 4999d4933fb..7ded7785869 100644
--- a/configs/nucleus2g/usbmsc/appconfig
+++ b/configs/nucleus2g/usbmsc/appconfig
@@ -35,5 +35,5 @@
 
 # Path to example in apps/examples containing the user_start entry point
 
-CONFIGURED_APPS += examples/usbmsc
+CONFIGURED_APPS += system/usbmsc
 
diff --git a/configs/nucleus2g/usbmsc/defconfig b/configs/nucleus2g/usbmsc/defconfig
index 81ee5c49206..85f2a419b77 100755
--- a/configs/nucleus2g/usbmsc/defconfig
+++ b/configs/nucleus2g/usbmsc/defconfig
@@ -440,16 +440,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information
diff --git a/configs/nucleus2g/usbserial/defconfig b/configs/nucleus2g/usbserial/defconfig
index 6de79a12e38..91221ee7e55 100644
--- a/configs/nucleus2g/usbserial/defconfig
+++ b/configs/nucleus2g/usbserial/defconfig
@@ -527,7 +527,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 CONFIG_EXAMPLES_USBSERIAL=y
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/nutiny-nuc120/nsh/defconfig b/configs/nutiny-nuc120/nsh/defconfig
index a27e0276cc0..4191ba21270 100644
--- a/configs/nutiny-nuc120/nsh/defconfig
+++ b/configs/nutiny-nuc120/nsh/defconfig
@@ -479,7 +479,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/nutiny-nuc120/ostest/defconfig b/configs/nutiny-nuc120/ostest/defconfig
index 36b2f22bc37..b515b9db361 100644
--- a/configs/nutiny-nuc120/ostest/defconfig
+++ b/configs/nutiny-nuc120/ostest/defconfig
@@ -489,7 +489,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=1
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/olimex-lpc1766stk/README.txt b/configs/olimex-lpc1766stk/README.txt
index 9bf1ef52aa8..5bfd273c19f 100644
--- a/configs/olimex-lpc1766stk/README.txt
+++ b/configs/olimex-lpc1766stk/README.txt
@@ -1058,7 +1058,7 @@ Where <subdir> is one of the following:
 
   usbmsc:
     This configuration directory exercises the USB mass storage
-    class driver at apps/examples/usbmsc.  See apps/examples/README.txt
+    class driver at apps/system/usbmsc.  See apps/examples/README.txt
     for more information.
 
   zmodem:
diff --git a/configs/olimex-lpc1766stk/hidkbd/defconfig b/configs/olimex-lpc1766stk/hidkbd/defconfig
index d42e3da48d5..04093bf35e3 100755
--- a/configs/olimex-lpc1766stk/hidkbd/defconfig
+++ b/configs/olimex-lpc1766stk/hidkbd/defconfig
@@ -569,7 +569,7 @@ CONFIG_EXAMPLES_HIDKBD_ENCODED=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/olimex-lpc1766stk/nettest/defconfig b/configs/olimex-lpc1766stk/nettest/defconfig
index f0f0a0faf25..cbf241f4819 100755
--- a/configs/olimex-lpc1766stk/nettest/defconfig
+++ b/configs/olimex-lpc1766stk/nettest/defconfig
@@ -547,7 +547,7 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WGET is not set
diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig
index ddbab4c396f..14df57a0f69 100644
--- a/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/configs/olimex-lpc1766stk/nsh/defconfig
@@ -585,7 +585,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/olimex-lpc1766stk/nx/defconfig b/configs/olimex-lpc1766stk/nx/defconfig
index 24f8ffedbbf..991e365fb59 100755
--- a/configs/olimex-lpc1766stk/nx/defconfig
+++ b/configs/olimex-lpc1766stk/nx/defconfig
@@ -537,16 +537,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/nx
diff --git a/configs/olimex-lpc1766stk/ostest/defconfig b/configs/olimex-lpc1766stk/ostest/defconfig
index 7d1a7af6359..8ed63ef78fc 100755
--- a/configs/olimex-lpc1766stk/ostest/defconfig
+++ b/configs/olimex-lpc1766stk/ostest/defconfig
@@ -465,16 +465,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information
diff --git a/configs/olimex-lpc1766stk/src/up_usbmsc.c b/configs/olimex-lpc1766stk/src/up_usbmsc.c
index c144203947f..78a99a2b1c3 100644
--- a/configs/olimex-lpc1766stk/src/up_usbmsc.c
+++ b/configs/olimex-lpc1766stk/src/up_usbmsc.c
@@ -57,8 +57,8 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
+#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
+#  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
 #endif
 
 /* PORT and SLOT number probably depend on the board configuration */
@@ -136,7 +136,7 @@ int usbmsc_archinitialize(void)
   message("usbmsc_archinitialize: Binding SPI port %d to MMC/SD slot %d\n",
           LPC17XX_MMCSDSPIPORTNO, LPC17XX_MMCSDSLOTNO);
 
-  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1, LPC17XX_MMCSDSLOTNO, spi);
+  ret = mmcsd_spislotinitialize(CONFIG_SYSTEM_USBMSC_DEVMINOR1, LPC17XX_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
       message("usbmsc_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
diff --git a/configs/olimex-lpc1766stk/usbmsc/appconfig b/configs/olimex-lpc1766stk/usbmsc/appconfig
index da8acd704d8..5f623be769e 100644
--- a/configs/olimex-lpc1766stk/usbmsc/appconfig
+++ b/configs/olimex-lpc1766stk/usbmsc/appconfig
@@ -35,5 +35,5 @@
 
 # Path to example in apps/examples containing the user_start entry point
 
-CONFIGURED_APPS += examples/usbmsc
+CONFIGURED_APPS += system/usbmsc
 
diff --git a/configs/olimex-lpc1766stk/usbmsc/defconfig b/configs/olimex-lpc1766stk/usbmsc/defconfig
index 99bf4b55207..9bdfda6304b 100755
--- a/configs/olimex-lpc1766stk/usbmsc/defconfig
+++ b/configs/olimex-lpc1766stk/usbmsc/defconfig
@@ -467,16 +467,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information
diff --git a/configs/olimex-lpc1766stk/usbserial/defconfig b/configs/olimex-lpc1766stk/usbserial/defconfig
index 1119dcdc7aa..ca09c0c40b5 100644
--- a/configs/olimex-lpc1766stk/usbserial/defconfig
+++ b/configs/olimex-lpc1766stk/usbserial/defconfig
@@ -526,7 +526,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 CONFIG_EXAMPLES_USBSERIAL=y
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/olimex-lpc1766stk/zmodem/defconfig b/configs/olimex-lpc1766stk/zmodem/defconfig
index 12cdcdceffc..4fe5abacf87 100644
--- a/configs/olimex-lpc1766stk/zmodem/defconfig
+++ b/configs/olimex-lpc1766stk/zmodem/defconfig
@@ -600,7 +600,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/olimex-stm32-p107/nsh/defconfig b/configs/olimex-stm32-p107/nsh/defconfig
index 0935f8fb54c..f1a116da6ee 100644
--- a/configs/olimex-stm32-p107/nsh/defconfig
+++ b/configs/olimex-stm32-p107/nsh/defconfig
@@ -695,7 +695,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_XMLRPC is not set
diff --git a/configs/open1788/knsh/defconfig b/configs/open1788/knsh/defconfig
index 6aad3faf1ce..ac7b867f028 100755
--- a/configs/open1788/knsh/defconfig
+++ b/configs/open1788/knsh/defconfig
@@ -566,7 +566,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/open1788/nsh/defconfig b/configs/open1788/nsh/defconfig
index 2dfc279f5ff..e81b11f4583 100644
--- a/configs/open1788/nsh/defconfig
+++ b/configs/open1788/nsh/defconfig
@@ -521,7 +521,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/open1788/nxlines/defconfig b/configs/open1788/nxlines/defconfig
index e4c0ea5893f..223e3b5a889 100644
--- a/configs/open1788/nxlines/defconfig
+++ b/configs/open1788/nxlines/defconfig
@@ -623,7 +623,7 @@ CONFIG_EXAMPLES_NXLINES_BPP=32
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/open1788/ostest/defconfig b/configs/open1788/ostest/defconfig
index 5546db942d8..dfeb1927450 100644
--- a/configs/open1788/ostest/defconfig
+++ b/configs/open1788/ostest/defconfig
@@ -490,7 +490,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/p112/ostest/defconfig b/configs/p112/ostest/defconfig
index 69430483a2e..16ab08987a8 100644
--- a/configs/p112/ostest/defconfig
+++ b/configs/p112/ostest/defconfig
@@ -425,7 +425,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/pcblogic-pic32mx/nsh/defconfig b/configs/pcblogic-pic32mx/nsh/defconfig
index 33cc5911374..a542ad17536 100644
--- a/configs/pcblogic-pic32mx/nsh/defconfig
+++ b/configs/pcblogic-pic32mx/nsh/defconfig
@@ -566,7 +566,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/pcblogic-pic32mx/ostest/defconfig b/configs/pcblogic-pic32mx/ostest/defconfig
index fd8157b691a..13927405f15 100644
--- a/configs/pcblogic-pic32mx/ostest/defconfig
+++ b/configs/pcblogic-pic32mx/ostest/defconfig
@@ -561,7 +561,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/pic32-starterkit/README.txt b/configs/pic32-starterkit/README.txt
index 0dd49c44412..af194171bcb 100644
--- a/configs/pic32-starterkit/README.txt
+++ b/configs/pic32-starterkit/README.txt
@@ -1095,7 +1095,7 @@ Where <subdir> is one of the following:
 
       CONFIG_CDCACM=y         : Enable the CDCACM device
 
-    examples/usbmsc - There are some hooks in the appconfig file
+    system/usbmsc - There are some hooks in the appconfig file
     to enable the USB mass storage device.  However, this device cannot
     work until support for the SD card is also incorporated.
 
@@ -1203,15 +1203,15 @@ Where <subdir> is one of the following:
 
     d) Use a RAM disk (instead of an SD card) as the USB MSC logical unit:
 
-      -CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-      +CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/ram0"
+      -CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+      +CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/ram0"
 
   2. Changes to apps/.config.
 
-    a) Enable building of the examples/usbmsc:
+    a) Enable building of the system/usbmsc:
 
-      -# CONFIGURED_APPS += examples/usbmsc
-      +  CONFIGURED_APPS += examples/usbmsc
+      -# CONFIGURED_APPS += system/usbmsc
+      +  CONFIGURED_APPS += system/usbmsc
 
   3. When NSH first comes up, you must manually create the RAM disk
      before exporting it:
diff --git a/configs/pic32-starterkit/nsh/appconfig b/configs/pic32-starterkit/nsh/appconfig
index 6f6b4d56139..98c52a98ea7 100644
--- a/configs/pic32-starterkit/nsh/appconfig
+++ b/configs/pic32-starterkit/nsh/appconfig
@@ -55,8 +55,8 @@ ifeq ($(CONFIG_PIC32MX_USBDEV),y)
 # USB Mass Storage Class device configurations
 
 ifeq ($(CONFIG_USBMSC),y)
-#  Uncomment to enable the examples/usbmsc built-in
-#  CONFIGURED_APPS += examples/usbmsc
+#  Uncomment to enable the system/usbmsc built-in
+#  CONFIGURED_APPS += system/usbmsc
 endif
 
 # USB CDC/ACM serial device configurations
diff --git a/configs/pic32-starterkit/nsh/defconfig b/configs/pic32-starterkit/nsh/defconfig
index f57c3c787d2..3388dec0aba 100644
--- a/configs/pic32-starterkit/nsh/defconfig
+++ b/configs/pic32-starterkit/nsh/defconfig
@@ -626,16 +626,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/usbterm
diff --git a/configs/pic32-starterkit/nsh2/appconfig b/configs/pic32-starterkit/nsh2/appconfig
index 95712d484b7..73cfdb4558a 100644
--- a/configs/pic32-starterkit/nsh2/appconfig
+++ b/configs/pic32-starterkit/nsh2/appconfig
@@ -55,8 +55,8 @@ ifeq ($(CONFIG_PIC32MX_USBDEV),y)
 # USB Mass Storage Class device configurations
 
 ifeq ($(CONFIG_USBMSC),y)
-#  Uncomment to enable the examples/usbmsc built-in
-#  CONFIGURED_APPS += examples/usbmsc
+#  Uncomment to enable the system/usbmsc built-in
+#  CONFIGURED_APPS += system/usbmsc
 endif
 
 # USB CDC/ACM serial device configurations
diff --git a/configs/pic32-starterkit/nsh2/defconfig b/configs/pic32-starterkit/nsh2/defconfig
index 1a791c4f5ea..0cb70d5acd7 100644
--- a/configs/pic32-starterkit/nsh2/defconfig
+++ b/configs/pic32-starterkit/nsh2/defconfig
@@ -625,16 +625,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/usbterm
diff --git a/configs/pic32-starterkit/ostest/defconfig b/configs/pic32-starterkit/ostest/defconfig
index ce2b3fa23e0..0e55d4a51f6 100644
--- a/configs/pic32-starterkit/ostest/defconfig
+++ b/configs/pic32-starterkit/ostest/defconfig
@@ -622,16 +622,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/usbterm
diff --git a/configs/pic32-starterkit/src/up_usbmsc.c b/configs/pic32-starterkit/src/up_usbmsc.c
index 00b374dfd5d..535754f156c 100644
--- a/configs/pic32-starterkit/src/up_usbmsc.c
+++ b/configs/pic32-starterkit/src/up_usbmsc.c
@@ -82,7 +82,7 @@
 
 int usbmsc_archinitialize(void)
 {
-  /* If examples/usbmsc is built as an NSH command, then SD slot should
+  /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initized in nsh_archinitialize() (see up_nsh.c).  In
    * this case, there is nothing further to be done here.
    */
diff --git a/configs/pic32mx7mmb/README.txt b/configs/pic32mx7mmb/README.txt
index 73b50945bb5..19ae05bc685 100644
--- a/configs/pic32mx7mmb/README.txt
+++ b/configs/pic32mx7mmb/README.txt
@@ -771,15 +771,15 @@ Where <subdir> is one of the following:
 
     d) Use a RAM disk (instead of an SD card) as the USB MSC logical unit:
 
-      -CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-      +CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/ram0"
+      -CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+      +CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/ram0"
 
   2. Changes to nuttx/.config.
 
-    a) Enable building of the examples/usbmsc:
+    a) Enable building of the system/usbmsc:
 
-      -# CONFIGURED_APPS += examples/usbmsc
-      +  CONFIGURED_APPS += examples/usbmsc
+      -# CONFIGURED_APPS += system/usbmsc
+      +  CONFIGURED_APPS += system/usbmsc
 
   3. When NSH first comes up, you must manually create the RAM disk
      before exporting it:
diff --git a/configs/pic32mx7mmb/nsh/appconfig b/configs/pic32mx7mmb/nsh/appconfig
index 679ab59979b..08ee858e958 100644
--- a/configs/pic32mx7mmb/nsh/appconfig
+++ b/configs/pic32mx7mmb/nsh/appconfig
@@ -55,7 +55,7 @@ ifeq ($(CONFIG_PIC32MX_USBDEV),y)
 # USB Mass Storage Class device configurations
 
 ifeq ($(CONFIG_USBMSC),y)
-  CONFIGURED_APPS += examples/usbmsc
+  CONFIGURED_APPS += system/usbmsc
 else
 
 # USB CDC/ACM serial device configurations
diff --git a/configs/pic32mx7mmb/nsh/defconfig b/configs/pic32mx7mmb/nsh/defconfig
index f4736301989..839464997f4 100644
--- a/configs/pic32mx7mmb/nsh/defconfig
+++ b/configs/pic32mx7mmb/nsh/defconfig
@@ -738,16 +738,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/usbterm
diff --git a/configs/pic32mx7mmb/ostest/defconfig b/configs/pic32mx7mmb/ostest/defconfig
index de06d16741d..419f2040f78 100644
--- a/configs/pic32mx7mmb/ostest/defconfig
+++ b/configs/pic32mx7mmb/ostest/defconfig
@@ -622,16 +622,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/usbterm
diff --git a/configs/pic32mx7mmb/src/up_usbmsc.c b/configs/pic32mx7mmb/src/up_usbmsc.c
index 5ec64336c75..7038bb635d3 100644
--- a/configs/pic32mx7mmb/src/up_usbmsc.c
+++ b/configs/pic32mx7mmb/src/up_usbmsc.c
@@ -82,7 +82,7 @@
 
 int usbmsc_archinitialize(void)
 {
-  /* If examples/usbmsc is built as an NSH command, then SD slot should
+  /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initized in nsh_archinitialize() (see up_nsh.c).  In
    * this case, there is nothing further to be done here.
    */
diff --git a/configs/pirelli_dpl10/nsh_highram/defconfig b/configs/pirelli_dpl10/nsh_highram/defconfig
index 41aec2462f3..8703a9a7542 100644
--- a/configs/pirelli_dpl10/nsh_highram/defconfig
+++ b/configs/pirelli_dpl10/nsh_highram/defconfig
@@ -435,7 +435,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig
index 87aa0b5dcde..e9209a8f79d 100644
--- a/configs/sam3u-ek/knsh/defconfig
+++ b/configs/sam3u-ek/knsh/defconfig
@@ -537,7 +537,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig
index 43b8295d9d5..6e3710e97f3 100644
--- a/configs/sam3u-ek/nsh/defconfig
+++ b/configs/sam3u-ek/nsh/defconfig
@@ -535,7 +535,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig
index 8fbb6ec63f0..7c2744d7a49 100644
--- a/configs/sam3u-ek/nx/defconfig
+++ b/configs/sam3u-ek/nx/defconfig
@@ -590,7 +590,7 @@ CONFIG_EXAMPLES_NX_BPP=16
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/sam3u-ek/nxwm/defconfig b/configs/sam3u-ek/nxwm/defconfig
index 5e81ffe9239..9bdd6a36cf5 100644
--- a/configs/sam3u-ek/nxwm/defconfig
+++ b/configs/sam3u-ek/nxwm/defconfig
@@ -656,7 +656,7 @@ CONFIG_CXX_NEWLONG=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/sam3u-ek/ostest/defconfig b/configs/sam3u-ek/ostest/defconfig
index cb237b44a4e..83052e68e78 100644
--- a/configs/sam3u-ek/ostest/defconfig
+++ b/configs/sam3u-ek/ostest/defconfig
@@ -498,7 +498,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/sam3u-ek/src/up_usbmsc.c b/configs/sam3u-ek/src/up_usbmsc.c
index 0d58e2f451b..99a8f365d4c 100644
--- a/configs/sam3u-ek/src/up_usbmsc.c
+++ b/configs/sam3u-ek/src/up_usbmsc.c
@@ -58,8 +58,8 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
+#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
+#  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
 #endif
 
 /* SLOT number(s) depends on the board configuration */
@@ -122,9 +122,9 @@ int usbmsc_archinitialize(void)
 
   message("usbmsc_archinitialize: "
           "Bind SDIO to the MMC/SD driver, minor=%d\n",
-          CONFIG_EXAMPLES_USBMSC_DEVMINOR1);
+          CONFIG_SYSTEM_USBMSC_DEVMINOR1);
 
-  ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1, sdio);
+  ret = mmcsd_slotinitialize(CONFIG_SYSTEM_USBMSC_DEVMINOR1, sdio);
   if (ret != OK)
     {
       message("usbmsc_archinitialize: "
diff --git a/configs/sam4l-xplained/nsh/defconfig b/configs/sam4l-xplained/nsh/defconfig
index 2850736585a..62a0ce1d9bc 100644
--- a/configs/sam4l-xplained/nsh/defconfig
+++ b/configs/sam4l-xplained/nsh/defconfig
@@ -551,7 +551,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/sam4l-xplained/ostest/defconfig b/configs/sam4l-xplained/ostest/defconfig
index c29d602bb56..d7060557255 100644
--- a/configs/sam4l-xplained/ostest/defconfig
+++ b/configs/sam4l-xplained/ostest/defconfig
@@ -516,7 +516,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/sam4s-xplained/nsh/defconfig b/configs/sam4s-xplained/nsh/defconfig
index 7e1becb8178..406d4d3b942 100644
--- a/configs/sam4s-xplained/nsh/defconfig
+++ b/configs/sam4s-xplained/nsh/defconfig
@@ -525,7 +525,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/sam4s-xplained/ostest/defconfig b/configs/sam4s-xplained/ostest/defconfig
index c8c20a4b26e..63438de0cb8 100644
--- a/configs/sam4s-xplained/ostest/defconfig
+++ b/configs/sam4s-xplained/ostest/defconfig
@@ -502,7 +502,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/sama5d3x-ek/README.txt b/configs/sama5d3x-ek/README.txt
index 8c131b15096..7e181458441 100644
--- a/configs/sama5d3x-ek/README.txt
+++ b/configs/sama5d3x-ek/README.txt
@@ -1141,18 +1141,18 @@ Configurations
          CONFIG_USBMSC_EPBULKOUT=1             : Use EP1 for the BULK OUT endpoint
          CONFIG_USBMSC_EPBULKIN=2              : Use EP2 for the BULK IN endpoint
 
-       The following setting enables an example that can can be used to
+       The following setting enables an add-on that can can be used to
        control the CDC/ACM device.  It will add two new NSH commands:
 
          a. msconn will connect the USB serial device and export the AT25
             to the host, and
          b. msdis which will disconnect the USB serial device.
 
-       Application Configuration -> Examples:
-         CONFIG_EXAMPLES_USBMSC=y              : Enable the USBMSC example
-         CONFIG_EXAMPLES_USBMSC_NLUNS=1        : One LUN
-         CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0    : Minor device zero
-         CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mtdblock0"
+       Application Configuration -> System Add-Ons:
+         CONFIG_SYSTEM_USBMSC=y                : Enable the USBMSC add-on
+         CONFIG_SYSTEM_USBMSC_NLUNS=1          : One LUN
+         CONFIG_SYSTEM_USBMSC_DEVMINOR1=0      : Minor device zero
+         CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mtdblock0"
                                                : Use a single, LUN:  The AT25
                                                : block driver.
 
@@ -1169,7 +1169,7 @@ Configurations
            nsh> msdis
            nsh> mount -t vfat /dev/mtdblock0 /mnt/at25
 
-       b. If you change the value CONFIG_EXAMPLES_USBMSC_DEVPATH1, then you
+       b. If you change the value CONFIG_SYSTEM_USBMSC_DEVPATH1, then you
           can export other file systems:
 
            "/dev/mmcsd1" will export the HSMCI1 microSD
diff --git a/configs/sama5d3x-ek/demo/defconfig b/configs/sama5d3x-ek/demo/defconfig
index 6e0c3299d25..a2273e1ecc9 100644
--- a/configs/sama5d3x-ek/demo/defconfig
+++ b/configs/sama5d3x-ek/demo/defconfig
@@ -43,6 +43,7 @@ CONFIG_RAW_BINARY=y
 # Debug Options
 #
 # CONFIG_DEBUG is not set
+CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_DEBUG_SYMBOLS is not set
 
 #
@@ -691,19 +692,6 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-CONFIG_EXAMPLES_USBMSC=y
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mtdblock0"
-CONFIG_EXAMPLES_USBMSC_DEVMINOR2=1
-CONFIG_EXAMPLES_USBMSC_DEVPATH2="/dev/mmcsd1"
-CONFIG_EXAMPLES_USBMSC_DEVMINOR3=2
-CONFIG_EXAMPLES_USBMSC_DEVPATH3="/dev/mmcsd2"
-# CONFIG_EXAMPLES_USBMSC_DEBUGMM is not set
-CONFIG_EXAMPLES_USBMSC_CMD_STACKSIZE=768
-CONFIG_EXAMPLES_USBMSC_CMD_PRIORITY=100
-CONFIG_EXAMPLES_USBMSC_DAEMON_STACKSIZE=2048
-CONFIG_EXAMPLES_USBMSC_DAEMON_PRIORITY=100
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
@@ -876,6 +864,27 @@ CONFIG_READLINE_ECHO=y
 # USB Monitor
 #
 
+#
+# Stack Monitor
+#
+
+#
+# USB Mass Storage Class
+#
+CONFIG_SYSTEM_USBMSC=y
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mtdblock0"
+CONFIG_SYSTEM_USBMSC_DEVMINOR2=1
+CONFIG_SYSTEM_USBMSC_DEVPATH2="/dev/mmcsd1"
+CONFIG_SYSTEM_USBMSC_DEVMINOR3=2
+CONFIG_SYSTEM_USBMSC_DEVPATH3="/dev/mmcsd2"
+# CONFIG_SYSTEM_USBMSC_DEBUGMM is not set
+CONFIG_SYSTEM_USBMSC_CMD_STACKSIZE=768
+CONFIG_SYSTEM_USBMSC_CMD_PRIORITY=100
+CONFIG_SYSTEM_USBMSC_DAEMON_STACKSIZE=2048
+CONFIG_SYSTEM_USBMSC_DAEMON_PRIORITY=100
+
 #
 # Zmodem Commands
 #
diff --git a/configs/sama5d3x-ek/hello/defconfig b/configs/sama5d3x-ek/hello/defconfig
index a89e0e97796..416f6475b6c 100644
--- a/configs/sama5d3x-ek/hello/defconfig
+++ b/configs/sama5d3x-ek/hello/defconfig
@@ -510,7 +510,7 @@ CONFIG_EXAMPLES_HELLO=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/sama5d3x-ek/norboot/defconfig b/configs/sama5d3x-ek/norboot/defconfig
index 8af56b68b9a..5aea4c9f3b5 100644
--- a/configs/sama5d3x-ek/norboot/defconfig
+++ b/configs/sama5d3x-ek/norboot/defconfig
@@ -525,7 +525,7 @@ CONFIG_EXAMPLES_HELLO=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/sama5d3x-ek/nsh/defconfig b/configs/sama5d3x-ek/nsh/defconfig
index 605ee9cbdd9..b9f4ec9aa44 100644
--- a/configs/sama5d3x-ek/nsh/defconfig
+++ b/configs/sama5d3x-ek/nsh/defconfig
@@ -551,7 +551,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/sama5d3x-ek/ostest/defconfig b/configs/sama5d3x-ek/ostest/defconfig
index d4bb4c4126b..b69ecf83651 100644
--- a/configs/sama5d3x-ek/ostest/defconfig
+++ b/configs/sama5d3x-ek/ostest/defconfig
@@ -534,7 +534,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/sama5d3x-ek/src/sam_usbmsc.c b/configs/sama5d3x-ek/src/sam_usbmsc.c
index 844a1602c25..b303e6d8726 100644
--- a/configs/sama5d3x-ek/src/sam_usbmsc.c
+++ b/configs/sama5d3x-ek/src/sam_usbmsc.c
@@ -64,11 +64,11 @@
 #  undef HAVE_AT25
 #endif
 
-#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
+#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
+#  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
 #endif
 
-#if CONFIG_EXAMPLES_USBMSC_DEVMINOR1 != AT25_MINOR
+#if CONFIG_SYSTEM_USBMSC_DEVMINOR1 != AT25_MINOR
 #  error Confusion in the assignment of minor device numbers
 #  undef HAVE_AT25
 #endif
diff --git a/configs/shenzhou/nsh/defconfig b/configs/shenzhou/nsh/defconfig
index 87809896a2b..fe861b7dce0 100644
--- a/configs/shenzhou/nsh/defconfig
+++ b/configs/shenzhou/nsh/defconfig
@@ -556,7 +556,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig
index ebd61b83621..a55013458a3 100644
--- a/configs/shenzhou/nxwm/defconfig
+++ b/configs/shenzhou/nxwm/defconfig
@@ -682,7 +682,7 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WGET is not set
diff --git a/configs/shenzhou/src/up_usbmsc.c b/configs/shenzhou/src/up_usbmsc.c
index e2ca462d19c..848b44bcb95 100644
--- a/configs/shenzhou/src/up_usbmsc.c
+++ b/configs/shenzhou/src/up_usbmsc.c
@@ -52,8 +52,8 @@
  ****************************************************************************/
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
+#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
+#  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
 #endif
 
 /* Debug ********************************************************************/
@@ -90,13 +90,13 @@
 
 int usbmsc_archinitialize(void)
 {
-  /* If examples/usbmsc is built as an NSH command, then SD slot should
+  /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initized in nsh_archinitialize() (see up_nsh.c).  In
    * this case, there is nothing further to be done here.
    */
 
 #ifndef CONFIG_NSH_BUILTIN_APPS
-  return stm32_sdinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1);
+  return stm32_sdinitialize(CONFIG_SYSTEM_USBMSC_DEVMINOR1);
 #else
   return OK;
 #endif
diff --git a/configs/shenzhou/thttpd/defconfig b/configs/shenzhou/thttpd/defconfig
index 1f31ced602f..41801d8dfd6 100644
--- a/configs/shenzhou/thttpd/defconfig
+++ b/configs/shenzhou/thttpd/defconfig
@@ -706,7 +706,7 @@ CONFIG_EXAMPLES_NSH=y
 #
 # USB Mass Storage Class Example
 #
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 
 #
 # USB Serial Terminal Example
diff --git a/configs/sim/cxxtest/defconfig b/configs/sim/cxxtest/defconfig
index 9c7caa54f0e..7df4ed57d28 100644
--- a/configs/sim/cxxtest/defconfig
+++ b/configs/sim/cxxtest/defconfig
@@ -348,7 +348,7 @@ CONFIG_EXAMPLES_CXXTEST=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/sim/mtdpart/defconfig b/configs/sim/mtdpart/defconfig
index a76563498f3..16e1e007ff6 100644
--- a/configs/sim/mtdpart/defconfig
+++ b/configs/sim/mtdpart/defconfig
@@ -392,7 +392,7 @@ CONFIG_EXAMPLES_MTDPART_NPARTITIONS=3
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/sim/nsh/defconfig b/configs/sim/nsh/defconfig
index aafb9549222..37089218b77 100644
--- a/configs/sim/nsh/defconfig
+++ b/configs/sim/nsh/defconfig
@@ -370,7 +370,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/sim/nxffs/defconfig b/configs/sim/nxffs/defconfig
index 7c557cb6ed9..3ac2ba5a585 100644
--- a/configs/sim/nxffs/defconfig
+++ b/configs/sim/nxffs/defconfig
@@ -403,7 +403,7 @@ CONFIG_EXAMPLES_NXFFS_NLOOPS=100
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/sim/nxlines/defconfig b/configs/sim/nxlines/defconfig
index c2a7cfc3fd5..db0fc315356 100644
--- a/configs/sim/nxlines/defconfig
+++ b/configs/sim/nxlines/defconfig
@@ -430,7 +430,7 @@ CONFIG_EXAMPLES_NXLINES_BPP=32
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/sim/nxwm/defconfig b/configs/sim/nxwm/defconfig
index 3c391652021..0de43832041 100644
--- a/configs/sim/nxwm/defconfig
+++ b/configs/sim/nxwm/defconfig
@@ -427,7 +427,7 @@ CONFIG_HAVE_CXX=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/sim/ostest/defconfig b/configs/sim/ostest/defconfig
index 0a47891a746..99612c8e4cf 100644
--- a/configs/sim/ostest/defconfig
+++ b/configs/sim/ostest/defconfig
@@ -385,7 +385,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/stm3210e-eval/README.txt b/configs/stm3210e-eval/README.txt
index 25f305d2fe2..ef04e337a86 100644
--- a/configs/stm3210e-eval/README.txt
+++ b/configs/stm3210e-eval/README.txt
@@ -736,7 +736,7 @@ Where <subdir> is one of the following:
     ----------- ----------------------- --------------------------------
     Built-in    None                    apps/examples/nx
     Apps                                apps/examples/nxhello
-                                        apps/examples/usbmsc (5)
+                                        apps/system/usbmsc (5)
                                         apps/system/i2c
     =========== ======================= ================================
 
@@ -961,7 +961,7 @@ Where <subdir> is one of the following:
   usbmsc:
   -------
     This configuration directory exercises the USB mass storage
-    class driver at examples/usbmsc.  See examples/README.txt for
+    class driver at system/usbmsc.  See examples/README.txt for
     more information.
 
       CONFIG_STM32_BUILDROOT=y      : NuttX buildroot under Linux or Cygwin
diff --git a/configs/stm3210e-eval/RIDE/bigfatstub.c b/configs/stm3210e-eval/RIDE/bigfatstub.c
index 69d679fd89a..8473ec19b99 100644
--- a/configs/stm3210e-eval/RIDE/bigfatstub.c
+++ b/configs/stm3210e-eval/RIDE/bigfatstub.c
@@ -1,31 +1,31 @@
-#include <stdint.h>
-#include <nuttx/irq.h>
-#include "up_internal.h"
-
-void os_start(void)
-{
-	up_lowputc('X');
-	up_lowputc('\n');
-	for (;;);
-}
-
-void up_assert(const uint8_t *filename, int lineno)
-{
-	up_lowputc('?');
-	up_lowputc('\n');
-	for (;;);
-}
-
-int irq_attach(int irq, xcpt_t isr)
-{
-	up_lowputc('A');
-	up_lowputc('\n');
-	for (;;);
-}
-
-uint32_t *up_doirq(int irq, uint32_t *regs)
-{
-	up_lowputc('I');
-	up_lowputc('\n');
-	for (;;);
+#include <stdint.h>
+#include <nuttx/irq.h>
+#include "up_internal.h"
+
+void os_start(void)
+{
+	up_lowputc('X');
+	up_lowputc('\n');
+	for (;;);
+}
+
+void up_assert(const uint8_t *filename, int lineno)
+{
+	up_lowputc('?');
+	up_lowputc('\n');
+	for (;;);
+}
+
+int irq_attach(int irq, xcpt_t isr)
+{
+	up_lowputc('A');
+	up_lowputc('\n');
+	for (;;);
+}
+
+uint32_t *up_doirq(int irq, uint32_t *regs)
+{
+	up_lowputc('I');
+	up_lowputc('\n');
+	for (;;);
 }
\ No newline at end of file
diff --git a/configs/stm3210e-eval/composite/defconfig b/configs/stm3210e-eval/composite/defconfig
index c11a110802d..87d3108fc9d 100755
--- a/configs/stm3210e-eval/composite/defconfig
+++ b/configs/stm3210e-eval/composite/defconfig
@@ -520,17 +520,17 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_DEBUGMM=n
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_DEBUGMM=n
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/composite
diff --git a/configs/stm3210e-eval/nsh2/appconfig b/configs/stm3210e-eval/nsh2/appconfig
index 6a9ea36ba56..6bce66fd869 100644
--- a/configs/stm3210e-eval/nsh2/appconfig
+++ b/configs/stm3210e-eval/nsh2/appconfig
@@ -50,7 +50,7 @@ CONFIGURED_APPS += examples/nx
 CONFIGURED_APPS += examples/nxhello
 #CONFIGURED_APPS += examples/nxlines
 #CONFIGURED_APPS += examples/nxtext
-CONFIGURED_APPS += examples/usbmsc
+CONFIGURED_APPS += system/usbmsc
 
 ifeq ($(CONFIG_I2C),y)
 CONFIGURED_APPS += system/i2c
diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig
index 27fc066160d..c2e6ce60300 100644
--- a/configs/stm3210e-eval/nsh2/defconfig
+++ b/configs/stm3210e-eval/nsh2/defconfig
@@ -693,17 +693,17 @@ CONFIG_EXAMPLES_NXLINES_BPP=16
 CONFIG_EXAMPLES_NXLINES_EXTERNINIT=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_DEBUGMM=n
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_DEBUGMM=n
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/watchdog
diff --git a/configs/stm3210e-eval/nxconsole/appconfig b/configs/stm3210e-eval/nxconsole/appconfig
index b7d22bf0bdb..1c6ecfa8621 100644
--- a/configs/stm3210e-eval/nxconsole/appconfig
+++ b/configs/stm3210e-eval/nxconsole/appconfig
@@ -43,7 +43,7 @@ CONFIGURED_APPS += nshlib
 # Optional built-in applications
 
 ifeq ($(CONFIG_USBDEV),y)
-CONFIGURED_APPS += examples/usbmsc
+CONFIGURED_APPS += system/usbmsc
 endif
 
 ifeq ($(CONFIG_I2C),y)
diff --git a/configs/stm3210e-eval/pm/appconfig b/configs/stm3210e-eval/pm/appconfig
index 07fb41bbacd..6fae050a72c 100644
--- a/configs/stm3210e-eval/pm/appconfig
+++ b/configs/stm3210e-eval/pm/appconfig
@@ -50,7 +50,7 @@ CONFIGURED_APPS += examples/nx
 CONFIGURED_APPS += examples/nxhello
 #CONFIGURED_APPS += examples/nxlines
 #CONFIGURED_APPS += examples/nxtext
-CONFIGURED_APPS += examples/usbmsc
+CONFIGURED_APPS += system/usbmsc
 
 ifeq ($(CONFIG_I2C),y)
 CONFIGURED_APPS += system/i2c
diff --git a/configs/stm3210e-eval/pm/defconfig b/configs/stm3210e-eval/pm/defconfig
index 8dc0665bf40..9377a0b3cb2 100644
--- a/configs/stm3210e-eval/pm/defconfig
+++ b/configs/stm3210e-eval/pm/defconfig
@@ -738,17 +738,17 @@ CONFIG_EXAMPLES_NXLINES_BPP=16
 CONFIG_EXAMPLES_NXLINES_EXTERNINIT=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_DEBUGMM=n
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_DEBUGMM=n
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/watchdog
diff --git a/configs/stm3210e-eval/src/up_usbmsc.c b/configs/stm3210e-eval/src/up_usbmsc.c
index 5bca7bf1b92..fe3cbb3efcb 100644
--- a/configs/stm3210e-eval/src/up_usbmsc.c
+++ b/configs/stm3210e-eval/src/up_usbmsc.c
@@ -60,8 +60,8 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
+#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
+#  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
 #endif
 
 /* SLOT number(s) could depend on the board configuration */
@@ -109,7 +109,7 @@
 
 int usbmsc_archinitialize(void)
 {
-  /* If examples/usbmsc is built as an NSH command, then SD slot should
+  /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initized in nsh_archinitialize() (see up_nsh.c).  In
    * this case, there is nothing further to be done here.
    */
@@ -136,9 +136,9 @@ int usbmsc_archinitialize(void)
 
   message("usbmsc_archinitialize: "
           "Bind SDIO to the MMC/SD driver, minor=%d\n",
-          CONFIG_EXAMPLES_USBMSC_DEVMINOR1);
+          CONFIG_SYSTEM_USBMSC_DEVMINOR1);
 
-  ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1, sdio);
+  ret = mmcsd_slotinitialize(CONFIG_SYSTEM_USBMSC_DEVMINOR1, sdio);
   if (ret != OK)
     {
       message("usbmsc_archinitialize: "
diff --git a/configs/stm3210e-eval/usbmsc/appconfig b/configs/stm3210e-eval/usbmsc/appconfig
index 5b86cb0ecc1..911d311696c 100644
--- a/configs/stm3210e-eval/usbmsc/appconfig
+++ b/configs/stm3210e-eval/usbmsc/appconfig
@@ -35,5 +35,5 @@
 
 # Path to example in apps/examples containing the user_start entry point
 
-CONFIGURED_APPS += examples/usbmsc
+CONFIGURED_APPS += system/usbmsc
 
diff --git a/configs/stm3210e-eval/usbmsc/defconfig b/configs/stm3210e-eval/usbmsc/defconfig
index f9460bf3dfc..faef419fcbd 100755
--- a/configs/stm3210e-eval/usbmsc/defconfig
+++ b/configs/stm3210e-eval/usbmsc/defconfig
@@ -477,17 +477,17 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_DEBUGMM=n
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_DEBUGMM=n
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/watchdog
diff --git a/configs/stm3210e-eval/usbserial/defconfig b/configs/stm3210e-eval/usbserial/defconfig
index 53c16cae488..d3fe17c8d31 100644
--- a/configs/stm3210e-eval/usbserial/defconfig
+++ b/configs/stm3210e-eval/usbserial/defconfig
@@ -578,7 +578,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 CONFIG_EXAMPLES_USBSERIAL=y
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/stm3220g-eval/nsh/defconfig b/configs/stm3220g-eval/nsh/defconfig
index e090427f757..601cd45b2b4 100644
--- a/configs/stm3220g-eval/nsh/defconfig
+++ b/configs/stm3220g-eval/nsh/defconfig
@@ -809,17 +809,17 @@ CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
 CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_DEBUGMM=n
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_DEBUGMM=n
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/watchdog
diff --git a/configs/stm3220g-eval/nsh2/defconfig b/configs/stm3220g-eval/nsh2/defconfig
index d0028b2a718..7b15734634d 100644
--- a/configs/stm3220g-eval/nsh2/defconfig
+++ b/configs/stm3220g-eval/nsh2/defconfig
@@ -796,17 +796,17 @@ CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
 CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_DEBUGMM=n
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_DEBUGMM=n
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/watchdog
diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig
index 59e93375bd5..b4297d94083 100644
--- a/configs/stm3220g-eval/nxwm/defconfig
+++ b/configs/stm3220g-eval/nxwm/defconfig
@@ -711,7 +711,7 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WGET is not set
diff --git a/configs/stm3220g-eval/ostest/defconfig b/configs/stm3220g-eval/ostest/defconfig
index d26b7ccd6d1..155396b1e2c 100644
--- a/configs/stm3220g-eval/ostest/defconfig
+++ b/configs/stm3220g-eval/ostest/defconfig
@@ -697,17 +697,17 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_DEBUGMM=n
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_DEBUGMM=n
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/watchdog
diff --git a/configs/stm3240g-eval/discover/defconfig b/configs/stm3240g-eval/discover/defconfig
index 0b6b6d77a3c..884c952676b 100644
--- a/configs/stm3240g-eval/discover/defconfig
+++ b/configs/stm3240g-eval/discover/defconfig
@@ -731,7 +731,7 @@ CONFIG_EXAMPLES_DISCOVER_NETMASK=0xffffff00
 #
 # USB Mass Storage Class Example
 #
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 
 #
 # USB Serial Terminal Example
diff --git a/configs/stm3240g-eval/nsh/defconfig b/configs/stm3240g-eval/nsh/defconfig
index 1b69df006eb..297ef6e0100 100644
--- a/configs/stm3240g-eval/nsh/defconfig
+++ b/configs/stm3240g-eval/nsh/defconfig
@@ -809,17 +809,17 @@ CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
 CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_DEBUGMM=n
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_DEBUGMM=n
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/watchdog
diff --git a/configs/stm3240g-eval/nxconsole/defconfig b/configs/stm3240g-eval/nxconsole/defconfig
index 19d73808574..2522d5e4ae6 100644
--- a/configs/stm3240g-eval/nxconsole/defconfig
+++ b/configs/stm3240g-eval/nxconsole/defconfig
@@ -768,17 +768,17 @@ CONFIG_EXAMPLES_NXLINES_BPP=16
 CONFIG_EXAMPLES_NXLINES_EXTERNINIT=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_DEBUGMM=n
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_DEBUGMM=n
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/watchdog
diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig
index 03534de40e1..18135b31b29 100644
--- a/configs/stm3240g-eval/nxwm/defconfig
+++ b/configs/stm3240g-eval/nxwm/defconfig
@@ -836,17 +836,17 @@ CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
 CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_DEBUGMM=n
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_DEBUGMM=n
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/watchdog
diff --git a/configs/stm3240g-eval/ostest/defconfig b/configs/stm3240g-eval/ostest/defconfig
index 31fe5194314..ce532e00029 100644
--- a/configs/stm3240g-eval/ostest/defconfig
+++ b/configs/stm3240g-eval/ostest/defconfig
@@ -554,7 +554,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/stm3240g-eval/webserver/defconfig b/configs/stm3240g-eval/webserver/defconfig
index 8b7ba750b21..56dedcb1d27 100644
--- a/configs/stm3240g-eval/webserver/defconfig
+++ b/configs/stm3240g-eval/webserver/defconfig
@@ -804,17 +804,17 @@ CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
 CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_DEBUGMM=n
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_DEBUGMM=n
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/watchdog
diff --git a/configs/stm3240g-eval/xmlrpc/defconfig b/configs/stm3240g-eval/xmlrpc/defconfig
index e83f2e33420..9d3c0a6280f 100644
--- a/configs/stm3240g-eval/xmlrpc/defconfig
+++ b/configs/stm3240g-eval/xmlrpc/defconfig
@@ -720,7 +720,7 @@ CONFIG_HAVE_CXXINITIALIZE=y
 #
 # USB Mass Storage Class Example
 #
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 
 #
 # USB Serial Terminal Example
diff --git a/configs/stm32_tiny/nsh/defconfig b/configs/stm32_tiny/nsh/defconfig
index df9eb9e1288..a748954f96e 100644
--- a/configs/stm32_tiny/nsh/defconfig
+++ b/configs/stm32_tiny/nsh/defconfig
@@ -589,7 +589,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/stm32_tiny/usbnsh/defconfig b/configs/stm32_tiny/usbnsh/defconfig
index fd70c066bfa..f4a35dfe46a 100644
--- a/configs/stm32_tiny/usbnsh/defconfig
+++ b/configs/stm32_tiny/usbnsh/defconfig
@@ -566,7 +566,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/stm32f100rc_generic/nsh/defconfig b/configs/stm32f100rc_generic/nsh/defconfig
index 1622990560b..099e72ca0ea 100644
--- a/configs/stm32f100rc_generic/nsh/defconfig
+++ b/configs/stm32f100rc_generic/nsh/defconfig
@@ -477,7 +477,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/stm32f100rc_generic/ostest/defconfig b/configs/stm32f100rc_generic/ostest/defconfig
index ada748730ca..db7f4f9157e 100644
--- a/configs/stm32f100rc_generic/ostest/defconfig
+++ b/configs/stm32f100rc_generic/ostest/defconfig
@@ -464,7 +464,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/stm32f3discovery/nsh/defconfig b/configs/stm32f3discovery/nsh/defconfig
index bcb94dbbbdd..933c82288d6 100644
--- a/configs/stm32f3discovery/nsh/defconfig
+++ b/configs/stm32f3discovery/nsh/defconfig
@@ -574,7 +574,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/stm32f3discovery/ostest/defconfig b/configs/stm32f3discovery/ostest/defconfig
index e48ec05c307..74d5724ae71 100644
--- a/configs/stm32f3discovery/ostest/defconfig
+++ b/configs/stm32f3discovery/ostest/defconfig
@@ -525,7 +525,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/stm32f3discovery/usbnsh/defconfig b/configs/stm32f3discovery/usbnsh/defconfig
index c0a872bfc8c..5484db47671 100644
--- a/configs/stm32f3discovery/usbnsh/defconfig
+++ b/configs/stm32f3discovery/usbnsh/defconfig
@@ -643,7 +643,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/stm32f4discovery/cxxtest/defconfig b/configs/stm32f4discovery/cxxtest/defconfig
index 289c19920e1..e7b0b55b7d1 100644
--- a/configs/stm32f4discovery/cxxtest/defconfig
+++ b/configs/stm32f4discovery/cxxtest/defconfig
@@ -477,7 +477,7 @@ CONFIG_EXAMPLES_CXXTEST_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/stm32f4discovery/elf/defconfig b/configs/stm32f4discovery/elf/defconfig
index fa0d41490ea..5c6cd2475f9 100644
--- a/configs/stm32f4discovery/elf/defconfig
+++ b/configs/stm32f4discovery/elf/defconfig
@@ -543,7 +543,7 @@ CONFIG_EXAMPLES_ELF_DEVPATH="/dev/ram0"
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/stm32f4discovery/kostest/defconfig b/configs/stm32f4discovery/kostest/defconfig
index b9174a86283..f79a54a2774 100644
--- a/configs/stm32f4discovery/kostest/defconfig
+++ b/configs/stm32f4discovery/kostest/defconfig
@@ -564,7 +564,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/stm32f4discovery/nsh/defconfig b/configs/stm32f4discovery/nsh/defconfig
index c95b5cda084..37f5936f122 100644
--- a/configs/stm32f4discovery/nsh/defconfig
+++ b/configs/stm32f4discovery/nsh/defconfig
@@ -643,7 +643,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/stm32f4discovery/nxlines/defconfig b/configs/stm32f4discovery/nxlines/defconfig
index 7dfdae8af5c..aa1a595f782 100644
--- a/configs/stm32f4discovery/nxlines/defconfig
+++ b/configs/stm32f4discovery/nxlines/defconfig
@@ -659,7 +659,7 @@ CONFIG_EXAMPLES_NXLINES_BPP=16
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/stm32f4discovery/ostest/defconfig b/configs/stm32f4discovery/ostest/defconfig
index ce5adf9a8fc..10264c82128 100644
--- a/configs/stm32f4discovery/ostest/defconfig
+++ b/configs/stm32f4discovery/ostest/defconfig
@@ -554,7 +554,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/stm32f4discovery/posix_spawn/defconfig b/configs/stm32f4discovery/posix_spawn/defconfig
index dd6b7b9586d..3261e4438bf 100644
--- a/configs/stm32f4discovery/posix_spawn/defconfig
+++ b/configs/stm32f4discovery/posix_spawn/defconfig
@@ -529,7 +529,7 @@ CONFIG_EXAMPLES_POSIXSPAWN_DEVPATH="/dev/ram0"
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/stm32f4discovery/usbnsh/defconfig b/configs/stm32f4discovery/usbnsh/defconfig
index 3c6dfaaea63..23e60d4705e 100644
--- a/configs/stm32f4discovery/usbnsh/defconfig
+++ b/configs/stm32f4discovery/usbnsh/defconfig
@@ -587,7 +587,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/stm32f4discovery/winbuild/defconfig b/configs/stm32f4discovery/winbuild/defconfig
index 2544dda6eb6..6d552aab6ba 100644
--- a/configs/stm32f4discovery/winbuild/defconfig
+++ b/configs/stm32f4discovery/winbuild/defconfig
@@ -484,7 +484,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/stm32ldiscovery/nsh/defconfig b/configs/stm32ldiscovery/nsh/defconfig
index 57ff9a13bda..d2b3bbc5b6d 100644
--- a/configs/stm32ldiscovery/nsh/defconfig
+++ b/configs/stm32ldiscovery/nsh/defconfig
@@ -559,7 +559,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/sure-pic32mx/README.txt b/configs/sure-pic32mx/README.txt
index 000f13c1305..7e482158e95 100644
--- a/configs/sure-pic32mx/README.txt
+++ b/configs/sure-pic32mx/README.txt
@@ -735,7 +735,7 @@ Where <subdir> is one of the following:
         Drivers->USB Device Driver Support
           CONFIG_CDCACM=y           : Enable the CDCACM device
 
-      examples/usbmsc - There are some hooks in the appconfig file
+      system/usbmsc - There are some hooks in the appconfig file
       to enable the USB mass storage class (MSC)device.  However, this device
       cannot work until support for the SD card is also incorporated.
 
@@ -743,7 +743,7 @@ Where <subdir> is one of the following:
           CONFIG_USBMSC=y           : Enables the USB MSC class
 
         Application Configuration->Examples:
-          CONFIG_EXAMPLES_USBMSC=y  : Enhables apps/examples/usbmsc
+          CONFIG_SYSTEM_USBMSC=y  : Enhables apps/system/usbmsc
 
     3. SD Card Support.
 
diff --git a/configs/sure-pic32mx/nsh/defconfig b/configs/sure-pic32mx/nsh/defconfig
index 85f27ed6b8c..a30837662b4 100644
--- a/configs/sure-pic32mx/nsh/defconfig
+++ b/configs/sure-pic32mx/nsh/defconfig
@@ -568,7 +568,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/sure-pic32mx/ostest/defconfig b/configs/sure-pic32mx/ostest/defconfig
index 11ed18e3810..4296da09654 100644
--- a/configs/sure-pic32mx/ostest/defconfig
+++ b/configs/sure-pic32mx/ostest/defconfig
@@ -563,7 +563,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/sure-pic32mx/usbnsh/defconfig b/configs/sure-pic32mx/usbnsh/defconfig
index 488345ec3fe..31843a6cb69 100644
--- a/configs/sure-pic32mx/usbnsh/defconfig
+++ b/configs/sure-pic32mx/usbnsh/defconfig
@@ -617,7 +617,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/teensy/README.txt b/configs/teensy/README.txt
index 897d3b23483..b76d6b3b3f0 100644
--- a/configs/teensy/README.txt
+++ b/configs/teensy/README.txt
@@ -538,7 +538,7 @@ Where <subdir> is one of the following:
 
   usbmsc:
     This configuration directory exercises the USB mass storage
-    class driver at apps/examples/usbmsc.  See apps/examples/README.txt
+    class driver at apps/system/usbmsc.  See apps/examples/README.txt
     for more information.  NOTE:  THIS CONFIGURATION HAS NOT YET BEEN
     DEBUGGED AND DOES NOT WORK!!!  ISSUES:  (1) THE SPI DRIVER IS UNTESTED,
     (2) THE USB DRIVER IS UNTESTED, AND (3) THE RAM USAGE MIGHT BE EXCESSIVE.
diff --git a/configs/teensy/hello/defconfig b/configs/teensy/hello/defconfig
index 1cb97f3cd82..a6eba19c936 100644
--- a/configs/teensy/hello/defconfig
+++ b/configs/teensy/hello/defconfig
@@ -393,16 +393,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information
diff --git a/configs/teensy/src/up_usbmsc.c b/configs/teensy/src/up_usbmsc.c
index 2743dfbfb48..daed5d13d67 100644
--- a/configs/teensy/src/up_usbmsc.c
+++ b/configs/teensy/src/up_usbmsc.c
@@ -58,8 +58,8 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
+#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
+#  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
 #endif
 
 /* PORT and SLOT number probably depend on the board configuration */
@@ -126,7 +126,7 @@ int usbmsc_archinitialize(void)
 
   message("Binding SPI port to MMC/SD slot\n");
 
-  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1, AVR_MMCSDSLOTNO, spi);
+  ret = mmcsd_spislotinitialize(CONFIG_SYSTEM_USBMSC_DEVMINOR1, AVR_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
       message("mmcsd_spislotinitialize failed: %d\n", ret);
diff --git a/configs/teensy/usbmsc/appconfig b/configs/teensy/usbmsc/appconfig
index 0e5057ce4a4..15316f01477 100644
--- a/configs/teensy/usbmsc/appconfig
+++ b/configs/teensy/usbmsc/appconfig
@@ -35,5 +35,5 @@
 
 # Path to example in apps/examples containing the user_start entry point
 
-CONFIGURED_APPS += examples/usbmsc
+CONFIGURED_APPS += system/usbmsc
 
diff --git a/configs/teensy/usbmsc/defconfig b/configs/teensy/usbmsc/defconfig
index adc626bc4f2..b00d7448ee3 100755
--- a/configs/teensy/usbmsc/defconfig
+++ b/configs/teensy/usbmsc/defconfig
@@ -412,16 +412,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Stack and heap information
diff --git a/configs/twr-k60n512/nsh/defconfig b/configs/twr-k60n512/nsh/defconfig
index 4d4bdb854f8..d702839f0ff 100644
--- a/configs/twr-k60n512/nsh/defconfig
+++ b/configs/twr-k60n512/nsh/defconfig
@@ -491,7 +491,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/twr-k60n512/ostest/defconfig b/configs/twr-k60n512/ostest/defconfig
index e6dbb8a0a04..e5123cec444 100644
--- a/configs/twr-k60n512/ostest/defconfig
+++ b/configs/twr-k60n512/ostest/defconfig
@@ -485,7 +485,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/twr-k60n512/src/up_usbmsc.c b/configs/twr-k60n512/src/up_usbmsc.c
index 41a21beaaca..d0e7f66c257 100644
--- a/configs/twr-k60n512/src/up_usbmsc.c
+++ b/configs/twr-k60n512/src/up_usbmsc.c
@@ -56,8 +56,8 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
+#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
+#  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
 #endif
 
 /* SLOT number(s) could depend on the board configuration */
@@ -105,7 +105,7 @@
 
 int usbmsc_archinitialize(void)
 {
-  /* If examples/usbmsc is built as an NSH command, then SD slot should
+  /* If system/usbmsc is built as an NSH command, then SD slot should
    * already have been initized in nsh_archinitialize() (see up_nsh.c).  In
    * this case, there is nothing further to be done here.
    */
diff --git a/configs/ubw32/nsh/appconfig b/configs/ubw32/nsh/appconfig
index 5760a5b4a38..7faea9c802a 100644
--- a/configs/ubw32/nsh/appconfig
+++ b/configs/ubw32/nsh/appconfig
@@ -55,8 +55,8 @@ ifeq ($(CONFIG_PIC32MX_USBDEV),y)
 # USB Mass Storage Class device configurations
 
 ifeq ($(CONFIG_USBMSC),y)
-#  Uncomment to enable the examples/usbmsc built-in
-#  CONFIGURED_APPS += examples/usbmsc
+#  Uncomment to enable the system/usbmsc built-in
+#  CONFIGURED_APPS += system/usbmsc
 endif
 
 # USB CDC/ACM serial device configurations
diff --git a/configs/ubw32/nsh/defconfig b/configs/ubw32/nsh/defconfig
index 3aba8ab5114..3d1eba7f01a 100644
--- a/configs/ubw32/nsh/defconfig
+++ b/configs/ubw32/nsh/defconfig
@@ -470,16 +470,16 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
 
 #
-# Settings for examples/usbmsc
+# Settings for system/usbmsc
 #
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_SYSTEM_USBMSC_NLUNS=1
+CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
+CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
+CONFIG_SYSTEM_USBMSC_TRACEINIT=n
+CONFIG_SYSTEM_USBMSC_TRACECLASS=n
+CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
+CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
+CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
 
 #
 # Settings for examples/cdcacm
diff --git a/configs/ubw32/ostest/defconfig b/configs/ubw32/ostest/defconfig
index 1d1fe25f677..7e828406897 100644
--- a/configs/ubw32/ostest/defconfig
+++ b/configs/ubw32/ostest/defconfig
@@ -543,7 +543,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
diff --git a/configs/vsn/src/usbmsc.c b/configs/vsn/src/usbmsc.c
index 198e27dea1e..df263afd33a 100644
--- a/configs/vsn/src/usbmsc.c
+++ b/configs/vsn/src/usbmsc.c
@@ -61,8 +61,8 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
+#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
+#  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
 #endif
 
 /* SLOT number(s) could depend on the board configuration */
@@ -131,9 +131,9 @@ int usbmsc_archinitialize(void)
 
   message("usbmsc_archinitialize: "
           "Bind SDIO to the MMC/SD driver, minor=%d\n",
-          CONFIG_EXAMPLES_USBMSC_DEVMINOR1);
+          CONFIG_SYSTEM_USBMSC_DEVMINOR1);
 
-  ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1, sdio);
+  ret = mmcsd_slotinitialize(CONFIG_SYSTEM_USBMSC_DEVMINOR1, sdio);
   if (ret != OK)
     {
       message("usbmsc_archinitialize: "
diff --git a/configs/xtrs/nsh/defconfig b/configs/xtrs/nsh/defconfig
index 8113ba1580b..436edef423e 100644
--- a/configs/xtrs/nsh/defconfig
+++ b/configs/xtrs/nsh/defconfig
@@ -353,7 +353,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/xtrs/ostest/defconfig b/configs/xtrs/ostest/defconfig
index d3b908e7d76..966411e11a3 100644
--- a/configs/xtrs/ostest/defconfig
+++ b/configs/xtrs/ostest/defconfig
@@ -357,7 +357,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/xtrs/pashello/defconfig b/configs/xtrs/pashello/defconfig
index d6d2831ce6b..c723e78aeb9 100644
--- a/configs/xtrs/pashello/defconfig
+++ b/configs/xtrs/pashello/defconfig
@@ -353,7 +353,7 @@ CONFIG_EXAMPLES_PASHELLO=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/z16f2800100zcog/ostest/defconfig b/configs/z16f2800100zcog/ostest/defconfig
index 083887eda3f..40d2a4018e8 100644
--- a/configs/z16f2800100zcog/ostest/defconfig
+++ b/configs/z16f2800100zcog/ostest/defconfig
@@ -396,7 +396,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/z16f2800100zcog/pashello/defconfig b/configs/z16f2800100zcog/pashello/defconfig
index 9a2986c0ca7..f02ddaff9f6 100644
--- a/configs/z16f2800100zcog/pashello/defconfig
+++ b/configs/z16f2800100zcog/pashello/defconfig
@@ -391,7 +391,7 @@ CONFIG_EXAMPLES_PASHELLO=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/z80sim/nsh/defconfig b/configs/z80sim/nsh/defconfig
index 82d2581955e..e77f949a7cb 100644
--- a/configs/z80sim/nsh/defconfig
+++ b/configs/z80sim/nsh/defconfig
@@ -353,7 +353,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/z80sim/ostest/defconfig b/configs/z80sim/ostest/defconfig
index 3650004104e..9004cd4d014 100644
--- a/configs/z80sim/ostest/defconfig
+++ b/configs/z80sim/ostest/defconfig
@@ -357,7 +357,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/z80sim/pashello/defconfig b/configs/z80sim/pashello/defconfig
index 82f9ac96c61..c3780e4a8ed 100644
--- a/configs/z80sim/pashello/defconfig
+++ b/configs/z80sim/pashello/defconfig
@@ -352,7 +352,7 @@ CONFIG_EXAMPLES_PASHELLO=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/z8encore000zco/ostest/defconfig b/configs/z8encore000zco/ostest/defconfig
index 7c22455e270..a7646d3f44d 100644
--- a/configs/z8encore000zco/ostest/defconfig
+++ b/configs/z8encore000zco/ostest/defconfig
@@ -383,7 +383,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/z8f64200100kit/ostest/defconfig b/configs/z8f64200100kit/ostest/defconfig
index cc70ced6161..c9a8094e9c7 100644
--- a/configs/z8f64200100kit/ostest/defconfig
+++ b/configs/z8f64200100kit/ostest/defconfig
@@ -383,7 +383,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/zkit-arm-1769/hello/defconfig b/configs/zkit-arm-1769/hello/defconfig
index cd01e3ceda3..d9cd932c696 100644
--- a/configs/zkit-arm-1769/hello/defconfig
+++ b/configs/zkit-arm-1769/hello/defconfig
@@ -552,7 +552,7 @@ CONFIG_EXAMPLES_HELLO=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WGET is not set
diff --git a/configs/zkit-arm-1769/nsh/defconfig b/configs/zkit-arm-1769/nsh/defconfig
index 2b3da6e4704..730ea2d1dd2 100644
--- a/configs/zkit-arm-1769/nsh/defconfig
+++ b/configs/zkit-arm-1769/nsh/defconfig
@@ -617,7 +617,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WGET is not set
diff --git a/configs/zkit-arm-1769/nxhello/defconfig b/configs/zkit-arm-1769/nxhello/defconfig
index b20eadf2693..ee8877db1d4 100644
--- a/configs/zkit-arm-1769/nxhello/defconfig
+++ b/configs/zkit-arm-1769/nxhello/defconfig
@@ -659,7 +659,7 @@ CONFIG_EXAMPLES_NXHELLO_FONTCOLOR=0xFF
 # CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WGET is not set
diff --git a/configs/zkit-arm-1769/src/up_usbmsc.c b/configs/zkit-arm-1769/src/up_usbmsc.c
index d6a9430da0a..9a4862fd5e9 100644
--- a/configs/zkit-arm-1769/src/up_usbmsc.c
+++ b/configs/zkit-arm-1769/src/up_usbmsc.c
@@ -62,8 +62,8 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_EXAMPLES_USBMSC_DEVMINOR1
-#  define CONFIG_EXAMPLES_USBMSC_DEVMINOR1 0
+#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
+#  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
 #endif
 
 /* PORT and SLOT number probably depend on the board configuration */
@@ -136,7 +136,7 @@ int usbmsc_archinitialize(void)
   message("usbmsc_archinitialize: Binding SPI port %d to MMC/SD slot %d\n",
           LPC17XX_MMCSDSPIPORTNO, LPC17XX_MMCSDSLOTNO);
 
-  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1, LPC17XX_MMCSDSLOTNO, spi);
+  ret = mmcsd_spislotinitialize(CONFIG_SYSTEM_USBMSC_DEVMINOR1, LPC17XX_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
       message("usbmsc_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
diff --git a/configs/zkit-arm-1769/thttpd/defconfig b/configs/zkit-arm-1769/thttpd/defconfig
index 606b9d53e59..305621cbb22 100644
--- a/configs/zkit-arm-1769/thttpd/defconfig
+++ b/configs/zkit-arm-1769/thttpd/defconfig
@@ -555,7 +555,7 @@ CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WGET is not set
diff --git a/configs/zp214xpa/nsh/defconfig b/configs/zp214xpa/nsh/defconfig
index 0ccb3d40d52..afbee451a1f 100644
--- a/configs/zp214xpa/nsh/defconfig
+++ b/configs/zp214xpa/nsh/defconfig
@@ -423,7 +423,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set
diff --git a/configs/zp214xpa/nxlines/defconfig b/configs/zp214xpa/nxlines/defconfig
index 83027ddeffb..c9adae9e492 100644
--- a/configs/zp214xpa/nxlines/defconfig
+++ b/configs/zp214xpa/nxlines/defconfig
@@ -508,7 +508,7 @@ CONFIG_EXAMPLES_NXLINES_EXTERNINIT=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WLAN is not set