Index: uspace/drv/usbkbd/kbdrepeat.h
===================================================================
--- uspace/drv/usbkbd/kbdrepeat.h	(revision 61825f976ecbcab2aead816e16d887c9f2fbb9b4)
+++ uspace/drv/usbkbd/kbdrepeat.h	(revision 4acf099b70c331292c191767acea76db03805008)
@@ -34,8 +34,8 @@
  */
 
-#ifndef USBHID_KBDREPEAT_H_
-#define USBHID_KBDREPEAT_H_
+#ifndef USB_KBDREPEAT_H_
+#define USB_KBDREPEAT_H_
 
-struct usbhid_kbd_t;
+struct usb_kbd_t;
 
 /*----------------------------------------------------------------------------*/
@@ -52,15 +52,15 @@
 	/** Delay between repeats in microseconds. */
 	unsigned int delay_between;
-} usbhid_kbd_repeat_t;
+} usb_kbd_repeat_t;
 
 /*----------------------------------------------------------------------------*/
 
-int usbhid_kbd_repeat_fibril(void *arg);
+int usb_kbd_repeat_fibril(void *arg);
 
-void usbhid_kbd_repeat_start(struct usbhid_kbd_t *kbd, unsigned int key);
+void usb_kbd_repeat_start(struct usb_kbd_t *kbd, unsigned int key);
 
-void usbhid_kbd_repeat_stop(struct usbhid_kbd_t *kbd, unsigned int key);
+void usb_kbd_repeat_stop(struct usb_kbd_t *kbd, unsigned int key);
 
-#endif /* USBHID_KBDREPEAT_H_ */
+#endif /* USB_KBDREPEAT_H_ */
 
 /**