Index: src/libcfa/bits/containers.h
===================================================================
--- src/libcfa/bits/containers.h	(revision 705e6123fcc33537e2747990ded045523fe6e3d5)
+++ src/libcfa/bits/containers.h	(revision 639991aa7d6f4c4ee71eeb5078b858be58b7fa2c)
@@ -220,21 +220,21 @@
 	}
 
-	#define _next .0
-	#define _prev .1
+	#define next 0
+	#define prev 1
 	forall(dtype T | sized(T))
 	static inline void push_front( __dllist(T) & this, T & node ) with( this ) {
 		if ( head ) {
-			__get( node )_next = head;
-			__get( node )_prev = __get( *head )_prev;
+			__get( node ).next = head;
+			__get( node ).prev = __get( *head ).prev;
 			// inserted node must be consistent before it is seen
 			// prevent code movement across barrier
 			asm( "" : : : "memory" );
-			__get( *head )_prev = &node;
-			T & prev = *__get( node )_prev;
-			__get( prev )_next = &node;
+			__get( *head ).prev = &node;
+			T & _prev = *__get( node ).prev;
+			__get( _prev ).next = &node;
 		}
 		else {
-			__get( node )_next = &node;
-			__get( node )_prev = &node;
+			__get( node ).next = &node;
+			__get( node ).prev = &node;
 		}
 
@@ -247,18 +247,18 @@
 	static inline void remove( __dllist(T) & this, T & node ) with( this ) {
 		if ( &node == head ) {
-			if ( __get( *head )_next == head ) {
+			if ( __get( *head ).next == head ) {
 				head = NULL;
 			}
 			else {
-				head = __get( *head )_next;
+				head = __get( *head ).next;
 			}
 		}
-		__get( *__get( node )_next )_prev = __get( node )_prev;
-		__get( *__get( node )_prev )_next = __get( node )_next;
-		__get( node )_next = NULL;
-		__get( node )_prev = NULL;
-	}
-	#undef _next
-	#undef _prev
+		__get( *__get( node ).next ).prev = __get( node ).prev;
+		__get( *__get( node ).prev ).next = __get( node ).next;
+		__get( node ).next = NULL;
+		__get( node ).prev = NULL;
+	}
+	#undef next
+	#undef prev
 #endif