Index: uspace/drv/bus/usb/usbflbk/main.c
===================================================================
--- uspace/drv/bus/usb/usbflbk/main.c	(revision f6b2a76b0bcfe02adf5d21778437749ac56bc83f)
+++ uspace/drv/bus/usb/usbflbk/main.c	(revision c39e9fb50acec8a18fc943618d6162e4b8629395)
@@ -50,5 +50,5 @@
 	usb_log_info("Pretending to control %s `%s' (handle %" PRIun ").\n",
 	    dev->interface_no < 0 ? "device" : "interface",
-	    ddf_dev_get_name(dev->ddf_dev), ddf_dev_get_handle(dev->ddf_dev));
+	    usb_device_get_name(dev), ddf_dev_get_handle(dev->ddf_dev));
 	return EOK;
 }
Index: uspace/drv/bus/usb/usbhid/kbd/kbddev.c
===================================================================
--- uspace/drv/bus/usb/usbhid/kbd/kbddev.c	(revision f6b2a76b0bcfe02adf5d21778437749ac56bc83f)
+++ uspace/drv/bus/usb/usbhid/kbd/kbddev.c	(revision c39e9fb50acec8a18fc943618d6162e4b8629395)
@@ -270,5 +270,6 @@
 	        0));
 
-	rc = usbhid_req_set_report(&hid_dev->usb_dev->ctrl_pipe,
+	rc = usbhid_req_set_report(
+	    usb_device_get_default_pipe(hid_dev->usb_dev),
 	    hid_dev->usb_dev->interface_no, USB_HID_REPORT_TYPE_OUTPUT,
 	    kbd_dev->output_buffer, kbd_dev->output_size);
@@ -581,5 +582,5 @@
 	usb_kbd_set_led(hid_dev, kbd_dev);
 
-	usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe,
+	usbhid_req_set_idle(usb_device_get_default_pipe(hid_dev->usb_dev),
 	    hid_dev->usb_dev->interface_no, IDLE_RATE);
 
@@ -786,5 +787,6 @@
 	}
 
-	rc = usbhid_req_set_protocol(&hid_dev->usb_dev->ctrl_pipe,
+	rc = usbhid_req_set_protocol(
+	    usb_device_get_default_pipe(hid_dev->usb_dev),
 	    hid_dev->usb_dev->interface_no, USB_HID_PROTOCOL_BOOT);
 
Index: uspace/drv/bus/usb/usbhid/main.c
===================================================================
--- uspace/drv/bus/usb/usbhid/main.c	(revision f6b2a76b0bcfe02adf5d21778437749ac56bc83f)
+++ uspace/drv/bus/usb/usbhid/main.c	(revision c39e9fb50acec8a18fc943618d6162e4b8629395)
@@ -105,5 +105,5 @@
 	if (rc != EOK) {
 		usb_log_error("Failed to start polling fibril for `%s'.\n",
-		    ddf_dev_get_name(dev->ddf_dev));
+		    usb_device_get_name(dev));
 		usb_hid_deinit(hid_dev);
 		return rc;
@@ -111,6 +111,5 @@
 	hid_dev->running = true;
 
-	usb_log_info("HID device `%s' ready to use.\n",
-	    ddf_dev_get_name(dev->ddf_dev));
+	usb_log_info("HID device `%s' ready.\n", usb_device_get_name(dev));
 
 	return EOK;
@@ -139,6 +138,6 @@
 {
 	assert(dev);
-	assert(dev->driver_data);
-	usb_hid_dev_t *hid_dev = dev->driver_data;
+	usb_hid_dev_t *hid_dev = usb_device_data_get(dev);
+	assert(hid_dev);
 	unsigned tries = 100;
 	/* Wait for fail. */
@@ -152,5 +151,5 @@
 
 	usb_hid_deinit(hid_dev);
-	usb_log_debug2("%s destruction complete.\n", ddf_dev_get_name(dev->ddf_dev));
+	usb_log_debug2("%s destruction complete.\n", usb_device_get_name(dev));
 	return EOK;
 }
Index: uspace/drv/bus/usb/usbhid/mouse/mousedev.c
===================================================================
--- uspace/drv/bus/usb/usbhid/mouse/mousedev.c	(revision f6b2a76b0bcfe02adf5d21778437749ac56bc83f)
+++ uspace/drv/bus/usb/usbhid/mouse/mousedev.c	(revision c39e9fb50acec8a18fc943618d6162e4b8629395)
@@ -315,5 +315,5 @@
 
 	// TODO: how to know if the device supports the request???
-	usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe,
+	usbhid_req_set_idle(usb_device_get_default_pipe(hid_dev->usb_dev),
 	    hid_dev->usb_dev->interface_no, IDLE_RATE);
 	return EOK;
@@ -425,5 +425,6 @@
 	}
 
-	rc = usbhid_req_set_protocol(&hid_dev->usb_dev->ctrl_pipe,
+	rc = usbhid_req_set_protocol(
+	    usb_device_get_default_pipe(hid_dev->usb_dev),
 	    hid_dev->usb_dev->interface_no, USB_HID_PROTOCOL_BOOT);
 
Index: uspace/drv/bus/usb/usbhub/port.c
===================================================================
--- uspace/drv/bus/usb/usbhub/port.c	(revision f6b2a76b0bcfe02adf5d21778437749ac56bc83f)
+++ uspace/drv/bus/usb/usbhub/port.c	(revision c39e9fb50acec8a18fc943618d6162e4b8629395)
@@ -57,5 +57,4 @@
     usb_port_status_t status);
 static int get_port_status(usb_hub_port_t *port, usb_port_status_t *status);
