@@ -314,22 +314,22 @@
 
 	_s->cString[_s->cStringLength] = 0;
 }
 
 - (void)appendCString: (const char *)cString
-	     encoding: (of_string_encoding_t)encoding
+	     encoding: (OFStringEncoding)encoding
 {
 	[self appendCString: cString
 		   encoding: encoding
 		     length: strlen(cString)];
 }
 
 - (void)appendCString: (const char *)cString
-	     encoding: (of_string_encoding_t)encoding
+	     encoding: (OFStringEncoding)encoding
 	       length: (size_t)cStringLength
 {
-	if (encoding == OF_STRING_ENCODING_UTF_8)
+	if (encoding == OFStringEncodingUTF8)
 		[self appendUTF8String: cString length: cStringLength];
 	else {
 		void *pool = objc_autoreleasePoolPush();
 
 		[self appendString: