diff --git a/right/usb_interface_generic_hid.h b/right/usb_interface_generic_hid.h
index f7e6372..daf10e4 100644
--- a/right/usb_interface_generic_hid.h
+++ b/right/usb_interface_generic_hid.h
@@ -10,8 +10,8 @@
 
     #define USB_GENERIC_HID_INTERFACE_INDEX 0
 
-    #define USB_GENERIC_HID_ENDPOINT_IN_INDEX 3
-    #define USB_GENERIC_HID_ENDPOINT_OUT_INDEX 4
+    #define USB_GENERIC_HID_ENDPOINT_IN_INDEX 1
+    #define USB_GENERIC_HID_ENDPOINT_OUT_INDEX 2
     #define USB_GENERIC_HID_ENDPOINT_COUNT 2
 
     #define USB_GENERIC_HID_INTERRUPT_IN_PACKET_SIZE 64
diff --git a/right/usb_interface_keyboard.h b/right/usb_interface_keyboard.h
index 3b40e67..b858751 100644
--- a/right/usb_interface_keyboard.h
+++ b/right/usb_interface_keyboard.h
@@ -10,7 +10,7 @@
 
     #define USB_KEYBOARD_INTERFACE_INDEX 1
 
-    #define USB_KEYBOARD_ENDPOINT_INDEX 2
+    #define USB_KEYBOARD_ENDPOINT_INDEX 3
     #define USB_KEYBOARD_ENDPOINT_COUNT 1
 
     #define USB_KEYBOARD_INTERRUPT_IN_PACKET_SIZE 8
diff --git a/right/usb_interface_mouse.h b/right/usb_interface_mouse.h
index 1667169..ae5a32d 100644
--- a/right/usb_interface_mouse.h
+++ b/right/usb_interface_mouse.h
@@ -10,7 +10,7 @@
 
     #define USB_MOUSE_INTERFACE_INDEX 2
 
-    #define USB_MOUSE_ENDPOINT_INDEX 1
+    #define USB_MOUSE_ENDPOINT_INDEX 4
     #define USB_MOUSE_ENDPOINT_COUNT 1
 
     #define USB_MOUSE_INTERRUPT_IN_PACKET_SIZE 8