Index: src/tests/monitor.c
===================================================================
--- src/tests/monitor.c	(revision c3acb841f4d192142b1ebb1e1c00c6cf23e0a7c7)
+++ src/tests/monitor.c	(revision 84c52a8bfe9692c48d8a2e8ec4ebafbccff7ba79)
@@ -6,5 +6,5 @@
 struct global_t {
 	int value;
-	__monitor_t m;
+	monitor_desc m;
 };
 
@@ -16,5 +16,5 @@
 
 void increment( /*mutex*/ global_t * this ) {
-	__monitor_t * mon = &this->m;
+	monitor_desc * mon = &this->m;
 	monitor_guard_t g1 = { &mon };
 	{
Index: src/tests/multi-monitor.c
===================================================================
--- src/tests/multi-monitor.c	(revision c3acb841f4d192142b1ebb1e1c00c6cf23e0a7c7)
+++ src/tests/multi-monitor.c	(revision 84c52a8bfe9692c48d8a2e8ec4ebafbccff7ba79)
@@ -6,8 +6,8 @@
 static int global12, global23, global13;
 
-static __monitor_t m1, m2, m3;
+static monitor_desc m1, m2, m3;
 
-void increment( /*mutex*/ __monitor_t * p1, /*mutex*/ __monitor_t * p2, int * value ) {
-	__monitor_t * mons[] = { p1, p2 };
+void increment( /*mutex*/ monitor_desc * p1, /*mutex*/ monitor_desc * p2, int * value ) {
+	monitor_desc * mons[] = { p1, p2 };
 	monitor_guard_t g = { mons, 2 };
 	*value += 1;