@@ -114,11 +114,11 @@
 
 static OFString *
 constructRequestString(OFHTTPRequest *request)
 {
 	void *pool = objc_autoreleasePoolPush();
-	of_http_request_method_t method = request.method;
+	OFHTTPRequestMethod method = request.method;
 	OFURL *URL = request.URL;
 	OFString *path;
 	OFString *user = URL.user, *password = URL.password;
 	OFMutableString *requestString;
 	OFMutableDictionary OF_GENERIC(OFString *, OFString *) *headers;
@@ -130,11 +130,11 @@
 		path = URL.URLEncodedPath;
 	else
 		path = @"/";
 
 	requestString = [OFMutableString stringWithFormat:
-	    @"%s %@", of_http_request_method_to_string(method), path];
+	    @"%s %@", OFHTTPRequestMethodName(method), path];
 
 	if (URL.query != nil) {
 		[requestString appendString: @"?"];
 		[requestString appendString: URL.URLEncodedQuery];
 	}
@@ -233,21 +233,21 @@
 		str++;
 	}
 }
 
 static bool
-defaultShouldFollow(of_http_request_method_t method, short statusCode)
+defaultShouldFollow(OFHTTPRequestMethod method, short statusCode)
 {
 	bool follow;
 
 	/*
 	 * 301, 302 and 307 should only redirect with user confirmation if the
 	 * request method is not GET or HEAD. Asking the delegate and getting
 	 * true returned is considered user confirmation.
 	 */
-	if (method == OF_HTTP_REQUEST_METHOD_GET ||
-	    method == OF_HTTP_REQUEST_METHOD_HEAD)
+	if (method == OFHTTPRequestMethodGet ||
+	    method == OFHTTPRequestMethodHead)
 		follow = true;
 	/* 303 should always be redirected and converted to a GET request. */
 	else if (statusCode == 303)
 		follow = true;
 	else
@@ -330,11 +330,11 @@
 		response.of_keepAlive = true;
 
 		_client->_socket = [sock retain];
 		_client->_lastURL = [URL copy];
 		_client->_lastWasHEAD =
-		    (_request.method == OF_HTTP_REQUEST_METHOD_HEAD);
+		    (_request.method == OFHTTPRequestMethodHead);
 		_client->_lastResponse = [response retain];
 	}
 
 	if (_redirects > 0 && (_status == 301 || _status == 302 ||
 	    _status == 303 || _status == 307) &&
@@ -399,11 +399,11 @@
 					if ([key hasPrefix: @"Content-"] ||
 					    [key hasPrefix: @"Transfer-"])
 						[newHeaders
 						    removeObjectForKey: key];
 
-				newRequest.method = OF_HTTP_REQUEST_METHOD_GET;
+				newRequest.method = OFHTTPRequestMethodGet;
 			}
 
 			newRequest.URL = newURL;
 			newRequest.headers = newHeaders;