Index: src/libcfa/concurrency/thread
===================================================================
--- src/libcfa/concurrency/thread	(revision c3acb841f4d192142b1ebb1e1c00c6cf23e0a7c7)
+++ src/libcfa/concurrency/thread	(revision 68fe077a5764a46debddf5a5dc89ef3614748ccd)
@@ -29,8 +29,8 @@
 trait is_thread(dtype T) {
       void main(T* this);
-      thread* get_thread(T* this);
+      thread_desc* get_thread(T* this);
 };
 
-#define DECL_THREAD(X) thread* get_thread(X* this) { return &this->t; } void main(X* this)
+#define DECL_THREAD(X) thread_desc* get_thread(X* this) { return &this->t; } void main(X* this)
 
 forall( dtype T | is_thread(T) )
@@ -39,14 +39,14 @@
 }
 
-static inline coroutine_desc* get_coroutine(thread* this) {
+static inline coroutine_desc* get_coroutine(thread_desc* this) {
 	return &this->c;
 }
 
-thread * this_thread(void);
+thread_desc * this_thread(void);
 
 //-----------------------------------------------------------------------------
 // Ctors and dtors
-void ?{}(thread* this);
-void ^?{}(thread* this);
+void ?{}(thread_desc* this);
+void ^?{}(thread_desc* this);
 
 //-----------------------------------------------------------------------------