@@ -380,11 +380,11 @@
 	OFUTF8String *string;
 	size_t length;
 	void *storage;
 
 	length = strlen(UTF8String);
-	string = of_alloc_object([OFUTF8String class], length + 1, 1, &storage);
+	string = OFAllocObject([OFUTF8String class], length + 1, 1, &storage);
 
 	return (id)[string of_initWithUTF8String: UTF8String
 					  length: length
 					 storage: storage];
 }
@@ -393,11 +393,11 @@
 			    length: (size_t)UTF8StringLength
 {
 	OFUTF8String *string;
 	void *storage;
 
-	string = of_alloc_object([OFUTF8String class], UTF8StringLength + 1, 1,
+	string = OFAllocObject([OFUTF8String class], UTF8StringLength + 1, 1,
 	    &storage);
 
 	return (id)[string of_initWithUTF8String: UTF8String
 					  length: UTF8StringLength
 					 storage: storage];
@@ -428,11 +428,11 @@
 		OFUTF8String *string;
 		size_t length;
 		void *storage;
 
 		length = strlen(cString);
-		string = of_alloc_object([OFUTF8String class], length + 1, 1,
+		string = OFAllocObject([OFUTF8String class], length + 1, 1,
 		    &storage);
 
 		return (id)[string of_initWithUTF8String: cString
 						  length: length
 						 storage: storage];
@@ -448,12 +448,12 @@
 {
 	if (encoding == OFStringEncodingUTF8) {
 		OFUTF8String *string;
 		void *storage;
 
-		string = of_alloc_object([OFUTF8String class],
-		    cStringLength + 1, 1, &storage);
+		string = OFAllocObject([OFUTF8String class], cStringLength + 1,
+		    1, &storage);
 
 		return (id)[string of_initWithUTF8String: cString
 						  length: cStringLength
 						 storage: storage];
 	}