@@ -21,11 +21,11 @@
 
 #include <errno.h>
 
 #import "OFHTTPClient.h"
 #import "OFHTTPRequest.h"
-#import "OFHTTPRequestReply.h"
+#import "OFHTTPResponse.h"
 #import "OFString.h"
 #import "OFURL.h"
 #import "OFTCPSocket.h"
 #import "OFDictionary.h"
 #import "OFDataArray.h"
@@ -64,11 +64,11 @@
 		firstLetter = false;
 		str++;
 	}
 }
 
-@interface OFHTTPClientReply: OFHTTPRequestReply
+@interface OFHTTPClientResponse: OFHTTPResponse
 {
 	OFTCPSocket *_socket;
 	bool _hasContentLength, _chunked, _keepAlive, _atEndOfStream;
 	size_t _toRead;
 }
@@ -75,11 +75,11 @@
 
 - initWithSocket: (OFTCPSocket*)socket;
 - (void)setKeepAlive: (bool)keepAlive;
 @end
 
-@implementation OFHTTPClientReply
+@implementation OFHTTPClientResponse
 - initWithSocket: (OFTCPSocket*)socket
 {
 	self = [super init];
 
 	_socket = [socket retain];
@@ -281,11 +281,11 @@
 - (bool)insecureRedirectsAllowed
 {
 	return _insecureRedirectsAllowed;
 }
 
-- (OFHTTPRequestReply*)performRequest: (OFHTTPRequest*)request
+- (OFHTTPResponse*)performRequest: (OFHTTPRequest*)request
 {
 	return [self performRequest: request
 			  redirects: 10];
 }
 
@@ -316,22 +316,22 @@
 			 port: [URL port]];
 
 	return socket;
 }
 
-- (OFHTTPRequestReply*)performRequest: (OFHTTPRequest*)request
-			    redirects: (size_t)redirects
+- (OFHTTPResponse*)performRequest: (OFHTTPRequest*)request
+			redirects: (size_t)redirects
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFURL *URL = [request URL];
 	OFString *scheme = [URL scheme];
 	of_http_request_type_t requestType = [request requestType];
 	OFMutableString *requestString;
 	OFDictionary *headers = [request headers];
 	OFDataArray *POSTData = [request POSTData];
 	OFTCPSocket *socket;
-	OFHTTPClientReply *reply;
+	OFHTTPClientResponse *response;
 	OFString *line, *path, *version, *redirect, *keepAlive;
 	OFMutableDictionary *serverHeaders;
 	OFEnumerator *keyEnumerator, *objectEnumerator;
 	OFString *key, *object;
 	int status;
@@ -354,19 +354,19 @@
 
 		[_lastURL release];
 		_lastURL = nil;
 
 		/* Throw away content that has not been read yet */
-		while (![_lastReply isAtEndOfStream]) {
+		while (![_lastResponse isAtEndOfStream]) {
 			char buffer[512];
 
-			[_lastReply readIntoBuffer: buffer
-					    length: 512];
+			[_lastResponse readIntoBuffer: buffer
+					       length: 512];
 		}
 
-		[_lastReply release];
-		_lastReply = nil;
+		[_lastResponse release];
+		_lastResponse = nil;
 	} else
 		socket = [self OF_createSocketForRequest: request];
 
 	if (requestType == OF_HTTP_REQUEST_TYPE_GET)
 		type = "GET";
@@ -538,24 +538,24 @@
 		[_delegate     client: self
 		    didReceiveHeaders: serverHeaders
 			   statusCode: status
 			      request: request];
 
-	reply = [[[OFHTTPClientReply alloc] initWithSocket: socket]
+	response = [[[OFHTTPClientResponse alloc] initWithSocket: socket]
 	    autorelease];
-	[reply setProtocolVersionFromString: version];
-	[reply setStatusCode: status];
-	[reply setHeaders: serverHeaders];
+	[response setProtocolVersionFromString: version];
+	[response setStatusCode: status];
+	[response setHeaders: serverHeaders];
 
 	keepAlive = [serverHeaders objectForKey: @"Connection"];
 	if ([version isEqual: @"1.1"] ||
 	    (keepAlive != nil && [keepAlive isEqual: @"keep-alive"])) {
-		[reply setKeepAlive: true];
+		[response setKeepAlive: true];
 
 		_socket = [socket retain];
 		_lastURL = [URL copy];
-		_lastReply = [reply retain];
+		_lastResponse = [response retain];
 	}
 
 	if (redirects > 0 && (status == 301 || status == 302 ||
 	    status == 303 || status == 307) &&
 	    (redirect = [serverHeaders objectForKey: @"Location"]) != nil &&
@@ -596,20 +596,20 @@
 			return [self performRequest: newRequest
 					  redirects: redirects - 1];
 		}
 	}
 
-	[reply retain];
+	[response retain];
 	objc_autoreleasePoolPop(pool);
-	[reply autorelease];
+	[response autorelease];
 
 	if (status / 100 != 2)
 		@throw [OFHTTPRequestFailedException
 		    exceptionWithRequest: request
-				   reply: reply];
+				response: response];
 
-	return reply;
+	return response;
 }
 
 - (void)close
 {
 	[_socket close];
@@ -617,9 +617,9 @@
 	_socket = nil;
 
 	[_lastURL release];
 	_lastURL = nil;
 
-	[_lastReply release];
-	_lastReply = nil;
+	[_lastResponse release];
+	_lastResponse = nil;
 }
 @end