@@ -21,11 +21,11 @@
 #import "OFArray.h"
 #import "OFData.h"
 #import "OFMethodSignature.h"
 
 #ifdef OF_INVOCATION_CAN_INVOKE
-extern void of_invocation_invoke(OFInvocation *);
+extern void OFInvocationInvoke(OFInvocation *);
 #endif
 
 @implementation OFInvocation
 @synthesize methodSignature = _methodSignature;
 
@@ -50,20 +50,20 @@
 		for (size_t i = 0; i < numberOfArguments; i++) {
 			OFMutableData *data;
 
 			typeEncoding = [_methodSignature
 			    argumentTypeAtIndex: i];
-			typeSize = of_sizeof_type_encoding(typeEncoding);
+			typeSize = OFSizeOfTypeEncoding(typeEncoding);
 
 			data = [OFMutableData dataWithItemSize: typeSize
 						      capacity: 1];
 			[data increaseCountBy: 1];
 			[_arguments addObject: data];
 		}
 
 		typeEncoding = _methodSignature.methodReturnType;
-		typeSize = of_sizeof_type_encoding(typeEncoding);
+		typeSize = OFSizeOfTypeEncoding(typeEncoding);
 
 		if (typeSize > 0) {
 			_returnValue = [[OFMutableData alloc]
 			    initWithItemSize: typeSize
 				    capacity: 1];
@@ -111,9 +111,9 @@
 }
 
 #ifdef OF_INVOCATION_CAN_INVOKE
 - (void)invoke
 {
-	of_invocation_invoke(self);
+	OFInvocationInvoke(self);
 }
 #endif
 @end