Index: uspace/drv/uhci-hcd/batch.c
===================================================================
--- uspace/drv/uhci-hcd/batch.c	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
+++ uspace/drv/uhci-hcd/batch.c	(revision 1387692fb51247c20a25daac06c32715aebbf3bf)
@@ -53,9 +53,9 @@
 } uhci_batch_t;
 
-static void batch_control(batch_t *instance,
+static void batch_control(usb_transfer_batch_t *instance,
     usb_packet_id data_stage, usb_packet_id status_stage);
-static void batch_data(batch_t *instance, usb_packet_id pid);
-static void batch_call_in_and_dispose(batch_t *instance);
-static void batch_call_out_and_dispose(batch_t *instance);
+static void batch_data(usb_transfer_batch_t *instance, usb_packet_id pid);
+static void batch_call_in_and_dispose(usb_transfer_batch_t *instance);
+static void batch_call_out_and_dispose(usb_transfer_batch_t *instance);
 
 
@@ -82,5 +82,5 @@
  * transaction and callback.
  */
-batch_t * batch_get(ddf_fun_t *fun, usb_target_t target,
+usb_transfer_batch_t * batch_get(ddf_fun_t *fun, usb_target_t target,
     usb_transfer_type_t transfer_type, size_t max_packet_size,
     usb_speed_t speed, char *buffer, size_t buffer_size,
@@ -103,8 +103,8 @@
 	} else (void)0
 
-	batch_t *instance = malloc(sizeof(batch_t));
+	usb_transfer_batch_t *instance = malloc(sizeof(usb_transfer_batch_t));
 	CHECK_NULL_DISPOSE_RETURN(instance,
 	    "Failed to allocate batch instance.\n");
-	batch_init(instance, target, transfer_type, speed, max_packet_size,
+	usb_transfer_batch_init(instance, target, transfer_type, speed, max_packet_size,
 	    buffer, NULL, buffer_size, NULL, setup_size, func_in,
 	    func_out, arg, fun, NULL);
@@ -161,5 +161,5 @@
  * is reached.
  */
-bool batch_is_complete(batch_t *instance)
+bool batch_is_complete(usb_transfer_batch_t *instance)
 {
 	assert(instance);
@@ -205,5 +205,5 @@
  * Uses genercir control function with pids OUT and IN.
  */
-void batch_control_write(batch_t *instance)
+void batch_control_write(usb_transfer_batch_t *instance)
 {
 	assert(instance);
@@ -222,5 +222,5 @@
  * Uses generic control with pids IN and OUT.
  */
-void batch_control_read(batch_t *instance)
+void batch_control_read(usb_transfer_batch_t *instance)
 {
 	assert(instance);
@@ -236,5 +236,5 @@
  * Data transaction with PID_IN.
  */
-void batch_interrupt_in(batch_t *instance)
+void batch_interrupt_in(usb_transfer_batch_t *instance)
 {
 	assert(instance);
@@ -251,5 +251,5 @@
  * Data transaction with PID_OUT.
  */
-void batch_interrupt_out(batch_t *instance)
+void batch_interrupt_out(usb_transfer_batch_t *instance)
 {
 	assert(instance);
@@ -269,5 +269,5 @@
  * Data transaction with PID_IN.
  */
-void batch_bulk_in(batch_t *instance)
+void batch_bulk_in(usb_transfer_batch_t *instance)
 {
 	assert(instance);
@@ -284,5 +284,5 @@
  * Data transaction with PID_OUT.
  */
-void batch_bulk_out(batch_t *instance)
+void batch_bulk_out(usb_transfer_batch_t *instance)
 {
 	assert(instance);
@@ -304,5 +304,5 @@
  * The last packet is marked with IOC flag.
  */
-void batch_data(batch_t *instance, usb_packet_id pid)
+void batch_data(usb_transfer_batch_t *instance, usb_packet_id pid)
 {
 	assert(instance);
@@ -358,5 +358,5 @@
  * The last packet is marked with IOC.
  */
-void batch_control(batch_t *instance,
+void batch_control(usb_transfer_batch_t *instance,
    usb_packet_id data_stage, usb_packet_id status_stage)
 {
@@ -411,5 +411,5 @@
 }
 /*----------------------------------------------------------------------------*/
-qh_t * batch_qh(batch_t *instance)
+qh_t * batch_qh(usb_transfer_batch_t *instance)
 {
 	assert(instance);
@@ -423,8 +423,8 @@
  * @param[in] instance Batch structure to use.
  */
-void batch_call_in_and_dispose(batch_t *instance)
-{
-	assert(instance);
-	batch_call_in(instance);
+void batch_call_in_and_dispose(usb_transfer_batch_t *instance)
+{
+	assert(instance);
+	usb_transfer_batch_call_in(instance);
 	batch_dispose(instance);
 }
@@ -434,8 +434,8 @@
  * @param[in] instance Batch structure to use.
  */
-void batch_call_out_and_dispose(batch_t *instance)
-{
-	assert(instance);
-	batch_call_out(instance);
+void batch_call_out_and_dispose(usb_transfer_batch_t *instance)
+{
+	assert(instance);
+	usb_transfer_batch_call_out(instance);
 	batch_dispose(instance);
 }
@@ -445,5 +445,5 @@
  * @param[in] instance Batch structure to use.
  */
-void batch_dispose(batch_t *instance)
+void batch_dispose(usb_transfer_batch_t *instance)
 {
 	assert(instance);
Index: uspace/drv/uhci-hcd/batch.h
===================================================================
--- uspace/drv/uhci-hcd/batch.h	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
+++ uspace/drv/uhci-hcd/batch.h	(revision 1387692fb51247c20a25daac06c32715aebbf3bf)
@@ -44,5 +44,5 @@
 #include "uhci_struct/queue_head.h"
 
-batch_t * batch_get(
+usb_transfer_batch_t * batch_get(
     ddf_fun_t *fun,
 		usb_target_t target,
@@ -60,21 +60,21 @@
 		);
 
-void batch_dispose(batch_t *instance);
+void batch_dispose(usb_transfer_batch_t *instance);
 
-bool batch_is_complete(batch_t *instance);
+bool batch_is_complete(usb_transfer_batch_t *instance);
 
-void batch_control_write(batch_t *instance);
+void batch_control_write(usb_transfer_batch_t *instance);
 
-void batch_control_read(batch_t *instance);
+void batch_control_read(usb_transfer_batch_t *instance);
 
-void batch_interrupt_in(batch_t *instance);
+void batch_interrupt_in(usb_transfer_batch_t *instance);
 
-void batch_interrupt_out(batch_t *instance);
+void batch_interrupt_out(usb_transfer_batch_t *instance);
 
-void batch_bulk_in(batch_t *instance);
+void batch_bulk_in(usb_transfer_batch_t *instance);
 
-void batch_bulk_out(batch_t *instance);
+void batch_bulk_out(usb_transfer_batch_t *instance);
 
-qh_t * batch_qh(batch_t *instance);
+qh_t * batch_qh(usb_transfer_batch_t *instance);
 #endif
 /**
Index: uspace/drv/uhci-hcd/iface.c
===================================================================
--- uspace/drv/uhci-hcd/iface.c	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
+++ uspace/drv/uhci-hcd/iface.c	(revision 1387692fb51247c20a25daac06c32715aebbf3bf)
@@ -154,5 +154,5 @@
 	    target.address, target.endpoint, size, max_packet_size);
 
-	batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
+	usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
 	    max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg,
 	    &hc->device_manager);
@@ -190,5 +190,5 @@
 	    target.address, target.endpoint, size, max_packet_size);
 
-	batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
+	usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
 	    max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg,
 			&hc->device_manager);
@@ -227,5 +227,5 @@
 	    target.address, target.endpoint, size, max_packet_size);
 
-	batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
+	usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
 	    max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg,
 	    &hc->device_manager);
@@ -263,5 +263,5 @@
 	    target.address, target.endpoint, size, max_packet_size);
 
-	batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
+	usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
 	    max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg,
 	    &hc->device_manager);
@@ -305,5 +305,5 @@
 		return EINVAL;
 
-	batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
+	usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
 	    max_packet_size, speed, data, size, setup_data, setup_size,
 	    NULL, callback, arg, &hc->device_manager);
@@ -345,5 +345,5 @@
 	usb_log_debug("Control READ(%d) %d:%d %zu(%zu).\n",
 	    speed, target.address, target.endpoint, size, max_packet_size);
-	batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
+	usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
 	    max_packet_size, speed, data, size, setup_data, setup_size, callback,
 	    NULL, arg, &hc->device_manager);
Index: uspace/drv/uhci-hcd/transfer_list.c
===================================================================
--- uspace/drv/uhci-hcd/transfer_list.c	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
+++ uspace/drv/uhci-hcd/transfer_list.c	(revision 1387692fb51247c20a25daac06c32715aebbf3bf)
@@ -38,5 +38,5 @@
 
 static void transfer_list_remove_batch(
-    transfer_list_t *instance, batch_t *batch);
+    transfer_list_t *instance, usb_transfer_batch_t *batch);
 /*----------------------------------------------------------------------------*/
 /** Initialize transfer list structures.
@@ -92,5 +92,5 @@
  * The batch is added to the end of the list and queue.
  */
-void transfer_list_add_batch(transfer_list_t *instance, batch_t *batch)
+void transfer_list_add_batch(transfer_list_t *instance, usb_transfer_batch_t *batch)
 {
 	assert(instance);
@@ -115,6 +115,6 @@
 	} else {
 		/* There is something scheduled */
-		batch_t *last = list_get_instance(
-		    instance->batch_list.prev, batch_t, link);
+		usb_transfer_batch_t *last = list_get_instance(
+		    instance->batch_list.prev, usb_transfer_batch_t, link);
 		qh_set_next_qh(batch_qh(last), pa);
 	}
@@ -122,6 +122,6 @@
 	list_append(&batch->link, &instance->batch_list);
 
-	batch_t *first = list_get_instance(
-	    instance->batch_list.next, batch_t, link);
+	usb_transfer_batch_t *first = list_get_instance(
+	    instance->batch_list.next, usb_transfer_batch_t, link);
 	usb_log_debug("Batch(%p) added to queue %s, first is %p.\n",
 		batch, instance->name, first);
@@ -148,5 +148,5 @@
 	while (current != &instance->batch_list) {
 		link_t *next = current->next;
-		batch_t *batch = list_get_instance(current, batch_t, link);
+		usb_transfer_batch_t *batch = list_get_instance(current, usb_transfer_batch_t, link);
 
 		if (batch_is_complete(batch)) {
@@ -162,5 +162,5 @@
 		link_t *item = done.next;
 		list_remove(item);
-		batch_t *batch = list_get_instance(item, batch_t, link);
+		usb_transfer_batch_t *batch = list_get_instance(item, usb_transfer_batch_t, link);
 		batch->next_step(batch);
 	}
@@ -176,7 +176,7 @@
 	while (list_empty(&instance->batch_list)) {
 		link_t *current = instance->batch_list.next;
-		batch_t *batch = list_get_instance(current, batch_t, link);
+		usb_transfer_batch_t *batch = list_get_instance(current, usb_transfer_batch_t, link);
 		transfer_list_remove_batch(instance, batch);
-		batch_finish(batch, EIO);
+		usb_transfer_batch_finish(batch, EIO);
 	}
 	fibril_mutex_unlock(&instance->guard);
@@ -191,5 +191,5 @@
  * Does not lock the transfer list, caller is responsible for that.
  */
-void transfer_list_remove_batch(transfer_list_t *instance, batch_t *batch)
+void transfer_list_remove_batch(transfer_list_t *instance, usb_transfer_batch_t *batch)
 {
 	assert(instance);
@@ -207,6 +207,6 @@
 		pos = "FIRST";
 	} else {
-		batch_t *prev =
-		    list_get_instance(batch->link.prev, batch_t, link);
+		usb_transfer_batch_t *prev =
+		    list_get_instance(batch->link.prev, usb_transfer_batch_t, link);
 		qh_set_next_qh(batch_qh(prev), batch_qh(batch)->next);
 		pos = "NOT FIRST";
Index: uspace/drv/uhci-hcd/transfer_list.h
===================================================================
--- uspace/drv/uhci-hcd/transfer_list.h	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
+++ uspace/drv/uhci-hcd/transfer_list.h	(revision 1387692fb51247c20a25daac06c32715aebbf3bf)
@@ -66,5 +66,5 @@
 void transfer_list_set_next(transfer_list_t *instance, transfer_list_t *next);
 
-void transfer_list_add_batch(transfer_list_t *instance, batch_t *batch);
+void transfer_list_add_batch(transfer_list_t *instance, usb_transfer_batch_t *batch);
 
 void transfer_list_remove_finished(transfer_list_t *instance);
Index: uspace/drv/uhci-hcd/uhci_hc.c
===================================================================
--- uspace/drv/uhci-hcd/uhci_hc.c	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
+++ uspace/drv/uhci-hcd/uhci_hc.c	(revision 1387692fb51247c20a25daac06c32715aebbf3bf)
@@ -316,5 +316,5 @@
  * Checks for bandwidth availability and appends the batch to the proper queue.
  */
-int uhci_hc_schedule(uhci_hc_t *instance, batch_t *batch)
+int uhci_hc_schedule(uhci_hc_t *instance, usb_transfer_batch_t *batch)
 {
 	assert(instance);
Index: uspace/drv/uhci-hcd/uhci_hc.h
===================================================================
--- uspace/drv/uhci-hcd/uhci_hc.h	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
+++ uspace/drv/uhci-hcd/uhci_hc.h	(revision 1387692fb51247c20a25daac06c32715aebbf3bf)
@@ -109,5 +109,5 @@
     void *regs, size_t reg_size, bool interupts);
 
-int uhci_hc_schedule(uhci_hc_t *instance, batch_t *batch);
+int uhci_hc_schedule(uhci_hc_t *instance, usb_transfer_batch_t *batch);
 
 void uhci_hc_interrupt(uhci_hc_t *instance, uint16_t status);