Index: uspace/app/rcubench/rcubench.c
===================================================================
--- uspace/app/rcubench/rcubench.c	(revision b7acf383016ce70e70a5c0df4f6ed935e25629fe)
+++ uspace/app/rcubench/rcubench.c	(revision 156b6406b959a4814f664d2e6b0cb1905b973b6c)
@@ -137,5 +137,5 @@
 	
 	/* Signal another thread completed. */
-	_futex_up(&bench->done_threads);
+	futex_up(&bench->done_threads);
 }
 
@@ -171,5 +171,5 @@
 	/* Wait for threads to complete. */
 	for (size_t k = 0; k < bench->nthreads; ++k) {
-		_futex_down(&bench->done_threads);
+		futex_down(&bench->done_threads);
 	}
 }
Index: uspace/lib/c/generic/futex.c
===================================================================
--- uspace/lib/c/generic/futex.c	(revision b7acf383016ce70e70a5c0df4f6ed935e25629fe)
+++ uspace/lib/c/generic/futex.c	(revision 156b6406b959a4814f664d2e6b0cb1905b973b6c)
@@ -56,5 +56,5 @@
 void futex_upgrade_all_and_wait(void)
 {
-	_futex_down(&upg_and_wait_futex);
+	futex_down(&upg_and_wait_futex);
 	
 	if (!_upgrade_futexes) {
@@ -63,5 +63,5 @@
 	}
 	
-	_futex_up(&upg_and_wait_futex);
+	futex_up(&upg_and_wait_futex);
 }
 