-//static int enable_port_callback(void *arg);
 static int add_device_phase1_worker_fibril(void *arg);
 static int create_add_device_fibril(usb_hub_port_t *port, usb_hub_dev_t *hub,
Index: uspace/drv/bus/usb/usbhub/usbhub.c
===================================================================
--- uspace/drv/bus/usb/usbhub/usbhub.c	(revision f6b2a76b0bcfe02adf5d21778437749ac56bc83f)
+++ uspace/drv/bus/usb/usbhub/usbhub.c	(revision c39e9fb50acec8a18fc943618d6162e4b8629395)
@@ -162,5 +162,5 @@
 	hub_dev->running = true;
 	usb_log_info("Controlling hub '%s' (%zu ports).\n",
-	    ddf_dev_get_name(hub_dev->usb_device->ddf_dev), hub_dev->port_count);
+	    usb_device_get_name(hub_dev->usb_device), hub_dev->port_count);
 
 	usb_pipe_end_long_transfer(control_pipe);
Index: uspace/drv/bus/usb/usbmast/bo_trans.c
===================================================================
--- uspace/drv/bus/usb/usbmast/bo_trans.c	(revision f6b2a76b0bcfe02adf5d21778437749ac56bc83f)
+++ uspace/drv/bus/usb/usbmast/bo_trans.c	(revision c39e9fb50acec8a18fc943618d6162e4b8629395)
@@ -117,8 +117,10 @@
 		/* Clear stall condition and continue below to read CSW. */
 		if (ddir == USB_DIRECTION_IN) {
-			usb_pipe_clear_halt(&mfun->mdev->usb_dev->ctrl_pipe,
+			usb_pipe_clear_halt(
+			    usb_device_get_default_pipe(mfun->mdev->usb_dev),
 			    &mfun->mdev->usb_dev->pipes[BULK_IN_EP].pipe);
 		} else {
-			usb_pipe_clear_halt(&mfun->mdev->usb_dev->ctrl_pipe,
+			usb_pipe_clear_halt(
+			    usb_device_get_default_pipe(mfun->mdev->usb_dev),
 			    &mfun->mdev->usb_dev->pipes[BULK_OUT_EP].pipe);
 		}
@@ -197,5 +199,6 @@
 int usb_massstor_reset(usbmast_dev_t *mdev)
 {
-	return usb_control_request_set(&mdev->usb_dev->ctrl_pipe,
+	return usb_control_request_set(
+	    usb_device_get_default_pipe(mdev->usb_dev),
 	    USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE,
 	    0xFF, 0, mdev->usb_dev->interface_no, NULL, 0);
@@ -215,7 +218,7 @@
 	 */
 	usb_massstor_reset(mdev);
-	usb_pipe_clear_halt(&mdev->usb_dev->ctrl_pipe,
+	usb_pipe_clear_halt(usb_device_get_default_pipe(mdev->usb_dev),
 	    &mdev->usb_dev->pipes[BULK_IN_EP].pipe);
-	usb_pipe_clear_halt(&mdev->usb_dev->ctrl_pipe,
+	usb_pipe_clear_halt(usb_device_get_default_pipe(mdev->usb_dev),
 	    &mdev->usb_dev->pipes[BULK_OUT_EP].pipe);
 }
@@ -236,5 +239,6 @@
 	uint8_t max_lun;
 	size_t data_recv_len;
-	int rc = usb_control_request_get(&mdev->usb_dev->ctrl_pipe,
+	int rc = usb_control_request_get(
+	    usb_device_get_default_pipe(mdev->usb_dev),
 	    USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE,
 	    0xFE, 0, mdev->usb_dev->interface_no, &max_lun, 1, &data_recv_len);
Index: uspace/drv/bus/usb/usbmast/main.c
===================================================================
--- uspace/drv/bus/usb/usbmast/main.c	(revision f6b2a76b0bcfe02adf5d21778437749ac56bc83f)
+++ uspace/drv/bus/usb/usbmast/main.c	(revision c39e9fb50acec8a18fc943618d6162e4b8629395)
@@ -110,5 +110,5 @@
 static int usbmast_device_gone(usb_device_t *dev)
 {
-	usbmast_dev_t *mdev = dev->driver_data;
+	usbmast_dev_t *mdev = usb_device_data_get(dev);
 	assert(mdev);
 
Index: uspace/drv/bus/usb/usbmid/explore.c
===================================================================
--- uspace/drv/bus/usb/usbmid/explore.c	(revision f6b2a76b0bcfe02adf5d21778437749ac56bc83f)
+++ uspace/drv/bus/usb/usbmid/explore.c	(revision c39e9fb50acec8a18fc943618d6162e4b8629395)
@@ -159,5 +159,5 @@
 
 	/* Select the first configuration */
-	int rc = usb_request_set_configuration(&dev->ctrl_pipe,
+	int rc = usb_request_set_configuration(usb_device_get_default_pipe(dev),
 	    config_descriptor->configuration_number);
 	if (rc != EOK) {
Index: uspace/drv/bus/usb/usbmid/main.c
===================================================================
--- uspace/drv/bus/usb/usbmid/main.c	(revision f6b2a76b0bcfe02adf5d21778437749ac56bc83f)
+++ uspace/drv/bus/usb/usbmid/main.c	(revision c39e9fb50acec8a18fc943618d6162e4b8629395)
@@ -64,5 +64,5 @@
 {
 	assert(dev);
-	usb_mid_t *usb_mid = dev->driver_data;
+	usb_mid_t *usb_mid = usb_device_data_get(dev);
 	assert(usb_mid);
 
@@ -113,5 +113,5 @@
 {
 	assert(dev);
-	usb_mid_t *usb_mid = dev->driver_data;
+	usb_mid_t *usb_mid = usb_device_data_get(dev);
 	assert(usb_mid);