diff --git a/module_usb_midi/src/usb_midi.xc b/module_usb_midi/src/usb_midi.xc
index e4b1550a..f037ecd0 100644
--- a/module_usb_midi/src/usb_midi.xc
+++ b/module_usb_midi/src/usb_midi.xc
@@ -331,11 +331,11 @@ void usb_midi(port ?p_midi_in, port ?p_midi_out,
                     /* Check for special case where MIDI ports are shared with i2c ports */
                     if(isnull(c_i2c) && isnull(p_scl) && isnull(p_sda))
                     {
-                        handle_iap_case(is_ack, is_reset, datum, c_iap, c_i2c, p_midi_out, p_midi_in);
+                        iap_handle_ack_or_reset_or_data(is_ack, is_reset, datum, c_iap, c_i2c, p_midi_out, p_midi_in);
                     }
                     else
                     {
-                        handle_iap_case(is_ack, is_reset, datum, c_iap, c_i2c, p_scl, p_sda);
+                        iap_handle_ack_or_reset_or_data(is_ack, is_reset, datum, c_iap, c_i2c, p_scl, p_sda);
                     }
                     if (!authenticating) 
                     {
@@ -347,7 +347,7 @@ void usb_midi(port ?p_midi_in, port ?p_midi_out,
                 /* Slow timer looking for IDevice plug/unplug event */
                 case iAPTimer when timerafter(polltime) :> void:
                     printintln(polltime);
-                    handle_poll_dev_det(iAPTimer);
+                    iap_handle_poll_dev_det(iAPTimer);
                     break;
 #endif
             }