Index: libcfa/src/concurrency/io/call.cfa.in
===================================================================
--- libcfa/src/concurrency/io/call.cfa.in	(revision c4c8571a1aaa3100966db2d603b3a32857faebdd)
+++ libcfa/src/concurrency/io/call.cfa.in	(revision 8bee858990b2b51491609072db909e1fd09e5127)
@@ -75,6 +75,6 @@
 	;
 
-	extern struct $io_context * cfa_io_allocate(struct io_uring_sqe * out_sqes[], __u32 out_idxs[], __u32 want)  __attribute__((nonnull (1,2)));
-	extern void cfa_io_submit( struct $io_context * in_ctx, __u32 in_idxs[], __u32 have, bool lazy ) __attribute__((nonnull (1,2)));
+	extern struct io_context$ * cfa_io_allocate(struct io_uring_sqe * out_sqes[], __u32 out_idxs[], __u32 want)  __attribute__((nonnull (1,2)));
+	extern void cfa_io_submit( struct io_context$ * in_ctx, __u32 in_idxs[], __u32 have, bool lazy ) __attribute__((nonnull (1,2)));
 #endif
 
@@ -200,5 +200,5 @@
 		__u32 idx;
 		struct io_uring_sqe * sqe;
-		struct $io_context * ctx = cfa_io_allocate( &sqe, &idx, 1 );
+		struct io_context$ * ctx = cfa_io_allocate( &sqe, &idx, 1 );
 
 		sqe->opcode = IORING_OP_{op};
Index: libcfa/src/concurrency/io/setup.cfa
===================================================================
--- libcfa/src/concurrency/io/setup.cfa	(revision c4c8571a1aaa3100966db2d603b3a32857faebdd)
+++ libcfa/src/concurrency/io/setup.cfa	(revision 8bee858990b2b51491609072db909e1fd09e5127)
@@ -28,6 +28,6 @@
 	void ?{}(io_context_params & this) libcfa_public {}
 
-	void  ?{}($io_context & this, struct cluster & cl) {}
-	void ^?{}($io_context & this) {}
+	void  ?{}(io_context$ & this, struct cluster & cl) {}
+	void ^?{}(io_context$ & this) {}
 
 	void __cfa_io_start( processor * proc ) {}
@@ -37,6 +37,6 @@
 	void __cfa_io_stop ( processor * proc ) {}
 
-	$io_arbiter * create(void) { return 0p; }
-	void destroy($io_arbiter *) {}
+	io_arbiter$ * create(void) { return 0p; }
+	void destroy(io_arbiter$ *) {}
 
 #else
