diff --git a/Documentation/NuttShell.html b/Documentation/NuttShell.html
index 0b5f7aa11b5..cc3f078ddfd 100644
--- a/Documentation/NuttShell.html
+++ b/Documentation/NuttShell.html
@@ -2515,7 +2515,7 @@ nsh>
   <tr>
     <td valign="top"><b><code>CONFIG_NSH_BUILTIN_APPS</code></b></td>
     <td>
-      Support external registered, &quot;named&quot; applications that can be
+      Support external registered, &quot;builtin&quot; applications that can be
       executed from the NSH command line (see apps/README.txt for
       more information).
     </td>
@@ -3239,48 +3239,48 @@ Builtin Apps:
   Note that no detailed help information beyond the name of the built-in application is provided.
 </p>
 
-<h3>4.3.1 Named Applications</h3>
+<h3>4.3.1 Built-In Applications</h3>
 
 <p>
   <b>Overview.</b>
-  The underlying logic that supports the NSH built-in applications is called &quot;Named Applications&quot;.
-  The named application logic can be found at <code>apps/namedapp</code>.
+  The underlying logic that supports the NSH built-in applications is called &quot;Built-In Applications&quot;.
+  The builtin application logic can be found at <code>apps/builtin</code>.
   This logic simply does the following:
 </p>
 
 <ol>
   <li>
     <p>
-      It supports registration mechanism so that named applications can dynamically register themselves at build time, and
+      It supports registration mechanism so that builtin applications can dynamically register themselves at build time, and
     </p>
   <li>
     <p>
-      Utility functions to look up, list, and execute the named applications.
+      Utility functions to look up, list, and execute the builtin applications.
     </p>
 </ol>
 
 <p>
-  <b>Named Application Utility Functions</b>.
-  The utility functions exported by the named application logic are prototyped in <code>apps/include/apps.h</code>.
+  <b>Built-In Application Utility Functions</b>.
+  The utility functions exported by the builtin application logic are prototyped in <code>apps/include/apps.h</code>.
   These utility functions include:
 </p>
 
 <ul>
   <li>
     <p>
-      <code>int namedapp_isavail(FAR const char *appname);</code>
+      <code>int builtin_isavail(FAR const char *appname);</code>
       Checks for availability of application registered as <code>appname</code> during build time.
     </p>
   <li>
     <p>
-      <code>const char *namedapp_getname(int index);</code>
+      <code>const char *builtin_getname(int index);</code>
       Returns a pointer to a name of built-in application pointed by the <code>index</code>.
       This is the utility function that is used by NSH in order to list the available built-in applications when &quot;<code>nsh&gt; help</code>&quot; is entered.
     </p>
   <li>
     <p>
-      <code>int exec_namedapp(FAR const char *appname, FAR const char **argv);</code>
-      Executes built-in named application registered during compile time.
+      <code>int exec_builtin(FAR const char *appname, FAR const char **argv);</code>
+      Executes built-in builtin application registered during compile time.
       This is the utility function used by NSH to execute the built-in application.
     </p>
 </ul>
@@ -3292,23 +3292,23 @@ Builtin Apps:
 <ol>
   <li>
     <p>
-      <code>apps/namedapp/namedapp_proto.h</code>:
+      <code>apps/builtin/builtin_proto.h</code>:
       Prototypes of application task entry points.
     </p>
   <li>
     <p>
-      <code>apps/namedapp/namedapp_list.h</code>:
+      <code>apps/builtin/builtin_list.h</code>:
       Application specific information and start-up requirements
     </p>
 </ol>
 
 <p>
-  <b>Registration of Named Applications</b>.
+  <b>Registration of Built-In Applications</b>.
   The NuttX build occurs in several phases as different build targets are executed:
   (1) <i>context</i> when the configuration is established,
   (2) <i>depend </i>when target dependencies are generated, and
   (3) <i>default</i> (<code>all</code>) when the normal compilation and link operations are performed.  
-  Named application information is collected during the make <i>context</i> build phase.
+  Built-in application information is collected during the make <i>context</i> build phase.
 </p>
 
 <p>
@@ -3376,7 +3376,7 @@ make apps_distclean
 </pre></ul>
 
 <p>
