diff --git a/ChangeLog b/ChangeLog
index 221bfe7128..8c57bbff0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7279,3 +7279,9 @@
 	  measurements are being driven by an external clock, then the prototype
 	  for sched_process_cpuload() must be available in include/nuttx/arch.h
 	  (2014-4-30).
+	* Documentation/NuttShell.html and many defconfig files:  The alternate
+	  console device CONFIG_NSH_CONDEV must not be defined unconditionally.
+	  This causes errors when using Telnet sessions.  This was solved by
+	  adding CONFIG_NSH_ALTCONDEV: CONFIG_NSH_ALTCONDEV enables or disables
+	  the feature then, if enabled, CONFIG_NSH_CONDEV provides the alternative
+	  console device name (2014-5-5).
diff --git a/Documentation/NuttShell.html b/Documentation/NuttShell.html
index 8931890964..071214af8f 100644
--- a/Documentation/NuttShell.html
+++ b/Documentation/NuttShell.html
@@ -3007,8 +3007,8 @@ set FOOBAR ABC_${FOO}_${BAR}
         <li>
           <code>CONFIG_NSH_USBCONSOLE</code>.
           If defined, then the an arbitrary USB device may be used to as the NSH console.
-          In this case, <code>CONFIG_NSH_CONDEV</code> must be defined to indicate which USB device to use as the console.
-          The advantage of using a device other that /dev/console is that normal debug output can not use /dev/console while NSH uses <code>CONFIG_NSH_USBCONDEV</code>.
+          In this case, <code>CONFIG_NSH_USBCONDEV</code> must be defined to indicate which USB device to use as the console.
+          The advantage of using a device other that <code>/dev/console</code> is that normal debug output can then use <code>/dev/console</code> while NSH uses <code>CONFIG_NSH_USBCONDEV</code>.
           <p>
           <code>CONFIG_NSH_USBCONDEV</code>.
           If <code>CONFIG_NSH_USBCONSOLE</code> is set to 'y', then <code>CONFIG_NSH_USBCONDEV</code> must also be set to select the USB device used to support the NSH console.
@@ -3053,20 +3053,29 @@ set FOOBAR ABC_${FOO}_${BAR}
     </td>
   </tr>
   <tr>
-    <td valign="top"><b><code>CONFIG_NSH_CONDEV</code></b></td>
+    <td valign="top"><b><code>CONFIG_NSH_ALTCONDEV</code></b> and <b><code>CONFIG_NSH_CONDEV</code></b></td>
     <td>
-      If <code>CONFIG_NSH_CONSOLE</code> is set to <i>y</i>, then <code>CONFIG_NSH_CONDEV</code>
-      may also be set to select the serial device used to support the NSH console.
-      This should be set to the quoted name of a readable/write-able character driver such as:
+      If <code>CONFIG_NSH_CONSOLE</code> is set to <i>y</i>, then <code>CONFIG_NSH_ALTCONDEV</code>
+      may also be selected to enable use of an alternate character device to support the NSH console.
+      If <code>CONFIG_NSH_ALTCONDEV</code> is selected, then <code>CONFIG_NSH_CONDEV</code> holds the quoted name of a readable/write-able character driver such as:
       <code>CONFIG_NSH_CONDEV=&quot;/dev/ttyS1&quot;</code>.
       This is useful, for example, to separate the NSH command line from the system console
       when the system console is used to provide debug output.
       Default:  <code>stdin</code> and <code>stdout</code> (probably &quot;<code>/dev/console</code>&quot;)
       <ul><small>
-        NOTE: When any other device other than <code>/dev/console</code> is used for a user interface,
-        (1) linefeeds (<code>\n</code>) will not be expanded to carriage return / linefeeds (<code>\r\n</code>).
-        You will need to configure your terminal program to account for this.
-        And (2) input is not automatically echoed so you will have to turn local echo on.
+        <li>
+          <b>NOTE 1:</b>
+          When any other device other than <code>/dev/console</code> is used for a user interface,
+          (1) linefeeds (<code>\n</code>) will not be expanded to carriage return / linefeeds (<code>\r\n</code>).
+          You will need to configure your terminal program to account for this.
+          And (2) input is not automatically echoed so you will have to turn local echo on.
+        </li>
+        <li>
+          <b>NOTE 2:</b>
+          This option forces the console of all sessions to use NSH_CONDEV.
+          Hence, this option only makes sense for a system that supports only a single session.
+          This option is, in particular, incompatible with Telnet sessions because each Telnet session must use a different console device.
+        </li>
       </small></ul>
     </td>
   <tr>
