Index: uspace/drv/usbkbd/main.c
===================================================================
--- uspace/drv/usbkbd/main.c	(revision 647492be9e52a32f31564b213ac3b39f28c01717)
+++ uspace/drv/usbkbd/main.c	(revision 1b29d6fabc7fd1e40ab61631ba0951f9d490a448)
@@ -39,5 +39,5 @@
 #define NAME "usbkbd"
 
-static const usb_endpoint_t CONTROL_EP = 0;
+#define GUESSED_POLL_ENDPOINT 1
 
 /*
@@ -155,5 +155,5 @@
 
 	// default endpoint
-	kbd_dev->default_ep = CONTROL_EP;
+	kbd_dev->poll_endpoint = GUESSED_POLL_ENDPOINT;
 	
 	/*
@@ -204,5 +204,5 @@
 	usb_target_t poll_target = {
 		.address = kbd_dev->address,
-		.endpoint = kbd_dev->default_ep
+		.endpoint = kbd_dev->poll_endpoint
 	};
 
Index: uspace/lib/usb/include/usb/classes/hid.h
===================================================================
--- uspace/lib/usb/include/usb/classes/hid.h	(revision 647492be9e52a32f31564b213ac3b39f28c01717)
+++ uspace/lib/usb/include/usb/classes/hid.h	(revision 1b29d6fabc7fd1e40ab61631ba0951f9d490a448)
@@ -100,5 +100,5 @@
 	device_t *device;
 	usb_address_t address;
-	usb_endpoint_t default_ep;
+	usb_endpoint_t poll_endpoint;
 	usb_hid_report_parser_t *parser;
 } usb_hid_dev_kbd_t;