@@ -80,11 +80,11 @@
 		AWAITING_PROLOG,
 		PARSING_HEADERS,
 		SEND_RESPONSE
 	} _state;
 	uint8_t _HTTPMinorVersion;
-	of_http_request_method_t _method;
+	OFHTTPRequestMethod _method;
 	OFString *_host, *_path;
 	uint16_t _port;
 	OFMutableDictionary *_headers;
 	size_t _contentLength;
 	OFStream *_requestBody;
@@ -187,11 +187,11 @@
 	OFEnumerator *keyEnumerator, *valueEnumerator;
 	OFString *key, *value;
 
 	[_socket writeFormat: @"HTTP/%@ %hd %@\r\n",
 			      self.protocolVersionString, _statusCode,
-			      of_http_status_code_to_string(_statusCode)];
+			      OFHTTPStatusCodeString(_statusCode)];
 
 	headers = [[_headers mutableCopy] autorelease];
 
 	if ([headers objectForKey: @"Date"] == nil) {
 		OFString *date = [[OFDate date]
@@ -373,11 +373,11 @@
 	if (pos == OFNotFound)
 		return [self sendErrorAndClose: 400];
 
 	method = [line substringToIndex: pos];
 	@try {
-		_method = of_http_request_method_from_string(method);
+		_method = OFHTTPRequestMethodParseName(method);
 	} @catch (OFInvalidArgumentException *e) {
 		return [self sendErrorAndClose: 405];
 	}
 
 	@try {
@@ -497,12 +497,11 @@
 	    dateStringWithFormat: @"%a, %d %b %Y %H:%M:%S GMT"];
 	[_socket writeFormat: @"HTTP/1.1 %hd %@\r\n"
 			      @"Date: %@\r\n"
 			      @"Server: %@\r\n"
 			      @"\r\n",
-			      statusCode,
-			      of_http_status_code_to_string(statusCode),
+			      statusCode, OFHTTPStatusCodeString(statusCode),
 			      date, _server.name];
 	return false;
 }
 
 - (void)createResponse
@@ -548,11 +547,11 @@
 	[URL makeImmutable];
 
 	request = [OFHTTPRequest requestWithURL: URL];
 	request.method = _method;
 	request.protocolVersion =
-	    (of_http_request_protocol_version_t){ 1, _HTTPMinorVersion };
+	    (OFHTTPRequestProtocolVersion){ 1, _HTTPMinorVersion };
 	request.headers = _headers;
 	request.remoteAddress = _socket.remoteAddress;
 
 	response = [[[OFHTTPServerResponse alloc]
 	    initWithSocket: _socket