diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c
index a9bcf8ed..1263d4cf 100644
--- a/tinyusb/class/hid_host.c
+++ b/tinyusb/class/hid_host.c
@@ -79,7 +79,7 @@ tusb_error_t hidh_interface_get_report(uint8_t dev_addr, void * report, hidh_int
 {
   //------------- parameters validation -------------//
   // TODO change to use is configured function
-  ASSERT_INT  (TUSB_DEVICE_STATE_CONFIGURED, tusbh_device_get_state(dev_addr), TUSB_ERROR_DEVICE_NOT_READY);
+  ASSERT_INT  (TUSB_DEVICE_STATE_CONFIGURED, tuh_device_get_state(dev_addr), TUSB_ERROR_DEVICE_NOT_READY);
   ASSERT_PTR  (report, TUSB_ERROR_INVALID_PARA);
   ASSERT_FALSE(hcd_pipe_is_busy(p_hid->pipe_hdl), TUSB_ERROR_INTERFACE_IS_BUSY);
 
@@ -108,7 +108,7 @@ STATIC_VAR hidh_interface_info_t keyboardh_data[TUSB_CFG_HOST_DEVICE_MAX]; // do
 //------------- KEYBOARD PUBLIC API (parameter validation required) -------------//
 bool  tuh_hid_keyboard_is_mounted(uint8_t dev_addr)
 {
-  return tusbh_device_is_configured(dev_addr) && pipehandle_is_valid(keyboardh_data[dev_addr-1].pipe_hdl);
+  return tuh_device_is_configured(dev_addr) && pipehandle_is_valid(keyboardh_data[dev_addr-1].pipe_hdl);
 }
 
 tusb_error_t tuh_hid_keyboard_get_report(uint8_t dev_addr, void* p_report)
@@ -134,7 +134,7 @@ STATIC_VAR hidh_interface_info_t mouseh_data[TUSB_CFG_HOST_DEVICE_MAX]; // does
 //------------- Public API -------------//
 bool tuh_hid_mouse_is_mounted(uint8_t dev_addr)
 {
-  return tusbh_device_is_configured(dev_addr) && pipehandle_is_valid(mouseh_data[dev_addr-1].pipe_hdl);
+  return tuh_device_is_configured(dev_addr) && pipehandle_is_valid(mouseh_data[dev_addr-1].pipe_hdl);
 }
 
 bool tuh_hid_mouse_is_busy(uint8_t dev_addr)
diff --git a/tinyusb/class/msc_host.c b/tinyusb/class/msc_host.c
index b961c172..5dcc6f30 100644
--- a/tinyusb/class/msc_host.c
+++ b/tinyusb/class/msc_host.c
@@ -69,7 +69,7 @@ TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4) STATIC_VAR uint8_t msch_buffer[sizeof(scsi_
 //--------------------------------------------------------------------+
 bool tuh_msc_is_mounted(uint8_t dev_addr)
 {
-  return  tusbh_device_is_configured(dev_addr) && // is configured can be omitted
+  return  tuh_device_is_configured(dev_addr) && // is configured can be omitted
           msch_data[dev_addr-1].is_initialized;
 }
 
diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c
index e694ef06..4806f58b 100644
--- a/tinyusb/host/usbh.c
+++ b/tinyusb/host/usbh.c
@@ -124,15 +124,15 @@ static inline uint8_t get_configure_number_for_device(tusb_descriptor_device_t*
 //--------------------------------------------------------------------+
 // PUBLIC API (Parameter Verification is required)
 //--------------------------------------------------------------------+
-tusb_device_state_t tusbh_device_get_state (uint8_t const dev_addr)
+tusb_device_state_t tuh_device_get_state (uint8_t const dev_addr)
 {
   ASSERT_INT_WITHIN(1, TUSB_CFG_HOST_DEVICE_MAX, dev_addr, TUSB_DEVICE_STATE_INVALID_PARAMETER);
   return (tusb_device_state_t) usbh_devices[dev_addr].state;
 }
 
-uint32_t tusbh_device_get_mounted_class_flag(uint8_t dev_addr)
+uint32_t tuh_device_get_mounted_class_flag(uint8_t dev_addr)
 {
-  return tusbh_device_is_configured(dev_addr) ? usbh_devices[dev_addr].flag_supported_class : 0;
+  return tuh_device_is_configured(dev_addr) ? usbh_devices[dev_addr].flag_supported_class : 0;
 }
 
 //--------------------------------------------------------------------+
@@ -209,7 +209,7 @@ tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, uint8_t bmRequestType,
 
 //  SUBTASK_ASSERT_WITH_HANDLER(TUSB_ERROR_NONE == error &&
 //                              TUSB_EVENT_XFER_COMPLETE == usbh_devices[dev_addr].control.pipe_status,
-//                              tusbh_device_mount_failed_cb(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL) );
+//                              tuh_device_mount_failed_cb(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL) );
 
   OSAL_SUBTASK_END
 }
@@ -527,7 +527,7 @@ tusb_error_t enumeration_body_subtask(void)
   );
   SUBTASK_ASSERT_STATUS(error);
   SUBTASK_ASSERT_WITH_HANDLER( TUSB_CFG_HOST_ENUM_BUFFER_SIZE >= ((tusb_descriptor_configuration_t*)enum_data_buffer)->wTotalLength,
-                            tusbh_device_mount_failed_cb(TUSB_ERROR_USBH_MOUNT_CONFIG_DESC_TOO_LONG, NULL) );
+                            tuh_device_mount_failed_cb(TUSB_ERROR_USBH_MOUNT_CONFIG_DESC_TOO_LONG, NULL) );
 
   //------------- Get full configuration descriptor -------------//
   OSAL_SUBTASK_INVOKED_AND_WAIT(
@@ -598,7 +598,7 @@ tusb_error_t enumeration_body_subtask(void)
     }
   }
 
