diff --git a/changelog.md b/changelog.md
index e25e93721..807b4dc3a 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,7 +4,7 @@
 
 ### Breaking
 
-- TinyUSB does not directly implement USB IRQ Handler function anymore. Application must implement IRQ Handler and invoke `tud_irq_handler(rhport)`. This is due to:
+- TinyUSB does not directly implement USB IRQ Handler function anymore. Application must implement IRQ Handler and invoke `tud_int_handler(rhport)`. This is due to:
   
   - IRQ Handler name can be different across system depending on the startup
   - Some OS need to execute enterISR()/exitISR() to work properly, also tracing tool may need to insert trace ISR enter/exit to record usb event
@@ -12,7 +12,7 @@
 
 ### MCU
 
-- All default IRQ Handler is renamed to `dcd_irq_handler()`
+- All default IRQ Handler is renamed to `dcd_int_handler()`
 
 ## 0.6.0 - 2019.03.30
 
diff --git a/docs/porting.md b/docs/porting.md
index 83b08da27..fabf24510 100644
--- a/docs/porting.md
+++ b/docs/porting.md
@@ -68,7 +68,7 @@ This function should leave an internal D+/D- pull-up in its default power-on sta
 
 Enables or disables the USB device interrupt(s). May be used to prevent concurrency issues when mutating data structures shared between main code and the interrupt handler.
 
-##### dcd_irq_handler
+##### dcd_int_handler
 
 Processes all the hardware generated events e.g Bus reset, new data packet from host etc ... It will be called by application in the MCU USB interrupt handler.
 
diff --git a/examples/device/board_test/Makefile b/examples/device/board_test/Makefile
index 66d8571cf..b65575ce6 100644
--- a/examples/device/board_test/Makefile
+++ b/examples/device/board_test/Makefile
@@ -13,6 +13,6 @@ SRC_C += $(addprefix $(CURRENT_PATH)/, $(EXAMPLE_SOURCE))
 # This can cause some TinyUSB API missing, this hack to allow us to fill those API
 # to pass the compilation process
 CFLAGS +=	\
-	-D"tud_irq_handler(x)= " \
+	-D"tud_int_handler(x)= " \
 
 include ../../rules.mk
diff --git a/hw/bsp/adafruit_clue/adafruit_clue.c b/hw/bsp/adafruit_clue/adafruit_clue.c
index 54b822fc9..cb5c2f223 100644
--- a/hw/bsp/adafruit_clue/adafruit_clue.c
+++ b/hw/bsp/adafruit_clue/adafruit_clue.c
@@ -40,7 +40,7 @@
 //--------------------------------------------------------------------+
 void USBD_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/arduino_nano33_ble/arduino_nano33_ble.c b/hw/bsp/arduino_nano33_ble/arduino_nano33_ble.c
index a3ab49a5d..d2d126311 100644
--- a/hw/bsp/arduino_nano33_ble/arduino_nano33_ble.c
+++ b/hw/bsp/arduino_nano33_ble/arduino_nano33_ble.c
@@ -41,7 +41,7 @@
 //--------------------------------------------------------------------+
 void USBD_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 /*------------------------------------------------------------------*/
diff --git a/hw/bsp/circuitplayground_bluefruit/circuitplayground_bluefruit.c b/hw/bsp/circuitplayground_bluefruit/circuitplayground_bluefruit.c
index 17e619704..9638b3cc8 100644
--- a/hw/bsp/circuitplayground_bluefruit/circuitplayground_bluefruit.c
+++ b/hw/bsp/circuitplayground_bluefruit/circuitplayground_bluefruit.c
@@ -40,7 +40,7 @@
 //--------------------------------------------------------------------+
 void USBD_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 /*------------------------------------------------------------------*/
diff --git a/hw/bsp/circuitplayground_express/circuitplayground_express.c b/hw/bsp/circuitplayground_express/circuitplayground_express.c
index 0e2583383..4ff95b2ff 100644
--- a/hw/bsp/circuitplayground_express/circuitplayground_express.c
+++ b/hw/bsp/circuitplayground_express/circuitplayground_express.c
@@ -40,7 +40,7 @@
 //--------------------------------------------------------------------+
 void USB_Handler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/ea4088qs/ea4088qs.c b/hw/bsp/ea4088qs/ea4088qs.c
index 756c9d384..7fc047490 100644
--- a/hw/bsp/ea4088qs/ea4088qs.c
+++ b/hw/bsp/ea4088qs/ea4088qs.c
@@ -37,7 +37,7 @@ void USB_IRQHandler(void)
   #endif
 
   #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE
-    tud_irq_handler(0);
+    tud_int_handler(0);
   #endif
 }
 
diff --git a/hw/bsp/ea4357/ea4357.c b/hw/bsp/ea4357/ea4357.c
index 87b19260e..87f1e83cc 100644
--- a/hw/bsp/ea4357/ea4357.c
+++ b/hw/bsp/ea4357/ea4357.c
@@ -240,7 +240,7 @@ void USB0_IRQHandler(void)
   #endif
 
   #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE
-    tud_irq_handler(0);
+    tud_int_handler(0);
   #endif
 }
 
@@ -251,7 +251,7 @@ void USB1_IRQHandler(void)
   #endif
 
   #if CFG_TUSB_RHPORT1_MODE & OPT_MODE_DEVICE
-    tud_irq_handler(1);
+    tud_int_handler(1);
   #endif
 }
 
diff --git a/hw/bsp/feather_m0_express/feather_m0_express.c b/hw/bsp/feather_m0_express/feather_m0_express.c
index 83b20793e..4eb157c8f 100644
--- a/hw/bsp/feather_m0_express/feather_m0_express.c
+++ b/hw/bsp/feather_m0_express/feather_m0_express.c
@@ -40,7 +40,7 @@
 //--------------------------------------------------------------------+
 void USB_Handler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/feather_m4_express/feather_m4_express.c b/hw/bsp/feather_m4_express/feather_m4_express.c
