@@ -89,13 +89,13 @@
 	[OF_XMLPARSER_IN_DOCTYPE] = inDOCTYPEState
 };
 
 static OF_INLINE void
 appendToBuffer(OFMutableData *buffer, const char *string,
-    of_string_encoding_t encoding, size_t length)
+    OFStringEncoding encoding, size_t length)
 {
-	if OF_LIKELY(encoding == OF_STRING_ENCODING_UTF_8)
+	if OF_LIKELY(encoding == OFStringEncodingUTF8)
 		[buffer addItems: string count: length];
 	else {
 		void *pool = objc_autoreleasePoolPush();
 		OFString *tmp = [OFString stringWithCString: string
 						   encoding: encoding
@@ -209,11 +209,11 @@
 		    @"xmlns", @"http://www.w3.org/2000/xmlns/", nil];
 		[_namespaces addObject: dict];
 
 		_acceptProlog = true;
 		_lineNumber = 1;
-		_encoding = OF_STRING_ENCODING_UTF_8;
+		_encoding = OFStringEncodingUTF8;
 		_depthLimit = 32;
 
 		objc_autoreleasePoolPop(pool);
 	} @catch (id e) {
 		[self release];
@@ -448,11 +448,11 @@
 			}
 
 			if ([attribute isEqual: @"encoding"]) {
 				@try {
 					self->_encoding =
-					    of_string_parse_encoding(value);
+					    OFParseStringEncodingName(value);
 				} @catch (OFInvalidArgumentException *e) {
 					@throw [OFInvalidEncodingException
 					    exception];
 				}
 			}