Index: kernel/arch/arm32/include/arch/arch.h
===================================================================
--- kernel/arch/arm32/include/arch/arch.h	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
+++ kernel/arch/arm32/include/arch/arch.h	(revision 8fefd8b580bf28eb98fa4eda780105c9d6409cc7)
@@ -53,4 +53,8 @@
 	size_t cnt;
 	utask_t tasks[TASKMAP_MAX_RECORDS];
+} taskmap_t;
+
+typedef struct {
+	taskmap_t taskmap;
 } bootinfo_t;
 
Index: kernel/arch/arm32/src/arm32.c
===================================================================
--- kernel/arch/arm32/src/arm32.c	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
+++ kernel/arch/arm32/src/arm32.c	(revision 8fefd8b580bf28eb98fa4eda780105c9d6409cc7)
@@ -67,12 +67,12 @@
 void arm32_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo)
 {
-	init.cnt = min3(bootinfo->cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS);
+	init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS);
 
 	size_t i;
 	for (i = 0; i < init.cnt; i++) {
-		init.tasks[i].paddr = KA2PA(bootinfo->tasks[i].addr);
-		init.tasks[i].size = bootinfo->tasks[i].size;
+		init.tasks[i].paddr = KA2PA(bootinfo->taskmap.tasks[i].addr);
+		init.tasks[i].size = bootinfo->taskmap.tasks[i].size;
 		str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN,
-		    bootinfo->tasks[i].name);
+		    bootinfo->taskmap.tasks[i].name);
 	}
 
Index: kernel/arch/ia64/include/arch/bootinfo.h
===================================================================
--- kernel/arch/ia64/include/arch/bootinfo.h	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
+++ kernel/arch/ia64/include/arch/bootinfo.h	(revision 8fefd8b580bf28eb98fa4eda780105c9d6409cc7)
@@ -36,5 +36,5 @@
 #define MEMMAP_FREE_MEM 0
 
-/** Size of buffer for storing task name in binit_task_t. */
+/** Size of buffer for storing task name in utask_t. */
 #define BOOTINFO_TASK_NAME_BUFLEN 32
 
@@ -43,10 +43,10 @@
 	size_t size;
 	char name[BOOTINFO_TASK_NAME_BUFLEN];
-} binit_task_t;
+} utask_t;
 
 typedef struct {
 	size_t cnt;
-	binit_task_t tasks[TASKMAP_MAX_RECORDS];
-} binit_t;
+	utask_t tasks[TASKMAP_MAX_RECORDS];
+} taskmap_t;
 
 typedef struct {
@@ -57,5 +57,5 @@
 
 typedef struct {
-	binit_t taskmap;
+	taskmap_t taskmap;
 
 	memmap_item_t memmap[MEMMAP_ITEMS];
Index: kernel/arch/mips32/include/arch/arch.h
===================================================================
--- kernel/arch/mips32/include/arch/arch.h	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
+++ kernel/arch/mips32/include/arch/arch.h	(revision 8fefd8b580bf28eb98fa4eda780105c9d6409cc7)
@@ -56,10 +56,14 @@
 
 typedef struct {
+	size_t cnt;
+	utask_t tasks[TASKMAP_MAX_RECORDS];
+} taskmap_t;
+
+typedef struct {
 #if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
 	uint32_t sdram_size;
 #endif
 	uint32_t cpumap;
-	size_t cnt;
-	utask_t tasks[TASKMAP_MAX_RECORDS];
+	taskmap_t taskmap;
 } bootinfo_t;
 
Index: kernel/arch/mips32/src/mips32.c
===================================================================
--- kernel/arch/mips32/src/mips32.c	(revision e88eb48e75ad044807a59279a35841cbebbc9611)
+++ kernel/arch/mips32/src/mips32.c	(revision 8fefd8b580bf28eb98fa4eda780105c9d6409cc7)
@@ -88,12 +88,12 @@
 void mips32_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo)
 {
-	init.cnt = min3(bootinfo->cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS);
+	init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS);
 
 	size_t i;
 	for (i = 0; i < init.cnt; i++) {
-		init.tasks[i].paddr = KA2PA(bootinfo->tasks[i].addr);
-		init.tasks[i].size = bootinfo->tasks[i].size;
+		init.tasks[i].paddr = KA2PA(bootinfo->taskmap.tasks[i].addr);
+		init.tasks[i].size = bootinfo->taskmap.tasks[i].size;
 		str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN,
-		    bootinfo->tasks[i].name);
+		    bootinfo->taskmap.tasks[i].name);
 	}