Index: src/libcfa/concurrency/monitor
===================================================================
--- src/libcfa/concurrency/monitor	(revision 2781e65c359cf1977f2538da573898134135ea2b)
+++ src/libcfa/concurrency/monitor	(revision 84c52a8bfe9692c48d8a2e8ec4ebafbccff7ba79)
@@ -22,5 +22,5 @@
 #include "stdlib"
 
-struct __monitor_t {
+struct monitor_desc {
 	spinlock lock;
 	thread * owner;
@@ -29,5 +29,5 @@
 };
 
-static inline void ?{}(__monitor_t * this) {
+static inline void ?{}(monitor_desc * this) {
 	this->owner = 0;
 	this->recursion = 0;
@@ -35,21 +35,21 @@
 
 //Basic entering routine
-void enter(__monitor_t *);
-void leave(__monitor_t *);
+void enter(monitor_desc *);
+void leave(monitor_desc *);
 
 //Array entering routine
-void enter(__monitor_t **, int count);
-void leave(__monitor_t **, int count);
+void enter(monitor_desc **, int count);
+void leave(monitor_desc **, int count);
 
 struct monitor_guard_t {
-	__monitor_t ** m;
+	monitor_desc ** m;
 	int count;
 };
 
-static inline int ?<?(__monitor_t* lhs, __monitor_t* rhs) {
+static inline int ?<?(monitor_desc* lhs, monitor_desc* rhs) {
 	return ((intptr_t)lhs) < ((intptr_t)rhs);
 }
 
-static inline void ?{}( monitor_guard_t * this, __monitor_t ** m ) {
+static inline void ?{}( monitor_guard_t * this, monitor_desc ** m ) {
 	this->m = m;
 	this->count = 1;
@@ -57,5 +57,5 @@
 }
 
-static inline void ?{}( monitor_guard_t * this, __monitor_t ** m, int count ) {
+static inline void ?{}( monitor_guard_t * this, monitor_desc ** m, int count ) {
 	this->m = m;
 	this->count = count;