Index: uspace/lib/c/generic/malloc.c
===================================================================
--- uspace/lib/c/generic/malloc.c	(revision b7acf383016ce70e70a5c0df4f6ed935e25629fe)
+++ uspace/lib/c/generic/malloc.c	(revision 156b6406b959a4814f664d2e6b0cb1905b973b6c)
@@ -200,5 +200,5 @@
 	do { \
 		if (!(expr)) {\
-			_futex_up(&malloc_futex); \
+			futex_up(&malloc_futex); \
 			assert_abort(#expr, __FILE__, __LINE__); \
 		} \
@@ -785,7 +785,7 @@
 void *malloc(const size_t size)
 {
-	_futex_down(&malloc_futex);
+	futex_down(&malloc_futex);
 	void *block = malloc_internal(size, BASE_ALIGN);
-	_futex_up(&malloc_futex);
+	futex_up(&malloc_futex);
 
 	return block;
@@ -808,7 +808,7 @@
 	    1 << (fnzb(max(sizeof(void *), align) - 1) + 1);
 
-	_futex_down(&malloc_futex);
+	futex_down(&malloc_futex);
 	void *block = malloc_internal(size, palign);
-	_futex_up(&malloc_futex);
+	futex_up(&malloc_futex);
 
 	return block;
@@ -828,5 +828,5 @@
 		return malloc(size);
 	
-	_futex_down(&malloc_futex);
+	futex_down(&malloc_futex);
 	
 	/* Calculate the position of the header. */
@@ -885,5 +885,5 @@
 	}
 	
-	_futex_up(&malloc_futex);
+	futex_up(&malloc_futex);
 	
 	if (reloc) {
@@ -908,5 +908,5 @@
 		return;
 	
-	_futex_down(&malloc_futex);
+	futex_down(&malloc_futex);
 	
 	/* Calculate the position of the header. */
@@ -953,13 +953,13 @@
 	heap_shrink(area);
 	
-	_futex_up(&malloc_futex);
+	futex_up(&malloc_futex);
 }
 
 void *heap_check(void)
 {
-	_futex_down(&malloc_futex);
+	futex_down(&malloc_futex);
 	
 	if (first_heap_area == NULL) {
-		_futex_up(&malloc_futex);
+		futex_up(&malloc_futex);
 		return (void *) -1;
 	}
@@ -975,5 +975,5 @@
 		    (((uintptr_t) area->start % PAGE_SIZE) != 0) ||
 		    (((uintptr_t) area->end % PAGE_SIZE) != 0)) {
-			_futex_up(&malloc_futex);
+			futex_up(&malloc_futex);
 			return (void *) area;
 		}
@@ -986,5 +986,5 @@
 			/* Check heap block consistency */
 			if (head->magic != HEAP_BLOCK_HEAD_MAGIC) {
-				_futex_up(&malloc_futex);
+				futex_up(&malloc_futex);
 				return (void *) head;
 			}
@@ -994,5 +994,5 @@
 			if ((foot->magic != HEAP_BLOCK_FOOT_MAGIC) ||
 			    (head->size != foot->size)) {
-				_futex_up(&malloc_futex);
+				futex_up(&malloc_futex);
 				return (void *) foot;
 			}
@@ -1000,5 +1000,5 @@
 	}
 	
-	_futex_up(&malloc_futex);
+	futex_up(&malloc_futex);
 	
 	return NULL;
Index: uspace/lib/c/include/futex.h
===================================================================
--- uspace/lib/c/include/futex.h	(revision b7acf383016ce70e70a5c0df4f6ed935e25629fe)
+++ uspace/lib/c/include/futex.h	(revision 156b6406b959a4814f664d2e6b0cb1905b973b6c)
@@ -55,18 +55,18 @@
 #define FUTEX_INITIALIZE(val) {{ (val) }, 0}
 
-#define futex_down(fut) \
+#define futex_lock(fut) \
 ({ \
 	rcu_read_lock(); \
 	(fut)->upgraded = rcu_access(_upgrade_futexes); \
 	if ((fut)->upgraded) \
-		(void) _futex_down((fut)); \
+		(void) futex_down((fut)); \
 })
 
-#define futex_trydown(fut) \
+#define futex_trylock(fut) \
 ({ \
 	rcu_read_lock(); \
 	int _upgraded = rcu_access(_upgrade_futexes); \
 	if (_upgraded) { \
-		int _acquired = _futex_trydown((fut)); \
+		int _acquired = futex_trydown((fut)); \
 		if (!_acquired) { \
 			rcu_read_unlock(); \
@@ -81,8 +81,8 @@
 })
 		
-#define futex_up(fut) \
+#define futex_unlock(fut) \
 ({ \
 	if ((fut)->upgraded) \
-		(void) _futex_up((fut)); \
+		(void) futex_up((fut)); \
 	rcu_read_unlock(); \
 })
@@ -96,7 +96,7 @@
 #define FUTEX_INITIALIZE(val) {{ (val) }}
 
-#define futex_down(fut)     (void)_futex_down((fut))
-#define futex_trydown(fut)  _futex_trydown((fut))
-#define futex_up(fut)       (void)_futex_up((fut))
+#define futex_lock(fut)     (void) futex_down((fut))
+#define futex_trylock(fut)  futex_trydown((fut))
+#define futex_unlock(fut)   (void) futex_up((fut))
 		
 #endif
@@ -112,5 +112,5 @@
  *
  */
-static inline int _futex_trydown(futex_t *futex)
+static inline int futex_trydown(futex_t *futex)
 {
 	return cas(&futex->val, 1, 0);
@@ -126,5 +126,5 @@
  *
  */
-static inline int _futex_down(futex_t *futex)
+static inline int futex_down(futex_t *futex)
 {
 	if ((atomic_signed_t) atomic_predec(&futex->val) < 0)
@@ -142,5 +142,5 @@
  *
  */
-static inline int _futex_up(futex_t *futex)
+static inline int futex_up(futex_t *futex)
 {
 	if ((atomic_signed_t) atomic_postinc(&futex->val) < 0)
Index: uspace/lib/urcu/rcu.c
===================================================================
--- uspace/lib/urcu/rcu.c	(revision b7acf383016ce70e70a5c0df4f6ed935e25629fe)
+++ uspace/lib/urcu/rcu.c	(revision 156b6406b959a4814f664d2e6b0cb1905b973b6c)
@@ -168,7 +168,7 @@
 	assert(!fibril_rcu.registered);
 	
-	_futex_down(&rcu.list_futex);
+	futex_down(&rcu.list_futex);
 	list_append(&fibril_rcu.link, &rcu.fibrils_list);
-	_futex_up(&rcu.list_futex);
+	futex_up(&rcu.list_futex);
 	
 	fibril_rcu.registered = true;
@@ -193,7 +193,7 @@
 	fibril_rcu.nesting_cnt = 0;
 	
-	_futex_down(&rcu.list_futex);
+	futex_down(&rcu.list_futex);
 	list_remove(&fibril_rcu.link);
-	_futex_up(&rcu.list_futex);
+	futex_up(&rcu.list_futex);
 
 	fibril_rcu.registered = false;
@@ -330,5 +330,5 @@
 static void wait_for_readers(size_t reader_group, blocking_mode_t blocking_mode)
 {
-	_futex_down(&rcu.list_futex);
+	futex_down(&rcu.list_futex);
 	
 	list_t quiescent_fibrils;
@@ -341,7 +341,7 @@
 			
 			if (is_preexisting_reader(fib, reader_group)) {
-				_futex_up(&rcu.list_futex);
+				futex_up(&rcu.list_futex);
 				sync_sleep(blocking_mode);
-				_futex_down(&rcu.list_futex);
+				futex_down(&rcu.list_futex);
 				/* Break to while loop. */
 				break;
@@ -354,10 +354,10 @@
 	
 	list_concat(&rcu.fibrils_list, &quiescent_fibrils);
-	_futex_up(&rcu.list_futex);
+	futex_up(&rcu.list_futex);
 }
 
 static void lock_sync(blocking_mode_t blocking_mode)
 {
-	_futex_down(&rcu.sync_lock.futex);
+	futex_down(&rcu.sync_lock.futex);
 	if (rcu.sync_lock.locked) {
 		if (blocking_mode == BM_BLOCK_FIBRIL) {
@@ -369,7 +369,7 @@
 			do {
 				blocked_fib.is_ready = false;
-				_futex_up(&rcu.sync_lock.futex);
+				futex_up(&rcu.sync_lock.futex);
 				fibril_switch(FIBRIL_TO_MANAGER);
-				_futex_down(&rcu.sync_lock.futex);
+				futex_down(&rcu.sync_lock.futex);
 			} while (rcu.sync_lock.locked);
 			
@@ -379,6 +379,6 @@
 			assert(blocking_mode == BM_BLOCK_THREAD);
 			rcu.sync_lock.blocked_thread_cnt++;
-			_futex_up(&rcu.sync_lock.futex);
-			_futex_down(&rcu.sync_lock.futex_blocking_threads);
+			futex_up(&rcu.sync_lock.futex);
+			futex_down(&rcu.sync_lock.futex_blocking_threads);
 		}
 	} else {
@@ -397,5 +397,5 @@
 	if (0 < rcu.sync_lock.blocked_thread_cnt) {
 		--rcu.sync_lock.blocked_thread_cnt;
-		_futex_up(&rcu.sync_lock.futex_blocking_threads);
+		futex_up(&rcu.sync_lock.futex_blocking_threads);
 	} else {
 		/* Unlock but wake up any fibrils waiting for the lock. */
@@ -412,5 +412,5 @@
 		
 		rcu.sync_lock.locked = false;
-		_futex_up(&rcu.sync_lock.futex);
+		futex_up(&rcu.sync_lock.futex);
 	}
 }
@@ -423,5 +423,5 @@
 	 * but keep sync locked. 
 	 */
-	_futex_up(&rcu.sync_lock.futex);
+	futex_up(&rcu.sync_lock.futex);
 
 	if (blocking_mode == BM_BLOCK_FIBRIL) {
@@ -431,5 +431,5 @@
 	}
 		
-	_futex_down(&rcu.sync_lock.futex);
+	futex_down(&rcu.sync_lock.futex);
 }