-  Logic for the <code>context</code> target in <code>apps/examples/hello/Makefile</code> registers the <code>hello_main()</code> application in the <code>namedapp</code>'s <code>namedapp_proto.h</code>and <code>namedapp_list.h</code> files.
+  Logic for the <code>context</code> target in <code>apps/examples/hello/Makefile</code> registers the <code>hello_main()</code> application in the <code>builtin</code>'s <code>builtin_proto.h</code>and <code>builtin_list.h</code> files.
   That logic that does that in  <code>apps/examples/hello/Makefile</code> is abstracted below:
 </p>
 <ol>
@@ -3388,13 +3388,13 @@ make apps_distclean
 include $(APPDIR)/Make.defs
 </pre></ul>
     <p>
-      This defines a macro called <code>REGISTER</code> that adds data to the <i>namedapp</i> header files:
+      This defines a macro called <code>REGISTER</code> that adds data to the <i>builtin</i> header files:
     </p>
 <ul><pre>
 define REGISTER
     @echo &quot;Register: $1&quot;
-    @echo &quot;{ \&quot;$1\&quot;, $2, $3, $4 },&quot; &gt;&gt; &quot;$(APPDIR)/namedapp/namedapp_list.h&quot;
-    @echo &quot;EXTERN int $4(int argc, char *argv[]);&quot; &gt;&gt; &quot;$(APPDIR)/namedapp/namedapp_proto.h&quot;
+    @echo &quot;{ \&quot;$1\&quot;, $2, $3, $4 },&quot; &gt;&gt; &quot;$(APPDIR)/builtin/builtin_list.h&quot;
+    @echo &quot;EXTERN int $4(int argc, char *argv[]);&quot; &gt;&gt; &quot;$(APPDIR)/builtin/builtin_proto.h&quot;
 endef
 </pre></ul>
     <p>
@@ -3412,7 +3412,7 @@ STACKSIZE       = 2048
 
   <li>
     <p>
-      And finally, the <code>Makefile</code> invokes the <code>REGISTER</code> macro to added the <code>hello_main()</code> named application.
+      And finally, the <code>Makefile</code> invokes the <code>REGISTER</code> macro to added the <code>hello_main()</code> builtin application.
       Then, when the system build completes, the <code>hello</code> command can be executed from the NSH command line.
       When the <code>hello</code> command is executed, it will start the task with entry point <code>hello_main()</code> with the default priority and with a stack size of 2K.
    </p>
@@ -3424,16 +3424,16 @@ STACKSIZE       = 2048
 </ol>
 
 <p>
-  <b>Other Uses of Named Application.</b>
-  The primary purpose of named applications is to support command line execution of applications from NSH.
-  However, there are two other uses of named applications that should be mentioned.
+  <b>Other Uses of Built-In Application.</b>
+  The primary purpose of builtin applications is to support command line execution of applications from NSH.
+  However, there are two other uses of builtin applications that should be mentioned.
 </p>
 
 <ol>
   <li>
     <p>
-      <b>Named Application Start-Up <code>main()</code> function</b>.
-      A named application can even be used as the main, start-up entry point into your embedded software. 
+      <b>Built-In Application Start-Up <code>main()</code> function</b>.
+      A builtin application can even be used as the main, start-up entry point into your embedded software. 
       When the user defines this option in the NuttX configuration file:
     </p>
 <ul><pre>
@@ -3451,11 +3451,11 @@ CONFIG_BUILTIN_APP_START=&lt;application name&gt;
 
   <li>
     <p><b><i>binfs</i></b>.
-    <i>binfs</i> is a tiny file system located at <code>apps/namedapp/binfs.c</code>.
-     This provides an alternative what of visualizing installed named applications.
-     Without <i>binfs</i>, you can see the installed named applications using the NSH help command.
+    <i>binfs</i> is a tiny file system located at <code>apps/builtin/binfs.c</code>.
+     This provides an alternative what of visualizing installed builtin applications.
+     Without <i>binfs</i>, you can see the installed builtin applications using the NSH help command.
      <i>binfs</i> will create a tiny pseudo-file system mounted at <code>/bin</code>.
-     Using <i>binfs</i>, you can see the available named applications by listing the contents of  <code>/bin</code> directory.
+     Using <i>binfs</i>, you can see the available builtin applications by listing the contents of  <code>/bin</code> directory.
      This gives some superficial Unix compatibility, but does not really add any new functionality.
    </p>
 </ol>