index 8b4764cd0..72183c612 100644
--- a/hw/bsp/feather_m4_express/feather_m4_express.c
+++ b/hw/bsp/feather_m4_express/feather_m4_express.c
@@ -37,22 +37,22 @@
 //--------------------------------------------------------------------+
 void USB_0_Handler (void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 void USB_1_Handler (void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 void USB_2_Handler (void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 void USB_3_Handler (void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/feather_nrf52840_express/feather_nrf52840_express.c b/hw/bsp/feather_nrf52840_express/feather_nrf52840_express.c
index e36615ee1..34e7fa8ec 100644
--- a/hw/bsp/feather_nrf52840_express/feather_nrf52840_express.c
+++ b/hw/bsp/feather_nrf52840_express/feather_nrf52840_express.c
@@ -41,7 +41,7 @@
 //--------------------------------------------------------------------+
 void USBD_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 /*------------------------------------------------------------------*/
diff --git a/hw/bsp/feather_nrf52840_sense/feather_nrf52840_sense.c b/hw/bsp/feather_nrf52840_sense/feather_nrf52840_sense.c
index fb4ef9af2..284ae27b1 100644
--- a/hw/bsp/feather_nrf52840_sense/feather_nrf52840_sense.c
+++ b/hw/bsp/feather_nrf52840_sense/feather_nrf52840_sense.c
@@ -40,7 +40,7 @@
 //--------------------------------------------------------------------+
 void USBD_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 /*------------------------------------------------------------------*/
diff --git a/hw/bsp/feather_stm32f405/feather_stm32f405.c b/hw/bsp/feather_stm32f405/feather_stm32f405.c
index bdd216272..a8c782da5 100644
--- a/hw/bsp/feather_stm32f405/feather_stm32f405.c
+++ b/hw/bsp/feather_stm32f405/feather_stm32f405.c
@@ -34,7 +34,7 @@
 //--------------------------------------------------------------------+
 void OTG_FS_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/fomu/fomu.c b/hw/bsp/fomu/fomu.c
index 404b72333..25e5e9613 100644
--- a/hw/bsp/fomu/fomu.c
+++ b/hw/bsp/fomu/fomu.c
@@ -63,7 +63,7 @@ void isr(void)
 
 #if CFG_TUSB_RHPORT0_MODE == OPT_MODE_DEVICE
   if (irqs & (1 << USB_INTERRUPT)) {
-    tud_irq_handler(0);
+    tud_int_handler(0);
   }
 #endif
   if (irqs & (1 << TIMER0_INTERRUPT)) {
diff --git a/hw/bsp/itsybitsy_m0/itsybitsy_m0.c b/hw/bsp/itsybitsy_m0/itsybitsy_m0.c
index 93661b899..652bc6b3d 100644
--- a/hw/bsp/itsybitsy_m0/itsybitsy_m0.c
+++ b/hw/bsp/itsybitsy_m0/itsybitsy_m0.c
@@ -40,7 +40,7 @@
 //--------------------------------------------------------------------+
 void USB_Handler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/itsybitsy_m4/itsybitsy_m4.c b/hw/bsp/itsybitsy_m4/itsybitsy_m4.c
index 3ae9565c9..0195a9fc4 100644
--- a/hw/bsp/itsybitsy_m4/itsybitsy_m4.c
+++ b/hw/bsp/itsybitsy_m4/itsybitsy_m4.c
@@ -37,22 +37,22 @@
 //--------------------------------------------------------------------+
 void USB_0_Handler (void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 void USB_1_Handler (void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 void USB_2_Handler (void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 void USB_3_Handler (void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/lpcxpresso11u37/lpcxpresso11u37.c b/hw/bsp/lpcxpresso11u37/lpcxpresso11u37.c
index 6f2ae80e8..11f1797a2 100644
--- a/hw/bsp/lpcxpresso11u37/lpcxpresso11u37.c
+++ b/hw/bsp/lpcxpresso11u37/lpcxpresso11u37.c
@@ -32,7 +32,7 @@
 //--------------------------------------------------------------------+
 void USB_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //---------------------------------------------------------------- ----+
diff --git a/hw/bsp/lpcxpresso11u68/lpcxpresso11u68.c b/hw/bsp/lpcxpresso11u68/lpcxpresso11u68.c
index 193df3bb1..e33a5c6e5 100644
--- a/hw/bsp/lpcxpresso11u68/lpcxpresso11u68.c
+++ b/hw/bsp/lpcxpresso11u68/lpcxpresso11u68.c
@@ -32,7 +32,7 @@
 //--------------------------------------------------------------------+
 void USB_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/lpcxpresso1347/lpcxpresso1347.c b/hw/bsp/lpcxpresso1347/lpcxpresso1347.c
index 14a0009e4..a9a67ae3a 100644
--- a/hw/bsp/lpcxpresso1347/lpcxpresso1347.c
+++ b/hw/bsp/lpcxpresso1347/lpcxpresso1347.c
@@ -32,7 +32,7 @@
 //--------------------------------------------------------------------+
 void USB_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/lpcxpresso1549/lpcxpresso1549.c b/hw/bsp/lpcxpresso1549/lpcxpresso1549.c
index 2ae8d7506..a10cd38ec 100644
--- a/hw/bsp/lpcxpresso1549/lpcxpresso1549.c
+++ b/hw/bsp/lpcxpresso1549/lpcxpresso1549.c
@@ -32,7 +32,7 @@
 //--------------------------------------------------------------------+
 void USB_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/lpcxpresso1769/lpcxpresso1769.c b/hw/bsp/lpcxpresso1769/lpcxpresso1769.c
index 3b5c9dcab..cc6fd95ae 100644
--- a/hw/bsp/lpcxpresso1769/lpcxpresso1769.c
+++ b/hw/bsp/lpcxpresso1769/lpcxpresso1769.c
@@ -37,7 +37,7 @@ void USB_IRQHandler(void)
   #endif
 
   #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE
-    tud_irq_handler(0);
+    tud_int_handler(0);
   #endif
 }
 
diff --git a/hw/bsp/lpcxpresso51u68/lpcxpresso51u68.c b/hw/bsp/lpcxpresso51u68/lpcxpresso51u68.c
index 2a314388d..6bade7743 100644
--- a/hw/bsp/lpcxpresso51u68/lpcxpresso51u68.c
+++ b/hw/bsp/lpcxpresso51u68/lpcxpresso51u68.c
@@ -35,7 +35,7 @@
 //--------------------------------------------------------------------+
 void USB0_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/lpcxpresso54114/lpcxpresso54114.c b/hw/bsp/lpcxpresso54114/lpcxpresso54114.c
index 847accb67..3bccc4bd7 100644
--- a/hw/bsp/lpcxpresso54114/lpcxpresso54114.c
+++ b/hw/bsp/lpcxpresso54114/lpcxpresso54114.c
@@ -35,7 +35,7 @@
 //--------------------------------------------------------------------+
 void USB0_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/lpcxpresso55s69/lpcxpresso55s69.c b/hw/bsp/lpcxpresso55s69/lpcxpresso55s69.c
index 31519dc8f..a17cffe9c 100644
--- a/hw/bsp/lpcxpresso55s69/lpcxpresso55s69.c
+++ b/hw/bsp/lpcxpresso55s69/lpcxpresso55s69.c
@@ -35,12 +35,12 @@
 //--------------------------------------------------------------------+
 void USB0_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 void USB1_IRQHandler(void)
 {
-  tud_irq_handler(1);
+  tud_int_handler(1);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/mbed1768/mbed1768.c b/hw/bsp/mbed1768/mbed1768.c
index cda508803..5963ad8ec 100644
--- a/hw/bsp/mbed1768/mbed1768.c
+++ b/hw/bsp/mbed1768/mbed1768.c
@@ -145,7 +145,7 @@ void USB_IRQHandler(void)
   #endif
 
   #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE
-    tud_irq_handler(0);
+    tud_int_handler(0);
   #endif
 }
 
diff --git a/hw/bsp/mcb1800/mcb1800.c b/hw/bsp/mcb1800/mcb1800.c
index 43dc7bfbb..ae9f1b62f 100644
--- a/hw/bsp/mcb1800/mcb1800.c
+++ b/hw/bsp/mcb1800/mcb1800.c
@@ -37,7 +37,7 @@ void USB0_IRQHandler(void)
   #endif
 
   #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE
-    tud_irq_handler(0);
+    tud_int_handler(0);
   #endif
 }
 
@@ -48,7 +48,7 @@ void USB1_IRQHandler(void)
   #endif
 
   #if CFG_TUSB_RHPORT1_MODE & OPT_MODE_DEVICE
-    tud_irq_handler(1);
+    tud_int_handler(1);
   #endif
 }
 
diff --git a/hw/bsp/metro_m0_express/metro_m0_express.c b/hw/bsp/metro_m0_express/metro_m0_express.c
index 83b20793e..4eb157c8f 100644
--- a/hw/bsp/metro_m0_express/metro_m0_express.c
+++ b/hw/bsp/metro_m0_express/metro_m0_express.c
@@ -40,7 +40,7 @@
 //--------------------------------------------------------------------+
 void USB_Handler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/metro_m4_express/metro_m4_express.c b/hw/bsp/metro_m4_express/metro_m4_express.c
index 61b270de0..b489b79c4 100644
--- a/hw/bsp/metro_m4_express/metro_m4_express.c
+++ b/hw/bsp/metro_m4_express/metro_m4_express.c
@@ -37,22 +37,22 @@
 //--------------------------------------------------------------------+
 void USB_0_Handler (void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 void USB_1_Handler (void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 void USB_2_Handler (void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 void USB_3_Handler (void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/mimxrt1010_evk/mimxrt1010_evk.c b/hw/bsp/mimxrt1010_evk/mimxrt1010_evk.c
index d061c0e04..c682ace8d 100644
--- a/hw/bsp/mimxrt1010_evk/mimxrt1010_evk.c
+++ b/hw/bsp/mimxrt1010_evk/mimxrt1010_evk.c
@@ -125,7 +125,7 @@ void USB_OTG1_IRQHandler(void)
   #endif
 
   #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE
-    tud_irq_handler(0);
+    tud_int_handler(0);
   #endif
 }
 
diff --git a/hw/bsp/mimxrt1015_evk/mimxrt1015_evk.c b/hw/bsp/mimxrt1015_evk/mimxrt1015_evk.c
index 874e4517e..214077a4a 100644
--- a/hw/bsp/mimxrt1015_evk/mimxrt1015_evk.c
+++ b/hw/bsp/mimxrt1015_evk/mimxrt1015_evk.c
@@ -125,7 +125,7 @@ void USB_OTG1_IRQHandler(void)
   #endif
 
   #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE
-    tud_irq_handler(0);
+    tud_int_handler(0);
   #endif
 }
 
diff --git a/hw/bsp/mimxrt1020_evk/mimxrt1020_evk.c b/hw/bsp/mimxrt1020_evk/mimxrt1020_evk.c
index 17727c0ab..f32ec5401 100644
--- a/hw/bsp/mimxrt1020_evk/mimxrt1020_evk.c
+++ b/hw/bsp/mimxrt1020_evk/mimxrt1020_evk.c
@@ -124,7 +124,7 @@ void USB_OTG1_IRQHandler(void)
   #endif
 
   #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE
-    tud_irq_handler(0);
+    tud_int_handler(0);
   #endif
 }
 
diff --git a/hw/bsp/mimxrt1050_evkb/mimxrt1050_evkb.c b/hw/bsp/mimxrt1050_evkb/mimxrt1050_evkb.c
index ed29be4d3..be0ae3ea8 100644
--- a/hw/bsp/mimxrt1050_evkb/mimxrt1050_evkb.c
+++ b/hw/bsp/mimxrt1050_evkb/mimxrt1050_evkb.c
@@ -128,7 +128,7 @@ void USB_OTG1_IRQHandler(void)
   #endif
 
   #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE
-    tud_irq_handler(0);
+    tud_int_handler(0);
   #endif
 }
 
@@ -139,7 +139,7 @@ void USB_OTG2_IRQHandler(void)
   #endif
 
   #if CFG_TUSB_RHPORT1_MODE & OPT_MODE_DEVICE
-    tud_irq_handler(1);
+    tud_int_handler(1);
   #endif
 }
 
diff --git a/hw/bsp/mimxrt1060_evk/mimxrt1060_evk.c b/hw/bsp/mimxrt1060_evk/mimxrt1060_evk.c
index ed29be4d3..be0ae3ea8 100644
--- a/hw/bsp/mimxrt1060_evk/mimxrt1060_evk.c
+++ b/hw/bsp/mimxrt1060_evk/mimxrt1060_evk.c
@@ -128,7 +128,7 @@ void USB_OTG1_IRQHandler(void)
   #endif
 
   #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE
-    tud_irq_handler(0);
+    tud_int_handler(0);
   #endif
 }
 
@@ -139,7 +139,7 @@ void USB_OTG2_IRQHandler(void)
   #endif
 
   #if CFG_TUSB_RHPORT1_MODE & OPT_MODE_DEVICE
-    tud_irq_handler(1);
+    tud_int_handler(1);
   #endif
 }
 
diff --git a/hw/bsp/mimxrt1064_evk/mimxrt1064_evk.c b/hw/bsp/mimxrt1064_evk/mimxrt1064_evk.c
index ed29be4d3..be0ae3ea8 100644
--- a/hw/bsp/mimxrt1064_evk/mimxrt1064_evk.c
+++ b/hw/bsp/mimxrt1064_evk/mimxrt1064_evk.c
@@ -128,7 +128,7 @@ void USB_OTG1_IRQHandler(void)
   #endif
 
   #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE
-    tud_irq_handler(0);
+    tud_int_handler(0);
   #endif
 }
 
@@ -139,7 +139,7 @@ void USB_OTG2_IRQHandler(void)
   #endif
 
   #if CFG_TUSB_RHPORT1_MODE & OPT_MODE_DEVICE
-    tud_irq_handler(1);
+    tud_int_handler(1);
   #endif
 }
 
diff --git a/hw/bsp/msp_exp430f5529lp/msp_exp430f5529lp.c b/hw/bsp/msp_exp430f5529lp/msp_exp430f5529lp.c
index 621d21d55..e9336b634 100644
--- a/hw/bsp/msp_exp430f5529lp/msp_exp430f5529lp.c
+++ b/hw/bsp/msp_exp430f5529lp/msp_exp430f5529lp.c
@@ -33,7 +33,7 @@
 //--------------------------------------------------------------------+
 void __attribute__ ((interrupt(USB_UBM_VECTOR))) USB_UBM_ISR(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/ngx4330/ngx4330.c b/hw/bsp/ngx4330/ngx4330.c
index a789a8819..5296ddcb3 100644
--- a/hw/bsp/ngx4330/ngx4330.c
+++ b/hw/bsp/ngx4330/ngx4330.c
@@ -229,7 +229,7 @@ void USB0_IRQHandler(void)
   #endif
 
   #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE
-    tud_irq_handler(0);
+    tud_int_handler(0);
   #endif
 }
 
@@ -240,7 +240,7 @@ void USB1_IRQHandler(void)
   #endif
 
   #if CFG_TUSB_RHPORT1_MODE & OPT_MODE_DEVICE
-    tud_irq_handler(1);
+    tud_int_handler(1);
   #endif
 }
 
