From 270bd0a9c2c556e2c13cd706a968669a327c73fb Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Wed, 25 Jan 2012 23:04:17 +0000
Subject: [PATCH] More name changes: USBSER->PL2303 CDCSER->CDCACM

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4337 42af7a65-404d-4744-a932-0658087f49c3
---
 Documentation/NuttxPortingGuide.html          |  50 +-
 Documentation/UsbTrace.html                   |  12 +-
 configs/README.txt                            |  50 +-
 configs/amber/hello/defconfig                 |  40 +-
 configs/avr32dev1/nsh/defconfig               |  40 +-
 configs/avr32dev1/ostest/defconfig            |  40 +-
 configs/demo9s12ne64/ostest/defconfig         |  40 +-
 configs/ea3131/nsh/defconfig                  |  40 +-
 configs/ea3131/ostest/defconfig               |  40 +-
 configs/ea3131/pgnsh/defconfig                |  40 +-
 configs/ea3131/usbserial/defconfig            |  40 +-
 configs/ea3131/usbstorage/defconfig           |  40 +-
 configs/ea3152/ostest/defconfig               |  40 +-
 configs/ez80f910200kitg/ostest/defconfig      |  40 +-
 configs/ez80f910200zco/dhcpd/defconfig        |  40 +-
 configs/ez80f910200zco/httpd/defconfig        |  40 +-
 configs/ez80f910200zco/nettest/defconfig      |  40 +-
 configs/ez80f910200zco/nsh/defconfig          |  40 +-
 configs/ez80f910200zco/ostest/defconfig       |  40 +-
 configs/ez80f910200zco/poll/defconfig         |  40 +-
 configs/hymini-stm32v/README.txt              |   8 +-
 configs/hymini-stm32v/buttons/defconfig       |  40 +-
 configs/hymini-stm32v/nsh/defconfig           |  40 +-
 configs/hymini-stm32v/nsh2/defconfig          |  40 +-
 configs/hymini-stm32v/nx/defconfig            |  40 +-
 configs/hymini-stm32v/nxlines/defconfig       |  40 +-
 configs/hymini-stm32v/usbserial/defconfig     | 108 ++---
 configs/hymini-stm32v/usbstorage/defconfig    |  40 +-
 configs/kwikstik-k40/ostest/defconfig         |  40 +-
 configs/lpcxpresso-lpc1768/dhcpd/defconfig    |  40 +-
 configs/lpcxpresso-lpc1768/nsh/defconfig      |  40 +-
 configs/lpcxpresso-lpc1768/nx/defconfig       |  40 +-
 configs/lpcxpresso-lpc1768/ostest/defconfig   |  40 +-
 configs/lpcxpresso-lpc1768/thttpd/defconfig   |  40 +-
 .../lpcxpresso-lpc1768/usbstorage/defconfig   |  40 +-
 configs/mbed/hidkbd/defconfig                 |  40 +-
 configs/mbed/nsh/defconfig                    |  40 +-
 configs/mcu123-lpc214x/nsh/defconfig          |  40 +-
 configs/mcu123-lpc214x/ostest/defconfig       |  40 +-
 configs/mcu123-lpc214x/usbserial/defconfig    |  40 +-
 configs/mcu123-lpc214x/usbstorage/defconfig   |  48 +-
 configs/micropendous3/hello/defconfig         |  40 +-
 configs/mx1ads/ostest/defconfig               |  36 +-
 configs/ne64badge/ostest/defconfig            |  40 +-
 configs/ntosd-dm320/nettest/defconfig         |  40 +-
 configs/ntosd-dm320/nsh/defconfig             |  40 +-
 configs/ntosd-dm320/ostest/defconfig          |  36 +-
 configs/ntosd-dm320/poll/defconfig            |  40 +-
 configs/ntosd-dm320/thttpd/defconfig          |  40 +-
 configs/ntosd-dm320/udp/defconfig             |  40 +-
 configs/ntosd-dm320/uip/defconfig             |  40 +-
 configs/nucleus2g/nsh/defconfig               |  40 +-
 configs/nucleus2g/ostest/defconfig            |  40 +-
 configs/nucleus2g/usbserial/defconfig         |  40 +-
 configs/nucleus2g/usbstorage/defconfig        |  40 +-
 configs/olimex-lpc1766stk/ftpc/defconfig      |  40 +-
 configs/olimex-lpc1766stk/hidkbd/defconfig    |  40 +-
 configs/olimex-lpc1766stk/nettest/defconfig   |  40 +-
 configs/olimex-lpc1766stk/nsh/defconfig       |  40 +-
 configs/olimex-lpc1766stk/nx/defconfig        |  40 +-
 configs/olimex-lpc1766stk/ostest/defconfig    |  40 +-
 .../olimex-lpc1766stk/slip-httpd/defconfig    |  40 +-
 configs/olimex-lpc1766stk/thttpd/defconfig    |  40 +-
 configs/olimex-lpc1766stk/usbserial/defconfig |  40 +-
 .../olimex-lpc1766stk/usbstorage/defconfig    |  40 +-
 configs/olimex-lpc1766stk/wlan/defconfig      |  40 +-
 configs/olimex-strp711/nettest/defconfig      |  40 +-
 configs/olimex-strp711/nsh/defconfig          |  40 +-
 configs/olimex-strp711/ostest/defconfig       |  40 +-
 configs/pcblogic-pic32mx/nsh/defconfig        |  40 +-
 configs/pcblogic-pic32mx/ostest/defconfig     |  40 +-
 configs/pic32-starterkit/ostest/defconfig     |  40 +-
 configs/sam3u-ek/knsh/defconfig               |  40 +-
 configs/sam3u-ek/nsh/defconfig                |  40 +-
 configs/sam3u-ek/nx/defconfig                 |  40 +-
 configs/sam3u-ek/ostest/defconfig             |  40 +-
 configs/sam3u-ek/touchscreen/defconfig        |  40 +-
 configs/skp16c26/ostest/defconfig             |  36 +-
 configs/stm3210e-eval/README.txt              |   8 +-
 configs/stm3210e-eval/RIDE/defconfig          |  40 +-
 configs/stm3210e-eval/buttons/defconfig       |  40 +-
 configs/stm3210e-eval/nsh/defconfig           |  40 +-
 configs/stm3210e-eval/nsh2/defconfig          | 112 ++---
 configs/stm3210e-eval/nx/defconfig            |  40 +-
 configs/stm3210e-eval/nxlines/defconfig       |  40 +-
 configs/stm3210e-eval/nxtext/defconfig        |  40 +-
 configs/stm3210e-eval/ostest/defconfig        |  40 +-
 configs/stm3210e-eval/usbserial/defconfig     | 112 ++---
 configs/stm3210e-eval/usbstorage/defconfig    |  40 +-
 configs/stm3240g-eval/dhcpd/defconfig         |  40 +-
 configs/stm3240g-eval/nettest/defconfig       |  40 +-
 configs/stm3240g-eval/nsh/defconfig           |  40 +-
 configs/stm3240g-eval/ostest/defconfig        |  40 +-
 configs/stm32f4discovery/nsh/defconfig        |  40 +-
 configs/stm32f4discovery/ostest/defconfig     |  40 +-
 configs/sure-pic32mx/nsh/defconfig            | 108 ++---
 configs/sure-pic32mx/ostest/defconfig         |  40 +-
 configs/teensy/hello/defconfig                |  40 +-
 configs/teensy/nsh/defconfig                  |  40 +-
 configs/teensy/usbstorage/defconfig           |  40 +-
 configs/twr-k60n512/nsh/defconfig             |  40 +-
 configs/twr-k60n512/ostest/defconfig          |  40 +-
 configs/us7032evb1/nsh/defconfig              |  40 +-
 configs/us7032evb1/ostest/defconfig           |  40 +-
 configs/vsn/nsh/defconfig                     |  40 +-
 drivers/usbdev/Make.defs                      |   4 +-
 drivers/usbdev/cdcacm.c                       | 412 ++++++++---------
 drivers/usbdev/cdcacm.h                       | 168 +++----
 drivers/usbdev/cdcacm_descriptors.c           | 176 +++----
 drivers/usbdev/composite.h                    |  46 +-
 drivers/usbdev/msc.c                          |   4 +-
 drivers/usbdev/msc.h                          |   2 +-
 drivers/usbdev/pl2303.c                       | 436 +++++++++---------
 include/nuttx/ioctl.h                         |   6 +-
 include/nuttx/usb/{cdc_serial.h => cdcacm.h}  | 170 +++----
 include/nuttx/usb/usbdev.h                    |   2 +-
 include/nuttx/usb/usbdev_trace.h              |   4 +-
 117 files changed, 2917 insertions(+), 2917 deletions(-)
 rename include/nuttx/usb/{cdc_serial.h => cdcacm.h} (72%)

diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 6d45a4339b0..fb0a1b4a88f 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -4898,90 +4898,90 @@ build
 <h3>USB Serial Device Class Driver (Prolific PL2303 Emulation)</h3> 
 <ul>
   <li>
-    <code>CONFIG_USBSER</code>: Enable compilation of the USB serial driver
+    <code>CONFIG_PL2303</code>: Enable compilation of the USB serial driver
   </li>
   <li>
-    <code>CONFIG_USBSER_EPINTIN</code>: The logical 7-bit address of a hardware endpoint that supports interrupt IN operation
+    <code>CONFIG_PL2303_EPINTIN</code>: The logical 7-bit address of a hardware endpoint that supports interrupt IN operation
   </li>
   <li>
-    <code>CONFIG_USBSER_EPBULKOUT</code>: The logical 7-bit address of a hardware endpoint that supports bulk OUT operation
+    <code>CONFIG_PL2303_EPBULKOUT</code>: The logical 7-bit address of a hardware endpoint that supports bulk OUT operation
   </li>
   <li>
-    <code>CONFIG_USBSER_EPBULKIN</code>: The logical 7-bit address of a hardware endpoint that supports bulk IN operation
+    <code>CONFIG_PL2303_EPBULKIN</code>: The logical 7-bit address of a hardware endpoint that supports bulk IN operation
   </li>
   <li>
-    <code>CONFIG_USBSER_NWRREQS</code> and <code>CONFIG_USBSER_NRDREQS</code>: The number of write/read requests that can be in flight
+    <code>CONFIG_PL2303_NWRREQS</code> and <code>CONFIG_PL2303_NRDREQS</code>: The number of write/read requests that can be in flight
   </li>
   <li>
-    <code>CONFIG_USBSER_VENDORID</code> and <code>CONFIG_USBSER_VENDORSTR</code>: The vendor ID code/string
+    <code>CONFIG_PL2303_VENDORID</code> and <code>CONFIG_PL2303_VENDORSTR</code>: The vendor ID code/string
   </li>
   <li>
-    <code>CONFIG_USBSER_PRODUCTID</code> and <code>CONFIG_USBSER_PRODUCTSTR</code>: The product ID code/string
+    <code>CONFIG_PL2303_PRODUCTID</code> and <code>CONFIG_PL2303_PRODUCTSTR</code>: The product ID code/string
   </li>
   <li>
-    <code>CONFIG_USBSER_RXBUFSIZE</code> and <code>CONFIG_USBSER_TXBUFSIZE</code>: Size of the serial receive/transmit buffers
+    <code>CONFIG_PL2303_RXBUFSIZE</code> and <code>CONFIG_PL2303_TXBUFSIZE</code>: Size of the serial receive/transmit buffers
   </li>
 </ul>
 
 <h3>USB serial device class driver (Standard CDC ACM class)</h3>
 <ul>
   <li>
-    <code>CONFIG_CDCSER</code>:  Enable compilation of the USB serial driver
+    <code>CONFIG_CDCACM</code>:  Enable compilation of the USB serial driver
   </li>
   <li>
-    <code>CONFIG_CDCSER_COMPOSITE</code>:
+    <code>CONFIG_CDCACM_COMPOSITE</code>:
     Configure the CDC serial driver as part of a composite driver
     (only if <code>CONFIG_USBDEV_COMPOSITE</code> is also defined)
   </li>
   <li>
-    <code>CONFIG_CDCSER_EP0MAXPACKET</code>:  Endpoint 0 max packet size. Default 64.
+    <code>CONFIG_CDCACM_EP0MAXPACKET</code>:  Endpoint 0 max packet size. Default 64.
   </li>
   <li>
-    <code>CONFIG_CDCSER_EPINTIN</code>:  The logical 7-bit address of a hardware endpoint that supports
+    <code>CONFIG_CDCACM_EPINTIN</code>:  The logical 7-bit address of a hardware endpoint that supports
   interrupt IN operation.  Default 2.
   </li>
   <li>
-    <code>CONFIG_CDCSER_EPINTIN_FSSIZE</code>:  Max package size for the interrupt IN endpoint if full speed mode. Default 64.
+    <code>CONFIG_CDCACM_EPINTIN_FSSIZE</code>:  Max package size for the interrupt IN endpoint if full speed mode. Default 64.
   </li>
   <li>
-    <code>CONFIG_CDCSER_EPINTIN_HSSIZE</code>:  Max package size for the interrupt IN endpoint if high speed mode. Default 64.
+    <code>CONFIG_CDCACM_EPINTIN_HSSIZE</code>:  Max package size for the interrupt IN endpoint if high speed mode. Default 64.
   </li>
   <li>
-    <code>CONFIG_CDCSER_EPBULKOUT</code>:  The logical 7-bit address of a hardware endpoint that supports
+    <code>CONFIG_CDCACM_EPBULKOUT</code>:  The logical 7-bit address of a hardware endpoint that supports
   bulk OUT operation.
   </li>
   <li>
-    <code>CONFIG_CDCSER_EPBULKOUT_FSSIZE</code>:  Max package size for the bulk OUT endpoint if full speed mode.  Default 64.
+    <code>CONFIG_CDCACM_EPBULKOUT_FSSIZE</code>:  Max package size for the bulk OUT endpoint if full speed mode.  Default 64.
   </li>
   <li>
-    <code>CONFIG_CDCSER_EPBULKOUT_HSSIZE</code>:  Max package size for the bulk OUT  endpoint if high speed mode.  Default 512.
+    <code>CONFIG_CDCACM_EPBULKOUT_HSSIZE</code>:  Max package size for the bulk OUT  endpoint if high speed mode.  Default 512.
   </li>
   <li>
-    <code>CONFIG_CDCSER_EPBULKIN</code>:  The logical 7-bit address of a hardware endpoint that supports
+    <code>CONFIG_CDCACM_EPBULKIN</code>:  The logical 7-bit address of a hardware endpoint that supports
   bulk IN operation
   </li>
   <li>
-    <code>CONFIG_CDCSER_EPBULKIN_FSSIZE</code>:  Max package size for the bulk IN endpoint if full speed mode.  Default 64.
+    <code>CONFIG_CDCACM_EPBULKIN_FSSIZE</code>:  Max package size for the bulk IN endpoint if full speed mode.  Default 64.
   </li>
   <li>
-    <code>CONFIG_CDCSER_EPBULKIN_HSSIZE</code>:  Max package size for the bulk IN  endpoint if high speed mode.  Default 512.
+    <code>CONFIG_CDCACM_EPBULKIN_HSSIZE</code>:  Max package size for the bulk IN  endpoint if high speed mode.  Default 512.
   </li>
   <li>
-    <code>CONFIG_CDCSER_NWRREQS</code> and <code>CONFIG_CDCSER_NRDREQS</code>:  The number of write/read requests that can be in flight.
-    <code>CONFIG_CDCSER_NWRREQS</code> includes write requests used for both the interrupt and bulk IN endpoints.
+    <code>CONFIG_CDCACM_NWRREQS</code> and <code>CONFIG_CDCACM_NRDREQS</code>:  The number of write/read requests that can be in flight.
+    <code>CONFIG_CDCACM_NWRREQS</code> includes write requests used for both the interrupt and bulk IN endpoints.
     Default 4.
   </li>
   <li>
-    <code>CONFIG_CDCSER_VENDORID</code> and <code>CONFIG_CDCSER_VENDORSTR</code>:  The vendor ID code/string.  Default 0x0525 and &quot;NuttX,&quot;
+    <code>CONFIG_CDCACM_VENDORID</code> and <code>CONFIG_CDCACM_VENDORSTR</code>:  The vendor ID code/string.  Default 0x0525 and &quot;NuttX,&quot;
     0x0525 is the Netchip vendor and should not be used in any products.
     This default VID was selected for compatibility with the Linux CDC ACM default VID.
   </li>
   <li>
-    <code>CONFIG_CDCSER_PRODUCTID</code> and <code>CONFIG_CDCSER_PRODUCTSTR</code>:  The product ID code/string. Default 0xa4a7 and &quot;CDC/ACM Serial&quot;
+    <code>CONFIG_CDCACM_PRODUCTID</code> and <code>CONFIG_CDCACM_PRODUCTSTR</code>:  The product ID code/string. Default 0xa4a7 and &quot;CDC/ACM Serial&quot;
     0xa4a7 was selected for compatibility with the Linux CDC ACM default PID.
   </li>
   <li>
-    <code>CONFIG_CDCSER_RXBUFSIZE</code> and <code>CONFIG_CDCSER_TXBUFSIZE</code>:  Size of the serial receive/transmit buffers.  Default 256.
+    <code>CONFIG_CDCACM_RXBUFSIZE</code> and <code>CONFIG_CDCACM_TXBUFSIZE</code>:  Size of the serial receive/transmit buffers.  Default 256.
 </ul>
 
 <h3>USB Storage Device Configuration</h3>
diff --git a/Documentation/UsbTrace.html b/Documentation/UsbTrace.html
index 6a834752f5b..6d170044f59 100644
--- a/Documentation/UsbTrace.html
+++ b/Documentation/UsbTrace.html
@@ -293,25 +293,25 @@
 <ul>
   <li><b>1</b>.
     The serial class USB setup method was called for the USB serial class.
-    This is the corresponds to the following logic in <code>drivers/usbdev/usbdev_serial.c</code>:
+    This is the corresponds to the following logic in <code>drivers/usbdev/pl2303.c</code>:
     <ul><pre>
-static int usbser_setup(FAR struct uart_dev_s *dev)
+static int pl2303_setup(FAR struct uart_dev_s *dev)
 {
   ...
-  usbtrace(USBSER_CLASSAPI_SETUP, 0);
+  usbtrace(PL2303_CLASSAPI_SETUP, 0);
   ...
 </pre></ul>
   </li>
   <li><b>2</b>.
     An error occurred while processing the setup command because no configuration has yet been selected by the host.
-    This corresponds to the following logic in <code>drivers/usbdev/usbdev_serial.c</code>:
+    This corresponds to the following logic in <code>drivers/usbdev/pl2303.c</code>:
     <ul><pre>
-static int usbser_setup(FAR struct uart_dev_s *dev)
+static int pl2303_setup(FAR struct uart_dev_s *dev)
 {
   ...
   /* Check if we have been configured */
 
-  if (priv->config == USBSER_CONFIGIDNONE)
+  if (priv->config == PL2303_CONFIGIDNONE)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_SETUPNOTCONNECTED), 0);
       return -ENOTCONN;
diff --git a/configs/README.txt b/configs/README.txt
index 77946f7fd1b..12db2e5efac 100644
--- a/configs/README.txt
+++ b/configs/README.txt
@@ -978,76 +978,76 @@ defconfig -- This is a configuration file similar to the Linux
 
 	USB serial device class driver (Prolific PL2303 Emulation)
 
-		CONFIG_USBSER
+		CONFIG_PL2303
 		  Enable compilation of the USB serial driver
-		CONFIG_USBSER_EPINTIN
+		CONFIG_PL2303_EPINTIN
 		  The logical 7-bit address of a hardware endpoint that supports
 		  interrupt IN operation
-		CONFIG_USBSER_EPBULKOUT
+		CONFIG_PL2303_EPBULKOUT
 		  The logical 7-bit address of a hardware endpoint that supports
 		  bulk OUT operation
-		CONFIG_USBSER_EPBULKIN
+		CONFIG_PL2303_EPBULKIN
 		  The logical 7-bit address of a hardware endpoint that supports
 		  bulk IN operation
-		CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+		CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 		  The number of write/read requests that can be in flight
-		CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+		CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 		  The vendor ID code/string
-		CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+		CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 		  The product ID code/string
-		CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+		CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 		  Size of the serial receive/transmit buffers
 
 	USB serial device class driver (Standard CDC ACM class)
 
-		CONFIG_CDCSER
+		CONFIG_CDCACM
 		  Enable compilation of the USB serial driver
-		CONFIG_CDCSER_COMPOSITE
+		CONFIG_CDCACM_COMPOSITE
 		  Configure the CDC serial driver as part of a composite driver
 		  (only if CONFIG_USBDEV_COMPOSITE is also defined)
-		CONFIG_CDCSER_EP0MAXPACKET
+		CONFIG_CDCACM_EP0MAXPACKET
 		  Endpoint 0 max packet size. Default 64.
-		CONFIG_CDCSER_EPINTIN
+		CONFIG_CDCACM_EPINTIN
 		  The logical 7-bit address of a hardware endpoint that supports
 		  interrupt IN operation.  Default 2.
-		CONFIG_CDCSER_EPINTIN_FSSIZE
+		CONFIG_CDCACM_EPINTIN_FSSIZE
 		  Max package size for the interrupt IN endpoint if full speed mode.
 		  Default 64.
-		CONFIG_CDCSER_EPINTIN_HSSIZE
+		CONFIG_CDCACM_EPINTIN_HSSIZE
 		  Max package size for the interrupt IN endpoint if high speed mode.
 		  Default 64.
-		CONFIG_CDCSER_EPBULKOUT
+		CONFIG_CDCACM_EPBULKOUT
 		  The logical 7-bit address of a hardware endpoint that supports
 		  bulk OUT operation
-		CONFIG_CDCSER_EPBULKOUT_FSSIZE
+		CONFIG_CDCACM_EPBULKOUT_FSSIZE
 		  Max package size for the bulk OUT endpoint if full speed mode.
 		  Default 64.
-		CONFIG_CDCSER_EPBULKOUT_HSSIZE
+		CONFIG_CDCACM_EPBULKOUT_HSSIZE
 		  Max package size for the bulk OUT endpoint if high speed mode.
 		  Default 512.
-		CONFIG_CDCSER_EPBULKIN
+		CONFIG_CDCACM_EPBULKIN
 		  The logical 7-bit address of a hardware endpoint that supports
 		  bulk IN operation
-		CONFIG_CDCSER_EPBULKIN_FSSIZE
+		CONFIG_CDCACM_EPBULKIN_FSSIZE
 		  Max package size for the bulk IN endpoint if full speed mode.
 		  Default 64.
-		CONFIG_CDCSER_EPBULKIN_HSSIZE
+		CONFIG_CDCACM_EPBULKIN_HSSIZE
 		  Max package size for the bulk IN endpoint if high speed mode.
 		  Default 512.
-		CONFIG_CDCSER_NWRREQS and CONFIG_CDCSER_NRDREQS
+		CONFIG_CDCACM_NWRREQS and CONFIG_CDCACM_NRDREQS
 		  The number of write/read requests that can be in flight.
-		  CONFIG_CDCSER_NWRREQS includes write requests used for both the
+		  CONFIG_CDCACM_NWRREQS includes write requests used for both the
 		  interrupt and bulk IN endpoints.  Default 4.
-		CONFIG_CDCSER_VENDORID and CONFIG_CDCSER_VENDORSTR
+		CONFIG_CDCACM_VENDORID and CONFIG_CDCACM_VENDORSTR
 		  The vendor ID code/string.  Default 0x0525 and "NuttX"
 		  0x0525 is the Netchip vendor and should not be used in any
 		  products.  This default VID was selected for compatibility with
 		  the Linux CDC ACM default VID.
-		CONFIG_CDCSER_PRODUCTID and CONFIG_CDCSER_PRODUCTSTR
+		CONFIG_CDCACM_PRODUCTID and CONFIG_CDCACM_PRODUCTSTR
 		  The product ID code/string. Default 0xa4a7 and "CDC/ACM Serial"
 		  0xa4a7 was selected for compatibility with the Linux CDC ACM
 		  default PID.
-		CONFIG_CDCSER_RXBUFSIZE and CONFIG_CDCSER_TXBUFSIZE
+		CONFIG_CDCACM_RXBUFSIZE and CONFIG_CDCACM_TXBUFSIZE
 		  Size of the serial receive/transmit buffers. Default 256.
 
 	USB Storage Device Configuration
diff --git a/configs/amber/hello/defconfig b/configs/amber/hello/defconfig
index 400585f9917..862d079b962 100644
--- a/configs/amber/hello/defconfig
+++ b/configs/amber/hello/defconfig
@@ -542,38 +542,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/avr32dev1/nsh/defconfig b/configs/avr32dev1/nsh/defconfig
index 505be57c9bf..3d2c5544f29 100755
--- a/configs/avr32dev1/nsh/defconfig
+++ b/configs/avr32dev1/nsh/defconfig
@@ -570,38 +570,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/avr32dev1/ostest/defconfig b/configs/avr32dev1/ostest/defconfig
index a2376daf3a7..668b2ec0542 100755
--- a/configs/avr32dev1/ostest/defconfig
+++ b/configs/avr32dev1/ostest/defconfig
@@ -570,38 +570,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/demo9s12ne64/ostest/defconfig b/configs/demo9s12ne64/ostest/defconfig
index 14430c3da0f..fa7c36db930 100755
--- a/configs/demo9s12ne64/ostest/defconfig
+++ b/configs/demo9s12ne64/ostest/defconfig
@@ -546,38 +546,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/ea3131/nsh/defconfig b/configs/ea3131/nsh/defconfig
index aea79004793..fa09b56004d 100644
--- a/configs/ea3131/nsh/defconfig
+++ b/configs/ea3131/nsh/defconfig
@@ -553,38 +553,38 @@ CONFIG_LPC31XX_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=3
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=1
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=3
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=1
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/ea3131/ostest/defconfig b/configs/ea3131/ostest/defconfig
index 8aa8672ab0e..cc4e8ddb612 100644
--- a/configs/ea3131/ostest/defconfig
+++ b/configs/ea3131/ostest/defconfig
@@ -553,38 +553,38 @@ CONFIG_LPC31XX_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=3
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=1
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=3
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=1
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig
index f8ffcecb480..da217f4d336 100644
--- a/configs/ea3131/pgnsh/defconfig
+++ b/configs/ea3131/pgnsh/defconfig
@@ -704,38 +704,38 @@ CONFIG_LPC31XX_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=3
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=1
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=3
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=1
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/ea3131/usbserial/defconfig b/configs/ea3131/usbserial/defconfig
index 5d1023570d9..470df0d8a8d 100644
--- a/configs/ea3131/usbserial/defconfig
+++ b/configs/ea3131/usbserial/defconfig
@@ -556,38 +556,38 @@ CONFIG_LPC31XX_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=y
-CONFIG_USBSER_EPINTIN=3
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=1
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=y
+CONFIG_PL2303_EPINTIN=3
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=1
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/ea3131/usbstorage/defconfig b/configs/ea3131/usbstorage/defconfig
index 210384a634e..f681f3f2a2b 100644
--- a/configs/ea3131/usbstorage/defconfig
+++ b/configs/ea3131/usbstorage/defconfig
@@ -556,38 +556,38 @@ CONFIG_LPC31XX_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=3
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=1
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=3
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=1
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/ea3152/ostest/defconfig b/configs/ea3152/ostest/defconfig
index 14496b590bf..8a3dcb98a52 100644
--- a/configs/ea3152/ostest/defconfig
+++ b/configs/ea3152/ostest/defconfig
@@ -554,38 +554,38 @@ CONFIG_LPC31XX_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=3
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=1
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=3
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=1
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig
index 73b289cb831..e1a0ad5ef84 100644
--- a/configs/ez80f910200kitg/ostest/defconfig
+++ b/configs/ez80f910200kitg/ostest/defconfig
@@ -466,37 +466,37 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/ez80f910200zco/dhcpd/defconfig b/configs/ez80f910200zco/dhcpd/defconfig
index 3127f86a670..dd3230e82dd 100644
--- a/configs/ez80f910200zco/dhcpd/defconfig
+++ b/configs/ez80f910200zco/dhcpd/defconfig
@@ -474,37 +474,37 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/ez80f910200zco/httpd/defconfig b/configs/ez80f910200zco/httpd/defconfig
index cf1926dbc42..7b1961a3544 100644
--- a/configs/ez80f910200zco/httpd/defconfig
+++ b/configs/ez80f910200zco/httpd/defconfig
@@ -474,37 +474,37 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/ez80f910200zco/nettest/defconfig b/configs/ez80f910200zco/nettest/defconfig
index 6fa22d3257f..f2f267b9265 100644
--- a/configs/ez80f910200zco/nettest/defconfig
+++ b/configs/ez80f910200zco/nettest/defconfig
@@ -474,37 +474,37 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/ez80f910200zco/nsh/defconfig b/configs/ez80f910200zco/nsh/defconfig
index 71f9f758ac9..73393b56e08 100644
--- a/configs/ez80f910200zco/nsh/defconfig
+++ b/configs/ez80f910200zco/nsh/defconfig
@@ -474,37 +474,37 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/ez80f910200zco/ostest/defconfig b/configs/ez80f910200zco/ostest/defconfig
index 50dec56bac3..340ee9d4230 100644
--- a/configs/ez80f910200zco/ostest/defconfig
+++ b/configs/ez80f910200zco/ostest/defconfig
@@ -469,37 +469,37 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/ez80f910200zco/poll/defconfig b/configs/ez80f910200zco/poll/defconfig
index bac05b8a861..d90836a171a 100644
--- a/configs/ez80f910200zco/poll/defconfig
+++ b/configs/ez80f910200zco/poll/defconfig
@@ -474,37 +474,37 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/hymini-stm32v/README.txt b/configs/hymini-stm32v/README.txt
index a3241da722f..3f87f4ef50c 100755
--- a/configs/hymini-stm32v/README.txt
+++ b/configs/hymini-stm32v/README.txt
@@ -647,11 +647,11 @@ Where <subdir> is one of the following:
     to use the CDC/ACM serial class by making the following changes
     to the configuration file:
 
-    -CONFIG_USBSER=y
-    +CONFIG_USBSER=n
+    -CONFIG_PL2303=y
+    +CONFIG_PL2303=n
 
-    -CONFIG_CDCSER=n
-    +CONFIG_CDCSER=y
+    -CONFIG_CDCACM=n
+    +CONFIG_CDCACM=y
 
     The example can also be converted to use the alternative
     USB serial example at apps/examples/usbterm by changing the 
diff --git a/configs/hymini-stm32v/buttons/defconfig b/configs/hymini-stm32v/buttons/defconfig
index 908d9eebfb0..811400e259a 100644
--- a/configs/hymini-stm32v/buttons/defconfig
+++ b/configs/hymini-stm32v/buttons/defconfig
@@ -637,38 +637,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/hymini-stm32v/nsh/defconfig b/configs/hymini-stm32v/nsh/defconfig
index d30c40a0b1a..2dddc77fed4 100755
--- a/configs/hymini-stm32v/nsh/defconfig
+++ b/configs/hymini-stm32v/nsh/defconfig
@@ -640,38 +640,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig
index 8e4963650d9..897feeabff8 100644
--- a/configs/hymini-stm32v/nsh2/defconfig
+++ b/configs/hymini-stm32v/nsh2/defconfig
@@ -610,38 +610,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/hymini-stm32v/nx/defconfig b/configs/hymini-stm32v/nx/defconfig
index ab7b9b2ac7e..48f1a866d98 100644
--- a/configs/hymini-stm32v/nx/defconfig
+++ b/configs/hymini-stm32v/nx/defconfig
@@ -656,38 +656,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/hymini-stm32v/nxlines/defconfig b/configs/hymini-stm32v/nxlines/defconfig
index 5e3a2e9b073..e6b33fbced4 100644
--- a/configs/hymini-stm32v/nxlines/defconfig
+++ b/configs/hymini-stm32v/nxlines/defconfig
@@ -660,38 +660,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/hymini-stm32v/usbserial/defconfig b/configs/hymini-stm32v/usbserial/defconfig
index 4f087671fa2..d5ef2ffc48f 100755
--- a/configs/hymini-stm32v/usbserial/defconfig
+++ b/configs/hymini-stm32v/usbserial/defconfig
@@ -636,107 +636,107 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration (Prolific PL2303 Emulation)
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=y
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=y
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB serial device class driver (Standard CDC ACM class)
 #
-# CONFIG_CDCSER
+# CONFIG_CDCACM
 #   Enable compilation of the USB serial driver
-# CONFIG_CDCSER_EP0MAXPACKET
+# CONFIG_CDCACM_EP0MAXPACKET
 #   Endpoint 0 max packet size. Default 64
-# CONFIG_CDCSER_EPINTIN
+# CONFIG_CDCACM_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation.  Default 2.
-# CONFIG_CDCSER_EPINTIN_FSSIZE
+# CONFIG_CDCACM_EPINTIN_FSSIZE
 #   Max package size for the interrupt IN endpoint if full speed mode.
 #   Default 64.