diff --git a/configs/16z/nsh/defconfig b/configs/16z/nsh/defconfig
index d3805a9167..caeb0ef3ba 100644
--- a/configs/16z/nsh/defconfig
+++ b/configs/16z/nsh/defconfig
@@ -639,7 +639,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-CONFIG_NSH_CONDEV="/dev/console"
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/arduino-due/nsh/defconfig b/configs/arduino-due/nsh/defconfig
index f24b4e86d1..fd9d0873f0 100644
--- a/configs/arduino-due/nsh/defconfig
+++ b/configs/arduino-due/nsh/defconfig
@@ -637,7 +637,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/avr32dev1/nsh/defconfig b/configs/avr32dev1/nsh/defconfig
index 2be6547a50..c148055412 100644
--- a/configs/avr32dev1/nsh/defconfig
+++ b/configs/avr32dev1/nsh/defconfig
@@ -594,7 +594,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/cloudctrl/nsh/defconfig b/configs/cloudctrl/nsh/defconfig
index b6a1a1413f..110bf7fcc8 100644
--- a/configs/cloudctrl/nsh/defconfig
+++ b/configs/cloudctrl/nsh/defconfig
@@ -662,7 +662,7 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLESCRIPT is not set
 # CONFIG_NSH_DISABLEBG is not set
 CONFIG_NSH_CONSOLE=y
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/compal_e86/nsh_highram/defconfig b/configs/compal_e86/nsh_highram/defconfig
index dcd1c52422..97c0d072c7 100644
--- a/configs/compal_e86/nsh_highram/defconfig
+++ b/configs/compal_e86/nsh_highram/defconfig
@@ -569,7 +569,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/compal_e88/nsh_highram/defconfig b/configs/compal_e88/nsh_highram/defconfig
index 047f4dc98d..b01d5c86e2 100644
--- a/configs/compal_e88/nsh_highram/defconfig
+++ b/configs/compal_e88/nsh_highram/defconfig
@@ -601,7 +601,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/compal_e99/nsh_compalram/defconfig b/configs/compal_e99/nsh_compalram/defconfig
index 629aae2273..00c56975c3 100644
--- a/configs/compal_e99/nsh_compalram/defconfig
+++ b/configs/compal_e99/nsh_compalram/defconfig
@@ -605,7 +605,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/compal_e99/nsh_highram/defconfig b/configs/compal_e99/nsh_highram/defconfig
index d5e35140b8..1037b0af13 100644
--- a/configs/compal_e99/nsh_highram/defconfig
+++ b/configs/compal_e99/nsh_highram/defconfig
@@ -748,7 +748,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/ea3131/nsh/defconfig b/configs/ea3131/nsh/defconfig
index fc578b51ab..5f223462ae 100644
--- a/configs/ea3131/nsh/defconfig
+++ b/configs/ea3131/nsh/defconfig
@@ -606,7 +606,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig
index 27f3cd7c6c..0c3225b771 100644
--- a/configs/ea3131/pgnsh/defconfig
+++ b/configs/ea3131/pgnsh/defconfig
@@ -697,7 +697,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig
index 110c2172c6..9410f472ff 100644
--- a/configs/eagle100/nsh/defconfig
+++ b/configs/eagle100/nsh/defconfig
@@ -765,7 +765,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/ekk-lm3s9b96/nsh/defconfig b/configs/ekk-lm3s9b96/nsh/defconfig
index 815053b979..6ef2f467a4 100644
--- a/configs/ekk-lm3s9b96/nsh/defconfig
+++ b/configs/ekk-lm3s9b96/nsh/defconfig
@@ -749,7 +749,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/ez80f910200zco/nsh/defconfig b/configs/ez80f910200zco/nsh/defconfig
index 10942baf80..3d4c25bfea 100644
--- a/configs/ez80f910200zco/nsh/defconfig
+++ b/configs/ez80f910200zco/nsh/defconfig
@@ -726,7 +726,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/fire-stm32v2/nsh/defconfig b/configs/fire-stm32v2/nsh/defconfig
index 50b79bef1b..340444abcc 100644
--- a/configs/fire-stm32v2/nsh/defconfig
+++ b/configs/fire-stm32v2/nsh/defconfig
@@ -965,7 +965,7 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLEBG is not set
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_USBCONSOLE is not set
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/freedom-kl25z/minnsh/defconfig b/configs/freedom-kl25z/minnsh/defconfig
index 253be78dc8..d0e0a44c27 100644
--- a/configs/freedom-kl25z/minnsh/defconfig
+++ b/configs/freedom-kl25z/minnsh/defconfig
@@ -615,7 +615,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/freedom-kl25z/nsh/defconfig b/configs/freedom-kl25z/nsh/defconfig
index 2d8ca7a11c..2703b56989 100644
--- a/configs/freedom-kl25z/nsh/defconfig
+++ b/configs/freedom-kl25z/nsh/defconfig
@@ -604,7 +604,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/hymini-stm32v/nsh/defconfig b/configs/hymini-stm32v/nsh/defconfig
index 2a72d1a93c..1135b0bf46 100644
--- a/configs/hymini-stm32v/nsh/defconfig
+++ b/configs/hymini-stm32v/nsh/defconfig
@@ -654,7 +654,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig
index 1797f3028a..40f0c7ec7e 100644
--- a/configs/hymini-stm32v/nsh2/defconfig
+++ b/configs/hymini-stm32v/nsh2/defconfig
@@ -842,7 +842,7 @@ CONFIG_NSH_CONSOLE=y
 # USB Trace Support
 #
 # CONFIG_NSH_USBDEV_TRACE is not set
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/hymini-stm32v/usbnsh/defconfig b/configs/hymini-stm32v/usbnsh/defconfig
index a41abcba16..639ff7e373 100644
--- a/configs/hymini-stm32v/usbnsh/defconfig
+++ b/configs/hymini-stm32v/usbnsh/defconfig
@@ -687,7 +687,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/lincoln60/nsh/defconfig b/configs/lincoln60/nsh/defconfig
index 0bcca5e609..6482c5e2d7 100644
--- a/configs/lincoln60/nsh/defconfig
+++ b/configs/lincoln60/nsh/defconfig
@@ -666,7 +666,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/lm3s6432-s2e/nsh/defconfig b/configs/lm3s6432-s2e/nsh/defconfig
index c8958101f3..ec2d618ceb 100644
--- a/configs/lm3s6432-s2e/nsh/defconfig
+++ b/configs/lm3s6432-s2e/nsh/defconfig
@@ -743,7 +743,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/lm3s6965-ek/discover/defconfig b/configs/lm3s6965-ek/discover/defconfig
index 4fee41a742..addaa01427 100644
--- a/configs/lm3s6965-ek/discover/defconfig
+++ b/configs/lm3s6965-ek/discover/defconfig
@@ -757,7 +757,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig
index 4fee41a742..addaa01427 100644
--- a/configs/lm3s6965-ek/nsh/defconfig
+++ b/configs/lm3s6965-ek/nsh/defconfig
@@ -757,7 +757,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig
index d245a54865..f57038fa7f 100644
--- a/configs/lm3s8962-ek/nsh/defconfig
+++ b/configs/lm3s8962-ek/nsh/defconfig
@@ -765,7 +765,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/lm4f120-launchpad/nsh/defconfig b/configs/lm4f120-launchpad/nsh/defconfig
index ba664a9686..cc2b9e873f 100644
--- a/configs/lm4f120-launchpad/nsh/defconfig
+++ b/configs/lm4f120-launchpad/nsh/defconfig
@@ -662,7 +662,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/lpc4330-xplorer/nsh/defconfig b/configs/lpc4330-xplorer/nsh/defconfig
index c8b9f53076..eede2a473b 100644
--- a/configs/lpc4330-xplorer/nsh/defconfig
+++ b/configs/lpc4330-xplorer/nsh/defconfig
@@ -675,7 +675,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/lpcxpresso-lpc1768/nsh/defconfig b/configs/lpcxpresso-lpc1768/nsh/defconfig
index 36ea50bba0..d3faa6919d 100644
--- a/configs/lpcxpresso-lpc1768/nsh/defconfig
+++ b/configs/lpcxpresso-lpc1768/nsh/defconfig
@@ -842,7 +842,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/maple/nsh/defconfig b/configs/maple/nsh/defconfig
index 1d5b8cc32c..e546933d77 100644
--- a/configs/maple/nsh/defconfig
+++ b/configs/maple/nsh/defconfig
@@ -757,7 +757,7 @@ CONFIG_NSH_CONSOLE=y
 # USB Trace Support
 #
 # CONFIG_NSH_USBDEV_TRACE is not set
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/mbed/nsh/defconfig b/configs/mbed/nsh/defconfig
index 525ce50d08..03d755b54c 100644
--- a/configs/mbed/nsh/defconfig
+++ b/configs/mbed/nsh/defconfig
@@ -703,7 +703,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/mcu123-lpc214x/nsh/defconfig b/configs/mcu123-lpc214x/nsh/defconfig
index 0face2bce1..176b5fca6e 100644
--- a/configs/mcu123-lpc214x/nsh/defconfig
+++ b/configs/mcu123-lpc214x/nsh/defconfig
@@ -548,7 +548,7 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLESCRIPT is not set
 # CONFIG_NSH_DISABLEBG is not set
 CONFIG_NSH_CONSOLE=y
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/mikroe-stm32f4/fulldemo/defconfig b/configs/mikroe-stm32f4/fulldemo/defconfig
index 0f9df87ebe..30621d7450 100644
--- a/configs/mikroe-stm32f4/fulldemo/defconfig
+++ b/configs/mikroe-stm32f4/fulldemo/defconfig
@@ -1141,7 +1141,7 @@ CONFIG_NSH_CONSOLE=y
 # USB Trace Support
 #
 # CONFIG_NSH_USBDEV_TRACE is not set
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/mikroe-stm32f4/kostest/defconfig b/configs/mikroe-stm32f4/kostest/defconfig
index dd4f5dae8b..c49627e75a 100644
--- a/configs/mikroe-stm32f4/kostest/defconfig
+++ b/configs/mikroe-stm32f4/kostest/defconfig
@@ -945,7 +945,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/mikroe-stm32f4/nsh/defconfig b/configs/mikroe-stm32f4/nsh/defconfig
index 7ebd5a3f56..cc35789686 100644
--- a/configs/mikroe-stm32f4/nsh/defconfig
+++ b/configs/mikroe-stm32f4/nsh/defconfig
@@ -871,7 +871,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/mikroe-stm32f4/nx/defconfig b/configs/mikroe-stm32f4/nx/defconfig
index 1067357530..b5eb797d61 100644
--- a/configs/mikroe-stm32f4/nx/defconfig
+++ b/configs/mikroe-stm32f4/nx/defconfig
@@ -845,7 +845,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/mikroe-stm32f4/nxlines/defconfig b/configs/mikroe-stm32f4/nxlines/defconfig
index e97261da87..07bfdad560 100644
--- a/configs/mikroe-stm32f4/nxlines/defconfig
+++ b/configs/mikroe-stm32f4/nxlines/defconfig
@@ -846,7 +846,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/mikroe-stm32f4/nxtext/defconfig b/configs/mikroe-stm32f4/nxtext/defconfig
index 1ad4e5236e..4d045085ac 100644
--- a/configs/mikroe-stm32f4/nxtext/defconfig
+++ b/configs/mikroe-stm32f4/nxtext/defconfig
@@ -855,7 +855,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/mikroe-stm32f4/usbnsh/defconfig b/configs/mikroe-stm32f4/usbnsh/defconfig
index 2f1bbbbc63..9ef3bb6d90 100644
--- a/configs/mikroe-stm32f4/usbnsh/defconfig
+++ b/configs/mikroe-stm32f4/usbnsh/defconfig
@@ -920,7 +920,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/mirtoo/nsh/defconfig b/configs/mirtoo/nsh/defconfig
index a7927517e5..93542855ea 100644
--- a/configs/mirtoo/nsh/defconfig
+++ b/configs/mirtoo/nsh/defconfig
@@ -712,7 +712,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/mirtoo/nxffs/defconfig b/configs/mirtoo/nxffs/defconfig
index 0c6386ca10..789d6c9531 100644
--- a/configs/mirtoo/nxffs/defconfig
+++ b/configs/mirtoo/nxffs/defconfig
@@ -757,7 +757,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/ntosd-dm320/nsh/defconfig b/configs/ntosd-dm320/nsh/defconfig
index a1f7a3c9ff..163567e56f 100644
--- a/configs/ntosd-dm320/nsh/defconfig
+++ b/configs/ntosd-dm320/nsh/defconfig
@@ -719,7 +719,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/nucleo-f401re/nsh/defconfig b/configs/nucleo-f401re/nsh/defconfig
index 7e122b6abe..2e92b88fd7 100644
--- a/configs/nucleo-f401re/nsh/defconfig
+++ b/configs/nucleo-f401re/nsh/defconfig
@@ -983,7 +983,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-CONFIG_NSH_CONDEV="/dev/console"
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_IPADDR=0x0a000002
 CONFIG_NSH_DRIPADDR=0x0a000001
