Index: uspace/drv/bus/usb/usbflbk/main.c
===================================================================
--- uspace/drv/bus/usb/usbflbk/main.c	(revision 49a98c8c6fdf8ca5858e5e00d9012d1c597602c2)
+++ uspace/drv/bus/usb/usbflbk/main.c	(revision 8e5ce07ed876c7d2a38b3ce3e1ebc05aee0fb596)
@@ -46,5 +46,5 @@
  * @return Error code.
  */
-static int usbfallback_add_device(usb_device_t *dev)
+static int usbfallback_device_add(usb_device_t *dev)
 {
 	int rc;
@@ -74,5 +74,5 @@
 /** USB fallback driver ops. */
 static usb_driver_ops_t usbfallback_driver_ops = {
-	.add_device = usbfallback_add_device,
+	.device_add = usbfallback_device_add,
 };
 
Index: uspace/drv/bus/usb/usbhid/main.c
===================================================================
--- uspace/drv/bus/usb/usbhid/main.c	(revision 49a98c8c6fdf8ca5858e5e00d9012d1c597602c2)
+++ uspace/drv/bus/usb/usbhid/main.c	(revision 8e5ce07ed876c7d2a38b3ce3e1ebc05aee0fb596)
@@ -150,7 +150,7 @@
  * @retval EREFUSED if the device is not supported.
  */
-static int usb_hid_add_device(usb_device_t *dev)
+static int usb_hid_device_add(usb_device_t *dev)
 {
-	usb_log_debug("usb_hid_add_device()\n");
+	usb_log_debug("usb_hid_device_add()\n");
 	
 	if (dev == NULL) {
@@ -185,5 +185,5 @@
  * supports unplug, more callbacks will be added. */
 static usb_driver_ops_t usb_hid_driver_ops = {
-        .add_device = usb_hid_add_device,
+        .device_add = usb_hid_device_add,
 };
 
Index: uspace/drv/bus/usb/usbhub/main.c
===================================================================
--- uspace/drv/bus/usb/usbhub/main.c	(revision 49a98c8c6fdf8ca5858e5e00d9012d1c597602c2)
+++ uspace/drv/bus/usb/usbhub/main.c	(revision 8e5ce07ed876c7d2a38b3ce3e1ebc05aee0fb596)
@@ -59,8 +59,8 @@
  * USB hub driver operations
  *
- * The most important one is add_device, which is set to usb_hub_add_device.
+ * The most important one is device_add, which is set to usb_hub_device_add.
  */
 static usb_driver_ops_t usb_hub_driver_ops = {
-	.add_device = usb_hub_add_device
+	.device_add = usb_hub_device_add
 };
 
Index: uspace/drv/bus/usb/usbhub/usbhub.c
===================================================================
--- uspace/drv/bus/usb/usbhub/usbhub.c	(revision 49a98c8c6fdf8ca5858e5e00d9012d1c597602c2)
+++ uspace/drv/bus/usb/usbhub/usbhub.c	(revision 8e5ce07ed876c7d2a38b3ce3e1ebc05aee0fb596)
@@ -84,5 +84,5 @@
  * @return error code
  */
-int usb_hub_add_device(usb_device_t *usb_dev)
+int usb_hub_device_add(usb_device_t *usb_dev)
 {
 	assert(usb_dev);
Index: uspace/drv/bus/usb/usbhub/usbhub.h
===================================================================
--- uspace/drv/bus/usb/usbhub/usbhub.h	(revision 49a98c8c6fdf8ca5858e5e00d9012d1c597602c2)
+++ uspace/drv/bus/usb/usbhub/usbhub.h	(revision 8e5ce07ed876c7d2a38b3ce3e1ebc05aee0fb596)
@@ -78,5 +78,5 @@
 };
 
-int usb_hub_add_device(usb_device_t *usb_dev);
+int usb_hub_device_add(usb_device_t *usb_dev);
 
 bool hub_port_changes_callback(usb_device_t *dev,
Index: uspace/drv/bus/usb/usbmast/main.c
===================================================================
--- uspace/drv/bus/usb/usbmast/main.c	(revision 49a98c8c6fdf8ca5858e5e00d9012d1c597602c2)
+++ uspace/drv/bus/usb/usbmast/main.c	(revision 8e5ce07ed876c7d2a38b3ce3e1ebc05aee0fb596)
@@ -87,5 +87,5 @@
  * @return Error code.
  */
-static int usbmast_add_device(usb_device_t *dev)
+static int usbmast_device_add(usb_device_t *dev)
 {
 	int rc;
@@ -295,5 +295,5 @@
 /** USB mass storage driver ops. */
 static usb_driver_ops_t usbmast_driver_ops = {
-	.add_device = usbmast_add_device,
+	.device_add = usbmast_device_add,
 };
 
Index: uspace/drv/bus/usb/usbmid/main.c
===================================================================
--- uspace/drv/bus/usb/usbmid/main.c	(revision 49a98c8c6fdf8ca5858e5e00d9012d1c597602c2)
+++ uspace/drv/bus/usb/usbmid/main.c	(revision 8e5ce07ed876c7d2a38b3ce3e1ebc05aee0fb596)
@@ -49,5 +49,5 @@
  * @return Error code.
  */
-static int usbmid_add_device(usb_device_t *dev)
+static int usbmid_device_add(usb_device_t *dev)
 {
 	usb_log_info("Taking care of new MID `%s'.\n", dev->ddf_dev->name);
@@ -68,5 +68,5 @@
 /** USB MID driver ops. */
 static usb_driver_ops_t mid_driver_ops = {
-	.add_device = usbmid_add_device,
+	.device_add = usbmid_device_add,
 };
 
Index: uspace/drv/bus/usb/usbmouse/main.c
===================================================================
--- uspace/drv/bus/usb/usbmouse/main.c	(revision 49a98c8c6fdf8ca5858e5e00d9012d1c597602c2)
+++ uspace/drv/bus/usb/usbmouse/main.c	(revision 8e5ce07ed876c7d2a38b3ce3e1ebc05aee0fb596)
@@ -50,5 +50,5 @@
  *
  */
-static int usbmouse_add_device(usb_device_t *dev)
+static int usbmouse_device_add(usb_device_t *dev)
 {
 	int rc = usb_mouse_create(dev);
@@ -80,5 +80,5 @@
 /** USB mouse driver ops. */
 static usb_driver_ops_t mouse_driver_ops = {
-	.add_device = usbmouse_add_device,
+	.device_add = usbmouse_device_add,
 };