diff --git a/class/audio/usbh_audio.c b/class/audio/usbh_audio.c
index 0d3bf72b..a27cd456 100644
--- a/class/audio/usbh_audio.c
+++ b/class/audio/usbh_audio.c
@@ -26,7 +26,7 @@ USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t g_audio_buf[128];
 static struct usbh_audio g_audio_class[CONFIG_USBHOST_MAX_AUDIO_CLASS];
 static uint32_t g_devinuse = 0;
 
-static struct usbh_audio *usbd_audio_class_alloc(void)
+static struct usbh_audio *usbh_audio_class_alloc(void)
 {
     int devno;
 
@@ -41,7 +41,7 @@ static struct usbh_audio *usbd_audio_class_alloc(void)
     return NULL;
 }
 
-static void usbd_audio_class_free(struct usbh_audio *audio_class)
+static void usbh_audio_class_free(struct usbh_audio *audio_class)
 {
     int devno = audio_class->minor;
 
@@ -274,7 +274,7 @@ static int usbh_audio_ctrl_connect(struct usbh_hubport *hport, uint8_t intf)
     uint8_t format_offset = 0;
     uint8_t *p;
 
-    struct usbh_audio *audio_class = usbd_audio_class_alloc();
+    struct usbh_audio *audio_class = usbh_audio_class_alloc();
     if (audio_class == NULL) {
         USB_LOG_ERR("Fail to alloc audio_class\r\n");
         return -ENOMEM;
@@ -428,7 +428,7 @@ static int usbh_audio_ctrl_disconnect(struct usbh_hubport *hport, uint8_t intf)
             usbh_audio_stop(audio_class);
         }
 
-        usbd_audio_class_free(audio_class);
+        usbh_audio_class_free(audio_class);
     }
 
     return ret;
diff --git a/class/cdc/usbh_cdc_acm.c b/class/cdc/usbh_cdc_acm.c
index d97968d5..a86c1298 100644
--- a/class/cdc/usbh_cdc_acm.c
+++ b/class/cdc/usbh_cdc_acm.c
@@ -13,7 +13,7 @@ USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX struct cdc_line_coding g_cdc_line_coding;
 static struct usbh_cdc_acm g_cdc_acm_class[CONFIG_USBHOST_MAX_CDC_ACM_CLASS];
 static uint32_t g_devinuse = 0;
 
-static struct usbh_cdc_acm *usbd_cdc_acm_class_alloc(void)
+static struct usbh_cdc_acm *usbh_cdc_acm_class_alloc(void)
 {
     int devno;
 
@@ -28,7 +28,7 @@ static struct usbh_cdc_acm *usbd_cdc_acm_class_alloc(void)
     return NULL;
 }
 
-static void usbd_cdc_acm_class_free(struct usbh_cdc_acm *cdc_acm_class)
+static void usbh_cdc_acm_class_free(struct usbh_cdc_acm *cdc_acm_class)
 {
     int devno = cdc_acm_class->minor;
 
@@ -93,7 +93,7 @@ static int usbh_cdc_acm_connect(struct usbh_hubport *hport, uint8_t intf)
     struct usb_endpoint_descriptor *ep_desc;
     int ret;
 
-    struct usbh_cdc_acm *cdc_acm_class = usbd_cdc_acm_class_alloc();
+    struct usbh_cdc_acm *cdc_acm_class = usbh_cdc_acm_class_alloc();
     if (cdc_acm_class == NULL) {
         USB_LOG_ERR("Fail to alloc cdc_acm_class\r\n");
         return -ENOMEM;
@@ -164,7 +164,7 @@ static int usbh_cdc_acm_disconnect(struct usbh_hubport *hport, uint8_t intf)
             usbh_cdc_acm_stop(cdc_acm_class);
         }
 
-        usbd_cdc_acm_class_free(cdc_acm_class);
+        usbh_cdc_acm_class_free(cdc_acm_class);
     }
 
     return ret;
diff --git a/class/hid/usbh_hid.c b/class/hid/usbh_hid.c
index 319a8414..8152af5f 100644
--- a/class/hid/usbh_hid.c
+++ b/class/hid/usbh_hid.c
@@ -13,7 +13,7 @@ USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t g_hid_buf[128];
 static struct usbh_hid g_hid_class[CONFIG_USBHOST_MAX_HID_CLASS];
 static uint32_t g_devinuse = 0;
 
-static struct usbh_hid *usbd_hid_class_alloc(void)
+static struct usbh_hid *usbh_hid_class_alloc(void)
 {
     int devno;
 
@@ -28,7 +28,7 @@ static struct usbh_hid *usbd_hid_class_alloc(void)
     return NULL;
 }
 