diff --git a/configs/nucleus2g/nsh/defconfig b/configs/nucleus2g/nsh/defconfig
index 78c8dd60d1..b7f97dc34d 100644
--- a/configs/nucleus2g/nsh/defconfig
+++ b/configs/nucleus2g/nsh/defconfig
@@ -670,7 +670,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/nutiny-nuc120/nsh/defconfig b/configs/nutiny-nuc120/nsh/defconfig
index cf2e909d0e..335b0b1f93 100644
--- a/configs/nutiny-nuc120/nsh/defconfig
+++ b/configs/nutiny-nuc120/nsh/defconfig
@@ -575,7 +575,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/olimex-lpc-h3131/nsh/defconfig b/configs/olimex-lpc-h3131/nsh/defconfig
index 708f00ac70..94ef334d5b 100644
--- a/configs/olimex-lpc-h3131/nsh/defconfig
+++ b/configs/olimex-lpc-h3131/nsh/defconfig
@@ -608,7 +608,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/olimex-lpc1766stk/ftpc/defconfig b/configs/olimex-lpc1766stk/ftpc/defconfig
index e822681954..3c4a1afa4a 100644
--- a/configs/olimex-lpc1766stk/ftpc/defconfig
+++ b/configs/olimex-lpc1766stk/ftpc/defconfig
@@ -828,7 +828,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_IPADDR=0x0a000002
 CONFIG_NSH_DRIPADDR=0x0a000001
