@@ -14,127 +14,127 @@
  */
 
 #include <libkern/OSAtomic.h>
 
 static OF_INLINE int
-of_atomic_int_add(volatile int *_Nonnull p, int i)
+OFAtomicIntAdd(volatile int *_Nonnull p, int i)
 {
 	return OSAtomicAdd32(i, p);
 }
 
 static OF_INLINE int32_t
-of_atomic_int32_add(volatile int32_t *_Nonnull p, int32_t i)
+OFAtomicInt32Add(volatile int32_t *_Nonnull p, int32_t i)
 {
 	return OSAtomicAdd32(i, p);
 }
 
 static OF_INLINE void *_Nullable
-of_atomic_ptr_add(void *volatile _Nullable *_Nonnull p, intptr_t i)
+OFAtomicPointerAdd(void *volatile _Nullable *_Nonnull p, intptr_t i)
 {
 #ifdef __LP64__
 	return (void *)OSAtomicAdd64(i, (int64_t *)p);
 #else
 	return (void *)OSAtomicAdd32(i, (int32_t *)p);
 #endif
 }
 
 static OF_INLINE int
-of_atomic_int_sub(volatile int *_Nonnull p, int i)
+OFAtomicIntSubtract(volatile int *_Nonnull p, int i)
 {
 	return OSAtomicAdd32(-i, p);
 }
 
 static OF_INLINE int32_t
-of_atomic_int32_sub(volatile int32_t *_Nonnull p, int32_t i)
+OFAtomicInt32Subtract(volatile int32_t *_Nonnull p, int32_t i)
 {
 	return OSAtomicAdd32(-i, p);
 }
 
 static OF_INLINE void *_Nullable
-of_atomic_ptr_sub(void *volatile _Nullable *_Nonnull p, intptr_t i)
+OFAtomicPointerSubtract(void *volatile _Nullable *_Nonnull p, intptr_t i)
 {
 #ifdef __LP64__
 	return (void *)OSAtomicAdd64(-i, (int64_t *)p);
 #else
 	return (void *)OSAtomicAdd32(-i, (int32_t *)p);
 #endif
 }
 
 static OF_INLINE int
-of_atomic_int_inc(volatile int *_Nonnull p)
-{
-	return OSAtomicIncrement32(p);
-}
-
-static OF_INLINE int32_t
-of_atomic_int32_inc(volatile int32_t *_Nonnull p)
-{
-	return OSAtomicIncrement32(p);
-}
-
-static OF_INLINE int
-of_atomic_int_dec(volatile int *_Nonnull p)
-{
-	return OSAtomicDecrement32(p);
-}
-
-static OF_INLINE int32_t
-of_atomic_int32_dec(volatile int32_t *_Nonnull p)
-{
-	return OSAtomicDecrement32(p);
-}
-
-static OF_INLINE unsigned int
-of_atomic_int_or(volatile unsigned int *_Nonnull p, unsigned int i)
-{
-	return OSAtomicOr32(i, p);
-}
-
-static OF_INLINE uint32_t
-of_atomic_int32_or(volatile uint32_t *_Nonnull p, uint32_t i)
-{
-	return OSAtomicOr32(i, p);
-}
-
-static OF_INLINE unsigned int
-of_atomic_int_and(volatile unsigned int *_Nonnull p, unsigned int i)
-{
-	return OSAtomicAnd32(i, p);
-}
-
-static OF_INLINE uint32_t
-of_atomic_int32_and(volatile uint32_t *_Nonnull p, uint32_t i)
-{
-	return OSAtomicAnd32(i, p);
-}
-
-static OF_INLINE unsigned int
-of_atomic_int_xor(volatile unsigned int *_Nonnull p, unsigned int i)
-{
-	return OSAtomicXor32(i, p);
-}
-
-static OF_INLINE uint32_t
-of_atomic_int32_xor(volatile uint32_t *_Nonnull p, uint32_t i)
-{
-	return OSAtomicXor32(i, p);
-}
-
-static OF_INLINE bool
-of_atomic_int_cmpswap(volatile int *_Nonnull p, int o, int n)
-{
-	return OSAtomicCompareAndSwapInt(o, n, p);
-}
-
-static OF_INLINE bool
-of_atomic_int32_cmpswap(volatile int32_t *_Nonnull p, int32_t o, int32_t n)
-{
-	return OSAtomicCompareAndSwap32(o, n, p);
-}
-
-static OF_INLINE bool
-of_atomic_ptr_cmpswap(void *volatile _Nullable *_Nonnull p,
+OFAtomicIntIncrease(volatile int *_Nonnull p)
+{
+	return OSAtomicIncrement32(p);
+}
+
+static OF_INLINE int32_t
+OFAtomicInt32Increase(volatile int32_t *_Nonnull p)
+{
+	return OSAtomicIncrement32(p);
+}
+
+static OF_INLINE int
+OFAtomicIntDecrease(volatile int *_Nonnull p)
+{
+	return OSAtomicDecrement32(p);
+}
+
+static OF_INLINE int32_t
+OFAtomicInt32Decrease(volatile int32_t *_Nonnull p)
+{
+	return OSAtomicDecrement32(p);
+}
+
+static OF_INLINE unsigned int
+OFAtomicIntOr(volatile unsigned int *_Nonnull p, unsigned int i)
+{
+	return OSAtomicOr32(i, p);
+}
+
+static OF_INLINE uint32_t
+OFAtomicInt32Or(volatile uint32_t *_Nonnull p, uint32_t i)
+{
+	return OSAtomicOr32(i, p);
+}
+
+static OF_INLINE unsigned int
+OFAtomicIntAnd(volatile unsigned int *_Nonnull p, unsigned int i)
+{
+	return OSAtomicAnd32(i, p);
+}
+
+static OF_INLINE uint32_t
+OFAtomicInt32And(volatile uint32_t *_Nonnull p, uint32_t i)
+{
+	return OSAtomicAnd32(i, p);
+}
+
+static OF_INLINE unsigned int
+OFAtomicIntXor(volatile unsigned int *_Nonnull p, unsigned int i)
+{
+	return OSAtomicXor32(i, p);
+}
+
+static OF_INLINE uint32_t
+OFAtomicInt32Xor(volatile uint32_t *_Nonnull p, uint32_t i)
+{
+	return OSAtomicXor32(i, p);
+}
+
+static OF_INLINE bool
+OFAtomicIntCompareAndSwap(volatile int *_Nonnull p, int o, int n)
+{
+	return OSAtomicCompareAndSwapInt(o, n, p);
+}
+
+static OF_INLINE bool
+OFAtomicInt32CompareAndSwap(volatile int32_t *_Nonnull p, int32_t o, int32_t n)
+{
+	return OSAtomicCompareAndSwap32(o, n, p);
+}
+
+static OF_INLINE bool
+OFAtomicPointerCompareAndSwap(void *volatile _Nullable *_Nonnull p,
     void *_Nullable o, void *_Nullable n)
 {
 	return OSAtomicCompareAndSwapPtr(o, n, p);
 }