@@ -105,12 +105,12 @@
 
 
-	static void __io_uring_setup ( $io_context & this, const io_context_params & params_in, int procfd );
-	static void __io_uring_teardown( $io_context & this );
-	static void __epoll_register($io_context & ctx);
-	static void __epoll_unregister($io_context & ctx);
-	void __ioarbiter_register( $io_arbiter & mutex, $io_context & ctx );
-	void __ioarbiter_unregister( $io_arbiter & mutex, $io_context & ctx );
-
-	void ?{}($io_context & this, processor * proc, struct cluster & cl) {
+	static void __io_uring_setup ( io_context$ & this, const io_context_params & params_in, int procfd );
+	static void __io_uring_teardown( io_context$ & this );
+	static void __epoll_register(io_context$ & ctx);
+	static void __epoll_unregister(io_context$ & ctx);
+	void __ioarbiter_register( io_arbiter$ & mutex, io_context$ & ctx );
+	void __ioarbiter_unregister( io_arbiter$ & mutex, io_context$ & ctx );
+
+	void ?{}(io_context$ & this, processor * proc, struct cluster & cl) {
 		/* paranoid */ verify( cl.io.arbiter );
 		this.proc = proc;
@@ -122,5 +122,5 @@
 	}
 
-	void ^?{}($io_context & this) {
+	void ^?{}(io_context$ & this) {
 		__cfadbg_print_safe(io_core, "Kernel I/O : tearing down io_context %u\n", this.fd);
 
@@ -129,5 +129,5 @@
 	}
 
-	static void __io_uring_setup( $io_context & this, const io_context_params & params_in, int procfd ) {
+	static void __io_uring_setup( io_context$ & this, const io_context_params & params_in, int procfd ) {
 		// Step 1 : call to setup
 		struct io_uring_params params;
@@ -270,5 +270,5 @@
 	}
 
-	static void __io_uring_teardown( $io_context & this ) {
+	static void __io_uring_teardown( io_context$ & this ) {
 		// Shutdown the io rings
 		struct __sub_ring_t & sq = this.sq;
@@ -313,5 +313,5 @@
 // I/O Context Sleep
 //=============================================================================================
-	// static inline void __epoll_ctl($io_context & ctx, int op, const char * error) {
+	// static inline void __epoll_ctl(io_context$ & ctx, int op, const char * error) {
 	// 	struct epoll_event ev;
 	// 	ev.events = EPOLLIN | EPOLLONESHOT;
@@ -323,9 +323,9 @@
 	// }
 
-	// static void __epoll_register($io_context & ctx) {
+	// static void __epoll_register(io_context$ & ctx) {
 	// 	__epoll_ctl(ctx, EPOLL_CTL_ADD, "ADD");
 	// }
 
-	// static void __epoll_unregister($io_context & ctx) {
+	// static void __epoll_unregister(io_context$ & ctx) {
 	// 	// Read the current epoch so we know when to stop
 	// 	size_t curr = __atomic_load_n(&iopoll.epoch, __ATOMIC_SEQ_CST);
@@ -346,5 +346,5 @@
 	// }
 
-	// void __ioctx_prepare_block($io_context & ctx) {
+	// void __ioctx_prepare_block(io_context$ & ctx) {
 	// 	__cfadbg_print_safe(io_core, "Kernel I/O - epoll : Re-arming io poller %d (%p)\n", ctx.fd, &ctx);
 	// 	__epoll_ctl(ctx, EPOLL_CTL_MOD, "REARM");
@@ -355,14 +355,14 @@
 // I/O Context Misc Setup
 //=============================================================================================
-	void ?{}( $io_arbiter & this ) {
+	void ?{}( io_arbiter$ & this ) {
 		this.pending.empty = true;
 	}
 
-	void ^?{}( $io_arbiter & mutex this ) {}
-
-	$io_arbiter * create(void) {
+	void ^?{}( io_arbiter$ & mutex this ) {}
+
+	io_arbiter$ * create(void) {
 		return new();
 	}
-	void destroy($io_arbiter * arbiter) {
+	void destroy(io_arbiter$ * arbiter) {
 		delete(arbiter);
 	}
Index: libcfa/src/concurrency/io/types.hfa
===================================================================
--- libcfa/src/concurrency/io/types.hfa	(revision c4c8571a1aaa3100966db2d603b3a32857faebdd)
+++ libcfa/src/concurrency/io/types.hfa	(revision 8bee858990b2b51491609072db909e1fd09e5127)
@@ -33,5 +33,5 @@
 
 	struct processor;
-	monitor $io_arbiter;
+	monitor io_arbiter$;
 
 	//-----------------------------------------------------------------------
@@ -125,6 +125,6 @@
 
 
-	struct __attribute__((aligned(64))) $io_context {
-		$io_arbiter * arbiter;
+	struct __attribute__((aligned(64))) io_context$ {
+		io_arbiter$ * arbiter;
 		processor * proc;
 
@@ -137,5 +137,5 @@
 	};
 
-	static inline unsigned long long ts($io_context *& this) {
+	static inline unsigned long long ts(io_context$ *& this) {
 		const __u32 head = *this->cq.head;
 		const __u32 tail = *this->cq.tail;
@@ -150,8 +150,8 @@
 		__u32 * idxs;
 		__u32 want;
-		$io_context * ctx;
+		io_context$ * ctx;
 	};
 
-	monitor __attribute__((aligned(64))) $io_arbiter {
+	monitor __attribute__((aligned(64))) io_arbiter$ {
 		__outstanding_io_queue pending;
 	};
@@ -186,4 +186,4 @@
 	#endif
 
-	// void __ioctx_prepare_block($io_context & ctx);
+	// void __ioctx_prepare_block(io_context$ & ctx);
 #endif