Index: libcfa/src/concurrency/clib/cfathread.cfa
===================================================================
--- libcfa/src/concurrency/clib/cfathread.cfa	(revision c457dc41e6b4b62b0efdae9921df595bf3a48d66)
+++ libcfa/src/concurrency/clib/cfathread.cfa	(revision 00da199562ec3c4b8d4fbd5ae8a205c18cb892ce)
@@ -23,5 +23,5 @@
 #include "cfathread.h"
 
-extern void ?{}(processor &, const char[], cluster &, $thread *);
+extern void ?{}(processor &, const char[], cluster &, thread$ *);
 extern "C" {
       extern void __cfactx_invoke_thread(void (*main)(void *), void * this);
@@ -34,5 +34,5 @@
 
 struct cfathread_object {
-	$thread self;
+	thread$ self;
 	void * (*themain)( void * );
 	void * arg;
@@ -42,5 +42,5 @@
 void ^?{}(cfathread_object & mutex this);
 
-static inline $thread * get_thread( cfathread_object & this ) { return &this.self; }
+static inline thread$ * get_thread( cfathread_object & this ) { return &this.self; }
 
 typedef ThreadCancelled(cfathread_object) cfathread_exception;
@@ -81,5 +81,5 @@
 // Special Init Thread responsible for the initialization or processors
 struct __cfainit {
-	$thread self;
+	thread$ self;
 	void (*init)( void * );
 	void * arg;
@@ -88,5 +88,5 @@
 void ^?{}(__cfainit & mutex this);
 
-static inline $thread * get_thread( __cfainit & this ) { return &this.self; }
+static inline thread$ * get_thread( __cfainit & this ) { return &this.self; }
 
 typedef ThreadCancelled(__cfainit) __cfainit_exception;
@@ -109,5 +109,5 @@
 
 	// Don't use __thrd_start! just prep the context manually
-	$thread * this_thrd = get_thread(this);
+	thread$ * this_thrd = get_thread(this);
 	void (*main_p)(__cfainit &) = main;