diff --git a/configs/olimex-lpc1766stk/hidmouse/defconfig b/configs/olimex-lpc1766stk/hidmouse/defconfig
index 5e7eb93524..21c315b805 100644
--- a/configs/olimex-lpc1766stk/hidmouse/defconfig
+++ b/configs/olimex-lpc1766stk/hidmouse/defconfig
@@ -829,7 +829,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig
index 0870983d63..e444a6d67a 100644
--- a/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/configs/olimex-lpc1766stk/nsh/defconfig
@@ -829,7 +829,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/olimex-lpc1766stk/zmodem/defconfig b/configs/olimex-lpc1766stk/zmodem/defconfig
index ce9efcffa0..ce5da73d62 100644
--- a/configs/olimex-lpc1766stk/zmodem/defconfig
+++ b/configs/olimex-lpc1766stk/zmodem/defconfig
@@ -840,7 +840,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/olimex-lpc2378/nsh/defconfig b/configs/olimex-lpc2378/nsh/defconfig
index d14a737e06..ba29f1588a 100644
--- a/configs/olimex-lpc2378/nsh/defconfig
+++ b/configs/olimex-lpc2378/nsh/defconfig
@@ -635,7 +635,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/olimex-stm32-p107/nsh/defconfig b/configs/olimex-stm32-p107/nsh/defconfig
index 052da3d573..d116a5cf2a 100644
--- a/configs/olimex-stm32-p107/nsh/defconfig
+++ b/configs/olimex-stm32-p107/nsh/defconfig
@@ -811,7 +811,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 # CONFIG_NSH_TELNET is not set
 CONFIG_NSH_IPADDR=0xc0a80232
diff --git a/configs/olimex-stm32-p207/nsh/defconfig b/configs/olimex-stm32-p207/nsh/defconfig
index ab5ed622b5..a4566a7780 100644
--- a/configs/olimex-stm32-p207/nsh/defconfig
+++ b/configs/olimex-stm32-p207/nsh/defconfig
@@ -872,7 +872,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 # CONFIG_NSH_TELNET is not set
 CONFIG_NSH_IPADDR=0xa0000002
diff --git a/configs/olimex-strp711/nsh/defconfig b/configs/olimex-strp711/nsh/defconfig
index 90559f30c2..cd50042c03 100644
--- a/configs/olimex-strp711/nsh/defconfig
+++ b/configs/olimex-strp711/nsh/defconfig
@@ -656,7 +656,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/open1788/knsh/defconfig b/configs/open1788/knsh/defconfig
index a05975ec94..9ba768c8d9 100644
--- a/configs/open1788/knsh/defconfig
+++ b/configs/open1788/knsh/defconfig
@@ -667,7 +667,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/open1788/nsh/defconfig b/configs/open1788/nsh/defconfig
index 93c0cae4a3..7ba4e86ec5 100644
--- a/configs/open1788/nsh/defconfig
+++ b/configs/open1788/nsh/defconfig
@@ -623,7 +623,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/pcblogic-pic32mx/nsh/defconfig b/configs/pcblogic-pic32mx/nsh/defconfig
index 29210143d1..db906c8c55 100644
--- a/configs/pcblogic-pic32mx/nsh/defconfig
+++ b/configs/pcblogic-pic32mx/nsh/defconfig
@@ -672,7 +672,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/pcduino-a10/nsh/defconfig b/configs/pcduino-a10/nsh/defconfig
index db6b08d7f2..744034b5b9 100644
--- a/configs/pcduino-a10/nsh/defconfig
+++ b/configs/pcduino-a10/nsh/defconfig
@@ -676,7 +676,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/pic32-starterkit/nsh/defconfig b/configs/pic32-starterkit/nsh/defconfig
index cbe89b89ee..dd6500fad4 100644
--- a/configs/pic32-starterkit/nsh/defconfig
+++ b/configs/pic32-starterkit/nsh/defconfig
@@ -783,7 +783,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/pic32mx7mmb/nsh/defconfig b/configs/pic32mx7mmb/nsh/defconfig
index c1dac8bde9..9fc6dadff2 100644
--- a/configs/pic32mx7mmb/nsh/defconfig
+++ b/configs/pic32mx7mmb/nsh/defconfig
@@ -921,7 +921,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/pirelli_dpl10/nsh_highram/defconfig b/configs/pirelli_dpl10/nsh_highram/defconfig
index 1f6ba92602..cce557e183 100644
--- a/configs/pirelli_dpl10/nsh_highram/defconfig
+++ b/configs/pirelli_dpl10/nsh_highram/defconfig
@@ -541,7 +541,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/px4fmu-v2_upstream/nsh/defconfig b/configs/px4fmu-v2_upstream/nsh/defconfig
index 3edab6f196..fbd5797b43 100644
--- a/configs/px4fmu-v2_upstream/nsh/defconfig
+++ b/configs/px4fmu-v2_upstream/nsh/defconfig
@@ -1052,7 +1052,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/qemu-i486/nsh/defconfig b/configs/qemu-i486/nsh/defconfig
index 883ebb5234..6ab0452676 100644
--- a/configs/qemu-i486/nsh/defconfig
+++ b/configs/qemu-i486/nsh/defconfig
@@ -588,7 +588,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/rgmp/arm/nsh/defconfig b/configs/rgmp/arm/nsh/defconfig
index cf15550e4d..cc5c92aa47 100644
--- a/configs/rgmp/arm/nsh/defconfig
+++ b/configs/rgmp/arm/nsh/defconfig
@@ -650,7 +650,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 # CONFIG_NSH_DHCPC is not set
 CONFIG_NSH_IPADDR=0xc0a80a02
