diff --git a/Documentation/NuttShell.html b/Documentation/NuttShell.html
index e03aadc7fde902cffb1bad98fc9c71904bdcf4f0..d1dd3d922bd89123be626fa40eefdffe9ce36614 100644
--- a/Documentation/NuttShell.html
+++ b/Documentation/NuttShell.html
@@ -8,7 +8,7 @@
   <tr align="center" bgcolor="#e4e4e4">
     <td>
       <h1><big><font color="#3c34ec"><i>NuttShell (NSH)</i></font></big></h1>
-      <p>Last Updated: March 7, 2011</p>
+      <p>Last Updated: March 18, 2011</p>
     </td>
   </tr>
 </table>
@@ -327,7 +327,9 @@
 </table>
 
 <p>
-  The <code>examples/nsh</code> sub-directory contains the NuttShell (NSH).
+  The <code>apps/nshlib</code> sub-directory contains the NuttShell (NSH)
+  library.
+  This library can easily to linked to produce a NSH application (See as an example <code>apps/nshlib</code>).
   NSH is a simple shell application for NuttX.
 </p>
 
@@ -511,7 +513,7 @@ fi
 <p>
   <b>NSH Start-Up Script</b>.
   NSH supports options to provide a start up script for NSH.  In general
-  this capability is enabled with <code>CONFIG_EXAMPLES_NSH_ROMFSETC</code>, but has
+  this capability is enabled with <code>CONFIG_NSH_ROMFSETC</code>, but has
   several other related configuration options as described with the
   <a href="#nshconfiguration">NSH-specific configuration settings</a>.
   This capability also depends on:
@@ -530,7 +532,7 @@ fi
   values.
 </p>
 <p>
-  In this default case, enabling <code>CONFIG_EXAMPLES_NSH_ROMFSETC</code> will cause
+  In this default case, enabling <code>CONFIG_NSH_ROMFSETC</code> will cause
   NSH to behave as follows at NSH startup time:
   <ul>
     <li>
@@ -580,12 +582,12 @@ mount -t vfat /dev/ram1 /tmp
 </p>
 <p>
   <b>Modifying the ROMFS Image</b>.
-  The contents of the <code>/etc</code> directory are retained in the file <code>examples/nsh/nsh_romfsimg.h</code> OR, if <code>CONFIG_EXAMPLES_NSH_ARCHROMFS</code> is defined, <code>include/arch/board/rcs.template</code>).
+  The contents of the <code>/etc</code> directory are retained in the file <code>apps/nshlib/nsh_romfsimg.h</code> OR, if <code>CONFIG_NSH_ARCHROMFS</code> is defined, <code>include/arch/board/rcs.template</code>).
   In order to modify the start-up behavior, there are three things to study:
   <ol>
     <li>
       <b>Configuration Options.</b>
-      The additional <code>CONFIG_EXAMPLES_NSH_ROMFSETC</code> configuration options
+      The additional <code>CONFIG_NSH_ROMFSETC</code> configuration options
       discussed with the other <a href="#nshconfiguration">NSH-specific configuration settings</a>.
     </li>
     <li>
