Index: src/libcfa/concurrency/coroutine
===================================================================
--- src/libcfa/concurrency/coroutine	(revision 75a17f10fc7c34b407256654caaa8d663af91674)
+++ src/libcfa/concurrency/coroutine	(revision 84c52a8bfe9692c48d8a2e8ec4ebafbccff7ba79)
@@ -27,16 +27,16 @@
 trait is_coroutine(dtype T) {
       void main(T * this);
-      coroutine * get_coroutine(T * this);
+      coroutine_desc * get_coroutine(T * this);
 };
 
-#define DECL_COROUTINE(X) static inline coroutine* get_coroutine(X* this) { return &this->c; } void main(X* this)
+#define DECL_COROUTINE(X) static inline coroutine_desc* get_coroutine(X* this) { return &this->c; } void main(X* this)
 
 //-----------------------------------------------------------------------------
 // Ctors and dtors
 void ?{}(coStack_t * this);
-void ?{}(coroutine * this);
-void ?{}(coroutine * this, const char * name);
+void ?{}(coroutine_desc * this);
+void ?{}(coroutine_desc * this, const char * name);
 void ^?{}(coStack_t * this);
-void ^?{}(coroutine * this);
+void ^?{}(coroutine_desc * this);
 
 //-----------------------------------------------------------------------------
@@ -63,13 +63,13 @@
 
 // Get current coroutine
-coroutine * this_coroutine(void);
+coroutine_desc * this_coroutine(void);
 
 // Private wrappers for context switch and stack creation
-extern void CoroutineCtxSwitch(coroutine * src, coroutine * dst);
+extern void CoroutineCtxSwitch(coroutine_desc * src, coroutine_desc * dst);
 extern void create_stack( coStack_t * this, unsigned int storageSize );
 
 // Suspend implementation inlined for performance
 static inline void suspend() {
-      coroutine * src = this_coroutine();		// optimization
+      coroutine_desc * src = this_coroutine();		// optimization
 
 	assertf( src->last != 0,
@@ -88,6 +88,6 @@
 forall(dtype T | is_coroutine(T))
 static inline void resume(T * cor) {
-	coroutine * src = this_coroutine();		// optimization
-	coroutine * dst = get_coroutine(cor);
+	coroutine_desc * src = this_coroutine();		// optimization
+	coroutine_desc * dst = get_coroutine(cor);
 
       if( unlikely(!dst->stack.base) ) {
@@ -111,6 +111,6 @@
 }
 
-static inline void resume(coroutine * dst) {
-	coroutine * src = this_coroutine();		// optimization
+static inline void resume(coroutine_desc * dst) {
+	coroutine_desc * src = this_coroutine();		// optimization
 
       // not resuming self ?