Index: uspace/drv/usbhid/main.c
===================================================================
--- uspace/drv/usbhid/main.c	(revision a4a8ccaa29992d9e9e44af4465ecd4d0a344bdfa)
+++ uspace/drv/usbhid/main.c	(revision 23c7f4da016c6237af3f60b40f8c7b373a9c9dd9)
@@ -412,5 +412,5 @@
 	 * Initialize the backing connection to the host controller.
 	 */
-	rc = usb_device_connection_initialize(&kbd_dev->wire, dev);
+	rc = usb_device_connection_initialize_from_device(&kbd_dev->wire, dev);
 	if (rc != EOK) {
 		printf("Problem initializing connection to device: %s.\n",
Index: uspace/lib/usb/include/usb/pipes.h
===================================================================
--- uspace/lib/usb/include/usb/pipes.h	(revision a4a8ccaa29992d9e9e44af4465ecd4d0a344bdfa)
+++ uspace/lib/usb/include/usb/pipes.h	(revision 23c7f4da016c6237af3f60b40f8c7b373a9c9dd9)
@@ -80,5 +80,6 @@
 
 
-int usb_device_connection_initialize(usb_device_connection_t *, device_t *);
+int usb_device_connection_initialize_from_device(usb_device_connection_t *,
+    device_t *);
 
 int usb_endpoint_pipe_initialize(usb_endpoint_pipe_t *,
Index: uspace/lib/usb/src/pipes.c
===================================================================
--- uspace/lib/usb/src/pipes.c	(revision a4a8ccaa29992d9e9e44af4465ecd4d0a344bdfa)
+++ uspace/lib/usb/src/pipes.c	(revision 23c7f4da016c6237af3f60b40f8c7b373a9c9dd9)
@@ -60,6 +60,6 @@
  * @return Error code.
  */
-int usb_device_connection_initialize(usb_device_connection_t *connection,
-    device_t *device)
+int usb_device_connection_initialize_from_device(
+    usb_device_connection_t *connection, device_t *device)
 {
 	assert(connection);