diff --git a/right/usb_descriptor_keyboard_report.c b/right/usb_descriptor_keyboard_report.c
index eb1cc4a..6e5627b 100644
--- a/right/usb_descriptor_keyboard_report.c
+++ b/right/usb_descriptor_keyboard_report.c
@@ -4,7 +4,7 @@
 
 uint8_t UsbKeyboardReportDescriptor[USB_KEYBOARD_REPORT_DESCRIPTOR_LENGTH] = {
     HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_GENERIC_DESKTOP),
-    HID_RI_USAGE(8, HID_RI_USAGE_KEYBOARD),
+    HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_KEYBOARD),
     HID_RI_COLLECTION(8, HID_RI_COLLECTION_APPLICATION),
 
         // Modifiers
diff --git a/right/usb_descriptor_mouse_report.c b/right/usb_descriptor_mouse_report.c
index 16ea4f4..ada1e08 100644
--- a/right/usb_descriptor_mouse_report.c
+++ b/right/usb_descriptor_mouse_report.c
@@ -4,13 +4,13 @@
 
 uint8_t UsbMouseReportDescriptor[USB_MOUSE_REPORT_DESCRIPTOR_LENGTH] = {
     HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_GENERIC_DESKTOP),
-    HID_RI_USAGE(8, HID_RI_USAGE_MOUSE),
+    HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_MOUSE),
     HID_RI_COLLECTION(8, HID_RI_COLLECTION_APPLICATION),
-        HID_RI_USAGE(8, HID_RI_USAGE_POINTER),
+        HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_POINTER),
         HID_RI_COLLECTION(8, HID_RI_COLLECTION_PHYSICAL),
 
             // Mouse buttons
-            HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_MOUSE_BUTTONS),
+            HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_BUTTONS),
             HID_RI_USAGE_MINIMUM(8, 0x01),
             HID_RI_USAGE_MAXIMUM(8, USB_MOUSE_REPORT_DESCRIPTOR_BUTTONS),
             HID_RI_LOGICAL_MINIMUM(8, 0x00),
@@ -26,8 +26,8 @@ uint8_t UsbMouseReportDescriptor[USB_MOUSE_REPORT_DESCRIPTOR_LENGTH] = {
 
             // Mouse X and Y coordinates
             HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_GENERIC_DESKTOP),
-            HID_RI_USAGE(8, HID_RI_USAGE_X),
-            HID_RI_USAGE(8, HID_RI_USAGE_Y),
+            HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_X),
+            HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_Y),
             HID_RI_LOGICAL_MINIMUM(16, USB_MOUSE_REPORT_DESCRIPTOR_MIN_AXIS_VALUE),
             HID_RI_LOGICAL_MAXIMUM(16, USB_MOUSE_REPORT_DESCRIPTOR_MAX_AXIS_VALUE),
             HID_RI_PHYSICAL_MINIMUM(16, USB_MOUSE_REPORT_DESCRIPTOR_MIN_AXIS_PHYSICAL_VALUE),
@@ -39,7 +39,7 @@ uint8_t UsbMouseReportDescriptor[USB_MOUSE_REPORT_DESCRIPTOR_LENGTH] = {
             HID_RI_COLLECTION(8, HID_RI_COLLECTION_LOGICAL),
 
                 // Vertical wheel resolution multiplier
-                HID_RI_USAGE(8, HID_RI_USAGE_RESOLUTION_MULTIPLIER),
+                HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_RESOLUTION_MULTIPLIER),
                 HID_RI_LOGICAL_MINIMUM(8, 0x00),
                 HID_RI_LOGICAL_MAXIMUM(8, 0x01),
                 HID_RI_PHYSICAL_MINIMUM(8, 0x01),
