Index: libcfa/src/concurrency/exception.cfa
===================================================================
--- libcfa/src/concurrency/exception.cfa	(revision be73f30f9fc916c25e69cf8448092b2fe7d7d2b8)
+++ libcfa/src/concurrency/exception.cfa	(revision c9f9d4fa0f8c21b313d7d200fe5978130a462a5e)
@@ -20,5 +20,5 @@
 #include "coroutine.hfa"
 
-extern struct $thread * mainThread;
+extern struct thread$ * mainThread;
 extern "C" {
 extern void __cfactx_thrd_leave();
@@ -55,6 +55,6 @@
 
 STOP_AT_END_FUNCTION(coroutine_cancelstop,
-	struct $coroutine * src = ($coroutine *)stop_param;
-	struct $coroutine * dst = src->last;
+	struct coroutine$ * src = (coroutine$ *)stop_param;
+	struct coroutine$ * dst = src->last;
 
 	$ctx_switch( src, dst );
@@ -72,7 +72,7 @@
 	void * stop_param;
 
-	struct $thread * this_thread = active_thread();
+	struct thread$ * this_thread = active_thread();
 	if ( &this_thread->self_cor != this_thread->curr_cor ) {
-		struct $coroutine * cor = this_thread->curr_cor;
+		struct coroutine$ * cor = this_thread->curr_cor;
 		cor->cancellation = unwind_exception;