Index: uspace/lib/usb/src/hcdhubd.c
===================================================================
--- uspace/lib/usb/src/hcdhubd.c	(revision 32eceb4ff0c0ddeba47997beaa5d0677aee84d3a)
+++ uspace/lib/usb/src/hcdhubd.c	(revision cb59f787f3b39c1da8220eb8042b8c459a038c61)
@@ -34,5 +34,5 @@
  */
 #include <usb/hcdhubd.h>
-#include <usb_iface.h>
+#include <usbhc_iface.h>
 #include <driver.h>
 #include <bool.h>
@@ -45,5 +45,5 @@
 static usb_hc_driver_t *hc_driver = NULL;
 
-static usb_iface_t usb_interface = {
+static usbhc_iface_t usb_interface = {
 	.interrupt_out = NULL,
 	.interrupt_in = NULL
@@ -51,5 +51,5 @@
 
 static device_ops_t usb_device_ops = {
-	.interfaces[USB_DEV_IFACE] = &usb_interface
+	.interfaces[USBHC_DEV_IFACE] = &usb_interface
 };
 
Index: uspace/lib/usb/src/usbdrv.c
===================================================================
--- uspace/lib/usb/src/usbdrv.c	(revision 32eceb4ff0c0ddeba47997beaa5d0677aee84d3a)
+++ uspace/lib/usb/src/usbdrv.c	(revision cb59f787f3b39c1da8220eb8042b8c459a038c61)
@@ -34,5 +34,5 @@
  */
 #include <usb/usbdrv.h>
-#include <usb_iface.h>
+#include <usbhc_iface.h>
 #include <errno.h>
 
@@ -121,5 +121,5 @@
 
 	transfer->request = async_send_4(phone,
-	    DEV_IFACE_ID(USB_DEV_IFACE),
+	    DEV_IFACE_ID(USBHC_DEV_IFACE),
 	    method,
 	    target.address, target.endpoint,
@@ -184,5 +184,5 @@
 
 	transfer->request = async_send_4(phone,
-	    DEV_IFACE_ID(USB_DEV_IFACE),
+	    DEV_IFACE_ID(USBHC_DEV_IFACE),
 	    method,
 	    target.address, target.endpoint,
@@ -214,6 +214,6 @@
 
 	req = async_send_2(phone,
-	    DEV_IFACE_ID(USB_DEV_IFACE),
-	    IPC_M_USB_GET_BUFFER,
+	    DEV_IFACE_ID(USBHC_DEV_IFACE),
+	    IPC_M_USBHC_GET_BUFFER,
 	    hash,
 	    &answer_data);
@@ -305,5 +305,5 @@
 {
 	return async_send_buffer(phone,
-	    IPC_M_USB_INTERRUPT_OUT,
+	    IPC_M_USBHC_INTERRUPT_OUT,
 	    target,
 	    buffer, size,
@@ -317,5 +317,5 @@
 {
 	return async_recv_buffer(phone,
-	    IPC_M_USB_INTERRUPT_IN,
+	    IPC_M_USBHC_INTERRUPT_IN,
 	    target,
 	    buffer, size, actual_size,