Index: kernel/generic/include/proc/task.h
===================================================================
--- kernel/generic/include/proc/task.h	(revision 9718692956e76525b421c8895899cd78e78063fd)
+++ kernel/generic/include/proc/task.h	(revision 326bf65ebff26a7eb2af6a434fcb5ee4b2a7e0a0)
@@ -78,6 +78,6 @@
 	/** Unique identity of task. */
 	task_id_t taskid;
-	/** Task security context. */
-	context_id_t context;
+	/** Task security container. */
+	container_id_t container;
 	
 	/** Number of references (i.e. threads). */
Index: kernel/generic/include/proc/thread.h
===================================================================
--- kernel/generic/include/proc/thread.h	(revision 9718692956e76525b421c8895899cd78e78063fd)
+++ kernel/generic/include/proc/thread.h	(revision 326bf65ebff26a7eb2af6a434fcb5ee4b2a7e0a0)
@@ -49,5 +49,4 @@
 #include <sysinfo/abi.h>
 
-#define THREAD_STACK_SIZE   STACK_SIZE
 #define THREAD_NAME_BUFLEN  20
 
Index: kernel/generic/include/proc/uarg.h
===================================================================
--- kernel/generic/include/proc/uarg.h	(revision 9718692956e76525b421c8895899cd78e78063fd)
+++ kernel/generic/include/proc/uarg.h	(revision 326bf65ebff26a7eb2af6a434fcb5ee4b2a7e0a0)
@@ -40,5 +40,5 @@
 	void *uspace_entry;
 	void *uspace_stack;
-
+	
 	void (* uspace_thread_function)();
 	void *uspace_thread_arg;