Index: libcfa/src/concurrency/coroutine.cfa
===================================================================
--- libcfa/src/concurrency/coroutine.cfa	(revision 43784ac7ca1579ca19d7dc8bc4e1423986fd4d97)
+++ libcfa/src/concurrency/coroutine.cfa	(revision 1b97976c642f3a6d89db6c57bbf763b7b73bd784)
@@ -37,5 +37,5 @@
 
 extern "C" {
-	void _CtxCoroutine_Unwind(struct _Unwind_Exception * storage, struct $coroutine *) __attribute__ ((__noreturn__));
+	void _CtxCoroutine_Unwind(struct _Unwind_Exception * storage, struct coroutine$ *) __attribute__ ((__noreturn__));
 	static void _CtxCoroutine_UnwindCleanup(_Unwind_Reason_Code, struct _Unwind_Exception *) __attribute__ ((__noreturn__));
 	static void _CtxCoroutine_UnwindCleanup(_Unwind_Reason_Code, struct _Unwind_Exception *) {
@@ -62,5 +62,5 @@
 forall(T & | is_coroutine(T))
 void __cfaehm_cancelled_coroutine(
-		T & cor, $coroutine * desc, EHM_DEFAULT_VTABLE(CoroutineCancelled, (T)) ) {
+		T & cor, coroutine$ * desc, EHM_DEFAULT_VTABLE(CoroutineCancelled, (T)) ) {
 	verify( desc->cancellation );
 	desc->state = Cancelled;
@@ -114,5 +114,5 @@
 }
 
-void ?{}( $coroutine & this, const char name[], void * storage, size_t storageSize ) with( this ) {
+void ?{}( coroutine$ & this, const char name[], void * storage, size_t storageSize ) with( this ) {
 	(this.context){0p, 0p};
 	(this.stack){storage, storageSize};
@@ -124,8 +124,8 @@
 }
 
-void ^?{}($coroutine& this) {
+void ^?{}(coroutine$& this) {
 	if(this.state != Halted && this.state != Start && this.state != Primed) {
-		$coroutine * src = active_coroutine();
-		$coroutine * dst = &this;
+		coroutine$ * src = active_coroutine();
+		coroutine$ * dst = &this;
 
 		struct _Unwind_Exception storage;
@@ -148,5 +148,5 @@
 forall(T & | is_coroutine(T) | { EHM_DEFAULT_VTABLE(CoroutineCancelled, (T)); })
 void prime(T& cor) {
-	$coroutine* this = get_coroutine(cor);
+	coroutine$* this = get_coroutine(cor);
 	assert(this->state == Start);
 
@@ -248,6 +248,6 @@
 // is not inline (We can't inline Cforall in C)
 extern "C" {
-	void __cfactx_cor_leave( struct $coroutine * src ) {
-		$coroutine * starter = src->cancellation != 0 ? src->last : src->starter;
+	void __cfactx_cor_leave( struct coroutine$ * src ) {
+		coroutine$ * starter = src->cancellation != 0 ? src->last : src->starter;
 
 		src->state = Halted;
@@ -265,9 +265,9 @@
 	}
 
-	struct $coroutine * __cfactx_cor_finish(void) {
-		struct $coroutine * cor = active_coroutine();
+	struct coroutine$ * __cfactx_cor_finish(void) {
+		struct coroutine$ * cor = active_coroutine();
 
 		// get the active thread once
-		$thread * athrd = active_thread();
+		thread$ * athrd = active_thread();
 
 		/* paranoid */ verify( athrd->corctx_flag );