Index: kernel/generic/include/udebug/udebug.h
===================================================================
--- kernel/generic/include/udebug/udebug.h	(revision 5d9430d762d530aa94e39ab6112719fe7bf92628)
+++ kernel/generic/include/udebug/udebug.h	(revision 699743c692ce28263c43343a30256acf1dbeff20)
@@ -178,7 +178,7 @@
 	/** What type of event are we stopped in or 0 if none. */
 	udebug_event_t cur_event;
-	bool go;	   /**< thread is GO */
-	bool stoppable;	   /**< thread is stoppable */
-	bool debug_active; /**< thread is in a debugging session */
+	bool go;		/**< thread is GO */
+	bool stoppable;		/**< thread is stoppable */
+	bool active;		/**< thread is in a debugging session */
 } udebug_thread_t;
 
Index: kernel/generic/src/udebug/udebug.c
===================================================================
--- kernel/generic/src/udebug/udebug.c	(revision 5d9430d762d530aa94e39ab6112719fe7bf92628)
+++ kernel/generic/src/udebug/udebug.c	(revision 699743c692ce28263c43343a30256acf1dbeff20)
@@ -73,5 +73,5 @@
 	ut->go = false;
 	ut->stoppable = true;
-	ut->debug_active = false;
+	ut->active = false;
 	ut->cur_event = 0; /* none */
 }
@@ -113,5 +113,5 @@
 
 	mutex_lock(&THREAD->udebug.lock);
-	res = THREAD->udebug.debug_active;
+	res = THREAD->udebug.active;
 	mutex_unlock(&THREAD->udebug.lock);
 
@@ -171,5 +171,5 @@
 		 */
 
-		if (THREAD->udebug.debug_active == true &&
+		if (THREAD->udebug.active == true &&
 		    THREAD->udebug.go == false) {
 			/*
@@ -211,6 +211,5 @@
 	mutex_lock(&THREAD->udebug.lock);
 
-	if (THREAD->udebug.debug_active &&
-	    THREAD->udebug.go == false) {
+	if (THREAD->udebug.active && THREAD->udebug.go == false) {
 		TASK->udebug.begin_call = NULL;
 		mutex_unlock(&THREAD->udebug.lock);
@@ -265,6 +264,5 @@
 
 	/* Must only generate events when in debugging session and is go. */
-	if (THREAD->udebug.debug_active != true ||
-	    THREAD->udebug.go == false ||
+	if (THREAD->udebug.active != true || THREAD->udebug.go == false ||
 	    (TASK->udebug.evmask & UDEBUG_EVMASK(etype)) == 0) {
 		mutex_unlock(&THREAD->udebug.lock);
@@ -335,7 +333,7 @@
 
 	/* Must only generate events when in debugging session */
-	if (THREAD->udebug.debug_active != true) {
-		LOG("- debug_active: %s, udebug.go: %s\n",
-			THREAD->udebug.debug_active ? "yes(+)" : "no(-)",
+	if (THREAD->udebug.active != true) {
+		LOG("- udebug.active: %s, udebug.go: %s\n",
+			THREAD->udebug.active ? "yes(+)" : "no(-)",
 			THREAD->udebug.go ? "yes(-)" : "no(+)");
 		mutex_unlock(&THREAD->udebug.lock);
@@ -385,7 +383,7 @@
 
 	/* Must only generate events when in debugging session. */
-	if (THREAD->udebug.debug_active != true) {
-/*		printf("- debug_active: %s, udebug.go: %s\n",
-			THREAD->udebug.debug_active ? "yes(+)" : "no(-)",
+	if (THREAD->udebug.active != true) {
+/*		printf("- udebug.active: %s, udebug.go: %s\n",
+			THREAD->udebug.active ? "yes(+)" : "no(-)",
 			THREAD->udebug.go ? "yes(-)" : "no(+)");*/
 		mutex_unlock(&THREAD->udebug.lock);
@@ -402,5 +400,5 @@
 
 	/* Prevent any further debug activity in thread. */
-	THREAD->udebug.debug_active = false;
+	THREAD->udebug.active = false;
 	THREAD->udebug.cur_event = 0;		/* none */
 	THREAD->udebug.go = false;	/* set to initial value */
@@ -460,5 +458,5 @@
 		if ((flags & THREAD_FLAG_USPACE) != 0) {
 			/* Prevent any further debug activity in thread. */
-			t->udebug.debug_active = false;
+			t->udebug.active = false;
 			t->udebug.cur_event = 0;	/* none */
 
@@ -466,5 +464,5 @@
 			if (t->udebug.go == true) {
 				/*
-				* Yes, so clear go. As debug_active == false,
+				* Yes, so clear go. As active == false,
 				 * this doesn't affect anything.
 				 */
Index: kernel/generic/src/udebug/udebug_ops.c
===================================================================
--- kernel/generic/src/udebug/udebug_ops.c	(revision 5d9430d762d530aa94e39ab6112719fe7bf92628)
+++ kernel/generic/src/udebug/udebug_ops.c	(revision 699743c692ce28263c43343a30256acf1dbeff20)
@@ -59,5 +59,5 @@
  * and belongs to the current task (TASK). Verifies, that the thread
  * is (or is not) go according to being_go (typically false).
- * It also locks t->udebug.lock, making sure that t->udebug.debug_active
+ * It also locks t->udebug.lock, making sure that t->udebug.active
  * is true - that the thread is in a valid debugging session.
  *
@@ -109,5 +109,5 @@
 
 	/* Verify debugging state. */
-	if (t->udebug.debug_active != true) {
+	if (t->udebug.active != true) {
 		/* Not in debugging session or undesired GO state */
 		spinlock_unlock(&t->lock);
@@ -118,6 +118,6 @@
 
 	/*
-	 * Since the thread has debug_active == true, TASK->udebug.lock
-	 * is enough to ensure its existence and that debug_active remains
+	 * Since the thread has active == true, TASK->udebug.lock
+	 * is enough to ensure its existence and that active remains
 	 * true.
 	 */
@@ -205,5 +205,5 @@
 	}
 	
-	/* Set udebug.debug_active on all of the task's userspace threads. */
+	/* Set udebug.active on all of the task's userspace threads. */
 
 	for (cur = TASK->th_head.next; cur != &TASK->th_head; cur = cur->next) {
@@ -212,5 +212,5 @@
 		mutex_lock(&t->udebug.lock);
 		if ((t->flags & THREAD_FLAG_USPACE) != 0)
-			t->udebug.debug_active = true;
+			t->udebug.active = true;
 		mutex_unlock(&t->udebug.lock);
 	}