Index: src/OFAtomic_builtins.h
==================================================================
--- src/OFAtomic_builtins.h
+++ src/OFAtomic_builtins.h
@@ -130,21 +130,21 @@
 	return __atomic_compare_exchange(p, &o, &n, false,
 	    __ATOMIC_RELAXED, __ATOMIC_RELAXED);
 }
 
 static OF_INLINE void
-of_memory_barrier_full(void)
+OFMemoryBarrier(void)
 {
 	__atomic_thread_fence(__ATOMIC_SEQ_CST);
 }
 
 static OF_INLINE void
-of_memory_barrier_acquire(void)
+OFAcquireMemoryBarrier(void)
 {
 	__atomic_thread_fence(__ATOMIC_ACQUIRE);
 }
 
 static OF_INLINE void
-of_memory_barrier_release(void)
+OFReleaseMemoryBarrier(void)
 {
 	__atomic_thread_fence(__ATOMIC_RELEASE);
 }

Index: src/OFAtomic_no_threads.h
==================================================================
--- src/OFAtomic_no_threads.h
+++ src/OFAtomic_no_threads.h
@@ -142,21 +142,21 @@
 
 	return false;
 }
 
 static OF_INLINE void
-of_memory_barrier(void)
+OFMemoryBarrier(void)
 {
 	/* nop */
 }
 
 static OF_INLINE void
-of_memory_barrier_acquire(void)
+OFAcquireMemoryBarrier(void)
 {
 	/* nop */
 }
 
 static OF_INLINE void
-of_memory_barrier_release(void)
+OFReleaseMemoryBarrier(void)
 {
 	/* nop */
 }

Index: src/OFAtomic_osatomic.h
==================================================================
--- src/OFAtomic_osatomic.h
+++ src/OFAtomic_osatomic.h
@@ -137,21 +137,21 @@
 {
 	return OSAtomicCompareAndSwapPtr(o, n, p);
 }
 
 static OF_INLINE void
-of_memory_barrier(void)
+OFMemoryBarrier(void)
 {
 	OSMemoryBarrier();
 }
 
 static OF_INLINE void
-of_memory_barrier_acquire(void)
+OFAcquireMemoryBarrier(void)
 {
 	OSMemoryBarrier();
 }
 
 static OF_INLINE void
-of_memory_barrier_release(void)
+OFReleaseMemoryBarrier(void)
 {
 	OSMemoryBarrier();
 }

Index: src/OFAtomic_powerpc.h
==================================================================
--- src/OFAtomic_powerpc.h
+++ src/OFAtomic_powerpc.h
@@ -371,27 +371,27 @@
 
 	return r;
 }
 
 static OF_INLINE void
-of_memory_barrier(void)
+OFMemoryBarrier(void)
 {
 	__asm__ __volatile__ (
 	    ".long 0x7C2004AC /* lwsync */" ::: "memory"
 	);
 }
 
 static OF_INLINE void
-of_memory_barrier_acquire(void)
+OFAcquireMemoryBarrier(void)
 {
 	__asm__ __volatile__ (
 	    ".long 0x7C2004AC /* lwsync */" ::: "memory"
 	);
 }
 
 static OF_INLINE void
-of_memory_barrier_release(void)
+OFReleaseMemoryBarrier(void)
 {
 	__asm__ __volatile__ (
 	    ".long 0x7C2004AC /* lwsync */" ::: "memory"
 	);
 }

Index: src/OFAtomic_sync_builtins.h
==================================================================
--- src/OFAtomic_sync_builtins.h
+++ src/OFAtomic_sync_builtins.h
@@ -127,21 +127,21 @@
 {
 	return __sync_bool_compare_and_swap(p, o, n);
 }
 
 static OF_INLINE void
-of_memory_barrier(void)
+OFMemoryBarrier(void)
 {
 	__sync_synchronize();
 }
 
 static OF_INLINE void
-of_memory_barrier_acquire(void)
+OFAcquireMemoryBarrier(void)
 {
 	__sync_synchronize();
 }
 
 static OF_INLINE void
-of_memory_barrier_release(void)
+OFReleaseMemoryBarrier(void)
 {
 	__sync_synchronize();
 }

Index: src/OFAtomic_x86.h
==================================================================
--- src/OFAtomic_x86.h
+++ src/OFAtomic_x86.h
@@ -478,25 +478,25 @@
 
 	return r;
 }
 
 static OF_INLINE void
-of_memory_barrier(void)
+OFMemoryBarrier(void)
 {
 	__asm__ __volatile__ (
 	    "mfence" ::: "memory"
 	);
 }
 
 static OF_INLINE void
-of_memory_barrier_acquire(void)
+OFAcquireMemoryBarrier(void)
 {
 	__asm__ __volatile__ ("" ::: "memory");
 }
 
 static OF_INLINE void
-of_memory_barrier_release(void)
+OFReleaseMemoryBarrier(void)
 {
 	__asm__ __volatile__ ("" ::: "memory");
 }
 
 OF_ASSUME_NONNULL_END

Index: src/OFObject.m
==================================================================
--- src/OFObject.m
+++ src/OFObject.m
@@ -1134,14 +1134,14 @@
 }
 
 - (void)release
 {
 #if defined(OF_HAVE_ATOMIC_OPS)
-	of_memory_barrier_release();
+	OFReleaseMemoryBarrier();
 
 	if (OFAtomicIntDecrease(&PRE_IVARS->retainCount) <= 0) {
-		of_memory_barrier_acquire();
+		OFAcquireMemoryBarrier();
 
 		[self dealloc];
 	}
 #elif defined(OF_AMIGAOS)
 	int retainCount;

Index: src/OFOnce.m
==================================================================
--- src/OFOnce.m
+++ src/OFOnce.m
@@ -43,11 +43,11 @@
 		return;
 
 	if (OFAtomicIntCompareAndSwap(control, 0, 1)) {
 		func();
 
-		of_memory_barrier();
+		OFMemoryBarrier();
 
 		OFAtomicIntIncrease(control);
 	} else
 		while (*control == 1)
 			OFYieldThread();

Index: src/OFPlainMutex.h
==================================================================
--- src/OFPlainMutex.h
+++ src/OFPlainMutex.h
@@ -107,11 +107,11 @@
 static OF_INLINE int
 OFSpinlockTryLock(OFSpinlock *spinlock)
 {
 #if defined(OF_HAVE_ATOMIC_OPS)
 	if (OFAtomicIntCompareAndSwap(spinlock, 0, 1)) {
-		of_memory_barrier_acquire();
+		OFAcquireMemoryBarrier();
 		return 0;
 	}
 
 	return EBUSY;
 #elif defined(OF_HAVE_PTHREAD_SPINLOCKS)
@@ -146,11 +146,11 @@
 OFSpinlockUnlock(OFSpinlock *spinlock)
 {
 #if defined(OF_HAVE_ATOMIC_OPS)
 	bool ret = OFAtomicIntCompareAndSwap(spinlock, 1, 0);
 
-	of_memory_barrier_release();
+	OFReleaseMemoryBarrier();
 
 	return (ret ? 0 : EINVAL);
 #elif defined(OF_HAVE_PTHREAD_SPINLOCKS)
 	return pthread_spin_unlock(spinlock);
 #else