Index: src/OFAtomic_powerpc.h
==================================================================
--- src/OFAtomic_powerpc.h
+++ src/OFAtomic_powerpc.h
@@ -292,11 +292,11 @@
 
 	return i;
 }
 
 static OF_INLINE bool
-OFAtomicIntCompAndSwap(volatile int *_Nonnull p, int o, int n)
+OFAtomicIntCompareAndSwap(volatile int *_Nonnull p, int o, int n)
 {
 	int r;
 
 	__asm__ __volatile__ (
 	    "0:\n\t"

Index: src/OFAtomic_sync_builtins.h
==================================================================
--- src/OFAtomic_sync_builtins.h
+++ src/OFAtomic_sync_builtins.h
@@ -114,11 +114,11 @@
 {
 	return __sync_bool_compare_and_swap(p, o, n);
 }
 
 static OF_INLINE bool
-OFAtomicInt32CompAndSwap(volatile int32_t *_Nonnull p, int32_t o, int32_t n)
+OFAtomicInt32CompareAndSwap(volatile int32_t *_Nonnull p, int32_t o, int32_t n)
 {
 	return __sync_bool_compare_and_swap(p, o, n);
 }
 
 static OF_INLINE bool

Index: src/platform/morphos/OFTLSKey.m
==================================================================
--- src/platform/morphos/OFTLSKey.m
+++ src/platform/morphos/OFTLSKey.m
@@ -16,11 +16,11 @@
 #include "config.h"
 
 #import "OFTLSKey.h"
 
 int
-OFTLSKeyNew(OFTLSKeyT *key)
+OFTLSKeyNew(OFTLSKey *key)
 {
 	*key = TLSAllocA(NULL);
 
 	if (*key == TLS_INVALID_INDEX)
 		return EAGAIN;
@@ -27,9 +27,9 @@
 
 	return 0;
 }
 
 int
-OFTLSKeyFree(OFTLSKeyT key)
+OFTLSKeyFree(OFTLSKey key)
 {
 	return (TLSFree(key) ? 0 : EINVAL);
 }