diff --git a/right/usb_interface_generic_hid.c b/right/usb_interface_generic_hid.c
index 0bf19c5..bf1a2ab 100644
--- a/right/usb_interface_generic_hid.c
+++ b/right/usb_interface_generic_hid.c
@@ -17,7 +17,7 @@ static usb_device_endpoint_struct_t UsbGenericHidEndpoints[USB_GENERIC_HID_ENDPO
 };
 
 static usb_device_interface_struct_t UsbGenericHidInterface[] = {{
-    USB_GENERIC_HID_INTERFACE_ALTERNATE_SETTING,
+    USB_INTERFACE_ALTERNATE_SETTING_NONE,
     {USB_GENERIC_HID_ENDPOINT_COUNT, UsbGenericHidEndpoints},
     NULL,
 }};
diff --git a/right/usb_interface_generic_hid.h b/right/usb_interface_generic_hid.h
index 9149fbc..a15da54 100644
--- a/right/usb_interface_generic_hid.h
+++ b/right/usb_interface_generic_hid.h
@@ -14,7 +14,6 @@
 
     #define USB_GENERIC_HID_INTERFACE_INDEX 0
     #define USB_GENERIC_HID_INTERFACE_COUNT 1
-    #define USB_GENERIC_HID_INTERFACE_ALTERNATE_SETTING 0
 
     #define USB_GENERIC_HID_ENDPOINT_IN_ID 3
     #define USB_GENERIC_HID_ENDPOINT_OUT_ID 4
diff --git a/right/usb_interface_keyboard.c b/right/usb_interface_keyboard.c
index f9a1d0c..bcd588c 100644
--- a/right/usb_interface_keyboard.c
+++ b/right/usb_interface_keyboard.c
@@ -18,7 +18,7 @@ static usb_device_endpoint_struct_t UsbKeyboardEndpoints[USB_KEYBOARD_ENDPOINT_C
 }};
 
 static usb_device_interface_struct_t UsbKeyboardInterface[] = {{
-    USB_KEYBOARD_INTERFACE_ALTERNATE_SETTING,
+    USB_INTERFACE_ALTERNATE_SETTING_NONE,
     {USB_KEYBOARD_ENDPOINT_COUNT, UsbKeyboardEndpoints},
     NULL,
 }};
diff --git a/right/usb_interface_keyboard.h b/right/usb_interface_keyboard.h
index fe5f4d1..eb4556e 100644
--- a/right/usb_interface_keyboard.h
+++ b/right/usb_interface_keyboard.h
@@ -14,7 +14,6 @@
 
     #define USB_KEYBOARD_INTERFACE_INDEX 1
     #define USB_KEYBOARD_INTERFACE_COUNT 1
-    #define USB_KEYBOARD_INTERFACE_ALTERNATE_SETTING 0
 
     #define USB_KEYBOARD_ENDPOINT_ID 2
     #define USB_KEYBOARD_ENDPOINT_COUNT 1
diff --git a/right/usb_interface_mouse.c b/right/usb_interface_mouse.c
index a1f26d2..d324b88 100644
--- a/right/usb_interface_mouse.c
+++ b/right/usb_interface_mouse.c
@@ -9,7 +9,7 @@ static usb_device_endpoint_struct_t UsbMouseEndpoints[USB_MOUSE_ENDPOINT_COUNT]
 }};
 
 static usb_device_interface_struct_t UsbMouseInterface[] = {{
-    USB_MOUSE_INTERFACE_ALTERNATE_SETTING,
+    USB_INTERFACE_ALTERNATE_SETTING_NONE,
     {USB_MOUSE_ENDPOINT_COUNT, UsbMouseEndpoints},
     NULL,
 }};
diff --git a/right/usb_interface_mouse.h b/right/usb_interface_mouse.h
index 2d2f4b7..9c5939a 100644
--- a/right/usb_interface_mouse.h
+++ b/right/usb_interface_mouse.h
@@ -9,7 +9,6 @@
 
     #define USB_MOUSE_INTERFACE_INDEX 2
     #define USB_MOUSE_INTERFACE_COUNT 1
-    #define USB_MOUSE_INTERFACE_ALTERNATE_SETTING 0
 
     #define USB_MOUSE_ENDPOINT_ID 1
     #define USB_MOUSE_ENDPOINT_COUNT 1