Index: kernel/generic/src/main/kinit.c
===================================================================
--- kernel/generic/src/main/kinit.c	(revision a212307ca711c2759f33236c7ca554a42a72d9cd)
+++ kernel/generic/src/main/kinit.c	(revision 561db3f87662526e5b14ca49efc6c1229d0a8a2b)
@@ -65,4 +65,6 @@
 #include <lib/rd.h>
 #include <ipc/ipc.h>
+#include <debug.h>
+#include <string.h>
 
 #ifdef CONFIG_SMP
@@ -78,4 +80,7 @@
 static char alive[ALIVE_CHARS] = "-\\|/";
 #endif
+
+#define BOOT_PREFIX		"boot:"
+#define BOOT_PREFIX_LEN		5
 
 /** Kernel initialization thread.
@@ -176,9 +181,21 @@
 		}
 
-		char *name = init.tasks[i].name;
-		if (name[0] == '\0') name = "init-bin";
+		/*
+		 * Construct task name from the 'boot:' prefix and the
+		 * name stored in the init structure (if any).
+		 */
+
+		char namebuf[TASK_NAME_BUFLEN], *name;
+
+		name = init.tasks[i].name;
+		if (name[0] == '\0') name = "<unknown>";
+
+		ASSERT(TASK_NAME_BUFLEN >= BOOT_PREFIX_LEN);
+		strncpy(namebuf, BOOT_PREFIX, TASK_NAME_BUFLEN);
+		strncpy(namebuf + BOOT_PREFIX_LEN, name,
+		    TASK_NAME_BUFLEN - BOOT_PREFIX_LEN);
 		
 		int rc = program_create_from_image((void *) init.tasks[i].addr,
-		    name, &programs[i]);
+		    namebuf, &programs[i]);
 		
 		if ((rc == 0) && (programs[i].task != NULL)) {