diff --git a/tests/test/host/test_hid_host_keyboard.c b/tests/test/host/test_hid_host_keyboard.c
index 72d28527b..d0a93f691 100644
--- a/tests/test/host/test_hid_host_keyboard.c
+++ b/tests/test/host/test_hid_host_keyboard.c
@@ -39,7 +39,7 @@
 #include "errors.h"
 #include "hid_host.h"
 #include "mock_osal.h"
-#include "mock_usbd_host.h"
+#include "mock_usbh.h"
 
 extern class_hid_keyboard_info_t keyboard_info_pool[TUSB_CFG_HOST_DEVICE_MAX];
 
diff --git a/tests/test/host/test_usbd_host.c b/tests/test/host/test_usbd_host.c
index dd3ab0f94..9143ef3f1 100644
--- a/tests/test/host/test_usbd_host.c
+++ b/tests/test/host/test_usbd_host.c
@@ -37,7 +37,7 @@
 
 #include "unity.h"
 #include "errors.h"
-#include "usbd_host.h"
+#include "usbh.h"
 #include "mock_osal.h"
 #include "mock_hcd.h"
 
diff --git a/tinyusb/class/hid_host.h b/tinyusb/class/hid_host.h
index b41bafb15..4ef003868 100644
--- a/tinyusb/class/hid_host.h
+++ b/tinyusb/class/hid_host.h
@@ -55,7 +55,7 @@
  extern "C" {
 #endif
 
-#include "host/usbd_host.h"
+#include "host/usbh.h"
 #include "hid.h"
 
 //--------------------------------------------------------------------+
diff --git a/tinyusb/host/hcd.h b/tinyusb/host/hcd.h
index 476170b74..31c1feb4d 100644
--- a/tinyusb/host/hcd.h
+++ b/tinyusb/host/hcd.h
@@ -56,7 +56,7 @@
 #endif
 
 #include "common/common.h"
-//#include "usbd_host.h"
+//#include "usbh.h"
 
 typedef uint32_t pipe_handle_t;
 
diff --git a/tinyusb/host/usbd_host.c b/tinyusb/host/usbh.c
similarity index 99%
rename from tinyusb/host/usbd_host.c
rename to tinyusb/host/usbh.c
index 293d8dbbd..69d30467b 100644
--- a/tinyusb/host/usbd_host.c
+++ b/tinyusb/host/usbh.c
@@ -45,7 +45,7 @@
 // INCLUDE
 //--------------------------------------------------------------------+
 #include "common/common.h"
-#include "usbd_host.h"
+#include "usbh.h"
 #include "osal/osal.h"
 
 //--------------------------------------------------------------------+
diff --git a/tinyusb/host/usbd_host.h b/tinyusb/host/usbh.h
similarity index 99%
rename from tinyusb/host/usbd_host.h
rename to tinyusb/host/usbh.h
index 12e7df48d..d0ad72c02 100644
--- a/tinyusb/host/usbd_host.h
+++ b/tinyusb/host/usbh.h
@@ -1,5 +1,5 @@
 /*
- * usbd_host.h
+ * usbh.h
  *
  *  Created on: Jan 19, 2013
  *      Author: hathach
diff --git a/tinyusb/tusb.h b/tinyusb/tusb.h
index 73a49b69d..a29b36d60 100644
--- a/tinyusb/tusb.h
+++ b/tinyusb/tusb.h
@@ -51,7 +51,7 @@
 #include "common/common.h"
 
 #ifdef TUSB_CFG_HOST
-  #include "host/usbd_host.h"
+  #include "host/usbh.h"
 
   #ifdef HOST_CLASS_HID
     #include "class/hid_host.h"