diff --git a/configs/rgmp/x86/nsh/defconfig b/configs/rgmp/x86/nsh/defconfig
index 0f12b836f3..429bb9a482 100644
--- a/configs/rgmp/x86/nsh/defconfig
+++ b/configs/rgmp/x86/nsh/defconfig
@@ -663,7 +663,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 # CONFIG_NSH_DHCPC is not set
 CONFIG_NSH_IPADDR=0xc0a80a02
diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig
index c55630709c..c7d9126c00 100644
--- a/configs/sam3u-ek/knsh/defconfig
+++ b/configs/sam3u-ek/knsh/defconfig
@@ -737,7 +737,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig
index 080970217f..82b092fd19 100644
--- a/configs/sam3u-ek/nsh/defconfig
+++ b/configs/sam3u-ek/nsh/defconfig
@@ -713,7 +713,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/sam3u-ek/nxwm/defconfig b/configs/sam3u-ek/nxwm/defconfig
index ee30e94821..22e3b32c90 100644
--- a/configs/sam3u-ek/nxwm/defconfig
+++ b/configs/sam3u-ek/nxwm/defconfig
@@ -848,7 +848,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/sam4e-ek/nsh/defconfig b/configs/sam4e-ek/nsh/defconfig
index 3353d0f53a..e16d92c831 100644
--- a/configs/sam4e-ek/nsh/defconfig
+++ b/configs/sam4e-ek/nsh/defconfig
@@ -898,7 +898,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/sam4e-ek/usbnsh/defconfig b/configs/sam4e-ek/usbnsh/defconfig
index e4b84eb948..f3d67290d7 100644
--- a/configs/sam4e-ek/usbnsh/defconfig
+++ b/configs/sam4e-ek/usbnsh/defconfig
@@ -947,7 +947,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/sam4l-xplained/nsh/defconfig b/configs/sam4l-xplained/nsh/defconfig
index f555b28d87..a31d889966 100644
--- a/configs/sam4l-xplained/nsh/defconfig
+++ b/configs/sam4l-xplained/nsh/defconfig
@@ -739,7 +739,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/sam4s-xplained-pro/nsh/defconfig b/configs/sam4s-xplained-pro/nsh/defconfig
index 7bfa9bc104..d54fe7ad57 100644
--- a/configs/sam4s-xplained-pro/nsh/defconfig
+++ b/configs/sam4s-xplained-pro/nsh/defconfig
@@ -939,7 +939,7 @@ CONFIG_NSH_CONSOLE=y
 # USB Trace Support
 #
 # CONFIG_NSH_USBDEV_TRACE is not set
