Index: src/tests/monitor.c
===================================================================
--- src/tests/monitor.c	(revision 578b637758f8bf4a583b6757ee3bec0c6bf462c0)
+++ src/tests/monitor.c	(revision bcda04c57444ccd998e9f7511b75c66e90f0301a)
@@ -4,15 +4,10 @@
 #include <thread>
 
-struct global_t {
+monitor global_t {
 	int value;
-	monitor_desc m;
 };
 
 void ?{}(global_t * this) {
 	this->value = 0;
-}
-
-monitor_desc * get_monitor( global_t * this ) {
-	return &this->m;
 }
 
@@ -45,5 +40,5 @@
 
 int main(int argc, char* argv[]) {
-	assert( global.m.entry_queue.tail != NULL );
+	assert( global.__mon.entry_queue.tail != NULL );
 	processor p;
 	{
Index: src/tests/multi-monitor.c
===================================================================
--- src/tests/multi-monitor.c	(revision 578b637758f8bf4a583b6757ee3bec0c6bf462c0)
+++ src/tests/multi-monitor.c	(revision bcda04c57444ccd998e9f7511b75c66e90f0301a)
@@ -6,11 +6,5 @@
 static int global12, global23, global13;
 
-struct monitor_t {
-	monitor_desc m;
-};
-
-monitor_desc * get_monitor( monitor_t * this ) {
-	return &this->m;
-}
+monitor monitor_t {};
 
 static monitor_t m1, m2, m3;