-# CONFIG_CDCSER_EPINTIN_HSSIZE
+# CONFIG_CDCACM_EPINTIN_HSSIZE
 #   Max package size for the interrupt IN endpoint if high speed mode.
 #   Default 64
-# CONFIG_CDCSER_EPBULKOUT
+# CONFIG_CDCACM_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_CDCSER_EPBULKOUT_FSSIZE
+# CONFIG_CDCACM_EPBULKOUT_FSSIZE
 #   Max package size for the bulk OUT endpoint if full speed mode.
 #   Default 64.
-# CONFIG_CDCSER_EPBULKOUT_HSSIZE
+# CONFIG_CDCACM_EPBULKOUT_HSSIZE
 #   Max package size for the bulk OUT  endpoint if high speed mode.
 #   Default 512.
-# CONFIG_CDCSER_EPBULKIN
+# CONFIG_CDCACM_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_CDCSER_EPBULKIN_FSSIZE
+# CONFIG_CDCACM_EPBULKIN_FSSIZE
 #   Max package size for the bulk IN endpoint if full speed mode.
 #   Default 64.
-# CONFIG_CDCSER_EPBULKIN_HSSIZE
+# CONFIG_CDCACM_EPBULKIN_HSSIZE
 #   Max package size for the bulk IN  endpoint if high speed mode.
 #   Default 512.
-# CONFIG_CDCSER_NWRREQS and CONFIG_CDCSER_NRDREQS
+# CONFIG_CDCACM_NWRREQS and CONFIG_CDCACM_NRDREQS
 #   The number of write/read requests that can be in flight.
 #   Default 256.
-# CONFIG_CDCSER_VENDORID and CONFIG_CDCSER_VENDORSTR
+# CONFIG_CDCACM_VENDORID and CONFIG_CDCACM_VENDORSTR
 #   The vendor ID code/string.  Default 0x0525 and "NuttX"
 #   0x0525 is the Netchip vendor and should not be used in any
 #   products.  This default VID was selected for compatibility with
 #   the Linux CDC ACM default VID.
-# CONFIG_CDCSER_PRODUCTID and CONFIG_CDCSER_PRODUCTSTR
+# CONFIG_CDCACM_PRODUCTID and CONFIG_CDCACM_PRODUCTSTR
 #   The product ID code/string. Default 0xara7 and "CDC/ACM Serial"
 #   0xa4a7 was selected for compatibility with the Linux CDC ACM
 #   default PID.
-# CONFIG_CDCSER_RXBUFSIZE and CONFIG_CDCSER_TXBUFSIZE
+# CONFIG_CDCACM_RXBUFSIZE and CONFIG_CDCACM_TXBUFSIZE
 #   Size of the serial receive/transmit buffers. Default 256.
 #
-CONFIG_CDCSER=n
-#CONFIG_CDCSER_EP0MAXPACKET
-#CONFIG_CDCSER_EPINTIN
-#CONFIG_CDCSER_EPINTIN_FSSIZE
-#CONFIG_CDCSER_EPINTIN_HSSIZE
-#CONFIG_CDCSER_EPBULKOUT
-#CONFIG_CDCSER_EPBULKOUT_FSSIZE
-#CONFIG_CDCSER_EPBULKOUT_HSSIZE
-#CONFIG_CDCSER_EPBULKIN
-#CONFIG_CDCSER_EPBULKIN_FSSIZE
-#CONFIG_CDCSER_EPBULKIN_HSSIZE
-#CONFIG_CDCSER_NWRREQS
-#CONFIG_CDCSER_NRDREQS
-#CONFIG_CDCSER_VENDORID
-#CONFIG_CDCSER_VENDORSTR
-#CONFIG_CDCSER_PRODUCTID
-#CONFIG_CDCSER_PRODUCTSTR
-#CONFIG_CDCSER_RXBUFSIZE
-#CONFIG_CDCSER_TXBUFSIZE
+CONFIG_CDCACM=n
+#CONFIG_CDCACM_EP0MAXPACKET
+#CONFIG_CDCACM_EPINTIN
+#CONFIG_CDCACM_EPINTIN_FSSIZE
+#CONFIG_CDCACM_EPINTIN_HSSIZE
+#CONFIG_CDCACM_EPBULKOUT
+#CONFIG_CDCACM_EPBULKOUT_FSSIZE
+#CONFIG_CDCACM_EPBULKOUT_HSSIZE
+#CONFIG_CDCACM_EPBULKIN
+#CONFIG_CDCACM_EPBULKIN_FSSIZE
+#CONFIG_CDCACM_EPBULKIN_HSSIZE
+#CONFIG_CDCACM_NWRREQS
+#CONFIG_CDCACM_NRDREQS
+#CONFIG_CDCACM_VENDORID
+#CONFIG_CDCACM_VENDORSTR
+#CONFIG_CDCACM_PRODUCTID
+#CONFIG_CDCACM_PRODUCTSTR
+#CONFIG_CDCACM_RXBUFSIZE
+#CONFIG_CDCACM_TXBUFSIZE
 
 # USB Storage Device Configuration
 #
diff --git a/configs/hymini-stm32v/usbstorage/defconfig b/configs/hymini-stm32v/usbstorage/defconfig
index 5e32895ffb8..e55183f54af 100755
--- a/configs/hymini-stm32v/usbstorage/defconfig
+++ b/configs/hymini-stm32v/usbstorage/defconfig
@@ -648,38 +648,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/kwikstik-k40/ostest/defconfig b/configs/kwikstik-k40/ostest/defconfig
index 57ffe91c048..3dec59521dd 100755
--- a/configs/kwikstik-k40/ostest/defconfig
+++ b/configs/kwikstik-k40/ostest/defconfig
@@ -697,38 +697,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/configs/lpcxpresso-lpc1768/dhcpd/defconfig
index d19ae4538fe..1b80f4ccf39 100755
--- a/configs/lpcxpresso-lpc1768/dhcpd/defconfig
+++ b/configs/lpcxpresso-lpc1768/dhcpd/defconfig
@@ -632,38 +632,38 @@ CONFIG_LPC17_USBDEV_NOLED=y
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/lpcxpresso-lpc1768/nsh/defconfig b/configs/lpcxpresso-lpc1768/nsh/defconfig
index add5f015b37..b6b438ae88e 100755
--- a/configs/lpcxpresso-lpc1768/nsh/defconfig
+++ b/configs/lpcxpresso-lpc1768/nsh/defconfig
@@ -672,38 +672,38 @@ CONFIG_USBHOST_IOBUFSIZE=512
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/lpcxpresso-lpc1768/nx/defconfig b/configs/lpcxpresso-lpc1768/nx/defconfig
index 043c9639808..6b584ab87d3 100755
--- a/configs/lpcxpresso-lpc1768/nx/defconfig
+++ b/configs/lpcxpresso-lpc1768/nx/defconfig
@@ -643,38 +643,38 @@ CONFIG_LPC17_USBDEV_NOLED=y
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/lpcxpresso-lpc1768/ostest/defconfig b/configs/lpcxpresso-lpc1768/ostest/defconfig
index 9dfaf4c5e89..1e42d603177 100755
--- a/configs/lpcxpresso-lpc1768/ostest/defconfig
+++ b/configs/lpcxpresso-lpc1768/ostest/defconfig
@@ -628,38 +628,38 @@ CONFIG_LPC17_USBDEV_NOLED=y
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/lpcxpresso-lpc1768/thttpd/defconfig b/configs/lpcxpresso-lpc1768/thttpd/defconfig
index 62ee7748127..ecfe5959a5a 100755
--- a/configs/lpcxpresso-lpc1768/thttpd/defconfig
+++ b/configs/lpcxpresso-lpc1768/thttpd/defconfig
@@ -637,38 +637,38 @@ CONFIG_LPC17_USBDEV_NOLED=y
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/lpcxpresso-lpc1768/usbstorage/defconfig b/configs/lpcxpresso-lpc1768/usbstorage/defconfig
index c2221151a75..f18ac3a2aa5 100755
--- a/configs/lpcxpresso-lpc1768/usbstorage/defconfig
+++ b/configs/lpcxpresso-lpc1768/usbstorage/defconfig
@@ -617,38 +617,38 @@ CONFIG_LPC17_USBDEV_NOLED=y
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/mbed/hidkbd/defconfig b/configs/mbed/hidkbd/defconfig
index 322780d8491..71be225be2d 100644
--- a/configs/mbed/hidkbd/defconfig
+++ b/configs/mbed/hidkbd/defconfig
@@ -660,38 +660,38 @@ CONFIG_USBHOST_IOBUFSIZE=512
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/mbed/nsh/defconfig b/configs/mbed/nsh/defconfig
index 1e1b10b3a8d..6d23e1d193d 100755
--- a/configs/mbed/nsh/defconfig
+++ b/configs/mbed/nsh/defconfig
@@ -602,38 +602,38 @@ CONFIG_LPC17_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/mcu123-lpc214x/nsh/defconfig b/configs/mcu123-lpc214x/nsh/defconfig
index cfe99367c82..c398546dff1 100644
--- a/configs/mcu123-lpc214x/nsh/defconfig
+++ b/configs/mcu123-lpc214x/nsh/defconfig
@@ -465,37 +465,37 @@ CONFIG_LPC214X_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/mcu123-lpc214x/ostest/defconfig b/configs/mcu123-lpc214x/ostest/defconfig
index 0d4d5010b1c..1793d5d27e0 100644
--- a/configs/mcu123-lpc214x/ostest/defconfig
+++ b/configs/mcu123-lpc214x/ostest/defconfig
@@ -455,37 +455,37 @@ CONFIG_LPC214X_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/mcu123-lpc214x/usbserial/defconfig b/configs/mcu123-lpc214x/usbserial/defconfig
index 8d241576a7d..f7bc30d69c4 100644
--- a/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/configs/mcu123-lpc214x/usbserial/defconfig
@@ -455,37 +455,37 @@ CONFIG_LPC214X_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER=y
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=y
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 CONFIG_NXFLAT=n
 
 #
diff --git a/configs/mcu123-lpc214x/usbstorage/defconfig b/configs/mcu123-lpc214x/usbstorage/defconfig
index 98cf9b34333..44dd15ff048 100644
--- a/configs/mcu123-lpc214x/usbstorage/defconfig
+++ b/configs/mcu123-lpc214x/usbstorage/defconfig
@@ -456,37 +456,37 @@ CONFIG_LPC214X_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
@@ -495,18 +495,18 @@ CONFIG_USBSER_TXBUFSIZE=512
 #   Enable compilation of the USB storage driver
 # CONFIG_USBMSC_EP0MAXPACKET
 #   Max packet size for endpoint 0
-# CONFIG_USBSER_EPBULKOUT and CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKOUT and CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoints that support
 #   bulk OUT and IN operations
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
 # CONFIG_USBMSC_BULKINREQLEN and CONFIG_USBMSC_BULKOUTREQLEN
 #   The size of the buffer in each write/read request.  This
 #   value needs to be at least as large as the endpoint
 #   maxpacket and ideally as large as a block device sector.
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
 # CONFIG_USBMSC_REMOVABLE
 #   Select if the media is removable
diff --git a/configs/micropendous3/hello/defconfig b/configs/micropendous3/hello/defconfig
index 818f7c5ade7..ccd0f9d6010 100644
--- a/configs/micropendous3/hello/defconfig
+++ b/configs/micropendous3/hello/defconfig
@@ -536,38 +536,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/mx1ads/ostest/defconfig b/configs/mx1ads/ostest/defconfig
index afc989ff4e1..b5f97c37c5c 100644
--- a/configs/mx1ads/ostest/defconfig
+++ b/configs/mx1ads/ostest/defconfig
@@ -439,34 +439,34 @@ CONFIG_IMX_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER_EPINTIN=3
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=1
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303_EPINTIN=3
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=1
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/ne64badge/ostest/defconfig b/configs/ne64badge/ostest/defconfig
index aa6c255db31..32af8f7e698 100755
--- a/configs/ne64badge/ostest/defconfig
+++ b/configs/ne64badge/ostest/defconfig
@@ -557,38 +557,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/ntosd-dm320/nettest/defconfig b/configs/ntosd-dm320/nettest/defconfig
index bd62fad043a..b8962b73944 100644
--- a/configs/ntosd-dm320/nettest/defconfig
+++ b/configs/ntosd-dm320/nettest/defconfig
@@ -429,37 +429,37 @@ CONFIG_DM320_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=3
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=1
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=3
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=1
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/ntosd-dm320/nsh/defconfig b/configs/ntosd-dm320/nsh/defconfig
index 635fe82f5d2..3556438f3bc 100644
--- a/configs/ntosd-dm320/nsh/defconfig
+++ b/configs/ntosd-dm320/nsh/defconfig
@@ -436,37 +436,37 @@ CONFIG_DM320_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=3
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=1
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=3
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=1
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/ntosd-dm320/ostest/defconfig b/configs/ntosd-dm320/ostest/defconfig
index 7d60da4b32e..a9790803cae 100644
--- a/configs/ntosd-dm320/ostest/defconfig
+++ b/configs/ntosd-dm320/ostest/defconfig
@@ -427,34 +427,34 @@ CONFIG_DM320_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER_EPINTIN=3
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=1
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303_EPINTIN=3
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=1
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/ntosd-dm320/poll/defconfig b/configs/ntosd-dm320/poll/defconfig
index 55a158eeb87..c1e62fb1ba7 100644
--- a/configs/ntosd-dm320/poll/defconfig
+++ b/configs/ntosd-dm320/poll/defconfig
@@ -429,37 +429,37 @@ CONFIG_DM320_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=3
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=1
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=3
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=1
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/ntosd-dm320/thttpd/defconfig b/configs/ntosd-dm320/thttpd/defconfig
index 6236bb6f675..df4e96add4c 100644
--- a/configs/ntosd-dm320/thttpd/defconfig
+++ b/configs/ntosd-dm320/thttpd/defconfig
@@ -477,37 +477,37 @@ CONFIG_DM320_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=3
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=1
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=3
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=1
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/ntosd-dm320/udp/defconfig b/configs/ntosd-dm320/udp/defconfig
index b4565882730..00aec20d6e1 100644
--- a/configs/ntosd-dm320/udp/defconfig
+++ b/configs/ntosd-dm320/udp/defconfig
@@ -428,37 +428,37 @@ CONFIG_DM320_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=3
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=1
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=3
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=1
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/ntosd-dm320/uip/defconfig b/configs/ntosd-dm320/uip/defconfig
index 7f34477986e..15d3d96482d 100644
--- a/configs/ntosd-dm320/uip/defconfig
+++ b/configs/ntosd-dm320/uip/defconfig
@@ -429,37 +429,37 @@ CONFIG_DM320_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=3
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=1
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=3
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=1
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/nucleus2g/nsh/defconfig b/configs/nucleus2g/nsh/defconfig
index 7ea8d34a5d3..3b3528b0956 100755
--- a/configs/nucleus2g/nsh/defconfig
+++ b/configs/nucleus2g/nsh/defconfig
@@ -654,38 +654,38 @@ CONFIG_USBHOST_IOBUFSIZE=512
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/nucleus2g/ostest/defconfig b/configs/nucleus2g/ostest/defconfig
index 455a0d7f84c..719adae7ea6 100755
--- a/configs/nucleus2g/ostest/defconfig
+++ b/configs/nucleus2g/ostest/defconfig
@@ -602,38 +602,38 @@ CONFIG_LPC17_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/nucleus2g/usbserial/defconfig b/configs/nucleus2g/usbserial/defconfig
index 5be30ccdc46..33b3e32bad7 100755
--- a/configs/nucleus2g/usbserial/defconfig
+++ b/configs/nucleus2g/usbserial/defconfig
@@ -603,38 +603,38 @@ CONFIG_LPC17_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=y
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=y
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/nucleus2g/usbstorage/defconfig b/configs/nucleus2g/usbstorage/defconfig
index 20bfd0811df..fc16725f685 100755
--- a/configs/nucleus2g/usbstorage/defconfig
+++ b/configs/nucleus2g/usbstorage/defconfig
@@ -603,38 +603,38 @@ CONFIG_LPC17_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/olimex-lpc1766stk/ftpc/defconfig b/configs/olimex-lpc1766stk/ftpc/defconfig
index aacd2db6974..d2949b9aa2a 100755
--- a/configs/olimex-lpc1766stk/ftpc/defconfig
+++ b/configs/olimex-lpc1766stk/ftpc/defconfig
@@ -723,38 +723,38 @@ CONFIG_USBHOST_IOBUFSIZE=512
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/olimex-lpc1766stk/hidkbd/defconfig b/configs/olimex-lpc1766stk/hidkbd/defconfig
index 6f6a50eb0af..6d64decaec3 100755
--- a/configs/olimex-lpc1766stk/hidkbd/defconfig
+++ b/configs/olimex-lpc1766stk/hidkbd/defconfig
@@ -706,38 +706,38 @@ CONFIG_USBHOST_IOBUFSIZE=512
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/olimex-lpc1766stk/nettest/defconfig b/configs/olimex-lpc1766stk/nettest/defconfig
index 8d99b6a5ce1..d3fb829d672 100755
--- a/configs/olimex-lpc1766stk/nettest/defconfig
+++ b/configs/olimex-lpc1766stk/nettest/defconfig
@@ -659,38 +659,38 @@ CONFIG_LPC17_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig
index 7c183c44c8d..157ccf08c66 100755
--- a/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/configs/olimex-lpc1766stk/nsh/defconfig
@@ -751,38 +751,38 @@ CONFIG_USBHOST_IOBUFSIZE=512
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/olimex-lpc1766stk/nx/defconfig b/configs/olimex-lpc1766stk/nx/defconfig
index 17bbfda4450..b2bbd75d450 100755
--- a/configs/olimex-lpc1766stk/nx/defconfig
+++ b/configs/olimex-lpc1766stk/nx/defconfig
@@ -669,38 +669,38 @@ CONFIG_LPC17_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/olimex-lpc1766stk/ostest/defconfig b/configs/olimex-lpc1766stk/ostest/defconfig
index f6192207d88..7925624e368 100755
--- a/configs/olimex-lpc1766stk/ostest/defconfig
+++ b/configs/olimex-lpc1766stk/ostest/defconfig
@@ -650,38 +650,38 @@ CONFIG_LPC17_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/olimex-lpc1766stk/slip-httpd/defconfig b/configs/olimex-lpc1766stk/slip-httpd/defconfig
index 1da53655ef9..d6e96418130 100755
--- a/configs/olimex-lpc1766stk/slip-httpd/defconfig
+++ b/configs/olimex-lpc1766stk/slip-httpd/defconfig
@@ -676,38 +676,38 @@ CONFIG_LPC17_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/olimex-lpc1766stk/thttpd/defconfig b/configs/olimex-lpc1766stk/thttpd/defconfig
index 4c74d561fc7..78411123f65 100755
--- a/configs/olimex-lpc1766stk/thttpd/defconfig
+++ b/configs/olimex-lpc1766stk/thttpd/defconfig
@@ -668,38 +668,38 @@ CONFIG_LPC17_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/olimex-lpc1766stk/usbserial/defconfig b/configs/olimex-lpc1766stk/usbserial/defconfig
index f644cc3ad38..76aa55200f1 100755
--- a/configs/olimex-lpc1766stk/usbserial/defconfig
+++ b/configs/olimex-lpc1766stk/usbserial/defconfig
@@ -651,38 +651,38 @@ CONFIG_LPC17_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=y
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=y
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/olimex-lpc1766stk/usbstorage/defconfig b/configs/olimex-lpc1766stk/usbstorage/defconfig
index 5b23fa431fb..6df0b20d62f 100755
--- a/configs/olimex-lpc1766stk/usbstorage/defconfig
+++ b/configs/olimex-lpc1766stk/usbstorage/defconfig
@@ -651,38 +651,38 @@ CONFIG_LPC17_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/olimex-lpc1766stk/wlan/defconfig b/configs/olimex-lpc1766stk/wlan/defconfig
index 203860ec17c..7f1ed86e6ad 100755
--- a/configs/olimex-lpc1766stk/wlan/defconfig
+++ b/configs/olimex-lpc1766stk/wlan/defconfig
@@ -704,38 +704,38 @@ CONFIG_USBHOST_IOBUFSIZE=448
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/olimex-strp711/nettest/defconfig b/configs/olimex-strp711/nettest/defconfig
index 24d516288a3..abaf6919534 100755
--- a/configs/olimex-strp711/nettest/defconfig
+++ b/configs/olimex-strp711/nettest/defconfig
@@ -561,37 +561,37 @@ CONFIG_STR71X_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/olimex-strp711/nsh/defconfig b/configs/olimex-strp711/nsh/defconfig
index 5608c84de72..67b51d28ecd 100644
--- a/configs/olimex-strp711/nsh/defconfig
+++ b/configs/olimex-strp711/nsh/defconfig
@@ -518,37 +518,37 @@ CONFIG_STR71X_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/olimex-strp711/ostest/defconfig b/configs/olimex-strp711/ostest/defconfig
index a3439eb3da6..f8c43e1fae3 100644
--- a/configs/olimex-strp711/ostest/defconfig
+++ b/configs/olimex-strp711/ostest/defconfig
@@ -518,37 +518,37 @@ CONFIG_STR71X_USBDEV_DMAINTMASK=0
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/pcblogic-pic32mx/nsh/defconfig b/configs/pcblogic-pic32mx/nsh/defconfig
index 6592a3da21b..8aa8adb9c85 100644
--- a/configs/pcblogic-pic32mx/nsh/defconfig
+++ b/configs/pcblogic-pic32mx/nsh/defconfig
@@ -669,38 +669,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/pcblogic-pic32mx/ostest/defconfig b/configs/pcblogic-pic32mx/ostest/defconfig
index babad70e07e..9298dc4bd30 100644
--- a/configs/pcblogic-pic32mx/ostest/defconfig
+++ b/configs/pcblogic-pic32mx/ostest/defconfig
@@ -614,38 +614,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/pic32-starterkit/ostest/defconfig b/configs/pic32-starterkit/ostest/defconfig
index a9df26cb6d0..5cb21d07c0c 100644
--- a/configs/pic32-starterkit/ostest/defconfig
+++ b/configs/pic32-starterkit/ostest/defconfig
@@ -701,38 +701,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig
index 20a443a8c7d..1cc6d976f6d 100755
--- a/configs/sam3u-ek/knsh/defconfig
+++ b/configs/sam3u-ek/knsh/defconfig
@@ -586,38 +586,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig
index 1843829be28..4c4ed90b29d 100755
--- a/configs/sam3u-ek/nsh/defconfig
+++ b/configs/sam3u-ek/nsh/defconfig
@@ -556,38 +556,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig
index a1bd142eee2..5f0fa1854ee 100755
--- a/configs/sam3u-ek/nx/defconfig
+++ b/configs/sam3u-ek/nx/defconfig
@@ -565,38 +565,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/sam3u-ek/ostest/defconfig b/configs/sam3u-ek/ostest/defconfig
index 9be22a3d098..a0610a66ffa 100755
--- a/configs/sam3u-ek/ostest/defconfig
+++ b/configs/sam3u-ek/ostest/defconfig
@@ -554,38 +554,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/sam3u-ek/touchscreen/defconfig b/configs/sam3u-ek/touchscreen/defconfig
index 1ccd5553184..75ecc55c72a 100755
--- a/configs/sam3u-ek/touchscreen/defconfig
+++ b/configs/sam3u-ek/touchscreen/defconfig
@@ -597,38 +597,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/skp16c26/ostest/defconfig b/configs/skp16c26/ostest/defconfig
index dd3690bf881..fca9dc7e1cf 100644
--- a/configs/skp16c26/ostest/defconfig
+++ b/configs/skp16c26/ostest/defconfig
@@ -430,34 +430,34 @@ CONFIG_M16C_USBDEV_DMA=n
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER_EPINTIN=3
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=1
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303_EPINTIN=3
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=1
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/stm3210e-eval/README.txt b/configs/stm3210e-eval/README.txt
index 1a38bac823f..a86b325265b 100755
--- a/configs/stm3210e-eval/README.txt
+++ b/configs/stm3210e-eval/README.txt
@@ -773,11 +773,11 @@ Where <subdir> is one of the following:
     to use the CDC/ACM serial class by making the following changes
     to the configuration file:
 
-    -CONFIG_USBSER=y
-    +CONFIG_USBSER=n
+    -CONFIG_PL2303=y
+    +CONFIG_PL2303=n
 
-    -CONFIG_CDCSER=n
-    +CONFIG_CDCSER=y
+    -CONFIG_CDCACM=n
+    +CONFIG_CDCACM=y
 
     The example can also be converted to use the alternative
     USB serial example at apps/examples/usbterm by changing the 
diff --git a/configs/stm3210e-eval/RIDE/defconfig b/configs/stm3210e-eval/RIDE/defconfig
index 8922e584e1c..f91c1c1451a 100755
--- a/configs/stm3210e-eval/RIDE/defconfig
+++ b/configs/stm3210e-eval/RIDE/defconfig
@@ -649,38 +649,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/stm3210e-eval/buttons/defconfig b/configs/stm3210e-eval/buttons/defconfig
index d311435e31f..ed0ffaacd80 100644
--- a/configs/stm3210e-eval/buttons/defconfig
+++ b/configs/stm3210e-eval/buttons/defconfig
@@ -662,38 +662,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/stm3210e-eval/nsh/defconfig b/configs/stm3210e-eval/nsh/defconfig
index 6b32d2094b3..826e2ad52d7 100755
--- a/configs/stm3210e-eval/nsh/defconfig
+++ b/configs/stm3210e-eval/nsh/defconfig
@@ -665,38 +665,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig
index 48081b0d302..2a97d499bda 100644
--- a/configs/stm3210e-eval/nsh2/defconfig
+++ b/configs/stm3210e-eval/nsh2/defconfig
@@ -697,111 +697,111 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB serial device class driver (Standard CDC ACM class)
 #
-# CONFIG_CDCSER
+# CONFIG_CDCACM
 #   Enable compilation of the USB serial driver
-# CONFIG_CDCSER_COMPOSITE
+# CONFIG_CDCACM_COMPOSITE
 #   Configure the CDC serial driver as part of a composite driver
 #   (only if CONFIG_USBDEV_COMPOSITE is also defined)
-# CONFIG_CDCSER_EP0MAXPACKET
+# CONFIG_CDCACM_EP0MAXPACKET
 #   Endpoint 0 max packet size. Default 64
-# CONFIG_CDCSER_EPINTIN
+# CONFIG_CDCACM_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation.  Default 2.
-# CONFIG_CDCSER_EPINTIN_FSSIZE
+# CONFIG_CDCACM_EPINTIN_FSSIZE
 #   Max package size for the interrupt IN endpoint if full speed mode.
 #   Default 64.
-# CONFIG_CDCSER_EPINTIN_HSSIZE
+# CONFIG_CDCACM_EPINTIN_HSSIZE
 #   Max package size for the interrupt IN endpoint if high speed mode.
 #   Default 64
-# CONFIG_CDCSER_EPBULKOUT
+# CONFIG_CDCACM_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_CDCSER_EPBULKOUT_FSSIZE
+# CONFIG_CDCACM_EPBULKOUT_FSSIZE
 #   Max package size for the bulk OUT endpoint if full speed mode.
 #   Default 64.
-# CONFIG_CDCSER_EPBULKOUT_HSSIZE
+# CONFIG_CDCACM_EPBULKOUT_HSSIZE
 #   Max package size for the bulk OUT  endpoint if high speed mode.
 #   Default 512.
-# CONFIG_CDCSER_EPBULKIN
+# CONFIG_CDCACM_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_CDCSER_EPBULKIN_FSSIZE
+# CONFIG_CDCACM_EPBULKIN_FSSIZE
 #   Max package size for the bulk IN endpoint if full speed mode.
 #   Default 64.
-# CONFIG_CDCSER_EPBULKIN_HSSIZE
+# CONFIG_CDCACM_EPBULKIN_HSSIZE
 #   Max package size for the bulk IN  endpoint if high speed mode.
 #   Default 512.
-# CONFIG_CDCSER_NWRREQS and CONFIG_CDCSER_NRDREQS
+# CONFIG_CDCACM_NWRREQS and CONFIG_CDCACM_NRDREQS
 #   The number of write/read requests that can be in flight.
 #   Default 256.
-# CONFIG_CDCSER_VENDORID and CONFIG_CDCSER_VENDORSTR
+# CONFIG_CDCACM_VENDORID and CONFIG_CDCACM_VENDORSTR
 #   The vendor ID code/string.  Default 0x0525 and "NuttX"
 #   0x0525 is the Netchip vendor and should not be used in any
 #   products.  This default VID was selected for compatibility with
 #   the Linux CDC ACM default VID.
-# CONFIG_CDCSER_PRODUCTID and CONFIG_CDCSER_PRODUCTSTR
+# CONFIG_CDCACM_PRODUCTID and CONFIG_CDCACM_PRODUCTSTR
 #   The product ID code/string. Default 0xara7 and "CDC/ACM Serial"
 #   0xa4a7 was selected for compatibility with the Linux CDC ACM
 #   default PID.
-# CONFIG_CDCSER_RXBUFSIZE and CONFIG_CDCSER_TXBUFSIZE
+# CONFIG_CDCACM_RXBUFSIZE and CONFIG_CDCACM_TXBUFSIZE
 #   Size of the serial receive/transmit buffers. Default 256.
 #
-CONFIG_CDCSER=n
-CONFIG_CDCSER_COMPOSITE=y
-#CONFIG_CDCSER_EP0MAXPACKET
-#CONFIG_CDCSER_EPINTIN
-#CONFIG_CDCSER_EPINTIN_FSSIZE
-#CONFIG_CDCSER_EPINTIN_HSSIZE
-#CONFIG_CDCSER_EPBULKOUT
-#CONFIG_CDCSER_EPBULKOUT_FSSIZE
-#CONFIG_CDCSER_EPBULKOUT_HSSIZE
-#CONFIG_CDCSER_EPBULKIN
-#CONFIG_CDCSER_EPBULKIN_FSSIZE
-#CONFIG_CDCSER_EPBULKIN_HSSIZE
-#CONFIG_CDCSER_NWRREQS
-#CONFIG_CDCSER_NRDREQS
-#CONFIG_CDCSER_VENDORID
-#CONFIG_CDCSER_VENDORSTR
-#CONFIG_CDCSER_PRODUCTID
-#CONFIG_CDCSER_PRODUCTSTR
-#CONFIG_CDCSER_RXBUFSIZE
-#CONFIG_CDCSER_TXBUFSIZE
+CONFIG_CDCACM=n
+CONFIG_CDCACM_COMPOSITE=y
+#CONFIG_CDCACM_EP0MAXPACKET
+#CONFIG_CDCACM_EPINTIN
+#CONFIG_CDCACM_EPINTIN_FSSIZE
+#CONFIG_CDCACM_EPINTIN_HSSIZE
+#CONFIG_CDCACM_EPBULKOUT
+#CONFIG_CDCACM_EPBULKOUT_FSSIZE
+#CONFIG_CDCACM_EPBULKOUT_HSSIZE
+#CONFIG_CDCACM_EPBULKIN
+#CONFIG_CDCACM_EPBULKIN_FSSIZE
+#CONFIG_CDCACM_EPBULKIN_HSSIZE
+#CONFIG_CDCACM_NWRREQS
+#CONFIG_CDCACM_NRDREQS
+#CONFIG_CDCACM_VENDORID
+#CONFIG_CDCACM_VENDORSTR
+#CONFIG_CDCACM_PRODUCTID
+#CONFIG_CDCACM_PRODUCTSTR
+#CONFIG_CDCACM_RXBUFSIZE
+#CONFIG_CDCACM_TXBUFSIZE
 #
 # USB Storage Device Configuration
 #
diff --git a/configs/stm3210e-eval/nx/defconfig b/configs/stm3210e-eval/nx/defconfig
index 9970b27a590..3378a4a24b2 100644
--- a/configs/stm3210e-eval/nx/defconfig
+++ b/configs/stm3210e-eval/nx/defconfig
@@ -681,38 +681,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/stm3210e-eval/nxlines/defconfig b/configs/stm3210e-eval/nxlines/defconfig
index f21b4fbefc9..e15782a914c 100644
--- a/configs/stm3210e-eval/nxlines/defconfig
+++ b/configs/stm3210e-eval/nxlines/defconfig
@@ -681,38 +681,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/stm3210e-eval/nxtext/defconfig b/configs/stm3210e-eval/nxtext/defconfig
index 036c73ac3f7..9484f3773cc 100644
--- a/configs/stm3210e-eval/nxtext/defconfig
+++ b/configs/stm3210e-eval/nxtext/defconfig
@@ -681,38 +681,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/stm3210e-eval/ostest/defconfig b/configs/stm3210e-eval/ostest/defconfig
index ca1ea021a4e..a8d3bcb82d1 100755
--- a/configs/stm3210e-eval/ostest/defconfig
+++ b/configs/stm3210e-eval/ostest/defconfig
@@ -685,38 +685,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/stm3210e-eval/usbserial/defconfig b/configs/stm3210e-eval/usbserial/defconfig
index a6ebfe75687..aa8f76adfd2 100755
--- a/configs/stm3210e-eval/usbserial/defconfig
+++ b/configs/stm3210e-eval/usbserial/defconfig
@@ -663,111 +663,111 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration (Prolific PL2303 Emulation)
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=y
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=y
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB serial device class driver (Standard CDC ACM class)
 #
