diff --git a/right/usb_descriptor_configuration.c b/right/usb_descriptor_configuration.c
index 94b1bf7..d6d1222 100644
--- a/right/usb_descriptor_configuration.c
+++ b/right/usb_descriptor_configuration.c
@@ -47,7 +47,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] =
 
     USB_DESCRIPTOR_LENGTH_ENDPOINT,
     USB_DESCRIPTOR_TYPE_ENDPOINT,
-    USB_GENERIC_HID_ENDPOINT_IN_ID | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT),
+    USB_GENERIC_HID_ENDPOINT_IN_INDEX | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT),
     USB_ENDPOINT_INTERRUPT,
     USB_SHORT_GET_LOW(USB_GENERIC_HID_INTERRUPT_IN_PACKET_SIZE),
     USB_SHORT_GET_HIGH(USB_GENERIC_HID_INTERRUPT_IN_PACKET_SIZE),
@@ -57,7 +57,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] =
 
     USB_DESCRIPTOR_LENGTH_ENDPOINT,
     USB_DESCRIPTOR_TYPE_ENDPOINT,
-    USB_GENERIC_HID_ENDPOINT_OUT_ID | (USB_OUT << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT),
+    USB_GENERIC_HID_ENDPOINT_OUT_INDEX | (USB_OUT << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT),
     USB_ENDPOINT_INTERRUPT,
     USB_SHORT_GET_LOW(USB_GENERIC_HID_INTERRUPT_OUT_PACKET_SIZE),
     USB_SHORT_GET_HIGH(USB_GENERIC_HID_INTERRUPT_OUT_PACKET_SIZE),
@@ -91,7 +91,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] =
 
     USB_DESCRIPTOR_LENGTH_ENDPOINT,
     USB_DESCRIPTOR_TYPE_ENDPOINT,
-    USB_KEYBOARD_ENDPOINT_ID | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT),
+    USB_KEYBOARD_ENDPOINT_INDEX | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT),
     USB_ENDPOINT_INTERRUPT,
     USB_SHORT_GET_LOW(USB_KEYBOARD_INTERRUPT_IN_PACKET_SIZE),
     USB_SHORT_GET_HIGH(USB_KEYBOARD_INTERRUPT_IN_PACKET_SIZE),
@@ -125,7 +125,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] =
 
     USB_DESCRIPTOR_LENGTH_ENDPOINT,
     USB_DESCRIPTOR_TYPE_ENDPOINT,
-    USB_MOUSE_ENDPOINT_ID | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT),
+    USB_MOUSE_ENDPOINT_INDEX | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT),
     USB_ENDPOINT_INTERRUPT,
     USB_SHORT_GET_LOW(USB_MOUSE_INTERRUPT_IN_PACKET_SIZE),
     USB_SHORT_GET_HIGH(USB_MOUSE_INTERRUPT_IN_PACKET_SIZE),
diff --git a/right/usb_interface_generic_hid.c b/right/usb_interface_generic_hid.c
index bf1a2ab..14c960a 100644
--- a/right/usb_interface_generic_hid.c
+++ b/right/usb_interface_generic_hid.c
@@ -5,12 +5,12 @@
 static usb_device_endpoint_struct_t UsbGenericHidEndpoints[USB_GENERIC_HID_ENDPOINT_COUNT] =
 {
     {
-        USB_GENERIC_HID_ENDPOINT_IN_ID | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT),
+        USB_GENERIC_HID_ENDPOINT_IN_INDEX | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT),
         USB_ENDPOINT_INTERRUPT,
         USB_GENERIC_HID_INTERRUPT_IN_PACKET_SIZE,
     },
     {
-        USB_GENERIC_HID_ENDPOINT_OUT_ID | (USB_OUT << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT),
+        USB_GENERIC_HID_ENDPOINT_OUT_INDEX | (USB_OUT << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT),
         USB_ENDPOINT_INTERRUPT,
         USB_GENERIC_HID_INTERRUPT_OUT_PACKET_SIZE,
     }
