Index: uspace/lib/drv/generic/driver.c
===================================================================
--- uspace/lib/drv/generic/driver.c	(revision 612ad86441dd4dcfe6278a4964b7c1cb33c1f63e)
+++ uspace/lib/drv/generic/driver.c	(revision 765678f460ba0db4d0ba6b052f01e51ab2f3ba90)
@@ -288,5 +288,5 @@
 	(void) parent_fun_handle;
 	
-	res = driver->driver_ops->add_device(dev);
+	res = driver->driver_ops->dev_add(dev);
 	
 	if (res != EOK) {
Index: uspace/lib/drv/include/ddf/driver.h
===================================================================
--- uspace/lib/drv/include/ddf/driver.h	(revision 612ad86441dd4dcfe6278a4964b7c1cb33c1f63e)
+++ uspace/lib/drv/include/ddf/driver.h	(revision 765678f460ba0db4d0ba6b052f01e51ab2f3ba90)
@@ -136,11 +136,5 @@
 typedef struct driver_ops {
 	/** Callback method for passing a new device to the device driver */
-	int (*add_device)(ddf_dev_t *);
-	/**
-	 * Notification that the device was succesfully added.
-	 * The driver can do any blocking operation without
-	 * blocking the device manager.
-	 */
-	void (*device_added)(ddf_dev_t *dev);
+	int (*dev_add)(ddf_dev_t *);
 	/** Ask driver to remove a device */
 	int (*dev_remove)(ddf_dev_t *);
@@ -151,4 +145,13 @@
 	/** Ask driver to offline a specific function */
 	int (*fun_offline)(ddf_fun_t *);
+
+	/**
+	 * Notification that the device was succesfully added.
+	 * The driver can do any blocking operation without
+	 * blocking the device manager.
+	 *
+	 * XXX REMOVE THIS
+	 */
+	void (*device_added)(ddf_dev_t *dev);
 } driver_ops_t;
 
Index: uspace/lib/usbdev/src/devdrv.c
===================================================================
--- uspace/lib/usbdev/src/devdrv.c	(revision 612ad86441dd4dcfe6278a4964b7c1cb33c1f63e)
+++ uspace/lib/usbdev/src/devdrv.c	(revision 765678f460ba0db4d0ba6b052f01e51ab2f3ba90)
@@ -46,5 +46,5 @@
 
 static driver_ops_t generic_driver_ops = {
-	.add_device = generic_device_add,
+	.dev_add = generic_device_add,
 	.dev_remove = generic_device_remove,
 	.dev_gone = generic_device_gone,