Index: libcfa/src/concurrency/locks.cfa
===================================================================
--- libcfa/src/concurrency/locks.cfa	(revision 8f9104301dac64ff5114b917d62f3da005252937)
+++ libcfa/src/concurrency/locks.cfa	(revision 90a10e8a7d82d5c8a828d08753cded2a5e35c448)
@@ -188,5 +188,5 @@
 		alarm_node_t alarm_node;
 		condition_variable(L) * cond;
-		info_thread(L) * i;
+		info_thread(L) * info_thd;
 	};
 
@@ -194,5 +194,5 @@
 		this.alarm_node{ callback, alarm, period };
 		this.cond = c;
-		this.i = i;
+		this.info_thd = i;
 	}
 
@@ -206,15 +206,15 @@
 		// 	may still be called after a thread has been removed from the queue but
 		// 	before the alarm is unregistered
-		if ( listed(i) ) {	// is thread on queue
-			i->signalled = false;
+		if ( listed(info_thd) ) {	// is thread on queue
+			info_thd->signalled = false;
 			// remove this thread O(1)
-			remove( cond->blocked_threads, *i );
+			remove( cond->blocked_threads, *info_thd );
 			cond->count--;
-			if( i->lock ) {
+			if( info_thd->lock ) {
 				// call lock's on_notify if a lock was passed
-				on_notify(*i->lock, i->t);
+				on_notify(*info_thd->lock, info_thd->t);
 			} else {
 				// otherwise wake thread
-				unpark( i->t );
+				unpark( info_thd->t );
 			}
 		}