@@ -47,7 +47,7 @@ static uint8_t GenericHidBufferIndex;
 
 static usb_status_t UsbReceiveData()
 {
-    return USB_DeviceHidRecv(UsbCompositeDevice.genericHidHandle, USB_GENERIC_HID_ENDPOINT_OUT_ID,
+    return USB_DeviceHidRecv(UsbCompositeDevice.genericHidHandle, USB_GENERIC_HID_ENDPOINT_OUT_INDEX,
                              &GenericHidBuffer[GenericHidBufferIndex][0],
                              USB_GENERIC_HID_OUT_BUFFER_LENGTH);
 }
@@ -78,7 +78,7 @@ usb_status_t UsbGenericHidCallback(class_handle_t handle, uint32_t event, void *
                     break;
             }
 
-            USB_DeviceHidSend(UsbCompositeDevice.genericHidHandle, USB_GENERIC_HID_ENDPOINT_IN_ID,
+            USB_DeviceHidSend(UsbCompositeDevice.genericHidHandle, USB_GENERIC_HID_ENDPOINT_IN_INDEX,
                               &GenericHidBuffer[GenericHidBufferIndex][0],
                               USB_GENERIC_HID_OUT_BUFFER_LENGTH);
             GenericHidBufferIndex ^= 1U;
diff --git a/right/usb_interface_generic_hid.h b/right/usb_interface_generic_hid.h
index a15da54..6d952b5 100644
--- a/right/usb_interface_generic_hid.h
+++ b/right/usb_interface_generic_hid.h
@@ -15,8 +15,8 @@
     #define USB_GENERIC_HID_INTERFACE_INDEX 0
     #define USB_GENERIC_HID_INTERFACE_COUNT 1
 
-    #define USB_GENERIC_HID_ENDPOINT_IN_ID 3
-    #define USB_GENERIC_HID_ENDPOINT_OUT_ID 4
+    #define USB_GENERIC_HID_ENDPOINT_IN_INDEX 3
+    #define USB_GENERIC_HID_ENDPOINT_OUT_INDEX 4
     #define USB_GENERIC_HID_ENDPOINT_COUNT 2
 
     #define USB_GENERIC_HID_INTERRUPT_IN_PACKET_SIZE 64
diff --git a/right/usb_interface_keyboard.c b/right/usb_interface_keyboard.c
index bcd588c..4fdffbb 100644
--- a/right/usb_interface_keyboard.c
+++ b/right/usb_interface_keyboard.c
@@ -12,7 +12,7 @@
 #include "usb_descriptor_configuration.h"
 
 static usb_device_endpoint_struct_t UsbKeyboardEndpoints[USB_KEYBOARD_ENDPOINT_COUNT] = {{
-    USB_KEYBOARD_ENDPOINT_ID | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT),
+    USB_KEYBOARD_ENDPOINT_INDEX | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT),
     USB_ENDPOINT_INTERRUPT,
     USB_KEYBOARD_INTERRUPT_IN_PACKET_SIZE,
 }};
@@ -57,7 +57,7 @@ static usb_status_t UsbKeyboardAction(void)
         UsbKeyboardReport.scancodes[0] = HID_KEYBOARD_SC_A;
     }
 
-    return USB_DeviceHidSend(UsbCompositeDevice.keyboardHandle, USB_KEYBOARD_ENDPOINT_ID,
+    return USB_DeviceHidSend(UsbCompositeDevice.keyboardHandle, USB_KEYBOARD_ENDPOINT_INDEX,
                              (uint8_t*)&UsbKeyboardReport, USB_KEYBOARD_REPORT_LENGTH);
 }
 
diff --git a/right/usb_interface_keyboard.h b/right/usb_interface_keyboard.h
index eb4556e..7bb7e8f 100644
--- a/right/usb_interface_keyboard.h
+++ b/right/usb_interface_keyboard.h
@@ -15,7 +15,7 @@
     #define USB_KEYBOARD_INTERFACE_INDEX 1
     #define USB_KEYBOARD_INTERFACE_COUNT 1
 
-    #define USB_KEYBOARD_ENDPOINT_ID 2
+    #define USB_KEYBOARD_ENDPOINT_INDEX 2
     #define USB_KEYBOARD_ENDPOINT_COUNT 1
 
     #define USB_KEYBOARD_INTERRUPT_IN_PACKET_SIZE 8
diff --git a/right/usb_interface_mouse.c b/right/usb_interface_mouse.c
index d324b88..8020dd1 100644
--- a/right/usb_interface_mouse.c
+++ b/right/usb_interface_mouse.c
@@ -3,7 +3,7 @@
 #include "usb_composite_device.h"
 
 static usb_device_endpoint_struct_t UsbMouseEndpoints[USB_MOUSE_ENDPOINT_COUNT] = {{
-    USB_MOUSE_ENDPOINT_ID | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT),
+    USB_MOUSE_ENDPOINT_INDEX | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT),
     USB_ENDPOINT_INTERRUPT,
     USB_MOUSE_INTERRUPT_IN_PACKET_SIZE,
 }};
@@ -51,7 +51,7 @@ static volatile usb_status_t UsbMouseAction(void)
         }
     }
     scrollCounter++;
-    return USB_DeviceHidSend(UsbCompositeDevice.mouseHandle, USB_MOUSE_ENDPOINT_ID,
+    return USB_DeviceHidSend(UsbCompositeDevice.mouseHandle, USB_MOUSE_ENDPOINT_INDEX,
                              (uint8_t*)&UsbMouseReport, USB_MOUSE_REPORT_LENGTH);
 }
 
diff --git a/right/usb_interface_mouse.h b/right/usb_interface_mouse.h
index 9c5939a..776ce4a 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_INTERFACE_COUNT 1
 
-    #define USB_MOUSE_ENDPOINT_ID 1
+    #define USB_MOUSE_ENDPOINT_INDEX 1
     #define USB_MOUSE_ENDPOINT_COUNT 1
 
     #define USB_MOUSE_INTERRUPT_IN_PACKET_SIZE 8