Index: uspace/drv/test1/test1.c
===================================================================
--- uspace/drv/test1/test1.c	(revision 5bee89701dfeeaf6af54574b17587ff273a9d444)
+++ uspace/drv/test1/test1.c	(revision 703d19c8d62d968e9d876fba84d87563a7a18da4)
@@ -49,4 +49,27 @@
 };
 
+/** Register child and inform user about it.
+ *
+ * @param parent Parent device.
+ * @param message Message for the user.
+ * @param name Device name.
+ * @param match_id Device match id.
+ * @param score Device match score.
+ */
+static void register_child_verbose(device_t *parent, const char *message,
+    const char *name, const char *match_id, int match_score)
+{
+	printf(NAME ": registering child device `%s': %s.\n",
+	   name, message);
+
+	int rc = child_device_register_wrapper(parent, name,
+	    match_id, match_score);
+
+	if (rc != EOK) {
+		printf(NAME ": failed to register child `%s' (%s).\n",
+		    name, str_error(rc));
+	}
+}
+
 /** Callback when new device is passed to this driver.
  * This function is the body of the test: it shall register new child
@@ -68,24 +91,15 @@
 static int add_device(device_t *dev)
 {
-	int rc;
 	printf(NAME ": add_device(name=\"%s\", handle=%d)\n",
 	    dev->name, (int) dev->handle);
 
+	add_device_to_class(dev, "virtual");
+
 	if (dev->parent == NULL) {
-		printf(NAME ": cloning myself ;-).\n");
-		rc = child_device_register_wrapper(dev, "clone",
+		register_child_verbose(dev, "cloning myself ;-)", "clone",
 		    "virtual&test1", 10);
-		if (rc != EOK) {
-			printf(NAME ": failed to register clone (%s).\n",
-			    str_error(rc));
-		}
 	} else if (str_cmp(dev->name, "clone") == 0) {
-		printf(NAME ": registering child device run by the same task.\n");
-		rc = child_device_register_wrapper(dev, "child",
+		register_child_verbose(dev, "run by the same task", "child",
 		    "virtual&test1&child", 10);
-		if (rc != EOK) {
-			printf(NAME ": failed to register child (%s).\n",
-			    str_error(rc));
-		}
 	}
 
Index: uspace/srv/devman/devman.c
===================================================================
--- uspace/srv/devman/devman.c	(revision 5bee89701dfeeaf6af54574b17587ff273a9d444)
+++ uspace/srv/devman/devman.c	(revision 703d19c8d62d968e9d876fba84d87563a7a18da4)
@@ -516,5 +516,5 @@
 	int phone;
 
-	printf(NAME ": pass_devices_to_driver\n");
+	printf(NAME ": pass_devices_to_driver(`%s')\n", driver->name);
 
 	fibril_mutex_lock(&driver->driver_mutex);
@@ -586,5 +586,5 @@
 void initialize_running_driver(driver_t *driver, dev_tree_t *tree)
 {
-	printf(NAME ": initialize_running_driver\n");
+	printf(NAME ": initialize_running_driver (`%s')\n", driver->name);
 	
 	/*