Index: src/libcfa/concurrency/CtxSwitch-x86_64.S
===================================================================
--- src/libcfa/concurrency/CtxSwitch-x86_64.S	(revision fda7e90df5931b51fb8f13534bdf735898b0c6b7)
+++ src/libcfa/concurrency/CtxSwitch-x86_64.S	(revision 58dd019a052f07152d413d2f67f0b5337b50f417)
@@ -79,6 +79,6 @@
 .text
 	.align 2
-.globl	coInvokeStub
-coInvokeStub:
+.globl	CtxInvokeStub
+CtxInvokeStub:
 	movq %rbx, %rdi 
 	jmp *%r12
Index: src/libcfa/concurrency/invoke.c
===================================================================
--- src/libcfa/concurrency/invoke.c	(revision fda7e90df5931b51fb8f13534bdf735898b0c6b7)
+++ src/libcfa/concurrency/invoke.c	(revision 58dd019a052f07152d413d2f67f0b5337b50f417)
@@ -15,5 +15,5 @@
 extern void __suspend__F___1(void);
 
-void invokeCoroutine(
+void CtxInvokeCoroutine(
       void (*main)(void *), 
       struct coroutine *(*get_coroutine)(void *), 
@@ -34,5 +34,5 @@
 
 
-void startCoroutine(
+void CtxStart(
       void (*main)(void *), 
       struct coroutine *(*get_coroutine)(void *), 
@@ -73,5 +73,5 @@
 
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->dummyReturn = NULL;
-      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->rturn = coInvokeStub;
+      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->rturn = CtxInvokeStub;
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[0] = this;
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[1] = invoke;
Index: src/libcfa/concurrency/invoke.h
===================================================================
--- src/libcfa/concurrency/invoke.h	(revision fda7e90df5931b51fb8f13534bdf735898b0c6b7)
+++ src/libcfa/concurrency/invoke.h	(revision 58dd019a052f07152d413d2f67f0b5337b50f417)
@@ -45,5 +45,5 @@
 
       // assembler routines that performs the context switch
-      extern void coInvokeStub( void );
+      extern void CtxInvokeStub( void );
       void CtxSwitch( void *from, void *to ) asm ("CtxSwitch");
 
Index: src/libcfa/concurrency/threads.c
===================================================================
--- src/libcfa/concurrency/threads.c	(revision fda7e90df5931b51fb8f13534bdf735898b0c6b7)
+++ src/libcfa/concurrency/threads.c	(revision 58dd019a052f07152d413d2f67f0b5337b50f417)
@@ -44,13 +44,13 @@
 }
 
-void ctxSwitchDirect(coroutine* src, coroutine* dst);
+void corCxtSw(coroutine* src, coroutine* dst);
 void create_stack( coStack_t* this, unsigned int storageSize );	// used by all constructors
 
 extern "C" {
       forall(dtype T | is_coroutine(T))
-      void invokeCoroutine(T* this);
+      void CtxInvokeCoroutine(T* this);
 
       forall(dtype T | is_coroutine(T))
-      void startCoroutine(T* this, void (*invoke)(T*));
+      void CtxStart(T* this, void (*invoke)(T*));
 }
 
@@ -100,5 +100,5 @@
 		src->name, src, src->last->name, src->last );
 
-	ctxSwitchDirect( src, src->last );
+	corCxtSw( src, src->last );
 }
 
@@ -108,7 +108,7 @@
 	coroutine* dst = get_coroutine(cor);
 
-	if( ((intptr_t)dst->stack.base) == 0 ) {
+	if( dst->stack.base == NULL ) {
 		create_stack(&dst->stack, dst->stack.size);
-		startCoroutine(cor, invokeCoroutine);
+		CtxStart(cor, CtxInvokeCoroutine);
 	}
 
@@ -120,5 +120,5 @@
 		dst->last = src;					// set last resumer
 	} // if
-	ctxSwitchDirect( src, dst );				// always done for performance testing
+	corCxtSw( src, dst );				// always done for performance testing
 }
 
@@ -132,5 +132,5 @@
 }
 
-void ctxSwitchDirect(coroutine* src, coroutine* dst) {
+void corCxtSw(coroutine* src, coroutine* dst) {
 	// THREAD_GETMEM( This )->disableInterrupts();