Index: uspace/lib/usb/src/ddfiface.c
===================================================================
--- uspace/lib/usb/src/ddfiface.c	(revision 1c1b57723631eced3f412c2102d9f8b1aca38d0b)
+++ uspace/lib/usb/src/ddfiface.c	(revision 27736cf9e91e5f4fa53f888bb312dd0a6cb7fffc)
@@ -44,13 +44,13 @@
 
 /** DDF interface for USB device, implementation for typical hub. */
-usb_iface_t  usb_iface_hub_impl = {
+usb_iface_t usb_iface_hub_impl = {
 	.get_hc_handle = usb_iface_get_hc_handle_device_impl,
-	.get_address = usb_iface_get_address_forward_impl,
+	.get_my_address = usb_iface_get_my_address_forward_impl,
 };
 
 /** DDF interface for USB device, implementation for child of a typical hub. */
-usb_iface_t  usb_iface_hub_child_impl = {
+usb_iface_t usb_iface_hub_child_impl = {
 	.get_hc_handle = usb_iface_get_hc_handle_device_impl,
-	.get_address = usb_iface_get_address_from_device_data,
+	.get_my_address = usb_iface_get_my_address_from_device_data,
 };
 
@@ -92,9 +92,8 @@
  * @return Error code.
  */
-int usb_iface_get_address_forward_impl(ddf_fun_t *fun, devman_handle_t handle,
+int usb_iface_get_my_address_forward_impl(ddf_fun_t *fun,
     usb_address_t *address)
 {
 	assert(fun);
-	assert(handle == 0);
 
 	async_sess_t *parent_sess =
@@ -107,6 +106,6 @@
 
 	sysarg_t addr;
-	int rc = async_req_2_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
-	    IPC_M_USB_GET_ADDRESS, handle, &addr);
+	int rc = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
+	    IPC_M_USB_GET_MY_ADDRESS, &addr);
 
 	async_exchange_end(exch);
@@ -133,9 +132,8 @@
  * @return Error code.
  */
-int usb_iface_get_address_from_device_data(ddf_fun_t *fun,
-    devman_handle_t handle, usb_address_t *address)
+int usb_iface_get_my_address_from_device_data(ddf_fun_t *fun,
+    usb_address_t *address)
 {
 	assert(fun);
-	assert(handle == 0);
 	assert(fun->driver_data);
 	usb_hub_attached_device_t *device = fun->driver_data;
Index: uspace/lib/usb/src/hc.c
===================================================================
--- uspace/lib/usb/src/hc.c	(revision 1c1b57723631eced3f412c2102d9f8b1aca38d0b)
+++ uspace/lib/usb/src/hc.c	(revision 27736cf9e91e5f4fa53f888bb312dd0a6cb7fffc)
@@ -174,5 +174,5 @@
  * @return USB address or negative error code.
  */
-usb_address_t usb_hc_get_address_by_handle(devman_handle_t dev_handle)
+usb_address_t usb_get_address_by_handle(devman_handle_t dev_handle)
 {
 	async_sess_t *parent_sess =
@@ -185,7 +185,6 @@
 	
 	sysarg_t address;
-	int rc = async_req_2_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
-	    IPC_M_USB_GET_ADDRESS,
-	    dev_handle, &address);
+	int rc = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
+	    IPC_M_USB_GET_MY_ADDRESS, &address);
 	
 	async_exchange_end(exch);
Index: uspace/lib/usb/src/resolve.c
===================================================================
--- uspace/lib/usb/src/resolve.c	(revision 1c1b57723631eced3f412c2102d9f8b1aca38d0b)
+++ uspace/lib/usb/src/resolve.c	(revision 27736cf9e91e5f4fa53f888bb312dd0a6cb7fffc)
@@ -200,5 +200,5 @@
 		/* Try to get its address. */
 		if (!found_addr) {
-			dev_addr = usb_hc_get_address_by_handle(tmp_handle);
+			dev_addr = usb_get_address_by_handle(tmp_handle);
 			if (dev_addr >= 0) {
 				found_addr = true;