Index: kernel/generic/include/arch.h
===================================================================
--- kernel/generic/include/arch.h	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/include/arch.h	(revision 2e4343bb577304bd2bb9c0c4825438035b24ac6f)
@@ -40,10 +40,8 @@
 
 /*
- * THE is not an abbreviation, but the English definite article written in
- * capital letters. It means the current pointer to something, e.g. thread,
- * processor or address space. Kind reader of this comment shall appreciate
- * the wit of constructs like THE->thread and similar.
+ * The current_t structure holds pointers to various parts of the current
+ * execution state, like running task, thread, address space, etc.
  */
-#define THE  ((the_t * )(get_stack_base()))
+#define CURRENT  ((current_t * )(get_stack_base()))
 
 #define MAGIC                UINT32_C(0xfacefeed)
@@ -53,5 +51,5 @@
 #define DEFAULT_CONTAINER  0
 #define CONTAINER \
-	((THE->task) ? (THE->task->container) : (DEFAULT_CONTAINER))
+	((CURRENT->task) ? (CURRENT->task->container) : (DEFAULT_CONTAINER))
 
 /* Fwd decl. to avoid include hell. */
@@ -76,5 +74,5 @@
 	struct as *as;         /**< Current address space. */
 	uint32_t magic;        /**< Magic value */
-} the_t;
+} current_t;
 
 typedef struct {
@@ -96,6 +94,6 @@
 #define ARCH_OP(op)	ARCH_STRUCT_OP(arch_ops, op)
 
-extern void the_initialize(the_t *);
-extern void the_copy(the_t *, the_t *);
+extern void current_initialize(current_t *);
+extern void current_copy(current_t *, current_t *);
 
 extern void calibrate_delay_loop(void);
Index: kernel/generic/include/cpu.h
===================================================================
--- kernel/generic/include/cpu.h	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/include/cpu.h	(revision 2e4343bb577304bd2bb9c0c4825438035b24ac6f)
@@ -45,5 +45,5 @@
 #include <arch.h>
 
-#define CPU                  THE->cpu
+#define CPU                  CURRENT->cpu
 
 /** CPU structure.
Index: kernel/generic/include/mm/as.h
===================================================================
--- kernel/generic/include/mm/as.h	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/include/mm/as.h	(revision 2e4343bb577304bd2bb9c0c4825438035b24ac6f)
@@ -50,5 +50,5 @@
 #include <lib/refcount.h>
 
-#define AS                   THE->as
+#define AS                   CURRENT->as
 
 /**
Index: kernel/generic/include/preemption.h
===================================================================
--- kernel/generic/include/preemption.h	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/include/preemption.h	(revision 2e4343bb577304bd2bb9c0c4825438035b24ac6f)
@@ -41,5 +41,5 @@
 
 #define PREEMPTION_INC         (1 << 0)
-#define PREEMPTION_DISABLED    (PREEMPTION_INC <= THE->preemption)
+#define PREEMPTION_DISABLED    (PREEMPTION_INC <= CURRENT->preemption)
 #define PREEMPTION_ENABLED     (!PREEMPTION_DISABLED)
 
@@ -47,5 +47,5 @@
 #define preemption_disable() \
 	do { \
-		THE->preemption += PREEMPTION_INC; \
+		CURRENT->preemption += PREEMPTION_INC; \
 		compiler_barrier(); \
 	} while (0)
@@ -56,5 +56,5 @@
 		assert(PREEMPTION_DISABLED); \
 		compiler_barrier(); \
-		THE->preemption -= PREEMPTION_INC; \
+		CURRENT->preemption -= PREEMPTION_INC; \
 	} while (0)
 
Index: kernel/generic/include/proc/task.h
===================================================================
--- kernel/generic/include/proc/task.h	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/include/proc/task.h	(revision 2e4343bb577304bd2bb9c0c4825438035b24ac6f)
@@ -63,5 +63,5 @@
 #include <cap/cap.h>
 
-#define TASK                 THE->task
+#define TASK                 CURRENT->task
 
 struct thread;
Index: kernel/generic/include/proc/thread.h
===================================================================
--- kernel/generic/include/proc/thread.h	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/include/proc/thread.h	(revision 2e4343bb577304bd2bb9c0c4825438035b24ac6f)
@@ -52,5 +52,5 @@
 #include <arch.h>
 
-#define THREAD              THE->thread
+#define THREAD              CURRENT->thread
 
 #define THREAD_NAME_BUFLEN  20
Index: kernel/generic/include/synch/rcu.h
===================================================================
--- kernel/generic/include/synch/rcu.h	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/include/synch/rcu.h	(revision 2e4343bb577304bd2bb9c0c4825438035b24ac6f)
@@ -132,5 +132,5 @@
 static inline void rcu_read_lock(void)
 {
-	THE->rcu_nesting += RCU_CNT_INC;
+	CURRENT->rcu_nesting += RCU_CNT_INC;
 	compiler_barrier();
 }
@@ -140,7 +140,7 @@
 {
 	compiler_barrier();
-	THE->rcu_nesting -= RCU_CNT_INC;
-
-	if (RCU_WAS_PREEMPTED == THE->rcu_nesting) {
+	CURRENT->rcu_nesting -= RCU_CNT_INC;
+
+	if (RCU_WAS_PREEMPTED == CURRENT->rcu_nesting) {
 		_rcu_preempted_unlock();
 	}
Index: kernel/generic/include/time/timeout.h
===================================================================
--- kernel/generic/include/time/timeout.h	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/include/time/timeout.h	(revision 2e4343bb577304bd2bb9c0c4825438035b24ac6f)
@@ -45,5 +45,5 @@
 	IRQ_SPINLOCK_DECLARE(lock);
 
-	/** Link to the list of active timeouts on THE->cpu */
+	/** Link to the list of active timeouts on CURRENT->cpu */
 	link_t link;
 	/** Timeout will be activated in this amount of clock() ticks. */