Index: uspace/drv/block/ata_bd/ata_bd.c
===================================================================
--- uspace/drv/block/ata_bd/ata_bd.c	(revision 363a504801b3e89816b06f074909410d93c9096c)
+++ uspace/drv/block/ata_bd/ata_bd.c	(revision f97f5cc2b91f2a3565f7b96b67bd28a8cb42c06a)
@@ -74,5 +74,4 @@
 
 #define NAME       "ata_bd"
-#define NAMESPACE  "bd"
 
 /** Number of defined legacy controller base addresses. */
Index: uspace/drv/block/ata_bd/main.c
===================================================================
--- uspace/drv/block/ata_bd/main.c	(revision 363a504801b3e89816b06f074909410d93c9096c)
+++ uspace/drv/block/ata_bd/main.c	(revision f97f5cc2b91f2a3565f7b96b67bd28a8cb42c06a)
@@ -198,5 +198,4 @@
 	}
 
-	ddf_fun_add_to_category(fun, "bd");
 	ddf_fun_add_to_category(fun, "disk");
 
Index: uspace/drv/block/ddisk/ddisk.c
===================================================================
--- uspace/drv/block/ddisk/ddisk.c	(revision 363a504801b3e89816b06f074909410d93c9096c)
+++ uspace/drv/block/ddisk/ddisk.c	(revision f97f5cc2b91f2a3565f7b96b67bd28a8cb42c06a)
@@ -337,5 +337,5 @@
 	}
 
-	ddf_fun_add_to_category(fun, "bd");
+	ddf_fun_add_to_category(fun, "disk");
 	ddisk->fun = fun;
 
Index: uspace/drv/bus/usb/usbmast/main.c
===================================================================
--- uspace/drv/bus/usb/usbmast/main.c	(revision 363a504801b3e89816b06f074909410d93c9096c)
+++ uspace/drv/bus/usb/usbmast/main.c	(revision f97f5cc2b91f2a3565f7b96b67bd28a8cb42c06a)
@@ -292,4 +292,6 @@
 	}
 
+	ddf_fun_add_to_category(fun, "disk");
+
 	free(fun_name);
 	mdev->luns[lun] = fun;
Index: uspace/srv/bd/file_bd/file_bd.c
===================================================================
--- uspace/srv/bd/file_bd/file_bd.c	(revision 363a504801b3e89816b06f074909410d93c9096c)
+++ uspace/srv/bd/file_bd/file_bd.c	(revision f97f5cc2b91f2a3565f7b96b67bd28a8cb42c06a)
@@ -90,4 +90,5 @@
 	char *image_name;
 	char *device_name;
+	category_id_t disk_cat;
 
 	printf(NAME ": File-backed block device driver\n");
@@ -138,5 +139,18 @@
 		return rc;
 	}
-	
+
+	rc = loc_category_get_id("disk", &disk_cat, IPC_FLAG_BLOCKING);
+	if (rc != EOK) {
+		printf("%s: Failed resolving category 'disk'.\n", NAME);
+		return rc;
+	}
+
+	rc = loc_service_add_to_cat(service_id, disk_cat);
+	if (rc != EOK) {
+		printf("%s: Failed adding %s to category.",
+		    NAME, device_name);
+		return rc;
+	}
+
 	printf("%s: Accepting connections\n", NAME);
 	task_retval(0);
Index: uspace/srv/bd/sata_bd/sata_bd.c
===================================================================
--- uspace/srv/bd/sata_bd/sata_bd.c	(revision 363a504801b3e89816b06f074909410d93c9096c)
+++ uspace/srv/bd/sata_bd/sata_bd.c	(revision f97f5cc2b91f2a3565f7b96b67bd28a8cb42c06a)
@@ -246,4 +246,5 @@
 {
 	int rc;
+	category_id_t disk_cat;
 	
 	async_set_fallback_port_handler(sata_bd_connection, NULL);
@@ -259,5 +260,11 @@
 	}
 
-	for(int i=0; i < disk_count; i++) {
+	rc = loc_category_get_id("disk", &disk_cat, IPC_FLAG_BLOCKING);
+	if (rc != EOK) {
+		printf("%s: Failed resolving category 'disk'.\n", NAME);
+		return rc;
+	}
+
+	for(int i = 0; i < disk_count; i++) {
 		char name[1024];
 		snprintf(name, 1024, "%s/%s", NAMESPACE, disk[i].dev_name);
@@ -267,6 +274,13 @@
 			return rc;
 		}
-	}
-		
+
+		rc = loc_service_add_to_cat(disk[i].service_id, disk_cat);
+		if (rc != EOK) {
+			printf("%s: Failed adding %s to category.",
+			    NAME, disk[i].dev_name);
+			return rc;
+		}
+	}
+
 	printf(NAME ": Accepting connections\n");
 	task_retval(0);
Index: uspace/srv/locsrv/locsrv.c
===================================================================
--- uspace/srv/locsrv/locsrv.c	(revision 363a504801b3e89816b06f074909410d93c9096c)
+++ uspace/srv/locsrv/locsrv.c	(revision f97f5cc2b91f2a3565f7b96b67bd28a8cb42c06a)
@@ -1314,7 +1314,4 @@
 	categ_dir_init(&cdir);
 
-	cat = category_new("bd");
-	categ_dir_add_cat(&cdir, cat);
-
 	cat = category_new("disk");
 	categ_dir_add_cat(&cdir, cat);