-CONFIG_NSH_CONDEV="/dev/console"
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/sam4s-xplained/nsh/defconfig b/configs/sam4s-xplained/nsh/defconfig
index 5941dc12fe..19a98ef116 100644
--- a/configs/sam4s-xplained/nsh/defconfig
+++ b/configs/sam4s-xplained/nsh/defconfig
@@ -711,7 +711,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/sama5d3-xplained/nsh/defconfig b/configs/sama5d3-xplained/nsh/defconfig
index 0cd2b0b951..6ee397aac1 100644
--- a/configs/sama5d3-xplained/nsh/defconfig
+++ b/configs/sama5d3-xplained/nsh/defconfig
@@ -734,7 +734,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/sama5d3x-ek/demo/defconfig b/configs/sama5d3x-ek/demo/defconfig
index 0f6eea020a..90c402997b 100644
--- a/configs/sama5d3x-ek/demo/defconfig
+++ b/configs/sama5d3x-ek/demo/defconfig
@@ -909,7 +909,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/sama5d3x-ek/nsh/defconfig b/configs/sama5d3x-ek/nsh/defconfig
index 7d69c591be..e01f95ecd0 100644
--- a/configs/sama5d3x-ek/nsh/defconfig
+++ b/configs/sama5d3x-ek/nsh/defconfig
@@ -749,7 +749,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/sama5d3x-ek/nxwm/defconfig b/configs/sama5d3x-ek/nxwm/defconfig
index 2ac907b206..9264d8f079 100644
--- a/configs/sama5d3x-ek/nxwm/defconfig
+++ b/configs/sama5d3x-ek/nxwm/defconfig
@@ -911,7 +911,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/samd20-xplained/nsh/defconfig b/configs/samd20-xplained/nsh/defconfig
index 0fc385f566..29402e3074 100644
--- a/configs/samd20-xplained/nsh/defconfig
+++ b/configs/samd20-xplained/nsh/defconfig
@@ -704,7 +704,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/shenzhou/nsh/defconfig b/configs/shenzhou/nsh/defconfig
index 80cf577fdf..45a9ee6f90 100644
--- a/configs/shenzhou/nsh/defconfig
+++ b/configs/shenzhou/nsh/defconfig
@@ -662,7 +662,7 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLESCRIPT is not set
 # CONFIG_NSH_DISABLEBG is not set
 CONFIG_NSH_CONSOLE=y
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig
index 6463d254de..93cfeda5bd 100644
--- a/configs/shenzhou/nxwm/defconfig
+++ b/configs/shenzhou/nxwm/defconfig
@@ -1015,7 +1015,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/shenzhou/thttpd/defconfig b/configs/shenzhou/thttpd/defconfig
index 20e03eeca6..d726439ff0 100644
--- a/configs/shenzhou/thttpd/defconfig
+++ b/configs/shenzhou/thttpd/defconfig
@@ -885,7 +885,7 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLESCRIPT is not set
 # CONFIG_NSH_DISABLEBG is not set
 CONFIG_NSH_CONSOLE=y
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/sim/nsh/defconfig b/configs/sim/nsh/defconfig
index 5aece50251..452cffeb50 100644
--- a/configs/sim/nsh/defconfig
+++ b/configs/sim/nsh/defconfig
@@ -571,7 +571,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/sim/nsh2/defconfig b/configs/sim/nsh2/defconfig
index efb61a6881..6f0fe5d79c 100644
--- a/configs/sim/nsh2/defconfig
+++ b/configs/sim/nsh2/defconfig
@@ -649,7 +649,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/sim/nxlines/defconfig b/configs/sim/nxlines/defconfig
index 24243c996c..0a15652dc9 100644
--- a/configs/sim/nxlines/defconfig
+++ b/configs/sim/nxlines/defconfig
@@ -650,7 +650,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/sim/nxwm/defconfig b/configs/sim/nxwm/defconfig
index 51656e1f86..d0677fbe39 100644
--- a/configs/sim/nxwm/defconfig
+++ b/configs/sim/nxwm/defconfig
@@ -659,7 +659,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/spark/composite/defconfig b/configs/spark/composite/defconfig
index bb30c31392..95e65e50bd 100644
--- a/configs/spark/composite/defconfig
+++ b/configs/spark/composite/defconfig
@@ -911,7 +911,7 @@ CONFIG_NSH_CONSOLE=y
 # USB Trace Support
 #
 # CONFIG_NSH_USBDEV_TRACE is not set
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/spark/nsh/defconfig b/configs/spark/nsh/defconfig
index 712073eda1..a5a6a22896 100644
--- a/configs/spark/nsh/defconfig
+++ b/configs/spark/nsh/defconfig
@@ -913,7 +913,7 @@ CONFIG_NSH_CONSOLE=y
 # USB Trace Support
 #
 # CONFIG_NSH_USBDEV_TRACE is not set
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/spark/usbmsc/defconfig b/configs/spark/usbmsc/defconfig
index 8f5a761743..70a337735b 100644
--- a/configs/spark/usbmsc/defconfig
+++ b/configs/spark/usbmsc/defconfig
@@ -877,7 +877,7 @@ CONFIG_NSH_CONSOLE=y
 # USB Trace Support
 #
 # CONFIG_NSH_USBDEV_TRACE is not set
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/stm3210e-eval/nsh/defconfig b/configs/stm3210e-eval/nsh/defconfig
index 621a1d6ee1..553c91f9d5 100644
--- a/configs/stm3210e-eval/nsh/defconfig
+++ b/configs/stm3210e-eval/nsh/defconfig
@@ -878,7 +878,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig
index 4789f91e2e..16aaf261ec 100644
--- a/configs/stm3210e-eval/nsh2/defconfig
+++ b/configs/stm3210e-eval/nsh2/defconfig
@@ -1035,7 +1035,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/stm3210e-eval/nxconsole/defconfig b/configs/stm3210e-eval/nxconsole/defconfig
index 94416da313..4d3ee2947a 100644
--- a/configs/stm3210e-eval/nxconsole/defconfig
+++ b/configs/stm3210e-eval/nxconsole/defconfig
@@ -926,7 +926,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/stm3210e-eval/pm/defconfig b/configs/stm3210e-eval/pm/defconfig
index 4c59d7e72d..b9ede8c921 100644
--- a/configs/stm3210e-eval/pm/defconfig
+++ b/configs/stm3210e-eval/pm/defconfig
@@ -957,7 +957,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/stm3220g-eval/nsh/defconfig b/configs/stm3220g-eval/nsh/defconfig
index d4bf79c9e7..68af75be41 100644
--- a/configs/stm3220g-eval/nsh/defconfig
+++ b/configs/stm3220g-eval/nsh/defconfig
@@ -958,7 +958,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 CONFIG_NSH_IPADDR=0x0a000002
 CONFIG_NSH_DRIPADDR=0x0a000001
diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig
index 0cf12031f5..dff5a59933 100644
--- a/configs/stm3220g-eval/nxwm/defconfig
+++ b/configs/stm3220g-eval/nxwm/defconfig
@@ -1072,7 +1072,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/stm3240g-eval/nsh/defconfig b/configs/stm3240g-eval/nsh/defconfig
index 35eaa73a01..9ac9143e35 100644
--- a/configs/stm3240g-eval/nsh/defconfig
+++ b/configs/stm3240g-eval/nsh/defconfig
@@ -940,7 +940,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/stm3240g-eval/nxconsole/defconfig b/configs/stm3240g-eval/nxconsole/defconfig
index 54ed7d945f..c327252c7e 100644
--- a/configs/stm3240g-eval/nxconsole/defconfig
+++ b/configs/stm3240g-eval/nxconsole/defconfig
@@ -1046,7 +1046,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig
index 57144e52e7..2946a652af 100644
--- a/configs/stm3240g-eval/nxwm/defconfig
+++ b/configs/stm3240g-eval/nxwm/defconfig
@@ -1067,7 +1067,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/stm3240g-eval/webserver/defconfig b/configs/stm3240g-eval/webserver/defconfig
index 4e94fa95c0..6b4adafd82 100644
--- a/configs/stm3240g-eval/webserver/defconfig
+++ b/configs/stm3240g-eval/webserver/defconfig
@@ -964,7 +964,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/stm32_tiny/nsh/defconfig b/configs/stm32_tiny/nsh/defconfig
index def0a659c7..aec384812d 100644
--- a/configs/stm32_tiny/nsh/defconfig
+++ b/configs/stm32_tiny/nsh/defconfig
@@ -696,7 +696,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/stm32_tiny/usbnsh/defconfig b/configs/stm32_tiny/usbnsh/defconfig
index a4788b4b44..900885113a 100644
--- a/configs/stm32_tiny/usbnsh/defconfig
+++ b/configs/stm32_tiny/usbnsh/defconfig
@@ -670,7 +670,7 @@ CONFIG_NSH_CONSOLE=y
 # USB Trace Support
 #
 # CONFIG_NSH_USBDEV_TRACE is not set
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/stm32f100rc_generic/nsh/defconfig b/configs/stm32f100rc_generic/nsh/defconfig
index 98c7cc39bb..11bc795035 100644
--- a/configs/stm32f100rc_generic/nsh/defconfig
+++ b/configs/stm32f100rc_generic/nsh/defconfig
@@ -577,7 +577,7 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLESCRIPT is not set
 # CONFIG_NSH_DISABLEBG is not set
 CONFIG_NSH_CONSOLE=y
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/stm32f3discovery/nsh/defconfig b/configs/stm32f3discovery/nsh/defconfig
index 165809a091..f20625dd09 100644
--- a/configs/stm32f3discovery/nsh/defconfig
+++ b/configs/stm32f3discovery/nsh/defconfig
@@ -764,7 +764,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/stm32f3discovery/usbnsh/defconfig b/configs/stm32f3discovery/usbnsh/defconfig
index a7e2e88e7b..9b535a060b 100644
--- a/configs/stm32f3discovery/usbnsh/defconfig
+++ b/configs/stm32f3discovery/usbnsh/defconfig
@@ -750,7 +750,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/stm32f429i-disco/extflash/defconfig b/configs/stm32f429i-disco/extflash/defconfig
index cfe9e224fa..fe261b59f6 100644
--- a/configs/stm32f429i-disco/extflash/defconfig
+++ b/configs/stm32f429i-disco/extflash/defconfig
@@ -914,7 +914,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/stm32f429i-disco/nsh/defconfig b/configs/stm32f429i-disco/nsh/defconfig
index 0aa8d6054c..3ed112fad2 100644
--- a/configs/stm32f429i-disco/nsh/defconfig
+++ b/configs/stm32f429i-disco/nsh/defconfig
@@ -845,7 +845,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/stm32f429i-disco/usbmsc/defconfig b/configs/stm32f429i-disco/usbmsc/defconfig
index 58a2b36cd6..f5ae9f25d8 100644
--- a/configs/stm32f429i-disco/usbmsc/defconfig
+++ b/configs/stm32f429i-disco/usbmsc/defconfig
@@ -874,7 +874,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/stm32f429i-disco/usbnsh/defconfig b/configs/stm32f429i-disco/usbnsh/defconfig
index dc159ecb58..5d72b335b3 100644
--- a/configs/stm32f429i-disco/usbnsh/defconfig
+++ b/configs/stm32f429i-disco/usbnsh/defconfig
@@ -904,7 +904,7 @@ CONFIG_NSH_CONSOLE=y
 # USB Trace Support
 #
 # CONFIG_NSH_USBDEV_TRACE is not set
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/stm32f4discovery/nsh/defconfig b/configs/stm32f4discovery/nsh/defconfig
index 48e60d4761..8af463f62f 100644
--- a/configs/stm32f4discovery/nsh/defconfig
+++ b/configs/stm32f4discovery/nsh/defconfig
@@ -823,7 +823,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/stm32f4discovery/nxlines/defconfig b/configs/stm32f4discovery/nxlines/defconfig
index f2b0d7548f..cda7f0a6f5 100644
--- a/configs/stm32f4discovery/nxlines/defconfig
+++ b/configs/stm32f4discovery/nxlines/defconfig
@@ -926,7 +926,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/stm32f4discovery/pm/defconfig b/configs/stm32f4discovery/pm/defconfig
index 0a2583e0e7..e6fd59c62e 100644
--- a/configs/stm32f4discovery/pm/defconfig
+++ b/configs/stm32f4discovery/pm/defconfig
@@ -830,7 +830,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/stm32f4discovery/usbnsh/defconfig b/configs/stm32f4discovery/usbnsh/defconfig
index 7112e93d44..3cb6823c7c 100644
--- a/configs/stm32f4discovery/usbnsh/defconfig
+++ b/configs/stm32f4discovery/usbnsh/defconfig
@@ -867,7 +867,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/stm32ldiscovery/nsh/defconfig b/configs/stm32ldiscovery/nsh/defconfig
index 15a80668f6..d263def2d6 100644
--- a/configs/stm32ldiscovery/nsh/defconfig
+++ b/configs/stm32ldiscovery/nsh/defconfig
@@ -665,7 +665,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/stm32vldiscovery/nsh/defconfig b/configs/stm32vldiscovery/nsh/defconfig
index 93b0b70af4..ac0fea1623 100644
--- a/configs/stm32vldiscovery/nsh/defconfig
+++ b/configs/stm32vldiscovery/nsh/defconfig
@@ -579,7 +579,7 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLESCRIPT is not set
 # CONFIG_NSH_DISABLEBG is not set
 CONFIG_NSH_CONSOLE=y
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/sure-pic32mx/nsh/defconfig b/configs/sure-pic32mx/nsh/defconfig
index 9840060e46..c5c021608e 100644
--- a/configs/sure-pic32mx/nsh/defconfig
+++ b/configs/sure-pic32mx/nsh/defconfig
@@ -674,7 +674,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/sure-pic32mx/usbnsh/defconfig b/configs/sure-pic32mx/usbnsh/defconfig
index f13f9cbb37..271faecc58 100644
--- a/configs/sure-pic32mx/usbnsh/defconfig
+++ b/configs/sure-pic32mx/usbnsh/defconfig
@@ -725,7 +725,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/teensy/nsh/defconfig b/configs/teensy/nsh/defconfig
index 9e09f15392..36e0466985 100644
--- a/configs/teensy/nsh/defconfig
+++ b/configs/teensy/nsh/defconfig
@@ -560,7 +560,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/tm4c123g-launchpad/nsh/defconfig b/configs/tm4c123g-launchpad/nsh/defconfig
index d3153ba18a..a000a9fe90 100644
--- a/configs/tm4c123g-launchpad/nsh/defconfig
+++ b/configs/tm4c123g-launchpad/nsh/defconfig
@@ -662,7 +662,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/twr-k60n512/nsh/defconfig b/configs/twr-k60n512/nsh/defconfig
index 7dc297abd0..72f71d6638 100644
--- a/configs/twr-k60n512/nsh/defconfig
+++ b/configs/twr-k60n512/nsh/defconfig
@@ -591,7 +591,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/ubw32/nsh/defconfig b/configs/ubw32/nsh/defconfig
index 1823222f48..2b7e64af11 100644
--- a/configs/ubw32/nsh/defconfig
+++ b/configs/ubw32/nsh/defconfig
@@ -740,7 +740,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 
 #
