@@ -26,11 +26,11 @@
 #import "OFOutOfRangeException.h"
 #import "OFTruncatedDataException.h"
 #import "OFUnsupportedVersionException.h"
 
 OFString *
-of_http_status_code_to_string(short code)
+OFHTTPStatusCodeString(short code)
 {
 	switch (code) {
 	case 100:
 		return @"Continue";
 	case 101:
@@ -247,11 +247,11 @@
 	[_headers release];
 
 	[super dealloc];
 }
 
-- (void)setProtocolVersion: (of_http_request_protocol_version_t)protocolVersion
+- (void)setProtocolVersion: (OFHTTPRequestProtocolVersion)protocolVersion
 {
 	if (protocolVersion.major != 1 || protocolVersion.minor > 1)
 		@throw [OFUnsupportedVersionException exceptionWithVersion:
 		    [OFString stringWithFormat: @"%hhu.%hhu",
 						protocolVersion.major,
@@ -258,21 +258,21 @@
 						protocolVersion.minor]];
 
 	_protocolVersion = protocolVersion;
 }
 
-- (of_http_request_protocol_version_t)protocolVersion
+- (OFHTTPRequestProtocolVersion)protocolVersion
 {
 	return _protocolVersion;
 }
 
 - (void)setProtocolVersionString: (OFString *)string
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFArray *components = [string componentsSeparatedByString: @"."];
 	unsigned long long major, minor;
-	of_http_request_protocol_version_t protocolVersion;
+	OFHTTPRequestProtocolVersion protocolVersion;
 
 	if (components.count != 2)
 		@throw [OFInvalidFormatException exception];
 
 	major = [components.firstObject unsignedLongLongValue];