Index: kernel/generic/src/proc/program.c
===================================================================
--- kernel/generic/src/proc/program.c	(revision 473d5d202238ab61558d1695b8e41f478815a862)
+++ kernel/generic/src/proc/program.c	(revision e06e27166f1b30422fc5f34049108ea34cdd2cfb)
@@ -54,8 +54,4 @@
 #include <proc/program.h>
 
-#ifndef LOADED_PROG_STACK_PAGES_NO
-#define LOADED_PROG_STACK_PAGES_NO 1
-#endif
-
 /**
  * Points to the binary image used as the program loader. All non-initial
@@ -90,10 +86,10 @@
 	
 	/*
-	 * Create the data address space area.
+	 * Create the stack address space area.
 	 */
 	as_area_t *area = as_area_create(as,
 	    AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE,
-	    LOADED_PROG_STACK_PAGES_NO * PAGE_SIZE, USTACK_ADDRESS,
-	    AS_AREA_ATTR_NONE, &anon_backend, NULL);
+	    STACK_SIZE, USTACK_ADDRESS, AS_AREA_ATTR_NONE,
+	    &anon_backend, NULL);
 	if (!area)
 		return ENOMEM;
Index: kernel/generic/src/proc/scheduler.c
===================================================================
--- kernel/generic/src/proc/scheduler.c	(revision 473d5d202238ab61558d1695b8e41f478815a862)
+++ kernel/generic/src/proc/scheduler.c	(revision e06e27166f1b30422fc5f34049108ea34cdd2cfb)
@@ -376,5 +376,5 @@
 	context_save(&CPU->saved_context);
 	context_set(&CPU->saved_context, FADDR(scheduler_separated_stack),
-	    (uintptr_t) CPU->stack, CPU_STACK_SIZE);
+	    (uintptr_t) CPU->stack, STACK_SIZE);
 	context_restore(&CPU->saved_context);
 	
Index: kernel/generic/src/proc/thread.c
===================================================================
--- kernel/generic/src/proc/thread.c	(revision 473d5d202238ab61558d1695b8e41f478815a862)
+++ kernel/generic/src/proc/thread.c	(revision e06e27166f1b30422fc5f34049108ea34cdd2cfb)
@@ -68,10 +68,4 @@
 #include <errno.h>
 
-
-#ifndef LOADED_PROG_STACK_PAGES_NO
-#define LOADED_PROG_STACK_PAGES_NO 1
-#endif
-
-
 /** Thread states */
 const char *thread_states[] = {
@@ -300,5 +294,5 @@
 	
 	/* Not needed, but good for debugging */
-	memsetb(thread->kstack, THREAD_STACK_SIZE * 1 << STACK_FRAMES, 0);
+	memsetb(thread->kstack, STACK_SIZE, 0);
 	
 	irq_spinlock_lock(&tidlock, true);
@@ -308,5 +302,5 @@
 	context_save(&thread->saved_context);
 	context_set(&thread->saved_context, FADDR(cushion),
-	    (uintptr_t) thread->kstack, THREAD_STACK_SIZE);
+	    (uintptr_t) thread->kstack, STACK_SIZE);
 	
 	the_initialize((the_t *) thread->kstack);
@@ -605,5 +599,5 @@
 		printf("%-8" PRIu64 " %-14s %10p %-8s %10p %-5" PRIu32 "\n",
 		    thread->tid, name, thread, thread_states[thread->state],
-		    thread->task, thread->task->context);
+		    thread->task, thread->task->container);
 #endif
 	
@@ -617,5 +611,5 @@
 		printf("%-8" PRIu64 " %-14s %18p %-8s %18p %-5" PRIu32 "\n",
 		    thread->tid, name, thread, thread_states[thread->state],
-		    thread->task, thread->task->context);
+		    thread->task, thread->task->container);
 #endif
 	
@@ -658,5 +652,5 @@
 	else
 		printf("[id    ] [name        ] [address ] [state ] [task    ]"
-		    " [ctx]\n");
+		    " [ctn]\n");
 #endif
 	
@@ -667,5 +661,5 @@
 	} else
 		printf("[id    ] [name        ] [address         ] [state ]"
-		    " [task            ] [ctx]\n");
+		    " [task            ] [ctn]\n");
 #endif