@@ -64,11 +64,11 @@
 	OFString *_outputPath, *_currentFileName;
 	bool _continue, _force, _detectFileName, _detectFileNameRequest;
 	bool _detectedFileName, _quiet, _verbose, _insecure, _ignoreStatus;
 	bool _useUnicode;
 	OFStream *_body;
-	of_http_request_method_t _method;
+	OFHTTPRequestMethod _method;
 	OFMutableDictionary *_clientHeaders;
 	OFHTTPClient *_HTTPClient;
 	char *_buffer;
 	OFStream *_output;
 	unsigned long long _received, _length, _resumedFrom;
@@ -292,11 +292,11 @@
 - (instancetype)init
 {
 	self = [super init];
 
 	@try {
-		_method = OF_HTTP_REQUEST_METHOD_GET;
+		_method = OFHTTPRequestMethodGet;
 
 		_clientHeaders = [[OFMutableDictionary alloc]
 		    initWithObject: @"OFHTTP"
 			    forKey: @"User-Agent"];
 
@@ -368,11 +368,11 @@
 	void *pool = objc_autoreleasePoolPush();
 
 	method = method.uppercaseString;
 
 	@try {
-		_method = of_http_request_method_from_string(method);
+		_method = OFHTTPRequestMethodParseName(method);
 	} @catch (OFInvalidArgumentException *e) {
 		[of_stderr writeLine: OF_LOCALIZED(@"invalid_input_method",
 		    @"%[prog]: Invalid request method %[method]!",
 		    @"prog", [OFApplication programName],
 		    @"method", method)];
@@ -886,12 +886,11 @@
 				goto after_exception_handling;
 			}
 
 			statusCode = response.statusCode;
 			codeString = [OFString stringWithFormat: @"%hd %@",
-			    statusCode,
-			    of_http_status_code_to_string(statusCode)];
+			    statusCode, OFHTTPStatusCodeString(statusCode)];
 			[of_stderr writeLine: OF_LOCALIZED(@"download_failed",
 			    @"%[prog]: Failed to download <%[url]>!\n"
 			    @"  HTTP status code: %[code]",
 			    @"prog", [OFApplication programName],
 			    @"url", request.URL.string,
@@ -904,11 +903,11 @@
 			   afterDelay: 0];
 		return;
 	}
 
 after_exception_handling:
-	if (_method == OF_HTTP_REQUEST_METHOD_HEAD)
+	if (_method == OFHTTPRequestMethodHead)
 		goto next;
 
 	if (_detectFileNameRequest) {
 		_currentFileName = [fileNameFromContentDisposition(
 		    [response.headers objectForKey: @"Content-Disposition"])
@@ -1029,11 +1028,11 @@
 				[of_stdout writeFormat: @"? %@", URL.string];
 		}
 
 		request = [OFHTTPRequest requestWithURL: URL];
 		request.headers = clientHeaders;
-		request.method = OF_HTTP_REQUEST_METHOD_HEAD;
+		request.method = OFHTTPRequestMethodHead;
 
 		_detectFileNameRequest = true;
 		[_HTTPClient asyncPerformRequest: request];
 		return;
 	}