Index: uspace/drv/uhci-hcd/batch.c
===================================================================
--- uspace/drv/uhci-hcd/batch.c	(revision 9351353990fd8e3bdacb002e6bb54f36ffc96d5b)
+++ uspace/drv/uhci-hcd/batch.c	(revision a9f91cdcff7efc763f9772aa8964f1b58c99fa90)
@@ -450,7 +450,7 @@
 {
 	assert(instance);
-	uhci_hc_t *hc = fun_to_uhci(instance->fun);
+	uhci_hc_t *hc = fun_to_uhci_hc(instance->fun);
 	assert(hc);
-	return uhci_schedule(hc, instance);
+	return uhci_hc_schedule(hc, instance);
 }
 /**
Index: uspace/drv/uhci-hcd/iface.c
===================================================================
--- uspace/drv/uhci-hcd/iface.c	(revision 9351353990fd8e3bdacb002e6bb54f36ffc96d5b)
+++ uspace/drv/uhci-hcd/iface.c	(revision a9f91cdcff7efc763f9772aa8964f1b58c99fa90)
@@ -53,5 +53,5 @@
 {
 	assert(fun);
-	uhci_hc_t *hc = fun_to_uhci(fun);
+	uhci_hc_t *hc = fun_to_uhci_hc(fun);
 	assert(hc);
 	usb_log_debug("Default address request with speed %d.\n", speed);
@@ -68,5 +68,5 @@
 {
 	assert(fun);
-	uhci_hc_t *hc = fun_to_uhci(fun);
+	uhci_hc_t *hc = fun_to_uhci_hc(fun);
 	assert(hc);
 	usb_log_debug("Default address release.\n");
@@ -86,5 +86,5 @@
 {
 	assert(fun);
-	uhci_hc_t *hc = fun_to_uhci(fun);
+	uhci_hc_t *hc = fun_to_uhci_hc(fun);
 	assert(hc);
 	assert(address);
@@ -109,5 +109,5 @@
 {
 	assert(fun);
-	uhci_hc_t *hc = fun_to_uhci(fun);
+	uhci_hc_t *hc = fun_to_uhci_hc(fun);
 	assert(hc);
 	usb_log_debug("Address bind %d-%d.\n", address, handle);
@@ -125,5 +125,5 @@
 {
 	assert(fun);
-	uhci_hc_t *hc = fun_to_uhci(fun);
+	uhci_hc_t *hc = fun_to_uhci_hc(fun);
 	assert(hc);
 	usb_log_debug("Address release %d.\n", address);
@@ -148,5 +148,5 @@
 {
 	assert(fun);
-	uhci_hc_t *hc = fun_to_uhci(fun);
+	uhci_hc_t *hc = fun_to_uhci_hc(fun);
 	assert(hc);
 	usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
@@ -180,5 +180,5 @@
 {
 	assert(fun);
-	uhci_hc_t *hc = fun_to_uhci(fun);
+	uhci_hc_t *hc = fun_to_uhci_hc(fun);
 	assert(hc);
 	usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
@@ -211,5 +211,5 @@
 {
 	assert(fun);
-	uhci_hc_t *hc = fun_to_uhci(fun);
+	uhci_hc_t *hc = fun_to_uhci_hc(fun);
 	assert(hc);
 	usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
@@ -243,5 +243,5 @@
 {
 	assert(fun);
-	uhci_hc_t *hc = fun_to_uhci(fun);
+	uhci_hc_t *hc = fun_to_uhci_hc(fun);
 	assert(hc);
 	usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
@@ -277,5 +277,5 @@
 {
 	assert(fun);
-	uhci_hc_t *hc = fun_to_uhci(fun);
+	uhci_hc_t *hc = fun_to_uhci_hc(fun);
 	assert(hc);
 	usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
@@ -315,5 +315,5 @@
 {
 	assert(fun);
-	uhci_hc_t *hc = fun_to_uhci(fun);
+	uhci_hc_t *hc = fun_to_uhci_hc(fun);
 	assert(hc);
 	usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
Index: uspace/drv/uhci-hcd/uhci.c
===================================================================
--- uspace/drv/uhci-hcd/uhci.c	(revision 9351353990fd8e3bdacb002e6bb54f36ffc96d5b)
+++ uspace/drv/uhci-hcd/uhci.c	(revision a9f91cdcff7efc763f9772aa8964f1b58c99fa90)
@@ -54,8 +54,8 @@
 {
 	assert(dev);
-	uhci_hc_t *hc = dev_to_uhci(dev);
+	uhci_hc_t *hc = &((uhci_t*)dev->driver_data)->hc;
 	uint16_t status = IPC_GET_ARG1(*call);
 	assert(hc);
-	uhci_interrupt(hc, status);
+	uhci_hc_interrupt(hc, status);
 }
 /*----------------------------------------------------------------------------*/
@@ -188,5 +188,5 @@
 	if (instance->rh_fun) \
 		ddf_fun_destroy(instance->rh_fun); \
-	uhci_fini(&instance->hc); \
+	uhci_hc_fini(&instance->hc); \
 	return ret; \
 }
Index: uspace/drv/uhci-hcd/uhci_hc.c
===================================================================
--- uspace/drv/uhci-hcd/uhci_hc.c	(revision 9351353990fd8e3bdacb002e6bb54f36ffc96d5b)
+++ uspace/drv/uhci-hcd/uhci_hc.c	(revision a9f91cdcff7efc763f9772aa8964f1b58c99fa90)
@@ -68,10 +68,10 @@
  */
 /*----------------------------------------------------------------------------*/