diff --git a/configs/us7032evb1/nsh/defconfig b/configs/us7032evb1/nsh/defconfig
index 826e193727..adc3cf8ce6 100644
--- a/configs/us7032evb1/nsh/defconfig
+++ b/configs/us7032evb1/nsh/defconfig
@@ -566,7 +566,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/viewtool-stm32f107/netnsh/defconfig b/configs/viewtool-stm32f107/netnsh/defconfig
index f701b06c4b..892c7d8217 100644
--- a/configs/viewtool-stm32f107/netnsh/defconfig
+++ b/configs/viewtool-stm32f107/netnsh/defconfig
@@ -894,7 +894,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/viewtool-stm32f107/nsh/defconfig b/configs/viewtool-stm32f107/nsh/defconfig
index c51245f72c..a93657cf72 100644
--- a/configs/viewtool-stm32f107/nsh/defconfig
+++ b/configs/viewtool-stm32f107/nsh/defconfig
@@ -792,7 +792,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/vsn/nsh/defconfig b/configs/vsn/nsh/defconfig
index 050866b0b6..c9c84ba3ef 100644
--- a/configs/vsn/nsh/defconfig
+++ b/configs/vsn/nsh/defconfig
@@ -876,7 +876,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/xtrs/nsh/defconfig b/configs/xtrs/nsh/defconfig
index ea7baf6013..f6cfb0b97e 100644
--- a/configs/xtrs/nsh/defconfig
+++ b/configs/xtrs/nsh/defconfig
@@ -454,7 +454,7 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLESCRIPT is not set
 # CONFIG_NSH_DISABLEBG is not set
 CONFIG_NSH_CONSOLE=y
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/z16f2800100zcog/nsh/defconfig b/configs/z16f2800100zcog/nsh/defconfig
index 6ba17d7807..d4fedd3c78 100644
--- a/configs/z16f2800100zcog/nsh/defconfig
+++ b/configs/z16f2800100zcog/nsh/defconfig
@@ -652,7 +652,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-CONFIG_NSH_CONDEV="/dev/console"
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/z80sim/nsh/defconfig b/configs/z80sim/nsh/defconfig
index d4ccc1d464..99ef2e3197 100644
--- a/configs/z80sim/nsh/defconfig
+++ b/configs/z80sim/nsh/defconfig
@@ -454,7 +454,7 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLESCRIPT is not set
 # CONFIG_NSH_DISABLEBG is not set
 CONFIG_NSH_CONSOLE=y
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #
diff --git a/configs/zkit-arm-1769/nsh/defconfig b/configs/zkit-arm-1769/nsh/defconfig
index 327fe06d30..040fe00fac 100644
--- a/configs/zkit-arm-1769/nsh/defconfig
+++ b/configs/zkit-arm-1769/nsh/defconfig
@@ -827,7 +827,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/zkit-arm-1769/nxhello/defconfig b/configs/zkit-arm-1769/nxhello/defconfig
index e9f86e4c97..acbf63c84d 100644
--- a/configs/zkit-arm-1769/nxhello/defconfig
+++ b/configs/zkit-arm-1769/nxhello/defconfig
@@ -936,7 +936,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Trace Support
 #
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_TELNET=y
 CONFIG_NSH_TELNETD_PORT=23
diff --git a/configs/zp214xpa/nsh/defconfig b/configs/zp214xpa/nsh/defconfig
index f4bfe05c5b..21d3787d1e 100644
--- a/configs/zp214xpa/nsh/defconfig
+++ b/configs/zp214xpa/nsh/defconfig
@@ -523,7 +523,7 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLESCRIPT is not set
 # CONFIG_NSH_DISABLEBG is not set
 CONFIG_NSH_CONSOLE=y
-# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
 #