diff --git a/hw/bsp/nrf52840_mdk_dongle/nrf52840_mdk_dongle.c b/hw/bsp/nrf52840_mdk_dongle/nrf52840_mdk_dongle.c
index 99db842ac..870a290dd 100644
--- a/hw/bsp/nrf52840_mdk_dongle/nrf52840_mdk_dongle.c
+++ b/hw/bsp/nrf52840_mdk_dongle/nrf52840_mdk_dongle.c
@@ -40,7 +40,7 @@
 //--------------------------------------------------------------------+
 void USBD_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 /*------------------------------------------------------------------*/
diff --git a/hw/bsp/nutiny_nuc121s/nutiny_nuc121.c b/hw/bsp/nutiny_nuc121s/nutiny_nuc121.c
index 115c88165..7117a3422 100644
--- a/hw/bsp/nutiny_nuc121s/nutiny_nuc121.c
+++ b/hw/bsp/nutiny_nuc121s/nutiny_nuc121.c
@@ -34,7 +34,7 @@
 //--------------------------------------------------------------------+
 void USBD_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/nutiny_nuc125s/nutiny_nuc125.c b/hw/bsp/nutiny_nuc125s/nutiny_nuc125.c
index 115c88165..7117a3422 100644
--- a/hw/bsp/nutiny_nuc125s/nutiny_nuc125.c
+++ b/hw/bsp/nutiny_nuc125s/nutiny_nuc125.c
@@ -34,7 +34,7 @@
 //--------------------------------------------------------------------+
 void USBD_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/nutiny_nuc126v/nutiny_nuc126.c b/hw/bsp/nutiny_nuc126v/nutiny_nuc126.c