@@ -602,14 +604,14 @@ mount -t vfat /dev/ram1 /tmp
         <ul>
           <li>The configuration settings then installed configuration.
           <li>The <code>genromfs<code> tool (available from <a href="http://romfs.sourceforge.net">http://romfs.sourceforge.net</a>).
-          <li>The file <code>examples/nsh/rcS.template</code>
-		    (OR, if <code>CONFIG_EXAMPLES_NSH_ARCHROMFS</code> is defined <code>include/arch/board/rcs.template</code>.
+          <li>The file <code>apps/nshlib/rcS.template</code>
+		    (OR, if <code>CONFIG_NSH_ARCHROMFS</code> is defined <code>include/arch/board/rcs.template</code>.
         </ul>
       </p>
     </li>
     <li>
       <b><code>rcS.template</code></b>.
-      The file <code>examples/nsh/rcS.template</code> contains the general form
+      The file <code>apps/nshlib/rcS.template</code> contains the general form
       of the <code>rcS</code> file; configured values are plugged into this
       template file to produce the final <code>rcS</code> file.
     </li>
@@ -617,8 +619,8 @@ mount -t vfat /dev/ram1 /tmp
 </p>
 <p>
   <b>NOTE</b>:
-  <code>examples/nsh/rcS.template</code> generates the standard, default <code>nsh_romfsimg.h</code> file.
-  If <code>CONFIG_EXAMPLES_NSH_ARCHROMFS<code> is defined in the NuttX configuration file, then a custom, board-specific <code>nsh_romfsimg.h</code> file residing in <code>configs/&lt;board&gt;/include</code> will be used.
+  <code>apps/nshlib/rcS.template</code> generates the standard, default <code>nsh_romfsimg.h</code> file.
+  If <code>CONFIG_NSH_ARCHROMFS<code> is defined in the NuttX configuration file, then a custom, board-specific <code>nsh_romfsimg.h</code> file residing in <code>configs/&lt;board&gt;/include</code> will be used.
   NOTE when the OS is configured, <code>include/arch/board</code> will be linked to <code>configs/&lt;board&gt;/include</code>.
 </p>
 <p>
@@ -1817,192 +1819,192 @@ nsh>
   </tr>
   <tr>
     <td><b><code>[</code></b></td>
-    <td>!<code>CONFIG_EXAMPLES_NSH_DISABLESCRIPT</code></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_TEST</code></td>
+    <td>!<code>CONFIG_NSH_DISABLESCRIPT</code></td>
+    <td><code>CONFIG_NSH_DISABLE_TEST</code></td>
   </tr>
   <tr>
     <td><b><code>cat</code></b></td>
     <td><code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0</td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_CAT</code></td>
+    <td><code>CONFIG_NSH_DISABLE_CAT</code></td>
   </tr>
   <tr>
     <td><b><code>cd</code></b></td>
     <td>!<code>CONFIG_DISABLE_ENVIRON</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0</td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_CD</code></td>
+    <td><code>CONFIG_NSH_DISABLE_CD</code></td>
   </tr>
   <tr>
     <td><b><code>cp</code></b></td>
     <td><code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0</td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_CP</code></td>
+    <td><code>CONFIG_NSH_DISABLE_CP</code></td>
   </tr>
   <tr>
     <td><b><code>dd</code></b></td>
     <td><code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0</td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_DD</code></td>
+    <td><code>CONFIG_NSH_DISABLE_DD</code></td>
   </tr>
   <tr>
     <td><b><code>echo</code></b></td>
     <td><br></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_ECHO</code></td>
+    <td><code>CONFIG_NSH_DISABLE_ECHO</code></td>
   </tr>
   <tr>
     <td><b><code>exec</code></b></td>
     <td><br></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_EXEC</code></td>
+    <td><code>CONFIG_NSH_DISABLE_EXEC</code></td>
   </tr>
   <tr>
     <td><b><code>exit</code></b></td>
     <td><br></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_EXIT</code></td>
+    <td><code>CONFIG_NSH_DISABLE_EXIT</code></td>
   </tr>
   <tr>
     <td><b><code>free</code></b></td>
     <td><br></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_FREE</code></td>
+    <td><code>CONFIG_NSH_DISABLE_FREE</code></td>
   </tr>
   <tr>
     <td><b><code>get</code></b></td>
     <td><code>CONFIG_NET</code> &amp;&amp; <code>CONFIG_NET_UDP</code> &amp;&amp;
         <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_NET_BUFSIZE</code> &gt;= 558<sup>1</sup></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_GET</code></td>
+    <td><code>CONFIG_NSH_DISABLE_GET</code></td>
   </tr>
   <tr>
     <td><b><code>help</code></b></td>
     <td><br></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_HELP</code></td>
+    <td><code>CONFIG_NSH_DISABLE_HELP</code></td>
   </tr>
   <tr>
     <td><b><code>ifconfig</code></b></td>
     <td><code>CONFIG_NET</code></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_IFCONFIG</code></td>
+    <td><code>CONFIG_NSH_DISABLE_IFCONFIG</code></td>
   </tr>
   <tr>
     <td><b><code>kill</code></b></td>
     <td>!<code>CONFIG_DISABLE_SIGNALS</code></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_KILL</code></td>
+    <td><code>CONFIG_NSH_DISABLE_KILL</code></td>
   </tr>
   <tr>
     <td><b><code>losetup</code></b></td>
     <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0</td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_LOSETUP</code></td>
+    <td><code>CONFIG_NSH_DISABLE_LOSETUP</code></td>
   </tr>
   <tr>
     <td><b><code>ls</code></b></td>
     <td><code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0</td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_LS</code></td>
+    <td><code>CONFIG_NSH_DISABLE_LS</code></td>
   </tr>
   <tr>
     <td><b><code>mb,mh,mw</code></b></td>
     <td><br></td>
     <td>
-      <code>CONFIG_EXAMPLES_NSH_DISABLE_MB</code>,<br>
-      <code>CONFIG_EXAMPLES_NSH_DISABLE_MH</code>,<br>
-      <code>CONFIG_EXAMPLES_NSH_DISABLE_MW</code>
+      <code>CONFIG_NSH_DISABLE_MB</code>,<br>
+      <code>CONFIG_NSH_DISABLE_MH</code>,<br>
+      <code>CONFIG_NSH_DISABLE_MW</code>
     </td>
   </tr>
   <tr>
     <td><b><code>mkdir</code></b></td>
     <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_FS_WRITABLE</code><sup>4</sup></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_MKDIR</code></td>
+    <td><code>CONFIG_NSH_DISABLE_MKDIR</code></td>
   </tr>
   <tr>
     <td><b><code>mkfatfs</code></b></td>
     <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_FS_FAT</code></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_MKFATFS</code></td>
+    <td><code>CONFIG_NSH_DISABLE_MKFATFS</code></td>
   </tr>
   <tr>
     <td><b><code>mkfifo</code></b></td>
     <td><code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0</td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_MKFIFO</code></td>
+    <td><code>CONFIG_NSH_DISABLE_MKFIFO</code></td>
   </tr>
   <tr>
     <td><b><code>mkrd</code></b></td>
     <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_FS_WRITABLE</code><sup>4</sup></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_MKRD</code></td>
+    <td><code>CONFIG_NSH_DISABLE_MKRD</code></td>
   </tr>
   <tr>
     <td><b><code>mount</code></b></td>
     <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_FS_READABLE</code><sup>3</sup></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_MOUNT</code></td>
+    <td><code>CONFIG_NSH_DISABLE_MOUNT</code></td>
   </tr>
   <tr>
     <td><b><code>ping</code></b></td>
     <td><code>CONFIG_NET</code> &amp;&amp; <code>CONFIG_NET_ICMP</code> &amp;&amp;
         <code>CONFIG_NET_ICMP_PING</code>  &amp;&amp; !<code>CONFIG_DISABLE_CLOCK</code> &amp;&amp;
         !<code>CONFIG_DISABLE_SIGNALS</code></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_PING</code></td>
+    <td><code>CONFIG_NSH_DISABLE_PING</code></td>
   </tr>
   <tr>
     <td><b><code>ps</code></b></td>
     <td><br></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_PS</code></td>
+    <td><code>CONFIG_NSH_DISABLE_PS</code></td>
   </tr>
   <tr>
     <td><b><code>put</code></b></td>
     <td><code>CONFIG_NET</code> &amp;&amp; <code>CONFIG_NET_UDP</code> &amp;&amp;
     <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_NET_BUFSIZE</code> &gt;= 558<sup>1,2</sup></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_PUT</code></td>
+    <td><code>CONFIG_NSH_DISABLE_PUT</code></td>
   </tr>
   <tr>
     <td><b><code>pwd</code></b></td>
     <td>!<code>CONFIG_DISABLE_ENVIRON</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0</td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_PWD</code></td>
+    <td><code>CONFIG_NSH_DISABLE_PWD</code></td>
   </tr>
   <tr>
     <td><b><code>rm</code></b></td>
     <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_FS_WRITABLE</code><sup>4</sup></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_RM</code></td>
+    <td><code>CONFIG_NSH_DISABLE_RM</code></td>
   </tr>
   <tr>
     <td><b><code>rmdir</code></b></td>
     <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_FS_WRITABLE</code><sup>4</sup></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_RMDIR</code></td>
+    <td><code>CONFIG_NSH_DISABLE_RMDIR</code></td>
   </tr>
   <tr>
     <td><b><code>set</code></b></td>
     <td>!<code>CONFIG_DISABLE_ENVIRON</code></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_SET</code></td>
+    <td><code>CONFIG_NSH_DISABLE_SET</code></td>
   </tr>
   <tr>
     <td><b><code>sh</code></b></td>
-    <td><code>CONFIG_NFILE_DESCRIPTORS &gt; 0 &amp;&amp; <code>CONFIG_NFILE_STREAMS &gt; 0 &amp;&amp; !<code>CONFIG_EXAMPLES_NSH_DISABLESCRIPT</code></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_SH</code></td>
+    <td><code>CONFIG_NFILE_DESCRIPTORS &gt; 0 &amp;&amp; <code>CONFIG_NFILE_STREAMS &gt; 0 &amp;&amp; !<code>CONFIG_NSH_DISABLESCRIPT</code></td>
+    <td><code>CONFIG_NSH_DISABLE_SH</code></td>
   </tr>
   <tr>
     <td><b><code>sleep</code></b></td>
     <td>!<code>CONFIG_DISABLE_SIGNALS</code></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_SLEEP</code></td>
+    <td><code>CONFIG_NSH_DISABLE_SLEEP</code></td>
   </tr>
   <tr>
     <td><b><code>test</code></b></td>
-    <td>!<code>CONFIG_EXAMPLES_NSH_DISABLESCRIPT</code></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_TEST</code></td>
+    <td>!<code>CONFIG_NSH_DISABLESCRIPT</code></td>
+    <td><code>CONFIG_NSH_DISABLE_TEST</code></td>
   </tr>
   <tr>
     <td><b><code>umount</code></b></td>
     <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_FS_READABLE</code><sup>3</sup></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_UMOUNT</code></td>
+    <td><code>CONFIG_NSH_DISABLE_UMOUNT</code></td>
   </tr>
   <tr>
     <td><b><code>unset</code></b></td>
     <td>!<code>CONFIG_DISABLE_ENVIRON</code></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_UNSET</code></td>
+    <td><code>CONFIG_NSH_DISABLE_UNSET</code></td>
   </tr>
   <tr>
     <td><b><code>usleep</code></b></td>
     <td>!<code>CONFIG_DISABLE_SIGNALS</code></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_USLEEP</code></td>
+    <td><code>CONFIG_NSH_DISABLE_USLEEP</code></td>
   </tr>
   <tr>
     <td><b><code>wget</code></b></td>
     <td><code>CONFIG_NET</code> &amp;&amp; <code>CONFIG_NET_TCP</code> &amp;&amp;
         <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0</td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_WGET</code></td>
+    <td><code>CONFIG_NSH_DISABLE_WGET</code></td>
   </tr>
   <tr>
     <td><b><code>xd</code></b></td>
     <td><br></td>
-    <td><code>CONFIG_EXAMPLES_NSH_DISABLE_XD</code></td>
+    <td><code>CONFIG_NSH_DISABLE_XD</code></td>
   </tr>
 </table></center>
 
@@ -2039,28 +2041,28 @@ nsh>
     <th align="left">Description</th>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_FILEIOSIZE</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_FILEIOSIZE</code></b></td>
     <td>
       Size of a static I/O buffer used for file access (ignored if
       there is no filesystem). Default is 1024.
     </td>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_STRERROR</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_STRERROR</code></b></td>
     <td>
       strerror(errno) makes more readable output but strerror() is
       very large and will not be used unless this setting is <i>y</i>
     </td>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_LINELEN</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_LINELEN</code></b></td>
     <td>
       The maximum length of one command line and of one output line.
       Default: 80
     </td>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_STACKSIZE</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_STACKSIZE</code></b></td>
     <td>
       The stack size to use when spawning new threads or tasks.  Such
       new threads are generated when a command is executed in background
@@ -2068,14 +2070,14 @@ nsh>
     </td>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_NESTDEPTH</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_NESTDEPTH</code></b></td>
     <td>
       The maximum number of nested <a href="#conditional"><code>if-then[-else]-fi</code></a> sequences that
       are permissable.  Default: 3
     </td>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_DISABLESCRIPT</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_DISABLESCRIPT</code></b></td>
     <td>
       This can be set to <i>y</i> to suppress support for scripting.  This
       setting disables the <a href="#cmdsh"><code>sh</code></a>, <a href="#cmdtest"><code>test</code></a>, and <a href="#cmtest"><code>[</code></a> commands and the
@@ -2084,7 +2086,7 @@ nsh>
     </td>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_DISABLEBG</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_DISABLEBG</code></b></td>
     <td>
       This can be set to <i>y</i> to suppress support for background
       commands.  This setting disables the <a href="#cmdoverview"><code>nice</code></a> command prefix and
@@ -2093,7 +2095,7 @@ nsh>
     </td>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_MMCSDMINOR</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_MMCSDMINOR</code></b></td>
     <td>
       If the architecture supports an MMC/SD slot and if the NSH
       architecture specific logic is present, this option will provide
@@ -2103,7 +2105,7 @@ nsh>
     </td>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_ROMFSETC</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_ROMFSETC</code></b></td>
     <td>
       Mount a ROMFS filesystem at <code>/etc</code> and provide a startup script
       at <code>/etc/init.d/rcS</code>.  The default startup script will mount
@@ -2112,25 +2114,25 @@ nsh>
     </td>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_CONSOLE</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_CONSOLE</code></b></td>
     <td>
-      If <code>CONFIG_EXAMPLES_NSH_CONSOLE</code>is set to <i>y</i>, then a serial
+      If <code>CONFIG_NSH_CONSOLE</code>is set to <i>y</i>, then a serial
       console front-end is selected.
     </td>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_TELNET</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_TELNET</code></b></td>
     <td>
-      If <code>CONFIG_EXAMPLES_NSH_TELNET</code> is set to <i>y</i>, then a TELENET
+      If <code>CONFIG_NSH_TELNET</code> is set to <i>y</i>, then a TELENET
       server front-end is selected.  When this option is provided,
       you may log into NuttX remotely using telnet in order to
       access NSH.
     </td>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_ARCHINIT</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_ARCHINIT</code></b></td>
     <td>
-      Set <code>CONFIG_EXAMPLES_NSH_ARCHINIT</code> if your board provides architecture
+      Set <code>CONFIG_NSH_ARCHINIT</code> if your board provides architecture
       specific initialization  via the board-specific function <code>nsh_archinitialize()</code>.
       This function will be called early in NSH initialization to allow board logic to
       do such things as configure MMC/SD slots.
@@ -2139,8 +2141,8 @@ nsh>
 </table></center>
 
 <p>
-  One or both of <code>CONFIG_EXAMPLES_NSH_CONSOLE</code> and <code>CONFIG_EXAMPLES_NSH_TELNET</code>
-  must be defined.  If <code>CONFIG_EXAMPLES_NSH_TELNET</code> is selected, then there some
+  One or both of <code>CONFIG_NSH_CONSOLE</code> and <code>CONFIG_NSH_TELNET</code>
+  must be defined.  If <code>CONFIG_NSH_TELNET</code> is selected, then there some
   other configuration settings that apply:
 </p>
 
@@ -2167,39 +2169,39 @@ nsh>
       TCP/IP support is required for telnet (as well as various other TCP-related configuration settings).
     </td>
   </tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_IOBUFFER_SIZE</code></b></td>
     <td>
       Determines the size of the I/O buffer to use for sending/
       receiving TELNET commands/reponses
     </td>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_DHCPC</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_DHCPC</code></b></td>
     <td>
       Obtain the IP address via DHCP.
     </td>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_IPADDR</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_IPADDR</code></b></td>
     <td>
-      If <code>CONFIG_EXAMPLES_NSH_DHCPC</code> is NOT set, then the static IP
+      If <code>CONFIG_NSH_DHCPC</code> is NOT set, then the static IP
       address must be provided.
     </td>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_DRIPADDR</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_DRIPADDR</code></b></td>
     <td>
       Default router IP address
     </td>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_NETMASK</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_NETMASK</code></b></td>
     <td>
       Network mask
     </td>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_NOMAC</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_NOMAC</code></b></td>
     <td>
       Set if your ethernet hardware has no built-in MAC address.
       If set, a bogus MAC will be assigned.
@@ -2251,7 +2253,7 @@ nsh>
 </table></center>
 
 <p>
-  If <code>CONFIG_EXAMPLES_NSH_ROMFSETC</code> is selected, then the following additional
+  If <code>CONFIG_NSH_ROMFSETC</code> is selected, then the following additional
   configuration setting apply:
 </p>
 
@@ -2261,13 +2263,13 @@ nsh>
     <th align="left">Description</th>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_ARCHROMFS</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_ARCHROMFS</code></b></td>
     <td>
       May be defined to specify an alternative ROMFS image that can be found at <code>configs/&lt;board&gt;/include/nsh_romfsimg.h</code>.
     </td>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_ROMFSMOUNTPT</code></b></td>
     <td>
       The default mountpoint for the ROMFS volume is <code>&quot;/etc&quot;</code>, but that
       can be changed with this setting.  This must be a absolute path
@@ -2275,7 +2277,7 @@ nsh>
     </td>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_INITSCRIPT</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_INITSCRIPT</code></b></td>
     <td>
       This is the relative path to the startup script within the mountpoint.
       The default is <code>&quot;init.d/rcS&quot;</code>.  This is a relative path and must not
@@ -2283,14 +2285,14 @@ nsh>
     </td>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_ROMFSDEVNO</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_ROMFSDEVNO</code></b></td>
     <td>
       This is the minor number of the ROMFS block device.  The default is
       '<code>0</code>' corresponding to <code>/dev/ram0</code>.
     </td>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_ROMFSSECTSIZE</code></b></td>
     <td>
       This is the sector size to use with the ROMFS volume.  Since the
       default volume is very small, this defaults to 64 but should be
@@ -2301,7 +2303,7 @@ nsh>
 </table></center>
 
 <p>
-  When the default <code>rcS</code> file used when <code>CONFIG_EXAMPLES_NSH_ROMFSETC</code> is
+  When the default <code>rcS</code> file used when <code>CONFIG_NSH_ROMFSETC</code> is
   selected, it will mount a FAT FS under <code>/tmp</code>.  The following selections
   describe that FAT FS.
 </p>
@@ -2312,14 +2314,14 @@ nsh>
     <th align="left">Description</th>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_FATDEVNO</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_FATDEVNO</code></b></td>
     <td>
       This is the minor number of the FAT FS block device.  The default is
       '<code>1</code>' corresponding to <code>/dev/ram1</code>.
     </td>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_FATSECTSIZE</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_FATSECTSIZE</code></b></td>
     <td>
       This is the sector size use with the FAT FS. Default is 512.
     </td>
@@ -2346,31 +2348,31 @@ nsh>
   <li><a href="#cmdcd"><code>cd</code></a></li>
   <li><a href="#commands">Command summaries</a></li>
   <li><a href="#conditional">Conditional command execution</a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_CONSOLE</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_DHCPC</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_DISABLEBG</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_DISABLESCRIPT</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_DRIPADDR</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_FATDEVNO</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_FATMOUNTPT</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_FATNSECTORS</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_FATSECTSIZE</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_FILEIOSIZE</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_INITSCRIPT</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_IPADDR</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_LINELEN</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_NESTDEPTH</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_NETMASK</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_NOMAC</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_ROMFSDEVNO</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_ROMFSETC</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_ARCHROMFS</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_STACKSIZE</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_STRERROR</code></a></li>
-  <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_TELNET</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_CONSOLE</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_DHCPC</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_DISABLEBG</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_DISABLESCRIPT</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_DRIPADDR</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_FATDEVNO</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_FATMOUNTPT</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_FATNSECTORS</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_FATSECTSIZE</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_FILEIOSIZE</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_INITSCRIPT</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_IOBUFFER_SIZE</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_IPADDR</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_LINELEN</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_NESTDEPTH</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_NETMASK</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_NOMAC</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_ROMFSDEVNO</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_ROMFSETC</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_ARCHROMFS</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_ROMFSMOUNTPT</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_ROMFSSECTSIZE</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_STACKSIZE</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_STRERROR</code></a></li>
+  <li><a href="#nshconfiguration"><code>CONFIG_NSH_TELNET</code></a></li>
   <li><a href="#configuration">Configuration settings</a></li>
   <li><a href="#cmddependencies">Configuration settings, command dependencies</a></li>
   <li><a href="#nshconfiguration">Configuration settings, NSH-specific</a></li>
diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 6e5c1d565106280f5fdabb72413801f552bf1a7f..ae26bf3a22db48f4852942d71695f9c5bc29f634 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -1847,21 +1847,21 @@ extern void up_ledoff(int led);
     indirectly through the <code>mount()</code> API.
     The <code>mount()</code> API binds a block driver instance with a file system and with a mountpoint.
     Then the user may use the block driver to access the file system on the underlying media.
-    <i>Example</i>: See the <code>cmd_mount()</code> implementation in <code>examples/nsh/nsh_fscmds.c</code>.
+    <i>Example</i>: See the <code>cmd_mount()</code> implementation in <code>apps/nshlib/nsh_fscmds.c</code>.
     </p>
   </li>
   <li>
     <p>
     <b>Accessing a Character Driver as a Block Device</b>.
     See the loop device at <code>drivers/loop.c</code>.
-    <i>Example</i>: See the <code>cmd_losetup()</code> implementation in <code>examples/nsh/nsh_fscmds.c</code>.
+    <i>Example</i>: See the <code>cmd_losetup()</code> implementation in <code>apps/nshlib/nsh_fscmds.c</code>.
     </p>
   </li>
   <li>
     <p>
     <b>Accessing a Block Driver as Character Device</b>.
     See the Block-to-Character (BCH) conversion logic in <code>drivers/bch/</code>.
-    <i>Example</i>: See the <code>cmd_dd()</code> implementation in <code>examples/nsh/nsh_ddcmd.c</code>.
+    <i>Example</i>: See the <code>cmd_dd()</code> implementation in <code>apps/nshlib/nsh_ddcmd.c</code>.
     </p>
   </li>
   <li>
diff --git a/TODO b/TODO
index ee9638a0b12cc1491b63ad4df80b155065fa85b2..b2a3c7317142d201fe12d041ad3b283fe75ca741 100644
--- a/TODO
+++ b/TODO
@@ -17,7 +17,7 @@ NuttX TODO List (Last updated March 16 2011)
   (1)  Pascal add-on (pcode/)
   (1)  Documentation (Documentation/)
   (5)  Build system / Toolchains
-  (4)  NuttShell (NSH) (examples/nsh)
+  (4)  NuttShell (NSH) (apps/nshlib)
   (3)  Other Applications & Tests (examples/)
   (7)  Linux/Cywgin simulation (arch/sim)
   (3)  ARM (arch/arm/)
@@ -226,7 +226,7 @@ o Network (net/, drivers/net)
   Priority:    Medium
 
   Description: Need to standardize collection of statistics from network
-               drivers.  examples/nsh ifconfig command should present
+               drivers.  apps/nshlib ifconfig command should present
                statistics.
   Status:      Open
   Priority:    Low
@@ -237,7 +237,7 @@ o Network (net/, drivers/net)
                solution is simple: A mutex will be needed to make sure that each 
                send that is started is able to be the exclusive sender until all of
                the data to be sent has been ACKed.
-  Status:      Open.  There is some temporary logic to examples/nsh that does
+  Status:      Open.  There is some temporary logic to apps/nshlib that does
                this same fix and that temporary logic should be removed when
                send() is fixed.
   Priority:    Medium-Low.  This is an important issue for applications that
@@ -551,8 +551,8 @@ o Build system
   Priority:    High if you are using NX and a newer compiler.
                
 
-o NuttShell (NSH) (examples/nsh)
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+o NuttShell (NSH) (apps/nshlib)
+  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
   Description: When the telnetd front end is received, each TCP packet
                received causes a prompt (nsh >) to be presented.  The
diff --git a/configs/avr32dev1/nsh/defconfig b/configs/avr32dev1/nsh/defconfig
index cacd37b180434d92039b3ef1b2057903fe16d998..27e791eba1fe82249639d89b0bb97fe866d2ebf9 100755
--- a/configs/avr32dev1/nsh/defconfig
+++ b/configs/avr32dev1/nsh/defconfig
@@ -670,71 +670,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=1024
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=1024
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=1024
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/avr32dev1/ostest/defconfig b/configs/avr32dev1/ostest/defconfig
index d42dc96dcdd238a05862690f82e32f7496e00932..58eb351f78a3eb36ef2aa5a435f4da31d58f91d0 100755
--- a/configs/avr32dev1/ostest/defconfig
+++ b/configs/avr32dev1/ostest/defconfig
@@ -670,71 +670,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=1024
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/c5471evm/defconfig b/configs/c5471evm/defconfig
index 15d5f7f068a00734a3102729a015b8243ad0e390..9ecfa331b87be1b31ec929677cd90149b8a85996 100644
--- a/configs/c5471evm/defconfig
+++ b/configs/c5471evm/defconfig
@@ -400,16 +400,16 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1)
 
 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Settings for examples/wget
diff --git a/configs/c5471evm/dhcpconfig b/configs/c5471evm/dhcpconfig
index ccfa1e7aa89fd796e3350c9ce1f477ed0ff48647..fcad5b52ad0b6860b123eb76a7fce58f50a1a769 100644
--- a/configs/c5471evm/dhcpconfig
+++ b/configs/c5471evm/dhcpconfig
@@ -400,16 +400,16 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1)
 
 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Settings for examples/wget
diff --git a/configs/c5471evm/netconfig b/configs/c5471evm/netconfig
index b28b4c4e97638c24b4abc6207be4e2a3f2a8584c..657c04885c3208cd254ecb653babc82fb6bc4b06 100644
--- a/configs/c5471evm/netconfig
+++ b/configs/c5471evm/netconfig
@@ -400,16 +400,16 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1)
 
 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Settings for examples/wget
diff --git a/configs/c5471evm/nshconfig b/configs/c5471evm/nshconfig
index b557874da3fd950dc7af1d6ec7fd84f6e7853a65..7c5ab6fa58cad308889d0073fa6795bfb4df81b9 100644
--- a/configs/c5471evm/nshconfig
+++ b/configs/c5471evm/nshconfig
@@ -400,16 +400,16 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1)
 
 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=n
-CONFIG_EXAMPLES_NSH_TELNET=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=n
+CONFIG_NSH_TELNET=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Settings for examples/wget
diff --git a/configs/demo9s12ne64/ostest/defconfig b/configs/demo9s12ne64/ostest/defconfig
index 21151bb63eaaae43f7f0c8b6181b9bc264c1a57e..c986c1a54de2924bcd991f501638195f945e8ddd 100755
--- a/configs/demo9s12ne64/ostest/defconfig
+++ b/configs/demo9s12ne64/ostest/defconfig
@@ -645,71 +645,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=512
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=512
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=512
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/demo9s12ne64/src/Makefile b/configs/demo9s12ne64/src/Makefile
index 7ae8ccc8a3c8f4eaf55d4bbe6ee7242ee7229cc0..f63df97198136356095e701180de2205290fe159 100755
--- a/configs/demo9s12ne64/src/Makefile
+++ b/configs/demo9s12ne64/src/Makefile
@@ -41,7 +41,7 @@ ASRCS		=
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 
 CSRCS		= up_boot.c up_leds.c up_buttons.c up_spi.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
 COBJS		= $(CSRCS:.c=$(OBJEXT))
diff --git a/configs/detron/hidkbd/defconfig b/configs/detron/hidkbd/defconfig
index b0e767579ea143f3d379f00bed770904ca1e4d15..f432dc2ce0c0d2af684597cff5415d8ac675b003 100755
--- a/configs/detron/hidkbd/defconfig
+++ b/configs/detron/hidkbd/defconfig
@@ -768,71 +768,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/detron/nsh/defconfig b/configs/detron/nsh/defconfig
index 3480dd7797a7893011471c15027f884519642d6b..af2e99c27cdaef1a89039213743f10b46eb2c090 100755
--- a/configs/detron/nsh/defconfig
+++ b/configs/detron/nsh/defconfig
@@ -775,71 +775,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/detron/ostest/defconfig b/configs/detron/ostest/defconfig
index 60907131195d870849282a87fcb9fb61f44dda13..9f45c1c05b27dee3fcc8f83a110865f33fd1efa7 100755
--- a/configs/detron/ostest/defconfig
+++ b/configs/detron/ostest/defconfig
@@ -702,71 +702,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/detron/src/Makefile b/configs/detron/src/Makefile
index 1d6d01355a31021b0a21d7686448892921be0e48..dbae8322654bea06b4f7385f8112257ad4db9e7c 100755
--- a/configs/detron/src/Makefile
+++ b/configs/detron/src/Makefile
@@ -39,7 +39,7 @@ CFLAGS		+= -I$(TOPDIR)/sched
 
 ASRCS		= 
 CSRCS		= up_boot.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
 
diff --git a/configs/detron/src/up_nsh.c b/configs/detron/src/up_nsh.c
index cac549ee7a34b7fd8175e92b8440e33f4b07f298..5a74f8d739347f34a9420cafcbe03bf38284fed4 100755
--- a/configs/detron/src/up_nsh.c
+++ b/configs/detron/src/up_nsh.c
@@ -59,37 +59,37 @@
 /* Configuration ************************************************************/
 
 #ifdef CONFIG_ARCH_BOARD_DETRON
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
-#  define CONFIG_EXAMPLES_NSH_HAVEUSBHOST 1
+#  undef CONFIG_NSH_HAVEMMCSD
+#  define CONFIG_NSH_HAVEUSBHOST 1
 #else
 #  error "Unrecognized board"
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBHOST
+#  undef CONFIG_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEUSBHOST
 #endif
 
 /* Can't support MMC/SD features if mountpoints are disabled */
 
 #if defined(CONFIG_DISABLE_MOUNTPOINT)
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
 /* MMC/SD PORT and SLOT number probably depend on the board configuration */
 
-#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 0
+#ifdef CONFIG_NSH_HAVEMMCSD
+#  if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0
 #    error "The Detron MMC/SD is on SSP0"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 0
+#    undef CONFIG_NSH_MMCSDSPIPORTNO
+#    define CONFIG_NSH_MMCSDSPIPORTNO 0
 #  endif
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
+#  if !defined(CONFIG_NSH_MMCSDSLOTNO) || CONFIG_NSH_MMCSDSLOTNO != 0
 #    error "The Detron MMC/SD is only one slot (0)"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
+#    undef CONFIG_NSH_MMCSDSLOTNO
+#    define CONFIG_NSH_MMCSDSLOTNO 0
 #  endif
 #endif
 
-#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR
-#  define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0
+#ifndef CONFIG_NSH_MMCSDMINOR
+#  define CONFIG_NSH_MMCSDMINOR 0
 #endif
 
 /* USB Host */
@@ -107,10 +107,10 @@
 #endif
 
 #if !defined(CONFIG_USBHOST) || !defined(CONFIG_LPC17_USBHOST)
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBHOST
+#  undef CONFIG_NSH_HAVEUSBHOST
 #endif
 
-#ifdef CONFIG_EXAMPLES_NSH_HAVEUSBHOST
+#ifdef CONFIG_NSH_HAVEUSBHOST
 #  ifndef CONFIG_USBHOST_DEFPRIO
 #    define CONFIG_USBHOST_DEFPRIO 50
 #  endif
@@ -139,7 +139,7 @@
  * Private Data
  ****************************************************************************/
 
-#ifdef CONFIG_EXAMPLES_NSH_HAVEUSBHOST
+#ifdef CONFIG_NSH_HAVEUSBHOST
 static struct usbhost_driver_s *g_drvr;
 #endif
 
@@ -155,7 +155,7 @@ static struct usbhost_driver_s *g_drvr;
  *
  ****************************************************************************/
 
-#ifdef CONFIG_EXAMPLES_NSH_HAVEUSBHOST
+#ifdef CONFIG_NSH_HAVEUSBHOST
 static int nsh_waiter(int argc, char *argv[])
 {
   bool connected = false;
@@ -196,7 +196,7 @@ static int nsh_waiter(int argc, char *argv[])
  *
  ****************************************************************************/
 
-#ifdef CONFIG_EXAMPLES_NSH_HAVEUSBHOST
+#ifdef CONFIG_NSH_HAVEUSBHOST
 static int nsh_usbhostinitialize(void)
 {
   int pid;
@@ -254,7 +254,7 @@ static int nsh_usbhostinitialize(void)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#ifdef CONFIG_NSH_HAVEMMCSD
 int nsh_sdinitialize(void)
 {
   FAR struct spi_dev_s *ssp;
@@ -262,29 +262,29 @@ int nsh_sdinitialize(void)
 
   /* Get the SSP port */
 
-  ssp = up_spiinitialize(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+  ssp = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
   if (!ssp)
     {
       message("nsh_archinitialize: Failed to initialize SSP port %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+              CONFIG_NSH_MMCSDSPIPORTNO);
       return -ENODEV;
     }
 
   message("Successfully initialized SSP port %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO);
 
   /* Bind the SSP port to the slot */
 
-  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, ssp);
+  ret = mmcsd_spislotinitialize(CONFIG_NSH_MMCSDMINOR, CONFIG_NSH_MMCSDSLOTNO, ssp);
   if (ret < 0)
     {
       message("nsh_archinitialize: Failed to bind SSP port %d to MMC/SD slot %d: %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, ret);
+              CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO, ret);
       return ret;
     }
 
   message("Successfuly bound SSP port %d to MMC/SD slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO);
   return OK;
 }
 #else
diff --git a/configs/detron/wlan/defconfig b/configs/detron/wlan/defconfig
index 504fe356b774840817350645565f29715a06f451..aa298ae0e7bcf6539ab9f2ed3384809d032b73aa 100755
--- a/configs/detron/wlan/defconfig
+++ b/configs/detron/wlan/defconfig
@@ -774,71 +774,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/ea3131/nsh/defconfig b/configs/ea3131/nsh/defconfig
index 15bf7abc9022cce5b5352fd719039400236d3b81..a6f47266ee16034cceaf9b95699ab99e0360dc0f 100755
--- a/configs/ea3131/nsh/defconfig
+++ b/configs/ea3131/nsh/defconfig
@@ -654,71 +654,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/ea3131/ostest/defconfig b/configs/ea3131/ostest/defconfig
index 0688c1e81b0c7418cf434219fe6030968916f0a5..2f81e3961e41d34c68ee56608d13c94148f3a26f 100755
--- a/configs/ea3131/ostest/defconfig
+++ b/configs/ea3131/ostest/defconfig
@@ -654,71 +654,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig
index 676e59419e8cdbe9c2d8d2cef399f5fd3385f7fe..5d4a54ab1e8602509aa6f60dae52453879a61a7c 100755
--- a/configs/ea3131/pgnsh/defconfig
+++ b/configs/ea3131/pgnsh/defconfig
@@ -799,71 +799,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/ea3131/src/Makefile b/configs/ea3131/src/Makefile
index d624bd3ea62dc9b4df45a0e756a1396b39989e64..cb3cc3da8d9cfea7c8fe300619a9d7bca52c25d6 100755
--- a/configs/ea3131/src/Makefile
+++ b/configs/ea3131/src/Makefile
@@ -53,7 +53,7 @@ endif
 ifeq ($(CONFIG_LPC313X_SPI),y)
 CSRCS		+= up_spi.c
 endif
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
 ifeq ($(CONFIG_PAGING),y)
diff --git a/configs/ea3131/src/up_nsh.c b/configs/ea3131/src/up_nsh.c
index 115f59f8b912af2654a0caabe508bb8bb30493e1..c0848c9f1a49b9dc62f463596cd6842e55a752c0 100755
--- a/configs/ea3131/src/up_nsh.c
+++ b/configs/ea3131/src/up_nsh.c
@@ -61,26 +61,26 @@
 /* PORT and SLOT number probably depend on the board configuration */
 
 #ifdef CONFIG_ARCH_BOARD_EA3131
-#  define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1
-#  define CONFIG_EXAMPLES_NSH_HAVEMMCSD  1
-#  if defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) && CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
+#  define CONFIG_NSH_HAVEUSBDEV 1
+#  define CONFIG_NSH_HAVEMMCSD  1
+#  if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0
 #    error "Only one MMC/SD slot"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
+#    undef CONFIG_NSH_MMCSDSLOTNO
 #  endif
-#  ifndef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
+#  ifndef CONFIG_NSH_MMCSDSLOTNO
+#    define CONFIG_NSH_MMCSDSLOTNO 0
 #  endif
 #else
    /* Add configuration for new LPC313X boards here */
 #  error "Unrecognized LPC313X board"
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
 /* Can't support USB features if USB is not enabled */
 
 #ifndef CONFIG_USBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEUSBDEV
 #endif
 
 /* Can't support MMC/SD features if mountpoints are disabled or if SDIO support
@@ -88,11 +88,11 @@
  */
 
 #if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_LPC313X_MCI)
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
-#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR
-#  define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0
+#ifndef CONFIG_NSH_MMCSDMINOR
+#  define CONFIG_NSH_MMCSDMINOR 0
 #endif
 
 /* Debug ********************************************************************/
@@ -125,27 +125,27 @@
 
 int nsh_archinitialize(void)
 {
-#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#ifdef CONFIG_NSH_HAVEMMCSD
   FAR struct sdio_dev_s *sdio;
   int ret;
 
   /* First, get an instance of the SDIO interface */
 
   message("nsh_archinitialize: Initializing SDIO slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
-  sdio = sdio_initialize(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSLOTNO);
+  sdio = sdio_initialize(CONFIG_NSH_MMCSDSLOTNO);
   if (!sdio)
     {
       message("nsh_archinitialize: Failed to initialize SDIO slot %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+              CONFIG_NSH_MMCSDSLOTNO);
       return -ENODEV;
     }
 
   /* Now bind the SPI interface to the MMC/SD driver */
 
   message("nsh_archinitialize: Bind SDIO to the MMC/SD driver, minor=%d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDMINOR);
-  ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, sdio);
+          CONFIG_NSH_MMCSDMINOR);
+  ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, sdio);
   if (ret != OK)
     {
       message("nsh_archinitialize: Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
diff --git a/configs/ea3131/usbserial/defconfig b/configs/ea3131/usbserial/defconfig
index 6758fcaa09af2679bdc8ddedd9a519fb04925390..d4df3b0c52d4f26c9f34a9063f730b4d0929b3e2 100755
--- a/configs/ea3131/usbserial/defconfig
+++ b/configs/ea3131/usbserial/defconfig
@@ -657,71 +657,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/ea3131/usbstorage/defconfig b/configs/ea3131/usbstorage/defconfig
index 9ff7a9911c2521005fb933830139280a2ad3db23..273510689feb68b68904416ce6e8c80477ce67bc 100755
--- a/configs/ea3131/usbstorage/defconfig
+++ b/configs/ea3131/usbstorage/defconfig
@@ -657,71 +657,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/eagle100/httpd/defconfig b/configs/eagle100/httpd/defconfig
index f9ed1245201198271b933099ff0dce7b437319e9..110b9c0c86b0481ff4447d415a3c39c036a450d6 100644
--- a/configs/eagle100/httpd/defconfig
+++ b/configs/eagle100/httpd/defconfig
@@ -520,71 +520,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/dhcpd
diff --git a/configs/eagle100/nettest/defconfig b/configs/eagle100/nettest/defconfig
index ded9f0f1913f675d86c8445625409f0508c52f90..07d61b821d6aefa896b735d529b91c9460808ea2 100644
--- a/configs/eagle100/nettest/defconfig
+++ b/configs/eagle100/nettest/defconfig
@@ -511,71 +511,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Stack and heap information
diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig
index bb09da1b6ef0ace3948ad330eb766f31376b6121..8f2bdfe65bc53e1957afab46c73ece71a4304de0 100644
--- a/configs/eagle100/nsh/defconfig
+++ b/configs/eagle100/nsh/defconfig
@@ -496,71 +496,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Stack and heap information
diff --git a/configs/eagle100/nxflat/defconfig b/configs/eagle100/nxflat/defconfig
index 50d5e98dc701d25a0f27d9f2519f40e02ed4417b..55edb913b8c094cac717d302123a929b0b29451b 100644
--- a/configs/eagle100/nxflat/defconfig
+++ b/configs/eagle100/nxflat/defconfig
@@ -509,71 +509,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Stack and heap information
diff --git a/configs/eagle100/ostest/defconfig b/configs/eagle100/ostest/defconfig
index a71bf61f46a645dd2f54f2c8d42e53446c600cde..e2fb3e6fab27da0a28868909da9f6cdabf3e0034 100644
--- a/configs/eagle100/ostest/defconfig
+++ b/configs/eagle100/ostest/defconfig
@@ -503,71 +503,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Stack and heap information
diff --git a/configs/eagle100/src/Makefile b/configs/eagle100/src/Makefile
index 79fb8a558dca1744ad3182e2e0fe57726da9f68f..df734e7a32540c8d53c88a00503dbe88722157dc 100644
--- a/configs/eagle100/src/Makefile
+++ b/configs/eagle100/src/Makefile
@@ -40,7 +40,7 @@ CFLAGS		+= -I$(TOPDIR)/sched
 ASRCS		= 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 CSRCS		= up_boot.c up_leds.c up_ethernet.c up_ssi.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
 COBJS		= $(CSRCS:.c=$(OBJEXT))
diff --git a/configs/eagle100/src/up_nsh.c b/configs/eagle100/src/up_nsh.c
index 184523c929cdc8f7822a3f229283ee10f6463f18..31d9adebd8e45d35cd422e6dd67f2b5289cc2d83 100644
--- a/configs/eagle100/src/up_nsh.c
+++ b/configs/eagle100/src/up_nsh.c
@@ -56,39 +56,39 @@
 /* PORT and SLOT number probably depend on the board configuration */
 
 #ifdef CONFIG_ARCH_BOARD_EAGLE100
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
-#  define CONFIG_EXAMPLES_NSH_HAVEMMCSD  1
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 0
+#  undef CONFIG_NSH_HAVEUSBDEV
+#  define CONFIG_NSH_HAVEMMCSD  1
+#  if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0
 #    error "The Eagle100 MMC/SD is on SSI0"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 0
+#    undef CONFIG_NSH_MMCSDSPIPORTNO
+#    define CONFIG_NSH_MMCSDSPIPORTNO 0
 #  endif
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
+#  if !defined(CONFIG_NSH_MMCSDSLOTNO) || CONFIG_NSH_MMCSDSLOTNO != 0
 #    error "The Eagle100 MMC/SD is on SSI0 slot 0"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
+#    undef CONFIG_NSH_MMCSDSLOTNO
+#    define CONFIG_NSH_MMCSDSLOTNO 0
 #  endif
 #else
    /* Add configuration for new LM3s boards here */
 #  error "Unrecognized lm3s board"
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
 /* Can't support USB features if USB is not enabled */
 
 #ifndef CONFIG_USBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEUSBDEV
 #endif
 
 /* Can't support MMC/SD features if mountpoints are disabled */
 
 #if defined(CONFIG_DISABLE_MOUNTPOINT)
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
-#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR
-#  define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0
+#ifndef CONFIG_NSH_MMCSDMINOR
+#  define CONFIG_NSH_MMCSDMINOR 0
 #endif
 
 /* Debug ********************************************************************/
@@ -127,33 +127,33 @@ int nsh_archinitialize(void)
   /* Get the SPI port */
 
   message("nsh_archinitialize: Initializing SPI port %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO);
 
-  spi = up_spiinitialize(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+  spi = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
   if (!spi)
     {
       message("nsh_archinitialize: Failed to initialize SPI port %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+              CONFIG_NSH_MMCSDSPIPORTNO);
       return -ENODEV;
     }
 
   message("nsh_archinitialize: Successfully initialized SPI port %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO);
 
   /* Bind the SPI port to the slot */
 
   message("nsh_archinitialize: Binding SPI port %d to MMC/SD slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO);
 
-  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, spi);
+  ret = mmcsd_spislotinitialize(CONFIG_NSH_MMCSDMINOR, CONFIG_NSH_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
       message("nsh_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, ret);
+              CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO, ret);
       return ret;
     }
 
   message("nsh_archinitialize: Successfuly bound SPI port %d to MMC/SD slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO);
   return OK;
 }
diff --git a/configs/eagle100/thttpd/defconfig b/configs/eagle100/thttpd/defconfig
index 54ddb6b5b843b97ff1b805e6212b3275e5ca78c6..09abbd97c6a713ad4e81cadccba8f8ca37a2a455 100644
--- a/configs/eagle100/thttpd/defconfig
+++ b/configs/eagle100/thttpd/defconfig
@@ -607,71 +607,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Stack and heap information
diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig
index 7aaabc009ee3f492d7647e8084427638dd9352a5..a7ac41c99e820d7c64dba6826d5e49bb589f3999 100644
--- a/configs/ez80f910200kitg/ostest/defconfig
+++ b/configs/ez80f910200kitg/ostest/defconfig
@@ -638,66 +638,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-#
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=1024
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
-CONFIG_EXAMPLES_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+#
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=1024
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
+CONFIG_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
+CONFIG_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/nx
diff --git a/configs/ez80f910200zco/dhcpd/defconfig b/configs/ez80f910200zco/dhcpd/defconfig
index 7d283d23b0dbbe7f0ffd702e45d2057ab1e37697..0b9b60c4c200ac562858eb76f7b7adeffec55483 100644
--- a/configs/ez80f910200zco/dhcpd/defconfig
+++ b/configs/ez80f910200zco/dhcpd/defconfig
@@ -665,66 +665,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-#
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=1024
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
-CONFIG_EXAMPLES_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+#
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=1024
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
+CONFIG_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
+CONFIG_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/dhcpd
diff --git a/configs/ez80f910200zco/httpd/defconfig b/configs/ez80f910200zco/httpd/defconfig
index deb71f1a9eba862c7186bd12a3e92d3392bd8fab..d12b966f1d53b4726c4e7c87b10e50fc0a3e4cbe 100644
--- a/configs/ez80f910200zco/httpd/defconfig
+++ b/configs/ez80f910200zco/httpd/defconfig
@@ -673,66 +673,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-#
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=1024
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
-CONFIG_EXAMPLES_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+#
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=1024
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
+CONFIG_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
+CONFIG_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/dhcpd
diff --git a/configs/ez80f910200zco/nettest/defconfig b/configs/ez80f910200zco/nettest/defconfig
index 47994153b909f74412418021b694a981b074e11f..22774b4ecdc8cc351e01d1ced74c578890a88517 100644
--- a/configs/ez80f910200zco/nettest/defconfig
+++ b/configs/ez80f910200zco/nettest/defconfig
@@ -665,66 +665,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-#
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=1024
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
-CONFIG_EXAMPLES_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+#
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=1024
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
+CONFIG_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
+CONFIG_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/nx
diff --git a/configs/ez80f910200zco/nsh/defconfig b/configs/ez80f910200zco/nsh/defconfig
index f91c216d20be6a41dfd2ec89d3f8c2161abc8cf7..238f9d9851a717422906f481f652eb0b116e0eeb 100644
--- a/configs/ez80f910200zco/nsh/defconfig
+++ b/configs/ez80f910200zco/nsh/defconfig
@@ -665,66 +665,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-#
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
-CONFIG_EXAMPLES_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+#
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
+CONFIG_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
+CONFIG_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/nx
diff --git a/configs/ez80f910200zco/ostest/defconfig b/configs/ez80f910200zco/ostest/defconfig
index 2022ff608cc8fe9e3b2c1542192c6bc4db98ad05..1be716ff8cc60e109402a051fbab0d25d3abd8b4 100644
--- a/configs/ez80f910200zco/ostest/defconfig
+++ b/configs/ez80f910200zco/ostest/defconfig
@@ -648,66 +648,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-#
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=1024
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
-CONFIG_EXAMPLES_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+#
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=1024
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
+CONFIG_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
+CONFIG_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/nx
diff --git a/configs/ez80f910200zco/poll/defconfig b/configs/ez80f910200zco/poll/defconfig
index cdbb56604e913c651d6459b1eba5c84fe6f33449..755a5c93a4bd3e76f3d29f0271f481a5fdd8900a 100644
--- a/configs/ez80f910200zco/poll/defconfig
+++ b/configs/ez80f910200zco/poll/defconfig
@@ -665,66 +665,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-#
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=1024
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
-CONFIG_EXAMPLES_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+#
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=1024
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
+CONFIG_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
+CONFIG_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/nx
diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig
index 3cdb92a6987f9638c805a9a5ec2e86ffd74d6c82..03b6c35343d7e0f4fe1337279a0b9646555fc082 100755
--- a/configs/lm3s6965-ek/nsh/defconfig
+++ b/configs/lm3s6965-ek/nsh/defconfig
@@ -520,71 +520,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=y
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=y
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Stack and heap information
diff --git a/configs/lm3s6965-ek/nx/defconfig b/configs/lm3s6965-ek/nx/defconfig
index a39c01208d3e2600bd03642beab0f88d75a2606b..f4f7a23532fe7b2e68e0eeb8a622e75901fb7988 100755
--- a/configs/lm3s6965-ek/nx/defconfig
+++ b/configs/lm3s6965-ek/nx/defconfig
@@ -641,71 +641,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/nx
diff --git a/configs/lm3s6965-ek/ostest/defconfig b/configs/lm3s6965-ek/ostest/defconfig
index fc17aeb86859650c4c68df2ae3ee9b081970ef72..13876f7a353b522a7c6fd1670ac8fbf25f54c55d 100755
--- a/configs/lm3s6965-ek/ostest/defconfig
+++ b/configs/lm3s6965-ek/ostest/defconfig
@@ -517,71 +517,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Stack and heap information
diff --git a/configs/lm3s6965-ek/src/Makefile b/configs/lm3s6965-ek/src/Makefile
index dfb59a4ed3189177467390f32b384f65521a21ea..58ea3f35199e7807b0f08abc9c78288d77173fc6 100755
--- a/configs/lm3s6965-ek/src/Makefile
+++ b/configs/lm3s6965-ek/src/Makefile
@@ -40,7 +40,7 @@ CFLAGS		+= -I$(TOPDIR)/sched
 ASRCS		= 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 CSRCS		= up_boot.c up_leds.c up_ethernet.c up_ssi.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
 ifeq ($(CONFIG_NX_LCDDRIVER),y)
diff --git a/configs/lm3s6965-ek/src/up_nsh.c b/configs/lm3s6965-ek/src/up_nsh.c
index b8f13879c34367d1c4889db6fba780be09ba7d12..4b06974001c31bb75c6c5f50c79f7f8598c1b5ec 100755
--- a/configs/lm3s6965-ek/src/up_nsh.c
+++ b/configs/lm3s6965-ek/src/up_nsh.c
@@ -56,39 +56,39 @@
 /* PORT and SLOT number probably depend on the board configuration */
 
 #ifdef CONFIG_ARCH_BOARD_LM3S6965EK
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
-#  define CONFIG_EXAMPLES_NSH_HAVEMMCSD  1
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 0
+#  undef CONFIG_NSH_HAVEUSBDEV
+#  define CONFIG_NSH_HAVEMMCSD  1
+#  if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0
 #    error "The LM3S6965 Eval Kit MMC/SD is on SSI0"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 0
+#    undef CONFIG_NSH_MMCSDSPIPORTNO
+#    define CONFIG_NSH_MMCSDSPIPORTNO 0
 #  endif
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
+#  if !defined(CONFIG_NSH_MMCSDSLOTNO) || CONFIG_NSH_MMCSDSLOTNO != 0
 #    error "The LM3S6965 Eval Kit MMC/SD is on SSI0 slot 0"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
+#    undef CONFIG_NSH_MMCSDSLOTNO
+#    define CONFIG_NSH_MMCSDSLOTNO 0
 #  endif
 #else
    /* Add configuration for new LM3s boards here */
 #  error "Unrecognized lm3s board"
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
 /* Can't support USB features if USB is not enabled */
 
 #ifndef CONFIG_USBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEUSBDEV
 #endif
 
 /* Can't support MMC/SD features if mountpoints are disabled */
 
 #if defined(CONFIG_DISABLE_MOUNTPOINT)
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
-#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR
-#  define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0
+#ifndef CONFIG_NSH_MMCSDMINOR
+#  define CONFIG_NSH_MMCSDMINOR 0
 #endif
 
 /* Debug ********************************************************************/
@@ -127,33 +127,33 @@ int nsh_archinitialize(void)
   /* Get the SPI port */
 
   message("nsh_archinitialize: Initializing SPI port %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO);
 
-  spi = up_spiinitialize(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+  spi = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
   if (!spi)
     {
       message("nsh_archinitialize: Failed to initialize SPI port %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+              CONFIG_NSH_MMCSDSPIPORTNO);
       return -ENODEV;
     }
 
   message("nsh_archinitialize: Successfully initialized SPI port %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO);
 
   /* Bind the SPI port to the slot */
 
   message("nsh_archinitialize: Binding SPI port %d to MMC/SD slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO);
 
-  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, spi);
+  ret = mmcsd_spislotinitialize(CONFIG_NSH_MMCSDMINOR, CONFIG_NSH_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
       message("nsh_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, ret);
+              CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO, ret);
       return ret;
     }
 
   message("nsh_archinitialize: Successfuly bound SPI port %d to MMC/SD slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO);
   return OK;
 }
diff --git a/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig
index 0b6532371383a36ead0a33d104b730a034c59088..c3718a69aaf08ba7c3d783c596240b3f4078e56d 100755
--- a/configs/lm3s8962-ek/nsh/defconfig
+++ b/configs/lm3s8962-ek/nsh/defconfig
@@ -520,71 +520,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=y
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=y
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Stack and heap information
diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig
index e386634a7f27180c4d7c4d2cc0ff4b8f78cbcdff..c34d4440d2cf82ca92dec5733e826ddb593207c8 100755
--- a/configs/lm3s8962-ek/nx/defconfig
+++ b/configs/lm3s8962-ek/nx/defconfig
@@ -640,71 +640,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/nx
diff --git a/configs/lm3s8962-ek/ostest/defconfig b/configs/lm3s8962-ek/ostest/defconfig
index 7e7c84dda4c6c64b35689748af957216662a6ec3..f434ea83571e827dbe7b64896e4ea34e9c4a4324 100755
--- a/configs/lm3s8962-ek/ostest/defconfig
+++ b/configs/lm3s8962-ek/ostest/defconfig
@@ -517,71 +517,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Stack and heap information
diff --git a/configs/lm3s8962-ek/src/Makefile b/configs/lm3s8962-ek/src/Makefile
index 8c5d10bc4a5f2a6381db3a4a0c95c50d26640cd3..fbea519beafce7b381ed7125c6a5c6f47d8c1be1 100755
--- a/configs/lm3s8962-ek/src/Makefile
+++ b/configs/lm3s8962-ek/src/Makefile
@@ -40,7 +40,7 @@ CFLAGS		+= -I$(TOPDIR)/sched
 ASRCS		= 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 CSRCS		= up_boot.c up_leds.c up_ethernet.c up_ssi.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
 ifeq ($(CONFIG_NX_LCDDRIVER),y)
diff --git a/configs/lm3s8962-ek/src/up_nsh.c b/configs/lm3s8962-ek/src/up_nsh.c
index 999013b13ea5aa56e6dad5373e2c418fd87e7843..d21edc46b73d32efb3c5655ecc86142667211f26 100755
--- a/configs/lm3s8962-ek/src/up_nsh.c
+++ b/configs/lm3s8962-ek/src/up_nsh.c
@@ -56,39 +56,39 @@
 /* PORT and SLOT number probably depend on the board configuration */
 
 #ifdef CONFIG_ARCH_BOARD_LM3S8962EK
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
-#  define CONFIG_EXAMPLES_NSH_HAVEMMCSD  1
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 0
+#  undef CONFIG_NSH_HAVEUSBDEV
+#  define CONFIG_NSH_HAVEMMCSD  1
+#  if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0
 #    error "The LM3S8962 Eval Kit MMC/SD is on SSI0"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 0
+#    undef CONFIG_NSH_MMCSDSPIPORTNO
+#    define CONFIG_NSH_MMCSDSPIPORTNO 0
 #  endif
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
+#  if !defined(CONFIG_NSH_MMCSDSLOTNO) || CONFIG_NSH_MMCSDSLOTNO != 0
 #    error "The LM3S8962 Eval Kit MMC/SD is on SSI0 slot 0"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
+#    undef CONFIG_NSH_MMCSDSLOTNO
+#    define CONFIG_NSH_MMCSDSLOTNO 0
 #  endif
 #else
    /* Add configuration for new LM3s boards here */
 #  error "Unrecognized lm3s board"
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
 /* Can't support USB features if USB is not enabled */
 
 #ifndef CONFIG_USBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEUSBDEV
 #endif
 
 /* Can't support MMC/SD features if mountpoints are disabled */
 
 #if defined(CONFIG_DISABLE_MOUNTPOINT)
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
-#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR
-#  define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0
+#ifndef CONFIG_NSH_MMCSDMINOR
+#  define CONFIG_NSH_MMCSDMINOR 0
 #endif
 
 /* Debug ********************************************************************/
@@ -127,33 +127,33 @@ int nsh_archinitialize(void)
   /* Get the SPI port */
 
   message("nsh_archinitialize: Initializing SPI port %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO);
 
-  spi = up_spiinitialize(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+  spi = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
   if (!spi)
     {
       message("nsh_archinitialize: Failed to initialize SPI port %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+              CONFIG_NSH_MMCSDSPIPORTNO);
       return -ENODEV;
     }
 
   message("nsh_archinitialize: Successfully initialized SPI port %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO);
 
   /* Bind the SPI port to the slot */
 
   message("nsh_archinitialize: Binding SPI port %d to MMC/SD slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO);
 
-  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, spi);
+  ret = mmcsd_spislotinitialize(CONFIG_NSH_MMCSDMINOR, CONFIG_NSH_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
       message("nsh_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, ret);
+              CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO, ret);
       return ret;
     }
 
   message("nsh_archinitialize: Successfuly bound SPI port %d to MMC/SD slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO);
   return OK;
 }
diff --git a/configs/m68332evb/defconfig b/configs/m68332evb/defconfig
index db8c91dde06b17e1953a2df814ba7cf8dc4703e1..83e09d88180cc21fa9df85029a8152e705a94962 100644
--- a/configs/m68332evb/defconfig
+++ b/configs/m68332evb/defconfig
@@ -346,16 +346,16 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Stack and heap information
diff --git a/configs/mbed/hidkbd/defconfig b/configs/mbed/hidkbd/defconfig
index a4e45838ff4f7ca80265bb33e76f6c2fcf92596d..f66a96fa34968fd425d0eb6a64816afaf79a4247 100644
--- a/configs/mbed/hidkbd/defconfig
+++ b/configs/mbed/hidkbd/defconfig
@@ -773,71 +773,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=y
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=y
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/mbed/nsh/defconfig b/configs/mbed/nsh/defconfig
index 6e482ff655925da81e45eb1d84312ed1dbb0a92e..1de314b2e6c5e24d8ddd20cdecd07ab1991528d9 100755
--- a/configs/mbed/nsh/defconfig
+++ b/configs/mbed/nsh/defconfig
@@ -702,71 +702,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/mbed/src/Makefile b/configs/mbed/src/Makefile
index 5bbf1d13c17c91143a606b80993e84bd83562db1..98b824b66b5cb0cee82540ca548f121dd94b6fee 100755
--- a/configs/mbed/src/Makefile
+++ b/configs/mbed/src/Makefile
@@ -39,7 +39,7 @@ CFLAGS		+= -I$(TOPDIR)/sched
 
 ASRCS		= 
 CSRCS		= up_boot.c up_leds.c 
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
 ifeq ($(CONFIG_APP_DIR),examples/usbstorage)
diff --git a/configs/mbed/src/up_nsh.c b/configs/mbed/src/up_nsh.c
index 8d0cfd4724831fdd35d1b937572501d6c752e369..f8c46bc8101f65702f148e8067b8f4ed5a09faf8 100755
--- a/configs/mbed/src/up_nsh.c
+++ b/configs/mbed/src/up_nsh.c
@@ -56,16 +56,16 @@
 /* PORT and SLOT number probably depend on the board configuration */
 
 #ifdef CONFIG_ARCH_BOARD_MBED
-#  define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1
+#  define CONFIG_NSH_HAVEUSBDEV 1
 #else
 #  error "Unrecognized board"
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEUSBDEV
 #endif
 
 /* Can't support USB features if USB is not enabled */
 
 #ifndef CONFIG_USBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEUSBDEV
 #endif
 
 /* Debug ********************************************************************/
diff --git a/configs/mcu123-lpc214x/nsh/defconfig b/configs/mcu123-lpc214x/nsh/defconfig
index 4d781194e269a59b5d151379de764e27bb74d02a..bb064a9c0836edfb2fdb525f853a5d53f3f8553a 100644
--- a/configs/mcu123-lpc214x/nsh/defconfig
+++ b/configs/mcu123-lpc214x/nsh/defconfig
@@ -544,70 +544,70 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Stack and heap information
diff --git a/configs/mcu123-lpc214x/ostest/defconfig b/configs/mcu123-lpc214x/ostest/defconfig
index 29331a9fa1584a2274132819e6180cf2a1a40c50..6da3ffeec8315f25fb9e727b1e7c7dfaa1cba630 100644
--- a/configs/mcu123-lpc214x/ostest/defconfig
+++ b/configs/mcu123-lpc214x/ostest/defconfig
@@ -534,70 +534,70 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Stack and heap information
diff --git a/configs/mcu123-lpc214x/src/Makefile b/configs/mcu123-lpc214x/src/Makefile
index 431d85fc0dff85d432897654ac36030bd2b29163..e3f86453fd4a63970280714f181cf6dc9c3b095a 100644
--- a/configs/mcu123-lpc214x/src/Makefile
+++ b/configs/mcu123-lpc214x/src/Makefile
@@ -48,7 +48,7 @@ endif
 ASRCS		= 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 CSRCS		= up_spi.c up_leds.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
 ifeq ($(CONFIG_APP_DIR),examples/usbstorage)
diff --git a/configs/mcu123-lpc214x/src/up_nsh.c b/configs/mcu123-lpc214x/src/up_nsh.c
index 9518862c8c9b43ef040c0b9494ebb85c7ee6b99b..1e1ee3c36baec877942cdda3471a534965476a66 100644
--- a/configs/mcu123-lpc214x/src/up_nsh.c
+++ b/configs/mcu123-lpc214x/src/up_nsh.c
@@ -56,39 +56,39 @@
 /* PORT and SLOT number probably depend on the board configuration */
 
 #ifdef CONFIG_ARCH_BOARD_MCU123
-#  define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1
-#  define CONFIG_EXAMPLES_NSH_HAVEMMCSD  1
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 1
+#  define CONFIG_NSH_HAVEUSBDEV 1
+#  define CONFIG_NSH_HAVEMMCSD  1
+#  if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 1
 #    error "The LPC214x MMC/SD is on SPI1"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 1
+#    undef CONFIG_NSH_MMCSDSPIPORTNO
+#    define CONFIG_NSH_MMCSDSPIPORTNO 1
 #  endif
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
+#  if !defined(CONFIG_NSH_MMCSDSLOTNO) || CONFIG_NSH_MMCSDSLOTNO != 0
 #    error "The LPC214x MMC/SD is on SPI1"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
+#    undef CONFIG_NSH_MMCSDSLOTNO
+#    define CONFIG_NSH_MMCSDSLOTNO 0
 #  endif
 #else
    /* Add configuration for new LPC214x boards here */
 #  error "Unrecognized LPC214x board"
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
 /* Can't support USB features if USB is not enabled */
 
 #ifndef CONFIG_USBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEUSBDEV
 #endif
 
 /* Can't support MMC/SD features if mountpoints are disabled */
 
 #if defined(CONFIG_DISABLE_MOUNTPOINT)
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
-#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR
-#  define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0
+#ifndef CONFIG_NSH_MMCSDMINOR
+#  define CONFIG_NSH_MMCSDMINOR 0
 #endif
 
 /* Debug ********************************************************************/
@@ -127,33 +127,33 @@ int nsh_archinitialize(void)
   /* Get the SPI port */
 
   message("nsh_archinitialize: Initializing SPI port %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO);
 
-  spi = up_spiinitialize(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+  spi = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
   if (!spi)
     {
       message("nsh_archinitialize: Failed to initialize SPI port %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+              CONFIG_NSH_MMCSDSPIPORTNO);
       return -ENODEV;
     }
 
   message("nsh_archinitialize: Successfully initialized SPI port %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO);
 
   /* Bind the SPI port to the slot */
 
   message("nsh_archinitialize: Binding SPI port %d to MMC/SD slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO);
 
-  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, spi);
+  ret = mmcsd_spislotinitialize(CONFIG_NSH_MMCSDMINOR, CONFIG_NSH_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
       message("nsh_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, ret);
+              CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO, ret);
       return ret;
     }
 
   message("nsh_archinitialize: Successfuly bound SPI port %d to MMC/SD slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO);
   return OK;
 }
diff --git a/configs/mcu123-lpc214x/usbserial/defconfig b/configs/mcu123-lpc214x/usbserial/defconfig
index 57643cea90d18de921c788c935719544d152a7f8..87bc15b2433b899f48b5c115585124716ab32eff 100644
--- a/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/configs/mcu123-lpc214x/usbserial/defconfig
@@ -535,70 +535,70 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/mcu123-lpc214x/usbstorage/defconfig b/configs/mcu123-lpc214x/usbstorage/defconfig
index aa6f392ba7ef1b3e8d291b96ab3481dae46c9090..24dd6c429ae61adbcf1c736e9580eefd3d88037d 100644
--- a/configs/mcu123-lpc214x/usbstorage/defconfig
+++ b/configs/mcu123-lpc214x/usbstorage/defconfig
@@ -535,69 +535,69 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/mx1ads/ostest/defconfig b/configs/mx1ads/ostest/defconfig
index 06ab2a83fcabdecc606b9448a865370a3e50f453..0c63113cc132925b70ce2ac193cbaf6df1d90cb8 100644
--- a/configs/mx1ads/ostest/defconfig
+++ b/configs/mx1ads/ostest/defconfig
@@ -524,16 +524,16 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1)
 
 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # DM90x0 Driver Settings
diff --git a/configs/ne64badge/ostest/defconfig b/configs/ne64badge/ostest/defconfig
index b2d74a5e6200400e285f36a31776b6767ecde0cd..87a3ae170fa5a4098e0dd4a3b24dc75b7008af7d 100755
--- a/configs/ne64badge/ostest/defconfig
+++ b/configs/ne64badge/ostest/defconfig
@@ -656,71 +656,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=512
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=512
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=512
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/ne64badge/src/Makefile b/configs/ne64badge/src/Makefile
index 2f8f0b390a6275f4b049272aaa461779d34b25f6..07081cd59f50953433f326443b1465ec07927222 100755
--- a/configs/ne64badge/src/Makefile
+++ b/configs/ne64badge/src/Makefile
@@ -41,7 +41,7 @@ ASRCS		=
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 
 CSRCS		= up_boot.c up_leds.c up_buttons.c up_spi.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
 COBJS		= $(CSRCS:.c=$(OBJEXT))
diff --git a/configs/ntosd-dm320/nettest/defconfig b/configs/ntosd-dm320/nettest/defconfig
index bb6351bffd56104b18b658fbaabd52567b5635cb..d890345b02939038c7148f608b479a53b88fbd66 100644
--- a/configs/ntosd-dm320/nettest/defconfig
+++ b/configs/ntosd-dm320/nettest/defconfig
@@ -520,16 +520,16 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1)
 
 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # DM90x0 Driver Settings
diff --git a/configs/ntosd-dm320/nsh/defconfig b/configs/ntosd-dm320/nsh/defconfig
index cd0bd274a8789c2657c91519788155185d9c3cb3..e662ff6aac2c1d0ce27f6a4e03a3ca8fa9708740 100644
--- a/configs/ntosd-dm320/nsh/defconfig
+++ b/configs/ntosd-dm320/nsh/defconfig
@@ -531,60 +531,60 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100
 CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-#
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=1024
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=80
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=y
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+#
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=1024
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=80
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=y
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Settings for examples/mount
diff --git a/configs/ntosd-dm320/ostest/defconfig b/configs/ntosd-dm320/ostest/defconfig
index 9d4e026c5a5504836f631107740dc44e44f1ff0d..48508b03b0b2cbc353c7850c1f2df8a59298d75c 100644
--- a/configs/ntosd-dm320/ostest/defconfig
+++ b/configs/ntosd-dm320/ostest/defconfig
@@ -512,16 +512,16 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1)
 
 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # DM90x0 Driver Settings
diff --git a/configs/ntosd-dm320/poll/defconfig b/configs/ntosd-dm320/poll/defconfig
index b0c54989729b129d59e17408c68ff4db35bf7e6f..eb3336715df8a587a734e9e5cf8a133bab5c128f 100644
--- a/configs/ntosd-dm320/poll/defconfig
+++ b/configs/ntosd-dm320/poll/defconfig
@@ -527,16 +527,16 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1)
 
 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # DM90x0 Driver Settings
diff --git a/configs/ntosd-dm320/thttpd/defconfig b/configs/ntosd-dm320/thttpd/defconfig
index c23e7b89f5a01437043beb80c45311a1de0fda3d..06b9a177d80b579058b4c258798337720bcb52f7 100644
--- a/configs/ntosd-dm320/thttpd/defconfig
+++ b/configs/ntosd-dm320/thttpd/defconfig
@@ -657,64 +657,64 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1)
 #
 # Settings for examples/nsh
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # DM90x0 Driver Settings
diff --git a/configs/ntosd-dm320/udp/defconfig b/configs/ntosd-dm320/udp/defconfig
index 487bed2abf808bb19bf99e83708eb0678f54a561..91b58291591841f7811293b41f07d765198cad1c 100644
--- a/configs/ntosd-dm320/udp/defconfig
+++ b/configs/ntosd-dm320/udp/defconfig
@@ -527,16 +527,16 @@ CONFIG_EXAMPLE_UDP_SERVERIP=(10<<24|0<<16|0<<8|1)
 
 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # DM90x0 Driver Settings
diff --git a/configs/ntosd-dm320/uip/defconfig b/configs/ntosd-dm320/uip/defconfig
index d78927ed4876a829df932a9e4c331983310ef4a7..8ebe89415635cc205cc1749c29240cb25c93e9e3 100644
--- a/configs/ntosd-dm320/uip/defconfig
+++ b/configs/ntosd-dm320/uip/defconfig
@@ -528,16 +528,16 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1)
 
 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # DM90x0 Driver Settings
diff --git a/configs/nucleus2g/nsh/defconfig b/configs/nucleus2g/nsh/defconfig
index 6b0b35559cddb763ee16b285135f946dc9cc721e..55e10597550f885750c78fbb5a50e516b3ea254d 100755
--- a/configs/nucleus2g/nsh/defconfig
+++ b/configs/nucleus2g/nsh/defconfig
@@ -767,71 +767,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/nucleus2g/ostest/defconfig b/configs/nucleus2g/ostest/defconfig
index 78e8e5bb80f6ad7f95412016f5cf78505709e61f..537a02607158cd960c71f535772b0712d48f3798 100755
--- a/configs/nucleus2g/ostest/defconfig
+++ b/configs/nucleus2g/ostest/defconfig
@@ -702,71 +702,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/nucleus2g/src/Makefile b/configs/nucleus2g/src/Makefile
index c54ba8a0ab3e32f4d22865fe70fc5fd1b3464970..36415136d160df1ae7758868f8ee8e6efc8f5ce8 100755
--- a/configs/nucleus2g/src/Makefile
+++ b/configs/nucleus2g/src/Makefile
@@ -39,7 +39,7 @@ CFLAGS		+= -I$(TOPDIR)/sched
 
 ASRCS		= 
 CSRCS		= up_boot.c up_leds.c up_ssp.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
 ifeq ($(CONFIG_APP_DIR),examples/usbstorage)
diff --git a/configs/nucleus2g/src/up_nsh.c b/configs/nucleus2g/src/up_nsh.c
index 10acca85f9025b1e47f881a1e4dfc2af6bdf6492..faf42bb516583229dff3a8b9bd12dbe7aa829f53 100755
--- a/configs/nucleus2g/src/up_nsh.c
+++ b/configs/nucleus2g/src/up_nsh.c
@@ -56,41 +56,41 @@
 /* PORT and SLOT number probably depend on the board configuration */
 
 #ifdef CONFIG_ARCH_BOARD_NUCLEUS2G
-#  define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1
-#  define CONFIG_EXAMPLES_NSH_HAVEMMCSD  1
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 0
+#  define CONFIG_NSH_HAVEUSBDEV 1
+#  define CONFIG_NSH_HAVEMMCSD  1
+#  if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0
 #    error "The Nucleus-2G MMC/SD is on SSP0"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 0
+#    undef CONFIG_NSH_MMCSDSPIPORTNO
+#    define CONFIG_NSH_MMCSDSPIPORTNO 0
 #  endif
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
+#  if !defined(CONFIG_NSH_MMCSDSLOTNO) || CONFIG_NSH_MMCSDSLOTNO != 0
 #    error "The Nucleus-2G MMC/SD is only one slot (0)"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
+#    undef CONFIG_NSH_MMCSDSLOTNO
+#    define CONFIG_NSH_MMCSDSLOTNO 0
 #  endif
 #  ifndef CONFIG_LPC17_SSP0
 #    warning "CONFIG_LPC17_SSP0 is not enabled"
 #  endif
 #else
 #  error "Unrecognized board"
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
 /* Can't support USB device features if USB device is not enabled */
 
 #ifndef CONFIG_USBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEUSBDEV
 #endif
 
 /* Can't support MMC/SD features if mountpoints are disabled */
 
 #if defined(CONFIG_DISABLE_MOUNTPOINT)
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
-#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR
-#  define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0
+#ifndef CONFIG_NSH_MMCSDMINOR
+#  define CONFIG_NSH_MMCSDMINOR 0
 #endif
 
 /* Debug ********************************************************************/
@@ -136,29 +136,29 @@ int nsh_archinitialize(void)
 
   /* Get the SSP port */
 
-  ssp = up_spiinitialize(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+  ssp = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
   if (!ssp)
     {
       message("nsh_archinitialize: Failed to initialize SSP port %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+              CONFIG_NSH_MMCSDSPIPORTNO);
       return -ENODEV;
     }
 
   message("Successfully initialized SSP port %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO);
 
   /* Bind the SSP port to the slot */
 
-  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, ssp);
+  ret = mmcsd_spislotinitialize(CONFIG_NSH_MMCSDMINOR, CONFIG_NSH_MMCSDSLOTNO, ssp);
   if (ret < 0)
     {
       message("nsh_archinitialize: Failed to bind SSP port %d to MMC/SD slot %d: %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, ret);
+              CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO, ret);
       return ret;
     }
 
   message("Successfuly bound SSP port %d to MMC/SD slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO);
 
   return OK;
 }
diff --git a/configs/nucleus2g/usbserial/defconfig b/configs/nucleus2g/usbserial/defconfig
index 71ee3c1eb3798c0a3fe48fad96acb2cb95781350..2063261a4a08ee0a39b6a8dd2a7fa001cda96a86 100755
--- a/configs/nucleus2g/usbserial/defconfig
+++ b/configs/nucleus2g/usbserial/defconfig
@@ -703,71 +703,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/nucleus2g/usbstorage/defconfig b/configs/nucleus2g/usbstorage/defconfig
index 4a30ba3a8391038e86443ddb2e9ac9763a4bc8d8..f0216725101011943b389bac1140dfa4e7d80507 100755
--- a/configs/nucleus2g/usbstorage/defconfig
+++ b/configs/nucleus2g/usbstorage/defconfig
@@ -703,71 +703,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/olimex-lpc1766stk/hidkbd/defconfig b/configs/olimex-lpc1766stk/hidkbd/defconfig
index b571529096fd6c66594773fbaa3a731da7ccc663..e3267eafea1f15addd90cb85e9d700860cf96e6f 100755
--- a/configs/olimex-lpc1766stk/hidkbd/defconfig
+++ b/configs/olimex-lpc1766stk/hidkbd/defconfig
@@ -773,71 +773,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=y
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=y
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/olimex-lpc1766stk/nettest/defconfig b/configs/olimex-lpc1766stk/nettest/defconfig
index aa4ed7f7c7c5c35fd9b1ebd76c1fc59f8d70b07b..0c2c1b0a6da82969245ad720862e98fd206b44bd 100755
--- a/configs/olimex-lpc1766stk/nettest/defconfig
+++ b/configs/olimex-lpc1766stk/nettest/defconfig
@@ -726,71 +726,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig
index 24239d6ee36089c6e700955333cec1b94809d03a..1e2c074e81430b095f105815118c91a01853d181 100755
--- a/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/configs/olimex-lpc1766stk/nsh/defconfig
@@ -773,71 +773,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=y
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=y
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/olimex-lpc1766stk/nx/defconfig b/configs/olimex-lpc1766stk/nx/defconfig
index d6b3d827985616f5e6383a56136bc57b9e2f3dfd..565337548a937c806f3f6ecdc5fbec1c6493b900 100755
--- a/configs/olimex-lpc1766stk/nx/defconfig
+++ b/configs/olimex-lpc1766stk/nx/defconfig
@@ -882,71 +882,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/olimex-lpc1766stk/ostest/defconfig b/configs/olimex-lpc1766stk/ostest/defconfig
index bdca7c32d0f03b9877f1fbf3b8284779011a29ac..561eba6380807f0f4a59f89663ae2f8064794f77 100755
--- a/configs/olimex-lpc1766stk/ostest/defconfig
+++ b/configs/olimex-lpc1766stk/ostest/defconfig
@@ -717,71 +717,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/olimex-lpc1766stk/slip-httpd/defconfig b/configs/olimex-lpc1766stk/slip-httpd/defconfig
index dced6af18c8c05a5ec40161c1fbb974cbe714810..81978e279d722f03c582580ef297e4901fe59d89 100755
--- a/configs/olimex-lpc1766stk/slip-httpd/defconfig
+++ b/configs/olimex-lpc1766stk/slip-httpd/defconfig
@@ -833,71 +833,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/olimex-lpc1766stk/src/Makefile b/configs/olimex-lpc1766stk/src/Makefile
index aa89ea9ad6f242e72f4ecad87f59e285ef5b8ff4..ae53d080796ca955bf6b8f7f44f81de28c29bd03 100755
--- a/configs/olimex-lpc1766stk/src/Makefile
+++ b/configs/olimex-lpc1766stk/src/Makefile
@@ -39,7 +39,7 @@ CFLAGS		+= -I$(TOPDIR)/sched
 
 ASRCS		= 
 CSRCS		= up_boot.c up_leds.c up_ssp.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
 ifeq ($(CONFIG_APP_DIR),examples/usbstorage)
diff --git a/configs/olimex-lpc1766stk/src/up_nsh.c b/configs/olimex-lpc1766stk/src/up_nsh.c
index afb6d084e18f10d9199072dd343887dc56cb201b..df51c3cab1d39260e12a255469efbc65ab6d0446 100755
--- a/configs/olimex-lpc1766stk/src/up_nsh.c
+++ b/configs/olimex-lpc1766stk/src/up_nsh.c
@@ -61,36 +61,36 @@
 /* PORT and SLOT number probably depend on the board configuration */
 
 #ifdef CONFIG_ARCH_BOARD_LPC1766STK
-#  define CONFIG_EXAMPLES_NSH_HAVEMMCSD  1
-#  define CONFIG_EXAMPLES_NSH_HAVEUSBHOST  1
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 1
+#  define CONFIG_NSH_HAVEMMCSD  1
+#  define CONFIG_NSH_HAVEUSBHOST  1
+#  if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 1
 #    error "The LPC1766-STK MMC/SD is on SSP1"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 1
+#    undef CONFIG_NSH_MMCSDSPIPORTNO
+#    define CONFIG_NSH_MMCSDSPIPORTNO 1
 #  endif
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
+#  if !defined(CONFIG_NSH_MMCSDSLOTNO) || CONFIG_NSH_MMCSDSLOTNO != 0
 #    error "The LPC1766-STK MMC/SD is only one slot (0)"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
+#    undef CONFIG_NSH_MMCSDSLOTNO
+#    define CONFIG_NSH_MMCSDSLOTNO 0
 #  endif
 #  ifndef CONFIG_LPC17_SSP1
 #    warning "CONFIG_LPC17_SSP1 is not enabled"
-#    undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#    undef CONFIG_NSH_HAVEMMCSD
 #  endif
 #else
 #  error "Unrecognized board"
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBHOST
+#  undef CONFIG_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEUSBHOST
 #endif
 
 /* Can't support MMC/SD features if mountpoints are disabled */
 
 #if defined(CONFIG_DISABLE_MOUNTPOINT)
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
-#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR
-#  define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0
+#ifndef CONFIG_NSH_MMCSDMINOR
+#  define CONFIG_NSH_MMCSDMINOR 0
 #endif
 
 /* USB Host */
@@ -108,10 +108,10 @@
 #endif
 
 #if !defined(CONFIG_USBHOST) || !defined(CONFIG_LPC17_USBHOST)
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBHOST
+#  undef CONFIG_NSH_HAVEUSBHOST
 #endif
 
-#ifdef CONFIG_EXAMPLES_NSH_HAVEUSBHOST
+#ifdef CONFIG_NSH_HAVEUSBHOST
 #  ifndef CONFIG_USBHOST_DEFPRIO
 #    define CONFIG_USBHOST_DEFPRIO 50
 #  endif
@@ -140,7 +140,7 @@
  * Private Data
  ****************************************************************************/
 
-#ifdef CONFIG_EXAMPLES_NSH_HAVEUSBHOST
+#ifdef CONFIG_NSH_HAVEUSBHOST
 static struct usbhost_driver_s *g_drvr;
 #endif
 
@@ -156,7 +156,7 @@ static struct usbhost_driver_s *g_drvr;
  *
  ****************************************************************************/
 
-#ifdef CONFIG_EXAMPLES_NSH_HAVEUSBHOST
+#ifdef CONFIG_NSH_HAVEUSBHOST
 static int nsh_waiter(int argc, char *argv[])
 {
   bool connected = false;
@@ -197,7 +197,7 @@ static int nsh_waiter(int argc, char *argv[])
  *
  ****************************************************************************/
 
-#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#ifdef CONFIG_NSH_HAVEMMCSD
 static int nsh_sdinitialize(void)
 {
   FAR struct spi_dev_s *ssp;
@@ -209,34 +209,34 @@ static int nsh_sdinitialize(void)
 
   /* Get the SSP port */
 
-  ssp = up_spiinitialize(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+  ssp = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
   if (!ssp)
     {
       message("nsh_archinitialize: Failed to initialize SSP port %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+              CONFIG_NSH_MMCSDSPIPORTNO);
       ret = -ENODEV;
       goto errout;
     }
 
   message("Successfully initialized SSP port %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO);
 
   /* Bind the SSP port to the slot */
 
-  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR,
-                               CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, ssp);
+  ret = mmcsd_spislotinitialize(CONFIG_NSH_MMCSDMINOR,
+                               CONFIG_NSH_MMCSDSLOTNO, ssp);
   if (ret < 0)
     {
       message("nsh_sdinitialize: "
               "Failed to bind SSP port %d to MMC/SD slot %d: %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO,
-              CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, ret);
+              CONFIG_NSH_MMCSDSPIPORTNO,
+              CONFIG_NSH_MMCSDSLOTNO, ret);
       goto errout;
     }
 
   message("Successfuly bound SSP port %d to MMC/SD slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO,
-          CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO,
+          CONFIG_NSH_MMCSDSLOTNO);
   return OK;
 
   /* Disable power to the SD/MMC via a GPIO. HIGH disables SD/MMC. */
@@ -257,7 +257,7 @@ errout:
  *
  ****************************************************************************/
 
-#ifdef CONFIG_EXAMPLES_NSH_HAVEUSBHOST
+#ifdef CONFIG_NSH_HAVEUSBHOST
 static int nsh_usbhostinitialize(void)
 {
   int pid;
diff --git a/configs/olimex-lpc1766stk/thttpd/defconfig b/configs/olimex-lpc1766stk/thttpd/defconfig
index b2f1a823258fb9662418414398f51d3b83206a62..118444517b6e95496f4fa442df1a3f0d8a5642d0 100755
--- a/configs/olimex-lpc1766stk/thttpd/defconfig
+++ b/configs/olimex-lpc1766stk/thttpd/defconfig
@@ -825,71 +825,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/olimex-lpc1766stk/usbserial/defconfig b/configs/olimex-lpc1766stk/usbserial/defconfig
index 48e0f84070fced6ac99ebfa82292691995000e71..cf7d7cb990bbfdbd311bd233befbf0c436dd8ebc 100755
--- a/configs/olimex-lpc1766stk/usbserial/defconfig
+++ b/configs/olimex-lpc1766stk/usbserial/defconfig
@@ -718,71 +718,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/olimex-lpc1766stk/usbstorage/defconfig b/configs/olimex-lpc1766stk/usbstorage/defconfig
index 7c679540109ae9ee7c8cfafcf1bf362248417514..85918740c4170e7c5036fc2a418058e17ce33f92 100755
--- a/configs/olimex-lpc1766stk/usbstorage/defconfig
+++ b/configs/olimex-lpc1766stk/usbstorage/defconfig
@@ -718,71 +718,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/olimex-lpc1766stk/wlan/defconfig b/configs/olimex-lpc1766stk/wlan/defconfig
index 58105751c7d826846dfd7986914ffe503f01c722..43d281570d2c6d17abdab1bc99fb187bd06c3a02 100755
--- a/configs/olimex-lpc1766stk/wlan/defconfig
+++ b/configs/olimex-lpc1766stk/wlan/defconfig
@@ -773,71 +773,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/olimex-lpc2378/nsh/defconfig b/configs/olimex-lpc2378/nsh/defconfig
index 73b7fad0b616989fecb8bb3b4eed6c1b79e64ea2..85c3f3bf0db4a3e15684ea24fd40e54c4486e04d 100755
--- a/configs/olimex-lpc2378/nsh/defconfig
+++ b/configs/olimex-lpc2378/nsh/defconfig
@@ -354,62 +354,62 @@ CONFIG_EXAMPLES_SERLOOP_BUFIO=
 #
 # Settings for examples/nsh
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 
 # Stack and heap information
diff --git a/configs/olimex-lpc2378/ostest/defconfig b/configs/olimex-lpc2378/ostest/defconfig
index 6f92f2085759fc9bb201eab49a526636de557538..f3938a53096598718ea1553d47017277953f32da 100755
--- a/configs/olimex-lpc2378/ostest/defconfig
+++ b/configs/olimex-lpc2378/ostest/defconfig
@@ -354,62 +354,62 @@ CONFIG_EXAMPLES_SERLOOP_BUFIO=
 #
 # Settings for examples/nsh
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 
 # Stack and heap information
diff --git a/configs/olimex-lpc2378/src/Makefile b/configs/olimex-lpc2378/src/Makefile
index dac27f82a1dcf47f79b85ce9de38b1be870737ef..1319a49155d32bef3f76260a2dd45e3311fb030f 100755
--- a/configs/olimex-lpc2378/src/Makefile
+++ b/configs/olimex-lpc2378/src/Makefile
@@ -54,7 +54,7 @@ ASRCS		=
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 CSRCS		= up_leds.c
 #CSRCS		+= up_spi.c 
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
 COBJS		= $(CSRCS:.c=$(OBJEXT))
diff --git a/configs/olimex-lpc2378/src/up_nsh.c b/configs/olimex-lpc2378/src/up_nsh.c
index 4bf6ac8dfbb0f6619e313d9ca6fc4d6cb7b631c2..d6b2445ca7ac136e0e33915eeefd322478d237de 100755
--- a/configs/olimex-lpc2378/src/up_nsh.c
+++ b/configs/olimex-lpc2378/src/up_nsh.c
@@ -61,23 +61,23 @@
 
 /* PORT and SLOT number probably depend on the board configuration */
 
-#undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
-#undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#undef CONFIG_NSH_HAVEUSBDEV
+#undef CONFIG_NSH_HAVEMMCSD
 
 /* Can't support USB features if USB is not enabled */
 
 #ifndef CONFIG_USBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEUSBDEV
 #endif
 
 /* Can't support MMC/SD features if mountpoints are disabled */
 
 #if defined(CONFIG_DISABLE_MOUNTPOINT)
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
-#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR
-#  define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0
+#ifndef CONFIG_NSH_MMCSDMINOR
+#  define CONFIG_NSH_MMCSDMINOR 0
 #endif
 
 /* Debug ********************************************************************/
diff --git a/configs/olimex-strp711/nettest/defconfig b/configs/olimex-strp711/nettest/defconfig
index 985f654d6e4f1cccfa9cf55bf946ea5111aa647e..ed34172d1dd00e8aee506d35e4ec12f133924d02 100755
--- a/configs/olimex-strp711/nettest/defconfig
+++ b/configs/olimex-strp711/nettest/defconfig
@@ -662,70 +662,70 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Stack and heap information
diff --git a/configs/olimex-strp711/nsh/defconfig b/configs/olimex-strp711/nsh/defconfig
index 87d75418f48eb52ef7c94be9c0ada303871ba0de..27e58db93711c2ce106fa80df0f0964921492e19 100644
--- a/configs/olimex-strp711/nsh/defconfig
+++ b/configs/olimex-strp711/nsh/defconfig
@@ -597,69 +597,69 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Stack and heap information
diff --git a/configs/olimex-strp711/ostest/defconfig b/configs/olimex-strp711/ostest/defconfig
index 9bb56b7c11d2dabe34d4ea67365f9e01f140800d..0add6394e896395b2e729cd09caace7ed0f2ded5 100644
--- a/configs/olimex-strp711/ostest/defconfig
+++ b/configs/olimex-strp711/ostest/defconfig
@@ -597,70 +597,70 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Stack and heap information
diff --git a/configs/olimex-strp711/src/Makefile b/configs/olimex-strp711/src/Makefile
index 722d60b7c54c86c03c7b6a02361b88fa8bb7893c..761237d852fa798e8121a81fc9ca6beab2f6c61e 100644
--- a/configs/olimex-strp711/src/Makefile
+++ b/configs/olimex-strp711/src/Makefile
@@ -48,7 +48,7 @@ endif
 ASRCS		= 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 CSRCS		= up_spi.c up_leds.c up_buttons.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
 ifeq ($(CONFIG_NET_ENC28J60),y)
diff --git a/configs/olimex-strp711/src/up_nsh.c b/configs/olimex-strp711/src/up_nsh.c
index cff3129dbbbb5c3553f8a7fdd2e8cbaec1a3f8f8..e6d2d349ee5d3da28ba87945ed4c38f47ce4bad8 100644
--- a/configs/olimex-strp711/src/up_nsh.c
+++ b/configs/olimex-strp711/src/up_nsh.c
@@ -56,43 +56,43 @@
 /* PORT and SLOT number probably depend on the board configuration */
 
 #ifdef CONFIG_ARCH_BOARD_OLIMEX_STRP711
-#  define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1
+#  define CONFIG_NSH_HAVEUSBDEV 1
 #  ifdef CONFIG_STR71X_BSPI1
-#    define CONFIG_EXAMPLES_NSH_HAVEMMCSD  1
-#    if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 1
+#    define CONFIG_NSH_HAVEMMCSD  1
+#    if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 1
 #      error "The Olimex STR-P711 MMC/SD is on BSPI1"
-#      undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO
-#      define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 0
+#      undef CONFIG_NSH_MMCSDSPIPORTNO
+#      define CONFIG_NSH_MMCSDSPIPORTNO 0
 #    endif
-#    if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
+#    if !defined(CONFIG_NSH_MMCSDSLOTNO) || CONFIG_NSH_MMCSDSLOTNO != 0
 #      error "The Olimex STR-P711 MMC/SD is on BSPI1 slot 0"
-#      undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
-#      define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
+#      undef CONFIG_NSH_MMCSDSLOTNO
+#      define CONFIG_NSH_MMCSDSLOTNO 0
 #    endif
 #  else
-#    undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#    undef CONFIG_NSH_HAVEMMCSD
 #  endif
 #else
    /* Add configuration for new STR71x boards here */
 #  error "Unrecognized STR71x board"
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
 /* Can't support USB features if USB is not enabled */
 
 #ifndef CONFIG_USBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEUSBDEV
 #endif
 
 /* Can't support MMC/SD features if mountpoints are disabled */
 
 #if defined(CONFIG_DISABLE_MOUNTPOINT)
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
-#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR
-#  define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0
+#ifndef CONFIG_NSH_MMCSDMINOR
+#  define CONFIG_NSH_MMCSDMINOR 0
 #endif
 
 /* Debug ********************************************************************/
@@ -128,39 +128,39 @@ int nsh_archinitialize(void)
   FAR struct spi_dev_s *spi;
   int ret;
 
-#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#ifdef CONFIG_NSH_HAVEMMCSD
 
   /* Get the SPI port */
 
   message("nsh_archinitialize: Initializing SPI port %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO);
 
-  spi = up_spiinitialize(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+  spi = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
   if (!spi)
     {
       message("nsh_archinitialize: Failed to initialize SPI port %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+              CONFIG_NSH_MMCSDSPIPORTNO);
       return -ENODEV;
     }
 
   message("nsh_archinitialize: Successfully initialized SPI port %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO);
 
   /* Bind the SPI port to the slot */
 
   message("nsh_archinitialize: Binding SPI port %d to MMC/SD slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO);
 
-  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, spi);
+  ret = mmcsd_spislotinitialize(CONFIG_NSH_MMCSDMINOR, CONFIG_NSH_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
       message("nsh_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, ret);
+              CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO, ret);
       return ret;
     }
 
   message("nsh_archinitialize: Successfuly bound SPI port %d to MMC/SD slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO);
 #endif
 
   return OK;
diff --git a/configs/pjrc-8051/defconfig b/configs/pjrc-8051/defconfig
index 1c1340a8ab39adb3f29b83bee302dae5e2645c2e..764ebe1edb472a6c342f03e5d74f5f94cf9b66ed 100644
--- a/configs/pjrc-8051/defconfig
+++ b/configs/pjrc-8051/defconfig
@@ -344,16 +344,16 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Stack and heap information
diff --git a/configs/qemu-i486/nsh/defconfig b/configs/qemu-i486/nsh/defconfig
index 91f34e55ce7b66a0979aac4d46e85bf74456c5d3..dfe3fb49438cbca69189161346e83f5f18bc96c5 100644
--- a/configs/qemu-i486/nsh/defconfig
+++ b/configs/qemu-i486/nsh/defconfig
@@ -448,64 +448,64 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100
 CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Stack and heap information
diff --git a/configs/qemu-i486/ostest/defconfig b/configs/qemu-i486/ostest/defconfig
index 394761ed2d55971262301e098b8de1f9f4183fba..9695160cf985e640c4aed8a4e0601a98501837ac 100644
--- a/configs/qemu-i486/ostest/defconfig
+++ b/configs/qemu-i486/ostest/defconfig
@@ -364,17 +364,17 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100
 CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096
 
 #
-# Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+# Settings for apps/nshlib
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Stack and heap information
diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig
index 61f49da6c5608545950ddc020ed26803aba9768c..8b2cf20e30d7d33a9c22048e5a34cabb6bf7616a 100755
--- a/configs/sam3u-ek/nsh/defconfig
+++ b/configs/sam3u-ek/nsh/defconfig
@@ -743,71 +743,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig
index 12ae973c8b28aa0aa58a93441cabf5482343b765..42d2dc9b238d27934474ead36139f46e789d69ab 100755
--- a/configs/sam3u-ek/nx/defconfig
+++ b/configs/sam3u-ek/nx/defconfig
@@ -752,71 +752,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/sam3u-ek/ostest/defconfig b/configs/sam3u-ek/ostest/defconfig
index cdb31139fcb42083e3c95ded6c1526ef646e96b2..1d5456a9a755490959b5fdcd2c940aace7a6cf09 100755
--- a/configs/sam3u-ek/ostest/defconfig
+++ b/configs/sam3u-ek/ostest/defconfig
@@ -741,71 +741,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/sam3u-ek/src/Makefile b/configs/sam3u-ek/src/Makefile
index c80b99c8fa2d68f2e78b53b5fc4f2f61605f963e..9aa681b8b43d0a60c8c46b7a76909f83f92b3cd3 100755
--- a/configs/sam3u-ek/src/Makefile
+++ b/configs/sam3u-ek/src/Makefile
@@ -41,7 +41,7 @@ ASRCS		=
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 
 CSRCS		= up_boot.c up_leds.c up_buttons.c up_spi.c up_usbdev.c up_lcd.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
 ifeq ($(CONFIG_SAM3U_HSMCI),y)
diff --git a/configs/sam3u-ek/src/up_nsh.c b/configs/sam3u-ek/src/up_nsh.c
index cb3665f904ddcbe2bbdc88adef682bc2ff4206ce..842d8b76271e7b78ab4c609c0815ee7c2fb93757 100755
--- a/configs/sam3u-ek/src/up_nsh.c
+++ b/configs/sam3u-ek/src/up_nsh.c
@@ -62,26 +62,26 @@
 /* PORT and SLOT number probably depend on the board configuration */
 
 #ifdef CONFIG_ARCH_BOARD_SAM3UEK
-#  define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1
-#  define CONFIG_EXAMPLES_NSH_HAVEMMCSD  1
-#  if defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) && CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
+#  define CONFIG_NSH_HAVEUSBDEV 1
+#  define CONFIG_NSH_HAVEMMCSD  1
+#  if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0
 #    error "Only one MMC/SD slot"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
+#    undef CONFIG_NSH_MMCSDSLOTNO
 #  endif
-#  ifndef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
+#  ifndef CONFIG_NSH_MMCSDSLOTNO
+#    define CONFIG_NSH_MMCSDSLOTNO 0
 #  endif
 #else
    /* Add configuration for new SAM3U boards here */
 #  error "Unrecognized SAM3U board"
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
 /* Can't support USB features if USB is not enabled */
 
 #ifndef CONFIG_USBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEUSBDEV
 #endif
 
 /* Can't support MMC/SD features if mountpoints are disabled or if SDIO support
@@ -89,11 +89,11 @@
  */
 
 #if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_SAM3U_HSMCI)
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
-#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR
-#  define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0
+#ifndef CONFIG_NSH_MMCSDMINOR
+#  define CONFIG_NSH_MMCSDMINOR 0
 #endif
 
 /* Debug ********************************************************************/
@@ -126,7 +126,7 @@
 
 int nsh_archinitialize(void)
 {
-#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#ifdef CONFIG_NSH_HAVEMMCSD
   FAR struct sdio_dev_s *sdio;
   int ret;
 
@@ -134,20 +134,20 @@ int nsh_archinitialize(void)
   /* First, get an instance of the SDIO interface */
 
   message("nsh_archinitialize: Initializing SDIO slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
-  sdio = sdio_initialize(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSLOTNO);
+  sdio = sdio_initialize(CONFIG_NSH_MMCSDSLOTNO);
   if (!sdio)
     {
       message("nsh_archinitialize: Failed to initialize SDIO slot %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+              CONFIG_NSH_MMCSDSLOTNO);
       return -ENODEV;
     }
 
   /* Now bind the SDIO interface to the MMC/SD driver */
 
   message("nsh_archinitialize: Bind SDIO to the MMC/SD driver, minor=%d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDMINOR);
-  ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, sdio);
+          CONFIG_NSH_MMCSDMINOR);
+  ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, sdio);
   if (ret != OK)
     {
       message("nsh_archinitialize: Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
diff --git a/configs/sim/mount/defconfig b/configs/sim/mount/defconfig
index 98ac9d11941a05b6b174a7663cefa70d1bef6c21..d8c9870abcd15f09f5e7d5403d1e94e0e129abea 100644
--- a/configs/sim/mount/defconfig
+++ b/configs/sim/mount/defconfig
@@ -340,17 +340,17 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100
 CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192
 
 #
-# Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+# Settings for apps/nshlib
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Settings for examples/mount
diff --git a/configs/sim/nettest/defconfig b/configs/sim/nettest/defconfig
index 8c37132074da9442cf9b5e12d235cb2c6f6d3156..9e19a3b8785118f21a5e18a7e9d5c3e4dfb4d647 100644
--- a/configs/sim/nettest/defconfig
+++ b/configs/sim/nettest/defconfig
@@ -340,17 +340,17 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100
 CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192
 
 #
-# Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+# Settings for apps/nshlib
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Settings for examples/mount
diff --git a/configs/sim/nsh/defconfig b/configs/sim/nsh/defconfig
index 9547e45acdc17e4a28a9c5e66a854987a10c70dc..f7611123b9ca914fc0e11f56e6a688e43ef7d140 100644
--- a/configs/sim/nsh/defconfig
+++ b/configs/sim/nsh/defconfig
@@ -340,60 +340,60 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100
 CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-#
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=1024
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=80
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=y
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=1
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=2
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+#
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=1024
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=80
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=y
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=1
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=2
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Settings for examples/mount
diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig
index 688fb6a66a2f3a4e87ff50fffe0e26323f419444..fa6557d74735d044aedf764f343cefdb35e5bbfd 100644
--- a/configs/sim/nx/defconfig
+++ b/configs/sim/nx/defconfig
@@ -434,60 +434,60 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100
 CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-#
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=1024
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=80
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=y
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=1
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=2
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+#
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=1024
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=80
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=y
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=1
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=2
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Settings for examples/nx
diff --git a/configs/sim/nx/defconfig-x11 b/configs/sim/nx/defconfig-x11
index 3594732cce4380edfa110cbf9ab7cab7a68bb4ae..5d483ef0a2acf04c55400752052a3ed4dc167a63 100644
--- a/configs/sim/nx/defconfig-x11
+++ b/configs/sim/nx/defconfig-x11
@@ -434,60 +434,60 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100
 CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-#
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=1024
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=80
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=y
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=1
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=2
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+#
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=1024
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=80
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=y
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=1
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=2
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Settings for examples/nx
diff --git a/configs/sim/ostest/defconfig b/configs/sim/ostest/defconfig
index 625feca2a04b156481d2858986e6d12032ace78b..87f3c878b7385f8ac8adeac5ef4a1fe76663c742 100644
--- a/configs/sim/ostest/defconfig
+++ b/configs/sim/ostest/defconfig
@@ -340,17 +340,17 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100
 CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192
 
 #
-# Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+# Settings for apps/nshlib
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Stack and heap information
diff --git a/configs/sim/pashello/defconfig b/configs/sim/pashello/defconfig
index 5466c71e07f8c64cecf306c383229ef5eb3a5690..6fdb006ce8dfa4ba4f9173ed329a2174531f50cf 100644
--- a/configs/sim/pashello/defconfig
+++ b/configs/sim/pashello/defconfig
@@ -336,16 +336,16 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106)
 
 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Stack and heap information
diff --git a/configs/skp16c26/ostest/defconfig b/configs/skp16c26/ostest/defconfig
index 335337307da1c24c77b6236ebc481fddf0d09bd6..3eacda9ce924a58a868f9e67f3a4a1e3bb4dcc19 100644
--- a/configs/skp16c26/ostest/defconfig
+++ b/configs/skp16c26/ostest/defconfig
@@ -515,16 +515,16 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1)
 
 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # DM90x0 Driver Settings
diff --git a/configs/stm3210e-eval/RIDE/defconfig b/configs/stm3210e-eval/RIDE/defconfig
index 7725c6d0a805db84c630b59e5536f4500f239fa0..ce1687172ea6bfad7383563770ae4ec4f581d892 100755
--- a/configs/stm3210e-eval/RIDE/defconfig
+++ b/configs/stm3210e-eval/RIDE/defconfig
@@ -677,71 +677,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/stm3210e-eval/nsh/defconfig b/configs/stm3210e-eval/nsh/defconfig
index 352133a8c0af90ee24467846255d4e1a2430ccc7..9f56ba0f8d4724a77186e672072f94d1714be2f8 100755
--- a/configs/stm3210e-eval/nsh/defconfig
+++ b/configs/stm3210e-eval/nsh/defconfig
@@ -686,71 +686,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/stm3210e-eval/ostest/defconfig b/configs/stm3210e-eval/ostest/defconfig
index 7038add286b06b95bb23bb08debc2565a5ec2d71..955a15e71d159156f5af3c0f70d4424e8cbc6163 100755
--- a/configs/stm3210e-eval/ostest/defconfig
+++ b/configs/stm3210e-eval/ostest/defconfig
@@ -688,71 +688,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/stm3210e-eval/src/Makefile b/configs/stm3210e-eval/src/Makefile
index d291a16930786228c0f6e77aa6674d1fee144051..42839b0f473328c031e3744aa296369fbab076ce 100755
--- a/configs/stm3210e-eval/src/Makefile
+++ b/configs/stm3210e-eval/src/Makefile
@@ -43,7 +43,7 @@ AOBJS		= $(ASRCS:.S=$(OBJEXT))
 CSRCS		= up_boot.c up_leds.c up_buttons.c up_spi.c up_usbdev.c \
 			  up_extcontext.c up_selectnor.c up_deselectnor.c \
 			  up_selectsram.c up_deselectsram.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
 ifeq ($(CONFIG_APP_DIR),examples/usbstorage)
diff --git a/configs/stm3210e-eval/src/up_nsh.c b/configs/stm3210e-eval/src/up_nsh.c
index db36946bd62b54b5ba2f3cf1adde71df56b59c00..ab4b625f0e3da634620e0af2f12ed90e2f21cfb9 100755
--- a/configs/stm3210e-eval/src/up_nsh.c
+++ b/configs/stm3210e-eval/src/up_nsh.c
@@ -70,26 +70,26 @@
 /* PORT and SLOT number probably depend on the board configuration */
 
 #ifdef CONFIG_ARCH_BOARD_STM3210E_EVAL
-#  define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1
-#  define CONFIG_EXAMPLES_NSH_HAVEMMCSD  1
-#  if defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) && CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
+#  define CONFIG_NSH_HAVEUSBDEV 1
+#  define CONFIG_NSH_HAVEMMCSD  1
+#  if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0
 #    error "Only one MMC/SD slot"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
+#    undef CONFIG_NSH_MMCSDSLOTNO
 #  endif
-#  ifndef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
+#  ifndef CONFIG_NSH_MMCSDSLOTNO
+#    define CONFIG_NSH_MMCSDSLOTNO 0
 #  endif
 #else
    /* Add configuration for new STM32 boards here */
 #  error "Unrecognized STM32 board"
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
 /* Can't support USB features if USB is not enabled */
 
 #ifndef CONFIG_USBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEUSBDEV
 #endif
 
 /* Can't support MMC/SD features if mountpoints are disabled or if SDIO support
@@ -97,11 +97,11 @@
  */
 
 #if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_STM32_SDIO)
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
-#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR
-#  define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0
+#ifndef CONFIG_NSH_MMCSDMINOR
+#  define CONFIG_NSH_MMCSDMINOR 0
 #endif
 
 /* Debug ********************************************************************/
@@ -138,7 +138,7 @@ int nsh_archinitialize(void)
   FAR struct spi_dev_s *spi;
   FAR struct mtd_dev_s *mtd;
 #endif
-#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#ifdef CONFIG_NSH_HAVEMMCSD
   FAR struct sdio_dev_s *sdio;
   int ret;
 #endif
@@ -177,24 +177,24 @@ int nsh_archinitialize(void)
 
   /* Mount the SDIO-based MMC/SD block driver */
 
-#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#ifdef CONFIG_NSH_HAVEMMCSD
   /* First, get an instance of the SDIO interface */
 
   message("nsh_archinitialize: Initializing SDIO slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
-  sdio = sdio_initialize(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSLOTNO);
+  sdio = sdio_initialize(CONFIG_NSH_MMCSDSLOTNO);
   if (!sdio)
     {
       message("nsh_archinitialize: Failed to initialize SDIO slot %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+              CONFIG_NSH_MMCSDSLOTNO);
       return -ENODEV;
     }
 
   /* Now bind the SPI interface to the MMC/SD driver */
 
   message("nsh_archinitialize: Bind SDIO to the MMC/SD driver, minor=%d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDMINOR);
-  ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, sdio);
+          CONFIG_NSH_MMCSDMINOR);
+  ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, sdio);
   if (ret != OK)
     {
       message("nsh_archinitialize: Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
diff --git a/configs/stm3210e-eval/usbserial/defconfig b/configs/stm3210e-eval/usbserial/defconfig
index 7bef8a50b42d2ec7d625d213af06020780d2d81d..46646bc416b51e16c98accd2dc98da908cde5b73 100755
--- a/configs/stm3210e-eval/usbserial/defconfig
+++ b/configs/stm3210e-eval/usbserial/defconfig
@@ -689,71 +689,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/stm3210e-eval/usbstorage/defconfig b/configs/stm3210e-eval/usbstorage/defconfig
index ceeabb907f2337e96a06c4525a0dfb5f251e4743..688e99f69e37e909fbf50df194531b508d4f93a6 100755
--- a/configs/stm3210e-eval/usbstorage/defconfig
+++ b/configs/stm3210e-eval/usbstorage/defconfig
@@ -688,71 +688,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/us7032evb1/nsh/defconfig b/configs/us7032evb1/nsh/defconfig
index a5a4bf350738c9b58b232f804ff0d15fbbd13bcd..9b41759044ae6bf508ae5f85fb338ae60c1ea5f8 100644
--- a/configs/us7032evb1/nsh/defconfig
+++ b/configs/us7032evb1/nsh/defconfig
@@ -518,66 +518,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-#
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+#
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Stack and heap information
diff --git a/configs/us7032evb1/ostest/defconfig b/configs/us7032evb1/ostest/defconfig
index ae87161011fa3c0b9d1a6d14b6f0ae07574091dd..b93973eea09f855b057ded0416a4c34c75e28d31 100644
--- a/configs/us7032evb1/ostest/defconfig
+++ b/configs/us7032evb1/ostest/defconfig
@@ -518,66 +518,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-#
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+#
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Stack and heap information
diff --git a/configs/vsn/nsh/appconfig b/configs/vsn/nsh/appconfig
index d946c07a3dfc47e5bff301919a44df1011d41852..65e8c220fa240e839058968843d145dce76bd2ff 100755
--- a/configs/vsn/nsh/appconfig
+++ b/configs/vsn/nsh/appconfig
@@ -35,8 +35,38 @@
 #
 ############################################################################
 
-# Add the list of built-in apps needed by this configuration
+########################################################################
+#
+# Applications to be included within the NuttX binary as described
+# under the apps/README.txt
+#
+# Set thi config parameter above to: CONFIG_TASK_NAME_SIZE=16
+# In order to enable argv[0]=<task name> argument set the option
+# CONFIG_TASK_NAME_SIZE=16
+#
+
+# Invoke the following application after NuttX starts
+#CONFIG_BUILTIN_APP_START="hello"
+
+# Application Libraries
+CONFIGURED_APPS += nshlib/.built_always
+
+# Individual selection of built-in applications:
+
+# Hello world provide a simple skeleton/demo application
+CONFIGURED_APPS += hello/.built_always
+
+# Provide poweroff command to switch off the board
+CONFIGURED_APPS += poweroff/.built_always 
+
+# Provide SDcard tool
+CONFIGURED_APPS += sdcard/.built_always 
+
+# Provide RAMTRON tool
+CONFIGURED_APPS += ramtron/.built_always 
 
-CONFIGURED_APPS += hello/.built_always poweroff/.built_always \
-	sdcard/.built_always ramtron/.built_always nshlib/.built_always
+# Provide UNIX style free 
+CONFIGURED_APPS += free/.built_always 
 
+# Provide JAVA Virtual Machine (the Darjeeling JVM)
+#CONFIGURED_APPS += jvm/.built_always 
diff --git a/configs/vsn/nsh/defconfig b/configs/vsn/nsh/defconfig
index f7340137269c2f3900453bf0e01b61d3e9ce1fcd..1e5f34c2f9b11384068608bf59a269de0f0f64d9 100755
--- a/configs/vsn/nsh/defconfig
+++ b/configs/vsn/nsh/defconfig
@@ -704,76 +704,76 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 
 #
-# Settings for examples/nsh
-#
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# Settings for apps/nshlib
+#
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ARCHROMFS - May be defined to specify an alternative
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ARCHROMFS - May be defined to specify an alternative
 #  ROMFS image that can be found at configs/<board>/include/nsh_romfsimg.h.
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-#
-CONFIG_EXAMPLES_NSH_BUILTIN_APPS=y
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=y
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ARCHROMFS=y
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=40
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+#
+CONFIG_NSH_BUILTIN_APPS=y
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=y
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ARCHROMFS=y
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=40
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 
 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Settings for examples/usbserial
diff --git a/configs/vsn/src/Makefile b/configs/vsn/src/Makefile
index f12a8bcefbb3c3e40f7e5e5f5387095bce14d4a2..6e55c30ca0ab7bebb358e455ec9fc9e36cf5ff1a 100644
--- a/configs/vsn/src/Makefile
+++ b/configs/vsn/src/Makefile
@@ -46,7 +46,7 @@ AOBJS		= $(ASRCS:.S=$(OBJEXT))
 CSRCS		= sysclock.c boot.c leds.c buttons.c spi.c \
 			  usbdev.c power.c
 
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= nsh.c
 endif
 ifeq ($(CONFIG_APP_DIR),examples/usbstorage)
diff --git a/configs/vsn/src/nsh.c b/configs/vsn/src/nsh.c
index d29368833f44c2bdd6342f76c3de50d337b02783..c4e691ba9cac856dca4f5c5ed6299f70c0a50fef 100644
--- a/configs/vsn/src/nsh.c
+++ b/configs/vsn/src/nsh.c
@@ -58,12 +58,12 @@
 
 /* PORT and SLOT number probably depend on the board configuration */
 
-#define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1
+#define CONFIG_NSH_HAVEUSBDEV 1
 
 /* Can't support USB features if USB is not enabled */
 
 #ifndef CONFIG_USBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEUSBDEV
 #endif
 
 
diff --git a/configs/vsn/src/sdcard.c b/configs/vsn/src/sdcard.c
index 367e4150bb459e31e6bfe22efe8475027d7b0859..af36062dd869e794269e8a303db29c35da776a5d 100644
--- a/configs/vsn/src/sdcard.c
+++ b/configs/vsn/src/sdcard.c
@@ -52,13 +52,13 @@
 #include "vsn.h"
 
 
-#define CONFIG_EXAMPLES_NSH_HAVEMMCSD  1
-#if defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) && CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
+#define CONFIG_NSH_HAVEMMCSD  1
+#if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0
 #  error "Only one MMC/SD slot"
-#  undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
+#  undef CONFIG_NSH_MMCSDSLOTNO
 #endif
-#ifndef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
-#  define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
+#ifndef CONFIG_NSH_MMCSDSLOTNO
+#  define CONFIG_NSH_MMCSDSLOTNO 0
 #endif
 
 /* Can't support MMC/SD features if mountpoints are disabled or if SDIO support
@@ -66,11 +66,11 @@
  */
 
 #if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_STM32_SDIO)
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
-#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR
-#  define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0
+#ifndef CONFIG_NSH_MMCSDMINOR
+#  define CONFIG_NSH_MMCSDMINOR 0
 #endif
 
 
@@ -79,24 +79,24 @@ int up_sdcard(void)
 {
   /* Mount the SDIO-based MMC/SD block driver */
 
-#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#ifdef CONFIG_NSH_HAVEMMCSD
 
   FAR struct sdio_dev_s *sdio;
   int ret;
 
   /* First, get an instance of the SDIO interface */
 
-  sdio = sdio_initialize(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+  sdio = sdio_initialize(CONFIG_NSH_MMCSDSLOTNO);
   if (!sdio)
     {
-      message("SDIO: Failed to initialize slot %d\n", CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+      message("SDIO: Failed to initialize slot %d\n", CONFIG_NSH_MMCSDSLOTNO);
       return -ENODEV;
     }
-  message("SDIO: Initialized slot %d\n", CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+  message("SDIO: Initialized slot %d\n", CONFIG_NSH_MMCSDSLOTNO);
 
   /* Now bind the SPI interface to the MMC/SD driver */
 
-  ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, sdio);
+  ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, sdio);
   if (ret != OK)
     {
       message("SDIO: Failed to bind to the MMC/SD driver: %d\n", ret);
diff --git a/configs/xtrs/nsh/defconfig b/configs/xtrs/nsh/defconfig
index 4026adf6fe9a620c6d65c6fb32b8bff17e8a3339..83c6498aefb5f9d6132235b0af92df7085e056cc 100644
--- a/configs/xtrs/nsh/defconfig
+++ b/configs/xtrs/nsh/defconfig
@@ -341,58 +341,58 @@ CONFIG_NET_RESOLV_ENTRIES=4
 #
 # Settings for examples/nsh
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-#
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=1024
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=1024
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+#
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=1024
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=40
+CONFIG_NSH_STACKSIZE=1024
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Stack and heap information
diff --git a/configs/xtrs/ostest/defconfig b/configs/xtrs/ostest/defconfig
index 21af7f055bc83a81f79ef8cac4c4e8d0939e0e4a..aad132b8b47ca8ae0168281de064eb2373b3fbe3 100644
--- a/configs/xtrs/ostest/defconfig
+++ b/configs/xtrs/ostest/defconfig
@@ -340,16 +340,16 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Stack and heap information
diff --git a/configs/xtrs/pashello/defconfig b/configs/xtrs/pashello/defconfig
index 0170247473f3bc4b18d091aa87e79f5c7f8a4199..24607207aee849e0e6df8fc00614c4784a73100e 100644
--- a/configs/xtrs/pashello/defconfig
+++ b/configs/xtrs/pashello/defconfig
@@ -340,16 +340,16 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Stack and heap information
diff --git a/configs/z16f2800100zcog/ostest/defconfig b/configs/z16f2800100zcog/ostest/defconfig
index ea7aa62db40e6a7bebf1391d7b2f54c2a1520b29..55617bd8582350a3d0fd1eac1d9c5bfbdb01f80b 100644
--- a/configs/z16f2800100zcog/ostest/defconfig
+++ b/configs/z16f2800100zcog/ostest/defconfig
@@ -368,16 +368,16 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Stack and heap information
diff --git a/configs/z16f2800100zcog/pashello/defconfig b/configs/z16f2800100zcog/pashello/defconfig
index 10761a6a44a9d6f716cc600c21e05dc4a33da11f..cbe0e1fbf0e21cf116a7a4a9713414c987819d3a 100644
--- a/configs/z16f2800100zcog/pashello/defconfig
+++ b/configs/z16f2800100zcog/pashello/defconfig
@@ -368,16 +368,16 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Stack and heap information
diff --git a/configs/z80sim/nsh/defconfig b/configs/z80sim/nsh/defconfig
index 38c3c2b417170fd3e711b8d2835dda31fc77ffdc..b6af3aa2766d978f7665b3849993d89f5ebdf7ca 100644
--- a/configs/z80sim/nsh/defconfig
+++ b/configs/z80sim/nsh/defconfig
@@ -331,58 +331,58 @@ CONFIG_NET_RESOLV_ENTRIES=4
 #
 # Settings for examples/nsh
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-#
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
-#
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=1024
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=1024
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+#
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
+#
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=1024
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=40
+CONFIG_NSH_STACKSIZE=1024
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
 
 #
 # Stack and heap information
diff --git a/configs/z80sim/ostest/defconfig b/configs/z80sim/ostest/defconfig
index f978e75b0d9275bdd1d0ba600f4a32883ccfef42..78a173af3b01cf12b36d0eb0016616d025102d33 100644
--- a/configs/z80sim/ostest/defconfig
+++ b/configs/z80sim/ostest/defconfig
@@ -330,16 +330,16 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Stack and heap information
diff --git a/configs/z80sim/pashello/defconfig b/configs/z80sim/pashello/defconfig
index 0fe2828db68f84fda53c4bcc60deba562cc5542f..c8a99c9bfd2558ae47da6e887537eca0c263e6c7 100644
--- a/configs/z80sim/pashello/defconfig
+++ b/configs/z80sim/pashello/defconfig
@@ -330,16 +330,16 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Stack and heap information
diff --git a/configs/z8encore000zco/ostest/defconfig b/configs/z8encore000zco/ostest/defconfig
index b206996a4a51a69a5a6d4829937090342b68c7c0..54cc2a863d7fd8de7e995d8adc77dc6cf1521b10 100644
--- a/configs/z8encore000zco/ostest/defconfig
+++ b/configs/z8encore000zco/ostest/defconfig
@@ -368,17 +368,17 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=1
 CONFIG_EXAMPLES_OSTEST_STACKSIZE=256
 
 #
-# Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+# Settings for apps/nshlib
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Stack and heap information
diff --git a/configs/z8f64200100kit/ostest/defconfig b/configs/z8f64200100kit/ostest/defconfig
index 34181dd5ad6d72e12e3ddf30db9a3e3c8db7017d..b37b81e34eb1444ab50834b0edce3264b3bfb60c 100644
--- a/configs/z8f64200100kit/ostest/defconfig
+++ b/configs/z8f64200100kit/ostest/defconfig
@@ -368,17 +368,17 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=1
 CONFIG_EXAMPLES_OSTEST_STACKSIZE=256
 
 #
-# Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+# Settings for apps/nshlib
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 
 #
 # Stack and heap information
diff --git a/examples/nsh/nsh_main.c b/examples/nsh/nsh_main.c
index fc6c9b0f9c5448a998057533c6dd9015c7b2c73d..c973530cc4e26a3d7b8b5b60ee8eab72d3298829 100644
--- a/examples/nsh/nsh_main.c
+++ b/examples/nsh/nsh_main.c
@@ -101,7 +101,7 @@ void user_initialize(void)
 int user_start(int argc, char *argv[])
 {
   int mid_priority;
-#if defined(CONFIG_EXAMPLES_NSH_CONSOLE) && defined(CONFIG_EXAMPLES_NSH_TELNET)
+#if defined(CONFIG_NSH_CONSOLE) && defined(CONFIG_NSH_TELNET)
   int ret;
 #endif
 
@@ -125,9 +125,9 @@ int user_start(int argc, char *argv[])
    * the telnet front end on another thread.
    */
 
-#if defined(CONFIG_EXAMPLES_NSH_CONSOLE) && defined(CONFIG_EXAMPLES_NSH_TELNET)
+#if defined(CONFIG_NSH_CONSOLE) && defined(CONFIG_NSH_TELNET)
 # ifndef CONFIG_CUSTOM_STACK
-  ret = task_create("nsh_telnetmain", mid_priority, CONFIG_EXAMPLES_NSH_STACKSIZE,
+  ret = task_create("nsh_telnetmain", mid_priority, CONFIG_NSH_STACKSIZE,
                     nsh_telnetmain, NULL);
 # else
   ret = task_create("nsh_telnetmain", mid_priority, nsh_telnetmain, NULL);
@@ -139,13 +139,13 @@ int user_start(int argc, char *argv[])
 
   /* If only the telnet front-end is selected, run it on this thread */
 
-#elif defined(CONFIG_EXAMPLES_NSH_TELNET)
+#elif defined(CONFIG_NSH_TELNET)
   return nsh_telnetmain(0, NULL);
 #endif
 
 /* If the serial console front end is selected, then run it on this thread */
 
-#ifdef CONFIG_EXAMPLES_NSH_CONSOLE
+#ifdef CONFIG_NSH_CONSOLE
   return nsh_consolemain(0, NULL);
 #endif
 }
diff --git a/netutils/README b/netutils/README.txt
similarity index 100%
rename from netutils/README
rename to netutils/README.txt
diff --git a/netutils/telnetd/README.txt b/netutils/telnetd/README.txt
index 14b05236c30d5019b763f8d4e955111aef018377..24fcba7d5d45d2ca60da57325f3d978d9524fe9b 100644
--- a/netutils/telnetd/README.txt
+++ b/netutils/telnetd/README.txt
@@ -1,7 +1,7 @@
 This directory is here for historical reasons. Nothing contained in this
 directory is currently used by NuttX.  This directly contains a functional
 port of the tiny uIP shell.  In the NuttX environment, the NuttShell (at
-/examples/nsh) supercedes this tiny shell and also supports telnetd.
+apps/nshlib) supercedes this tiny shell and also supports telnetd.
 
 This example is retained here for reference purposes only.
 
diff --git a/tools/mkromfsimg.sh b/tools/mkromfsimg.sh
index 5e742f47de556b04bdb9a81e3835412fbb7519d2..b628d2419613e1e53a16723175a1904313e52e53 100755
--- a/tools/mkromfsimg.sh
+++ b/tools/mkromfsimg.sh
@@ -65,21 +65,21 @@ if [ ! -r $topdir/.config ]; then
     exit 1
 fi
 
-romfsetc=`grep CONFIG_EXAMPLES_NSH_ROMFSETC= $topdir/.config | cut -d'=' -f2`
+romfsetc=`grep CONFIG_NSH_ROMFSETC= $topdir/.config | cut -d'=' -f2`
 disablempt=`grep CONFIG_DISABLE_MOUNTPOINT= $topdir/.config | cut -d'=' -f2`
-disablescript=`grep CONFIG_EXAMPLES_NSH_DISABLESCRIPT= $topdir/.config | cut -d'=' -f2`
+disablescript=`grep CONFIG_NSH_DISABLESCRIPT= $topdir/.config | cut -d'=' -f2`
 ndescriptors=`grep CONFIG_NFILE_DESCRIPTORS= $topdir/.config | cut -d'=' -f2`
 devconsole=`grep CONFIG_DEV_CONSOLE= $topdir/.config | cut -d'=' -f2`
 romfs=`grep CONFIG_FS_ROMFS= $topdir/.config | cut -d'=' -f2`
-romfsmpt=`grep CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT= $topdir/.config | cut -d'=' -f2`
-initscript=`grep CONFIG_EXAMPLES_NSH_INITSCRIPT= $topdir/.config | cut -d'=' -f2`
-romfsdevno=`grep CONFIG_EXAMPLES_NSH_ROMFSDEVNO= $topdir/.config | cut -d'=' -f2`
-romfssectsize=`grep CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE= $topdir/.config | cut -d'=' -f2`
+romfsmpt=`grep CONFIG_NSH_ROMFSMOUNTPT= $topdir/.config | cut -d'=' -f2`
+initscript=`grep CONFIG_NSH_INITSCRIPT= $topdir/.config | cut -d'=' -f2`
+romfsdevno=`grep CONFIG_NSH_ROMFSDEVNO= $topdir/.config | cut -d'=' -f2`
+romfssectsize=`grep CONFIG_NSH_ROMFSSECTSIZE= $topdir/.config | cut -d'=' -f2`
 fatfs=`grep CONFIG_FS_FAT= $topdir/.config | cut -d'=' -f2`
-fatdevno=`grep CONFIG_EXAMPLES_NSH_FATDEVNO= $topdir/.config | cut -d'=' -f2`
-fatsectsize=`grep CONFIG_EXAMPLES_NSH_FATSECTSIZE= $topdir/.config | cut -d'=' -f2`
-fatnsectors=`grep CONFIG_EXAMPLES_NSH_FATNSECTORS= $topdir/.config | cut -d'=' -f2`
-fatmpt=`grep CONFIG_EXAMPLES_NSH_FATMOUNTPT= $topdir/.config | cut -d'=' -f2`
+fatdevno=`grep CONFIG_NSH_FATDEVNO= $topdir/.config | cut -d'=' -f2`
+fatsectsize=`grep CONFIG_NSH_FATSECTSIZE= $topdir/.config | cut -d'=' -f2`
+fatnsectors=`grep CONFIG_NSH_FATNSECTORS= $topdir/.config | cut -d'=' -f2`
+fatmpt=`grep CONFIG_NSH_FATMOUNTPT= $topdir/.config | cut -d'=' -f2`
 
 # The following settings are required for general ROMFS support
 #
@@ -95,7 +95,7 @@ fi
 
 if [ "X$disablescript" = "Xy" ]; then
     echo "NSH scripting support is required for this feature"
-    echo "Set CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n to continue"
+    echo "Set CONFIG_NSH_DISABLESCRIPT=n to continue"
     exit 1
 fi
 
@@ -179,7 +179,7 @@ fi
 # /., /./*, /.., or /../*
 
 if [ ${romfsmpt:0:1} != "\"" ]; then
-   echo "CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT must be a string"
+   echo "CONFIG_NSH_ROMFSMOUNTPT must be a string"
    echo "Change it so that it is enclosed in quotes."
    exit 1
 fi
@@ -187,7 +187,7 @@ fi
 uromfsmpt=`echo $romfsmpt | sed -e "s/\"//g"`
 
 if [ ${uromfsmpt:0:1} != "/" ]; then
-   echo "CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT must be an absolute path in the target FS"
+   echo "CONFIG_NSH_ROMFSMOUNTPT must be an absolute path in the target FS"
    echo "Change it so that it begins with the character '/'.  Eg. /etc"
    exit 1
 fi
@@ -199,14 +199,14 @@ done
 
 if [ -z "$tmpdir" -o "X$tmpdir" = "Xdev" -o "X$tmpdir" = "." -o \
      ${tmpdir:0:2} = "./" -o "X$tmpdir" = ".." -o ${tmpdir:0:3} = "../" ]; then
-   echo "Invalid CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT selection."
+   echo "Invalid CONFIG_NSH_ROMFSMOUNTPT selection."
    exit 1
 fi
 
 # Verify that the path to the init file is a relative path and not ., ./*, .., or ../*
 
 if [ ${initscript:0:1} != "\"" ]; then
-   echo "CONFIG_EXAMPLES_NSH_INITSCRIPT must be a string"
+   echo "CONFIG_NSH_INITSCRIPT must be a string"
    echo "Change it so that it is enclosed in quotes."
    exit 1
 fi
@@ -214,14 +214,14 @@ fi
 uinitscript=`echo $initscript | sed -e "s/\"//g"`
 
 if [ ${uinitscript:0:1} == "/" ]; then
-   echo "CONFIG_EXAMPLES_NSH_INITSCRIPT must be an relative path in under $romfsmpt"
+   echo "CONFIG_NSH_INITSCRIPT must be an relative path in under $romfsmpt"
    echo "Change it so that it begins with the character '/'.  Eg. init.d/rcS. "
    exit 1
 fi
 
 if [ "X$uinitscript" = "."  -o ${uinitscript:0:2} = "./" -o \
      "X$uinitscript" = ".." -o ${uinitscript:0:3} = "../" ]; then
-   echo "Invalid CONFIG_EXAMPLES_NSH_INITSCRIPT selection.  Must not begin with . or .."
+   echo "Invalid CONFIG_NSH_INITSCRIPT selection.  Must not begin with . or .."
    exit 1
 fi