Index: kernel/generic/src/proc/task.c
===================================================================
--- kernel/generic/src/proc/task.c	(revision f9061b499e4439544d82ae29d075f8782dde1065)
+++ kernel/generic/src/proc/task.c	(revision 21300a2687821bddcb2325b0330dfe6148aff6cd)
@@ -190,5 +190,5 @@
 	str_cpy(task->name, TASK_NAME_BUFLEN, name);
 	
-	task->context = CONTEXT;
+	task->container = CONTAINER;
 	task->capabilities = 0;
 	task->ucycles = 0;
@@ -211,5 +211,5 @@
 	
 	if ((ipc_phone_0) &&
-	    (context_check(ipc_phone_0->task->context, task->context)))
+	    (container_check(ipc_phone_0->task->container, task->container)))
 		ipc_phone_connect(&task->phones[0], ipc_phone_0);
 	
@@ -584,5 +584,5 @@
 		printf("%-8" PRIu64 " %-14s %-5" PRIu32 " %10p %10p"
 		    " %9" PRIu64 "%c %9" PRIu64 "%c\n", task->taskid,
-		    task->name, task->context, task, task->as,
+		    task->name, task->container, task, task->as,
 		    ucycles, usuffix, kcycles, ksuffix);
 #endif
@@ -595,5 +595,5 @@
 	else
 		printf("%-8" PRIu64 " %-14s %-5" PRIu32 " %18p %18p\n",
-		    task->taskid, task->name, task->context, task, task->as);
+		    task->taskid, task->name, task->container, task, task->as);
 #endif
 	
@@ -625,5 +625,5 @@
 		printf("[id    ] [threads] [calls] [callee\n");
 	else
-		printf("[id    ] [name        ] [ctx] [address ] [as      ]"
+		printf("[id    ] [name        ] [ctn] [address ] [as      ]"
 		    " [ucycles ] [kcycles ]\n");
 #endif
@@ -634,5 +634,5 @@
 		    " [callee\n");
 	else
-		printf("[id    ] [name        ] [ctx] [address         ]"
+		printf("[id    ] [name        ] [ctn] [address         ]"
 		    " [as              ]\n");
 #endif