index 214873f8c..da62e7bd2 100644
--- a/hw/bsp/nutiny_nuc126v/nutiny_nuc126.c
+++ b/hw/bsp/nutiny_nuc126v/nutiny_nuc126.c
@@ -35,7 +35,7 @@
 //--------------------------------------------------------------------+
 void USBD_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/nutiny_sdk_nuc120/nutiny_sdk_nuc120.c b/hw/bsp/nutiny_sdk_nuc120/nutiny_sdk_nuc120.c
index 906d44454..0d78116b8 100644
--- a/hw/bsp/nutiny_sdk_nuc120/nutiny_sdk_nuc120.c
+++ b/hw/bsp/nutiny_sdk_nuc120/nutiny_sdk_nuc120.c
@@ -34,7 +34,7 @@
 //--------------------------------------------------------------------+
 void USBD_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/nutiny_sdk_nuc505/nutiny_sdk_nuc505.c b/hw/bsp/nutiny_sdk_nuc505/nutiny_sdk_nuc505.c
index 9018e698d..49e66d2d0 100644
--- a/hw/bsp/nutiny_sdk_nuc505/nutiny_sdk_nuc505.c
+++ b/hw/bsp/nutiny_sdk_nuc505/nutiny_sdk_nuc505.c
@@ -32,7 +32,7 @@
 //--------------------------------------------------------------------+
 void USBD_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/pca10056/pca10056.c b/hw/bsp/pca10056/pca10056.c