-static void usbd_hid_class_free(struct usbh_hid *hid_class)
+static void usbh_hid_class_free(struct usbh_hid *hid_class)
 {
     int devno = hid_class->minor;
 
@@ -107,7 +107,7 @@ int usbh_hid_connect(struct usbh_hubport *hport, uint8_t intf)
     struct usb_endpoint_descriptor *ep_desc;
     int ret;
 
-    struct usbh_hid *hid_class = usbd_hid_class_alloc();
+    struct usbh_hid *hid_class = usbh_hid_class_alloc();
     if (hid_class == NULL) {
         USB_LOG_ERR("Fail to alloc hid_class\r\n");
         return -ENOMEM;
@@ -171,7 +171,7 @@ int usbh_hid_disconnect(struct usbh_hubport *hport, uint8_t intf)
             usbh_hid_stop(hid_class);
         }
 
-        usbd_hid_class_free(hid_class);
+        usbh_hid_class_free(hid_class);
     }
 
     return ret;
diff --git a/class/hub/usbh_hub.c b/class/hub/usbh_hub.c
index 7711a3c7..7c4ec7ba 100644
--- a/class/hub/usbh_hub.c
+++ b/class/hub/usbh_hub.c
@@ -42,7 +42,7 @@ struct usbh_hubport *usbh_get_roothub_port(unsigned int port)
 static struct usbh_hub g_hub_class[CONFIG_USBHOST_MAX_EXTHUBS];
 static uint32_t g_devinuse = 0;
 
-static struct usbh_hub *usbd_hub_class_alloc(void)
+static struct usbh_hub *usbh_hub_class_alloc(void)
 {
     int devno;
 
@@ -57,7 +57,7 @@ static struct usbh_hub *usbd_hub_class_alloc(void)
     return NULL;
 }
 
-static void usbd_hub_class_free(struct usbh_hub *hub_class)
+static void usbh_hub_class_free(struct usbh_hub *hub_class)
 {
     int devno = hub_class->index - EXTHUB_FIRST_INDEX;
 
@@ -309,7 +309,7 @@ static int usbh_hub_connect(struct usbh_hubport *hport, uint8_t intf)
     struct hub_port_status port_status;
     int ret;
 
-    struct usbh_hub *hub = usbd_hub_class_alloc();
+    struct usbh_hub *hub = usbh_hub_class_alloc();
     if (hub == NULL) {
         USB_LOG_ERR("Fail to alloc cdc_acm_class\r\n");
         return -ENOMEM;
@@ -409,7 +409,7 @@ static int usbh_hub_disconnect(struct usbh_hubport *hport, uint8_t intf)
             usbh_hub_unregister(hub);
         }
 
-        usbd_hub_class_free(hub);
+        usbh_hub_class_free(hub);
     }
     return ret;
 }
diff --git a/class/msc/usbh_msc.c b/class/msc/usbh_msc.c
index f1a4adb5..ddb3bc60 100644
--- a/class/msc/usbh_msc.c
+++ b/class/msc/usbh_msc.c
@@ -14,7 +14,7 @@ USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t g_msc_buf[32];
 static struct usbh_msc g_msc_class[CONFIG_USBHOST_MAX_MSC_CLASS];
 static uint32_t g_devinuse = 0;
 
-static struct usbh_msc *usbd_msc_class_alloc(void)
+static struct usbh_msc *usbh_msc_class_alloc(void)
 {
     int devno;
 
@@ -29,7 +29,7 @@ static struct usbh_msc *usbd_msc_class_alloc(void)
     return NULL;
 }
 
-static void usbd_msc_class_free(struct usbh_msc *msc_class)
+static void usbh_msc_class_free(struct usbh_msc *msc_class)
 {
     int devno = msc_class->sdchar - 'a';
 
@@ -279,7 +279,7 @@ static int usbh_msc_connect(struct usbh_hubport *hport, uint8_t intf)
     struct usb_endpoint_descriptor *ep_desc;
     int ret;
 
-    struct usbh_msc *msc_class = usbd_msc_class_alloc();
+    struct usbh_msc *msc_class = usbh_msc_class_alloc();
     if (msc_class == NULL) {
         USB_LOG_ERR("Fail to alloc msc_class\r\n");
         return -ENOMEM;
@@ -361,7 +361,7 @@ static int usbh_msc_disconnect(struct usbh_hubport *hport, uint8_t intf)
             usbh_msc_stop(msc_class);
         }
 
-        usbd_msc_class_free(msc_class);
+        usbh_msc_class_free(msc_class);
     }
 
     return ret;
diff --git a/class/printer/usbh_printer.c b/class/printer/usbh_printer.c
index b68dc134..7033d693 100644
--- a/class/printer/usbh_printer.c
+++ b/class/printer/usbh_printer.c
@@ -11,7 +11,7 @@
 static struct usbh_printer g_printer_class[CONFIG_USBHOST_MAX_PRINTER_CLASS];
 static uint32_t g_devinuse = 0;
 
