Index: uspace/drv/ohci/batch.c
===================================================================
--- uspace/drv/ohci/batch.c	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
+++ uspace/drv/ohci/batch.c	(revision c92c13f6c4447ba4a35cc8863976d36af27f26a2)
@@ -41,9 +41,9 @@
 #include "utils/malloc32.h"
 
-static void batch_call_in_and_dispose(batch_t *instance);
-static void batch_call_out_and_dispose(batch_t *instance);
+static void batch_call_in_and_dispose(usb_transfer_batch_t *instance);
+static void batch_call_out_and_dispose(usb_transfer_batch_t *instance);
 
 #define DEFAULT_ERROR_COUNT 3
-batch_t * batch_get(
+usb_transfer_batch_t * batch_get(
     ddf_fun_t *fun,
 		usb_target_t target,
@@ -70,8 +70,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);
@@ -94,5 +94,5 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_dispose(batch_t *instance)
+void batch_dispose(usb_transfer_batch_t *instance)
 {
 	assert(instance);
@@ -102,5 +102,5 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_control_write(batch_t *instance)
+void batch_control_write(usb_transfer_batch_t *instance)
 {
 	assert(instance);
@@ -113,5 +113,5 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_control_read(batch_t *instance)
+void batch_control_read(usb_transfer_batch_t *instance)
 {
 	assert(instance);
@@ -121,5 +121,5 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_interrupt_in(batch_t *instance)
+void batch_interrupt_in(usb_transfer_batch_t *instance)
 {
 	assert(instance);
@@ -130,5 +130,5 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_interrupt_out(batch_t *instance)
+void batch_interrupt_out(usb_transfer_batch_t *instance)
 {
 	assert(instance);
@@ -142,5 +142,5 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_bulk_in(batch_t *instance)
+void batch_bulk_in(usb_transfer_batch_t *instance)
 {
 	assert(instance);
@@ -151,5 +151,5 @@
 }
 /*----------------------------------------------------------------------------*/
-void batch_bulk_out(batch_t *instance)
+void batch_bulk_out(usb_transfer_batch_t *instance)
 {
 	assert(instance);
@@ -164,8 +164,8 @@
  * @param[in] instance Batch structure to use.
  */
-void batch_call_in_and_dispose(batch_t *instance)
+void batch_call_in_and_dispose(usb_transfer_batch_t *instance)
 {
 	assert(instance);
-	batch_call_in(instance);
+	usb_transfer_batch_call_in(instance);
 	batch_dispose(instance);
 }
@@ -175,8 +175,8 @@
  * @param[in] instance Batch structure to use.
  */
-void batch_call_out_and_dispose(batch_t *instance)
+void batch_call_out_and_dispose(usb_transfer_batch_t *instance)
 {
 	assert(instance);
-	batch_call_out(instance);
+	usb_transfer_batch_call_out(instance);
 	batch_dispose(instance);
 }
Index: uspace/drv/ohci/batch.h
===================================================================
--- uspace/drv/ohci/batch.h	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
+++ uspace/drv/ohci/batch.h	(revision c92c13f6c4447ba4a35cc8863976d36af27f26a2)
@@ -41,5 +41,5 @@
 #include <usb/host/batch.h>
 
-batch_t * batch_get(
+usb_transfer_batch_t * batch_get(
     ddf_fun_t *fun,
 		usb_target_t target,
@@ -57,17 +57,17 @@
 		);
 
-void batch_dispose(batch_t *instance);
+void batch_dispose(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);
 #endif
 /**
Index: uspace/drv/ohci/hc.c
===================================================================
--- uspace/drv/ohci/hc.c	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
+++ uspace/drv/ohci/hc.c	(revision c92c13f6c4447ba4a35cc8863976d36af27f26a2)
@@ -106,5 +106,5 @@
 }
 /*----------------------------------------------------------------------------*/
-int hc_schedule(hc_t *instance, batch_t *batch)
+int hc_schedule(hc_t *instance, usb_transfer_batch_t *batch)
 {
 	assert(instance);
Index: uspace/drv/ohci/hc.h
===================================================================
--- uspace/drv/ohci/hc.h	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
+++ uspace/drv/ohci/hc.h	(revision c92c13f6c4447ba4a35cc8863976d36af27f26a2)
@@ -61,5 +61,5 @@
 int hc_register_hub(hc_t *instance);
 
-int hc_schedule(hc_t *instance, batch_t *batch);
+int hc_schedule(hc_t *instance, usb_transfer_batch_t *batch);
 
 void hc_interrupt(hc_t *instance, uint16_t status);
Index: uspace/drv/ohci/iface.c
===================================================================
--- uspace/drv/ohci/iface.c	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
+++ uspace/drv/ohci/iface.c	(revision c92c13f6c4447ba4a35cc8863976d36af27f26a2)
@@ -205,5 +205,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->manager);
@@ -247,5 +247,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->manager);
@@ -290,5 +290,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->manager);
@@ -333,5 +333,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->manager);
@@ -383,5 +383,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->manager);
@@ -431,5 +431,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->manager);
Index: uspace/drv/ohci/root_hub.c
===================================================================
--- uspace/drv/ohci/root_hub.c	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
+++ uspace/drv/ohci/root_hub.c	(revision c92c13f6c4447ba4a35cc8863976d36af27f26a2)
@@ -56,5 +56,5 @@
 }
 /*----------------------------------------------------------------------------*/
-int rh_request(rh_t *instance, batch_t *request)
+int rh_request(rh_t *instance, usb_transfer_batch_t *request)
 {
 	assert(instance);
@@ -66,5 +66,5 @@
 	}
 	usb_log_error("Root hub request processing not implemented.\n");
-	batch_finish(request, ENOTSUP);
+	usb_transfer_batch_finish(request, ENOTSUP);
 	return EOK;
 }
Index: uspace/drv/ohci/root_hub.h
===================================================================
--- uspace/drv/ohci/root_hub.h	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
+++ uspace/drv/ohci/root_hub.h	(revision c92c13f6c4447ba4a35cc8863976d36af27f26a2)
@@ -49,5 +49,5 @@
 int rh_init(rh_t *instance, ddf_dev_t *dev, ohci_regs_t *regs);
 
-int rh_request(rh_t *instance, batch_t *request);
+int rh_request(rh_t *instance, usb_transfer_batch_t *request);
 
 void rh_interrupt(rh_t *instance);