Index: uspace/drv/usbhid/usbhid.c
===================================================================
--- uspace/drv/usbhid/usbhid.c	(revision 73ae3373feaf1647fc3c56640205a536981d073e)
+++ uspace/drv/usbhid/usbhid.c	(revision fec47d4d4a2130ab84e58b61c1e5433ef7bacea3)
@@ -51,5 +51,5 @@
 
 /** Mouse polling endpoint description for boot protocol class. */
-static usb_endpoint_description_t ush_hid_mouse_poll_endpoint_description = {
+static usb_endpoint_description_t usb_hid_mouse_poll_endpoint_description = {
 	.transfer_type = USB_TRANSFER_INTERRUPT,
 	.direction = USB_DIRECTION_IN,
@@ -61,8 +61,7 @@
 
 /* Array of endpoints expected on the device, NULL terminated. */
-usb_endpoint_description_t 
-    *usb_hid_endpoints[USB_HID_POLL_EP_COUNT + 1] = {
-	&ush_hid_kbd_poll_endpoint_description,
-	&ush_hid_mouse_poll_endpoint_description,
+usb_endpoint_description_t *usb_hid_endpoints[USB_HID_POLL_EP_COUNT + 1] = {
+	&usb_hid_kbd_poll_endpoint_description,
+	&usb_hid_mouse_poll_endpoint_description,
 	&usb_hid_generic_poll_endpoint_description,
 	NULL
Index: uspace/drv/usbhid/usbhid.ma
===================================================================
--- uspace/drv/usbhid/usbhid.ma	(revision 73ae3373feaf1647fc3c56640205a536981d073e)
+++ uspace/drv/usbhid/usbhid.ma	(revision fec47d4d4a2130ab84e58b61c1e5433ef7bacea3)
@@ -1,2 +1,3 @@
+100 usb&interface&class=HID&subclass=0x01&protocol=0x01
 100 usb&interface&class=HID&subclass=0x01&protocol=0x02
 100 usb&interface&class=HID
Index: uspace/drv/usbkbd/usbkbd.ma
===================================================================
--- uspace/drv/usbkbd/usbkbd.ma	(revision 73ae3373feaf1647fc3c56640205a536981d073e)
+++ uspace/drv/usbkbd/usbkbd.ma	(revision fec47d4d4a2130ab84e58b61c1e5433ef7bacea3)
@@ -1,1 +1,1 @@
-1000 usb&interface&class=HID&subclass=0x01&protocol=0x01
+10 usb&interface&class=HID&subclass=0x01&protocol=0x01