@@ -114,11 +114,11 @@
 	default:
 		return @"(unknown)";
 	}
 }
 
-static of_string_encoding_t
+static OFStringEncoding
 encodingForContentType(OFString *contentType)
 {
 	const char *UTF8String = contentType.UTF8String;
 	size_t last, length = contentType.UTF8StringLength;
 	enum {
@@ -129,11 +129,11 @@
 		STATE_PARAM_VALUE,
 		STATE_PARAM_QUOTED_VALUE,
 		STATE_AFTER_PARAM_VALUE
 	} state = STATE_TYPE;
 	OFString *name = nil, *value = nil, *charset = nil;
-	of_string_encoding_t ret;
+	OFStringEncoding ret;
 
 	last = 0;
 	for (size_t i = 0; i < length; i++) {
 		switch (state) {
 		case STATE_TYPE:
@@ -199,11 +199,11 @@
 		case STATE_AFTER_PARAM_VALUE:
 			if (UTF8String[i] == ';') {
 				state = STATE_BEFORE_PARAM_NAME;
 				last = i + 1;
 			} else if (UTF8String[i] != ' ')
-				return OF_STRING_ENCODING_AUTODETECT;
+				return OFStringEncodingAutodetect;
 			break;
 		}
 	}
 	if (state == STATE_PARAM_VALUE) {
 		value = [OFString stringWithUTF8String: UTF8String + last
@@ -213,13 +213,13 @@
 		if ([name isEqual: @"charset"])
 			charset = value;
 	}
 
 	@try {
-		ret = of_string_parse_encoding(charset);
+		ret = OFParseStringEncodingName(charset);
 	} @catch (OFInvalidArgumentException *e) {
-		ret = OF_STRING_ENCODING_AUTODETECT;
+		ret = OFStringEncodingAutodetect;
 	}
 
 	return ret;
 }
 
@@ -296,25 +296,25 @@
 					   _protocolVersion.minor];
 }
 
 - (OFString *)string
 {
-	return [self stringWithEncoding: OF_STRING_ENCODING_AUTODETECT];
+	return [self stringWithEncoding: OFStringEncodingAutodetect];
 }
 
-- (OFString *)stringWithEncoding: (of_string_encoding_t)encoding
+- (OFString *)stringWithEncoding: (OFStringEncoding)encoding
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFString *contentType, *contentLengthString, *ret;
 	OFData *data;
 
-	if (encoding == OF_STRING_ENCODING_AUTODETECT &&
+	if (encoding == OFStringEncodingAutodetect &&
 	    (contentType = [_headers objectForKey: @"Content-Type"]) != nil)
 		encoding = encodingForContentType(contentType);
 
-	if (encoding == OF_STRING_ENCODING_AUTODETECT)
-		encoding = OF_STRING_ENCODING_UTF_8;
+	if (encoding == OFStringEncodingAutodetect)
+		encoding = OFStringEncodingUTF8;
 
 	data = [self readDataUntilEndOfStream];
 
 	contentLengthString = [_headers objectForKey: @"Content-Length"];
 	if (contentLengthString != nil) {