Index: uspace/drv/usbhid/usbhid.h
===================================================================
--- uspace/drv/usbhid/usbhid.h	(revision df29f24d4abcaa1e1685723e6f90f6acdccb7941)
+++ uspace/drv/usbhid/usbhid.h	(revision 0a7627bdd4ecac2e377bc051c9d03bfa45c06258)
@@ -50,7 +50,7 @@
 typedef int (*usb_hid_driver_init_t)(struct usb_hid_dev *, void **data);
 typedef void (*usb_hid_driver_deinit_t)(struct usb_hid_dev *, void *data);
-typedef bool (*usb_hid_driver_poll)(struct usb_hid_dev *, void *data, uint8_t *,
+typedef bool (*usb_hid_driver_poll_t)(struct usb_hid_dev *, void *data, uint8_t *,
                                     size_t);
-typedef int (*usb_hid_driver_poll_ended)(struct usb_hid_dev *, void *data, 
+typedef int (*usb_hid_driver_poll_ended_t)(struct usb_hid_dev *, void *data, 
                                          bool reason);
 
@@ -61,7 +61,7 @@
 	usb_hid_driver_deinit_t deinit;
 	/** Function to be called when data arrives from the device. */
-	usb_hid_driver_poll poll;
+	usb_hid_driver_poll_t poll;
 	/** Function to be called when polling ends. */
-	usb_hid_driver_poll_ended poll_end;
+	usb_hid_driver_poll_ended_t poll_end;
 	/** Arbitrary data needed by the subdriver. */
 	void *data;
Index: uspace/lib/usbhid/src/hidreq.c
===================================================================
--- uspace/lib/usbhid/src/hidreq.c	(revision df29f24d4abcaa1e1685723e6f90f6acdccb7941)
+++ uspace/lib/usbhid/src/hidreq.c	(revision 0a7627bdd4ecac2e377bc051c9d03bfa45c06258)
@@ -82,5 +82,5 @@
 	value |= (type << 8);
 
-	usb_log_debug("Sending Set_Report request to the device.\n");
+	usb_log_debug("Sending Set Report request to the device.\n");
 	
 	rc = usb_control_request_set(ctrl_pipe, 
@@ -89,6 +89,6 @@
 
 	if (rc != EOK) {
-		usb_log_warning("Error sending output report to the keyboard: "
-		    "%s.\n", str_error(rc));
+		usb_log_warning("Error sending Set Report request to the "
+		    "device: %s.\n", str_error(rc));
 		return rc;
 	}
@@ -129,5 +129,5 @@
 	int rc;
 
-	usb_log_debug("Sending Set_Protocol request to the device ("
+	usb_log_debug("Sending Set Protocol request to the device ("
 	    "protocol: %d, iface: %d).\n", protocol, iface_no);
 	
@@ -137,6 +137,6 @@
 
 	if (rc != EOK) {
-		usb_log_warning("Error sending output report to the keyboard: "
-		    "%s.\n", str_error(rc));
+		usb_log_warning("Error sending Set Protocol request to the "
+		    "device: %s.\n", str_error(rc));
 		return rc;
 	}
@@ -177,5 +177,5 @@
 	int rc;
 
-	usb_log_debug("Sending Set_Idle request to the device ("
+	usb_log_debug("Sending Set Idle request to the device ("
 	    "duration: %u, iface: %d).\n", duration, iface_no);
 	
@@ -187,5 +187,5 @@
 
 	if (rc != EOK) {
-		usb_log_warning("Error sending output report to the keyboard: "
+		usb_log_warning("Error sending Set Idle request to the device: "
 		    "%s.\n", str_error(rc));
 		return rc;
@@ -235,5 +235,5 @@
 	value |= (type << 8);
 	
-	usb_log_debug("Sending Get_Report request to the device.\n");
+	usb_log_debug("Sending Get Report request to the device.\n");
 	
 	rc = usb_control_request_get(ctrl_pipe, 
@@ -243,5 +243,5 @@
 
 	if (rc != EOK) {
-		usb_log_warning("Error sending output report to the keyboard: "
+		usb_log_warning("Error sending Get Report request to the device: "
 		    "%s.\n", str_error(rc));
 		return rc;
@@ -283,5 +283,5 @@
 	int rc;	
 
-	usb_log_debug("Sending Get_Protocol request to the device ("
+	usb_log_debug("Sending Get Protocol request to the device ("
 	    "iface: %d).\n", iface_no);
 	
@@ -294,6 +294,6 @@
 
 	if (rc != EOK) {
-		usb_log_warning("Error sending output report to the keyboard: "
-		    "%s.\n", str_error(rc));
+		usb_log_warning("Error sending Get Protocol request to the "
+		    "device: %s.\n", str_error(rc));
 		return rc;
 	}
@@ -344,5 +344,5 @@
 	int rc;
 
-	usb_log_debug("Sending Get_Idle request to the device ("
+	usb_log_debug("Sending Get Idle request to the device ("
 	    "iface: %d).\n", iface_no);
 	
@@ -357,5 +357,5 @@
 
 	if (rc != EOK) {
-		usb_log_warning("Error sending output report to the keyboard: "
+		usb_log_warning("Error sending Get Idle request to the device: "
 		    "%s.\n", str_error(rc));
 		return rc;