@@ -3762,7 +3762,12 @@ mount -t vfat /dev/ram1 /tmp
   <li><a href="#cmdoverview">Background command priority</a></li>
   <li><a href="#custapps"><code>binfs</code></a></li>
   <li><a href="#custapps">Built-In applications</a></li>
+  <li><a href="#custapps">Built-In application start-up <code>main()</code></a></li>
   <li><a href="#builtinvars">Built-in variables</a></li>
+  <li><a href="#custapps"><code>builtin_getname()</code></a></li>
+  <li><a href="#custapps"><code>builtin_isavail()</code></a></li>
+  <li><a href="#custapps"><code>builtin_list.h</code></a></li>
+  <li><a href="#custapps"><code>builtin_proto.h</code></a></li>
   <li><a href="#cmdbase64dec"><code>base64dec</code></a></li>
   <li><a href="#cmdbase64enc"><code>base64enc</code></a></li>
   <li><a href="#cmdcat"><code>cat</code></a></li>
@@ -3827,12 +3832,12 @@ mount -t vfat /dev/ram1 /tmp
   <li><a href="#cmdecho"><code>echo</code></a></li>
   <li><a href="#environvars">Environment Variables</a></li>
   <li><a href="#startupscript"><code>/etc/init.d/rcS</code></a>
-  <li><a href="#cmdexec"><code>exec</code></a></li>
-  <li><a href="#custapps"><code>exec_namedapp()</code></a></li>
-  <li><a href="#cmdexit"><code>exit</code></a></li>
-  <li><a href="#cmdfree"><code>free</code></a></li>
 </ul></td>
 <td></ul>
+  <li><a href="#cmdexec"><code>exec</code></a></li>
+  <li><a href="#custapps"><code>exec_builtin()</code></a></li>
+  <li><a href="#cmdexit"><code>exit</code></a></li>
+  <li><a href="#cmdfree"><code>free</code></a></li>
   <li><a href="#custoncmds"><code>g_cmdmap</code></a></li>
   <li><a href="#custinit"><code>genromfs</code></a></li>
   <li><a href="#cmdget"><code>get</code></a></li>
@@ -3858,12 +3863,6 @@ mount -t vfat /dev/ram1 /tmp
   <li><a href="#custinit"><code>mkromfsimg.sh</code></a></li>
   <li><a href="#cmdmount"><code>mount</code></a></li>
   <li><a href="#cmdmv"><code>mv</code></a></li>
-  <li><a href="#custapps">Named application start-up <code>main()</code></a></li>
-  <li><a href="#custapps">Named applications</a></li>
-  <li><a href="#custapps"><code>namedapp_getname()</code></a></li>
-  <li><a href="#custapps"><code>namedapp_isavail()</code></a></li>
-  <li><a href="#custapps"><code>namedapp_list.h</code></a></li>
-  <li><a href="#custapps"><code>namedapp_proto.h</code></a></li>
   <li><a href="#cmdnfsmount"><code>nfsmount</code></a></li>
   <li><a href="#cmdoverview"><code>nice</code></a></li>
   <li><a href="#custonshlib">NSH library (<code>nshlib</code>)</a></li>
@@ -3887,7 +3886,7 @@ mount -t vfat /dev/ram1 /tmp
   <li><a href="#environvars"><code>PWD</code></a></li>
   <li><a href="#custinit"><code>rcS.template</code></a></li>
   <li><a href="#cmdoverview">Re-directed commands</a></li>
-  <li><a href="#custapps">Registration of named applications</a></li>
+  <li><a href="#custapps">Registration of builtin applications</a></li>
   <li><a href="#cmdrm"><code>rm</code></a></li>
   <li><a href="#cmdrmdir"><code>rmdir</code></a></li>
   <li><a href="#custinit">ROMFS, Modifying the ROMFS image</a></li>
diff --git a/configs/cloudctrl/nsh/defconfig b/configs/cloudctrl/nsh/defconfig
index fbb5e8c1397..99c7eb7901c 100644
--- a/configs/cloudctrl/nsh/defconfig
+++ b/configs/cloudctrl/nsh/defconfig
@@ -505,7 +505,7 @@ CONFIG_HAVE_CXX=y
 #
 # Named Applications
 #
-CONFIG_NAMEDAPP=y
+CONFIG_BUILTIN=y
 
 #
 # Examples
diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig
index 50efbfdaf34..80c9e682eae 100644
--- a/configs/ez80f910200kitg/ostest/defconfig
+++ b/configs/ez80f910200kitg/ostest/defconfig
@@ -334,7 +334,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/ez80f910200zco/ostest/defconfig b/configs/ez80f910200zco/ostest/defconfig
index 3a135233316..88c1b727911 100644
--- a/configs/ez80f910200zco/ostest/defconfig
+++ b/configs/ez80f910200zco/ostest/defconfig
@@ -342,7 +342,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/fire-stm32v2/nsh/defconfig b/configs/fire-stm32v2/nsh/defconfig
index 2fb623a0d04..c42bb15696a 100644
--- a/configs/fire-stm32v2/nsh/defconfig
+++ b/configs/fire-stm32v2/nsh/defconfig
@@ -531,7 +531,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Named Applications
 #
-CONFIG_NAMEDAPP=y
+CONFIG_BUILTIN=y
 
 #
 # Examples
diff --git a/configs/p112/ostest/defconfig b/configs/p112/ostest/defconfig
index c30adcf2258..3699475c595 100644
--- a/configs/p112/ostest/defconfig
+++ b/configs/p112/ostest/defconfig
@@ -370,7 +370,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/shenzhou/nsh/defconfig b/configs/shenzhou/nsh/defconfig
index 36f8e40fc67..c54d714d0d0 100644
--- a/configs/shenzhou/nsh/defconfig
+++ b/configs/shenzhou/nsh/defconfig
@@ -505,7 +505,7 @@ CONFIG_HAVE_CXX=y
 #
 # Named Applications
 #
-CONFIG_NAMEDAPP=y
+CONFIG_BUILTIN=y
 
 #
 # Examples
diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig
index 0f100ed5e52..9753277470c 100644
--- a/configs/shenzhou/nxwm/defconfig
+++ b/configs/shenzhou/nxwm/defconfig
@@ -630,7 +630,7 @@ CONFIG_HAVE_CXXINITIALIZE=y
 #
 # Named Applications
 #
-CONFIG_NAMEDAPP=y
+CONFIG_BUILTIN=y
 
 #
 # Examples
diff --git a/configs/shenzhou/thttpd/defconfig b/configs/shenzhou/thttpd/defconfig
index ccbcf9ab25e..958ab02ed16 100644
--- a/configs/shenzhou/thttpd/defconfig
+++ b/configs/shenzhou/thttpd/defconfig
@@ -474,7 +474,7 @@ CONFIG_HAVE_CXX=y
 #
 # Named Applications
 #
-CONFIG_NAMEDAPP=y
+CONFIG_BUILTIN=y
 
 #
 # Examples
diff --git a/configs/sim/README.txt b/configs/sim/README.txt
index f1dfd0dd224..03f163ea5a5 100644
--- a/configs/sim/README.txt
+++ b/configs/sim/README.txt
@@ -148,9 +148,9 @@ If you are running X11 applications as NSH add-on programs, then the stack
 size of the add-on program is controlled in another way.  Here are the
 steps for increasing the stack size in that case:
 
-  cd ../apps/namedapps  # Go to the namedapps directory
-  vi namedapps_list.h   # Edit this file and increase the stack size of the add-on
-  rm .built *.o         # This will force the namedapps logic to rebuild
+  cd ../apps/builtin    # Go to the builtin apps directory
+  vi builtin_list.h     # Edit this file and increase the stack size of the add-on
+  rm .built *.o         # This will force the builtin apps logic to rebuild
 
 Buffered I/O Issues
 -------------------
