@@ -70,15 +70,15 @@
 
 #ifdef OF_APPLE_RUNTIME
 extern id _Nullable _objc_rootAutorelease(id _Nullable object);
 #endif
 #if defined(OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR)
-extern id of_forward(id, SEL, ...);
-extern struct stret of_forward_stret(id, SEL, ...);
+extern id OFForward(id, SEL, ...);
+extern struct stret OFForward_stret(id, SEL, ...);
 #else
-# define of_forward of_method_not_found
-# define of_forward_stret of_method_not_found_stret
+# define OFForward OFMethodNotFound
+# define OFForward_stret OFMethodNotFound_stret
 #endif
 
 struct pre_ivar {
 	int retainCount;
 #if !defined(OF_HAVE_ATOMIC_OPS) && !defined(OF_AMIGAOS)
@@ -92,11 +92,11 @@
 
 static struct {
 	Class isa;
 } allocFailedException;
 
-uint32_t of_hash_seed;
+uint32_t OFHashSeed;
 
 void *
 OFAllocMemory(size_t count, size_t size)
 {
 	void *pointer;
@@ -170,11 +170,11 @@
 # endif
 }
 #endif
 
 uint16_t
-of_random16(void)
+OFRandom16(void)
 {
 #if defined(HAVE_ARC4RANDOM)
 	return arc4random();
 #elif defined(HAVE_GETRANDOM)
 	uint16_t buffer;
@@ -192,11 +192,11 @@
 # endif
 #endif
 }
 
 uint32_t
-of_random32(void)
+OFRandom32(void)
 {
 #if defined(HAVE_ARC4RANDOM)
 	return arc4random();
 #elif defined(HAVE_GETRANDOM)
 	uint32_t buffer;
@@ -203,16 +203,16 @@
 
 	OF_ENSURE(getrandom(&buffer, sizeof(buffer), 0) == sizeof(buffer));
 
 	return buffer;
 #else
-	return ((uint32_t)of_random16() << 16) | of_random16();
+	return ((uint32_t)OFRandom16() << 16) | OFRandom16();
 #endif
 }
 
 uint64_t
-of_random64(void)
+OFRandom64(void)
 {
 #if defined(HAVE_ARC4RANDOM_BUF)
 	uint64_t buffer;
 
 	arc4random_buf(&buffer, sizeof(buffer));
@@ -223,11 +223,11 @@
 
 	OF_ENSURE(getrandom(&buffer, sizeof(buffer), 0) == sizeof(buffer));
 
 	return buffer;
 #else
-	return ((uint64_t)of_random32() << 32) | of_random32();
+	return ((uint64_t)OFRandom32() << 32) | OFRandom32();
 #endif
 }
 
 static const char *
 typeEncodingForSelector(Class class, SEL selector)
@@ -269,11 +269,11 @@
 {
 	@throw [OFEnumerationMutationException exceptionWithObject: object];
 }
 
 void OF_NO_RETURN_FUNC
-of_method_not_found(id object, SEL selector)
+OFMethodNotFound(id object, SEL selector)
 {
 	[object doesNotRecognizeSelector: selector];
 
 	/*
 	 * Just in case doesNotRecognizeSelector: returned, even though it must
@@ -283,17 +283,17 @@
 
 	OF_UNREACHABLE
 }
 
 void OF_NO_RETURN_FUNC
-of_method_not_found_stret(void *stret, id object, SEL selector)
+OFMethodNotFound_stret(void *stret, id object, SEL selector)
 {
-	of_method_not_found(object, selector);
+	OFMethodNotFound(object, selector);
 }
 
 id
-of_alloc_object(Class class, size_t extraSize, size_t extraAlignment,
+OFAllocObject(Class class, size_t extraSize, size_t extraAlignment,
     void **extra)
 {
 	OFObject *instance;
 	size_t instanceSize;
 
@@ -366,25 +366,25 @@
 	 *
 	 * Unfortunately, there is no way to check if a forward handler has
 	 * already been set, so this is the best we can do.
 	 */
 	if (dlsym(RTLD_DEFAULT, "NSFoundationVersionNumber") == NULL)
-		objc_setForwardHandler((void *)&of_forward,
-		    (void *)&of_forward_stret);
+		objc_setForwardHandler((void *)&OFForward,
+		    (void *)&OFForward_stret);
 #else
-	objc_setForwardHandler((IMP)&of_forward, (IMP)&of_forward_stret);
+	objc_setForwardHandler((IMP)&OFForward, (IMP)&OFForward_stret);
 #endif
 
 	objc_setEnumerationMutationHandler(enumerationMutationHandler);
 
 	do {
-		of_hash_seed = of_random32();
-	} while (of_hash_seed == 0);
+		OFHashSeed = OFRandom32();
+	} while (OFHashSeed == 0);
 
 #ifdef OF_OBJFW_RUNTIME
 	objc_setTaggedPointerSecret(sizeof(uintptr_t) == 4
-	    ? (uintptr_t)of_random32() : (uintptr_t)of_random64());
+	    ? (uintptr_t)OFRandom32() : (uintptr_t)OFRandom64());
 #endif
 }
 
 + (void)unload
 {
@@ -394,11 +394,11 @@
 {
 }
 
 + (instancetype)alloc
 {
-	return of_alloc_object(self, 0, 0, NULL);
+	return OFAllocObject(self, 0, 0, NULL);
 }
 
 + (instancetype)new
 {
 	return [[self alloc] init];