index ec34dbb9e..30df50124 100644
--- a/hw/bsp/pca10056/pca10056.c
+++ b/hw/bsp/pca10056/pca10056.c
@@ -41,7 +41,7 @@
 //--------------------------------------------------------------------+
 void USBD_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 /*------------------------------------------------------------------*/
diff --git a/hw/bsp/pca10059/pca10059.c b/hw/bsp/pca10059/pca10059.c
index 72a85a9fa..2a2a45eb2 100644
--- a/hw/bsp/pca10059/pca10059.c
+++ b/hw/bsp/pca10059/pca10059.c
@@ -40,7 +40,7 @@
 //--------------------------------------------------------------------+
 void USBD_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 /*------------------------------------------------------------------*/
diff --git a/hw/bsp/pca10100/pca10100.c b/hw/bsp/pca10100/pca10100.c
index ec34dbb9e..30df50124 100644
--- a/hw/bsp/pca10100/pca10100.c
+++ b/hw/bsp/pca10100/pca10100.c
@@ -41,7 +41,7 @@
 //--------------------------------------------------------------------+
 void USBD_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 /*------------------------------------------------------------------*/
diff --git a/hw/bsp/pyboardv11/pyboardv11.c b/hw/bsp/pyboardv11/pyboardv11.c
index e6f45b339..5c910484d 100644
--- a/hw/bsp/pyboardv11/pyboardv11.c
+++ b/hw/bsp/pyboardv11/pyboardv11.c
@@ -34,7 +34,7 @@
 //--------------------------------------------------------------------+
 void OTG_FS_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/raytac_mdbt50q_rx/raytac_mdbt50q_rx.c b/hw/bsp/raytac_mdbt50q_rx/raytac_mdbt50q_rx.c
index 62e6fa045..97f3cbf05 100644
--- a/hw/bsp/raytac_mdbt50q_rx/raytac_mdbt50q_rx.c
+++ b/hw/bsp/raytac_mdbt50q_rx/raytac_mdbt50q_rx.c
@@ -40,7 +40,7 @@
 //--------------------------------------------------------------------+
 void USBD_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 /*------------------------------------------------------------------*/
diff --git a/hw/bsp/samg55xplained/samg55xplained.c b/hw/bsp/samg55xplained/samg55xplained.c
index 4f894a2bc..c9bc0656e 100644
--- a/hw/bsp/samg55xplained/samg55xplained.c
+++ b/hw/bsp/samg55xplained/samg55xplained.c
@@ -100,7 +100,7 @@ void board_init(void)
 void UDP_Handler(void)
 {
   #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE
-    tud_irq_handler(0);
+    tud_int_handler(0);
   #endif
 }
 
diff --git a/hw/bsp/seeeduino_xiao/seeeduino_xiao.c b/hw/bsp/seeeduino_xiao/seeeduino_xiao.c
index d8dbd2b1c..0456228da 100644
--- a/hw/bsp/seeeduino_xiao/seeeduino_xiao.c
+++ b/hw/bsp/seeeduino_xiao/seeeduino_xiao.c
@@ -40,7 +40,7 @@
 //--------------------------------------------------------------------+
 void USB_Handler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/stm32f070rbnucleo/stm32f070rbnucleo.c b/hw/bsp/stm32f070rbnucleo/stm32f070rbnucleo.c
index 132da8aee..ded5a9c85 100644
--- a/hw/bsp/stm32f070rbnucleo/stm32f070rbnucleo.c
+++ b/hw/bsp/stm32f070rbnucleo/stm32f070rbnucleo.c
@@ -32,7 +32,7 @@
 //--------------------------------------------------------------------+
 void USB_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/stm32f072disco/stm32f072disco.c b/hw/bsp/stm32f072disco/stm32f072disco.c
index 9a3a354ef..2815beef4 100644
--- a/hw/bsp/stm32f072disco/stm32f072disco.c
+++ b/hw/bsp/stm32f072disco/stm32f072disco.c
@@ -32,7 +32,7 @@
 //--------------------------------------------------------------------+
 void USB_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/stm32f103bluepill/stm32f103bluepill.c b/hw/bsp/stm32f103bluepill/stm32f103bluepill.c