@@ -50,7 +50,7 @@ uint8_t UsbMouseReportDescriptor[USB_MOUSE_REPORT_DESCRIPTOR_LENGTH] = {
                 HID_RI_FEATURE(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
 
                 // Vertical wheel
-                HID_RI_USAGE(8, HID_RI_USAGE_WHEEL),
+                HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_WHEEL),
                 HID_RI_LOGICAL_MINIMUM(8, -127),
                 HID_RI_LOGICAL_MAXIMUM(8, 127),
                 HID_RI_PHYSICAL_MINIMUM(8, 0x00),
@@ -62,7 +62,7 @@ uint8_t UsbMouseReportDescriptor[USB_MOUSE_REPORT_DESCRIPTOR_LENGTH] = {
             HID_RI_COLLECTION(8, HID_RI_COLLECTION_LOGICAL),
 
                 // Horizontal wheel resolution multiplier
-                HID_RI_USAGE(8, HID_RI_USAGE_RESOLUTION_MULTIPLIER),
+                HID_RI_USAGE(8, HID_RI_USAGE_GENERIC_DESKTOP_RESOLUTION_MULTIPLIER),
                 HID_RI_POP(0),
                 HID_RI_FEATURE(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
 
@@ -74,7 +74,7 @@ uint8_t UsbMouseReportDescriptor[USB_MOUSE_REPORT_DESCRIPTOR_LENGTH] = {
 
                 // Horizontal wheel
                 HID_RI_USAGE_PAGE(8, HID_RI_USAGE_PAGE_CONSUMER),
-                HID_RI_USAGE(16, HID_RI_USAGE_AC_PAN),
+                HID_RI_USAGE(16, HID_RI_USAGE_CONSUMER_AC_PAN),
                 HID_RI_LOGICAL_MINIMUM(8, -127),
                 HID_RI_LOGICAL_MAXIMUM(8, 127),
                 HID_RI_REPORT_SIZE(8, 0x08),
diff --git a/right/usb_report_item_macros.h b/right/usb_report_item_macros.h
index 93926fb..395cb09 100644
--- a/right/usb_report_item_macros.h
+++ b/right/usb_report_item_macros.h
@@ -10,18 +10,20 @@
 
     #define HID_RI_USAGE_PAGE_GENERIC_DESKTOP 0x01
     #define HID_RI_USAGE_PAGE_LEDS            0x08
-    #define HID_RI_USAGE_PAGE_MOUSE_BUTTONS   0x09
+    #define HID_RI_USAGE_PAGE_BUTTONS         0x09
     #define HID_RI_USAGE_PAGE_CONSUMER        0x0C
 
-    #define HID_RI_USAGE_POINTER               0x01
-    #define HID_RI_USAGE_MOUSE                 0x02
-    #define HID_RI_USAGE_JOYSTICK              0x04
-    #define HID_RI_USAGE_KEYBOARD              0x06
-    #define HID_RI_USAGE_X                     0x30
-    #define HID_RI_USAGE_Y                     0x31
-    #define HID_RI_USAGE_WHEEL                 0x38
-    #define HID_RI_USAGE_RESOLUTION_MULTIPLIER 0x48
-    #define HID_RI_USAGE_AC_PAN                0x0238
+    #define HID_RI_USAGE_GENERIC_DESKTOP_POINTER               0x01
+    #define HID_RI_USAGE_GENERIC_DESKTOP_MOUSE                 0x02
+    #define HID_RI_USAGE_GENERIC_DESKTOP_JOYSTICK              0x04
+    #define HID_RI_USAGE_GENERIC_DESKTOP_GAMEPAD               0x05
+    #define HID_RI_USAGE_GENERIC_DESKTOP_KEYBOARD              0x06
+    #define HID_RI_USAGE_GENERIC_DESKTOP_X                     0x30
+    #define HID_RI_USAGE_GENERIC_DESKTOP_Y                     0x31
+    #define HID_RI_USAGE_GENERIC_DESKTOP_WHEEL                 0x38
+    #define HID_RI_USAGE_GENERIC_DESKTOP_RESOLUTION_MULTIPLIER 0x48
+
+    #define HID_RI_USAGE_CONSUMER_AC_PAN 0x0238
 
     #define HID_RI_COLLECTION_PHYSICAL    0x00
     #define HID_RI_COLLECTION_APPLICATION 0x01