-# CONFIG_CDCSER
+# CONFIG_CDCACM
 #   Enable compilation of the USB serial driver
-# CONFIG_CDCSER_COMPOSITE
+# CONFIG_CDCACM_COMPOSITE
 #   Configure the CDC serial driver as part of a composite driver
 #   (only if CONFIG_USBDEV_COMPOSITE is also defined)
-# CONFIG_CDCSER_EP0MAXPACKET
+# CONFIG_CDCACM_EP0MAXPACKET
 #   Endpoint 0 max packet size. Default 64
-# CONFIG_CDCSER_EPINTIN
+# CONFIG_CDCACM_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation.  Default 2.
-# CONFIG_CDCSER_EPINTIN_FSSIZE
+# CONFIG_CDCACM_EPINTIN_FSSIZE
 #   Max package size for the interrupt IN endpoint if full speed mode.
 #   Default 64.
-# CONFIG_CDCSER_EPINTIN_HSSIZE
+# CONFIG_CDCACM_EPINTIN_HSSIZE
 #   Max package size for the interrupt IN endpoint if high speed mode.
 #   Default 64
-# CONFIG_CDCSER_EPBULKOUT
+# CONFIG_CDCACM_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_CDCSER_EPBULKOUT_FSSIZE
+# CONFIG_CDCACM_EPBULKOUT_FSSIZE
 #   Max package size for the bulk OUT endpoint if full speed mode.
 #   Default 64.
-# CONFIG_CDCSER_EPBULKOUT_HSSIZE
+# CONFIG_CDCACM_EPBULKOUT_HSSIZE
 #   Max package size for the bulk OUT  endpoint if high speed mode.
 #   Default 512.
-# CONFIG_CDCSER_EPBULKIN
+# CONFIG_CDCACM_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_CDCSER_EPBULKIN_FSSIZE
+# CONFIG_CDCACM_EPBULKIN_FSSIZE
 #   Max package size for the bulk IN endpoint if full speed mode.
 #   Default 64.
-# CONFIG_CDCSER_EPBULKIN_HSSIZE
+# CONFIG_CDCACM_EPBULKIN_HSSIZE
 #   Max package size for the bulk IN  endpoint if high speed mode.
 #   Default 512.
-# CONFIG_CDCSER_NWRREQS and CONFIG_CDCSER_NRDREQS
+# CONFIG_CDCACM_NWRREQS and CONFIG_CDCACM_NRDREQS
 #   The number of write/read requests that can be in flight.
 #   Default 256.
-# CONFIG_CDCSER_VENDORID and CONFIG_CDCSER_VENDORSTR
+# CONFIG_CDCACM_VENDORID and CONFIG_CDCACM_VENDORSTR
 #   The vendor ID code/string.  Default 0x0525 and "NuttX"
 #   0x0525 is the Netchip vendor and should not be used in any
 #   products.  This default VID was selected for compatibility with
 #   the Linux CDC ACM default VID.
-# CONFIG_CDCSER_PRODUCTID and CONFIG_CDCSER_PRODUCTSTR
+# CONFIG_CDCACM_PRODUCTID and CONFIG_CDCACM_PRODUCTSTR
 #   The product ID code/string. Default 0xara7 and "CDC/ACM Serial"
 #   0xa4a7 was selected for compatibility with the Linux CDC ACM
 #   default PID.
-# CONFIG_CDCSER_RXBUFSIZE and CONFIG_CDCSER_TXBUFSIZE
+# CONFIG_CDCACM_RXBUFSIZE and CONFIG_CDCACM_TXBUFSIZE
 #   Size of the serial receive/transmit buffers. Default 256.
 #
-CONFIG_CDCSER=n
-CONFIG_CDCSER_COMPOSITE=y
-#CONFIG_CDCSER_EP0MAXPACKET
-#CONFIG_CDCSER_EPINTIN
-#CONFIG_CDCSER_EPINTIN_FSSIZE
-#CONFIG_CDCSER_EPINTIN_HSSIZE
-#CONFIG_CDCSER_EPBULKOUT
-#CONFIG_CDCSER_EPBULKOUT_FSSIZE
-#CONFIG_CDCSER_EPBULKOUT_HSSIZE
-#CONFIG_CDCSER_EPBULKIN
-#CONFIG_CDCSER_EPBULKIN_FSSIZE
-#CONFIG_CDCSER_EPBULKIN_HSSIZE
-#CONFIG_CDCSER_NWRREQS
-#CONFIG_CDCSER_NRDREQS
-#CONFIG_CDCSER_VENDORID
-#CONFIG_CDCSER_VENDORSTR
-#CONFIG_CDCSER_PRODUCTID
-#CONFIG_CDCSER_PRODUCTSTR
-#CONFIG_CDCSER_RXBUFSIZE
-#CONFIG_CDCSER_TXBUFSIZE
+CONFIG_CDCACM=n
+CONFIG_CDCACM_COMPOSITE=y
+#CONFIG_CDCACM_EP0MAXPACKET
+#CONFIG_CDCACM_EPINTIN
+#CONFIG_CDCACM_EPINTIN_FSSIZE
+#CONFIG_CDCACM_EPINTIN_HSSIZE
+#CONFIG_CDCACM_EPBULKOUT
+#CONFIG_CDCACM_EPBULKOUT_FSSIZE
+#CONFIG_CDCACM_EPBULKOUT_HSSIZE
+#CONFIG_CDCACM_EPBULKIN
+#CONFIG_CDCACM_EPBULKIN_FSSIZE
+#CONFIG_CDCACM_EPBULKIN_HSSIZE
+#CONFIG_CDCACM_NWRREQS
+#CONFIG_CDCACM_NRDREQS
+#CONFIG_CDCACM_VENDORID
+#CONFIG_CDCACM_VENDORSTR
+#CONFIG_CDCACM_PRODUCTID
+#CONFIG_CDCACM_PRODUCTSTR
+#CONFIG_CDCACM_RXBUFSIZE
+#CONFIG_CDCACM_TXBUFSIZE
 
 # USB Storage Device Configuration
 #
diff --git a/configs/stm3210e-eval/usbstorage/defconfig b/configs/stm3210e-eval/usbstorage/defconfig
index ad082b9d6bc..53f09060cd5 100755
--- a/configs/stm3210e-eval/usbstorage/defconfig
+++ b/configs/stm3210e-eval/usbstorage/defconfig
@@ -672,38 +672,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/stm3240g-eval/dhcpd/defconfig b/configs/stm3240g-eval/dhcpd/defconfig
index 0a54d9bfb9e..a0f42c3c814 100755
--- a/configs/stm3240g-eval/dhcpd/defconfig
+++ b/configs/stm3240g-eval/dhcpd/defconfig
@@ -857,38 +857,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/stm3240g-eval/nettest/defconfig b/configs/stm3240g-eval/nettest/defconfig
index 4c1e892056e..46b537bde48 100755
--- a/configs/stm3240g-eval/nettest/defconfig
+++ b/configs/stm3240g-eval/nettest/defconfig
@@ -857,38 +857,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/stm3240g-eval/nsh/defconfig b/configs/stm3240g-eval/nsh/defconfig
index 202d3e34c88..60b1204ef9a 100755
--- a/configs/stm3240g-eval/nsh/defconfig
+++ b/configs/stm3240g-eval/nsh/defconfig
@@ -902,38 +902,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/stm3240g-eval/ostest/defconfig b/configs/stm3240g-eval/ostest/defconfig
index 502dacde7a2..52e20379854 100755
--- a/configs/stm3240g-eval/ostest/defconfig
+++ b/configs/stm3240g-eval/ostest/defconfig
@@ -819,38 +819,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/stm32f4discovery/nsh/defconfig b/configs/stm32f4discovery/nsh/defconfig
index 6b46e992e50..bfa6f8df656 100755
--- a/configs/stm32f4discovery/nsh/defconfig
+++ b/configs/stm32f4discovery/nsh/defconfig
@@ -856,38 +856,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/stm32f4discovery/ostest/defconfig b/configs/stm32f4discovery/ostest/defconfig
index 2aed2d64040..c28ebaa61ee 100755
--- a/configs/stm32f4discovery/ostest/defconfig
+++ b/configs/stm32f4discovery/ostest/defconfig
@@ -809,38 +809,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/sure-pic32mx/nsh/defconfig b/configs/sure-pic32mx/nsh/defconfig
index 1b214cee693..7c40c0ee896 100644
--- a/configs/sure-pic32mx/nsh/defconfig
+++ b/configs/sure-pic32mx/nsh/defconfig
@@ -673,107 +673,107 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB serial device class driver (Standard CDC ACM class)
 #
-# CONFIG_CDCSER
+# CONFIG_CDCACM
 #   Enable compilation of the USB serial driver
-# CONFIG_CDCSER_EP0MAXPACKET
+# CONFIG_CDCACM_EP0MAXPACKET
 #   Endpoint 0 max packet size. Default 64
-# CONFIG_CDCSER_EPINTIN
+# CONFIG_CDCACM_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation.  Default 2.
-# CONFIG_CDCSER_EPINTIN_FSSIZE
+# CONFIG_CDCACM_EPINTIN_FSSIZE
 #   Max package size for the interrupt IN endpoint if full speed mode.
 #   Default 64.
-# CONFIG_CDCSER_EPINTIN_HSSIZE
+# CONFIG_CDCACM_EPINTIN_HSSIZE
 #   Max package size for the interrupt IN endpoint if high speed mode.
 #   Default 64
-# CONFIG_CDCSER_EPBULKOUT
+# CONFIG_CDCACM_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_CDCSER_EPBULKOUT_FSSIZE
+# CONFIG_CDCACM_EPBULKOUT_FSSIZE
 #   Max package size for the bulk OUT endpoint if full speed mode.
 #   Default 64.
-# CONFIG_CDCSER_EPBULKOUT_HSSIZE
+# CONFIG_CDCACM_EPBULKOUT_HSSIZE
 #   Max package size for the bulk OUT  endpoint if high speed mode.
 #   Default 512.
-# CONFIG_CDCSER_EPBULKIN
+# CONFIG_CDCACM_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_CDCSER_EPBULKIN_FSSIZE
+# CONFIG_CDCACM_EPBULKIN_FSSIZE
 #   Max package size for the bulk IN endpoint if full speed mode.
 #   Default 64.
-# CONFIG_CDCSER_EPBULKIN_HSSIZE
+# CONFIG_CDCACM_EPBULKIN_HSSIZE
 #   Max package size for the bulk IN  endpoint if high speed mode.
 #   Default 512.
-# CONFIG_CDCSER_NWRREQS and CONFIG_CDCSER_NRDREQS
+# CONFIG_CDCACM_NWRREQS and CONFIG_CDCACM_NRDREQS
 #   The number of write/read requests that can be in flight.
 #   Default 256.
-# CONFIG_CDCSER_VENDORID and CONFIG_CDCSER_VENDORSTR
+# CONFIG_CDCACM_VENDORID and CONFIG_CDCACM_VENDORSTR
 #   The vendor ID code/string.  Default 0x0525 and "NuttX"
 #   0x0525 is the Netchip vendor and should not be used in any
 #   products.  This default VID was selected for compatibility with
 #   the Linux CDC ACM default VID.
-# CONFIG_CDCSER_PRODUCTID and CONFIG_CDCSER_PRODUCTSTR
+# CONFIG_CDCACM_PRODUCTID and CONFIG_CDCACM_PRODUCTSTR
 #   The product ID code/string. Default 0xara7 and "CDC/ACM Serial"
 #   0xa4a7 was selected for compatibility with the Linux CDC ACM
 #   default PID.
-# CONFIG_CDCSER_RXBUFSIZE and CONFIG_CDCSER_TXBUFSIZE
+# CONFIG_CDCACM_RXBUFSIZE and CONFIG_CDCACM_TXBUFSIZE
 #   Size of the serial receive/transmit buffers. Default 256.
 #
-CONFIG_CDCSER=n
-#CONFIG_CDCSER_EP0MAXPACKET
-#CONFIG_CDCSER_EPINTIN
-#CONFIG_CDCSER_EPINTIN_FSSIZE
-#CONFIG_CDCSER_EPINTIN_HSSIZE
-#CONFIG_CDCSER_EPBULKOUT
-#CONFIG_CDCSER_EPBULKOUT_FSSIZE
-#CONFIG_CDCSER_EPBULKOUT_HSSIZE
-#CONFIG_CDCSER_EPBULKIN
-#CONFIG_CDCSER_EPBULKIN_FSSIZE
-#CONFIG_CDCSER_EPBULKIN_HSSIZE
-#CONFIG_CDCSER_NWRREQS
-#CONFIG_CDCSER_NRDREQS
-#CONFIG_CDCSER_VENDORID
-#CONFIG_CDCSER_VENDORSTR
-#CONFIG_CDCSER_PRODUCTID
-#CONFIG_CDCSER_PRODUCTSTR
-#CONFIG_CDCSER_RXBUFSIZE
-#CONFIG_CDCSER_TXBUFSIZE
+CONFIG_CDCACM=n
+#CONFIG_CDCACM_EP0MAXPACKET
+#CONFIG_CDCACM_EPINTIN
+#CONFIG_CDCACM_EPINTIN_FSSIZE
+#CONFIG_CDCACM_EPINTIN_HSSIZE
+#CONFIG_CDCACM_EPBULKOUT
+#CONFIG_CDCACM_EPBULKOUT_FSSIZE
+#CONFIG_CDCACM_EPBULKOUT_HSSIZE
+#CONFIG_CDCACM_EPBULKIN
+#CONFIG_CDCACM_EPBULKIN_FSSIZE
+#CONFIG_CDCACM_EPBULKIN_HSSIZE
+#CONFIG_CDCACM_NWRREQS
+#CONFIG_CDCACM_NRDREQS
+#CONFIG_CDCACM_VENDORID
+#CONFIG_CDCACM_VENDORSTR
+#CONFIG_CDCACM_PRODUCTID
+#CONFIG_CDCACM_PRODUCTSTR
+#CONFIG_CDCACM_RXBUFSIZE
+#CONFIG_CDCACM_TXBUFSIZE
 
 #
 # USB Storage Device Configuration
diff --git a/configs/sure-pic32mx/ostest/defconfig b/configs/sure-pic32mx/ostest/defconfig
index 3e968210031..63b4c4ed2ef 100644
--- a/configs/sure-pic32mx/ostest/defconfig
+++ b/configs/sure-pic32mx/ostest/defconfig
@@ -614,38 +614,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/teensy/hello/defconfig b/configs/teensy/hello/defconfig
index 22eb080c4ea..99f7232e9a1 100644
--- a/configs/teensy/hello/defconfig
+++ b/configs/teensy/hello/defconfig
@@ -536,38 +536,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/teensy/nsh/defconfig b/configs/teensy/nsh/defconfig
index 40bd7d721e7..745860dfb40 100755
--- a/configs/teensy/nsh/defconfig
+++ b/configs/teensy/nsh/defconfig
@@ -565,38 +565,38 @@ CONFIG_USBHOST_ISOC_DISABLE=y
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/teensy/usbstorage/defconfig b/configs/teensy/usbstorage/defconfig
index 75d92a06c5d..c9521c3b7e2 100755
--- a/configs/teensy/usbstorage/defconfig
+++ b/configs/teensy/usbstorage/defconfig
@@ -569,38 +569,38 @@ CONFIG_USBHOST_ISOC_DISABLE=y
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/twr-k60n512/nsh/defconfig b/configs/twr-k60n512/nsh/defconfig
index c5fcce6c6f1..0dab4d4c6c8 100644
--- a/configs/twr-k60n512/nsh/defconfig
+++ b/configs/twr-k60n512/nsh/defconfig
@@ -699,38 +699,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/twr-k60n512/ostest/defconfig b/configs/twr-k60n512/ostest/defconfig
index 7b100817261..4b2cf9a10a5 100644
--- a/configs/twr-k60n512/ostest/defconfig
+++ b/configs/twr-k60n512/ostest/defconfig
@@ -697,38 +697,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/us7032evb1/nsh/defconfig b/configs/us7032evb1/nsh/defconfig
index 31ac3eccabb..76495ade01e 100644
--- a/configs/us7032evb1/nsh/defconfig
+++ b/configs/us7032evb1/nsh/defconfig
@@ -439,37 +439,37 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/us7032evb1/ostest/defconfig b/configs/us7032evb1/ostest/defconfig
index bc9c2052552..397a80690b5 100644
--- a/configs/us7032evb1/ostest/defconfig
+++ b/configs/us7032evb1/ostest/defconfig
@@ -439,37 +439,37 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=5
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=5
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/configs/vsn/nsh/defconfig b/configs/vsn/nsh/defconfig
index 9d21c4b8645..f06b915657e 100755
--- a/configs/vsn/nsh/defconfig
+++ b/configs/vsn/nsh/defconfig
@@ -663,38 +663,38 @@ CONFIG_USBDEV_TRACE_NRECORDS=128
 #
 # USB Serial Device Configuration
 #
-# CONFIG_USBSER
+# CONFIG_PL2303
 #   Enable compilation of the USB serial driver
-# CONFIG_USBSER_EPINTIN
+# CONFIG_PL2303_EPINTIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   interrupt IN operation
-# CONFIG_USBSER_EPBULKOUT
+# CONFIG_PL2303_EPBULKOUT
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk OUT operation
-# CONFIG_USBSER_EPBULKIN
+# CONFIG_PL2303_EPBULKIN
 #   The logical 7-bit address of a hardware endpoint that supports
 #   bulk IN operation
-# # CONFIG_USBSER_NWRREQS and CONFIG_USBSER_NRDREQS
+# # CONFIG_PL2303_NWRREQS and CONFIG_PL2303_NRDREQS
 #   The number of write/read requests that can be in flight
-# CONFIG_USBSER_VENDORID and CONFIG_USBSER_VENDORSTR
+# CONFIG_PL2303_VENDORID and CONFIG_PL2303_VENDORSTR
 #   The vendor ID code/string
-# CONFIG_USBSER_PRODUCTID and CONFIG_USBSER_PRODUCTSTR
+# CONFIG_PL2303_PRODUCTID and CONFIG_PL2303_PRODUCTSTR
 #   The product ID code/string
-# CONFIG_USBSER_RXBUFSIZE and CONFIG_USBSER_TXBUFSIZE
+# CONFIG_PL2303_RXBUFSIZE and CONFIG_PL2303_TXBUFSIZE
 #   Size of the serial receive/transmit buffers
 #
-CONFIG_USBSER=n
-CONFIG_USBSER_EPINTIN=1
-CONFIG_USBSER_EPBULKOUT=2
-CONFIG_USBSER_EPBULKIN=3
-CONFIG_USBSER_NWRREQS=4
-CONFIG_USBSER_NRDREQS=4
-CONFIG_USBSER_VENDORID=0x067b
-CONFIG_USBSER_PRODUCTID=0x2303
-CONFIG_USBSER_VENDORSTR="Nuttx"
-CONFIG_USBSER_PRODUCTSTR="USBdev Serial"
-CONFIG_USBSER_RXBUFSIZE=512
-CONFIG_USBSER_TXBUFSIZE=512
+CONFIG_PL2303=n
+CONFIG_PL2303_EPINTIN=1
+CONFIG_PL2303_EPBULKOUT=2
+CONFIG_PL2303_EPBULKIN=3
+CONFIG_PL2303_NWRREQS=4
+CONFIG_PL2303_NRDREQS=4
+CONFIG_PL2303_VENDORID=0x067b
+CONFIG_PL2303_PRODUCTID=0x2303
+CONFIG_PL2303_VENDORSTR="Nuttx"
+CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
+CONFIG_PL2303_RXBUFSIZE=512
+CONFIG_PL2303_TXBUFSIZE=512
 
 #
 # USB Storage Device Configuration
diff --git a/drivers/usbdev/Make.defs b/drivers/usbdev/Make.defs
index 66c3b3dd58b..d5b56683e9b 100644
--- a/drivers/usbdev/Make.defs
+++ b/drivers/usbdev/Make.defs
@@ -37,11 +37,11 @@ ifeq ($(CONFIG_USBDEV),y)
 
 # Include USB device drivers
 
-ifeq ($(CONFIG_USBSER),y)
+ifeq ($(CONFIG_PL2303),y)
   CSRCS += pl2303.c
 endif
 
-ifeq ($(CONFIG_CDCSER),y)
+ifeq ($(CONFIG_CDCACM),y)
   CSRCS += cdcacm.c cdcacm_descriptors.c
 endif
 
diff --git a/drivers/usbdev/cdcacm.c b/drivers/usbdev/cdcacm.c
index aeea60ce806..021136f90a1 100644
--- a/drivers/usbdev/cdcacm.c
+++ b/drivers/usbdev/cdcacm.c
@@ -58,7 +58,7 @@
 #include <nuttx/usb/usb.h>
 #include <nuttx/usb/cdc.h>
 #include <nuttx/usb/usbdev.h>
-#include <nuttx/usb/cdc_serial.h>
+#include <nuttx/usb/cdcacm.h>
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "cdcacm.h"
@@ -73,15 +73,15 @@
 
 /* Container to support a list of requests */
 
-struct cdcser_req_s
+struct cdcacm_req_s
 {
-  FAR struct cdcser_req_s *flink;      /* Implements a singly linked list */
+  FAR struct cdcacm_req_s *flink;      /* Implements a singly linked list */
   FAR struct usbdev_req_s *req;        /* The contained request */
 };
 
 /* This structure describes the internal state of the driver */
 
-struct cdcser_dev_s
+struct cdcacm_dev_s
 {
   FAR struct uart_dev_s    serdev;     /* Serial device structure */
   FAR struct usbdev_s     *usbdev;     /* usbdev driver pointer */
@@ -94,7 +94,7 @@ struct cdcser_dev_s
 
   uint8_t                  ctrlline;   /* Buffered control line state */
   struct cdc_linecoding_s  linecoding; /* Buffered line status */
-  cdcser_callback_t        callback;   /* Serial event callback function */
+  cdcacm_callback_t        callback;   /* Serial event callback function */
 
   FAR struct usbdev_ep_s  *epintin;    /* Interrupt IN endpoint structure */
   FAR struct usbdev_ep_s  *epbulkin;   /* Bulk IN endpoint structure */
@@ -107,29 +107,29 @@ struct cdcser_dev_s
    * EPBULKIN; Read requests will be queued in the EBULKOUT.
    */
 
-  struct cdcser_req_s wrreqs[CONFIG_CDCSER_NWRREQS];
-  struct cdcser_req_s rdreqs[CONFIG_CDCSER_NWRREQS];
+  struct cdcacm_req_s wrreqs[CONFIG_CDCACM_NWRREQS];
+  struct cdcacm_req_s rdreqs[CONFIG_CDCACM_NWRREQS];
 
   /* Serial I/O buffers */
 
-  char rxbuffer[CONFIG_CDCSER_RXBUFSIZE];
-  char txbuffer[CONFIG_CDCSER_TXBUFSIZE];
+  char rxbuffer[CONFIG_CDCACM_RXBUFSIZE];
+  char txbuffer[CONFIG_CDCACM_TXBUFSIZE];
 };
 
 /* The internal version of the class driver */
 
-struct cdcser_driver_s
+struct cdcacm_driver_s
 {
   struct usbdevclass_driver_s drvr;
-  FAR struct cdcser_dev_s     *dev;
+  FAR struct cdcacm_dev_s     *dev;
 };
 
 /* This is what is allocated */
 
-struct cdcser_alloc_s
+struct cdcacm_alloc_s
 {
-  struct cdcser_dev_s    dev;
-  struct cdcser_driver_s drvr;
+  struct cdcacm_dev_s    dev;
+  struct cdcacm_driver_s drvr;
 };
 
 /****************************************************************************
@@ -138,46 +138,46 @@ struct cdcser_alloc_s
 
 /* Transfer helpers *********************************************************/
 