index dbb58032c..600f3aaef 100644
--- a/hw/bsp/stm32f103bluepill/stm32f103bluepill.c
+++ b/hw/bsp/stm32f103bluepill/stm32f103bluepill.c
@@ -32,17 +32,17 @@
 //--------------------------------------------------------------------+
 void USB_HP_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 void USB_LP_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 void USBWakeUp_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/stm32f207nucleo/stm32f207nucleo.c b/hw/bsp/stm32f207nucleo/stm32f207nucleo.c
index 3d1765e8b..619c90d68 100644
--- a/hw/bsp/stm32f207nucleo/stm32f207nucleo.c
+++ b/hw/bsp/stm32f207nucleo/stm32f207nucleo.c
@@ -33,7 +33,7 @@
 //--------------------------------------------------------------------+
 void OTG_FS_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/stm32f303disco/stm32f303disco.c b/hw/bsp/stm32f303disco/stm32f303disco.c
index 444472a79..1fe908bc3 100644
--- a/hw/bsp/stm32f303disco/stm32f303disco.c
+++ b/hw/bsp/stm32f303disco/stm32f303disco.c
@@ -38,7 +38,7 @@
 // the highest possible transfer rate.
 void USB_HP_CAN_TX_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 // USB low-priority interrupt (Channel 20): Triggered by all USB events
@@ -46,14 +46,14 @@ void USB_HP_CAN_TX_IRQHandler(void)
 // interrupt source before serving the interrupt.
 void USB_LP_CAN_RX0_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 // USB wakeup interrupt (Channel 42): Triggered by the wakeup event from the USB
 // Suspend mode.
 void USBWakeUp_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/stm32f401blackpill/stm32f401blackpill.c b/hw/bsp/stm32f401blackpill/stm32f401blackpill.c
index 90507e178..f9daa364f 100644
--- a/hw/bsp/stm32f401blackpill/stm32f401blackpill.c
+++ b/hw/bsp/stm32f401blackpill/stm32f401blackpill.c
@@ -34,7 +34,7 @@
 //--------------------------------------------------------------------+
 void OTG_FS_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/stm32f407disco/stm32f407disco.c b/hw/bsp/stm32f407disco/stm32f407disco.c
index d317ae7df..ce3b67da0 100644
--- a/hw/bsp/stm32f407disco/stm32f407disco.c
+++ b/hw/bsp/stm32f407disco/stm32f407disco.c
@@ -33,7 +33,7 @@
 //--------------------------------------------------------------------+
 void OTG_FS_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/stm32f411blackpill/stm32f411blackpill.c b/hw/bsp/stm32f411blackpill/stm32f411blackpill.c
index 0d085b20e..af1cf70ed 100644
--- a/hw/bsp/stm32f411blackpill/stm32f411blackpill.c
+++ b/hw/bsp/stm32f411blackpill/stm32f411blackpill.c
@@ -33,7 +33,7 @@
 //--------------------------------------------------------------------+
 void OTG_FS_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/stm32f411disco/stm32f411disco.c b/hw/bsp/stm32f411disco/stm32f411disco.c
index 3f95afb09..5d432fe23 100644
--- a/hw/bsp/stm32f411disco/stm32f411disco.c
+++ b/hw/bsp/stm32f411disco/stm32f411disco.c
@@ -32,7 +32,7 @@
 //--------------------------------------------------------------------+
 void OTG_FS_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/stm32f412disco/stm32f412disco.c b/hw/bsp/stm32f412disco/stm32f412disco.c
index be0731fb6..669891d68 100644
--- a/hw/bsp/stm32f412disco/stm32f412disco.c
+++ b/hw/bsp/stm32f412disco/stm32f412disco.c
@@ -33,7 +33,7 @@
 //--------------------------------------------------------------------+
 void OTG_FS_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/stm32f767nucleo/stm32f767nucleo.c b/hw/bsp/stm32f767nucleo/stm32f767nucleo.c
index b9025a42c..8328c361a 100644
--- a/hw/bsp/stm32f767nucleo/stm32f767nucleo.c
+++ b/hw/bsp/stm32f767nucleo/stm32f767nucleo.c
@@ -34,7 +34,7 @@
 //--------------------------------------------------------------------+
 void OTG_FS_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/stm32h743nucleo/stm32h743nucleo.c b/hw/bsp/stm32h743nucleo/stm32h743nucleo.c
index 9a758988c..bb768eb40 100644
--- a/hw/bsp/stm32h743nucleo/stm32h743nucleo.c
+++ b/hw/bsp/stm32h743nucleo/stm32h743nucleo.c
@@ -34,7 +34,7 @@
 //--------------------------------------------------------------------+
 void OTG_FS_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/stm32l0538disco/stm32l0538disco.c b/hw/bsp/stm32l0538disco/stm32l0538disco.c
index 0bfb1f845..ab04e5c51 100644
--- a/hw/bsp/stm32l0538disco/stm32l0538disco.c
+++ b/hw/bsp/stm32l0538disco/stm32l0538disco.c
@@ -32,7 +32,7 @@
 //--------------------------------------------------------------------+
 void USB_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/stm32l476disco/stm32l476disco.c b/hw/bsp/stm32l476disco/stm32l476disco.c
index 65c544137..2d4a4e3de 100644
--- a/hw/bsp/stm32l476disco/stm32l476disco.c
+++ b/hw/bsp/stm32l476disco/stm32l476disco.c
@@ -33,7 +33,7 @@
 //--------------------------------------------------------------------+
 void OTG_FS_IRQHandler(void)
 {
-  tud_irq_handler(0);
+  tud_int_handler(0);
 }
 
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/teensy_40/teensy40.c b/hw/bsp/teensy_40/teensy40.c
index 9e49ed19c..f45a98ef3 100644
--- a/hw/bsp/teensy_40/teensy40.c
+++ b/hw/bsp/teensy_40/teensy40.c
@@ -129,7 +129,7 @@ void USB_OTG1_IRQHandler(void)
   #endif
 
   #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE
-    tud_irq_handler(0);
+    tud_int_handler(0);
   #endif
 }
 
@@ -140,7 +140,7 @@ void USB_OTG2_IRQHandler(void)
   #endif
 
   #if CFG_TUSB_RHPORT1_MODE & OPT_MODE_DEVICE
-    tud_irq_handler(1);
+    tud_int_handler(1);
   #endif
 }
 
diff --git a/src/device/dcd.h b/src/device/dcd.h
index 6554be2c8..99a0e01ca 100644
--- a/src/device/dcd.h
+++ b/src/device/dcd.h
@@ -89,7 +89,7 @@ typedef struct TU_ATTR_ALIGNED(4)
 void dcd_init       (uint8_t rhport);
 
 // Interrupt Handler
-void dcd_irq_handler(uint8_t rhport) TU_ATTR_USED;
+void dcd_int_handler(uint8_t rhport);
 
 // Enable device interrupt
 void dcd_int_enable (uint8_t rhport);
diff --git a/src/device/usbd.h b/src/device/usbd.h
index 3b409e70b..fcb4e5c5f 100644
--- a/src/device/usbd.h
+++ b/src/device/usbd.h
@@ -48,7 +48,7 @@ bool tud_init (void);
 void tud_task (void);
 
 // Interrupt handler, name alias to DCD
-#define tud_irq_handler   dcd_irq_handler
+#define tud_int_handler   dcd_int_handler
 
 // Check if device is connected and configured
 bool tud_mounted(void);
diff --git a/src/portable/espressif/esp32s2/dcd_esp32s2.c b/src/portable/espressif/esp32s2/dcd_esp32s2.c
index 47c90fd13..986df3b3b 100644
--- a/src/portable/espressif/esp32s2/dcd_esp32s2.c
+++ b/src/portable/espressif/esp32s2/dcd_esp32s2.c
@@ -638,7 +638,7 @@ static void handle_epin_ints(void)
 }
 
 
-static void dcd_int_handler(void* arg)
+static void _dcd_int_handler(void* arg)
 {
   (void) arg;
 
@@ -726,7 +726,7 @@ static void dcd_int_handler(void* arg)
 void dcd_int_enable (uint8_t rhport)
 {
   (void) rhport;
-  esp_intr_alloc(ETS_USB_INTR_SOURCE, ESP_INTR_FLAG_LOWMED, (intr_handler_t) dcd_int_handler, NULL, &usb_ih);
+  esp_intr_alloc(ETS_USB_INTR_SOURCE, ESP_INTR_FLAG_LOWMED, (intr_handler_t) _dcd_int_handler, NULL, &usb_ih);
 }
 
 void dcd_int_disable (uint8_t rhport)
diff --git a/src/portable/microchip/samd/dcd_samd.c b/src/portable/microchip/samd/dcd_samd.c
index 2c01f8017..bd61df86a 100644
--- a/src/portable/microchip/samd/dcd_samd.c
+++ b/src/portable/microchip/samd/dcd_samd.c
@@ -331,7 +331,7 @@ void maybe_transfer_complete(void) {
 }
 
 
-void dcd_irq_handler (uint8_t rhport)
+void dcd_int_handler (uint8_t rhport)
 {
   (void) rhport;
 
diff --git a/src/portable/microchip/samg/dcd_samg.c b/src/portable/microchip/samg/dcd_samg.c
index c122b9bee..7703ee0dc 100644
--- a/src/portable/microchip/samg/dcd_samg.c
+++ b/src/portable/microchip/samg/dcd_samg.c
@@ -347,7 +347,7 @@ void dcd_edpt_clear_stall (uint8_t rhport, uint8_t ep_addr)
 //--------------------------------------------------------------------+
 // ISR
 //--------------------------------------------------------------------+
-void dcd_irq_handler(uint8_t rhport)
+void dcd_int_handler(uint8_t rhport)
 {
   uint32_t const intr_mask   = UDP->UDP_IMR;
   uint32_t const intr_status = UDP->UDP_ISR & intr_mask;
diff --git a/src/portable/nordic/nrf5x/dcd_nrf5x.c b/src/portable/nordic/nrf5x/dcd_nrf5x.c
index 389266217..95240f9f0 100644
--- a/src/portable/nordic/nrf5x/dcd_nrf5x.c
+++ b/src/portable/nordic/nrf5x/dcd_nrf5x.c
@@ -373,7 +373,7 @@ void bus_reset(void)
   _dcd.xfer[0][TUSB_DIR_OUT].mps = MAX_PACKET_SIZE;
 }
 
-void dcd_irq_handler(uint8_t rhport)
+void dcd_int_handler(uint8_t rhport)
 {
   (void) rhport;
 
diff --git a/src/portable/nuvoton/nuc120/dcd_nuc120.c b/src/portable/nuvoton/nuc120/dcd_nuc120.c
index 050aea255..9195b8dbe 100644
--- a/src/portable/nuvoton/nuc120/dcd_nuc120.c
+++ b/src/portable/nuvoton/nuc120/dcd_nuc120.c
@@ -306,7 +306,7 @@ void dcd_edpt_clear_stall(uint8_t rhport, uint8_t ep_addr)
   ep->CFG |= USBD_CFG_CSTALL_Msk;
 }
 
-void dcd_irq_handler(uint8_t rhport)
+void dcd_int_handler(uint8_t rhport)
 {
   (void) rhport;
 
diff --git a/src/portable/nuvoton/nuc121/dcd_nuc121.c b/src/portable/nuvoton/nuc121/dcd_nuc121.c
index df72cbb2d..edd1e14a7 100644
--- a/src/portable/nuvoton/nuc121/dcd_nuc121.c
+++ b/src/portable/nuvoton/nuc121/dcd_nuc121.c
@@ -312,7 +312,7 @@ void dcd_edpt_clear_stall(uint8_t rhport, uint8_t ep_addr)
   ep->CFG |= USBD_CFG_CSTALL_Msk;
 }
 
-void dcd_irq_handler(uint8_t rhport)
+void dcd_int_handler(uint8_t rhport)
 {
   (void) rhport;
 
diff --git a/src/portable/nuvoton/nuc505/dcd_nuc505.c b/src/portable/nuvoton/nuc505/dcd_nuc505.c
index 3baed87c5..af6972961 100644
--- a/src/portable/nuvoton/nuc505/dcd_nuc505.c
+++ b/src/portable/nuvoton/nuc505/dcd_nuc505.c
@@ -435,7 +435,7 @@ void dcd_edpt_clear_stall(uint8_t rhport, uint8_t ep_addr)
   }
 }
 
-void dcd_irq_handler(uint8_t rhport)
+void dcd_int_handler(uint8_t rhport)
 {
   (void) rhport;
 
diff --git a/src/portable/nxp/lpc17_40/dcd_lpc17_40.c b/src/portable/nxp/lpc17_40/dcd_lpc17_40.c
index dfdae1450..14f3dce3b 100644
--- a/src/portable/nxp/lpc17_40/dcd_lpc17_40.c
+++ b/src/portable/nxp/lpc17_40/dcd_lpc17_40.c
@@ -505,7 +505,7 @@ static void dd_complete_isr(uint8_t rhport, uint8_t ep_id)
 }
 
 // main USB IRQ handler
-void dcd_irq_handler(uint8_t rhport)
+void dcd_int_handler(uint8_t rhport)
 {
   uint32_t const dev_int_status = LPC_USB->DevIntSt & LPC_USB->DevIntEn;
   LPC_USB->DevIntClr = dev_int_status;// Acknowledge handled interrupt
diff --git a/src/portable/nxp/lpc_ip3511/dcd_lpc_ip3511.c b/src/portable/nxp/lpc_ip3511/dcd_lpc_ip3511.c
index 980fa118f..c1f80185b 100644
--- a/src/portable/nxp/lpc_ip3511/dcd_lpc_ip3511.c
+++ b/src/portable/nxp/lpc_ip3511/dcd_lpc_ip3511.c
@@ -345,7 +345,7 @@ static void process_xfer_isr(uint32_t int_status)
   }
 }
 
