diff --git a/examples/obsolete/device/src/keyboard_device_app.c b/examples/obsolete/device/src/keyboard_device_app.c
index 6c413464e..5e14c56c9 100644
--- a/examples/obsolete/device/src/keyboard_device_app.c
+++ b/examples/obsolete/device/src/keyboard_device_app.c
@@ -70,9 +70,9 @@ void tud_hid_keyboard_cb(uint8_t rhport, xfer_result_t event, uint32_t xferred_b
 {
   switch(event)
   {
-    case TUSB_EVENT_XFER_COMPLETE:
-    case TUSB_EVENT_XFER_ERROR:
-    case TUSB_EVENT_XFER_STALLED:
+    case XFER_RESULT_SUCCESS:
+    case XFER_RESULT_FAILED:
+    case XFER_RESULT_STALLED:
     default: break;
   }
 }
diff --git a/examples/obsolete/device/src/mouse_device_app.c b/examples/obsolete/device/src/mouse_device_app.c
index 4c4d322d7..6869f1a05 100644
--- a/examples/obsolete/device/src/mouse_device_app.c
+++ b/examples/obsolete/device/src/mouse_device_app.c
@@ -70,9 +70,9 @@ void tud_hid_mouse_cb(uint8_t rhport, xfer_result_t event, uint32_t xferred_byte
 {
   switch(event)
   {
-    case TUSB_EVENT_XFER_COMPLETE:
-    case TUSB_EVENT_XFER_ERROR:
-    case TUSB_EVENT_XFER_STALLED:
+    case XFER_RESULT_SUCCESS:
+    case XFER_RESULT_FAILED:
+    case XFER_RESULT_STALLED:
     default: break;
   }
 }
diff --git a/examples/obsolete/host/src/cdc_serial_host_app.c b/examples/obsolete/host/src/cdc_serial_host_app.c
index afb2b8937..85604dcdf 100644
--- a/examples/obsolete/host/src/cdc_serial_host_app.c
+++ b/examples/obsolete/host/src/cdc_serial_host_app.c
@@ -84,17 +84,17 @@ void tuh_cdc_xfer_isr(uint8_t dev_addr, xfer_result_t event, cdc_pipeid_t pipe_i
     case CDC_PIPE_DATA_IN:
       switch(event)
       {
-        case TUSB_EVENT_XFER_COMPLETE:
+        case XFER_RESULT_SUCCESS:
           received_bytes = xferred_bytes;
           osal_semaphore_post(sem_hdl);  // notify main task
         break;
 
-        case TUSB_EVENT_XFER_ERROR:
+        case XFER_RESULT_FAILED:
           received_bytes = 0; // ignore
           tuh_cdc_receive(dev_addr, serial_in_buffer, SERIAL_BUFFER_SIZE, true); // waiting for next data
         break;
 
-        case TUSB_EVENT_XFER_STALLED:
+        case XFER_RESULT_STALLED:
         default :
         break;
       }
diff --git a/examples/obsolete/host/src/keyboard_host_app.c b/examples/obsolete/host/src/keyboard_host_app.c
index 27d10b9e7..fd51548c3 100644
--- a/examples/obsolete/host/src/keyboard_host_app.c
+++ b/examples/obsolete/host/src/keyboard_host_app.c
@@ -81,12 +81,12 @@ void tuh_hid_keyboard_isr(uint8_t dev_addr, xfer_result_t event)
 {
   switch(event)
   {
-    case TUSB_EVENT_XFER_COMPLETE:
+    case XFER_RESULT_SUCCESS:
       osal_queue_send(queue_kbd_hdl, &usb_keyboard_report);
       tuh_hid_keyboard_get_report(dev_addr, (uint8_t*) &usb_keyboard_report);
     break;
 
-    case TUSB_EVENT_XFER_ERROR:
+    case XFER_RESULT_FAILED:
       tuh_hid_keyboard_get_report(dev_addr, (uint8_t*) &usb_keyboard_report); // ignore & continue
     break;
 
diff --git a/examples/obsolete/host/src/mouse_host_app.c b/examples/obsolete/host/src/mouse_host_app.c
index 05135693b..819c2b290 100644
--- a/examples/obsolete/host/src/mouse_host_app.c
+++ b/examples/obsolete/host/src/mouse_host_app.c
@@ -80,12 +80,12 @@ void tuh_hid_mouse_isr(uint8_t dev_addr, xfer_result_t event)
 {
   switch(event)
   {
-    case TUSB_EVENT_XFER_COMPLETE:
+    case XFER_RESULT_SUCCESS:
       osal_queue_send(queue_mouse_hdl, &usb_mouse_report);
       (void) tuh_hid_mouse_get_report(dev_addr, (uint8_t*) &usb_mouse_report);
     break;
 
-    case TUSB_EVENT_XFER_ERROR:
+    case XFER_RESULT_FAILED:
       (void) tuh_hid_mouse_get_report(dev_addr, (uint8_t*) &usb_mouse_report); // ignore & continue
     break;
 
diff --git a/src/class/cdc/cdc_host.h b/src/class/cdc/cdc_host.h
index 8cfe6e5b7..0b863bb61 100644
--- a/src/class/cdc/cdc_host.h
+++ b/src/class/cdc/cdc_host.h
@@ -122,9 +122,9 @@ void tuh_cdc_unmounted_cb(uint8_t dev_addr);
  * \param[in]   pipe_id value from \ref cdc_pipeid_t indicate the pipe
  * \param[in]   xferred_bytes Number of bytes transferred via USB bus
  * \note        event can be one of following
- *              - TUSB_EVENT_XFER_COMPLETE : previously scheduled transfer completes successfully.
- *              - TUSB_EVENT_XFER_ERROR   : previously scheduled transfer encountered a transaction error.
- *              - TUSB_EVENT_XFER_STALLED : previously scheduled transfer is stalled by device.
+ *              - XFER_RESULT_SUCCESS : previously scheduled transfer completes successfully.
+ *              - XFER_RESULT_FAILED   : previously scheduled transfer encountered a transaction error.
+ *              - XFER_RESULT_STALLED : previously scheduled transfer is stalled by device.
  * \note
  */
 void tuh_cdc_xfer_isr(uint8_t dev_addr, xfer_result_t event, cdc_pipeid_t pipe_id, uint32_t xferred_bytes);
diff --git a/src/class/hid/hid_host.h b/src/class/hid/hid_host.h
index fb10a614f..cb0230e8a 100644
--- a/src/class/hid/hid_host.h
+++ b/src/class/hid/hid_host.h
@@ -95,9 +95,9 @@ tusb_error_t  tuh_hid_keyboard_get_report(uint8_t dev_addr, void * p_report) /*A
  * \param[in]		dev_addr	Address of device
  * \param[in]   event an value from \ref xfer_result_t
  * \note        event can be one of following
- *              - TUSB_EVENT_XFER_COMPLETE : previously scheduled transfer completes successfully.
- *              - TUSB_EVENT_XFER_ERROR   : previously scheduled transfer encountered a transaction error.
- *              - TUSB_EVENT_XFER_STALLED : previously scheduled transfer is stalled by device.
+ *              - XFER_RESULT_SUCCESS : previously scheduled transfer completes successfully.
+ *              - XFER_RESULT_FAILED   : previously scheduled transfer encountered a transaction error.
+ *              - XFER_RESULT_STALLED : previously scheduled transfer is stalled by device.
  * \note        Application should schedule the next report by calling \ref tuh_hid_keyboard_get_report within this callback
  */
 void tuh_hid_keyboard_isr(uint8_t dev_addr, xfer_result_t event);
@@ -160,9 +160,9 @@ tusb_error_t  tuh_hid_mouse_get_report(uint8_t dev_addr, void* p_report) /*ATTR_
  * \param[in]		dev_addr	Address of device
  * \param[in]   event an value from \ref xfer_result_t
  * \note        event can be one of following
- *              - TUSB_EVENT_XFER_COMPLETE : previously scheduled transfer completes successfully.
- *              - TUSB_EVENT_XFER_ERROR   : previously scheduled transfer encountered a transaction error.
- *              - TUSB_EVENT_XFER_STALLED : previously scheduled transfer is stalled by device.
+ *              - XFER_RESULT_SUCCESS : previously scheduled transfer completes successfully.
+ *              - XFER_RESULT_FAILED   : previously scheduled transfer encountered a transaction error.
+ *              - XFER_RESULT_STALLED : previously scheduled transfer is stalled by device.
  * \note        Application should schedule the next report by calling \ref tuh_hid_mouse_get_report within this callback
  */
 void tuh_hid_mouse_isr(uint8_t dev_addr, xfer_result_t event);
diff --git a/src/class/msc/msc_host.h b/src/class/msc/msc_host.h
index 0afe5c515..a408bbeaf 100644
--- a/src/class/msc/msc_host.h
+++ b/src/class/msc/msc_host.h
@@ -174,9 +174,9 @@ void tuh_msc_unmounted_cb(uint8_t dev_addr);
  * \param[in]   event an value from \ref xfer_result_t
  * \param[in]   xferred_bytes Number of bytes transferred via USB bus
  * \note        event can be one of following
- *              - TUSB_EVENT_XFER_COMPLETE : previously scheduled transfer completes successfully.
- *              - TUSB_EVENT_XFER_ERROR   : previously scheduled transfer encountered a transaction error.
- *              - TUSB_EVENT_XFER_STALLED : previously scheduled transfer is stalled by device.
+ *              - XFER_RESULT_SUCCESS : previously scheduled transfer completes successfully.
+ *              - XFER_RESULT_FAILED   : previously scheduled transfer encountered a transaction error.
+ *              - XFER_RESULT_STALLED : previously scheduled transfer is stalled by device.
  * \note
  */
 void tuh_msc_isr(uint8_t dev_addr, xfer_result_t event, uint32_t xferred_bytes);
diff --git a/src/common/tusb_types.h b/src/common/tusb_types.h
index 7b5268d4f..9c3c21b88 100644
--- a/src/common/tusb_types.h
+++ b/src/common/tusb_types.h
@@ -197,9 +197,9 @@ typedef enum
 
 typedef enum
 {
-  TUSB_EVENT_XFER_COMPLETE,
-  TUSB_EVENT_XFER_ERROR,
-  TUSB_EVENT_XFER_STALLED,
+  XFER_RESULT_SUCCESS,
+  XFER_RESULT_FAILED,
+  XFER_RESULT_STALLED,
 }xfer_result_t;
 
 enum
diff --git a/src/host/ehci/ehci.c b/src/host/ehci/ehci.c
index 2fc99ffcd..27808d59b 100644
--- a/src/host/ehci/ehci.c
+++ b/src/host/ehci/ehci.c
@@ -570,7 +570,7 @@ static void qhd_xfer_complete_isr(ehci_qhd_t * p_qhd)
     if (is_ioc) // end of request
     { // call USBH callback
       usbh_xfer_isr( qhd_create_pipe_handle(p_qhd, xfer_type),
-                     p_qhd->class_code, TUSB_EVENT_XFER_COMPLETE,
+                     p_qhd->class_code, XFER_RESULT_SUCCESS,
                      p_qhd->total_xferred_bytes - (xfer_type == TUSB_XFER_CONTROL ? 8 : 0) ); // subtract setup packet size if control,
       p_qhd->total_xferred_bytes = 0;
     }
@@ -641,12 +641,12 @@ static void qhd_xfer_error_isr(ehci_qhd_t * p_qhd)
     xfer_result_t error_event;
 
     // no error bits are set, endpoint is halted due to STALL
-    error_event = qhd_has_xact_error(p_qhd) ? TUSB_EVENT_XFER_ERROR : TUSB_EVENT_XFER_STALLED;
+    error_event = qhd_has_xact_error(p_qhd) ? XFER_RESULT_FAILED : XFER_RESULT_STALLED;
 
     p_qhd->total_xferred_bytes += p_qhd->p_qtd_list_head->expected_bytes - p_qhd->p_qtd_list_head->total_bytes;
 
 
-//    if ( TUSB_EVENT_XFER_ERROR == error_event )    TU_BREAKPOINT(); // TODO skip unplugged device
+//    if ( XFER_RESULT_FAILED == error_event )    TU_BREAKPOINT(); // TODO skip unplugged device
 
     p_qhd->p_qtd_list_head->used = 0; // free QTD
     qtd_remove_1st_from_qhd(p_qhd);
diff --git a/src/host/hub.c b/src/host/hub.c
index 9635bcc0b..55c8597ad 100644
--- a/src/host/hub.c
+++ b/src/host/hub.c
@@ -215,7 +215,7 @@ void hub_isr(pipe_handle_t pipe_hdl, xfer_result_t event, uint32_t xferred_bytes
 
   usbh_hub_t * p_hub = &hub_data[pipe_hdl.dev_addr-1];
 
-  if ( event == TUSB_EVENT_XFER_COMPLETE )
+  if ( event == XFER_RESULT_SUCCESS )
   {
     for (uint8_t port=1; port <= p_hub->port_number; port++)
     { // TODO HUB ignore bit0 hub_status_change
diff --git a/src/host/ohci/ohci.c b/src/host/ohci/ohci.c
index 58738a236..91d9b6243 100644
--- a/src/host/ohci/ohci.c
+++ b/src/host/ohci/ohci.c
@@ -617,11 +617,11 @@ static void done_queue_isr(uint8_t hostid)
     // TODO check if td_head is iso td
     //------------- Non ISO transfer -------------//
     ohci_gtd_t * const p_qtd = (ohci_gtd_t *) td_head;
-    xfer_result_t const event = (p_qtd->condition_code == OHCI_CCODE_NO_ERROR) ? TUSB_EVENT_XFER_COMPLETE :
-                               (p_qtd->condition_code == OHCI_CCODE_STALL) ? TUSB_EVENT_XFER_STALLED : TUSB_EVENT_XFER_ERROR;
+    xfer_result_t const event = (p_qtd->condition_code == OHCI_CCODE_NO_ERROR) ? XFER_RESULT_SUCCESS :
+                               (p_qtd->condition_code == OHCI_CCODE_STALL) ? XFER_RESULT_STALLED : XFER_RESULT_FAILED;
 
     p_qtd->used = 0; // free TD
-    if ( (p_qtd->delay_interrupt == OHCI_INT_ON_COMPLETE_YES) || (event != TUSB_EVENT_XFER_COMPLETE) )
+    if ( (p_qtd->delay_interrupt == OHCI_INT_ON_COMPLETE_YES) || (event != XFER_RESULT_SUCCESS) )
     {
       ohci_ed_t * const p_ed  = gtd_get_ed(p_qtd);
 
@@ -634,11 +634,11 @@ static void done_queue_isr(uint8_t hostid)
       // --> HC will not process Control list (due to service ratio when Bulk list not empty)
       // To walk-around this, the halted ED will have TailP = HeadP (empty list condition), when clearing halt
       // the TailP must be set back to NULL for processing remaining TDs
-      if ((event != TUSB_EVENT_XFER_COMPLETE))
+      if ((event != XFER_RESULT_SUCCESS))
       {
         p_ed->td_tail.address &= 0x0Ful;
         p_ed->td_tail.address |= tu_align16(p_ed->td_head.address); // mark halted EP as empty queue
-        if ( event == TUSB_EVENT_XFER_STALLED ) p_ed->is_stalled = 1;
+        if ( event == XFER_RESULT_STALLED ) p_ed->is_stalled = 1;
       }
 
       pipe_handle_t pipe_hdl =
diff --git a/src/host/usbh.c b/src/host/usbh.c
index ed21bf3da..a0aab3b96 100644
--- a/src/host/usbh.c
+++ b/src/host/usbh.c
@@ -199,7 +199,7 @@ tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, uint8_t bmRequestType,
 #ifndef _TEST_
   usbh_devices[dev_addr].control.pipe_status = 0;
 #else
-  usbh_devices[dev_addr].control.pipe_status = TUSB_EVENT_XFER_COMPLETE; // in Test project, mark as complete immediately
+  usbh_devices[dev_addr].control.pipe_status = XFER_RESULT_SUCCESS; // in Test project, mark as complete immediately
 #endif
 
   error = hcd_pipe_control_xfer(dev_addr, &usbh_devices[dev_addr].control.request, data);
@@ -207,11 +207,11 @@ tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, uint8_t bmRequestType,
   osal_mutex_release(usbh_devices[dev_addr].control.mutex_hdl);
 
   STASK_ASSERT_ERR(error);
-  if (TUSB_EVENT_XFER_STALLED == usbh_devices[dev_addr].control.pipe_status) STASK_RETURN(TUSB_ERROR_USBH_XFER_STALLED);
-  if (TUSB_EVENT_XFER_ERROR   == usbh_devices[dev_addr].control.pipe_status) STASK_RETURN(TUSB_ERROR_USBH_XFER_FAILED);
+  if (XFER_RESULT_STALLED == usbh_devices[dev_addr].control.pipe_status) STASK_RETURN(TUSB_ERROR_USBH_XFER_STALLED);
+  if (XFER_RESULT_FAILED   == usbh_devices[dev_addr].control.pipe_status) STASK_RETURN(TUSB_ERROR_USBH_XFER_FAILED);
 
 //  STASK_ASSERT_HDLR(TUSB_ERROR_NONE == error &&
-//                              TUSB_EVENT_XFER_COMPLETE == usbh_devices[dev_addr].control.pipe_status,
+//                              XFER_RESULT_SUCCESS == usbh_devices[dev_addr].control.pipe_status,
 //                              tuh_device_mount_failed_cb(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND, NULL) );
 
   OSAL_SUBTASK_END
diff --git a/src/osal/osal_none.h b/src/osal/osal_none.h
index 46930aeda..b21c3332a 100644
--- a/src/osal/osal_none.h
+++ b/src/osal/osal_none.h
@@ -156,10 +156,12 @@ static inline void osal_queue_reset(osal_queue_t const queue_hdl)
 static inline bool osal_queue_receive(osal_queue_t const queue_hdl, void* data)
 {
   // osal none return immediately without blocking
+  // extern void tusb_hal_int_disable(uint8_t rhport);
+  // extern void tusb_hal_int_enable(uint8_t rhport);
 
-  // tusb_hal_int_disable_all();
+//  tusb_hal_int_disable(0);
   bool rc = tu_fifo_read(queue_hdl, data);
-  // tusb_hal_int_enable_all();
+//  tusb_hal_int_enable(0);
 
   return rc;
 }
diff --git a/tests/lpc18xx_43xx/test/host/cdc/test_cdc_host.c b/tests/lpc18xx_43xx/test/host/cdc/test_cdc_host.c
index 5077eea93..12dce0528 100644
--- a/tests/lpc18xx_43xx/test/host/cdc/test_cdc_host.c
+++ b/tests/lpc18xx_43xx/test/host/cdc/test_cdc_host.c
@@ -251,10 +251,10 @@ void test_cdc_xfer_notification_pipe(void)
   cdch_data[dev_addr-1].pipe_out          = pipe_out;
   cdch_data[dev_addr-1].pipe_in           = pipe_in;
 
-  tusbh_cdc_xfer_isr_Expect(dev_addr, TUSB_EVENT_XFER_COMPLETE, CDC_PIPE_NOTIFICATION, 10);
+  tusbh_cdc_xfer_isr_Expect(dev_addr, XFER_RESULT_SUCCESS, CDC_PIPE_NOTIFICATION, 10);
 
   //------------- CUT -------------//
-  cdch_isr(pipe_notification, TUSB_EVENT_XFER_COMPLETE, 10);
+  cdch_isr(pipe_notification, XFER_RESULT_SUCCESS, 10);
 }
 
 void test_cdc_xfer_pipe_out(void)
@@ -267,10 +267,10 @@ void test_cdc_xfer_pipe_out(void)
   cdch_data[dev_addr-1].pipe_out          = pipe_out;
   cdch_data[dev_addr-1].pipe_in           = pipe_in;
 
-  tusbh_cdc_xfer_isr_Expect(dev_addr, TUSB_EVENT_XFER_ERROR, CDC_PIPE_DATA_OUT, 20);
+  tusbh_cdc_xfer_isr_Expect(dev_addr, XFER_RESULT_FAILED, CDC_PIPE_DATA_OUT, 20);
 
   //------------- CUT -------------//
-  cdch_isr(pipe_out, TUSB_EVENT_XFER_ERROR, 20);
+  cdch_isr(pipe_out, XFER_RESULT_FAILED, 20);
 }
 
 void test_cdc_xfer_pipe_in(void)
@@ -283,8 +283,8 @@ void test_cdc_xfer_pipe_in(void)
   cdch_data[dev_addr-1].pipe_out          = pipe_out;
   cdch_data[dev_addr-1].pipe_in           = pipe_in;
 
-  tusbh_cdc_xfer_isr_Expect(dev_addr, TUSB_EVENT_XFER_STALLED, CDC_PIPE_DATA_IN, 0);
+  tusbh_cdc_xfer_isr_Expect(dev_addr, XFER_RESULT_STALLED, CDC_PIPE_DATA_IN, 0);
 
   //------------- CUT -------------//
-  cdch_isr(pipe_in, TUSB_EVENT_XFER_STALLED, 0);
+  cdch_isr(pipe_in, XFER_RESULT_STALLED, 0);
 }
diff --git a/tests/lpc18xx_43xx/test/host/cdc/test_cdc_rndis_host.c b/tests/lpc18xx_43xx/test/host/cdc/test_cdc_rndis_host.c
index a493c3b79..86d6c2890 100644
--- a/tests/lpc18xx_43xx/test/host/cdc/test_cdc_rndis_host.c
+++ b/tests/lpc18xx_43xx/test/host/cdc/test_cdc_rndis_host.c
@@ -188,7 +188,7 @@ static tusb_error_t  stub_pipe_notification_xfer(pipe_handle_t pipe_hdl, uint8_t
 
   buffer[0] = 1; // response available
 
-  cdch_isr(pipe_hdl, TUSB_EVENT_XFER_COMPLETE, 8);
+  cdch_isr(pipe_hdl, XFER_RESULT_SUCCESS, 8);
 
   return TUSB_ERROR_NONE;
 }
diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_xfer.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_xfer.c
index 2e9e29fdc..c4037c596 100644
--- a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_xfer.c
+++ b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_bulk_xfer.c
@@ -208,7 +208,7 @@ void test_bulk_xfer_complete_isr(void)
   ehci_qtd_t* p_head = p_qhd_bulk->p_qtd_list_head;
   ehci_qtd_t* p_tail = p_qhd_bulk->p_qtd_list_tail;
 
-  usbh_xfer_isr_Expect(pipe_hdl_bulk, TUSB_CLASS_MSC, TUSB_EVENT_XFER_COMPLETE, sizeof(data2)+sizeof(xfer_data));
+  usbh_xfer_isr_Expect(pipe_hdl_bulk, TUSB_CLASS_MSC, XFER_RESULT_SUCCESS, sizeof(data2)+sizeof(xfer_data));
 
   //------------- Code Under Test -------------//
   ehci_controller_run(hostid);
diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_xfer.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_xfer.c
index ffd7ffb67..4f8cdb4c8 100644
--- a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_xfer.c
+++ b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_xfer.c
@@ -228,7 +228,7 @@ void test_control_xfer_complete_isr(void)
 {
   TEST_ASSERT_STATUS( hcd_pipe_control_xfer(dev_addr, &request_get_dev_desc, xfer_data) );
 
-  usbh_xfer_isr_Expect(((pipe_handle_t){.dev_addr = dev_addr}), 0, TUSB_EVENT_XFER_COMPLETE, 18);
+  usbh_xfer_isr_Expect(((pipe_handle_t){.dev_addr = dev_addr}), 0, XFER_RESULT_SUCCESS, 18);
 
   //------------- Code Under TEST -------------//
   ehci_controller_run(hostid);
@@ -247,7 +247,7 @@ void test_control_xfer_error_isr(void)
 {
   TEST_ASSERT_STATUS( hcd_pipe_control_xfer(dev_addr, &request_get_dev_desc, xfer_data) );
 
-  usbh_xfer_isr_Expect(((pipe_handle_t){.dev_addr = dev_addr}), 0, TUSB_EVENT_XFER_ERROR, 0);
+  usbh_xfer_isr_Expect(((pipe_handle_t){.dev_addr = dev_addr}), 0, XFER_RESULT_FAILED, 0);
 
   //------------- Code Under TEST -------------//
   ehci_controller_run_error(hostid);
@@ -266,7 +266,7 @@ void test_control_xfer_error_stall(void)
 {
   TEST_ASSERT_STATUS( hcd_pipe_control_xfer(dev_addr, &request_get_dev_desc, xfer_data) );
 
-  usbh_xfer_isr_Expect(((pipe_handle_t){.dev_addr = dev_addr}), 0, TUSB_EVENT_XFER_STALLED, 0);
+  usbh_xfer_isr_Expect(((pipe_handle_t){.dev_addr = dev_addr}), 0, XFER_RESULT_STALLED, 0);
 
   //------------- Code Under TEST -------------//
   ehci_controller_run_stall(hostid);
diff --git a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_xfer.c b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_xfer.c
index 827db2897..bf7ad352a 100644
--- a/tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_xfer.c
+++ b/tests/lpc18xx_43xx/test/host/ehci/test_pipe_interrupt_xfer.c
@@ -201,7 +201,7 @@ void test_interrupt_xfer_complete_isr_interval_less_than_1ms(void)
 
   TEST_ASSERT_STATUS( hcd_pipe_xfer(pipe_hdl_interrupt, data2, sizeof(data2), true) );
 
-  usbh_xfer_isr_Expect(pipe_hdl_interrupt, TUSB_CLASS_HID, TUSB_EVENT_XFER_COMPLETE, sizeof(xfer_data)+sizeof(data2));
+  usbh_xfer_isr_Expect(pipe_hdl_interrupt, TUSB_CLASS_HID, XFER_RESULT_SUCCESS, sizeof(xfer_data)+sizeof(data2));
 
   ehci_qtd_t* p_head = p_qhd_interrupt->p_qtd_list_head;
   ehci_qtd_t* p_tail = p_qhd_interrupt->p_qtd_list_tail;
@@ -242,7 +242,7 @@ void test_interrupt_xfer_error_isr(void)
 {
   TEST_ASSERT_STATUS( hcd_pipe_xfer(pipe_hdl_interrupt, xfer_data, sizeof(xfer_data), true) );
 
-  usbh_xfer_isr_Expect(pipe_hdl_interrupt, TUSB_CLASS_HID, TUSB_EVENT_XFER_ERROR, 0);
+  usbh_xfer_isr_Expect(pipe_hdl_interrupt, TUSB_CLASS_HID, XFER_RESULT_FAILED, 0);
 
   //------------- Code Under TEST -------------//
   ehci_controller_run_error(hostid);
@@ -254,7 +254,7 @@ void test_interrupt_xfer_error_stall(void)
 {
   TEST_ASSERT_STATUS( hcd_pipe_xfer(pipe_hdl_interrupt, xfer_data, sizeof(xfer_data), true) );
 
-  usbh_xfer_isr_Expect(pipe_hdl_interrupt, TUSB_CLASS_HID, TUSB_EVENT_XFER_STALLED, 0);
+  usbh_xfer_isr_Expect(pipe_hdl_interrupt, TUSB_CLASS_HID, XFER_RESULT_STALLED, 0);
 
   //------------- Code Under TEST -------------//
   ehci_controller_run_stall(hostid);
diff --git a/tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c b/tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c
index b3b49c172..de3581423 100644
--- a/tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c
+++ b/tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c
@@ -216,10 +216,10 @@ void test_keyboard_get_ok()
 
 void test_keyboard_isr_event_complete(void)
 {
-  tusbh_hid_keyboard_isr_Expect(dev_addr, TUSB_EVENT_XFER_COMPLETE);
+  tusbh_hid_keyboard_isr_Expect(dev_addr, XFER_RESULT_SUCCESS);
 
   //------------- Code Under TEST -------------//
-  hidh_isr(p_hidh_kbd->pipe_hdl, TUSB_EVENT_XFER_COMPLETE, 8);
+  hidh_isr(p_hidh_kbd->pipe_hdl, XFER_RESULT_SUCCESS, 8);
 
 //  tusbh_device_get_state_IgnoreAndReturn(TUSB_DEVICE_STATE_CONFIGURED);
 //  TEST_ASSERT_EQUAL(TUSB_INTERFACE_STATUS_COMPLETE, tusbh_hid_keyboard_status(dev_addr));
diff --git a/tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c b/tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c
index b1a3558e6..541c2caef 100644
--- a/tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c
+++ b/tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c
@@ -189,10 +189,10 @@ void test_mouse_get_ok()
 
 void test_mouse_isr_event_xfer_complete(void)
 {
-  tusbh_hid_mouse_isr_Expect(dev_addr, TUSB_EVENT_XFER_COMPLETE);
+  tusbh_hid_mouse_isr_Expect(dev_addr, XFER_RESULT_SUCCESS);
 
   //------------- Code Under TEST -------------//
-  hidh_isr(p_hidh_mouse->pipe_hdl, TUSB_EVENT_XFER_COMPLETE, 8);
+  hidh_isr(p_hidh_mouse->pipe_hdl, XFER_RESULT_SUCCESS, 8);
 
   tusbh_device_get_state_IgnoreAndReturn(TUSB_DEVICE_STATE_CONFIGURED);
 //  TEST_ASSERT_EQUAL(TUSB_INTERFACE_STATUS_COMPLETE, tusbh_hid_mouse_status(dev_addr));
@@ -200,10 +200,10 @@ void test_mouse_isr_event_xfer_complete(void)
 
 void test_mouse_isr_event_xfer_error(void)
 {
-  tusbh_hid_mouse_isr_Expect(dev_addr, TUSB_EVENT_XFER_ERROR);
+  tusbh_hid_mouse_isr_Expect(dev_addr, XFER_RESULT_FAILED);
 
   //------------- Code Under TEST -------------//
-  hidh_isr(p_hidh_mouse->pipe_hdl, TUSB_EVENT_XFER_ERROR, 0);
+  hidh_isr(p_hidh_mouse->pipe_hdl, XFER_RESULT_FAILED, 0);
 
   tusbh_device_get_state_IgnoreAndReturn(TUSB_DEVICE_STATE_CONFIGURED);
 //  TEST_ASSERT_EQUAL(TUSB_INTERFACE_STATUS_ERROR, tusbh_hid_mouse_status(dev_addr));
diff --git a/tests/lpc18xx_43xx/test/host/usbh/test_enum_task.c b/tests/lpc18xx_43xx/test/host/usbh/test_enum_task.c
index a85c3c48a..eba3fbcc3 100644
--- a/tests/lpc18xx_43xx/test/host/usbh/test_enum_task.c
+++ b/tests/lpc18xx_43xx/test/host/usbh/test_enum_task.c
@@ -181,7 +181,7 @@ tusb_error_t control_xfer_stub(uint8_t dev_addr, const tusb_control_request_t *
 
   usbh_xfer_isr(
       (pipe_handle_t) { .dev_addr = (num_call > 1 ? 1 : 0), .xfer_type = TUSB_XFER_CONTROL },
-      0, TUSB_EVENT_XFER_COMPLETE, 0);
+      0, XFER_RESULT_SUCCESS, 0);
 
   return TUSB_ERROR_NONE;
 }