-static uint16_t cdcser_fillrequest(FAR struct cdcser_dev_s *priv,
+static uint16_t cdcacm_fillrequest(FAR struct cdcacm_dev_s *priv,
                  uint8_t *reqbuf, uint16_t reqlen);
-static int     cdcser_sndpacket(FAR struct cdcser_dev_s *priv);
-static inline int cdcser_recvpacket(FAR struct cdcser_dev_s *priv,
+static int     cdcacm_sndpacket(FAR struct cdcacm_dev_s *priv);
+static inline int cdcacm_recvpacket(FAR struct cdcacm_dev_s *priv,
                  uint8_t *reqbuf, uint16_t reqlen);
 
 /* Request helpers *********************************************************/
 
-static struct usbdev_req_s *cdcser_allocreq(FAR struct usbdev_ep_s *ep,
+static struct usbdev_req_s *cdcacm_allocreq(FAR struct usbdev_ep_s *ep,
                  uint16_t len);
-static void    cdcser_freereq(FAR struct usbdev_ep_s *ep,
+static void    cdcacm_freereq(FAR struct usbdev_ep_s *ep,
                  FAR struct usbdev_req_s *req);
 
 /* Configuration ***********************************************************/
 
-static void    cdcser_resetconfig(FAR struct cdcser_dev_s *priv);
+static void    cdcacm_resetconfig(FAR struct cdcacm_dev_s *priv);
 #ifdef CONFIG_USBDEV_DUALSPEED
-static int     cdcser_epconfigure(FAR struct usbdev_ep_s *ep,
-                 enum cdcser_epdesc_e epid, uint16_t mxpacket, bool last);
+static int     cdcacm_epconfigure(FAR struct usbdev_ep_s *ep,
+                 enum cdcacm_epdesc_e epid, uint16_t mxpacket, bool last);
 #endif
-static int     cdcser_setconfig(FAR struct cdcser_dev_s *priv,
+static int     cdcacm_setconfig(FAR struct cdcacm_dev_s *priv,
                  uint8_t config);
 
 /* Completion event handlers ***********************************************/
 
-static void    cdcser_ep0incomplete(FAR struct usbdev_ep_s *ep,
+static void    cdcacm_ep0incomplete(FAR struct usbdev_ep_s *ep,
                  FAR struct usbdev_req_s *req);
-static void    cdcser_rdcomplete(FAR struct usbdev_ep_s *ep,
+static void    cdcacm_rdcomplete(FAR struct usbdev_ep_s *ep,
                  FAR struct usbdev_req_s *req);
-static void    cdcser_wrcomplete(FAR struct usbdev_ep_s *ep,
+static void    cdcacm_wrcomplete(FAR struct usbdev_ep_s *ep,
                  FAR struct usbdev_req_s *req);
 
 /* USB class device ********************************************************/
 
-static int     cdcser_bind(FAR struct usbdev_s *dev,
+static int     cdcacm_bind(FAR struct usbdev_s *dev,
                  FAR struct usbdevclass_driver_s *driver);
-static void    cdcser_unbind(FAR struct usbdev_s *dev);
-static int     cdcser_setup(FAR struct usbdev_s *dev,
+static void    cdcacm_unbind(FAR struct usbdev_s *dev);
+static int     cdcacm_setup(FAR struct usbdev_s *dev,
                  const struct usb_ctrlreq_s *ctrl);
-static void    cdcser_disconnect(FAR struct usbdev_s *dev);
+static void    cdcacm_disconnect(FAR struct usbdev_s *dev);
 
 /* UART Operationt **********************************************************/
 
@@ -197,10 +197,10 @@ static bool    cdcuart_txempty(FAR struct uart_dev_s *dev);
 
 static const struct usbdevclass_driverops_s g_driverops =
 {
-  cdcser_bind,          /* bind */
-  cdcser_unbind,        /* unbind */
-  cdcser_setup,         /* setup */
-  cdcser_disconnect,    /* disconnect */
+  cdcacm_bind,          /* bind */
+  cdcacm_unbind,        /* unbind */
+  cdcacm_setup,         /* setup */
+  cdcacm_disconnect,    /* disconnect */
   NULL,                 /* suspend */
   NULL,                 /* resume */
 };
@@ -228,7 +228,7 @@ static const struct uart_ops_s g_uartops =
  ****************************************************************************/
 
 /****************************************************************************
- * Name: cdcser_fillrequest
+ * Name: cdcacm_fillrequest
  *
  * Description:
  *   If there is data to send it is copied to the given buffer.  Called
@@ -243,7 +243,7 @@ static const struct uart_ops_s g_uartops =
  *
  ****************************************************************************/
 
-static uint16_t cdcser_fillrequest(FAR struct cdcser_dev_s *priv, uint8_t *reqbuf,
+static uint16_t cdcacm_fillrequest(FAR struct cdcacm_dev_s *priv, uint8_t *reqbuf,
                                    uint16_t reqlen)
 {
   FAR uart_dev_t *serdev = &priv->serdev;
@@ -293,7 +293,7 @@ static uint16_t cdcser_fillrequest(FAR struct cdcser_dev_s *priv, uint8_t *reqbu
 }
 
 /****************************************************************************
- * Name: cdcser_sndpacket
+ * Name: cdcacm_sndpacket
  *
  * Description:
  *   This function obtains write requests, transfers the TX data into the
@@ -303,11 +303,11 @@ static uint16_t cdcser_fillrequest(FAR struct cdcser_dev_s *priv, uint8_t *reqbu
  *
  ****************************************************************************/
 
-static int cdcser_sndpacket(FAR struct cdcser_dev_s *priv)
+static int cdcacm_sndpacket(FAR struct cdcacm_dev_s *priv)
 {
   FAR struct usbdev_ep_s *ep;
   FAR struct usbdev_req_s *req;
-  FAR struct cdcser_req_s *reqcontainer;
+  FAR struct cdcacm_req_s *reqcontainer;
   irqstate_t flags;
   int len;
   int ret = OK;
@@ -326,7 +326,7 @@ static int cdcser_sndpacket(FAR struct cdcser_dev_s *priv)
 
   ep = priv->epbulkin;
 
-  /* Loop until either (1) we run out or write requests, or (2) cdcser_fillrequest()
+  /* Loop until either (1) we run out or write requests, or (2) cdcacm_fillrequest()
    * is unable to fill the request with data (i.e., untilthere is no more data
    * to be sent).
    */
@@ -339,12 +339,12 @@ static int cdcser_sndpacket(FAR struct cdcser_dev_s *priv)
     {
       /* Peek at the request in the container at the head of the list */
 
-      reqcontainer = (struct cdcser_req_s *)sq_peek(&priv->reqlist);
+      reqcontainer = (struct cdcacm_req_s *)sq_peek(&priv->reqlist);
       req          = reqcontainer->req;
 
       /* Fill the request with serial TX data */
 
-      len = cdcser_fillrequest(priv, req->buf, req->len);
+      len = cdcacm_fillrequest(priv, req->buf, req->len);
       if (len > 0)
         {
           /* Remove the empty container from the request list */
@@ -375,7 +375,7 @@ static int cdcser_sndpacket(FAR struct cdcser_dev_s *priv)
 }
 
 /****************************************************************************
- * Name: cdcser_recvpacket
+ * Name: cdcacm_recvpacket
  *
  * Description:
  *   A normal completion event was received by the read completion handler
@@ -387,7 +387,7 @@ static int cdcser_sndpacket(FAR struct cdcser_dev_s *priv)
  *
  ****************************************************************************/
 
-static inline int cdcser_recvpacket(FAR struct cdcser_dev_s *priv,
+static inline int cdcacm_recvpacket(FAR struct cdcacm_dev_s *priv,
                                     uint8_t *reqbuf, uint16_t reqlen)
 {
   FAR uart_dev_t *serdev = &priv->serdev;
@@ -486,14 +486,14 @@ static inline int cdcser_recvpacket(FAR struct cdcser_dev_s *priv,
 }
 
 /****************************************************************************
- * Name: cdcser_allocreq
+ * Name: cdcacm_allocreq
  *
  * Description:
  *   Allocate a request instance along with its buffer
  *
  ****************************************************************************/
 
-static struct usbdev_req_s *cdcser_allocreq(FAR struct usbdev_ep_s *ep,
+static struct usbdev_req_s *cdcacm_allocreq(FAR struct usbdev_ep_s *ep,
                                             uint16_t len)
 {
   FAR struct usbdev_req_s *req;
@@ -513,14 +513,14 @@ static struct usbdev_req_s *cdcser_allocreq(FAR struct usbdev_ep_s *ep,
 }
 
 /****************************************************************************
- * Name: cdcser_freereq
+ * Name: cdcacm_freereq
  *
  * Description:
  *   Free a request instance along with its buffer
  *
  ****************************************************************************/
 
-static void cdcser_freereq(FAR struct usbdev_ep_s *ep,
+static void cdcacm_freereq(FAR struct usbdev_ep_s *ep,
                            FAR struct usbdev_req_s *req)
 {
   if (ep != NULL && req != NULL)
@@ -534,22 +534,22 @@ static void cdcser_freereq(FAR struct usbdev_ep_s *ep,
 }
 
 /****************************************************************************
- * Name: cdcser_resetconfig
+ * Name: cdcacm_resetconfig
  *
  * Description:
  *   Mark the device as not configured and disable all endpoints.
  *
  ****************************************************************************/
 
-static void cdcser_resetconfig(FAR struct cdcser_dev_s *priv)
+static void cdcacm_resetconfig(FAR struct cdcacm_dev_s *priv)
 {
   /* Are we configured? */
 
-  if (priv->config != CDCSER_CONFIGIDNONE)
+  if (priv->config != CDCACM_CONFIGIDNONE)
     {
       /* Yes.. but not anymore */
 
-      priv->config = CDCSER_CONFIGIDNONE;
+      priv->config = CDCACM_CONFIGIDNONE;
 
       /* Disable endpoints.  This should force completion of all pending
        * transfers.
@@ -562,7 +562,7 @@ static void cdcser_resetconfig(FAR struct cdcser_dev_s *priv)
 }
 
 /****************************************************************************
- * Name: cdcser_epconfigure
+ * Name: cdcacm_epconfigure
  *
  * Description:
  *   Configure one endpoint.
@@ -570,18 +570,18 @@ static void cdcser_resetconfig(FAR struct cdcser_dev_s *priv)
  ****************************************************************************/
 
 #ifdef CONFIG_USBDEV_DUALSPEED
-static int cdcser_epconfigure(FAR struct usbdev_ep_s *ep,
-                              enum cdcser_epdesc_e epid, uint16_t mxpacket,
+static int cdcacm_epconfigure(FAR struct usbdev_ep_s *ep,
+                              enum cdcacm_epdesc_e epid, uint16_t mxpacket,
                               bool last)
 {
   struct usb_epdesc_s epdesc;
-  cdcser_mkepdesc(epid, mxpacket, &epdesc);
+  cdcacm_mkepdesc(epid, mxpacket, &epdesc);
   return EP_CONFIGURE(ep, &epdesc, last);
 }
 #endif
 
 /****************************************************************************
- * Name: cdcser_setconfig
+ * Name: cdcacm_setconfig
  *
  * Description:
  *   Set the device configuration by allocating and configuring endpoints and
@@ -589,7 +589,7 @@ static int cdcser_epconfigure(FAR struct usbdev_ep_s *ep,
  *
  ****************************************************************************/
 
-static int cdcser_setconfig(FAR struct cdcser_dev_s *priv, uint8_t config)
+static int cdcacm_setconfig(FAR struct cdcacm_dev_s *priv, uint8_t config)
 {
   FAR struct usbdev_req_s *req;
   int i;
@@ -613,11 +613,11 @@ static int cdcser_setconfig(FAR struct cdcser_dev_s *priv, uint8_t config)
 
   /* Discard the previous configuration data */
 
-  cdcser_resetconfig(priv);
+  cdcacm_resetconfig(priv);
 
   /* Was this a request to simply discard the current configuration? */
 
-  if (config == CDCSER_CONFIGIDNONE)
+  if (config == CDCACM_CONFIGIDNONE)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_CONFIGNONE), 0);
       return 0;
@@ -625,7 +625,7 @@ static int cdcser_setconfig(FAR struct cdcser_dev_s *priv, uint8_t config)
 
   /* We only accept one configuration */
 
-  if (config != CDCSER_CONFIGID)
+  if (config != CDCACM_CONFIGID)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_CONFIGIDBAD), 0);
       return -EINVAL;
@@ -636,14 +636,14 @@ static int cdcser_setconfig(FAR struct cdcser_dev_s *priv, uint8_t config)
 #ifdef CONFIG_USBDEV_DUALSPEED
   if (priv->usbdev->speed == USB_SPEED_HIGH)
     {
-      ret = cdcser_epconfigure(priv->epintin, CDCSER_EPINTIN,
-                               CONFIG_CDCSER_EPINTIN_HSSIZE, false);
+      ret = cdcacm_epconfigure(priv->epintin, CDCACM_EPINTIN,
+                               CONFIG_CDCACM_EPINTIN_HSSIZE, false);
     }
   else
 #endif
     {
       ret = EP_CONFIGURE(priv->epintin,
-                         cdcser_getepdesc(CDCSER_EPINTIN), false);
+                         cdcacm_getepdesc(CDCACM_EPINTIN), false);
     }
 
   if (ret < 0)
@@ -658,14 +658,14 @@ static int cdcser_setconfig(FAR struct cdcser_dev_s *priv, uint8_t config)
 #ifdef CONFIG_USBDEV_DUALSPEED
   if (priv->usbdev->speed == USB_SPEED_HIGH)
     {
-      ret = cdcser_epconfigure(priv->epbulkin, CDCSER_EPBULKIN,
-                               CONFIG_CDCSER_EPBULKIN_HSSIZE, false);
+      ret = cdcacm_epconfigure(priv->epbulkin, CDCACM_EPBULKIN,
+                               CONFIG_CDCACM_EPBULKIN_HSSIZE, false);
     }
   else
 #endif
     {
       ret = EP_CONFIGURE(priv->epbulkin,
-                         cdcser_getepdesc(CDCSER_EPBULKIN), false);
+                         cdcacm_getepdesc(CDCACM_EPBULKIN), false);
     }
 
   if (ret < 0)
@@ -681,14 +681,14 @@ static int cdcser_setconfig(FAR struct cdcser_dev_s *priv, uint8_t config)
 #ifdef CONFIG_USBDEV_DUALSPEED
   if (priv->usbdev->speed == USB_SPEED_HIGH)
     {
-      ret = cdcser_epconfigure(priv->epbulkout, CDCSER_EPBULKOUT,
-                               CONFIG_CDCSER_EPBULKOUT_HSSIZE, true);
+      ret = cdcacm_epconfigure(priv->epbulkout, CDCACM_EPBULKOUT,
+                               CONFIG_CDCACM_EPBULKOUT_HSSIZE, true);
     }
   else
 #endif
     {
       ret = EP_CONFIGURE(priv->epbulkout,
-                         cdcser_getepdesc(CDCSER_EPBULKOUT), true);
+                         cdcacm_getepdesc(CDCACM_EPBULKOUT), true);
     }
 
   if (ret < 0)
@@ -702,10 +702,10 @@ static int cdcser_setconfig(FAR struct cdcser_dev_s *priv, uint8_t config)
   /* Queue read requests in the bulk OUT endpoint */
 
   DEBUGASSERT(priv->nrdq == 0);
-  for (i = 0; i < CONFIG_CDCSER_NRDREQS; i++)
+  for (i = 0; i < CONFIG_CDCACM_NRDREQS; i++)
     {
       req           = priv->rdreqs[i].req;
-      req->callback = cdcser_rdcomplete;
+      req->callback = cdcacm_rdcomplete;
       ret           = EP_SUBMIT(priv->epbulkout, req);
       if (ret != OK)
         {
@@ -719,19 +719,19 @@ static int cdcser_setconfig(FAR struct cdcser_dev_s *priv, uint8_t config)
   return OK;
 
 errout:
-  cdcser_resetconfig(priv);
+  cdcacm_resetconfig(priv);
   return ret;
 }
 
 /****************************************************************************
- * Name: cdcser_ep0incomplete
+ * Name: cdcacm_ep0incomplete
  *
  * Description:
  *   Handle completion of EP0 control operations
  *
  ****************************************************************************/
 
-static void cdcser_ep0incomplete(FAR struct usbdev_ep_s *ep,
+static void cdcacm_ep0incomplete(FAR struct usbdev_ep_s *ep,
                                    FAR struct usbdev_req_s *req)
 {
   if (req->result || req->xfrd != req->len)
@@ -741,7 +741,7 @@ static void cdcser_ep0incomplete(FAR struct usbdev_ep_s *ep,
 }
 
 /****************************************************************************
- * Name: cdcser_rdcomplete
+ * Name: cdcacm_rdcomplete
  *
  * Description:
  *   Handle completion of read request on the bulk OUT endpoint.  This
@@ -749,10 +749,10 @@ static void cdcser_ep0incomplete(FAR struct usbdev_ep_s *ep,
  *
  ****************************************************************************/
 
-static void cdcser_rdcomplete(FAR struct usbdev_ep_s *ep,
+static void cdcacm_rdcomplete(FAR struct usbdev_ep_s *ep,
                               FAR struct usbdev_req_s *req)
 {
-  FAR struct cdcser_dev_s *priv;
+  FAR struct cdcacm_dev_s *priv;
   irqstate_t flags;
   int ret;
 
@@ -768,7 +768,7 @@ static void cdcser_rdcomplete(FAR struct usbdev_ep_s *ep,
 
   /* Extract references to private data */
 
-  priv = (FAR struct cdcser_dev_s*)ep->priv;
+  priv = (FAR struct cdcacm_dev_s*)ep->priv;
 
   /* Process the received data unless this is some unusual condition */
 
@@ -777,7 +777,7 @@ static void cdcser_rdcomplete(FAR struct usbdev_ep_s *ep,
     {
     case 0: /* Normal completion */
       usbtrace(TRACE_CLASSRDCOMPLETE, priv->nrdq);
-      cdcser_recvpacket(priv, req->buf, req->xfrd);
+      cdcacm_recvpacket(priv, req->buf, req->xfrd);
       break;
 
     case -ESHUTDOWN: /* Disconnection */
@@ -793,8 +793,8 @@ static void cdcser_rdcomplete(FAR struct usbdev_ep_s *ep,
 
   /* Requeue the read request */
 
-#ifdef CONFIG_CDCSER_BULKREQLEN
-  req->len = MAX(CONFIG_CDCSER_BULKREQLEN, ep->maxpacket);
+#ifdef CONFIG_CDCACM_BULKREQLEN
+  req->len = MAX(CONFIG_CDCACM_BULKREQLEN, ep->maxpacket);
 #else
   req->len = ep->maxpacket;
 #endif
@@ -808,7 +808,7 @@ static void cdcser_rdcomplete(FAR struct usbdev_ep_s *ep,
 }
 
 /****************************************************************************
- * Name: cdcser_wrcomplete
+ * Name: cdcacm_wrcomplete
  *
  * Description:
  *   Handle completion of write request.  This function probably executes
@@ -816,11 +816,11 @@ static void cdcser_rdcomplete(FAR struct usbdev_ep_s *ep,
  *
  ****************************************************************************/
 
-static void cdcser_wrcomplete(FAR struct usbdev_ep_s *ep,
+static void cdcacm_wrcomplete(FAR struct usbdev_ep_s *ep,
                               FAR struct usbdev_req_s *req)
 {
-  FAR struct cdcser_dev_s *priv;
-  FAR struct cdcser_req_s *reqcontainer;
+  FAR struct cdcacm_dev_s *priv;
+  FAR struct cdcacm_req_s *reqcontainer;
   irqstate_t flags;
 
   /* Sanity check */
@@ -835,8 +835,8 @@ static void cdcser_wrcomplete(FAR struct usbdev_ep_s *ep,
 
   /* Extract references to our private data */
 
-  priv         = (FAR struct cdcser_dev_s *)ep->priv;
-  reqcontainer = (FAR struct cdcser_req_s *)req->priv;
+  priv         = (FAR struct cdcacm_dev_s *)ep->priv;
+  reqcontainer = (FAR struct cdcacm_req_s *)req->priv;
 
   /* Return the write request to the free list */
 
@@ -853,7 +853,7 @@ static void cdcser_wrcomplete(FAR struct usbdev_ep_s *ep,
     {
     case OK: /* Normal completion */
       usbtrace(TRACE_CLASSWRCOMPLETE, priv->nwrq);
-      cdcser_sndpacket(priv);
+      cdcacm_sndpacket(priv);
       break;
 
     case -ESHUTDOWN: /* Disconnection */
@@ -871,17 +871,17 @@ static void cdcser_wrcomplete(FAR struct usbdev_ep_s *ep,
  ****************************************************************************/
 
 /****************************************************************************
- * Name: cdcser_bind
+ * Name: cdcacm_bind
  *
  * Description:
  *   Invoked when the driver is bound to a USB device driver
  *
  ****************************************************************************/
 
-static int cdcser_bind(FAR struct usbdev_s *dev, FAR struct usbdevclass_driver_s *driver)
+static int cdcacm_bind(FAR struct usbdev_s *dev, FAR struct usbdevclass_driver_s *driver)
 {
-  FAR struct cdcser_dev_s *priv = ((struct cdcser_driver_s*)driver)->dev;
-  FAR struct cdcser_req_s *reqcontainer;
+  FAR struct cdcacm_dev_s *priv = ((struct cdcacm_driver_s*)driver)->dev;
+  FAR struct cdcacm_req_s *reqcontainer;
   irqstate_t flags;
   uint16_t reqlen;
   int ret;
@@ -896,17 +896,17 @@ static int cdcser_bind(FAR struct usbdev_s *dev, FAR struct usbdevclass_driver_s
 
   /* Preallocate control request */
 
-  priv->ctrlreq = cdcser_allocreq(dev->ep0, CDCSER_MXDESCLEN);
+  priv->ctrlreq = cdcacm_allocreq(dev->ep0, CDCACM_MXDESCLEN);
   if (priv->ctrlreq == NULL)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_ALLOCCTRLREQ), 0);
       ret = -ENOMEM;
       goto errout;
     }
-  priv->ctrlreq->callback = cdcser_ep0incomplete;
+  priv->ctrlreq->callback = cdcacm_ep0incomplete;
 
   /* Pre-allocate all endpoints... the endpoints will not be functional
-   * until the SET CONFIGURATION request is processed in cdcser_setconfig.
+   * until the SET CONFIGURATION request is processed in cdcacm_setconfig.
    * This is done here because there may be calls to kmalloc and the SET
    * CONFIGURATION processing probably occurrs within interrupt handling
    * logic where kmalloc calls will fail.
@@ -914,7 +914,7 @@ static int cdcser_bind(FAR struct usbdev_s *dev, FAR struct usbdevclass_driver_s
 
   /* Pre-allocate the IN interrupt endpoint */
 
-  priv->epintin = DEV_ALLOCEP(dev, CDCSER_EPINTIN_ADDR, true, USB_EP_ATTR_XFER_INT);
+  priv->epintin = DEV_ALLOCEP(dev, CDCACM_EPINTIN_ADDR, true, USB_EP_ATTR_XFER_INT);
   if (!priv->epintin)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EPINTINALLOCFAIL), 0);
@@ -925,7 +925,7 @@ static int cdcser_bind(FAR struct usbdev_s *dev, FAR struct usbdevclass_driver_s
 
   /* Pre-allocate the IN bulk endpoint */
 
-  priv->epbulkin = DEV_ALLOCEP(dev, CDCSER_EPINBULK_ADDR, true, USB_EP_ATTR_XFER_BULK);
+  priv->epbulkin = DEV_ALLOCEP(dev, CDCACM_EPINBULK_ADDR, true, USB_EP_ATTR_XFER_BULK);
   if (!priv->epbulkin)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EPBULKINALLOCFAIL), 0);
@@ -936,7 +936,7 @@ static int cdcser_bind(FAR struct usbdev_s *dev, FAR struct usbdevclass_driver_s
 
   /* Pre-allocate the OUT bulk endpoint */
 
-  priv->epbulkout = DEV_ALLOCEP(dev, CDCSER_EPOUTBULK_ADDR, false, USB_EP_ATTR_XFER_BULK);
+  priv->epbulkout = DEV_ALLOCEP(dev, CDCACM_EPOUTBULK_ADDR, false, USB_EP_ATTR_XFER_BULK);
   if (!priv->epbulkout)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EPBULKOUTALLOCFAIL), 0);
@@ -947,16 +947,16 @@ static int cdcser_bind(FAR struct usbdev_s *dev, FAR struct usbdevclass_driver_s
 
   /* Pre-allocate read requests */
 
-#ifdef CONFIG_CDCSER_BULKREQLEN
-  reqlen = MAX(CONFIG_CDCSER_BULKREQLEN, priv->epbulkout->maxpacket);
+#ifdef CONFIG_CDCACM_BULKREQLEN
+  reqlen = MAX(CONFIG_CDCACM_BULKREQLEN, priv->epbulkout->maxpacket);
 #else
   reqlen = priv->epbulkout->maxpacket;
 #endif
 
-  for (i = 0; i < CONFIG_CDCSER_NRDREQS; i++)
+  for (i = 0; i < CONFIG_CDCACM_NRDREQS; i++)
     {
       reqcontainer      = &priv->rdreqs[i];
-      reqcontainer->req = cdcser_allocreq(priv->epbulkout, reqlen);
+      reqcontainer->req = cdcacm_allocreq(priv->epbulkout, reqlen);
       if (reqcontainer->req == NULL)
         {
           usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_RDALLOCREQ), -ENOMEM);
@@ -964,21 +964,21 @@ static int cdcser_bind(FAR struct usbdev_s *dev, FAR struct usbdevclass_driver_s
           goto errout;
         }
       reqcontainer->req->priv     = reqcontainer;
-      reqcontainer->req->callback = cdcser_rdcomplete;
+      reqcontainer->req->callback = cdcacm_rdcomplete;
     }
 
   /* Pre-allocate write request containers and put in a free list */
 
-#ifdef CONFIG_CDCSER_BULKREQLEN
-  reqlen = MAX(CONFIG_CDCSER_BULKREQLEN, priv->epbulkin->maxpacket);
+#ifdef CONFIG_CDCACM_BULKREQLEN
+  reqlen = MAX(CONFIG_CDCACM_BULKREQLEN, priv->epbulkin->maxpacket);
 #else
   reqlen = priv->epbulkin->maxpacket;
 #endif
 
-  for (i = 0; i < CONFIG_CDCSER_NWRREQS; i++)
+  for (i = 0; i < CONFIG_CDCACM_NWRREQS; i++)
     {
       reqcontainer      = &priv->wrreqs[i];
-      reqcontainer->req = cdcser_allocreq(priv->epbulkin, reqlen);
+      reqcontainer->req = cdcacm_allocreq(priv->epbulkin, reqlen);
       if (reqcontainer->req == NULL)
         {
           usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_WRALLOCREQ), -ENOMEM);
@@ -986,7 +986,7 @@ static int cdcser_bind(FAR struct usbdev_s *dev, FAR struct usbdevclass_driver_s
           goto errout;
         }
       reqcontainer->req->priv     = reqcontainer;
-      reqcontainer->req->callback = cdcser_wrcomplete;
+      reqcontainer->req->callback = cdcacm_wrcomplete;
 
       flags = irqsave();
       sq_addlast((sq_entry_t*)reqcontainer, &priv->reqlist);
@@ -996,7 +996,7 @@ static int cdcser_bind(FAR struct usbdev_s *dev, FAR struct usbdevclass_driver_s
 
   /* Report if we are selfpowered (unless we are part of a composite device) */
 
-#ifndef CONFIG_CDCSER_COMPOSITE
+#ifndef CONFIG_CDCACM_COMPOSITE
 #ifdef CONFIG_USBDEV_SELFPOWERED
   DEV_SETSELFPOWERED(dev);
 #endif
@@ -1010,22 +1010,22 @@ static int cdcser_bind(FAR struct usbdev_s *dev, FAR struct usbdevclass_driver_s
   return OK;
 
 errout:
-  cdcser_unbind(dev);
+  cdcacm_unbind(dev);
   return ret;
 }
 
 /****************************************************************************
- * Name: cdcser_unbind
+ * Name: cdcacm_unbind
  *
  * Description:
  *    Invoked when the driver is unbound from a USB device driver
  *
  ****************************************************************************/
 
-static void cdcser_unbind(FAR struct usbdev_s *dev)
+static void cdcacm_unbind(FAR struct usbdev_s *dev)
 {
-  FAR struct cdcser_dev_s *priv;
-  FAR struct cdcser_req_s *reqcontainer;
+  FAR struct cdcacm_dev_s *priv;
+  FAR struct cdcacm_req_s *reqcontainer;
   irqstate_t flags;
   int i;
 
@@ -1041,7 +1041,7 @@ static void cdcser_unbind(FAR struct usbdev_s *dev)
 
   /* Extract reference to private data */
 
-  priv = (FAR struct cdcser_dev_s *)dev->ep0->priv;
+  priv = (FAR struct cdcacm_dev_s *)dev->ep0->priv;
 
 #ifdef CONFIG_DEBUG
   if (!priv)
@@ -1057,12 +1057,12 @@ static void cdcser_unbind(FAR struct usbdev_s *dev)
     {
       /* Make sure that the endpoints have been unconfigured.  If
        * we were terminated gracefully, then the configuration should
-       * already have been reset.  If not, then calling cdcser_resetconfig
+       * already have been reset.  If not, then calling cdcacm_resetconfig
        * should cause the endpoints to immediately terminate all
        * transfers and return the requests to us (with result == -ESHUTDOWN)
        */
 
-      cdcser_resetconfig(priv);
+      cdcacm_resetconfig(priv);
       up_mdelay(50);
 
       /* Free the interrupt IN endpoint */
@@ -1085,7 +1085,7 @@ static void cdcser_unbind(FAR struct usbdev_s *dev)
 
       if (priv->ctrlreq != NULL)
         {
-          cdcser_freereq(dev->ep0, priv->ctrlreq);
+          cdcacm_freereq(dev->ep0, priv->ctrlreq);
           priv->ctrlreq = NULL;
         }
 
@@ -1094,12 +1094,12 @@ static void cdcser_unbind(FAR struct usbdev_s *dev)
        */
 
       DEBUGASSERT(priv->nrdq == 0);
-      for (i = 0; i < CONFIG_CDCSER_NRDREQS; i++)
+      for (i = 0; i < CONFIG_CDCACM_NRDREQS; i++)
         {
           reqcontainer = &priv->rdreqs[i];
           if (reqcontainer->req)
             {
-              cdcser_freereq(priv->epbulkout, reqcontainer->req);
+              cdcacm_freereq(priv->epbulkout, reqcontainer->req);
               reqcontainer->req = NULL;
             }
         }
@@ -1117,13 +1117,13 @@ static void cdcser_unbind(FAR struct usbdev_s *dev)
        */
 
       flags = irqsave();
-      DEBUGASSERT(priv->nwrq == CONFIG_CDCSER_NWRREQS);
+      DEBUGASSERT(priv->nwrq == CONFIG_CDCACM_NWRREQS);
       while (!sq_empty(&priv->reqlist))
         {
-          reqcontainer = (struct cdcser_req_s *)sq_remfirst(&priv->reqlist);
+          reqcontainer = (struct cdcacm_req_s *)sq_remfirst(&priv->reqlist);
           if (reqcontainer->req != NULL)
             {
-              cdcser_freereq(priv->epbulkin, reqcontainer->req);
+              cdcacm_freereq(priv->epbulkin, reqcontainer->req);
               priv->nwrq--;     /* Number of write requests queued */
             }
         }
@@ -1138,7 +1138,7 @@ static void cdcser_unbind(FAR struct usbdev_s *dev)
 }
 
 /****************************************************************************
- * Name: cdcser_setup
+ * Name: cdcacm_setup
  *
  * Description:
  *   Invoked for ep0 control requests.  This function probably executes
@@ -1146,9 +1146,9 @@ static void cdcser_unbind(FAR struct usbdev_s *dev)
  *
  ****************************************************************************/
 
-static int cdcser_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *ctrl)
+static int cdcacm_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *ctrl)
 {
-  FAR struct cdcser_dev_s *priv;
+  FAR struct cdcacm_dev_s *priv;
   FAR struct usbdev_req_s *ctrlreq;
   uint16_t value;
   uint16_t index;
@@ -1166,7 +1166,7 @@ static int cdcser_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *ct
   /* Extract reference to private data */
 
   usbtrace(TRACE_CLASSSETUP, ctrl->req);
-  priv = (FAR struct cdcser_dev_s *)dev->ep0->priv;
+  priv = (FAR struct cdcacm_dev_s *)dev->ep0->priv;
 
 #ifdef CONFIG_DEBUG
   if (!priv || !priv->ctrlreq)
@@ -1209,11 +1209,11 @@ static int cdcser_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *ct
                  * device implementation.
                  */
 
-#ifndef CONFIG_CDCSER_COMPOSITE
+#ifndef CONFIG_CDCACM_COMPOSITE
                 case USB_DESC_TYPE_DEVICE:
                   {
                     ret = USB_SIZEOF_DEVDESC;
-                    memcpy(ctrlreq->buf, cdcser_getdevdesc(), ret);
+                    memcpy(ctrlreq->buf, cdcacm_getdevdesc(), ret);
                   }
                   break;
 #endif
@@ -1223,11 +1223,11 @@ static int cdcser_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *ct
                  * composite device implementation.
                  */
 
-#if !defined(CONFIG_CDCSER_COMPOSITE) && defined(CONFIG_USBDEV_DUALSPEED)
+#if !defined(CONFIG_CDCACM_COMPOSITE) && defined(CONFIG_USBDEV_DUALSPEED)
                 case USB_DESC_TYPE_DEVICEQUALIFIER:
                   {
                     ret = USB_SIZEOF_QUALDESC;
-                    memcpy(ctrlreq->buf, cdcser_getqualdesc(), ret);
+                    memcpy(ctrlreq->buf, cdcacm_getqualdesc(), ret);
                   }
                   break;
 
@@ -1239,13 +1239,13 @@ static int cdcser_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *ct
                  * composite device implementation.
                  */
 
-#ifndef CONFIG_CDCSER_COMPOSITE
+#ifndef CONFIG_CDCACM_COMPOSITE
                 case USB_DESC_TYPE_CONFIG:
                   {
 #ifdef CONFIG_USBDEV_DUALSPEED
-                    ret = cdcser_mkcfgdesc(ctrlreq->buf, dev->speed, ctrl->req);
+                    ret = cdcacm_mkcfgdesc(ctrlreq->buf, dev->speed, ctrl->req);
 #else
-                    ret = cdcser_mkcfgdesc(ctrlreq->buf);
+                    ret = cdcacm_mkcfgdesc(ctrlreq->buf);
 #endif
                   }
                   break;
@@ -1256,12 +1256,12 @@ static int cdcser_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *ct
                  * composite device implementation.
                  */
 
-#ifndef CONFIG_CDCSER_COMPOSITE
+#ifndef CONFIG_CDCACM_COMPOSITE
                 case USB_DESC_TYPE_STRING:
                   {
                     /* index == language code. */
 
-                    ret = cdcser_mkstrdesc(ctrl->value[0], (struct usb_strdesc_s *)ctrlreq->buf);
+                    ret = cdcacm_mkstrdesc(ctrl->value[0], (struct usb_strdesc_s *)ctrlreq->buf);
                   }
                   break;
 #endif
@@ -1279,7 +1279,7 @@ static int cdcser_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *ct
             {
               if (ctrl->type == 0)
                 {
-                  ret = cdcser_setconfig(priv, value);
+                  ret = cdcacm_setconfig(priv, value);
                 }
             }
             break;
@@ -1289,7 +1289,7 @@ static int cdcser_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *ct
            * in the composite device implementation.
            */
 
-#ifndef CONFIG_CDCSER_COMPOSITE
+#ifndef CONFIG_CDCACM_COMPOSITE
           case USB_REQ_GETCONFIGURATION:
             {
               if (ctrl->type == USB_DIR_IN)
@@ -1304,13 +1304,13 @@ static int cdcser_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *ct
           case USB_REQ_SETINTERFACE:
             {
               if (ctrl->type == USB_REQ_RECIPIENT_INTERFACE &&
-                  priv->config == CDCSER_CONFIGID)
+                  priv->config == CDCACM_CONFIGID)
                 {
-                  if ((index == CDCSER_NOTIFID && value == CDCSER_NOTALTIFID) ||
-                      (index == CDCSER_DATAIFID && value == CDCSER_DATAALTIFID))
+                  if ((index == CDCACM_NOTIFID && value == CDCACM_NOTALTIFID) ||
+                      (index == CDCACM_DATAIFID && value == CDCACM_DATAALTIFID))
                     {
-                      cdcser_resetconfig(priv);
-                      cdcser_setconfig(priv, priv->config);
+                      cdcacm_resetconfig(priv);
+                      cdcacm_setconfig(priv, priv->config);
                       ret = 0;
                     }
                 }
@@ -1320,10 +1320,10 @@ static int cdcser_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *ct
           case USB_REQ_GETINTERFACE:
             {
               if (ctrl->type == (USB_DIR_IN|USB_REQ_RECIPIENT_INTERFACE) &&
-                  priv->config == CDCSER_CONFIGIDNONE)
+                  priv->config == CDCACM_CONFIGIDNONE)
                 {
-                  if ((index == CDCSER_NOTIFID && value == CDCSER_NOTALTIFID) ||
-                      (index == CDCSER_DATAIFID && value == CDCSER_DATAALTIFID))
+                  if ((index == CDCACM_NOTIFID && value == CDCACM_NOTALTIFID) ||
+                      (index == CDCACM_DATAIFID && value == CDCACM_DATAALTIFID))
                      {
                       *(uint8_t*) ctrlreq->buf = value;
                       ret = 1;
@@ -1354,7 +1354,7 @@ static int cdcser_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *ct
     case ACM_GET_LINE_CODING:
       {
         if (ctrl->type == (USB_DIR_IN|USB_REQ_TYPE_CLASS|USB_REQ_RECIPIENT_INTERFACE) &&
-            index == CDCSER_NOTIFID)
+            index == CDCACM_NOTIFID)
           {
             /* Return the current line status from the private data structure */
 
@@ -1375,7 +1375,7 @@ static int cdcser_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *ct
     case ACM_SET_LINE_CODING:
       {
         if (ctrl->type == (USB_DIR_OUT|USB_REQ_TYPE_CLASS|USB_REQ_RECIPIENT_INTERFACE) &&
-            len  == SIZEOF_CDC_LINECODING && index == CDCSER_NOTIFID)
+            len  == SIZEOF_CDC_LINECODING && index == CDCACM_NOTIFID)
           {
             /* Save the new line coding in the private data structure */
 
@@ -1388,7 +1388,7 @@ static int cdcser_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *ct
 
             if (priv->callback)
               {
-                priv->callback(CDCSER_EVENT_LINECODING);
+                priv->callback(CDCACM_EVENT_LINECODING);
               }
           }
         else
@@ -1405,7 +1405,7 @@ static int cdcser_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *ct
     case ACM_SET_CTRL_LINE_STATE:
       {
         if (ctrl->type == (USB_DIR_OUT|USB_REQ_TYPE_CLASS|USB_REQ_RECIPIENT_INTERFACE) &&
-            index == CDCSER_NOTIFID)
+            index == CDCACM_NOTIFID)
           {
             /* Save the control line state in the private data structure. Only bits
              * 0 and 1 have meaning.
@@ -1420,7 +1420,7 @@ static int cdcser_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *ct
 
             if (priv->callback)
               {
-                priv->callback(CDCSER_EVENT_CTRLLINE);
+                priv->callback(CDCACM_EVENT_CTRLLINE);
               }
           }
         else
@@ -1435,7 +1435,7 @@ static int cdcser_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *ct
     case ACM_SEND_BREAK:
       {
         if (ctrl->type == (USB_DIR_OUT|USB_REQ_TYPE_CLASS|USB_REQ_RECIPIENT_INTERFACE) &&
-            index == CDCSER_NOTIFID)
+            index == CDCACM_NOTIFID)
           {
             /* If there is a registered callback to handle the SendBreak request,
              * then callout now.
@@ -1444,7 +1444,7 @@ static int cdcser_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *ct
             ret = 0;
             if (priv->callback)
               {
-                priv->callback(CDCSER_EVENT_SENDBREAK);
+                priv->callback(CDCACM_EVENT_SENDBREAK);
               }
           }
         else
@@ -1472,14 +1472,14 @@ static int cdcser_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *ct
         {
           usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EPRESPQ), (uint16_t)-ret);
           ctrlreq->result = OK;
-          cdcser_ep0incomplete(dev->ep0, ctrlreq);
+          cdcacm_ep0incomplete(dev->ep0, ctrlreq);
         }
     }
   return ret;
 }
 
 /****************************************************************************
- * Name: cdcser_disconnect
+ * Name: cdcacm_disconnect
  *
  * Description:
  *   Invoked after all transfers have been stopped, when the host is
@@ -1488,9 +1488,9 @@ static int cdcser_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *ct
  *
  ****************************************************************************/
 
-static void cdcser_disconnect(FAR struct usbdev_s *dev)
+static void cdcacm_disconnect(FAR struct usbdev_s *dev)
 {
-  FAR struct cdcser_dev_s *priv;
+  FAR struct cdcacm_dev_s *priv;
   irqstate_t flags;
 
   usbtrace(TRACE_CLASSDISCONNECT, 0);
@@ -1505,7 +1505,7 @@ static void cdcser_disconnect(FAR struct usbdev_s *dev)
 
   /* Extract reference to private data */
 
-  priv = (FAR struct cdcser_dev_s *)dev->ep0->priv;
+  priv = (FAR struct cdcacm_dev_s *)dev->ep0->priv;
 
 #ifdef CONFIG_DEBUG
   if (!priv)
@@ -1518,7 +1518,7 @@ static void cdcser_disconnect(FAR struct usbdev_s *dev)
   /* Reset the configuration */
 
   flags = irqsave();
-  cdcser_resetconfig(priv);
+  cdcacm_resetconfig(priv);
 
   /* Clear out all data in the circular buffer */
 
@@ -1530,7 +1530,7 @@ static void cdcser_disconnect(FAR struct usbdev_s *dev)
    * re-enumerated (unless we are part of a composite device)
    */
 
-#ifndef CONFIG_CDCSER_COMPOSITE
+#ifndef CONFIG_CDCACM_COMPOSITE
   DEV_CONNECT(dev);
 #endif
 }
@@ -1549,9 +1549,9 @@ static void cdcser_disconnect(FAR struct usbdev_s *dev)
 
 static int cdcuart_setup(FAR struct uart_dev_s *dev)
 {
-  FAR struct cdcser_dev_s *priv;
+  FAR struct cdcacm_dev_s *priv;
 
-  usbtrace(CDCSER_CLASSAPI_SETUP, 0);
+  usbtrace(CDCACM_CLASSAPI_SETUP, 0);
 
   /* Sanity check */
 
@@ -1565,11 +1565,11 @@ static int cdcuart_setup(FAR struct uart_dev_s *dev)
 
   /* Extract reference to private data */
 
-  priv = (FAR struct cdcser_dev_s*)dev->priv;
+  priv = (FAR struct cdcacm_dev_s*)dev->priv;
 
   /* Check if we have been configured */
 
-  if (priv->config == CDCSER_CONFIGIDNONE)
+  if (priv->config == CDCACM_CONFIGIDNONE)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_SETUPNOTCONNECTED), 0);
       return -ENOTCONN;
@@ -1592,7 +1592,7 @@ static int cdcuart_setup(FAR struct uart_dev_s *dev)
 
 static void cdcuart_shutdown(FAR struct uart_dev_s *dev)
 {
-  usbtrace(CDCSER_CLASSAPI_SHUTDOWN, 0);
+  usbtrace(CDCACM_CLASSAPI_SHUTDOWN, 0);
 
   /* Sanity check */
 
@@ -1614,7 +1614,7 @@ static void cdcuart_shutdown(FAR struct uart_dev_s *dev)
 
 static int cdcuart_attach(FAR struct uart_dev_s *dev)
 {
-  usbtrace(CDCSER_CLASSAPI_ATTACH, 0);
+  usbtrace(CDCACM_CLASSAPI_ATTACH, 0);
   return OK;
 }
 
@@ -1628,7 +1628,7 @@ static int cdcuart_attach(FAR struct uart_dev_s *dev)
 
 static void cdcuart_detach(FAR struct uart_dev_s *dev)
 {
-  usbtrace(CDCSER_CLASSAPI_DETACH, 0);
+  usbtrace(CDCACM_CLASSAPI_DETACH, 0);
 }
 
 /****************************************************************************
@@ -1642,14 +1642,14 @@ static void cdcuart_detach(FAR struct uart_dev_s *dev)
 static int cdcuart_ioctl(FAR struct file *filep,int cmd,unsigned long arg)
 {
   struct inode        *inode = filep->f_inode;
-  struct cdcser_dev_s *priv  = inode->i_private;
+  struct cdcacm_dev_s *priv  = inode->i_private;
   int                  ret   = OK;
 
   switch (cmd)
     {
     /* CAICO_REGISTERCB
      *   Register a callback for serial event notification. Argument:
-     *   cdcser_callback_t.  See cdcser_callback_t type definition below.
+     *   cdcacm_callback_t.  See cdcacm_callback_t type definition below.
      *   NOTE:  The callback will most likely invoked at the interrupt level.
      *   The called back function should, therefore, limit its operations to
      *   invoking some kind of IPC to handle the serial event in some normal
@@ -1660,7 +1660,7 @@ static int cdcuart_ioctl(FAR struct file *filep,int cmd,unsigned long arg)
       {
         /* Save the new callback function */
 
-        priv->callback = (cdcser_callback_t)((uintptr_t)arg);
+        priv->callback = (cdcacm_callback_t)((uintptr_t)arg);
       }
       break;
 
@@ -1668,7 +1668,7 @@ static int cdcuart_ioctl(FAR struct file *filep,int cmd,unsigned long arg)
      *   Get current line coding.  Argument: struct cdc_linecoding_s*.
      *   See include/nuttx/usb/cdc.h for structure definition.  This IOCTL
      *   should be called to get the data associated with the
-     *   CDCSER_EVENT_LINECODING event).
+     *   CDCACM_EVENT_LINECODING event).
      */
 
     case CAIOC_GETLINECODING:
@@ -1688,7 +1688,7 @@ static int cdcuart_ioctl(FAR struct file *filep,int cmd,unsigned long arg)
     /* CAIOC_GETCTRLLINE
      *   Get control line status bits. Argument FAR int*.  See
      *   include/nuttx/usb/cdc.h for bit definitions.  This IOCTL should be
-     *   called to get the data associated CDCSER_EVENT_CTRLLINE event.
+     *   called to get the data associated CDCACM_EVENT_CTRLLINE event.
      */
 
    case CAIOC_GETCTRLLINE:
@@ -1762,11 +1762,11 @@ static int cdcuart_ioctl(FAR struct file *filep,int cmd,unsigned long arg)
 
 static void cdcuart_rxint(FAR struct uart_dev_s *dev, bool enable)
 {
-  FAR struct cdcser_dev_s *priv;
+  FAR struct cdcacm_dev_s *priv;
   FAR uart_dev_t *serdev;
   irqstate_t flags;
 
-  usbtrace(CDCSER_CLASSAPI_RXINT, (uint16_t)enable);
+  usbtrace(CDCACM_CLASSAPI_RXINT, (uint16_t)enable);
 
   /* Sanity check */
 
@@ -1780,7 +1780,7 @@ static void cdcuart_rxint(FAR struct uart_dev_s *dev, bool enable)
 
   /* Extract reference to private data */
 
-  priv   = (FAR struct cdcser_dev_s*)dev->priv;
+  priv   = (FAR struct cdcacm_dev_s*)dev->priv;
   serdev = &priv->serdev;
 
   /* We need exclusive access to the RX buffer and private structure
@@ -1855,9 +1855,9 @@ static void cdcuart_rxint(FAR struct uart_dev_s *dev, bool enable)
 
 static void cdcuart_txint(FAR struct uart_dev_s *dev, bool enable)
 {
-  FAR struct cdcser_dev_s *priv;
+  FAR struct cdcacm_dev_s *priv;
 
-  usbtrace(CDCSER_CLASSAPI_TXINT, (uint16_t)enable);
+  usbtrace(CDCACM_CLASSAPI_TXINT, (uint16_t)enable);
 
   /* Sanity checks */
 
@@ -1871,7 +1871,7 @@ static void cdcuart_txint(FAR struct uart_dev_s *dev, bool enable)
 
  /* Extract references to private data */
 
-  priv = (FAR struct cdcser_dev_s*)dev->priv;
+  priv = (FAR struct cdcacm_dev_s*)dev->priv;
 
   /* If the new state is enabled and if there is data in the XMIT buffer,
    * send the next packet now.
@@ -1882,7 +1882,7 @@ static void cdcuart_txint(FAR struct uart_dev_s *dev, bool enable)
 
   if (enable && priv->serdev.xmit.head != priv->serdev.xmit.tail)
     {
-      cdcser_sndpacket(priv);
+      cdcacm_sndpacket(priv);
     }
 }
 
@@ -1900,9 +1900,9 @@ static void cdcuart_txint(FAR struct uart_dev_s *dev, bool enable)
 
 static bool cdcuart_txempty(FAR struct uart_dev_s *dev)
 {
-  FAR struct cdcser_dev_s *priv = (FAR struct cdcser_dev_s*)dev->priv;
+  FAR struct cdcacm_dev_s *priv = (FAR struct cdcacm_dev_s*)dev->priv;
 
-  usbtrace(CDCSER_CLASSAPI_TXEMPTY, 0);
+  usbtrace(CDCACM_CLASSAPI_TXEMPTY, 0);
 
 #if CONFIG_DEBUG
   if (!priv)
@@ -1916,7 +1916,7 @@ static bool cdcuart_txempty(FAR struct uart_dev_s *dev)
    * reqlist, then there is no longer any TX data in flight.
    */
 
-  return priv->nwrq >= CONFIG_CDCSER_NWRREQS;
+  return priv->nwrq >= CONFIG_CDCACM_NWRREQS;
 }
 
 /****************************************************************************
@@ -1924,7 +1924,7 @@ static bool cdcuart_txempty(FAR struct uart_dev_s *dev)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: cdcser_classobject
+ * Name: cdcacm_classobject
  *
  * Description:
  *   Register USB serial port (and USB serial console if so configured) and
@@ -1941,20 +1941,20 @@ static bool cdcuart_txempty(FAR struct uart_dev_s *dev)
  *
  ****************************************************************************/
 
-#ifndef CONFIG_CDCSER_COMPOSITE
+#ifndef CONFIG_CDCACM_COMPOSITE
 static
 #endif
-int cdcser_classobject(int minor, FAR struct usbdevclass_driver_s **classdev)
+int cdcacm_classobject(int minor, FAR struct usbdevclass_driver_s **classdev)
 {
-  FAR struct cdcser_alloc_s *alloc;
-  FAR struct cdcser_dev_s *priv;
-  FAR struct cdcser_driver_s *drvr;
+  FAR struct cdcacm_alloc_s *alloc;
+  FAR struct cdcacm_dev_s *priv;
+  FAR struct cdcacm_driver_s *drvr;
   char devname[16];
   int ret;
 
   /* Allocate the structures needed */
 
-  alloc = (FAR struct cdcser_alloc_s*)kmalloc(sizeof(struct cdcser_alloc_s));
+  alloc = (FAR struct cdcacm_alloc_s*)kmalloc(sizeof(struct cdcacm_alloc_s));
   if (!alloc)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_ALLOCDEVSTRUCT), 0);
@@ -1968,7 +1968,7 @@ int cdcser_classobject(int minor, FAR struct usbdevclass_driver_s **classdev)
 
   /* Initialize the USB serial driver structure */
 
-  memset(priv, 0, sizeof(struct cdcser_dev_s));
+  memset(priv, 0, sizeof(struct cdcacm_dev_s));
   sq_init(&priv->reqlist);
 
   /* Fake line status */
@@ -1983,9 +1983,9 @@ int cdcser_classobject(int minor, FAR struct usbdevclass_driver_s **classdev)
 
   /* Initialize the serial driver sub-structure */
 
-  priv->serdev.recv.size   = CONFIG_CDCSER_RXBUFSIZE;
+  priv->serdev.recv.size   = CONFIG_CDCACM_RXBUFSIZE;
   priv->serdev.recv.buffer = priv->rxbuffer;
-  priv->serdev.xmit.size   = CONFIG_CDCSER_TXBUFSIZE;
+  priv->serdev.xmit.size   = CONFIG_CDCACM_TXBUFSIZE;
   priv->serdev.xmit.buffer = priv->txbuffer;
   priv->serdev.ops         = &g_uartops;
   priv->serdev.priv        = priv;
@@ -2002,7 +2002,7 @@ int cdcser_classobject(int minor, FAR struct usbdevclass_driver_s **classdev)
 
   /* Register the USB serial console */
 
-#ifdef CONFIG_CDCSER_CONSOLE
+#ifdef CONFIG_CDCACM_CONSOLE
   g_usbserialport.isconsole = true;
   ret = uart_register("/dev/console", &pri->serdev);
   if (ret < 0)
@@ -2031,7 +2031,7 @@ errout_with_class:
 }
 
 /****************************************************************************
- * Name: cdcser_initialize
+ * Name: cdcacm_initialize
  *
  * Description:
  *   Register USB serial port (and USB serial console if so configured).
@@ -2045,15 +2045,15 @@ errout_with_class:
  *
  ****************************************************************************/
 
-#ifndef CONFIG_CDCSER_COMPOSITE
-int cdcser_initialize(int minor)
+#ifndef CONFIG_CDCACM_COMPOSITE
+int cdcacm_initialize(int minor)
 {
   FAR struct usbdevclass_driver_s *drvr;
   int ret;
 
   /* Get an instance of the serial driver class object */
 
-  ret = cdcser_classobject(minor, &drvr);
+  ret = cdcacm_classobject(minor, &drvr);
   if (ret == OK)
     {
       /* Register the USB serial class driver */
@@ -2069,35 +2069,35 @@ int cdcser_initialize(int minor)
 #endif
 
 /****************************************************************************
- * Name: cdcser_uninitialize
+ * Name: cdcacm_uninitialize
  *
  * Description:
  *   Un-initialize the USB storage class driver
  *
  * Input Parameters:
- *   handle - The handle returned by a previous call to cdcser_configure().
+ *   handle - The handle returned by a previous call to cdcacm_configure().
  *
  * Returned Value:
  *   None
  *
  ****************************************************************************/
 
-#ifndef CONFIG_CDCSER_COMPOSITE
-void cdcser_uninitialize(FAR struct usbdevclass_driver_s *classdev)
+#ifndef CONFIG_CDCACM_COMPOSITE
+void cdcacm_uninitialize(FAR struct usbdevclass_driver_s *classdev)
 {
-  FAR struct cdcser_driver_s *drvr = (FAR struct cdcser_driver_s *)classdev;
-  FAR struct cdcser_dev_s    *priv = drvr->dev;
+  FAR struct cdcacm_driver_s *drvr = (FAR struct cdcacm_driver_s *)classdev;
+  FAR struct cdcacm_dev_s    *priv = drvr->dev;
 
   /* Unbind the class (if still bound) */
 
   if (priv->usbdev)
     {
-       cdcser_unbind(Fpriv->usbdev);
+       cdcacm_unbind(Fpriv->usbdev);
     }
 
   /* Unregister the driver (unless we are a part of a composite device */
 
-#ifndef CONFIG_CDCSER_COMPOSITE
+#ifndef CONFIG_CDCACM_COMPOSITE
   usbdev_unregister(&alloc->drvr.drvr);
 #endif
 
diff --git a/drivers/usbdev/cdcacm.h b/drivers/usbdev/cdcacm.h
index c434b0f078e..13007d18c91 100644
--- a/drivers/usbdev/cdcacm.h
+++ b/drivers/usbdev/cdcacm.h
@@ -53,22 +53,22 @@
  ****************************************************************************/
 /* Configuration ************************************************************/
 /* If the serial device is configured as part of a composite device than both
- * CONFIG_USBDEV_COMPOSITE and CONFIG_CDCSER_COMPOSITE must be defined.
+ * CONFIG_USBDEV_COMPOSITE and CONFIG_CDCACM_COMPOSITE must be defined.
  */
 
 #ifndef CONFIG_USBDEV_COMPOSITE
-#  undef CONFIG_CDCSER_COMPOSITE
+#  undef CONFIG_CDCACM_COMPOSITE
 #endif
 
-#if defined(CONFIG_CDCSER_COMPOSITE) && !defined(CONFIG_CDCSER_STRBASE)
-#  define CONFIG_CDCSER_STRBASE (4)
+#if defined(CONFIG_CDCACM_COMPOSITE) && !defined(CONFIG_CDCACM_STRBASE)
+#  define CONFIG_CDCACM_STRBASE (4)
 #endif
 
 /* Packet and request buffer sizes */
 
-#ifndef CONFIG_CDCSER_COMPOSITE
-#  ifndef CONFIG_CDCSER_EP0MAXPACKET
-#    define CONFIG_CDCSER_EP0MAXPACKET 64
+#ifndef CONFIG_CDCACM_COMPOSITE
+#  ifndef CONFIG_CDCACM_EP0MAXPACKET
+#    define CONFIG_CDCACM_EP0MAXPACKET 64
 #  endif
 #endif
 
@@ -76,100 +76,100 @@
  * device, then the interface IDs may need to be offset.
  */
 
-#ifndef CONFIG_CDCSER_COMPOSITE
-#  undef CONFIG_CDCSER_IFNOBASE
-#  define CONFIG_CDCSER_IFNOBASE 0
+#ifndef CONFIG_CDCACM_COMPOSITE
+#  undef CONFIG_CDCACM_IFNOBASE
+#  define CONFIG_CDCACM_IFNOBASE 0
 #endif
 
-#ifndef CONFIG_CDCSER_IFNOBASE
-#  define CONFIG_CDCSER_IFNOBASE 0
+#ifndef CONFIG_CDCACM_IFNOBASE
+#  define CONFIG_CDCACM_IFNOBASE 0
 #endif
 
 /* Descriptors **************************************************************/
 /* These settings are not modifiable via the NuttX configuration */
 
 #define CDC_VERSIONNO              0x0110   /* CDC version number 1.10 (BCD) */
-#define CDCSER_CONFIGIDNONE        (0)      /* Config ID means to return to address mode */
+#define CDCACM_CONFIGIDNONE        (0)      /* Config ID means to return to address mode */
 
 /* Interface IDs:
  *
- * CDCSER_NINTERFACES              Two interfaces
- * CDCSER_NOTIFID                  ID of the notifier interface
- * CDCSER_NOTALTIFID               No alternate for the notifier interface
- * CDCSER_DATAIFID                 ID of the data interface
- * CDCSER_DATAALTIFID              No alternate for the data interface
+ * CDCACM_NINTERFACES              Two interfaces
+ * CDCACM_NOTIFID                  ID of the notifier interface
+ * CDCACM_NOTALTIFID               No alternate for the notifier interface
+ * CDCACM_DATAIFID                 ID of the data interface
+ * CDCACM_DATAALTIFID              No alternate for the data interface
  */
 
-#define CDCSER_NINTERFACES         (2)      /* Number of interfaces in the configuration */
-#define CDCSER_NOTIFID             (CONFIG_CDCSER_IFNOBASE+0)
-#define CDCSER_NOTALTIFID          CDCSER_NOTIFID
-#define CDCSER_DATAIFID            (CONFIG_CDCSER_IFNOBASE+1)
-#define CDCSER_DATAALTIFID         CDCSER_DATAIFID
+#define CDCACM_NINTERFACES         (2)      /* Number of interfaces in the configuration */
+#define CDCACM_NOTIFID             (CONFIG_CDCACM_IFNOBASE+0)
+#define CDCACM_NOTALTIFID          CDCACM_NOTIFID
+#define CDCACM_DATAIFID            (CONFIG_CDCACM_IFNOBASE+1)
+#define CDCACM_DATAALTIFID         CDCACM_DATAIFID
 
 /* Configuration descriptor values */
 
-#define CDCSER_CONFIGID            (1)      /* The only supported configuration ID */
+#define CDCACM_CONFIGID            (1)      /* The only supported configuration ID */
 
 /* Buffer big enough for any of our descriptors (the config descriptor is the
  * biggest).
  */
 
-#define CDCSER_MXDESCLEN           (64)
+#define CDCACM_MXDESCLEN           (64)
 
 /* Device descriptor values */
 
-#define CDCSER_VERSIONNO           (0x0101) /* Device version number 1.1 (BCD) */
-#define CDCSER_NCONFIGS            (1)      /* Number of configurations supported */
+#define CDCACM_VERSIONNO           (0x0101) /* Device version number 1.1 (BCD) */
+#define CDCACM_NCONFIGS            (1)      /* Number of configurations supported */
 
 /* String language */
 
-#define CDCSER_STR_LANGUAGE        (0x0409) /* en-us */
+#define CDCACM_STR_LANGUAGE        (0x0409) /* en-us */
 
 /* Descriptor strings.  If there serial device is part of a composite device
  * then the manufacturer, product, and serial number strings will be provided
  * by the composite logic.
  */
 
-#ifndef CONFIG_CDCSER_COMPOSITE
-#  define CDCSER_MANUFACTURERSTRID (1)
-#  define CDCSER_PRODUCTSTRID      (2)
-#  define CDCSER_SERIALSTRID       (3)
-#  define CDCSER_CONFIGSTRID       (4)
+#ifndef CONFIG_CDCACM_COMPOSITE
+#  define CDCACM_MANUFACTURERSTRID (1)
+#  define CDCACM_PRODUCTSTRID      (2)
+#  define CDCACM_SERIALSTRID       (3)
+#  define CDCACM_CONFIGSTRID       (4)
 
-#  undef CONFIG_CDCSER_STRBASE
-#  define CONFIG_CDCSER_STRBASE    (4)
+#  undef CONFIG_CDCACM_STRBASE
+#  define CONFIG_CDCACM_STRBASE    (4)
 #endif
 
 /* These string IDs only exist if a user-defined string is provided */
 
-#ifdef CONFIG_CDCSER_NOTIFSTR
-#  define CDCSER_NOTIFSTRID        (CONFIG_CDCSER_STRBASE+1)
+#ifdef CONFIG_CDCACM_NOTIFSTR
+#  define CDCACM_NOTIFSTRID        (CONFIG_CDCACM_STRBASE+1)
 #else
-#  define CDCSER_NOTIFSTRID        CONFIG_CDCSER_STRBASE
+#  define CDCACM_NOTIFSTRID        CONFIG_CDCACM_STRBASE
 #endif
 
-#ifdef CONFIG_CDCSER_DATAIFSTR
-#  define CDCSER_DATAIFSTRID       (CDCSER_NOTIFSTRID+1)
+#ifdef CONFIG_CDCACM_DATAIFSTR
+#  define CDCACM_DATAIFSTRID       (CDCACM_NOTIFSTRID+1)
 #else
-#  define CDCSER_DATAIFSTRID       CDCSER_NOTIFSTRID
+#  define CDCACM_DATAIFSTRID       CDCACM_NOTIFSTRID
 #endif
 
-#define CDCSER_LASTSTRID           CDCSER_DATAIFSTRID
+#define CDCACM_LASTSTRID           CDCACM_DATAIFSTRID
 
 /* Configuration descriptor size */
 
-#ifndef CONFIG_CDCSER_COMPOSITE
+#ifndef CONFIG_CDCACM_COMPOSITE
 
 /* Number of individual descriptors in the configuration descriptor:
  * Configuration descriptor + (2) interface descriptors + (3) endpoint
  * descriptors + (3) ACM descriptors.
  */
 
-#  define CDCSER_CFGGROUP_SIZE     (9)
+#  define CDCACM_CFGGROUP_SIZE     (9)
 
 /* The size of the config descriptor: (9 + 2*9 + 3*7 + 4 + 5 + 5) = 62 */
 
-#  define SIZEOF_CDCSER_CFGDESC \
+#  define SIZEOF_CDCACM_CFGDESC \
      (USB_SIZEOF_CFGDESC + 2*USB_SIZEOF_IFDESC + 3*USB_SIZEOF_EPDESC + \
       SIZEOF_ACM_FUNCDESC + SIZEOF_HDR_FUNCDESC + SIZEOF_UNION_FUNCDESC(1))
 #else
@@ -178,25 +178,25 @@
  * (2) interface descriptors + (3) endpoint descriptors + (3) ACM descriptors.
  */
 
-#  define CDCSER_CFGGROUP_SIZE     (8)
+#  define CDCACM_CFGGROUP_SIZE     (8)
 
 /* The size of the config descriptor: (2*9 + 3*7 + 4 + 5 + 5) = 53 */
 
-#  define SIZEOF_CDCSER_CFGDESC \
+#  define SIZEOF_CDCACM_CFGDESC \
      (2*USB_SIZEOF_IFDESC + 3*USB_SIZEOF_EPDESC + SIZEOF_ACM_FUNCDESC + \
       SIZEOF_HDR_FUNCDESC + SIZEOF_UNION_FUNCDESC(1))
 #endif
 
 /* Endpoint configuration ****************************************************/
 
-#define CDCSER_EPINTIN_ADDR        (USB_DIR_IN|CONFIG_CDCSER_EPINTIN)
-#define CDCSER_EPINTIN_ATTR        (USB_EP_ATTR_XFER_INT)
+#define CDCACM_EPINTIN_ADDR        (USB_DIR_IN|CONFIG_CDCACM_EPINTIN)
+#define CDCACM_EPINTIN_ATTR        (USB_EP_ATTR_XFER_INT)
 
-#define CDCSER_EPOUTBULK_ADDR      (CONFIG_CDCSER_EPBULKOUT)
-#define CDCSER_EPOUTBULK_ATTR      (USB_EP_ATTR_XFER_BULK)
+#define CDCACM_EPOUTBULK_ADDR      (CONFIG_CDCACM_EPBULKOUT)
+#define CDCACM_EPOUTBULK_ATTR      (USB_EP_ATTR_XFER_BULK)
 
-#define CDCSER_EPINBULK_ADDR       (USB_DIR_IN|CONFIG_CDCSER_EPBULKIN)
-#define CDCSER_EPINBULK_ATTR       (USB_EP_ATTR_XFER_BULK)
+#define CDCACM_EPINBULK_ADDR       (USB_DIR_IN|CONFIG_CDCACM_EPBULKIN)
+#define CDCACM_EPINBULK_ATTR       (USB_EP_ATTR_XFER_BULK)
 
 /* Misc Macros **************************************************************/
 /* MIN/MAX macros */
@@ -211,28 +211,28 @@
 
 /* Trace values *************************************************************/
 
-#define CDCSER_CLASSAPI_SETUP       TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_SETUP)
-#define CDCSER_CLASSAPI_SHUTDOWN    TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_SHUTDOWN)
-#define CDCSER_CLASSAPI_ATTACH      TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_ATTACH)
-#define CDCSER_CLASSAPI_DETACH      TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_DETACH)
-#define CDCSER_CLASSAPI_IOCTL       TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_IOCTL)
-#define CDCSER_CLASSAPI_RECEIVE     TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_RECEIVE)
-#define CDCSER_CLASSAPI_RXINT       TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_RXINT)
-#define CDCSER_CLASSAPI_RXAVAILABLE TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_RXAVAILABLE)
-#define CDCSER_CLASSAPI_SEND        TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_SEND)
-#define CDCSER_CLASSAPI_TXINT       TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_TXINT)
-#define CDCSER_CLASSAPI_TXREADY     TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_TXREADY)
-#define CDCSER_CLASSAPI_TXEMPTY     TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_TXEMPTY)
+#define CDCACM_CLASSAPI_SETUP       TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_SETUP)
+#define CDCACM_CLASSAPI_SHUTDOWN    TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_SHUTDOWN)
+#define CDCACM_CLASSAPI_ATTACH      TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_ATTACH)
+#define CDCACM_CLASSAPI_DETACH      TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_DETACH)
+#define CDCACM_CLASSAPI_IOCTL       TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_IOCTL)
+#define CDCACM_CLASSAPI_RECEIVE     TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_RECEIVE)
+#define CDCACM_CLASSAPI_RXINT       TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_RXINT)
+#define CDCACM_CLASSAPI_RXAVAILABLE TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_RXAVAILABLE)
+#define CDCACM_CLASSAPI_SEND        TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_SEND)
+#define CDCACM_CLASSAPI_TXINT       TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_TXINT)
+#define CDCACM_CLASSAPI_TXREADY     TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_TXREADY)
+#define CDCACM_CLASSAPI_TXEMPTY     TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_TXEMPTY)
 
 /****************************************************************************
  * Public Types
  ****************************************************************************/
 
-enum cdcser_epdesc_e
+enum cdcacm_epdesc_e
 {
-  CDCSER_EPINTIN = 0,  /* Interrupt IN endpoint descriptor */
-  CDCSER_EPBULKOUT,    /* Bulk OUT endpoint descriptor */
-  CDCSER_EPBULKIN      /* Bulk IN endpoint descriptor */
+  CDCACM_EPINTIN = 0,  /* Interrupt IN endpoint descriptor */
+  CDCACM_EPBULKOUT,    /* Bulk OUT endpoint descriptor */
+  CDCACM_EPBULKIN      /* Bulk IN endpoint descriptor */
 };
 
 /****************************************************************************
@@ -244,29 +244,29 @@ enum cdcser_epdesc_e
  ****************************************************************************/
 
 /****************************************************************************
- * Name: cdcser_mkstrdesc
+ * Name: cdcacm_mkstrdesc
  *
  * Description:
  *   Construct a string descriptor
  *
  ****************************************************************************/
 
-int cdcser_mkstrdesc(uint8_t id, struct usb_strdesc_s *strdesc);
+int cdcacm_mkstrdesc(uint8_t id, struct usb_strdesc_s *strdesc);
 
 /****************************************************************************
- * Name: cdcser_getepdesc
+ * Name: cdcacm_getepdesc
  *
  * Description:
  *   Return a pointer to the raw device descriptor
  *
  ****************************************************************************/
 
-#ifndef CONFIG_CDCSER_COMPOSITE
-FAR const struct usb_devdesc_s *cdcser_getdevdesc(void);
+#ifndef CONFIG_CDCACM_COMPOSITE
+FAR const struct usb_devdesc_s *cdcacm_getdevdesc(void);
 #endif
 
 /****************************************************************************
- * Name: cdcser_getepdesc
+ * Name: cdcacm_getepdesc
  *
  * Description:
  *   Return a pointer to the raw endpoint descriptor (used for configuring
@@ -274,10 +274,10 @@ FAR const struct usb_devdesc_s *cdcser_getdevdesc(void);
  *
  ****************************************************************************/
 
-FAR const struct usb_epdesc_s *cdcser_getepdesc(enum cdcser_epdesc_e epid);
+FAR const struct usb_epdesc_s *cdcacm_getepdesc(enum cdcacm_epdesc_e epid);
 
 /****************************************************************************
- * Name: cdcser_mkepdesc
+ * Name: cdcacm_mkepdesc
  *
  * Description:
  *   Construct the endpoint descriptor using the correct max packet size.
@@ -285,12 +285,12 @@ FAR const struct usb_epdesc_s *cdcser_getepdesc(enum cdcser_epdesc_e epid);
  ****************************************************************************/
 
 #ifdef CONFIG_USBDEV_DUALSPEED
-void cdcser_mkepdesc(enum cdcser_epdesc_e epid,
+void cdcacm_mkepdesc(enum cdcacm_epdesc_e epid,
                      uint16_t mxpacket, FAR struct usb_epdesc_s *outdesc);
 #endif
 
 /****************************************************************************
- * Name: cdcser_mkcfgdesc
+ * Name: cdcacm_mkcfgdesc
  *
  * Description:
  *   Construct the configuration descriptor
@@ -298,21 +298,21 @@ void cdcser_mkepdesc(enum cdcser_epdesc_e epid,
  ****************************************************************************/
 
 #ifdef CONFIG_USBDEV_DUALSPEED
-int16_t cdcser_mkcfgdesc(FAR uint8_t *buf, uint8_t speed, uint8_t type);
+int16_t cdcacm_mkcfgdesc(FAR uint8_t *buf, uint8_t speed, uint8_t type);
 #else
-int16_t cdcser_mkcfgdesc(FAR uint8_t *buf);
+int16_t cdcacm_mkcfgdesc(FAR uint8_t *buf);
 #endif
 
 /****************************************************************************
- * Name: cdcser_getqualdesc
+ * Name: cdcacm_getqualdesc
  *
  * Description:
  *   Return a pointer to the raw qual descriptor
  *
  ****************************************************************************/
 
-#if !defined(CONFIG_CDCSER_COMPOSITE) && defined(CONFIG_USBDEV_DUALSPEED)
-FAR const struct usb_qualdesc_s *cdcser_getqualdesc(void);
+#if !defined(CONFIG_CDCACM_COMPOSITE) && defined(CONFIG_USBDEV_DUALSPEED)
+FAR const struct usb_qualdesc_s *cdcacm_getqualdesc(void);
 #endif
 
 #endif /* __DRIVERS_USBDEV_CDCACM_H */
diff --git a/drivers/usbdev/cdcacm_descriptors.c b/drivers/usbdev/cdcacm_descriptors.c
index 168801ac0d8..80bbfbfd12b 100644
--- a/drivers/usbdev/cdcacm_descriptors.c
+++ b/drivers/usbdev/cdcacm_descriptors.c
@@ -47,7 +47,7 @@
 
 #include <nuttx/usb/usb.h>
 #include <nuttx/usb/cdc.h>
-#include <nuttx/usb/cdc_serial.h>
+#include <nuttx/usb/cdcacm.h>
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "cdcacm.h"
@@ -85,7 +85,7 @@ struct cfgdecsc_group_s
  * composite device logic.
  */
 
-#ifndef CONFIG_CDCSER_COMPOSITE
+#ifndef CONFIG_CDCACM_COMPOSITE
 static const struct usb_devdesc_s g_devdesc =
 {
   USB_SIZEOF_DEVDESC,                           /* len */
@@ -97,23 +97,23 @@ static const struct usb_devdesc_s g_devdesc =
   USB_CLASS_CDC,                                /* class */
   CDC_SUBCLASS_NONE,                            /* subclass */
   CDC_PROTO_NONE,                               /* protocol */
-  CONFIG_CDCSER_EP0MAXPACKET,                   /* maxpacketsize */
+  CONFIG_CDCACM_EP0MAXPACKET,                   /* maxpacketsize */
   {
-    LSBYTE(CONFIG_CDCSER_VENDORID),             /* vendor */
-    MSBYTE(CONFIG_CDCSER_VENDORID)
+    LSBYTE(CONFIG_CDCACM_VENDORID),             /* vendor */
+    MSBYTE(CONFIG_CDCACM_VENDORID)
   },
   {
-    LSBYTE(CONFIG_CDCSER_PRODUCTID),            /* product */
-    MSBYTE(CONFIG_CDCSER_PRODUCTID)
+    LSBYTE(CONFIG_CDCACM_PRODUCTID),            /* product */
+    MSBYTE(CONFIG_CDCACM_PRODUCTID)
   },
   {
-    LSBYTE(CDCSER_VERSIONNO),                   /* device */
-    MSBYTE(CDCSER_VERSIONNO)
+    LSBYTE(CDCACM_VERSIONNO),                   /* device */
+    MSBYTE(CDCACM_VERSIONNO)
   },
-  CDCSER_MANUFACTURERSTRID,                     /* imfgr */
-  CDCSER_PRODUCTSTRID,                          /* iproduct */
-  CDCSER_SERIALSTRID,                           /* serno */
-  CDCSER_NCONFIGS                               /* nconfigs */
+  CDCACM_MANUFACTURERSTRID,                     /* imfgr */
+  CDCACM_PRODUCTSTRID,                          /* iproduct */
+  CDCACM_SERIALSTRID,                           /* serno */
+  CDCACM_NCONFIGS                               /* nconfigs */
 };
 #endif
 
@@ -122,18 +122,18 @@ static const struct usb_devdesc_s g_devdesc =
  * composite device logic.
  */
 
-#ifndef CONFIG_CDCSER_COMPOSITE
+#ifndef CONFIG_CDCACM_COMPOSITE
 static const struct usb_cfgdesc_s g_cfgdesc =
 {
   USB_SIZEOF_CFGDESC,                           /* len */
   USB_DESC_TYPE_CONFIG,                         /* type */
   {
-    LSBYTE(SIZEOF_CDCSER_CFGDESC),              /* LS totallen */
-    MSBYTE(SIZEOF_CDCSER_CFGDESC)               /* MS totallen */
+    LSBYTE(SIZEOF_CDCACM_CFGDESC),              /* LS totallen */
+    MSBYTE(SIZEOF_CDCACM_CFGDESC)               /* MS totallen */
   },
-  CDCSER_NINTERFACES,                           /* ninterfaces */
-  CDCSER_CONFIGID,                              /* cfgvalue */
-  CDCSER_CONFIGSTRID,                           /* icfg */
+  CDCACM_NINTERFACES,                           /* ninterfaces */
+  CDCACM_CONFIGID,                              /* cfgvalue */
+  CDCACM_CONFIGSTRID,                           /* icfg */
   USB_CONFIG_ATTR_ONE|SELFPOWERED|REMOTEWAKEUP, /* attr */
   (CONFIG_USBDEV_MAXPOWER + 1) / 2              /* mxpower */
 };
@@ -145,14 +145,14 @@ static const struct usb_ifdesc_s g_notifdesc =
 {
   USB_SIZEOF_IFDESC,                            /* len */
   USB_DESC_TYPE_INTERFACE,                      /* type */
-  CDCSER_NOTIFID,                               /* ifno */
-  CDCSER_NOTALTIFID,                            /* alt */
+  CDCACM_NOTIFID,                               /* ifno */
+  CDCACM_NOTALTIFID,                            /* alt */
   1,                                            /* neps */
   USB_CLASS_CDC,                                /* class */
   CDC_SUBCLASS_ACM,                             /* subclass */
   CDC_PROTO_ATM,                                /* proto */
-#ifdef CONFIG_CDCSER_NOTIFSTR
-  CDCSER_NOTIFSTRID                             /* iif */
+#ifdef CONFIG_CDCACM_NOTIFSTR
+  CDCACM_NOTIFSTRID                             /* iif */
 #else
   0                                             /* iif */
 #endif
@@ -198,11 +198,11 @@ static const struct usb_epdesc_s g_epintindesc =
 {
   USB_SIZEOF_EPDESC,                            /* len */
   USB_DESC_TYPE_ENDPOINT,                       /* type */
-  CDCSER_EPINTIN_ADDR,                          /* addr */
-  CDCSER_EPINTIN_ATTR,                          /* attr */
+  CDCACM_EPINTIN_ADDR,                          /* addr */
+  CDCACM_EPINTIN_ATTR,                          /* attr */
   {
-    LSBYTE(CONFIG_CDCSER_EPINTIN_FSSIZE),       /* maxpacket (full speed) */
-    MSBYTE(CONFIG_CDCSER_EPINTIN_FSSIZE)
+    LSBYTE(CONFIG_CDCACM_EPINTIN_FSSIZE),       /* maxpacket (full speed) */
+    MSBYTE(CONFIG_CDCACM_EPINTIN_FSSIZE)
   },
   0xff                                          /* interval */
 };
@@ -213,14 +213,14 @@ static const struct usb_ifdesc_s g_dataifdesc =
 {
   USB_SIZEOF_IFDESC,                            /* len */
   USB_DESC_TYPE_INTERFACE,                      /* type */
-  CDCSER_DATAIFID,                              /* ifno */
-  CDCSER_DATAALTIFID,                           /* alt */
+  CDCACM_DATAIFID,                              /* ifno */
+  CDCACM_DATAALTIFID,                           /* alt */
   2,                                            /* neps */
   USB_CLASS_CDC_DATA,                           /* class */
   CDC_DATA_SUBCLASS_NONE,                       /* subclass */
   CDC_DATA_PROTO_NONE,                          /* proto */
-#ifdef CONFIG_CDCSER_DATAIFSTR
-  CDCSER_DATAIFSTRID                            /* iif */
+#ifdef CONFIG_CDCACM_DATAIFSTR
+  CDCACM_DATAIFSTRID                            /* iif */
 #else
   0                                             /* iif */
 #endif
@@ -232,11 +232,11 @@ static const struct usb_epdesc_s g_epbulkoutdesc =
 {
   USB_SIZEOF_EPDESC,                            /* len */
   USB_DESC_TYPE_ENDPOINT,                       /* type */
-  CDCSER_EPOUTBULK_ADDR,                        /* addr */
-  CDCSER_EPOUTBULK_ATTR,                        /* attr */
+  CDCACM_EPOUTBULK_ADDR,                        /* addr */
+  CDCACM_EPOUTBULK_ATTR,                        /* attr */
   {
-    LSBYTE(CONFIG_CDCSER_EPBULKOUT_FSSIZE),     /* maxpacket (full speed) */
-    MSBYTE(CONFIG_CDCSER_EPBULKOUT_FSSIZE)
+    LSBYTE(CONFIG_CDCACM_EPBULKOUT_FSSIZE),     /* maxpacket (full speed) */
+    MSBYTE(CONFIG_CDCACM_EPBULKOUT_FSSIZE)
   },
   1                                             /* interval */
 };
@@ -247,11 +247,11 @@ static const struct usb_epdesc_s g_epbulkindesc =
 {
   USB_SIZEOF_EPDESC,                            /* len */
   USB_DESC_TYPE_ENDPOINT,                       /* type */
-  CDCSER_EPINBULK_ADDR,                         /* addr */
-  CDCSER_EPINBULK_ATTR,                         /* attr */
+  CDCACM_EPINBULK_ADDR,                         /* addr */
+  CDCACM_EPINBULK_ATTR,                         /* attr */
   {
-    LSBYTE(CONFIG_CDCSER_EPBULKIN_FSSIZE),      /* maxpacket (full speed) */
-    MSBYTE(CONFIG_CDCSER_EPBULKIN_FSSIZE)
+    LSBYTE(CONFIG_CDCACM_EPBULKIN_FSSIZE),      /* maxpacket (full speed) */
+    MSBYTE(CONFIG_CDCACM_EPBULKIN_FSSIZE)
   },
   1                                             /* interval */
 };
@@ -266,14 +266,14 @@ static const struct usb_epdesc_s g_epbulkindesc =
  * instead of compile time, there should no issues there either.
  */
 
-static const struct cfgdecsc_group_s g_cfggroup[CDCSER_CFGGROUP_SIZE] =
+static const struct cfgdecsc_group_s g_cfggroup[CDCACM_CFGGROUP_SIZE] =
 {
   /* Configuration Descriptor.  If the serial device is used in as part
    * or a composite device, then the configuration descriptor is
    * provided by the composite device logic.
    */
 
-#ifndef CONFIG_CDCSER_COMPOSITE
+#ifndef CONFIG_CDCACM_COMPOSITE
   {
     USB_SIZEOF_CFGDESC,            /* 1. Configuration descriptor */
     0,
@@ -302,7 +302,7 @@ static const struct cfgdecsc_group_s g_cfggroup[CDCSER_CFGGROUP_SIZE] =
   },
   {
     USB_SIZEOF_EPDESC,             /* 6. Interrupt IN endpoint descriptor */
-    CONFIG_CDCSER_EPINTIN_HSSIZE,
+    CONFIG_CDCACM_EPINTIN_HSSIZE,
     (FAR void *)&g_epintindesc
   },
   {
@@ -312,17 +312,17 @@ static const struct cfgdecsc_group_s g_cfggroup[CDCSER_CFGGROUP_SIZE] =
   },
   {
     USB_SIZEOF_EPDESC,             /* 8. Bulk OUT endpoint descriptor */
-    CONFIG_CDCSER_EPBULKOUT_HSSIZE,
+    CONFIG_CDCACM_EPBULKOUT_HSSIZE,
     (FAR void *)&g_epbulkoutdesc
   },
   {
     USB_SIZEOF_EPDESC,             /* 9. Bulk OUT endpoint descriptor */
-    CONFIG_CDCSER_EPBULKIN_HSSIZE,
+    CONFIG_CDCACM_EPBULKIN_HSSIZE,
     (FAR void *)&g_epbulkindesc
   }
 };
 
-#if !defined(CONFIG_CDCSER_COMPOSITE) && defined(CONFIG_USBDEV_DUALSPEED)
+#if !defined(CONFIG_CDCACM_COMPOSITE) && defined(CONFIG_USBDEV_DUALSPEED)
 static const struct usb_qualdesc_s g_qualdesc =
 {
   USB_SIZEOF_QUALDESC,                          /* len */
@@ -334,8 +334,8 @@ static const struct usb_qualdesc_s g_qualdesc =
   USB_CLASS_VENDOR_SPEC,                        /* class */
   0,                                            /* subclass */
   0,                                            /* protocol */
-  CONFIG_CDCSER_EP0MAXPACKET,                   /* mxpacketsize */
-  CDCSER_NCONFIGS,                              /* nconfigs */
+  CONFIG_CDCACM_EP0MAXPACKET,                   /* mxpacketsize */
+  CDCACM_NCONFIGS,                              /* nconfigs */
   0,                                            /* reserved */
 };
 #endif
@@ -349,17 +349,17 @@ static const struct usb_qualdesc_s g_qualdesc =
  ****************************************************************************/
 
 /****************************************************************************
- * Name: cdcser_mkstrdesc
+ * Name: cdcacm_mkstrdesc
  *
  * Description:
  *   Construct a string descriptor
  *
  ****************************************************************************/
 
-int cdcser_mkstrdesc(uint8_t id, struct usb_strdesc_s *strdesc)
+int cdcacm_mkstrdesc(uint8_t id, struct usb_strdesc_s *strdesc)
 {
-#if !defined(CONFIG_CDCSER_COMPOSITE) || defined(CONFIG_CDCSER_NOTIFSTR) || \
-     defined(CONFIG_CDCSER_DATAIFSTR)
+#if !defined(CONFIG_CDCACM_COMPOSITE) || defined(CONFIG_CDCACM_NOTIFSTR) || \
+     defined(CONFIG_CDCACM_DATAIFSTR)
 
   const char *str;
   int len;
@@ -368,44 +368,44 @@ int cdcser_mkstrdesc(uint8_t id, struct usb_strdesc_s *strdesc)
 
   switch (id)
     {
-#ifndef CONFIG_CDCSER_COMPOSITE
+#ifndef CONFIG_CDCACM_COMPOSITE
     case 0:
       {
         /* Descriptor 0 is the language id */
 
         strdesc->len     = 4;
         strdesc->type    = USB_DESC_TYPE_STRING;
-        strdesc->data[0] = LSBYTE(CDCSER_STR_LANGUAGE);
-        strdesc->data[1] = MSBYTE(CDCSER_STR_LANGUAGE);
+        strdesc->data[0] = LSBYTE(CDCACM_STR_LANGUAGE);
+        strdesc->data[1] = MSBYTE(CDCACM_STR_LANGUAGE);
         return 4;
       }
 
-    case CDCSER_MANUFACTURERSTRID:
-      str = CONFIG_CDCSER_VENDORSTR;
+    case CDCACM_MANUFACTURERSTRID:
+      str = CONFIG_CDCACM_VENDORSTR;
       break;
 
-    case CDCSER_PRODUCTSTRID:
-      str = CONFIG_CDCSER_PRODUCTSTR;
+    case CDCACM_PRODUCTSTRID:
+      str = CONFIG_CDCACM_PRODUCTSTR;
       break;
 
-    case CDCSER_SERIALSTRID:
-      str = CONFIG_CDCSER_SERIALSTR;
+    case CDCACM_SERIALSTRID:
+      str = CONFIG_CDCACM_SERIALSTR;
       break;
 
-    case CDCSER_CONFIGSTRID:
-      str = CONFIG_CDCSER_CONFIGSTR;
+    case CDCACM_CONFIGSTRID:
+      str = CONFIG_CDCACM_CONFIGSTR;
       break;
 #endif
 
-#ifdef CONFIG_CDCSER_NOTIFSTR
-    case CDCSER_NOTIFSTRID:
-      str = CONFIG_CDCSER_NOTIFSTR;
+#ifdef CONFIG_CDCACM_NOTIFSTR
+    case CDCACM_NOTIFSTRID:
+      str = CONFIG_CDCACM_NOTIFSTR;
       break;
 #endif
 
-#ifdef CONFIG_CDCSER_DATAIFSTR
-    case CDCSER_DATAIFSTRID:
-      str = CONFIG_CDCSER_DATAIFSTR;
+#ifdef CONFIG_CDCACM_DATAIFSTR
+    case CDCACM_DATAIFSTRID:
+      str = CONFIG_CDCACM_DATAIFSTR;
       break;
 #endif
 
@@ -433,22 +433,22 @@ int cdcser_mkstrdesc(uint8_t id, struct usb_strdesc_s *strdesc)
 }
 
 /****************************************************************************
- * Name: cdcser_getepdesc
+ * Name: cdcacm_getepdesc
  *
  * Description:
  *   Return a pointer to the raw device descriptor
  *
  ****************************************************************************/
 
-#ifndef CONFIG_CDCSER_COMPOSITE
-FAR const struct usb_devdesc_s *cdcser_getdevdesc(void)
+#ifndef CONFIG_CDCACM_COMPOSITE
+FAR const struct usb_devdesc_s *cdcacm_getdevdesc(void)
 {
   return &g_devdesc;
 }
 #endif
 
 /****************************************************************************
- * Name: cdcser_getepdesc
+ * Name: cdcacm_getepdesc
  *
  * Description:
  *   Return a pointer to the raw endpoint struct (used for configuring
@@ -456,17 +456,17 @@ FAR const struct usb_devdesc_s *cdcser_getdevdesc(void)
  *
  ****************************************************************************/
 
-FAR const struct usb_epdesc_s *cdcser_getepdesc(enum cdcser_epdesc_e epid)
+FAR const struct usb_epdesc_s *cdcacm_getepdesc(enum cdcacm_epdesc_e epid)
 {
   switch (epid)
     {
-      case CDCSER_EPINTIN:       /* Interrupt IN endpoint */
+      case CDCACM_EPINTIN:       /* Interrupt IN endpoint */
         return &g_epintindesc;
 
-      case CDCSER_EPBULKOUT:     /* Bulk OUT endpoint */
+      case CDCACM_EPBULKOUT:     /* Bulk OUT endpoint */
         return &g_epbulkoutdesc;
 
-      case CDCSER_EPBULKIN:      /* Bulk IN endpoint */
+      case CDCACM_EPBULKIN:      /* Bulk IN endpoint */
         return &g_epbulkindesc;
 
       default:
@@ -475,7 +475,7 @@ FAR const struct usb_epdesc_s *cdcser_getepdesc(enum cdcser_epdesc_e epid)
 }
 
 /****************************************************************************
- * Name: cdcser_mkepdesc
+ * Name: cdcacm_mkepdesc
  *
  * Description:
  *   Construct the endpoint descriptor using the correct max packet size.
@@ -483,14 +483,14 @@ FAR const struct usb_epdesc_s *cdcser_getepdesc(enum cdcser_epdesc_e epid)
  ****************************************************************************/
 
 #ifdef CONFIG_USBDEV_DUALSPEED
-void cdcser_mkepdesc(num cdcser_epdesc_e epid, uint16_t mxpacket,
+void cdcacm_mkepdesc(num cdcacm_epdesc_e epid, uint16_t mxpacket,
                      FAR struct usb_epdesc_s *outdesc)
 {
   FAR const struct usb_epdesc_s *indesc;
 
   /* Copy the "canned" descriptor */
 
-  indesc = cdcser_getepdesc(epid)
+  indesc = cdcacm_getepdesc(epid)
   memcpy(outdesc, indesc, USB_SIZEOF_EPDESC);
 
   /* Then add the correct max packet size */
@@ -501,7 +501,7 @@ void cdcser_mkepdesc(num cdcser_epdesc_e epid, uint16_t mxpacket,
 #endif
 
 /****************************************************************************
- * Name: cdcser_mkcfgdesc
+ * Name: cdcacm_mkcfgdesc
  *
  * Description:
  *   Construct the configuration descriptor
@@ -509,9 +509,9 @@ void cdcser_mkepdesc(num cdcser_epdesc_e epid, uint16_t mxpacket,
  ****************************************************************************/
 
 #ifdef CONFIG_USBDEV_DUALSPEED
-int16_t cdcser_mkcfgdesc(FAR uint8_t *buf, uint8_t speed, uint8_t type)
+int16_t cdcacm_mkcfgdesc(FAR uint8_t *buf, uint8_t speed, uint8_t type)
 #else
-int16_t cdcser_mkcfgdesc(FAR uint8_t *buf)
+int16_t cdcacm_mkcfgdesc(FAR uint8_t *buf)
 #endif
 {
   FAR const struct cfgdecsc_group_s *group;
@@ -531,7 +531,7 @@ int16_t cdcser_mkcfgdesc(FAR uint8_t *buf)
 
   /* Copy all of the descriptors in the group */
 
-  for (i = 0, dest = buf; i < CDCSER_CFGGROUP_SIZE; i++)
+  for (i = 0, dest = buf; i < CDCACM_CFGGROUP_SIZE; i++)
     {
       group = &g_cfggroup[i];
 
@@ -547,7 +547,7 @@ int16_t cdcser_mkcfgdesc(FAR uint8_t *buf)
 #ifdef CONFIG_USBDEV_DUALSPEED
       if (highspeed && group->hsepsize != 0)
         {
-          cdcser_mkepdesc(group->desc, group->hsepsize,
+          cdcacm_mkepdesc(group->desc, group->hsepsize,
                             (FAR struct usb_epdesc_s*)dest);
         }
       else
@@ -565,19 +565,19 @@ int16_t cdcser_mkcfgdesc(FAR uint8_t *buf)
       dest += group->descsize;
     }
 
-  return SIZEOF_CDCSER_CFGDESC;
+  return SIZEOF_CDCACM_CFGDESC;
 }
 
 /****************************************************************************
- * Name: cdcser_getqualdesc
+ * Name: cdcacm_getqualdesc
  *
  * Description:
  *   Return a pointer to the raw qual descriptor
  *
  ****************************************************************************/
 
-#if !defined(CONFIG_CDCSER_COMPOSITE) && defined(CONFIG_USBDEV_DUALSPEED)
-FAR const struct usb_qualdesc_s *cdcser_getqualdesc(void)
+#if !defined(CONFIG_CDCACM_COMPOSITE) && defined(CONFIG_USBDEV_DUALSPEED)
+FAR const struct usb_qualdesc_s *cdcacm_getqualdesc(void)
 {
   return &g_qualdesc;
 }
diff --git a/drivers/usbdev/composite.h b/drivers/usbdev/composite.h
index 93f91f1802b..18ac7d53e8e 100644
--- a/drivers/usbdev/composite.h
+++ b/drivers/usbdev/composite.h
@@ -50,8 +50,8 @@
 
 #ifdef CONFIG_USBDEV_COMPOSITE
 
-#ifdef CONFIG_CDCSER_COMPOSITE
-#  include <nuttx/usb/cdc_serial.h>
+#ifdef CONFIG_CDCACM_COMPOSITE
+#  include <nuttx/usb/cdcacm.h>
 #  include "cdcacm.h"
 #endif
 
@@ -124,18 +124,18 @@
  * the CDC serial device or the mass storage device.
  */
 
-#if defined(CONFIG_CDCSER_COMPOSITE)
+#if defined(CONFIG_CDCACM_COMPOSITE)
 #  define DEV1_IS_CDCACM   1
-#  define DEV1_MKCFGDESC      cdcser_mkcfgdesc
+#  define DEV1_MKCFGDESC      cdcacm_mkcfgdesc
 #  define DEV1_CLASSOBJECT    board_cdcclassobject
-#  define DEV1_NCONFIGS       CDCSER_NCONFIGS
-#  define DEV1_CONFIGID       CDCSER_CONFIGID
-#  define DEV1_FIRSTINTERFACE CONFIG_CDCSER_IFNOBASE
-#  define DEV1_NINTERFACES    CDCSER_NINTERFACES
-#  define DEV1_FIRSTSTRID     CONFIG_CDCSER_STRBASE
-#  define DEV1_NSTRIDS        (CDCSER_LASTSTRID-CONFIG_CDCSER_STRBASE)
-#  define DEV1_CFGDESCSIZE    SIZEOF_CDCSER_CFGDESC
-#elif defined(CONFIG_CDCSER_COMPOSITE)
+#  define DEV1_NCONFIGS       CDCACM_NCONFIGS
+#  define DEV1_CONFIGID       CDCACM_CONFIGID
+#  define DEV1_FIRSTINTERFACE CONFIG_CDCACM_IFNOBASE
+#  define DEV1_NINTERFACES    CDCACM_NINTERFACES
+#  define DEV1_FIRSTSTRID     CONFIG_CDCACM_STRBASE
+#  define DEV1_NSTRIDS        (CDCACM_LASTSTRID-CONFIG_CDCACM_STRBASE)
+#  define DEV1_CFGDESCSIZE    SIZEOF_CDCACM_CFGDESC
+#elif defined(CONFIG_CDCACM_COMPOSITE)
 #  define DEV1_IS_USBMSC     1
 #  define DEV1_MKCFGDESC      usbmsc_mkcfgdesc
 #  define DEV1_CLASSOBJECT    board_mscclassobject
@@ -154,18 +154,18 @@
  * the CDC serial device or the mass storage device.
  */
 
-#if defined(CONFIG_CDCSER_COMPOSITE) && !defined(DEV1_IS_CDCACM)
+#if defined(CONFIG_CDCACM_COMPOSITE) && !defined(DEV1_IS_CDCACM)
 #  define DEV2_IS_CDCACM 1
-#  define DEV2_MKCFGDESC      cdcser_mkcfgdesc
+#  define DEV2_MKCFGDESC      cdcacm_mkcfgdesc
 #  define DEV2_CLASSOBJECT    board_cdcclassobject
-#  define DEV2_NCONFIGS       CDCSER_NCONFIGS
-#  define DEV2_CONFIGID       CDCSER_CONFIGID
-#  define DEV2_FIRSTINTERFACE CONFIG_CDCSER_IFNOBASE
-#  define DEV2_NINTERFACES    CDCSER_NINTERFACES
-#  define DEV2_FIRSTSTRID     CONFIG_CDCSER_STRBASE
-#  define DEV2_NSTRIDS        (CDCSER_LASTSTRID-CONFIG_CDCSER_STRBASE)
-#  define DEV2_CFGDESCSIZE    SIZEOF_CDCSER_CFGDESC
-#elif defined(CONFIG_CDCSER_COMPOSITE) && !defined(DEV1_IS_USBMSC)
+#  define DEV2_NCONFIGS       CDCACM_NCONFIGS
+#  define DEV2_CONFIGID       CDCACM_CONFIGID
+#  define DEV2_FIRSTINTERFACE CONFIG_CDCACM_IFNOBASE
+#  define DEV2_NINTERFACES    CDCACM_NINTERFACES
+#  define DEV2_FIRSTSTRID     CONFIG_CDCACM_STRBASE
+#  define DEV2_NSTRIDS        (CDCACM_LASTSTRID-CONFIG_CDCACM_STRBASE)
+#  define DEV2_CFGDESCSIZE    SIZEOF_CDCACM_CFGDESC
+#elif defined(CONFIG_CDCACM_COMPOSITE) && !defined(DEV1_IS_USBMSC)
 #  define DEV2_IS_USBMSC     1
 #  define DEV2_MKCFGDESC      usbmsc_mkcfgdesc
 #  define DEV2_CLASSOBJECT    board_mscclassobject
@@ -173,7 +173,7 @@
 #  define DEV2_CONFIGID       USBMSC_CONFIGID
 #  define DEV2_FIRSTINTERFACE CONFIG_USBMSC_IFNOBASE
 #  define DEV2_NINTERFACES    USBMSC_NINTERFACES
-#  define DEV2_FIRSTSTRID     CONFIG_CDCSER_STRBASE
+#  define DEV2_FIRSTSTRID     CONFIG_CDCACM_STRBASE
 #  define DEV2_NSTRIDS        (USBMSC_LASTSTRID-CONFIG_USBMSC_STRBASE)
 #  define DEV2_CFGDESCSIZE    SIZEOF_USBMSC_CFGDESC
 #else
diff --git a/drivers/usbdev/msc.c b/drivers/usbdev/msc.c
index b70d89d4433..a040128d80c 100644
--- a/drivers/usbdev/msc.c
+++ b/drivers/usbdev/msc.c
@@ -1580,7 +1580,7 @@ int usbmsc_exportluns(FAR void *handle)
 
   /* Register the USB storage class driver (unless we are part of a composite device) */
 
-#ifndef CONFIG_CDCSER_COMPOSITE
+#ifndef CONFIG_USBMSC_COMPOSITE
   ret = usbdev_register(&drvr->drvr);
   if (ret != OK)
     {
@@ -1666,7 +1666,7 @@ void usbmsc_uninitialize(FAR void *handle)
 
   /* Unregister the driver (unless we are a part of a composite device */
 
-#ifndef CONFIG_CDCSER_COMPOSITE
+#ifndef CONFIG_USBMSC_COMPOSITE
   usbdev_unregister(&alloc->drvr.drvr);
 #endif
 
diff --git a/drivers/usbdev/msc.h b/drivers/usbdev/msc.h
index 47cca0e8af5..587649cac5a 100644
--- a/drivers/usbdev/msc.h
+++ b/drivers/usbdev/msc.h
@@ -110,7 +110,7 @@
 
 /* Packet and request buffer sizes */
 
-#ifndef CONFIG_CDCSER_COMPOSITE
+#ifndef CONFIG_USBMSC_COMPOSITE
 #  ifndef CONFIG_USBMSC_EP0MAXPACKET
 #    define CONFIG_USBMSC_EP0MAXPACKET 64
 #  endif
diff --git a/drivers/usbdev/pl2303.c b/drivers/usbdev/pl2303.c
index 86e55fefbee..9759b714d3e 100644
--- a/drivers/usbdev/pl2303.c
+++ b/drivers/usbdev/pl2303.c
@@ -68,66 +68,66 @@
 
 /* Number of requests in the write queue */
 
-#ifndef CONFIG_USBSER_NWRREQS
-#  define CONFIG_USBSER_NWRREQS 4
+#ifndef CONFIG_PL2303_NWRREQS
+#  define CONFIG_PL2303_NWRREQS 4
 #endif
 
 /* Number of requests in the read queue */
 
-#ifndef CONFIG_USBSER_NRDREQS
-#  define CONFIG_USBSER_NRDREQS 4
+#ifndef CONFIG_PL2303_NRDREQS
+#  define CONFIG_PL2303_NRDREQS 4
 #endif
 
 /* Logical endpoint numbers / max packet sizes */
 
-#ifndef CONFIG_USBSER_EPINTIN
+#ifndef CONFIG_PL2303_EPINTIN
 #  warning "EPINTIN not defined in the configuration"
-#  define CONFIG_USBSER_EPINTIN 1
+#  define CONFIG_PL2303_EPINTIN 1
 #endif
 
-#ifndef CONFIG_USBSER_EPBULKOUT
+#ifndef CONFIG_PL2303_EPBULKOUT
 #  warning "EPBULKOUT not defined in the configuration"
-#  define CONFIG_USBSER_EPBULKOUT 2
+#  define CONFIG_PL2303_EPBULKOUT 2
 #endif
 
-#ifndef CONFIG_USBSER_EPBULKIN
+#ifndef CONFIG_PL2303_EPBULKIN
 #  warning "EPBULKIN not defined in the configuration"
-#  define CONFIG_USBSER_EPBULKIN 3
+#  define CONFIG_PL2303_EPBULKIN 3
 #endif
 
 /* Packet and request buffer sizes */
 
-#ifndef CONFIG_USBSER_EP0MAXPACKET
-#  define CONFIG_USBSER_EP0MAXPACKET 64
+#ifndef CONFIG_PL2303_EP0MAXPACKET
+#  define CONFIG_PL2303_EP0MAXPACKET 64
 #endif
 
-#undef CONFIG_USBSER_BULKREQLEN
+#undef CONFIG_PL2303_BULKREQLEN
 
 /* Vendor and product IDs and strings */
 
-#ifndef CONFIG_USBSER_VENDORID
-#  define CONFIG_USBSER_VENDORID  0x067b
+#ifndef CONFIG_PL2303_VENDORID
+#  define CONFIG_PL2303_VENDORID  0x067b
 #endif
 
-#ifndef CONFIG_USBSER_PRODUCTID
-#  define CONFIG_USBSER_PRODUCTID 0x2303
+#ifndef CONFIG_PL2303_PRODUCTID
+#  define CONFIG_PL2303_PRODUCTID 0x2303
 #endif
 
-#ifndef CONFIG_USBSER_VENDORSTR
+#ifndef CONFIG_PL2303_VENDORSTR
 #  warning "No Vendor string specified"
-#  define CONFIG_USBSER_VENDORSTR  "NuttX"
+#  define CONFIG_PL2303_VENDORSTR  "NuttX"
 #endif
 
-#ifndef CONFIG_USBSER_PRODUCTSTR
+#ifndef CONFIG_PL2303_PRODUCTSTR
 #  warning "No Product string specified"
-#  define CONFIG_USBSER_PRODUCTSTR "USBdev Serial"
+#  define CONFIG_PL2303_PRODUCTSTR "USBdev Serial"
 #endif
 
-#undef CONFIG_USBSER_SERIALSTR
-#define CONFIG_USBSER_SERIALSTR "0"
+#undef CONFIG_PL2303_SERIALSTR
+#define CONFIG_PL2303_SERIALSTR "0"
 
-#undef CONFIG_USBSER_CONFIGSTR
-#define CONFIG_USBSER_CONFIGSTR "Bulk"
+#undef CONFIG_PL2303_CONFIGSTR
+#define CONFIG_PL2303_CONFIGSTR "Bulk"
 
 /* USB Controller */
 
@@ -151,41 +151,41 @@
 
 /* These settings are not modifiable via the NuttX configuration */
 
-#define USBSER_VERSIONNO           (0x0202) /* Device version number */
-#define USBSER_CONFIGIDNONE        (0)      /* Config ID means to return to address mode */
-#define USBSER_CONFIGID            (1)      /* The only supported configuration ID */
-#define USBSER_NCONFIGS            (1)      /* Number of configurations supported */
-#define USBSER_INTERFACEID         (0)
-#define USBSER_ALTINTERFACEID      (0)
-#define USBSER_NINTERFACES         (1)      /* Number of interfaces in the configuration */
-#define USBSER_NENDPOINTS          (3)      /* Number of endpoints in the interface  */
+#define PL2303_VERSIONNO           (0x0202) /* Device version number */
+#define PL2303_CONFIGIDNONE        (0)      /* Config ID means to return to address mode */
+#define PL2303_CONFIGID            (1)      /* The only supported configuration ID */
+#define PL2303_NCONFIGS            (1)      /* Number of configurations supported */
+#define PL2303_INTERFACEID         (0)
+#define PL2303_ALTINTERFACEID      (0)
+#define PL2303_NINTERFACES         (1)      /* Number of interfaces in the configuration */
+#define PL2303_NENDPOINTS          (3)      /* Number of endpoints in the interface  */
 
 /* Endpoint configuration */
 
-#define USBSER_EPINTIN_ADDR        (USB_DIR_IN|CONFIG_USBSER_EPINTIN)
-#define USBSER_EPINTIN_ATTR        (USB_EP_ATTR_XFER_INT)
-#define USBSER_EPINTIN_MXPACKET    (10)
+#define PL2303_EPINTIN_ADDR        (USB_DIR_IN|CONFIG_PL2303_EPINTIN)
+#define PL2303_EPINTIN_ATTR        (USB_EP_ATTR_XFER_INT)
+#define PL2303_EPINTIN_MXPACKET    (10)
 
-#define USBSER_EPOUTBULK_ADDR      (CONFIG_USBSER_EPBULKOUT)
-#define USBSER_EPOUTBULK_ATTR      (USB_EP_ATTR_XFER_BULK)
+#define PL2303_EPOUTBULK_ADDR      (CONFIG_PL2303_EPBULKOUT)
+#define PL2303_EPOUTBULK_ATTR      (USB_EP_ATTR_XFER_BULK)
 
-#define USBSER_EPINBULK_ADDR       (USB_DIR_IN|CONFIG_USBSER_EPBULKIN)
-#define USBSER_EPINBULK_ATTR       (USB_EP_ATTR_XFER_BULK)
+#define PL2303_EPINBULK_ADDR       (USB_DIR_IN|CONFIG_PL2303_EPBULKIN)
+#define PL2303_EPINBULK_ATTR       (USB_EP_ATTR_XFER_BULK)
 
 /* String language */
 
-#define USBSER_STR_LANGUAGE        (0x0409) /* en-us */
+#define PL2303_STR_LANGUAGE        (0x0409) /* en-us */
 
 /* Descriptor strings */
 
-#define USBSER_MANUFACTURERSTRID   (1)
-#define USBSER_PRODUCTSTRID        (2)
-#define USBSER_SERIALSTRID         (3)
-#define USBSER_CONFIGSTRID         (4)
+#define PL2303_MANUFACTURERSTRID   (1)
+#define PL2303_PRODUCTSTRID        (2)
+#define PL2303_SERIALSTRID         (3)
+#define PL2303_CONFIGSTRID         (4)
 
 /* Buffer big enough for any of our descriptors */
 
-#define USBSER_MXDESCLEN           (64)
+#define PL2303_MXDESCLEN           (64)
 
 /* Vender specific control requests *******************************************/
 
@@ -214,18 +214,18 @@
 
 /* Trace values *************************************************************/
 
-#define USBSER_CLASSAPI_SETUP       TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_SETUP)
-#define USBSER_CLASSAPI_SHUTDOWN    TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_SHUTDOWN)
-#define USBSER_CLASSAPI_ATTACH      TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_ATTACH)
-#define USBSER_CLASSAPI_DETACH      TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_DETACH)
-#define USBSER_CLASSAPI_IOCTL       TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_IOCTL)
-#define USBSER_CLASSAPI_RECEIVE     TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_RECEIVE)
-#define USBSER_CLASSAPI_RXINT       TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_RXINT)
-#define USBSER_CLASSAPI_RXAVAILABLE TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_RXAVAILABLE)
-#define USBSER_CLASSAPI_SEND        TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_SEND)
-#define USBSER_CLASSAPI_TXINT       TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_TXINT)
-#define USBSER_CLASSAPI_TXREADY     TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_TXREADY)
-#define USBSER_CLASSAPI_TXEMPTY     TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_TXEMPTY)
+#define PL2303_CLASSAPI_SETUP       TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_SETUP)
+#define PL2303_CLASSAPI_SHUTDOWN    TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_SHUTDOWN)
+#define PL2303_CLASSAPI_ATTACH      TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_ATTACH)
+#define PL2303_CLASSAPI_DETACH      TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_DETACH)
+#define PL2303_CLASSAPI_IOCTL       TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_IOCTL)
+#define PL2303_CLASSAPI_RECEIVE     TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_RECEIVE)
+#define PL2303_CLASSAPI_RXINT       TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_RXINT)
+#define PL2303_CLASSAPI_RXAVAILABLE TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_RXAVAILABLE)
+#define PL2303_CLASSAPI_SEND        TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_SEND)
+#define PL2303_CLASSAPI_TXINT       TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_TXINT)
+#define PL2303_CLASSAPI_TXREADY     TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_TXREADY)
+#define PL2303_CLASSAPI_TXEMPTY     TRACE_EVENT(TRACE_CLASSAPI_ID, USBSER_TRACECLASSAPI_TXEMPTY)
 
 /****************************************************************************
  * Private Types
@@ -233,15 +233,15 @@
 
 /* Container to support a list of requests */
 
-struct usbser_req_s
+struct pl2303_req_s
 {
-  FAR struct usbser_req_s *flink;     /* Implements a singly linked list */
+  FAR struct pl2303_req_s *flink;     /* Implements a singly linked list */
   FAR struct usbdev_req_s *req;       /* The contained request */
 };
 
 /* This structure describes the internal state of the driver */
 
-struct usbser_dev_s
+struct pl2303_dev_s
 {
   FAR struct uart_dev_s    serdev;    /* Serial device structure */
   FAR struct usbdev_s     *usbdev;    /* usbdev driver pointer */
@@ -264,29 +264,29 @@ struct usbser_dev_s
    * EPBULKIN; Read requests will be queued in the EBULKOUT.
    */
 
-  struct usbser_req_s wrreqs[CONFIG_USBSER_NWRREQS];
-  struct usbser_req_s rdreqs[CONFIG_USBSER_NWRREQS];
+  struct pl2303_req_s wrreqs[CONFIG_PL2303_NWRREQS];
+  struct pl2303_req_s rdreqs[CONFIG_PL2303_NWRREQS];
 
   /* Serial I/O buffers */
 
-  char rxbuffer[CONFIG_USBSER_RXBUFSIZE];
-  char txbuffer[CONFIG_USBSER_TXBUFSIZE];
+  char rxbuffer[CONFIG_PL2303_RXBUFSIZE];
+  char txbuffer[CONFIG_PL2303_TXBUFSIZE];
 };
 
 /* The internal version of the class driver */
 
-struct usbser_driver_s
+struct pl2303_driver_s
 {
   struct usbdevclass_driver_s drvr;
-  FAR struct usbser_dev_s     *dev;
+  FAR struct pl2303_dev_s     *dev;
 };
 
 /* This is what is allocated */
 
-struct usbser_alloc_s
+struct pl2303_alloc_s
 {
-  struct usbser_dev_s    dev;
-  struct usbser_driver_s drvr;
+  struct pl2303_dev_s    dev;
+  struct pl2303_driver_s drvr;
 };
 
 /****************************************************************************
@@ -295,10 +295,10 @@ struct usbser_alloc_s
 
 /* Transfer helpers *********************************************************/
 
-static uint16_t usbclass_fillrequest(FAR struct usbser_dev_s *priv,
+static uint16_t usbclass_fillrequest(FAR struct pl2303_dev_s *priv,
                  uint8_t *reqbuf, uint16_t reqlen);
-static int     usbclass_sndpacket(FAR struct usbser_dev_s *priv);
-static inline int usbclass_recvpacket(FAR struct usbser_dev_s *priv,
+static int     usbclass_sndpacket(FAR struct pl2303_dev_s *priv);
+static inline int usbclass_recvpacket(FAR struct pl2303_dev_s *priv,
                  uint8_t *reqbuf, uint16_t reqlen);
 
 /* Request helpers *********************************************************/
@@ -318,8 +318,8 @@ static int16_t usbclass_mkcfgdesc(uint8_t *buf, uint8_t speed, uint8_t type);
 #else
 static int16_t usbclass_mkcfgdesc(uint8_t *buf);
 #endif
-static void    usbclass_resetconfig(FAR struct usbser_dev_s *priv);
-static int     usbclass_setconfig(FAR struct usbser_dev_s *priv,
+static void    usbclass_resetconfig(FAR struct pl2303_dev_s *priv);
+static int     usbclass_setconfig(FAR struct pl2303_dev_s *priv,
                  uint8_t config);
 
 /* Completion event handlers ***********************************************/
@@ -342,13 +342,13 @@ static void    usbclass_disconnect(FAR struct usbdev_s *dev);
 
 /* Serial port *************************************************************/
 
-static int     usbser_setup(FAR struct uart_dev_s *dev);
-static void    usbser_shutdown(FAR struct uart_dev_s *dev);
-static int     usbser_attach(FAR struct uart_dev_s *dev);
-static void    usbser_detach(FAR struct uart_dev_s *dev);
-static void    usbser_rxint(FAR struct uart_dev_s *dev, bool enable);
-static void    usbser_txint(FAR struct uart_dev_s *dev, bool enable);
-static bool    usbser_txempty(FAR struct uart_dev_s *dev);
+static int     pl2303_setup(FAR struct uart_dev_s *dev);
+static void    pl2303_shutdown(FAR struct uart_dev_s *dev);
+static int     pl2303_attach(FAR struct uart_dev_s *dev);
+static void    pl2303_detach(FAR struct uart_dev_s *dev);
+static void    pl2303_rxint(FAR struct uart_dev_s *dev, bool enable);
+static void    pl2303_txint(FAR struct uart_dev_s *dev, bool enable);
+static bool    pl2303_txempty(FAR struct uart_dev_s *dev);
 
 /****************************************************************************
  * Private Variables
@@ -370,18 +370,18 @@ static const struct usbdevclass_driverops_s g_driverops =
 
 static const struct uart_ops_s g_uartops =
 {
-  usbser_setup,         /* setup */
-  usbser_shutdown,      /* shutdown */
-  usbser_attach,        /* attach */
-  usbser_detach,        /* detach */
+  pl2303_setup,         /* setup */
+  pl2303_shutdown,      /* shutdown */
+  pl2303_attach,        /* attach */
+  pl2303_detach,        /* detach */
   NULL,                 /* ioctl */
   NULL,                 /* receive */
-  usbser_rxint,         /* rxinit */
+  pl2303_rxint,         /* rxinit */
   NULL,                 /* rxavailable */
   NULL,                 /* send */
-  usbser_txint,         /* txinit */
+  pl2303_txint,         /* txinit */
   NULL,                 /* txready */
-  usbser_txempty        /* txempty */
+  pl2303_txempty        /* txempty */
 };
 
 /* USB descriptor templates these will be copied and modified **************/
@@ -394,17 +394,17 @@ static const struct usb_devdesc_s g_devdesc =
   USB_CLASS_PER_INTERFACE,                      /* class */
   0,                                            /* subclass */
   0,                                            /* protocol */
-  CONFIG_USBSER_EP0MAXPACKET,                   /* maxpacketsize */
-  { LSBYTE(CONFIG_USBSER_VENDORID),             /* vendor */
-    MSBYTE(CONFIG_USBSER_VENDORID) },
-  { LSBYTE(CONFIG_USBSER_PRODUCTID),            /* product */
-    MSBYTE(CONFIG_USBSER_PRODUCTID) },
-  { LSBYTE(USBSER_VERSIONNO),                   /* device */
-    MSBYTE(USBSER_VERSIONNO) },
-  USBSER_MANUFACTURERSTRID,                     /* imfgr */
-  USBSER_PRODUCTSTRID,                          /* iproduct */
-  USBSER_SERIALSTRID,                           /* serno */
-  USBSER_NCONFIGS                               /* nconfigs */
+  CONFIG_PL2303_EP0MAXPACKET,                   /* maxpacketsize */
+  { LSBYTE(CONFIG_PL2303_VENDORID),             /* vendor */
+    MSBYTE(CONFIG_PL2303_VENDORID) },
+  { LSBYTE(CONFIG_PL2303_PRODUCTID),            /* product */
+    MSBYTE(CONFIG_PL2303_PRODUCTID) },
+  { LSBYTE(PL2303_VERSIONNO),                   /* device */
+    MSBYTE(PL2303_VERSIONNO) },
+  PL2303_MANUFACTURERSTRID,                     /* imfgr */
+  PL2303_PRODUCTSTRID,                          /* iproduct */
+  PL2303_SERIALSTRID,                           /* serno */
+  PL2303_NCONFIGS                               /* nconfigs */
 };
 
 static const struct usb_cfgdesc_s g_cfgdesc =
@@ -412,9 +412,9 @@ static const struct usb_cfgdesc_s g_cfgdesc =
   USB_SIZEOF_CFGDESC,                           /* len */
   USB_DESC_TYPE_CONFIG,                         /* type */
   {0, 0},                                       /* totallen -- to be provided */
-  USBSER_NINTERFACES,                           /* ninterfaces */
-  USBSER_CONFIGID,                              /* cfgvalue */
-  USBSER_CONFIGSTRID,                           /* icfg */
+  PL2303_NINTERFACES,                           /* ninterfaces */
+  PL2303_CONFIGID,                              /* cfgvalue */
+  PL2303_CONFIGSTRID,                           /* icfg */
   USB_CONFIG_ATTR_ONE|SELFPOWERED|REMOTEWAKEUP, /* attr */
   (CONFIG_USBDEV_MAXPOWER + 1) / 2              /* mxpower */
 };
@@ -425,21 +425,21 @@ static const struct usb_ifdesc_s g_ifdesc =
   USB_DESC_TYPE_INTERFACE,                      /* type */
   0,                                            /* ifno */
   0,                                            /* alt */
-  USBSER_NENDPOINTS,                            /* neps */
+  PL2303_NENDPOINTS,                            /* neps */
   USB_CLASS_VENDOR_SPEC,                        /* class */
   0,                                            /* subclass */
   0,                                            /* protocol */
-  USBSER_CONFIGSTRID                            /* iif */
+  PL2303_CONFIGSTRID                            /* iif */
 };
 
 static const struct usb_epdesc_s g_epintindesc =
 {
   USB_SIZEOF_EPDESC,                            /* len */
   USB_DESC_TYPE_ENDPOINT,                       /* type */
-  USBSER_EPINTIN_ADDR,                          /* addr */
-  USBSER_EPINTIN_ATTR,                          /* attr */
-  { LSBYTE(USBSER_EPINTIN_MXPACKET),            /* maxpacket */
-    MSBYTE(USBSER_EPINTIN_MXPACKET) },
+  PL2303_EPINTIN_ADDR,                          /* addr */
+  PL2303_EPINTIN_ATTR,                          /* attr */
+  { LSBYTE(PL2303_EPINTIN_MXPACKET),            /* maxpacket */
+    MSBYTE(PL2303_EPINTIN_MXPACKET) },
   1                                             /* interval */
 };
 
@@ -447,8 +447,8 @@ static const struct usb_epdesc_s g_epbulkoutdesc =
 {
   USB_SIZEOF_EPDESC,                            /* len */
   USB_DESC_TYPE_ENDPOINT,                       /* type */
-  USBSER_EPOUTBULK_ADDR,                        /* addr */
-  USBSER_EPOUTBULK_ATTR,                        /* attr */
+  PL2303_EPOUTBULK_ADDR,                        /* addr */
+  PL2303_EPOUTBULK_ATTR,                        /* attr */
   { LSBYTE(64), MSBYTE(64) },                   /* maxpacket -- might change to 512*/
   0                                             /* interval */
 };
@@ -457,8 +457,8 @@ static const struct usb_epdesc_s g_epbulkindesc =
 {
   USB_SIZEOF_EPDESC,                            /* len */
   USB_DESC_TYPE_ENDPOINT,                       /* type */
-  USBSER_EPINBULK_ADDR,                         /* addr */
-  USBSER_EPINBULK_ATTR,                         /* attr */
+  PL2303_EPINBULK_ADDR,                         /* addr */
+  PL2303_EPINBULK_ATTR,                         /* attr */
   { LSBYTE(64), MSBYTE(64) },                   /* maxpacket -- might change to 512*/
   0                                             /* interval */
 };
@@ -472,8 +472,8 @@ static const struct usb_qualdesc_s g_qualdesc =
   USB_CLASS_VENDOR_SPEC,                        /* class */
   0,                                            /* subclass */
   0,                                            /* protocol */
-  CONFIG_USBSER_EP0MAXPACKET,                   /* mxpacketsize */
-  USBSER_NCONFIGS,                              /* nconfigs */
+  CONFIG_PL2303_EP0MAXPACKET,                   /* mxpacketsize */
+  PL2303_NCONFIGS,                              /* nconfigs */
   0,                                            /* reserved */
 };
 #endif
@@ -498,7 +498,7 @@ static const struct usb_qualdesc_s g_qualdesc =
  *
  ************************************************************************************/
 
-static uint16_t usbclass_fillrequest(FAR struct usbser_dev_s *priv, uint8_t *reqbuf,
+static uint16_t usbclass_fillrequest(FAR struct pl2303_dev_s *priv, uint8_t *reqbuf,
                                      uint16_t reqlen)
 {
   FAR uart_dev_t *serdev = &priv->serdev;
@@ -558,11 +558,11 @@ static uint16_t usbclass_fillrequest(FAR struct usbser_dev_s *priv, uint8_t *req
  *
  ************************************************************************************/
 
-static int usbclass_sndpacket(FAR struct usbser_dev_s *priv)
+static int usbclass_sndpacket(FAR struct pl2303_dev_s *priv)
 {
   FAR struct usbdev_ep_s *ep;
   FAR struct usbdev_req_s *req;
-  FAR struct usbser_req_s *reqcontainer;
+  FAR struct pl2303_req_s *reqcontainer;
   irqstate_t flags;
   int len;
   int ret = OK;
@@ -594,7 +594,7 @@ static int usbclass_sndpacket(FAR struct usbser_dev_s *priv)
     {
       /* Peek at the request in the container at the head of the list */
 
-      reqcontainer = (struct usbser_req_s *)sq_peek(&priv->reqlist);
+      reqcontainer = (struct pl2303_req_s *)sq_peek(&priv->reqlist);
       req          = reqcontainer->req;
 
       /* Fill the request with serial TX data */
@@ -642,7 +642,7 @@ static int usbclass_sndpacket(FAR struct usbser_dev_s *priv)
  *
  ************************************************************************************/
 
-static inline int usbclass_recvpacket(FAR struct usbser_dev_s *priv,
+static inline int usbclass_recvpacket(FAR struct pl2303_dev_s *priv,
                                       uint8_t *reqbuf, uint16_t reqlen)
 {
   FAR uart_dev_t *serdev = &priv->serdev;
@@ -808,25 +808,25 @@ static int usbclass_mkstrdesc(uint8_t id, struct usb_strdesc_s *strdesc)
 
         strdesc->len     = 4;
         strdesc->type    = USB_DESC_TYPE_STRING;
-        strdesc->data[0] = LSBYTE(USBSER_STR_LANGUAGE);
-        strdesc->data[1] = MSBYTE(USBSER_STR_LANGUAGE);
+        strdesc->data[0] = LSBYTE(PL2303_STR_LANGUAGE);
+        strdesc->data[1] = MSBYTE(PL2303_STR_LANGUAGE);
         return 4;
       }
 
-    case USBSER_MANUFACTURERSTRID:
-      str = CONFIG_USBSER_VENDORSTR;
+    case PL2303_MANUFACTURERSTRID:
+      str = CONFIG_PL2303_VENDORSTR;
       break;
 
-    case USBSER_PRODUCTSTRID:
-      str = CONFIG_USBSER_PRODUCTSTR;
+    case PL2303_PRODUCTSTRID:
+      str = CONFIG_PL2303_PRODUCTSTR;
       break;
 
-    case USBSER_SERIALSTRID:
-      str = CONFIG_USBSER_SERIALSTR;
+    case PL2303_SERIALSTRID:
+      str = CONFIG_PL2303_SERIALSTR;
       break;
 
-    case USBSER_CONFIGSTRID:
-      str = CONFIG_USBSER_CONFIGSTR;
+    case PL2303_CONFIGSTRID:
+      str = CONFIG_PL2303_CONFIGSTR;
       break;
 
     default:
@@ -898,7 +898,7 @@ static int16_t usbclass_mkcfgdesc(uint8_t *buf)
    * size that we will be sending now.
    */
 
-  totallen = USB_SIZEOF_CFGDESC + USB_SIZEOF_IFDESC + USBSER_NENDPOINTS * USB_SIZEOF_EPDESC;
+  totallen = USB_SIZEOF_CFGDESC + USB_SIZEOF_IFDESC + PL2303_NENDPOINTS * USB_SIZEOF_EPDESC;
 
   /* Configuration descriptor -- Copy the canned descriptor and fill in the
    * type (we'll also need to update the size below
@@ -960,15 +960,15 @@ static int16_t usbclass_mkcfgdesc(uint8_t *buf)
  *
  ****************************************************************************/
 
-static void usbclass_resetconfig(FAR struct usbser_dev_s *priv)
+static void usbclass_resetconfig(FAR struct pl2303_dev_s *priv)
 {
   /* Are we configured? */
 
-  if (priv->config != USBSER_CONFIGIDNONE)
+  if (priv->config != PL2303_CONFIGIDNONE)
     {
       /* Yes.. but not anymore */
 
-      priv->config = USBSER_CONFIGIDNONE;
+      priv->config = PL2303_CONFIGIDNONE;
 
       /* Disable endpoints.  This should force completion of all pending
        * transfers.
@@ -989,7 +989,7 @@ static void usbclass_resetconfig(FAR struct usbser_dev_s *priv)
  *
  ****************************************************************************/
 
-static int usbclass_setconfig(FAR struct usbser_dev_s *priv, uint8_t config)
+static int usbclass_setconfig(FAR struct pl2303_dev_s *priv, uint8_t config)
 {
   FAR struct usbdev_req_s *req;
 #ifdef CONFIG_USBDEV_DUALSPEED
@@ -1021,7 +1021,7 @@ static int usbclass_setconfig(FAR struct usbser_dev_s *priv, uint8_t config)
 
   /* Was this a request to simply discard the current configuration? */
 
-  if (config == USBSER_CONFIGIDNONE)
+  if (config == PL2303_CONFIGIDNONE)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_CONFIGNONE), 0);
       return 0;
@@ -1029,7 +1029,7 @@ static int usbclass_setconfig(FAR struct usbser_dev_s *priv, uint8_t config)
 
   /* We only accept one configuration */
 
-  if (config != USBSER_CONFIGID)
+  if (config != PL2303_CONFIGID)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_CONFIGIDBAD), 0);
       return -EINVAL;
@@ -1089,7 +1089,7 @@ static int usbclass_setconfig(FAR struct usbser_dev_s *priv, uint8_t config)
   /* Queue read requests in the bulk OUT endpoint */
 
   DEBUGASSERT(priv->nrdq == 0);
-  for (i = 0; i < CONFIG_USBSER_NRDREQS; i++)
+  for (i = 0; i < CONFIG_PL2303_NRDREQS; i++)
     {
       req           = priv->rdreqs[i].req;
       req->callback = usbclass_rdcomplete;
@@ -1139,7 +1139,7 @@ static void usbclass_ep0incomplete(FAR struct usbdev_ep_s *ep,
 static void usbclass_rdcomplete(FAR struct usbdev_ep_s *ep,
                                 FAR struct usbdev_req_s *req)
 {
-  FAR struct usbser_dev_s *priv;
+  FAR struct pl2303_dev_s *priv;
   irqstate_t flags;
   int ret;
 
@@ -1155,7 +1155,7 @@ static void usbclass_rdcomplete(FAR struct usbdev_ep_s *ep,
 
   /* Extract references to private data */
 
-  priv = (FAR struct usbser_dev_s*)ep->priv;
+  priv = (FAR struct pl2303_dev_s*)ep->priv;
 
   /* Process the received data unless this is some unusual condition */
 
@@ -1180,8 +1180,8 @@ static void usbclass_rdcomplete(FAR struct usbdev_ep_s *ep,
 
   /* Requeue the read request */
 
-#ifdef CONFIG_USBSER_BULKREQLEN
-  req->len = max(CONFIG_USBSER_BULKREQLEN, ep->maxpacket);
+#ifdef CONFIG_PL2303_BULKREQLEN
+  req->len = max(CONFIG_PL2303_BULKREQLEN, ep->maxpacket);
 #else
   req->len = ep->maxpacket;
 #endif
@@ -1206,8 +1206,8 @@ static void usbclass_rdcomplete(FAR struct usbdev_ep_s *ep,
 static void usbclass_wrcomplete(FAR struct usbdev_ep_s *ep,
                                 FAR struct usbdev_req_s *req)
 {
-  FAR struct usbser_dev_s *priv;
-  FAR struct usbser_req_s *reqcontainer;
+  FAR struct pl2303_dev_s *priv;
+  FAR struct pl2303_req_s *reqcontainer;
   irqstate_t flags;
 
   /* Sanity check */
@@ -1222,8 +1222,8 @@ static void usbclass_wrcomplete(FAR struct usbdev_ep_s *ep,
 
   /* Extract references to our private data */
 
-  priv         = (FAR struct usbser_dev_s *)ep->priv;
-  reqcontainer = (FAR struct usbser_req_s *)req->priv;
+  priv         = (FAR struct pl2303_dev_s *)ep->priv;
+  reqcontainer = (FAR struct pl2303_req_s *)req->priv;
 
   /* Return the write request to the free list */
 
@@ -1267,8 +1267,8 @@ static void usbclass_wrcomplete(FAR struct usbdev_ep_s *ep,
 
 static int usbclass_bind(FAR struct usbdev_s *dev, FAR struct usbdevclass_driver_s *driver)
 {
-  FAR struct usbser_dev_s *priv = ((struct usbser_driver_s*)driver)->dev;
-  FAR struct usbser_req_s *reqcontainer;
+  FAR struct pl2303_dev_s *priv = ((struct pl2303_driver_s*)driver)->dev;
+  FAR struct pl2303_req_s *reqcontainer;
   irqstate_t flags;
   uint16_t reqlen;
   int ret;
@@ -1283,7 +1283,7 @@ static int usbclass_bind(FAR struct usbdev_s *dev, FAR struct usbdevclass_driver
 
   /* Preallocate control request */
 
-  priv->ctrlreq = usbclass_allocreq(dev->ep0, USBSER_MXDESCLEN);
+  priv->ctrlreq = usbclass_allocreq(dev->ep0, PL2303_MXDESCLEN);
   if (priv->ctrlreq == NULL)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_ALLOCCTRLREQ), 0);
@@ -1301,7 +1301,7 @@ static int usbclass_bind(FAR struct usbdev_s *dev, FAR struct usbdevclass_driver
 
   /* Pre-allocate the IN interrupt endpoint */
 
-  priv->epintin = DEV_ALLOCEP(dev, USBSER_EPINTIN_ADDR, true, USB_EP_ATTR_XFER_INT);
+  priv->epintin = DEV_ALLOCEP(dev, PL2303_EPINTIN_ADDR, true, USB_EP_ATTR_XFER_INT);
   if (!priv->epintin)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EPINTINALLOCFAIL), 0);
@@ -1312,7 +1312,7 @@ static int usbclass_bind(FAR struct usbdev_s *dev, FAR struct usbdevclass_driver
 
   /* Pre-allocate the IN bulk endpoint */
 
-  priv->epbulkin = DEV_ALLOCEP(dev, USBSER_EPINBULK_ADDR, true, USB_EP_ATTR_XFER_BULK);
+  priv->epbulkin = DEV_ALLOCEP(dev, PL2303_EPINBULK_ADDR, true, USB_EP_ATTR_XFER_BULK);
   if (!priv->epbulkin)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EPBULKINALLOCFAIL), 0);
@@ -1323,7 +1323,7 @@ static int usbclass_bind(FAR struct usbdev_s *dev, FAR struct usbdevclass_driver
 
   /* Pre-allocate the OUT bulk endpoint */
 
-  priv->epbulkout = DEV_ALLOCEP(dev, USBSER_EPOUTBULK_ADDR, false, USB_EP_ATTR_XFER_BULK);
+  priv->epbulkout = DEV_ALLOCEP(dev, PL2303_EPOUTBULK_ADDR, false, USB_EP_ATTR_XFER_BULK);
   if (!priv->epbulkout)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EPBULKOUTALLOCFAIL), 0);
@@ -1334,13 +1334,13 @@ static int usbclass_bind(FAR struct usbdev_s *dev, FAR struct usbdevclass_driver
 
   /* Pre-allocate read requests */
 
-#ifdef CONFIG_USBSER_BULKREQLEN
-  reqlen = max(CONFIG_USBSER_BULKREQLEN, priv->epbulkout->maxpacket);
+#ifdef CONFIG_PL2303_BULKREQLEN
+  reqlen = max(CONFIG_PL2303_BULKREQLEN, priv->epbulkout->maxpacket);
 #else
   reqlen = priv->epbulkout->maxpacket;
 #endif
 
-  for (i = 0; i < CONFIG_USBSER_NRDREQS; i++)
+  for (i = 0; i < CONFIG_PL2303_NRDREQS; i++)
     {
       reqcontainer      = &priv->rdreqs[i];
       reqcontainer->req = usbclass_allocreq(priv->epbulkout, reqlen);
@@ -1356,13 +1356,13 @@ static int usbclass_bind(FAR struct usbdev_s *dev, FAR struct usbdevclass_driver
 
   /* Pre-allocate write request containers and put in a free list */
 
-#ifdef CONFIG_USBSER_BULKREQLEN
-  reqlen = max(CONFIG_USBSER_BULKREQLEN, priv->epbulkin->maxpacket);
+#ifdef CONFIG_PL2303_BULKREQLEN
+  reqlen = max(CONFIG_PL2303_BULKREQLEN, priv->epbulkin->maxpacket);
 #else
   reqlen = priv->epbulkin->maxpacket;
 #endif
 
-  for (i = 0; i < CONFIG_USBSER_NWRREQS; i++)
+  for (i = 0; i < CONFIG_PL2303_NWRREQS; i++)
     {
       reqcontainer      = &priv->wrreqs[i];
       reqcontainer->req = usbclass_allocreq(priv->epbulkin, reqlen);
@@ -1407,8 +1407,8 @@ errout:
 
 static void usbclass_unbind(FAR struct usbdev_s *dev)
 {
-  FAR struct usbser_dev_s *priv;
-  FAR struct usbser_req_s *reqcontainer;
+  FAR struct pl2303_dev_s *priv;
+  FAR struct pl2303_req_s *reqcontainer;
   irqstate_t flags;
   int i;
 
@@ -1424,7 +1424,7 @@ static void usbclass_unbind(FAR struct usbdev_s *dev)
 
   /* Extract reference to private data */
 
-  priv = (FAR struct usbser_dev_s *)dev->ep0->priv;
+  priv = (FAR struct pl2303_dev_s *)dev->ep0->priv;
 
 #ifdef CONFIG_DEBUG
   if (!priv)
@@ -1477,7 +1477,7 @@ static void usbclass_unbind(FAR struct usbdev_s *dev)
        */
 
       DEBUGASSERT(priv->nrdq == 0);
-      for (i = 0; i < CONFIG_USBSER_NRDREQS; i++)
+      for (i = 0; i < CONFIG_PL2303_NRDREQS; i++)
         {
           reqcontainer = &priv->rdreqs[i];
           if (reqcontainer->req)
@@ -1500,10 +1500,10 @@ static void usbclass_unbind(FAR struct usbdev_s *dev)
        */
 
       flags = irqsave();
-      DEBUGASSERT(priv->nwrq == CONFIG_USBSER_NWRREQS);
+      DEBUGASSERT(priv->nwrq == CONFIG_PL2303_NWRREQS);
       while (!sq_empty(&priv->reqlist))
         {
-          reqcontainer = (struct usbser_req_s *)sq_remfirst(&priv->reqlist);
+          reqcontainer = (struct pl2303_req_s *)sq_remfirst(&priv->reqlist);
           if (reqcontainer->req != NULL)
             {
               usbclass_freereq(priv->epbulkin, reqcontainer->req);
@@ -1531,7 +1531,7 @@ static void usbclass_unbind(FAR struct usbdev_s *dev)
 
 static int usbclass_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *ctrl)
 {
-  FAR struct usbser_dev_s *priv;
+  FAR struct pl2303_dev_s *priv;
   FAR struct usbdev_req_s *ctrlreq;
   uint16_t value;
   uint16_t index;
@@ -1549,7 +1549,7 @@ static int usbclass_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *
   /* Extract reference to private data */
 
   usbtrace(TRACE_CLASSSETUP, ctrl->req);
-  priv = (FAR struct usbser_dev_s *)dev->ep0->priv;
+  priv = (FAR struct pl2303_dev_s *)dev->ep0->priv;
 
 #ifdef CONFIG_DEBUG
   if (!priv || !priv->ctrlreq)
@@ -1655,9 +1655,9 @@ static int usbclass_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *
             {
               if (ctrl->type == USB_REQ_RECIPIENT_INTERFACE)
                 {
-                  if (priv->config == USBSER_CONFIGID &&
-                      index == USBSER_INTERFACEID &&
-                      value == USBSER_ALTINTERFACEID)
+                  if (priv->config == PL2303_CONFIGID &&
+                      index == PL2303_INTERFACEID &&
+                      value == PL2303_ALTINTERFACEID)
                     {
                       usbclass_resetconfig(priv);
                       usbclass_setconfig(priv, priv->config);
@@ -1670,15 +1670,15 @@ static int usbclass_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *
           case USB_REQ_GETINTERFACE:
             {
               if (ctrl->type == (USB_DIR_IN|USB_REQ_RECIPIENT_INTERFACE) &&
-                  priv->config == USBSER_CONFIGIDNONE)
+                  priv->config == PL2303_CONFIGIDNONE)
                 {
-                  if (index != USBSER_INTERFACEID)
+                  if (index != PL2303_INTERFACEID)
                     {
                       ret = -EDOM;
                     }
                   else
                      {
-                      *(uint8_t*) ctrlreq->buf = USBSER_ALTINTERFACEID;
+                      *(uint8_t*) ctrlreq->buf = PL2303_ALTINTERFACEID;
                       ret = 1;
                     }
                 }
@@ -1793,7 +1793,7 @@ static int usbclass_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *
 
 static void usbclass_disconnect(FAR struct usbdev_s *dev)
 {
-  FAR struct usbser_dev_s *priv;
+  FAR struct pl2303_dev_s *priv;
   irqstate_t flags;
 
   usbtrace(TRACE_CLASSDISCONNECT, 0);
@@ -1808,7 +1808,7 @@ static void usbclass_disconnect(FAR struct usbdev_s *dev)
 
   /* Extract reference to private data */
 
-  priv = (FAR struct usbser_dev_s *)dev->ep0->priv;
+  priv = (FAR struct pl2303_dev_s *)dev->ep0->priv;
 
 #ifdef CONFIG_DEBUG
   if (!priv)
@@ -1841,18 +1841,18 @@ static void usbclass_disconnect(FAR struct usbdev_s *dev)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: usbser_setup
+ * Name: pl2303_setup
  *
  * Description:
  *   This method is called the first time that the serial port is opened.
  *
  ****************************************************************************/
 
-static int usbser_setup(FAR struct uart_dev_s *dev)
+static int pl2303_setup(FAR struct uart_dev_s *dev)
 {
-  FAR struct usbser_dev_s *priv;
+  FAR struct pl2303_dev_s *priv;
 
-  usbtrace(USBSER_CLASSAPI_SETUP, 0);
+  usbtrace(PL2303_CLASSASPI_SETUP, 0);
 
   /* Sanity check */
 
@@ -1866,11 +1866,11 @@ static int usbser_setup(FAR struct uart_dev_s *dev)
 
   /* Extract reference to private data */
 
-  priv = (FAR struct usbser_dev_s*)dev->priv;
+  priv = (FAR struct pl2303_dev_s*)dev->priv;
 
   /* Check if we have been configured */
 
-  if (priv->config == USBSER_CONFIGIDNONE)
+  if (priv->config == PL2303_CONFIGIDNONE)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_SETUPNOTCONNECTED), 0);
       return -ENOTCONN;
@@ -1880,20 +1880,20 @@ static int usbser_setup(FAR struct uart_dev_s *dev)
 }
 
 /****************************************************************************
- * Name: usbser_shutdown
+ * Name: pl2303_shutdown
  *
  * Description:
  *   This method is called when the serial port is closed.  This operation
  *   is very simple for the USB serial backend because the serial driver
  *   has already assured that the TX data has full drained -- it calls
- *   usbser_txempty() until that function returns true before calling this
+ *   pl2303_txempty() until that function returns true before calling this
  *   function.
  *
  ****************************************************************************/
 
-static void usbser_shutdown(FAR struct uart_dev_s *dev)
+static void pl2303_shutdown(FAR struct uart_dev_s *dev)
 {
-  usbtrace(USBSER_CLASSAPI_SHUTDOWN, 0);
+  usbtrace(PL2303_CLASSASPI_SHUTDOWN, 0);
 
   /* Sanity check */
 
@@ -1906,56 +1906,56 @@ static void usbser_shutdown(FAR struct uart_dev_s *dev)
 }
 
 /****************************************************************************
- * Name: usbser_attach
+ * Name: pl2303_attach
  *
  * Description:
  *   Does not apply to the USB serial class device
  *
  ****************************************************************************/
 
-static int usbser_attach(FAR struct uart_dev_s *dev)
+static int pl2303_attach(FAR struct uart_dev_s *dev)
 {
-  usbtrace(USBSER_CLASSAPI_ATTACH, 0);
+  usbtrace(PL2303_CLASSASPI_ATTACH, 0);
   return OK;
 }
 
 /****************************************************************************
- * Name: usbser_detach
+ * Name: pl2303_detach
  *
  * Description:
 *   Does not apply to the USB serial class device
   *
  ****************************************************************************/
 
-static void usbser_detach(FAR struct uart_dev_s *dev)
+static void pl2303_detach(FAR struct uart_dev_s *dev)
 {
-  usbtrace(USBSER_CLASSAPI_DETACH, 0);
+  usbtrace(PL2303_CLASSASPI_DETACH, 0);
 }
 
 /****************************************************************************
- * Name: usbser_rxint
+ * Name: pl2303_rxint
  *
  * Description:
  *   Called by the serial driver to enable or disable RX interrupts.  We, of
  *   course, have no RX interrupts but must behave consistently.  This method
  *   is called under the conditions:
  *
- *   1. With enable==true when the port is opened (just after usbser_setup
- *      and usbser_attach are called called)
+ *   1. With enable==true when the port is opened (just after pl2303_setup
+ *      and pl2303_attach are called called)
  *   2. With enable==false while transferring data from the RX buffer
  *   2. With enable==true while waiting for more incoming data
- *   3. With enable==false when the port is closed (just before usbser_detach
- *      and usbser_shutdown are called).
+ *   3. With enable==false when the port is closed (just before pl2303_detach
+ *      and pl2303_shutdown are called).
  *
  ****************************************************************************/
 
-static void usbser_rxint(FAR struct uart_dev_s *dev, bool enable)
+static void pl2303_rxint(FAR struct uart_dev_s *dev, bool enable)
 {
-  FAR struct usbser_dev_s *priv;
+  FAR struct pl2303_dev_s *priv;
   FAR uart_dev_t *serdev;
   irqstate_t flags;
 
-  usbtrace(USBSER_CLASSAPI_RXINT, (uint16_t)enable);
+  usbtrace(PL2303_CLASSASPI_RXINT, (uint16_t)enable);
 
   /* Sanity check */
 
@@ -1969,7 +1969,7 @@ static void usbser_rxint(FAR struct uart_dev_s *dev, bool enable)
 
   /* Extract reference to private data */
 
-  priv   = (FAR struct usbser_dev_s*)dev->priv;
+  priv   = (FAR struct pl2303_dev_s*)dev->priv;
   serdev = &priv->serdev;
 
   /* We need exclusive access to the RX buffer and private structure
@@ -2029,7 +2029,7 @@ static void usbser_rxint(FAR struct uart_dev_s *dev, bool enable)
 }
 
 /****************************************************************************
- * Name: usbser_txint
+ * Name: pl2303_txint
  *
  * Description:
  *   Called by the serial driver to enable or disable TX interrupts.  We, of
@@ -2042,11 +2042,11 @@ static void usbser_rxint(FAR struct uart_dev_s *dev, bool enable)
  *
  ****************************************************************************/
 
-static void usbser_txint(FAR struct uart_dev_s *dev, bool enable)
+static void pl2303_txint(FAR struct uart_dev_s *dev, bool enable)
 {
-  FAR struct usbser_dev_s *priv;
+  FAR struct pl2303_dev_s *priv;
 
-  usbtrace(USBSER_CLASSAPI_TXINT, (uint16_t)enable);
+  usbtrace(PL2303_CLASSASPI_TXINT, (uint16_t)enable);
 
   /* Sanity checks */
 
@@ -2060,7 +2060,7 @@ static void usbser_txint(FAR struct uart_dev_s *dev, bool enable)
 
  /* Extract references to private data */
 
-  priv = (FAR struct usbser_dev_s*)dev->priv;
+  priv = (FAR struct pl2303_dev_s*)dev->priv;
 
   /* If the new state is enabled and if there is data in the XMIT buffer,
    * send the next packet now.
@@ -2076,7 +2076,7 @@ static void usbser_txint(FAR struct uart_dev_s *dev, bool enable)
 }
 
 /****************************************************************************
- * Name: usbser_txempty
+ * Name: pl2303_txempty
  *
  * Description:
  *   Return true when all data has been sent.  This is called from the
@@ -2087,11 +2087,11 @@ static void usbser_txint(FAR struct uart_dev_s *dev, bool enable)
  *
  ****************************************************************************/
 
-static bool usbser_txempty(FAR struct uart_dev_s *dev)
+static bool pl2303_txempty(FAR struct uart_dev_s *dev)
 {
-  FAR struct usbser_dev_s *priv = (FAR struct usbser_dev_s*)dev->priv;
+  FAR struct pl2303_dev_s *priv = (FAR struct pl2303_dev_s*)dev->priv;
 
-  usbtrace(USBSER_CLASSAPI_TXEMPTY, 0);
+  usbtrace(PL2303_CLASSASPI_TXEMPTY, 0);
 
 #if CONFIG_DEBUG
   if (!priv)
@@ -2105,7 +2105,7 @@ static bool usbser_txempty(FAR struct uart_dev_s *dev)
    * reqlist, then there is no longer any TX data in flight.
    */
 
-  return priv->nwrq >= CONFIG_USBSER_NWRREQS;
+  return priv->nwrq >= CONFIG_PL2303_NWRREQS;
 }
 
 /****************************************************************************
@@ -2122,15 +2122,15 @@ static bool usbser_txempty(FAR struct uart_dev_s *dev)
 
 int usbdev_serialinitialize(int minor)
 {
-  FAR struct usbser_alloc_s *alloc;
-  FAR struct usbser_dev_s *priv;
-  FAR struct usbser_driver_s *drvr;
+  FAR struct pl2303_alloc_s *alloc;
+  FAR struct pl2303_dev_s *priv;
+  FAR struct pl2303_driver_s *drvr;
   char devname[16];
   int ret;
 
   /* Allocate the structures needed */
 
-  alloc = (FAR struct usbser_alloc_s*)kmalloc(sizeof(struct usbser_alloc_s));
+  alloc = (FAR struct pl2303_alloc_s*)kmalloc(sizeof(struct pl2303_alloc_s));
   if (!alloc)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_ALLOCDEVSTRUCT), 0);
@@ -2144,7 +2144,7 @@ int usbdev_serialinitialize(int minor)
 
   /* Initialize the USB serial driver structure */
 
-  memset(priv, 0, sizeof(struct usbser_dev_s));
+  memset(priv, 0, sizeof(struct pl2303_dev_s));
   sq_init(&priv->reqlist);
 
   /* Fake line status */
@@ -2159,9 +2159,9 @@ int usbdev_serialinitialize(int minor)
 
   /* Initialize the serial driver sub-structure */
 
-  priv->serdev.recv.size   = CONFIG_USBSER_RXBUFSIZE;
+  priv->serdev.recv.size   = CONFIG_PL2303_RXBUFSIZE;
   priv->serdev.recv.buffer = priv->rxbuffer;
-  priv->serdev.xmit.size   = CONFIG_USBSER_TXBUFSIZE;
+  priv->serdev.xmit.size   = CONFIG_PL2303_TXBUFSIZE;
   priv->serdev.xmit.buffer = priv->txbuffer;
   priv->serdev.ops         = &g_uartops;
   priv->serdev.priv        = priv;
@@ -2187,8 +2187,8 @@ int usbdev_serialinitialize(int minor)
 
   /* Register the USB serial console */
 
-#ifdef CONFIG_USBSER_CONSOLE
-  g_usbserialport.isconsole = true;
+#ifdef CONFIG_PL2303_CONSOLE
+  g_pl2303ialport.isconsole = true;
   ret = uart_register("/dev/console", &pri->serdev);
   if (ret < 0)
     {
diff --git a/include/nuttx/ioctl.h b/include/nuttx/ioctl.h
index 4c17f74d9ea..dd76c879f23 100644
--- a/include/nuttx/ioctl.h
+++ b/include/nuttx/ioctl.h
@@ -1,8 +1,8 @@
 /****************************************************************************
  * include/nuttx/ioctl.h
  *
- *   Copyright (C) 2008, 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2008, 2009, 2011-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -182,7 +182,7 @@
 #define _PWMIOC(nr)       _IOC(_PWMIOCBASE,nr)
 
 /* NuttX USB CDC/ACM serial driver ioctl definitions ************************/
-/* (see nuttx/usb/cdc_serial.h) */
+/* (see nuttx/usb/cdcacm.h) */
 
 #define _CAIOCVALID(c)    (_IOC_TYPE(c)==_CAIOCBASE)
 #define _CAIOC(nr)        _IOC(_CAIOCBASE,nr)
diff --git a/include/nuttx/usb/cdc_serial.h b/include/nuttx/usb/cdcacm.h
similarity index 72%
rename from include/nuttx/usb/cdc_serial.h
rename to include/nuttx/usb/cdcacm.h
index ad2c0e64fb2..3ca6f52f103 100644
--- a/include/nuttx/usb/cdc_serial.h
+++ b/include/nuttx/usb/cdcacm.h
@@ -1,8 +1,8 @@
 /****************************************************************************
- * include/nuttx/usb/cdc_serial.h
+ * include/nuttx/usb/cdcacm.h
  *
  *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_USB_CDC_SERIAL_H
-#define __INCLUDE_NUTTX_USB_CDC_SERIAL_H
+#ifndef __INCLUDE_NUTTX_USB_CDCACM_H
+#define __INCLUDE_NUTTX_USB_CDCACM_H
 
 /****************************************************************************
  * Included Files
@@ -48,74 +48,74 @@
  * Preprocessor definitions
  ****************************************************************************/
 /* Configuration ************************************************************/
-/* CONFIG_CDCSER
+/* CONFIG_CDCACM
  *   Enable compilation of the USB serial driver
- * CONFIG_CDCSER_EP0MAXPACKET
+ * CONFIG_CDCACM_EP0MAXPACKET
  *   Endpoint 0 max packet size. Default 64.
- * CONFIG_CDCSER_EPINTIN
+ * CONFIG_CDCACM_EPINTIN
  *   The logical 7-bit address of a hardware endpoint that supports
  *   interrupt IN operation.  Default 2.
- * CONFIG_CDCSER_EPINTIN_FSSIZE
+ * CONFIG_CDCACM_EPINTIN_FSSIZE
  *   Max package size for the interrupt IN endpoint if full speed mode.
  *   Default 64.
- * CONFIG_CDCSER_EPINTIN_HSSIZE
+ * CONFIG_CDCACM_EPINTIN_HSSIZE
  *   Max package size for the interrupt IN endpoint if high speed mode.
  *   Default 64.
- * CONFIG_CDCSER_EPBULKOUT
+ * CONFIG_CDCACM_EPBULKOUT
  *   The logical 7-bit address of a hardware endpoint that supports
  *   bulk OUT operation
- * CONFIG_CDCSER_EPBULKOUT_FSSIZE
+ * CONFIG_CDCACM_EPBULKOUT_FSSIZE
  *   Max package size for the bulk OUT endpoint if full speed mode.
  *   Default 64.
- * CONFIG_CDCSER_EPBULKOUT_HSSIZE
+ * CONFIG_CDCACM_EPBULKOUT_HSSIZE
  *   Max package size for the bulk OUT endpoint if high speed mode.
  *   Default 512.
- * CONFIG_CDCSER_EPBULKIN
+ * CONFIG_CDCACM_EPBULKIN
  *   The logical 7-bit address of a hardware endpoint that supports
  *   bulk IN operation
- * CONFIG_CDCSER_EPBULKIN_FSSIZE
+ * CONFIG_CDCACM_EPBULKIN_FSSIZE
  *   Max package size for the bulk IN endpoint if full speed mode.
  *   Default 64.
- * CONFIG_CDCSER_EPBULKIN_HSSIZE
+ * CONFIG_CDCACM_EPBULKIN_HSSIZE
  *   Max package size for the bulk IN endpoint if high speed mode.
  *   Default 512.
- * CONFIG_CDCSER_NWRREQS and CONFIG_CDCSER_NRDREQS
+ * CONFIG_CDCACM_NWRREQS and CONFIG_CDCACM_NRDREQS
  *   The number of write/read requests that can be in flight.
- *   CONFIG_CDCSER_NWRREQS includes write requests used for both the
+ *   CONFIG_CDCACM_NWRREQS includes write requests used for both the
  *   interrupt and bulk IN endpoints.  Default 4.
- * CONFIG_CDCSER_VENDORID and CONFIG_CDCSER_VENDORSTR
+ * CONFIG_CDCACM_VENDORID and CONFIG_CDCACM_VENDORSTR
  *   The vendor ID code/string.  Default 0x0525 and "NuttX"
  *   0x0525 is the Netchip vendor and should not be used in any
  *   products.  This default VID was selected for compatibility with
  *   the Linux CDC ACM default VID.
- * CONFIG_CDCSER_PRODUCTID and CONFIG_CDCSER_PRODUCTSTR
+ * CONFIG_CDCACM_PRODUCTID and CONFIG_CDCACM_PRODUCTSTR
  *   The product ID code/string. Default 0xa4a7 and "CDC/ACM Serial"
  *   0xa4a7 was selected for compatibility with the Linux CDC ACM
  *   default PID.
- * CONFIG_CDCSER_RXBUFSIZE and CONFIG_CDCSER_TXBUFSIZE
+ * CONFIG_CDCACM_RXBUFSIZE and CONFIG_CDCACM_TXBUFSIZE
  *   Size of the serial receive/transmit buffers. Default 256.
  */
 
 /* EP0 max packet size */
 
-#ifndef CONFIG_CDCSER_EP0MAXPACKET
-#  define CONFIG_CDCSER_EP0MAXPACKET 64
+#ifndef CONFIG_CDCACM_EP0MAXPACKET
+#  define CONFIG_CDCACM_EP0MAXPACKET 64
 #endif
 
 /* Endpoint number and size (in bytes) of the CDC serial device-to-host (IN)
  * notification interrupt endpoint.
  */
 
-#ifndef CONFIG_CDCSER_EPINTIN
-#  define CONFIG_CDCSER_EPINTIN 2
+#ifndef CONFIG_CDCACM_EPINTIN
+#  define CONFIG_CDCACM_EPINTIN 2
 #endif
 
-#ifndef CONFIG_CDCSER_EPINTIN_FSSIZE
-#  define CONFIG_CDCSER_EPINTIN_FSSIZE 64
+#ifndef CONFIG_CDCACM_EPINTIN_FSSIZE
+#  define CONFIG_CDCACM_EPINTIN_FSSIZE 64
 #endif
 
-#ifndef CONFIG_CDCSER_EPINTIN_HSSIZE
-#  define CONFIG_CDCSER_EPINTIN_HSSIZE 64
+#ifndef CONFIG_CDCACM_EPINTIN_HSSIZE
+#  define CONFIG_CDCACM_EPINTIN_HSSIZE 64
 #endif
 
 /* Endpoint number and size (in bytes) of the CDC device-to-host (IN) data
@@ -123,16 +123,16 @@
  * or high speed (HS) modes.
  */
 
-#ifndef CONFIG_CDCSER_EPBULKIN
-#  define CONFIG_CDCSER_EPBULKIN 3
+#ifndef CONFIG_CDCACM_EPBULKIN
+#  define CONFIG_CDCACM_EPBULKIN 3
 #endif
 
-#ifndef CONFIG_CDCSER_EPBULKIN_FSSIZE
-#  define CONFIG_CDCSER_EPBULKIN_FSSIZE 64
+#ifndef CONFIG_CDCACM_EPBULKIN_FSSIZE
+#  define CONFIG_CDCACM_EPBULKIN_FSSIZE 64
 #endif
 
-#ifndef CONFIG_CDCSER_EPBULKIN_HSSIZE
-#  define CONFIG_CDCSER_EPBULKIN_HSSIZE 512
+#ifndef CONFIG_CDCACM_EPBULKIN_HSSIZE
+#  define CONFIG_CDCACM_EPBULKIN_HSSIZE 512
 #endif
 
 /* Endpoint number and size (in bytes) of the CDC host-to-device (OUT) data
@@ -140,67 +140,67 @@
  * or high speed (HS) modes.
  */
 
-#ifndef CONFIG_CDCSER_EPBULKOUT
-#  define CONFIG_CDCSER_EPBULKOUT 4
+#ifndef CONFIG_CDCACM_EPBULKOUT
+#  define CONFIG_CDCACM_EPBULKOUT 4
 #endif
 
-#ifndef CONFIG_CDCSER_EPBULKOUT_FSSIZE
-#  define CONFIG_CDCSER_EPBULKOUT_FSSIZE 64
+#ifndef CONFIG_CDCACM_EPBULKOUT_FSSIZE
+#  define CONFIG_CDCACM_EPBULKOUT_FSSIZE 64
 #endif
 
-#ifndef CONFIG_CDCSER_EPBULKOUT_HSSIZE
-#  define CONFIG_CDCSER_EPBULKOUT_HSSIZE 512
+#ifndef CONFIG_CDCACM_EPBULKOUT_HSSIZE
+#  define CONFIG_CDCACM_EPBULKOUT_HSSIZE 512
 #endif
 
 /* Number of requests in the write queue.  This includes write requests used
  * for both the interrupt and bulk IN endpoints.
  */
 
-#ifndef CONFIG_CDCSER_NWRREQS
-#  define CONFIG_CDCSER_NWRREQS 4
+#ifndef CONFIG_CDCACM_NWRREQS
+#  define CONFIG_CDCACM_NWRREQS 4
 #endif
 
 /* Number of requests in the read queue */
 
-#ifndef CONFIG_CDCSER_NRDREQS
-#  define CONFIG_CDCSER_NRDREQS 4
+#ifndef CONFIG_CDCACM_NRDREQS
+#  define CONFIG_CDCACM_NRDREQS 4
 #endif
 
 /* TX/RX buffer sizes */
 
-#ifndef CONFIG_CDCSER_RXBUFSIZE
-#  define CONFIG_CDCSER_RXBUFSIZE 256
+#ifndef CONFIG_CDCACM_RXBUFSIZE
+#  define CONFIG_CDCACM_RXBUFSIZE 256
 #endif
 
-#ifndef CONFIG_CDCSER_TXBUFSIZE
-#  define CONFIG_CDCSER_TXBUFSIZE 256
+#ifndef CONFIG_CDCACM_TXBUFSIZE
+#  define CONFIG_CDCACM_TXBUFSIZE 256
 #endif
 
 /* Vendor and product IDs and strings.  The default is the Linux Netchip
  * CDC ACM VID and PID.
  */
 
-#ifndef CONFIG_CDCSER_VENDORID
-#  define CONFIG_CDCSER_VENDORID  0x0525
+#ifndef CONFIG_CDCACM_VENDORID
+#  define CONFIG_CDCACM_VENDORID  0x0525
 #endif
 
-#ifndef CONFIG_CDCSER_PRODUCTID
-#  define CONFIG_CDCSER_PRODUCTID 0xa4a7
+#ifndef CONFIG_CDCACM_PRODUCTID
+#  define CONFIG_CDCACM_PRODUCTID 0xa4a7
 #endif
 
-#ifndef CONFIG_CDCSER_VENDORSTR
-#  define CONFIG_CDCSER_VENDORSTR  "NuttX"
+#ifndef CONFIG_CDCACM_VENDORSTR
+#  define CONFIG_CDCACM_VENDORSTR  "NuttX"
 #endif
 
-#ifndef CONFIG_CDCSER_PRODUCTSTR
-#  define CONFIG_CDCSER_PRODUCTSTR "CDC ACM Serial"
+#ifndef CONFIG_CDCACM_PRODUCTSTR
+#  define CONFIG_CDCACM_PRODUCTSTR "CDC ACM Serial"
 #endif
 
-#undef CONFIG_CDCSER_SERIALSTR
-#define CONFIG_CDCSER_SERIALSTR "0"
+#undef CONFIG_CDCACM_SERIALSTR
+#define CONFIG_CDCACM_SERIALSTR "0"
 
-#undef CONFIG_CDCSER_CONFIGSTR
-#define CONFIG_CDCSER_CONFIGSTR "Bulk"
+#undef CONFIG_CDCACM_CONFIGSTR
+#define CONFIG_CDCACM_CONFIGSTR "Bulk"
 
 /* USB Controller */
 
@@ -226,7 +226,7 @@
  *
  * CAICO_REGISTERCB
  *   Register a callback for serial event notification. Argument:
- *   cdcser_callback_t.  See cdcser_callback_t type definition below.
+ *   cdcacm_callback_t.  See cdcacm_callback_t type definition below.
  *   NOTE:  The callback will most likely invoked at the interrupt level.
  *   The called back function should, therefore, limit its operations to
  *   invoking some kind of IPC to handle the serial event in some normal
@@ -235,11 +235,11 @@
  *   Get current line coding.  Argument: struct cdc_linecoding_s*.
  *   See include/nuttx/usb/cdc.h for structure definition.  This IOCTL
  *   should be called to get the data associated with the
- *   CDCSER_EVENT_LINECODING event (see devent definition below).
+ *   CDCACM_EVENT_LINECODING event (see devent definition below).
  * CAIOC_GETCTRLLINE
  *   Get control line status bits. Argument FAR int*.  See
  *   include/nuttx/usb/cdc.h for bit definitions.  This IOCTL should be
- *   called to get the data associated CDCSER_EVENT_CTRLLINE event (see event
+ *   called to get the data associated CDCACM_EVENT_CTRLLINE event (see event
  *   definition below).
  * CAIOC_NOTIFY
  *   Send a serial state to the host via the Interrupt IN endpoint.
@@ -265,26 +265,26 @@ extern "C" {
 # define EXTERN extern
 #endif
 
-/* Reported serial events.  Data is associated with CDCSER_EVENT_LINECODING
- * and CDCSER_EVENT_CTRLLINE.  The data may be obtained using CDCSER IOCTL
+/* Reported serial events.  Data is associated with CDCACM_EVENT_LINECODING
+ * and CDCACM_EVENT_CTRLLINE.  The data may be obtained using CDCACM IOCTL
  * commands described above.
  *
- * CDCSER_EVENT_LINECODING - See "Table 50: Line Coding Structure" and struct
+ * CDCACM_EVENT_LINECODING - See "Table 50: Line Coding Structure" and struct
  *   cdc_linecoding_s in include/nuttx/usb/cdc.h.
- * CDCSER_EVENT_CTRLLINE - See "Table 51: Control Signal Bitmap Values for
+ * CDCACM_EVENT_CTRLLINE - See "Table 51: Control Signal Bitmap Values for
  *   SetControlLineState" and definitions in include/nutt/usb/cdc.h
- * CDCSER_EVENT_SENDBREAK - See Paragraph "6.2.15 SendBreak." This request
+ * CDCACM_EVENT_SENDBREAK - See Paragraph "6.2.15 SendBreak." This request
  *   sends special carrier modulation that generates an RS-232 style break.
  */
 
-enum cdcser_event_e
+enum cdcacm_event_e
 {
-  CDCSER_EVENT_LINECODING = 0, /* New line coding received from host */
-  CDCSER_EVENT_CTRLLINE,       /* New control line status received from host */
-  CDCSER_EVENT_SENDBREAK       /* Send break request received */
+  CDCACM_EVENT_LINECODING = 0, /* New line coding received from host */
+  CDCACM_EVENT_CTRLLINE,       /* New control line status received from host */
+  CDCACM_EVENT_SENDBREAK       /* Send break request received */
 };
 
-typedef FAR void (*cdcser_callback_t)(enum cdcser_event_e event);
+typedef FAR void (*cdcacm_callback_t)(enum cdcacm_event_e event);
 
 /****************************************************************************
  * Public Function Prototypes
@@ -296,7 +296,7 @@ typedef FAR void (*cdcser_callback_t)(enum cdcser_event_e event);
  * Description:
  *   If the CDC serial class driver is part of composite device, then
  *   board-specific logic must provide board_cdcclassobject().  In the simplest
- *   case, board_cdcclassobject() is simply a wrapper around cdcser_classobject()
+ *   case, board_cdcclassobject() is simply a wrapper around cdcacm_classobject()
  *   that provides the correct device minor number.
  *
  * Input Parameters:
@@ -308,12 +308,12 @@ typedef FAR void (*cdcser_callback_t)(enum cdcser_event_e event);
  *
  ****************************************************************************/
 
-#if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_CDCSER_COMPOSITE)
+#if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_CDCACM_COMPOSITE)
 EXTERN int board_cdcclassobject(FAR struct usbdevclass_driver_s **classdev);
 #endif
 
 /****************************************************************************
- * Name: cdcser_classobject
+ * Name: cdcacm_classobject
  *
  * Description:
  *   Register USB serial port (and USB serial console if so configured) and
@@ -330,12 +330,12 @@ EXTERN int board_cdcclassobject(FAR struct usbdevclass_driver_s **classdev);
  *
  ****************************************************************************/
 
-#if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_CDCSER_COMPOSITE)
-int cdcser_classobject(int minor, FAR struct usbdevclass_driver_s **classdev);
+#if defined(CONFIG_USBDEV_COMPOSITE) && defined(CONFIG_CDCACM_COMPOSITE)
+int cdcacm_classobject(int minor, FAR struct usbdevclass_driver_s **classdev);
 #endif
 
 /****************************************************************************
- * Name: cdcser_initialize
+ * Name: cdcacm_initialize
  *
  * Description:
  *   Register USB serial port (and USB serial console if so configured).
@@ -349,24 +349,24 @@ int cdcser_classobject(int minor, FAR struct usbdevclass_driver_s **classdev);
  *
  ****************************************************************************/
 
-EXTERN int cdcser_initialize(int minor);
+EXTERN int cdcacm_initialize(int minor);
 
 /****************************************************************************
- * Name: cdcser_uninitialize
+ * Name: cdcacm_uninitialize
  *
  * Description:
  *   Un-initialize the USB storage class driver
  *
  * Input Parameters:
- *   handle - The handle returned by a previous call to cdcser_configure().
+ *   handle - The handle returned by a previous call to cdcacm_configure().
  *
  * Returned Value:
  *   None
  *
  ****************************************************************************/
 
-#ifndef CONFIG_CDCSER_COMPOSITE
-EXTERN void cdcser_uninitialize(FAR struct usbdevclass_driver_s *classdev);
+#ifndef CONFIG_CDCACM_COMPOSITE
+EXTERN void cdcacm_uninitialize(FAR struct usbdevclass_driver_s *classdev);
 #endif
 
 #undef EXTERN
@@ -374,4 +374,4 @@ EXTERN void cdcser_uninitialize(FAR struct usbdevclass_driver_s *classdev);
 }
 #endif
 
-#endif /* __INCLUDE_NUTTX_USB_CDC_SERIAL_H */
+#endif /* __INCLUDE_NUTTX_USB_CDCACM_H */
diff --git a/include/nuttx/usb/usbdev.h b/include/nuttx/usb/usbdev.h
index 00ded577085..8e89eddab9d 100644
--- a/include/nuttx/usb/usbdev.h
+++ b/include/nuttx/usb/usbdev.h
@@ -464,7 +464,7 @@ EXTERN int usbmsc_unbindlun(FAR void *handle, unsigned int lunno);
 EXTERN int usbmsc_exportluns(FAR void *handle);
 
 /****************************************************************************
- * Name: cdcser_classobject
+ * Name: usbmsc_classobject
  *
  * Description:
  *   .
diff --git a/include/nuttx/usb/usbdev_trace.h b/include/nuttx/usb/usbdev_trace.h
index ce9b4bebd06..bc60da211e9 100644
--- a/include/nuttx/usb/usbdev_trace.h
+++ b/include/nuttx/usb/usbdev_trace.h
@@ -170,7 +170,7 @@
 #define TRACE_CLSERROR(id)       TRACE_EVENT(TRACE_CLSERROR_ID, id)
 
 /* USB Serial driver class events *******************************************/
-
+/* Used by both the CDC/ACM and the PL2303 serial class drivers */
 /* UART interface API calls */
 
 #define USBSER_TRACECLASSAPI_SETUP                   0x0001
@@ -184,7 +184,7 @@
 #define USBSER_TRACECLASSAPI_SEND                    0x0009
 #define USBSER_TRACECLASSAPI_TXINT                   0x000a
 #define USBSER_TRACECLASSAPI_TXREADY                 0x000b
-#define USBSER_TRACECLASSAPI_TXEMPTY                 0x000c
+#define RTXEMPTY                 0x000c
 
 /* Values of the class error ID used by the USB serial driver */