-void dcd_irq_handler(uint8_t rhport)
+void dcd_int_handler(uint8_t rhport)
 {
   (void) rhport; // TODO support multiple USB on supported mcu such as LPC55s69
 
diff --git a/src/portable/nxp/transdimension/dcd_transdimension.c b/src/portable/nxp/transdimension/dcd_transdimension.c
index cea7c2b04..539629c3d 100644
--- a/src/portable/nxp/transdimension/dcd_transdimension.c
+++ b/src/portable/nxp/transdimension/dcd_transdimension.c
@@ -503,7 +503,7 @@ bool dcd_edpt_xfer(uint8_t rhport, uint8_t ep_addr, uint8_t * buffer, uint16_t t
 //--------------------------------------------------------------------+
 // ISR
 //--------------------------------------------------------------------+
-void dcd_irq_handler(uint8_t rhport)
+void dcd_int_handler(uint8_t rhport)
 {
   dcd_registers_t* const dcd_reg = _dcd_controller[rhport].regs;
 
diff --git a/src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c b/src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c
index 14ffcbe40..dbc1e6952 100644
--- a/src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c
+++ b/src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c
@@ -499,7 +499,7 @@ static void dcd_ep_ctr_handler(void)
   }
 }
 
-void dcd_irq_handler(uint8_t rhport) {
+void dcd_int_handler(uint8_t rhport) {
 
   (void) rhport;
 
diff --git a/src/portable/st/synopsys/dcd_synopsys.c b/src/portable/st/synopsys/dcd_synopsys.c
index 38c284c5a..0c9c2650d 100644
--- a/src/portable/st/synopsys/dcd_synopsys.c
+++ b/src/portable/st/synopsys/dcd_synopsys.c
@@ -669,7 +669,7 @@ static void handle_epin_ints(USB_OTG_DeviceTypeDef * dev, USB_OTG_INEndpointType
   }
 }
 
-void dcd_irq_handler(uint8_t rhport) {
+void dcd_int_handler(uint8_t rhport) {
 
   (void) rhport;
 
diff --git a/src/portable/ti/msp430x5xx/dcd_msp430x5xx.c b/src/portable/ti/msp430x5xx/dcd_msp430x5xx.c
index 1512f0de4..da75a7f3f 100644
--- a/src/portable/ti/msp430x5xx/dcd_msp430x5xx.c
+++ b/src/portable/ti/msp430x5xx/dcd_msp430x5xx.c
@@ -558,7 +558,7 @@ static void handle_setup_packet(void)
   dcd_event_setup_received(0, (uint8_t*) &_setup_packet[0], true);
 }
 
-void dcd_irq_handler(uint8_t rhport)
+void dcd_int_handler(uint8_t rhport)
 {
   (void) rhport;
 
diff --git a/src/portable/valentyusb/eptri/dcd_eptri.c b/src/portable/valentyusb/eptri/dcd_eptri.c
index 1e7219a1f..8dde874fc 100644
--- a/src/portable/valentyusb/eptri/dcd_eptri.c
+++ b/src/portable/valentyusb/eptri/dcd_eptri.c
@@ -626,7 +626,7 @@ static void handle_setup(void)
 
   usb_setup_ev_pending_write(1);
 }
-void dcd_irq_handler(uint8_t rhport)
+void dcd_int_handler(uint8_t rhport)
 {
   (void)rhport;
   uint8_t next_ev;