diff --git a/drivers/usbdev/usbdev_scsi.c b/drivers/usbdev/usbdev_scsi.c
index c35a50183e0..3d5201209c0 100644
--- a/drivers/usbdev/usbdev_scsi.c
+++ b/drivers/usbdev/usbdev_scsi.c
@@ -69,7 +69,7 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/scsi.h>
-#include <nuttx/usb/usb_storage.h>
+#include <nuttx/usb/storage.h>
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
diff --git a/drivers/usbdev/usbdev_storage.c b/drivers/usbdev/usbdev_storage.c
index 17509c13e0d..fc61670d27e 100644
--- a/drivers/usbdev/usbdev_storage.c
+++ b/drivers/usbdev/usbdev_storage.c
@@ -75,7 +75,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/fs.h>
 #include <nuttx/usb/usb.h>
-#include <nuttx/usb/usb_storage.h>
+#include <nuttx/usb/storage.h>
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 
diff --git a/drivers/usbdev/usbdev_storage.h b/drivers/usbdev/usbdev_storage.h
index e9702b8dd43..320c78ccde3 100644
--- a/drivers/usbdev/usbdev_storage.h
+++ b/drivers/usbdev/usbdev_storage.h
@@ -51,7 +51,7 @@
 #include <queue.h>
 
 #include <nuttx/fs.h>
-#include <nuttx/usb/usb_storage.h>
+#include <nuttx/usb/storage.h>
 #include <nuttx/usb/usbdev.h>
 
 /****************************************************************************
diff --git a/drivers/usbhost/usbhost_storage.c b/drivers/usbhost/usbhost_storage.c
index 5c44fd9f615..bef82ba3a54 100644
--- a/drivers/usbhost/usbhost_storage.c
+++ b/drivers/usbhost/usbhost_storage.c
@@ -54,7 +54,7 @@
 
 #include <nuttx/usb/usb.h>
 #include <nuttx/usb/usbhost.h>
-#include <nuttx/usb/usb_storage.h>
+#include <nuttx/usb/storage.h>
 
 #if defined(CONFIG_USBHOST) && !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0
 
@@ -1109,9 +1109,8 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
  *   completes the initialization operations.  It is first called after the
  *   configuration descriptor has been received.
  *
- *   This function is called from the connect() method.  It may either
- *   execute on (1) the thread of the caller of connect(), or (2) if
- *   connect() was called from an interrupt handler, on the worker thread.
+ *   This function is called from the connect() method.  This function always
+ *   executes on the thread of the caller of connect().
  *
  * Input Parameters:
  *   priv - A reference to the class instance.
@@ -1366,7 +1365,7 @@ static void usbhost_putbe16(uint8_t *dest, uint16_t val)
 }
 
 /****************************************************************************
- * Name: usbhost_getbe32
+ * Name: usbhost_getle32
  *
  * Description:
  *   Get a (possibly unaligned) 32-bit little endian value.
@@ -1707,8 +1706,8 @@ static int usbhost_disconnected(struct usbhost_class_s *class)
 
   DEBUGASSERT(priv != NULL);
 
-  /* Nullify the driver instance.  This will be our indication to any users
-   * of the mass storage device that the device is no longer available.
+  /* Set an indication to any users of the mass storage device that the device
+   * is no longer available.
    */
 
   flags              = irqsave();
diff --git a/include/nuttx/usb/usb_storage.h b/include/nuttx/usb/storage.h
similarity index 96%
rename from include/nuttx/usb/usb_storage.h
rename to include/nuttx/usb/storage.h
index 030b10bc218..150149c83a0 100644
--- a/include/nuttx/usb/usb_storage.h
+++ b/include/nuttx/usb/storage.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * include/nuttx/usb/usb_storage.h
+ * include/nuttx/usb/storage.h
  *
- *   Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * References:
@@ -40,8 +40,8 @@
  *
  ************************************************************************************/
 
-#ifndef __NUTTX_USB_USB_STORAGE_H
-#define __NUTTX_USB_USB_STORAGE_H
+#ifndef __NUTTX_USB_STORAGE_H
+#define __NUTTX_USB_STORAGE_H
 
 /************************************************************************************
  * Included Files
@@ -128,4 +128,4 @@ struct usbstrg_csw_s
  * Public Functions
  ************************************************************************************/
 
-#endif /* __NUTTX_USB_USB_STORAGE_H */
+#endif /* __NUTTX_USB_STORAGE_H */