diff --git a/configs/sim/cxxtest/defconfig b/configs/sim/cxxtest/defconfig
index 648a9285194..6ac45d44d80 100644
--- a/configs/sim/cxxtest/defconfig
+++ b/configs/sim/cxxtest/defconfig
@@ -298,7 +298,7 @@ CONFIG_UCLIBCXX_HAVE_LIBSUPCXX=y
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/sim/nxwm/defconfig b/configs/sim/nxwm/defconfig
index 6a295ef4f20..90ee00f5005 100644
--- a/configs/sim/nxwm/defconfig
+++ b/configs/sim/nxwm/defconfig
@@ -376,7 +376,7 @@ CONFIG_HAVE_CXX=y
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/sim/ostest/defconfig b/configs/sim/ostest/defconfig
index beee3063986..55687c366ad 100644
--- a/configs/sim/ostest/defconfig
+++ b/configs/sim/ostest/defconfig
@@ -297,7 +297,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig
index 11e88f7640b..ab061f07a37 100644
--- a/configs/stm3220g-eval/nxwm/defconfig
+++ b/configs/stm3220g-eval/nxwm/defconfig
@@ -659,7 +659,7 @@ CONFIG_HAVE_CXXINITIALIZE=y
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/stm3240g-eval/discover/defconfig b/configs/stm3240g-eval/discover/defconfig
index 152486d1bb5..e11d39ce1a3 100644
--- a/configs/stm3240g-eval/discover/defconfig
+++ b/configs/stm3240g-eval/discover/defconfig
@@ -494,7 +494,7 @@ CONFIG_HAVE_CXXINITIALIZE=y
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/stm3240g-eval/xmlrpc/defconfig b/configs/stm3240g-eval/xmlrpc/defconfig
index 6b4c9af7074..4f621d45354 100644
--- a/configs/stm3240g-eval/xmlrpc/defconfig
+++ b/configs/stm3240g-eval/xmlrpc/defconfig
@@ -487,7 +487,7 @@ CONFIG_HAVE_CXXINITIALIZE=y
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/stm32f100rc_generic/nsh/defconfig b/configs/stm32f100rc_generic/nsh/defconfig
index a0228a3def7..65ac9a73d83 100644
--- a/configs/stm32f100rc_generic/nsh/defconfig
+++ b/configs/stm32f100rc_generic/nsh/defconfig
@@ -428,7 +428,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Named Applications
 #
-CONFIG_NAMEDAPP=y
+CONFIG_BUILTIN=y
 
 #
 # Examples
diff --git a/configs/stm32f100rc_generic/ostest/defconfig b/configs/stm32f100rc_generic/ostest/defconfig
index 0041feb502e..2d2842c5432 100644
--- a/configs/stm32f100rc_generic/ostest/defconfig
+++ b/configs/stm32f100rc_generic/ostest/defconfig
@@ -410,7 +410,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/stm32f4discovery/cxxtest/defconfig b/configs/stm32f4discovery/cxxtest/defconfig
index 6487742cf31..e7fa4995416 100644
--- a/configs/stm32f4discovery/cxxtest/defconfig
+++ b/configs/stm32f4discovery/cxxtest/defconfig
@@ -426,7 +426,7 @@ CONFIG_UCLIBCXX_HAVE_LIBSUPCXX=y
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/stm32f4discovery/elf/defconfig b/configs/stm32f4discovery/elf/defconfig
index 9379c885b54..3f5a5d0fcf7 100644
--- a/configs/stm32f4discovery/elf/defconfig
+++ b/configs/stm32f4discovery/elf/defconfig
@@ -460,7 +460,7 @@ CONFIG_HAVE_CXX=y
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/stm32f4discovery/nxlines/defconfig b/configs/stm32f4discovery/nxlines/defconfig
index 8609993ea16..58eebd41f11 100644
--- a/configs/stm32f4discovery/nxlines/defconfig
+++ b/configs/stm32f4discovery/nxlines/defconfig
@@ -518,7 +518,7 @@ CONFIG_HAVE_CXXINITIALIZE=y
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/stm32f4discovery/ostest/defconfig b/configs/stm32f4discovery/ostest/defconfig
index b29622c8ed3..5fdd30f57e2 100644
--- a/configs/stm32f4discovery/ostest/defconfig
+++ b/configs/stm32f4discovery/ostest/defconfig
@@ -430,7 +430,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/stm32f4discovery/winbuild/defconfig b/configs/stm32f4discovery/winbuild/defconfig
index ac8a18c9bb2..95be148865f 100644
--- a/configs/stm32f4discovery/winbuild/defconfig
+++ b/configs/stm32f4discovery/winbuild/defconfig
@@ -430,7 +430,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/vsn/src/README.txt b/configs/vsn/src/README.txt
index 4e2d50e0b15..87a538a109d 100644
--- a/configs/vsn/src/README.txt
+++ b/configs/vsn/src/README.txt
@@ -12,7 +12,7 @@ Execution starts in the following order:
    is set. It must be set for the VSN board.
    
  - boot, performs initial chip and board initialization
