.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)\r
                },\r
                \r
-       .Interface = \r
+       .HID_Interface = \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
 \r
                        .InterfaceStrIndex      = NO_DESCRIPTOR\r
                },\r
 \r
-       .MouseHID = \r
+       .HID_MouseHID = \r
                {\r
                        .Header                 = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},\r
 \r
                        .HIDReportLength        = sizeof(MouseReport)\r
                },\r
 \r
-       .MouseEndpoint = \r
+       .HID_ReportINEndpoint = \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
 \r
                        \r
                        break;\r
                case DTYPE_HID: \r
-                       Address = (void*)&ConfigurationDescriptor.MouseHID;\r
+                       Address = (void*)&ConfigurationDescriptor.HID_MouseHID;\r
                        Size    = sizeof(USB_HID_Descriptor_t);\r
                        break;\r
                case DTYPE_Report: \r