Index: uspace/drv/bus/usb/uhcirh/port.h
===================================================================
--- uspace/drv/bus/usb/uhcirh/port.h	(revision aa1922c9def555d208dc11181d2a48a7b676d816)
+++ uspace/drv/bus/usb/uhcirh/port.h	(revision 4501e2073927a0d64db8a85ca96715739a19d518)
@@ -63,5 +63,5 @@
 	usb_hc_connection_t hc_connection;
 	ddf_dev_t *rh;
-	usb_hc_attached_device_t attached_device;
+	usb_hub_attached_device_t attached_device;
 	fid_t checker;
 } uhci_port_t;
Index: uspace/drv/bus/usb/usbhub/port.h
===================================================================
--- uspace/drv/bus/usb/usbhub/port.h	(revision aa1922c9def555d208dc11181d2a48a7b676d816)
+++ uspace/drv/bus/usb/usbhub/port.h	(revision 4501e2073927a0d64db8a85ca96715739a19d518)
@@ -58,5 +58,5 @@
 
 	/** Information about attached device. */
-	usb_hc_attached_device_t attached_device;
+	usb_hub_attached_device_t attached_device;
 } usb_hub_port_t;
 
Index: uspace/lib/usbdev/include/usb/dev/hub.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/hub.h	(revision aa1922c9def555d208dc11181d2a48a7b676d816)
+++ uspace/lib/usbdev/include/usb/dev/hub.h	(revision 4501e2073927a0d64db8a85ca96715739a19d518)
@@ -57,9 +57,9 @@
 	/** Devman handle of the device. */
 	devman_handle_t handle;
-} usb_hc_attached_device_t;
+} usb_hub_attached_device_t;
 
 usb_address_t usb_hc_request_address(usb_hc_connection_t *, usb_speed_t);
 int usb_hc_register_device(usb_hc_connection_t *,
-    const usb_hc_attached_device_t *);
+    const usb_hub_attached_device_t *);
 int usb_hc_unregister_device(usb_hc_connection_t *, usb_address_t);
 
Index: uspace/lib/usbdev/src/hub.c
===================================================================
--- uspace/lib/usbdev/src/hub.c	(revision aa1922c9def555d208dc11181d2a48a7b676d816)
+++ uspace/lib/usbdev/src/hub.c	(revision 4501e2073927a0d64db8a85ca96715739a19d518)
@@ -95,5 +95,5 @@
  */
 int usb_hc_register_device(usb_hc_connection_t * connection,
-    const usb_hc_attached_device_t *attached_device)
+    const usb_hub_attached_device_t *attached_device)
 {
 	CHECK_CONNECTION(connection);
@@ -332,5 +332,5 @@
 	 * And now inform the host controller about the handle.
 	 */
-	usb_hc_attached_device_t new_device = {
+	usb_hub_attached_device_t new_device = {
 		.address = dev_addr,
 		.handle = child_handle