-  tusbh_device_mount_succeed_cb(new_addr);
+  tuh_device_mount_succeed_cb(new_addr);
 
   OSAL_SUBTASK_END
 }
@@ -630,9 +630,9 @@ static inline uint8_t get_configure_number_for_device(tusb_descriptor_device_t*
   uint8_t config_num = 1;
 
   // invoke callback to ask user which configuration to select
-  if (tusbh_device_attached_cb)
+  if (tuh_device_attached_cb)
   {
-    config_num = min8_of(1, tusbh_device_attached_cb(dev_desc) );
+    config_num = min8_of(1, tuh_device_attached_cb(dev_desc) );
   }
 
   return config_num;
diff --git a/tinyusb/host/usbh.h b/tinyusb/host/usbh.h
index eed50a53..33e4e5a5 100644
--- a/tinyusb/host/usbh.h
+++ b/tinyusb/host/usbh.h
@@ -77,20 +77,20 @@ typedef struct {
 // APPLICATION API
 //--------------------------------------------------------------------+
 //tusb_error_t tusbh_configuration_set     (uint8_t dev_addr, uint8_t configure_number) ATTR_WARN_UNUSED_RESULT;
-tusb_device_state_t tusbh_device_get_state (uint8_t dev_addr) ATTR_WARN_UNUSED_RESULT ATTR_PURE;
-static inline bool tusbh_device_is_configured(uint8_t dev_addr) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT ATTR_PURE;
-static inline bool tusbh_device_is_configured(uint8_t dev_addr)
+tusb_device_state_t tuh_device_get_state (uint8_t dev_addr) ATTR_WARN_UNUSED_RESULT ATTR_PURE;
+static inline bool tuh_device_is_configured(uint8_t dev_addr) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT ATTR_PURE;
+static inline bool tuh_device_is_configured(uint8_t dev_addr)
 {
-  return tusbh_device_get_state(dev_addr) == TUSB_DEVICE_STATE_CONFIGURED;
+  return tuh_device_get_state(dev_addr) == TUSB_DEVICE_STATE_CONFIGURED;
 }
-uint32_t tusbh_device_get_mounted_class_flag(uint8_t dev_addr);
+uint32_t tuh_device_get_mounted_class_flag(uint8_t dev_addr);
 
 //--------------------------------------------------------------------+
 // APPLICATION CALLBACK
 //--------------------------------------------------------------------+
-ATTR_WEAK uint8_t tusbh_device_attached_cb (tusb_descriptor_device_t const *p_desc_device)  ATTR_WARN_UNUSED_RESULT;
-ATTR_WEAK void    tusbh_device_mount_succeed_cb (uint8_t dev_addr);
-ATTR_WEAK void    tusbh_device_mount_failed_cb(tusb_error_t error, tusb_descriptor_device_t const *p_desc_device); // TODO refractor remove desc_device
+ATTR_WEAK uint8_t tuh_device_attached_cb (tusb_descriptor_device_t const *p_desc_device)  ATTR_WARN_UNUSED_RESULT;
+ATTR_WEAK void    tuh_device_mount_succeed_cb (uint8_t dev_addr);
+ATTR_WEAK void    tuh_device_mount_failed_cb(tusb_error_t error, tusb_descriptor_device_t const *p_desc_device); // TODO refractor remove desc_device
 
 //--------------------------------------------------------------------+
 // CLASS-USBH & INTERNAL API