diff --git a/drivers/usbdev/usbdev_scsi.c b/drivers/usbdev/usbdev_scsi.c
index 1f169332be6b2ee89cd51f45e078a43aff9d5c00..d04b6a5543530e8be6eb87b18ec00ebef69cb050 100644
--- a/drivers/usbdev/usbdev_scsi.c
+++ b/drivers/usbdev/usbdev_scsi.c
@@ -66,7 +66,7 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/scsi.h>
-#include <nuttx/usb_bulk.h>
+#include <nuttx/usb_storage.h>
 #include <nuttx/usbdev.h>
 #include <nuttx/usbdev_trace.h>
 
diff --git a/drivers/usbdev/usbdev_storage.c b/drivers/usbdev/usbdev_storage.c
index 4c56492ba504c8edce26e55a4d932f9b497c8a31..99651c15b0f657429bdee3f466b982aa293f1527 100644
--- a/drivers/usbdev/usbdev_storage.c
+++ b/drivers/usbdev/usbdev_storage.c
@@ -73,7 +73,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/fs.h>
 #include <nuttx/usb.h>
-#include <nuttx/usb_bulk.h>
+#include <nuttx/usb_storage.h>
 #include <nuttx/usbdev.h>
 #include <nuttx/usbdev_trace.h>
 
diff --git a/drivers/usbdev/usbdev_storage.h b/drivers/usbdev/usbdev_storage.h
index 400103fa21b6c7c7523d82423f6c42e444a90a60..9d874c16605fb5f4ffd0abdf5efdd507ef830811 100644
--- a/drivers/usbdev/usbdev_storage.h
+++ b/drivers/usbdev/usbdev_storage.h
@@ -49,7 +49,7 @@
 #include <queue.h>
 
 #include <nuttx/fs.h>
-#include <nuttx/usb_bulk.h>
+#include <nuttx/usb_storage.h>
 #include <nuttx/usbdev.h>
 
 /****************************************************************************
diff --git a/include/nuttx/usb_bulk.h b/include/nuttx/usb_storage.h
similarity index 97%
rename from include/nuttx/usb_bulk.h
rename to include/nuttx/usb_storage.h
index 2bd99a4d3fafff59b5c6595401279cec85e842e9..41dc330753f67882d12ebf2e62147314076c77b5 100644
--- a/include/nuttx/usb_bulk.h
+++ b/include/nuttx/usb_storage.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * include/nuttx/usb_bulk.h
+ * include/nuttx/usb_storage.h
  *
  *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -40,8 +40,8 @@
  *
  ************************************************************************************/
 
-#ifndef __NUTTX_USB_BULK_H
-#define __NUTTX_USB_BULK_H
+#ifndef __NUTTX_USB_STORAGE_H
+#define __NUTTX_USB_STORAGE_H
 
 /************************************************************************************
  * Included Files
@@ -136,4 +136,4 @@ struct usbstrg_csw_s
  * Public Functions
  ************************************************************************************/
 
-#endif // __NUTTX_USB_BULK_H
+#endif /* __NUTTX_USB_STORAGE_H */