Index: uspace/drv/bus/isa/isa.c
===================================================================
--- uspace/drv/bus/isa/isa.c	(revision 2d1ba51a91ec19c247cef419a7e2b3c59881e0b9)
+++ uspace/drv/bus/isa/isa.c	(revision 0c0f823be60de51c77b4a379e049bb77bd2df4bc)
@@ -108,5 +108,5 @@
 static ddf_dev_ops_t isa_fun_ops;
 
-static int isa_add_device(ddf_dev_t *dev);
+static int isa_dev_add(ddf_dev_t *dev);
 static int isa_dev_remove(ddf_dev_t *dev);
 static int isa_fun_online(ddf_fun_t *fun);
@@ -115,5 +115,5 @@
 /** The isa device driver's standard operations */
 static driver_ops_t isa_ops = {
-	.add_device = &isa_add_device,
+	.dev_add = &isa_dev_add,
 	.dev_remove = &isa_dev_remove,
 	.fun_online = &isa_fun_online,
@@ -494,9 +494,9 @@
 }
 
-static int isa_add_device(ddf_dev_t *dev)
+static int isa_dev_add(ddf_dev_t *dev)
 {
 	isa_bus_t *isa;
 
-	ddf_msg(LVL_DEBUG, "isa_add_device, device handle = %d",
+	ddf_msg(LVL_DEBUG, "isa_dev_add, device handle = %d",
 	    (int) dev->handle);
 
Index: uspace/drv/bus/pci/pciintel/pci.c
===================================================================
--- uspace/drv/bus/pci/pciintel/pci.c	(revision 2d1ba51a91ec19c247cef419a7e2b3c59881e0b9)
+++ uspace/drv/bus/pci/pciintel/pci.c	(revision 0c0f823be60de51c77b4a379e049bb77bd2df4bc)
@@ -205,5 +205,5 @@
 };
 
-static int pci_add_device(ddf_dev_t *);
+static int pci_dev_add(ddf_dev_t *);
 static int pci_fun_online(ddf_fun_t *);
 static int pci_fun_offline(ddf_fun_t *);
@@ -211,5 +211,5 @@
 /** PCI bus driver standard operations */
 static driver_ops_t pci_ops = {
-	.add_device = &pci_add_device,
+	.dev_add = &pci_dev_add,
 	.fun_online = &pci_fun_online,
 	.fun_offline = &pci_fun_offline,
@@ -610,5 +610,5 @@
 }
 
-static int pci_add_device(ddf_dev_t *dnode)
+static int pci_dev_add(ddf_dev_t *dnode)
 {
 	pci_bus_t *bus = NULL;
@@ -617,10 +617,10 @@
 	int rc;
 	
-	ddf_msg(LVL_DEBUG, "pci_add_device");
+	ddf_msg(LVL_DEBUG, "pci_dev_add");
 	dnode->parent_sess = NULL;
 	
 	bus = ddf_dev_data_alloc(dnode, sizeof(pci_bus_t));
 	if (bus == NULL) {
-		ddf_msg(LVL_ERROR, "pci_add_device allocation failed.");
+		ddf_msg(LVL_ERROR, "pci_dev_add allocation failed.");
 		rc = ENOMEM;
 		goto fail;
@@ -634,5 +634,5 @@
 	    dnode->handle, IPC_FLAG_BLOCKING);
 	if (!dnode->parent_sess) {
-		ddf_msg(LVL_ERROR, "pci_add_device failed to connect to the "
+		ddf_msg(LVL_ERROR, "pci_dev_add failed to connect to the "
 		    "parent driver.");
 		rc = ENOENT;
@@ -644,5 +644,5 @@
 	rc = hw_res_get_resource_list(dnode->parent_sess, &hw_resources);
 	if (rc != EOK) {
-		ddf_msg(LVL_ERROR, "pci_add_device failed to get hw resources "
+		ddf_msg(LVL_ERROR, "pci_dev_add failed to get hw resources "
 		    "for the device.");
 		goto fail;
Index: uspace/drv/bus/usb/ehci/main.c
===================================================================
--- uspace/drv/bus/usb/ehci/main.c	(revision 2d1ba51a91ec19c247cef419a7e2b3c59881e0b9)
+++ uspace/drv/bus/usb/ehci/main.c	(revision 0c0f823be60de51c77b4a379e049bb77bd2df4bc)
@@ -46,8 +46,8 @@
 #include "ehci.h"
 
-static int ehci_add_device(ddf_dev_t *device);
+static int ehci_dev_add(ddf_dev_t *device);
 /*----------------------------------------------------------------------------*/
 static driver_ops_t ehci_driver_ops = {
-	.add_device = ehci_add_device,
+	.dev_add = ehci_dev_add,
 };
 /*----------------------------------------------------------------------------*/
@@ -66,5 +66,5 @@
  * @return Error code.
  */
-static int ehci_add_device(ddf_dev_t *device)
+static int ehci_dev_add(ddf_dev_t *device)
 {
 	assert(device);
Index: uspace/drv/bus/usb/ohci/main.c
===================================================================
--- uspace/drv/bus/usb/ohci/main.c	(revision 2d1ba51a91ec19c247cef419a7e2b3c59881e0b9)
+++ uspace/drv/bus/usb/ohci/main.c	(revision 0c0f823be60de51c77b4a379e049bb77bd2df4bc)
@@ -48,7 +48,7 @@
  * @return Error code.
  */
-static int ohci_add_device(ddf_dev_t *device)
+static int ohci_dev_add(ddf_dev_t *device)
 {
-	usb_log_debug("ohci_add_device() called\n");
+	usb_log_debug("ohci_dev_add() called\n");
 	assert(device);
 
@@ -65,5 +65,5 @@
 /*----------------------------------------------------------------------------*/
 static driver_ops_t ohci_driver_ops = {
-	.add_device = ohci_add_device,
+	.dev_add = ohci_dev_add,
 };
 /*----------------------------------------------------------------------------*/
Index: uspace/drv/bus/usb/uhci/main.c
===================================================================
--- uspace/drv/bus/usb/uhci/main.c	(revision 2d1ba51a91ec19c247cef419a7e2b3c59881e0b9)
+++ uspace/drv/bus/usb/uhci/main.c	(revision 0c0f823be60de51c77b4a379e049bb77bd2df4bc)
@@ -43,8 +43,8 @@
 #define NAME "uhci"
 
-static int uhci_add_device(ddf_dev_t *device);
+static int uhci_dev_add(ddf_dev_t *device);
 /*----------------------------------------------------------------------------*/
 static driver_ops_t uhci_driver_ops = {
-	.add_device = uhci_add_device,
+	.dev_add = uhci_dev_add,
 };
 /*----------------------------------------------------------------------------*/
@@ -59,7 +59,7 @@
  * @return Error code.
  */
-int uhci_add_device(ddf_dev_t *device)
+int uhci_dev_add(ddf_dev_t *device)
 {
-	usb_log_debug2("uhci_add_device() called\n");
+	usb_log_debug2("uhci_dev_add() called\n");
 	assert(device);
 
Index: uspace/drv/bus/usb/uhcirh/main.c
===================================================================
--- uspace/drv/bus/usb/uhcirh/main.c	(revision 2d1ba51a91ec19c247cef419a7e2b3c59881e0b9)
+++ uspace/drv/bus/usb/uhcirh/main.c	(revision 0c0f823be60de51c77b4a379e049bb77bd2df4bc)
@@ -51,8 +51,8 @@
     uintptr_t *io_reg_address, size_t *io_reg_size);
 
-static int uhci_rh_add_device(ddf_dev_t *device);
+static int uhci_rh_dev_add(ddf_dev_t *device);
 
 static driver_ops_t uhci_rh_driver_ops = {
-	.add_device = uhci_rh_add_device,
+	.dev_add = uhci_rh_dev_add,
 };
 
@@ -82,10 +82,10 @@
  * @return Error code.
  */
-static int uhci_rh_add_device(ddf_dev_t *device)
+static int uhci_rh_dev_add(ddf_dev_t *device)
 {
 	if (!device)
 		return EINVAL;
 
-	usb_log_debug2("uhci_rh_add_device(handle=%" PRIun ")\n",
+	usb_log_debug2("uhci_rh_dev_add(handle=%" PRIun ")\n",
 	    device->handle);
 
Index: uspace/drv/bus/usb/vhc/main.c
===================================================================
--- uspace/drv/bus/usb/vhc/main.c	(revision 2d1ba51a91ec19c247cef419a7e2b3c59881e0b9)
+++ uspace/drv/bus/usb/vhc/main.c	(revision 0c0f823be60de51c77b4a379e049bb77bd2df4bc)
@@ -58,5 +58,5 @@
 };
 
-static int vhc_add_device(ddf_dev_t *dev)
+static int vhc_dev_add(ddf_dev_t *dev)
 {
 	static int vhc_count = 0;
@@ -131,5 +131,5 @@
 
 static driver_ops_t vhc_driver_ops = {
-	.add_device = vhc_add_device,
+	.dev_add = vhc_dev_add,
 };
 
Index: uspace/drv/char/ns8250/ns8250.c
===================================================================
--- uspace/drv/char/ns8250/ns8250.c	(revision 2d1ba51a91ec19c247cef419a7e2b3c59881e0b9)
+++ uspace/drv/char/ns8250/ns8250.c	(revision 0c0f823be60de51c77b4a379e049bb77bd2df4bc)
@@ -223,10 +223,10 @@
 };
 
-static int ns8250_add_device(ddf_dev_t *dev);
+static int ns8250_dev_add(ddf_dev_t *dev);
 static int ns8250_dev_remove(ddf_dev_t *dev);
 
 /** The serial port device driver's standard operations. */
 static driver_ops_t ns8250_ops = {
-	.add_device = &ns8250_add_device,
+	.dev_add = &ns8250_dev_add,
 	.dev_remove = &ns8250_dev_remove
 };
@@ -717,5 +717,5 @@
 }
 
-/** The add_device callback method of the serial port driver.
+/** The dev_add callback method of the serial port driver.
  *
  * Probe and initialize the newly added device.
@@ -723,5 +723,5 @@
  * @param dev		The serial port device.
  */
-static int ns8250_add_device(ddf_dev_t *dev)
+static int ns8250_dev_add(ddf_dev_t *dev)
 {
 	ns8250_t *ns = NULL;
@@ -730,5 +730,5 @@
 	int rc;
 	
-	ddf_msg(LVL_DEBUG, "ns8250_add_device %s (handle = %d)",
+	ddf_msg(LVL_DEBUG, "ns8250_dev_add %s (handle = %d)",
 	    dev->name, (int) dev->handle);
 	
Index: uspace/drv/infrastructure/root/root.c
===================================================================
--- uspace/drv/infrastructure/root/root.c	(revision 2d1ba51a91ec19c247cef419a7e2b3c59881e0b9)
+++ uspace/drv/infrastructure/root/root.c	(revision 0c0f823be60de51c77b4a379e049bb77bd2df4bc)
@@ -66,5 +66,5 @@
 #define VIRTUAL_FUN_MATCH_SCORE 100
 
-static int root_add_device(ddf_dev_t *dev);
+static int root_dev_add(ddf_dev_t *dev);
 static int root_fun_online(ddf_fun_t *fun);
 static int root_fun_offline(ddf_fun_t *fun);
@@ -72,5 +72,5 @@
 /** The root device driver's standard operations. */
 static driver_ops_t root_ops = {
-	.add_device = &root_add_device,
+	.dev_add = &root_dev_add,
 	.fun_online = &root_fun_online,
 	.fun_offline = &root_fun_offline
@@ -198,7 +198,7 @@
  *			of HW and pseudo devices).
  */
-static int root_add_device(ddf_dev_t *dev)
-{
-	ddf_msg(LVL_DEBUG, "root_add_device, device handle=%" PRIun,
+static int root_dev_add(ddf_dev_t *dev)
+{
+	ddf_msg(LVL_DEBUG, "root_dev_add, device handle=%" PRIun,
 	    dev->handle);
 
Index: uspace/drv/infrastructure/rootmac/rootmac.c
===================================================================
--- uspace/drv/infrastructure/rootmac/rootmac.c	(revision 2d1ba51a91ec19c247cef419a7e2b3c59881e0b9)
+++ uspace/drv/infrastructure/rootmac/rootmac.c	(revision 0c0f823be60de51c77b4a379e049bb77bd2df4bc)
@@ -125,5 +125,5 @@
  *
  */
-static int rootmac_add_device(ddf_dev_t *dev)
+static int rootmac_dev_add(ddf_dev_t *dev)
 {
 	/* Register functions */
@@ -136,5 +136,5 @@
 /** The root device driver's standard operations. */
 static driver_ops_t rootmac_ops = {
-	.add_device = &rootmac_add_device
+	.dev_add = &rootmac_dev_add
 };
 
Index: uspace/drv/infrastructure/rootpc/rootpc.c
===================================================================
--- uspace/drv/infrastructure/rootpc/rootpc.c	(revision 2d1ba51a91ec19c247cef419a7e2b3c59881e0b9)
+++ uspace/drv/infrastructure/rootpc/rootpc.c	(revision 0c0f823be60de51c77b4a379e049bb77bd2df4bc)
@@ -63,10 +63,10 @@
 } rootpc_fun_t;
 
-static int rootpc_add_device(ddf_dev_t *dev);
+static int rootpc_dev_add(ddf_dev_t *dev);
 static void root_pc_init(void);
 
 /** The root device driver's standard operations. */
 static driver_ops_t rootpc_ops = {
-	.add_device = &rootpc_add_device
+	.dev_add = &rootpc_dev_add
 };
 
@@ -175,7 +175,7 @@
  * @return		Zero on success, negative error number otherwise.
  */
-static int rootpc_add_device(ddf_dev_t *dev)
-{
-	ddf_msg(LVL_DEBUG, "rootpc_add_device, device handle = %d",
+static int rootpc_dev_add(ddf_dev_t *dev)
+{
+	ddf_msg(LVL_DEBUG, "rootpc_dev_add, device handle = %d",
 	    (int)dev->handle);
 	
Index: uspace/drv/infrastructure/rootvirt/rootvirt.c
===================================================================
--- uspace/drv/infrastructure/rootvirt/rootvirt.c	(revision 2d1ba51a91ec19c247cef419a7e2b3c59881e0b9)
+++ uspace/drv/infrastructure/rootvirt/rootvirt.c	(revision 0c0f823be60de51c77b4a379e049bb77bd2df4bc)
@@ -62,5 +62,5 @@
 };
 
-static int rootvirt_add_device(ddf_dev_t *dev);
+static int rootvirt_dev_add(ddf_dev_t *dev);
 static int rootvirt_dev_remove(ddf_dev_t *dev);
 static int rootvirt_fun_online(ddf_fun_t *fun);
@@ -68,5 +68,5 @@
 
 static driver_ops_t rootvirt_ops = {
-	.add_device = &rootvirt_add_device,
+	.dev_add = &rootvirt_dev_add,
 	.dev_remove = &rootvirt_dev_remove,
 	.fun_online = &rootvirt_fun_online,
@@ -172,5 +172,5 @@
 
 
-static int rootvirt_add_device(ddf_dev_t *dev)
+static int rootvirt_dev_add(ddf_dev_t *dev)
 {
 	rootvirt_t *rootvirt;
@@ -183,5 +183,5 @@
 	}
 
-	ddf_msg(LVL_DEBUG, "add_device(handle=%d)", (int)dev->handle);
+	ddf_msg(LVL_DEBUG, "dev_add(handle=%d)", (int)dev->handle);
 
 	rootvirt = ddf_dev_data_alloc(dev, sizeof(rootvirt_t));
Index: uspace/drv/nic/lo/lo.c
===================================================================
--- uspace/drv/nic/lo/lo.c	(revision 2d1ba51a91ec19c247cef419a7e2b3c59881e0b9)
+++ uspace/drv/nic/lo/lo.c	(revision 0c0f823be60de51c77b4a379e049bb77bd2df4bc)
@@ -79,5 +79,5 @@
 }
 
-static int lo_add_device(ddf_dev_t *dev)
+static int lo_dev_add(ddf_dev_t *dev)
 {
 	nic_t *nic_data = nic_create_and_bind(dev);
@@ -118,5 +118,5 @@
 
 static driver_ops_t lo_driver_ops = {
-	.add_device = lo_add_device,
+	.dev_add = lo_dev_add,
 };
 
Index: uspace/drv/nic/ne2k/ne2k.c
===================================================================
--- uspace/drv/nic/ne2k/ne2k.c	(revision 2d1ba51a91ec19c247cef419a7e2b3c59881e0b9)
+++ uspace/drv/nic/ne2k/ne2k.c	(revision 0c0f823be60de51c77b4a379e049bb77bd2df4bc)
@@ -336,5 +336,5 @@
 }
 
-static int ne2k_add_device(ddf_dev_t *dev)
+static int ne2k_dev_add(ddf_dev_t *dev)
 {
 	/* Allocate driver data for the device. */
@@ -391,5 +391,5 @@
 
 static driver_ops_t ne2k_driver_ops = {
-	.add_device = ne2k_add_device
+	.dev_add = ne2k_dev_add
 };
 
Index: uspace/drv/test/test1/test1.c
===================================================================
--- uspace/drv/test/test1/test1.c	(revision 2d1ba51a91ec19c247cef419a7e2b3c59881e0b9)
+++ uspace/drv/test/test1/test1.c	(revision 0c0f823be60de51c77b4a379e049bb77bd2df4bc)
@@ -40,5 +40,5 @@
 #include "test1.h"
 
-static int test1_add_device(ddf_dev_t *dev);
+static int test1_dev_add(ddf_dev_t *dev);
 static int test1_dev_remove(ddf_dev_t *dev);
 static int test1_dev_gone(ddf_dev_t *dev);
@@ -47,5 +47,5 @@
 
 static driver_ops_t driver_ops = {
-	.add_device = &test1_add_device,
+	.dev_add = &test1_dev_add,
 	.dev_remove = &test1_dev_remove,
 	.dev_gone = &test1_dev_gone,
@@ -141,5 +141,5 @@
  * @return Error code reporting success of the operation.
  */
-static int test1_add_device(ddf_dev_t *dev)
+static int test1_dev_add(ddf_dev_t *dev)
 {
 	ddf_fun_t *fun_a;
@@ -147,5 +147,5 @@
 	int rc;
 
-	ddf_msg(LVL_DEBUG, "add_device(name=\"%s\", handle=%d)",
+	ddf_msg(LVL_DEBUG, "dev_add(name=\"%s\", handle=%d)",
 	    dev->name, (int) dev->handle);
 
Index: uspace/drv/test/test2/test2.c
===================================================================
--- uspace/drv/test/test2/test2.c	(revision 2d1ba51a91ec19c247cef419a7e2b3c59881e0b9)
+++ uspace/drv/test/test2/test2.c	(revision 0c0f823be60de51c77b4a379e049bb77bd2df4bc)
@@ -40,5 +40,5 @@
 #define NAME "test2"
 
-static int test2_add_device(ddf_dev_t *dev);
+static int test2_dev_add(ddf_dev_t *dev);
 static int test2_dev_remove(ddf_dev_t *dev);
 static int test2_dev_gone(ddf_dev_t *dev);
@@ -47,5 +47,5 @@
 
 static driver_ops_t driver_ops = {
-	.add_device = &test2_add_device,
+	.dev_add = &test2_dev_add,
 	.dev_remove = &test2_dev_remove,
 	.dev_gone = &test2_dev_gone,
@@ -193,9 +193,9 @@
 }
 
-static int test2_add_device(ddf_dev_t *dev)
+static int test2_dev_add(ddf_dev_t *dev)
 {
 	test2_t *test2;
 
-	ddf_msg(LVL_DEBUG, "test2_add_device(name=\"%s\", handle=%d)",
+	ddf_msg(LVL_DEBUG, "test2_dev_add(name=\"%s\", handle=%d)",
 	    dev->name, (int) dev->handle);
 
Index: uspace/drv/test/test3/test3.c
===================================================================
--- uspace/drv/test/test3/test3.c	(revision 2d1ba51a91ec19c247cef419a7e2b3c59881e0b9)
+++ uspace/drv/test/test3/test3.c	(revision 0c0f823be60de51c77b4a379e049bb77bd2df4bc)
@@ -41,5 +41,5 @@
 #define NUM_FUNCS 20
 
-static int test3_add_device(ddf_dev_t *dev);
+static int test3_dev_add(ddf_dev_t *dev);
 static int test3_dev_remove(ddf_dev_t *dev);
 static int test3_fun_online(ddf_fun_t *fun);
@@ -47,5 +47,5 @@
 
 static driver_ops_t driver_ops = {
-	.add_device = &test3_add_device,
+	.dev_add = &test3_dev_add,
 	.dev_remove = &test3_dev_remove,
 	.fun_online = &test3_fun_online,
@@ -127,10 +127,10 @@
 }
 
-static int test3_add_device(ddf_dev_t *dev)
+static int test3_dev_add(ddf_dev_t *dev)
 {
 	int rc = EOK;
 	test3_t *test3;
 
-	ddf_msg(LVL_DEBUG, "add_device(name=\"%s\", handle=%d)",
+	ddf_msg(LVL_DEBUG, "dev_add(name=\"%s\", handle=%d)",
 	    dev->name, (int) dev->handle);