- - sched/os_bringup.c then calls either user_start or exec_namedapp()
+ - sched/os_bringup.c then calls either user_start or exec_builtin()
    with application as set in the .config
 
 
@@ -55,4 +55,5 @@ Compile notes
 To link-in the sif_main() utility do, in this folder:
  - make context TOPDIR=<path to nuttx top dir>
  
-This will result in registering the application into the namedapp.
+This will result in registering the application into the builtin application
+registry.
diff --git a/configs/xtrs/nsh/defconfig b/configs/xtrs/nsh/defconfig
index 8730ebab72e..72b32d9aaa6 100644
--- a/configs/xtrs/nsh/defconfig
+++ b/configs/xtrs/nsh/defconfig
@@ -303,7 +303,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/xtrs/ostest/defconfig b/configs/xtrs/ostest/defconfig
index a0a100bcfd4..74a0199dfef 100644
--- a/configs/xtrs/ostest/defconfig
+++ b/configs/xtrs/ostest/defconfig
@@ -302,7 +302,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/xtrs/pashello/defconfig b/configs/xtrs/pashello/defconfig
index d23c5071637..abdaf1f3591 100644
--- a/configs/xtrs/pashello/defconfig
+++ b/configs/xtrs/pashello/defconfig
@@ -303,7 +303,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/z16f2800100zcog/ostest/defconfig b/configs/z16f2800100zcog/ostest/defconfig
index defd3d5efae..64828738f29 100644
--- a/configs/z16f2800100zcog/ostest/defconfig
+++ b/configs/z16f2800100zcog/ostest/defconfig
@@ -342,7 +342,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/z16f2800100zcog/pashello/defconfig b/configs/z16f2800100zcog/pashello/defconfig
index f3067a9e7c3..ba99283d33d 100644
--- a/configs/z16f2800100zcog/pashello/defconfig
+++ b/configs/z16f2800100zcog/pashello/defconfig
@@ -342,7 +342,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/z80sim/nsh/defconfig b/configs/z80sim/nsh/defconfig
index fb9fac5462e..d13f0f7f7f1 100644
--- a/configs/z80sim/nsh/defconfig
+++ b/configs/z80sim/nsh/defconfig
@@ -303,7 +303,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/z80sim/ostest/defconfig b/configs/z80sim/ostest/defconfig
index d3410d52d34..bd4144821a6 100644
--- a/configs/z80sim/ostest/defconfig
+++ b/configs/z80sim/ostest/defconfig
@@ -302,7 +302,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/z80sim/pashello/defconfig b/configs/z80sim/pashello/defconfig
index e7dee626c1a..58d609c4b89 100644
--- a/configs/z80sim/pashello/defconfig
+++ b/configs/z80sim/pashello/defconfig
@@ -302,7 +302,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/z8encore000zco/ostest/defconfig b/configs/z8encore000zco/ostest/defconfig
index 7d9b227f4b1..7bd512727ed 100644
--- a/configs/z8encore000zco/ostest/defconfig
+++ b/configs/z8encore000zco/ostest/defconfig
@@ -329,7 +329,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/configs/z8f64200100kit/ostest/defconfig b/configs/z8f64200100kit/ostest/defconfig
index a3495298726..e98e4156186 100644
--- a/configs/z8f64200100kit/ostest/defconfig
+++ b/configs/z8f64200100kit/ostest/defconfig
@@ -329,7 +329,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Named Applications
 #
-# CONFIG_NAMEDAPP is not set
+# CONFIG_BUILTIN is not set
 
 #
 # Examples
diff --git a/sched/os_bringup.c b/sched/os_bringup.c
index e0a236bbed2..4b5adcae1a8 100644
--- a/sched/os_bringup.c
+++ b/sched/os_bringup.c
@@ -189,11 +189,11 @@ int os_bringup(void)
   svdbg("Starting init thread\n");
 
 #ifdef CONFIG_BUILTIN_APP_START
-  /* Start the built-in named application, passing an "init" argument, so that
+  /* Start the built-in application, passing an "init" argument, so that
    * application can distinguish different run-levels 
    */
   
-  init_taskid = exec_namedapp(CONFIG_BUILTIN_APP_START, argv);
+  init_taskid = exec_builtin(CONFIG_BUILTIN_APP_START, argv);
 #else
   /* Start the default application at CONFIG_USER_ENTRYPOINT() */