Index: kernel/generic/include/udebug/udebug.h
===================================================================
--- kernel/generic/include/udebug/udebug.h	(revision 1378b2bc1021b18bb8b0e27b71625f9a4bd5182c)
+++ kernel/generic/include/udebug/udebug.h	(revision 384c4886e4ae3a6c323a34e23d7f8a36553a0910)
@@ -185,8 +185,8 @@
 
 	/** What type of event are we stopped in or 0 if none. */
-	udebug_event_t cur_event;	
-	bool stop;
-	bool stoppable;
-	bool debug_active; /**< in a debugging session */
+	udebug_event_t cur_event;
+	bool go;	   /**< thread is GO */
+	bool stoppable;	   /**< thread is stoppable */
+	bool debug_active; /**< thread is in a debugging session */
 } udebug_thread_t;
 
Index: kernel/generic/src/udebug/udebug.c
===================================================================
--- kernel/generic/src/udebug/udebug.c	(revision 1378b2bc1021b18bb8b0e27b71625f9a4bd5182c)
+++ kernel/generic/src/udebug/udebug.c	(revision 384c4886e4ae3a6c323a34e23d7f8a36553a0910)
@@ -96,5 +96,5 @@
 
 	ut->go_call = NULL;
-	ut->stop = true;
+	ut->go = false;
 	ut->stoppable = true;
 	ut->debug_active = false;
@@ -199,5 +199,6 @@
 		 */
 
-		if (THREAD->udebug.debug_active && THREAD->udebug.stop) {
+		if (THREAD->udebug.debug_active == true &&
+		    THREAD->udebug.go == false) {
 			/*
 			 * Thread was requested to stop - answer go call
@@ -240,5 +241,5 @@
 
 	if (THREAD->udebug.debug_active &&
-	    THREAD->udebug.stop == true) {
+	    THREAD->udebug.go == false) {
 		TASK->udebug.begin_call = NULL;
 		mutex_unlock(&THREAD->udebug.lock);
@@ -324,5 +325,5 @@
 	/* Must only generate events when in debugging session and is go. */
 	if (THREAD->udebug.debug_active != true ||
-	    THREAD->udebug.stop == true ||
+	    THREAD->udebug.go == false ||
 	    (TASK->udebug.evmask & UDEBUG_EVMASK(etype)) == 0) {
 		mutex_unlock(&THREAD->udebug.lock);
@@ -349,9 +350,9 @@
 
 	/*
-	 * Make sure udebug.stop is true when going to sleep
+	 * Make sure udebug.go is false when going to sleep
 	 * in case we get woken up by DEBUG_END. (At which
 	 * point it must be back to the initial true value).
 	 */
-	THREAD->udebug.stop = true;
+	THREAD->udebug.go = false;
 	THREAD->udebug.cur_event = etype;
 
@@ -388,7 +389,7 @@
 	/* Must only generate events when in debugging session */
 	if (THREAD->udebug.debug_active != true) {
-		LOG("- debug_active: %s, udebug.stop: %s\n",
+		LOG("- debug_active: %s, udebug.go: %s\n",
 			THREAD->udebug.debug_active ? "yes(+)" : "no(-)",
-			THREAD->udebug.stop ? "yes(-)" : "no(+)");
+			THREAD->udebug.go ? "yes(-)" : "no(+)");
 		mutex_unlock(&THREAD->udebug.lock);
 		mutex_unlock(&TASK->udebug.lock);
@@ -405,9 +406,9 @@
 
 	/*
-	 * Make sure udebug.stop is true when going to sleep
+	 * Make sure udebug.go is false when going to sleep
 	 * in case we get woken up by DEBUG_END. (At which
 	 * point it must be back to the initial true value).
 	 */
-	THREAD->udebug.stop = true;
+	THREAD->udebug.go = false;
 	THREAD->udebug.cur_event = UDEBUG_EVENT_THREAD_B;
 
@@ -442,7 +443,7 @@
 	/* Must only generate events when in debugging session. */
 	if (THREAD->udebug.debug_active != true) {
-/*		printf("- debug_active: %s, udebug.stop: %s\n",
+/*		printf("- debug_active: %s, udebug.go: %s\n",
 			THREAD->udebug.debug_active ? "yes(+)" : "no(-)",
-			THREAD->udebug.stop ? "yes(-)" : "no(+)");*/
+			THREAD->udebug.go ? "yes(-)" : "no(+)");*/
 		mutex_unlock(&THREAD->udebug.lock);
 		mutex_unlock(&TASK->udebug.lock);
@@ -460,5 +461,5 @@
 	THREAD->udebug.debug_active = false;
 	THREAD->udebug.cur_event = 0;		/* none */
-	THREAD->udebug.stop = true;	/* set to initial value */
+	THREAD->udebug.go = false;	/* set to initial value */
 
 	ipc_answer(&TASK->answerbox, call);
@@ -520,10 +521,10 @@
 
 			/* Is the thread still go? */
-			if (t->udebug.stop == false) {
+			if (t->udebug.go == true) {
 				/*
 				* Yes, so clear go. As debug_active == false,
 				 * this doesn't affect anything.
 				 */
-				t->udebug.stop = true;	
+				t->udebug.go = false;	
 
 				/* Answer GO call */
Index: kernel/generic/src/udebug/udebug_ops.c
===================================================================
--- kernel/generic/src/udebug/udebug_ops.c	(revision 1378b2bc1021b18bb8b0e27b71625f9a4bd5182c)
+++ kernel/generic/src/udebug/udebug_ops.c	(revision 384c4886e4ae3a6c323a34e23d7f8a36553a0910)
@@ -143,5 +143,5 @@
 	mutex_unlock(&TASK->udebug.lock);
 
-	if (!t->udebug.stop != being_go) {
+	if (t->udebug.go != being_go) {
 		/* Not in debugging session or undesired GO state. */
 		mutex_unlock(&t->udebug.lock);
@@ -292,5 +292,5 @@
 
 	t->udebug.go_call = call;
-	t->udebug.stop = false;
+	t->udebug.go = true;
 	t->udebug.cur_event = 0;	/* none */
 
@@ -330,7 +330,7 @@
 
 	/* Take GO away from the thread. */
-	t->udebug.stop = true;
-
-	if (!t->udebug.stoppable) {
+	t->udebug.go = false;
+
+	if (t->udebug.stoppable != true) {
 		/* Answer will be sent when the thread becomes stoppable. */
 		_thread_op_end(t);