-static struct usbh_printer *usbd_printer_class_alloc(void)
+static struct usbh_printer *usbh_printer_class_alloc(void)
 {
     int devno;
 
@@ -26,7 +26,7 @@ static struct usbh_printer *usbd_printer_class_alloc(void)
     return NULL;
 }
 
-static void usbd_printer_class_free(struct usbh_printer *printer_class)
+static void usbh_printer_class_free(struct usbh_printer *printer_class)
 {
     int devno = printer_class->minor;
 
@@ -84,7 +84,7 @@ static int usbh_printer_connect(struct usbh_hubport *hport, uint8_t intf)
     struct usb_endpoint_descriptor *ep_desc;
     int ret;
 
-    struct usbh_printer *printer_class = usbd_printer_class_alloc();
+    struct usbh_printer *printer_class = usbh_printer_class_alloc();
     if (printer_class == NULL) {
         USB_LOG_ERR("Fail to alloc printer_class\r\n");
         return -ENOMEM;
@@ -133,7 +133,7 @@ static int usbh_printer_disconnect(struct usbh_hubport *hport, uint8_t intf)
             USB_LOG_INFO("Unregister Printer Class:%s\r\n", hport->config.intf[intf].devname);
         }
 
-        usbd_printer_class_free(printer_class);
+        usbh_printer_class_free(printer_class);
     }
 
     return ret;
diff --git a/class/template/usbh_xxx.c b/class/template/usbh_xxx.c
index 5bd4ca68..ae177983 100644
--- a/class/template/usbh_xxx.c
+++ b/class/template/usbh_xxx.c
@@ -6,7 +6,7 @@
 static struct usbh_xxx g_xxx_class[CONFIG_USBHOST_MAX_CUSTOM_CLASS];
 static uint32_t g_devinuse = 0;
 
-static struct usbh_xxx *usbd_xxx_class_alloc(void)
+static struct usbh_xxx *usbh_xxx_class_alloc(void)
 {
     int devno;
 
@@ -21,7 +21,7 @@ static struct usbh_xxx *usbd_xxx_class_alloc(void)
     return NULL;
 }
 
-static void usbd_xxx_class_free(struct usbh_xxx *xxx_class)
+static void usbh_xxx_class_free(struct usbh_xxx *xxx_class)
 {
     int devno = xxx_class->minor;
 
@@ -37,7 +37,7 @@ static int usbh_xxx_connect(struct usbh_hubport *hport, uint8_t intf)
     struct usb_endpoint_descriptor *ep_desc;
     int ret;
 
-    struct usbh_xxx *xxx_class = usbd_xxx_class_alloc();
+    struct usbh_xxx *xxx_class = usbh_xxx_class_alloc();
     if (xxx_class == NULL) {
         USB_LOG_ERR("Fail to alloc xxx_class\r\n");
         return -ENOMEM;
@@ -67,7 +67,7 @@ static int usbh_xxx_disconnect(struct usbh_hubport *hport, uint8_t intf)
             usbh_xxx_stop(xxx_class);
         }
 
-        usbd_xxx_class_free(xxx_class);
+        usbh_xxx_class_free(xxx_class);
     }
 
     return ret;
diff --git a/class/video/usbh_video.c b/class/video/usbh_video.c
index aa3200f9..1a4e07b8 100644
--- a/class/video/usbh_video.c
+++ b/class/video/usbh_video.c
@@ -28,7 +28,7 @@ static const char *format_type[] = { "uncompressed", "mjpeg" };
 static struct usbh_video g_video_class[CONFIG_USBHOST_MAX_VIDEO_CLASS];
 static uint32_t g_devinuse = 0;
 
-static struct usbh_video *usbd_video_class_alloc(void)
+static struct usbh_video *usbh_video_class_alloc(void)
 {
     int devno;
 
@@ -43,7 +43,7 @@ static struct usbh_video *usbd_video_class_alloc(void)
     return NULL;
 }
 
-static void usbd_video_class_free(struct usbh_video *video_class)
+static void usbh_video_class_free(struct usbh_video *video_class)
 {
     int devno = video_class->minor;
 
@@ -293,7 +293,7 @@ static int usbh_video_ctrl_connect(struct usbh_hubport *hport, uint8_t intf)
     uint8_t num_of_frames = 0xff;
     uint8_t *p;
 
-    struct usbh_video *video_class = usbd_video_class_alloc();
+    struct usbh_video *video_class = usbh_video_class_alloc();
     if (video_class == NULL) {
         USB_LOG_ERR("Fail to alloc video_class\r\n");
         return -ENOMEM;
@@ -413,7 +413,7 @@ static int usbh_video_ctrl_disconnect(struct usbh_hubport *hport, uint8_t intf)
             usbh_video_stop(video_class);
         }
 
-        usbd_video_class_free(video_class);
+        usbh_video_class_free(video_class);
     }
 
     return ret;