-static int uhci_init_transfer_lists(uhci_hc_t *instance);
-static int uhci_init_mem_structures(uhci_hc_t *instance);
-static void uhci_init_hw(uhci_hc_t *instance);
-
-static int uhci_interrupt_emulator(void *arg);
-static int uhci_debug_checker(void *arg);
+static int uhci_hc_init_transfer_lists(uhci_hc_t *instance);
+static int uhci_hc_init_mem_structures(uhci_hc_t *instance);
+static void uhci_hc_init_hw(uhci_hc_t *instance);
+
+static int uhci_hc_interrupt_emulator(void *arg);
+static int uhci_hc_debug_checker(void *arg);
 
 static bool allowed_usb_packet(
@@ -113,14 +113,14 @@
 	    io, reg_size);
 
-	ret = uhci_init_mem_structures(instance);
+	ret = uhci_hc_init_mem_structures(instance);
 	CHECK_RET_DEST_FUN_RETURN(ret,
 	    "Failed to initialize UHCI memory structures.\n");
 
-	uhci_init_hw(instance);
+	uhci_hc_init_hw(instance);
 	instance->cleaner =
-	    fibril_create(uhci_interrupt_emulator, instance);
+	    fibril_create(uhci_hc_interrupt_emulator, instance);
 	fibril_add_ready(instance->cleaner);
 
-	instance->debug_checker = fibril_create(uhci_debug_checker, instance);
+	instance->debug_checker = fibril_create(uhci_hc_debug_checker, instance);
 	fibril_add_ready(instance->debug_checker);
 
@@ -134,5 +134,5 @@
  * @param[in] instance UHCI structure to use.
  */
-void uhci_init_hw(uhci_hc_t *instance)
+void uhci_hc_init_hw(uhci_hc_t *instance)
 {
 	assert(instance);
@@ -172,5 +172,5 @@
  * @note Should be called only once on any structure.
  */
-int uhci_init_mem_structures(uhci_hc_t *instance)
+int uhci_hc_init_mem_structures(uhci_hc_t *instance)
 {
 	assert(instance);
@@ -201,5 +201,5 @@
 
 	/* Init transfer lists */
-	ret = uhci_init_transfer_lists(instance);
+	ret = uhci_hc_init_transfer_lists(instance);
 	CHECK_RET_DEST_CMDS_RETURN(ret, "Failed to init transfer lists.\n");
 	usb_log_debug("Initialized transfer lists.\n");
@@ -235,5 +235,5 @@
  * @note Should be called only once on any structure.
  */
-int uhci_init_transfer_lists(uhci_hc_t *instance)
+int uhci_hc_init_transfer_lists(uhci_hc_t *instance)
 {
 	assert(instance);
@@ -299,5 +299,5 @@
  * @return Error code
  */
-int uhci_schedule(uhci_hc_t *instance, batch_t *batch)
+int uhci_hc_schedule(uhci_hc_t *instance, batch_t *batch)
 {
 	assert(instance);
@@ -327,5 +327,5 @@
  * @param[in] status Value of the stsatus regiser at the time of interrupt.
  */
-void uhci_interrupt(uhci_hc_t *instance, uint16_t status)
+void uhci_hc_interrupt(uhci_hc_t *instance, uint16_t status)
 {
 	assert(instance);
@@ -345,5 +345,5 @@
  * @return EOK
  */
-int uhci_interrupt_emulator(void* arg)
+int uhci_hc_interrupt_emulator(void* arg)
 {
 	usb_log_debug("Started interrupt emulator.\n");
@@ -357,5 +357,5 @@
 		if (status != 0)
 			usb_log_debug2("UHCI status: %x.\n", status);
-		uhci_interrupt(instance, status);
+		uhci_hc_interrupt(instance, status);
 		async_usleep(UHCI_CLEANER_TIMEOUT);
 	}
@@ -368,5 +368,5 @@
  * @return EOK
  */
-int uhci_debug_checker(void *arg)
+int uhci_hc_debug_checker(void *arg)
 {
 	uhci_hc_t *instance = (uhci_hc_t*)arg;
Index: uspace/drv/uhci-hcd/uhci_hc.h
===================================================================
--- uspace/drv/uhci-hcd/uhci_hc.h	(revision 9351353990fd8e3bdacb002e6bb54f36ffc96d5b)
+++ uspace/drv/uhci-hcd/uhci_hc.h	(revision a9f91cdcff7efc763f9772aa8964f1b58c99fa90)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2010 Jan Vesely
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -106,17 +106,12 @@
 int uhci_hc_init(uhci_hc_t *instance, ddf_fun_t *fun, void *regs, size_t reg_size);
 
-static inline void uhci_fini(uhci_hc_t *instance) {};
+static inline void uhci_hc_fini(uhci_hc_t *instance) { /* TODO: implement*/ };
 
-int uhci_schedule(uhci_hc_t *instance, batch_t *batch);
+int uhci_hc_schedule(uhci_hc_t *instance, batch_t *batch);
 
-void uhci_interrupt(uhci_hc_t *instance, uint16_t status);
+void uhci_hc_interrupt(uhci_hc_t *instance, uint16_t status);
 
-static inline uhci_hc_t * dev_to_uhci(ddf_dev_t *dev)
-	{ return (uhci_hc_t*)dev->driver_data; }
-
-static inline uhci_hc_t * fun_to_uhci(ddf_fun_t *fun)
+static inline uhci_hc_t * fun_to_uhci_hc(ddf_fun_t *fun)
 	{ return (uhci_hc_t*)fun->driver_data; }
-
-
 #endif
 /**