diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html
index fb0a1b4a88..676e6a2e89 100644
--- a/nuttx/Documentation/NuttxPortingGuide.html
+++ b/nuttx/Documentation/NuttxPortingGuide.html
@@ -3080,7 +3080,7 @@ extern void up_ledoff(int led);
     </p>
     <p>
       <b>Examples</b>:
-      <code>drivers/usbdev/usbdev_serial.c</code> and <code>drivers/usbdev/usbdev_storage.c</code>
+      <code>drivers/usbdev/pl2303.c</code> and <code>drivers/usbdev/usbmsc.c</code>
     </p>
   </li>
   <li>
@@ -3100,8 +3100,8 @@ extern void up_ledoff(int led);
           </p>
           <p>
             <b>Examples</b>:
-            The function <code>usbdev_serialinitialize()</code> in the file <code>drivers/usbdev/usbdev_serial.c</code> and
-            the function <code></code> in the file <code>drivers/usbdev/usbdev_storage.c</code>
+            The function <code>usbdev_serialinitialize()</code> in the file <code>drivers/usbdev/pl2303.c</code> and
+            the function <code></code> in the file <code>drivers/usbdev/usbmsc.c</code>
           </p>
         </li>
         <li>
diff --git a/nuttx/arch/arm/src/stm32/chip/stm32f40xxx_memorymap.h b/nuttx/arch/arm/src/stm32/chip/stm32f40xxx_memorymap.h
index c755c075ba..5e7d80c00d 100644
--- a/nuttx/arch/arm/src/stm32/chip/stm32f40xxx_memorymap.h
+++ b/nuttx/arch/arm/src/stm32/chip/stm32f40xxx_memorymap.h
@@ -127,7 +127,7 @@
 #define STM32_UART5_BASE     0x40005000     /* 0x40005000-0x400053ff: UART5 */
 #define STM32_I2C1_BASE      0x40005400     /* 0x40005400-0x400057ff: I2C1 */
 #define STM32_I2C2_BASE      0x40005800     /* 0x40005800-0x40005Bff: I2C2 */
-#define STM32_I2C3_BASE      0x40005C00     /* 0x40005c00-0x40005fff: I2C3 */
+#define STM32_I2C3_BASE      0x40005c00     /* 0x40005c00-0x40005fff: I2C3 */
 #define STM32_CAN1_BASE      0x40006400     /* 0x40006400-0x400067ff: bxCAN1 */
 #define STM32_CAN2_BASE      0x40006800     /* 0x40006800-0x40006bff: bxCAN2 */
 #define STM32_PWR_BASE       0x40007000     /* 0x40007000-0x400073ff: Power control PWR */
diff --git a/nuttx/drivers/usbdev/Make.defs b/nuttx/drivers/usbdev/Make.defs
index d5b56683e9..445cf7817e 100644
--- a/nuttx/drivers/usbdev/Make.defs
+++ b/nuttx/drivers/usbdev/Make.defs
@@ -46,7 +46,7 @@ ifeq ($(CONFIG_CDCACM),y)
 endif
 
 ifeq ($(CONFIG_USBMSC),y)
-  CSRCS += msc.c msc_descriptors.c msc_scsi.c
+  CSRCS += usbmsc.c usbmsc_descriptors.c usbmsc_scsi.c
 endif
 
 ifeq ($(CONFIG_USBDEV_COMPOSITE),y)
diff --git a/nuttx/drivers/usbdev/composite.h b/nuttx/drivers/usbdev/composite.h
index 18ac7d53e8..114754ec4e 100644
--- a/nuttx/drivers/usbdev/composite.h
+++ b/nuttx/drivers/usbdev/composite.h
@@ -56,7 +56,7 @@
 #endif
 
 #ifdef CONFIG_USBMSC_COMPOSITE
-#  include "msc.h"
+#  include "usbmsc.h"
 #endif
 
 /****************************************************************************
diff --git a/nuttx/drivers/usbdev/msc.c b/nuttx/drivers/usbdev/usbmsc.c
similarity index 99%
rename from nuttx/drivers/usbdev/msc.c
rename to nuttx/drivers/usbdev/usbmsc.c
index a040128d80..e99342abc6 100644
--- a/nuttx/drivers/usbdev/msc.c
+++ b/nuttx/drivers/usbdev/usbmsc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * drivers/usbdev/msc.c
+ * drivers/usbdev/usbmsc.c
  *
  *   Copyright (C) 2008-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -80,7 +80,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "msc.h"
+#include "usbmsc.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/drivers/usbdev/msc.h b/nuttx/drivers/usbdev/usbmsc.h
similarity index 99%
rename from nuttx/drivers/usbdev/msc.h
rename to nuttx/drivers/usbdev/usbmsc.h
index 587649cac5..910aef8bdd 100644
--- a/nuttx/drivers/usbdev/msc.h
+++ b/nuttx/drivers/usbdev/usbmsc.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * drivers/usbdev/msc.h
+ * drivers/usbdev/usbmsc.h
  *
  *   Copyright (C) 2008-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
  *
  ****************************************************************************/
 
-#ifndef __DRIVERS_USBDEV_MSC_H
-#define __DRIVERS_USBDEV_MSC_H
+#ifndef __DRIVERS_USBDEV_USBMSC_H
+#define __DRIVERS_USBDEV_USBMSC_H
 
 /****************************************************************************
  * Included Files
@@ -686,4 +686,4 @@ EXTERN void usbmsc_deferredresponse(FAR struct usbmsc_dev_s *priv, bool failed);
 }
 #endif
 
-#endif /* #define __DRIVERS_USBDEV_MSC_H */
+#endif /* #define __DRIVERS_USBDEV_USBMSC_H */
diff --git a/nuttx/drivers/usbdev/msc_descriptors.c b/nuttx/drivers/usbdev/usbmsc_descriptors.c
similarity index 99%
rename from nuttx/drivers/usbdev/msc_descriptors.c
rename to nuttx/drivers/usbdev/usbmsc_descriptors.c
index 0c86eaba9e..30a48f1bf0 100644
--- a/nuttx/drivers/usbdev/msc_descriptors.c
+++ b/nuttx/drivers/usbdev/usbmsc_descriptors.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * drivers/usbdev/msc_descriptors.c
+ * drivers/usbdev/usbmsc_descriptors.c
  *
  *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -48,7 +48,7 @@
 #include <nuttx/usb/usb.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "msc.h"
+#include "usbmsc.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/drivers/usbdev/msc_scsi.c b/nuttx/drivers/usbdev/usbmsc_scsi.c
similarity index 99%
rename from nuttx/drivers/usbdev/msc_scsi.c
rename to nuttx/drivers/usbdev/usbmsc_scsi.c
index 0af86011f1..799f81ea66 100644
--- a/nuttx/drivers/usbdev/msc_scsi.c
+++ b/nuttx/drivers/usbdev/usbmsc_scsi.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * drivers/usbdev/msc_scsi.c
+ * drivers/usbdev/usbmsc_scsi.c
  *
  *   Copyright (C) 2008-2010, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -73,7 +73,7 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
-#include "msc.h"
+#include "usbmsc.h"
 
 /****************************************************************************
  * Pre-processor Definitions