@@ -24,11 +24,11 @@
 #import "OFDataArray.h"
 #import "OFDate.h"
 #import "OFDictionary.h"
 #import "OFURL.h"
 #import "OFHTTPRequest.h"
-#import "OFHTTPRequestReply.h"
+#import "OFHTTPResponse.h"
 #import "OFTCPSocket.h"
 #import "OFTimer.h"
 
 #import "OFAlreadyConnectedException.h"
 #import "OFInvalidArgumentException.h"
@@ -162,11 +162,11 @@
 
 	return [OFString stringWithUTF8StringNoCopy: cString
 				       freeWhenDone: true];
 }
 
-@interface OFHTTPServerReply: OFHTTPRequestReply
+@interface OFHTTPServerResponse: OFHTTPResponse
 {
 	OFTCPSocket *_socket;
 	OFHTTPServer *_server;
 	bool _chunked, _headersSent, _closed;
 }
@@ -173,11 +173,11 @@
 
 - initWithSocket: (OFTCPSocket*)socket
 	  server: (OFHTTPServer*)server;
 @end
 
-@implementation OFHTTPServerReply
+@implementation OFHTTPServerResponse
 - initWithSocket: (OFTCPSocket*)socket
 	  server: (OFHTTPServer*)server
 {
 	self = [super init];
 
@@ -280,11 +280,11 @@
 	OFHTTPServer *_server;
 	OFTimer *_timer;
 	enum {
 		AWAITING_PROLOG,
 		PARSING_HEADERS,
-		SEND_REPLY
+		SEND_RESPONSE
 	} _state;
 	uint8_t _HTTPMinorVersion;
 	of_http_request_type_t _requestType;
 	OFString *_host, *_path;
 	uint16_t _port;
@@ -303,11 +303,11 @@
 -      (bool)socket: (OFTCPSocket*)socket
   didReadIntoBuffer: (const char*)buffer
 	     length: (size_t)length
 	  exception: (OFException*)exception;
 - (bool)sendErrorAndClose: (short)statusCode;
-- (void)createReply;
+- (void)createResponse;
 @end
 
 @implementation OFHTTPServer_Connection
 - initWithSocket: (OFTCPSocket*)socket
 	  server: (OFHTTPServer*)server
@@ -361,12 +361,12 @@
 			return [self parseProlog: line];
 		case PARSING_HEADERS:
 			if (![self parseHeaders: line])
 				return false;
 
-			if (_state == SEND_REPLY) {
-				[self createReply];
+			if (_state == SEND_RESPONSE) {
+				[self createResponse];
 				return false;
 			}
 
 			return true;
 		default:
@@ -439,11 +439,11 @@
 
 	if ([line length] == 0) {
 		switch (_requestType) {
 		case OF_HTTP_REQUEST_TYPE_GET:
 		case OF_HTTP_REQUEST_TYPE_HEAD:
-			_state = SEND_REPLY;
+			_state = SEND_RESPONSE;
 			break;
 		case OF_HTTP_REQUEST_TYPE_POST:;
 			OFString *tmp;
 			char *buffer;
 
@@ -533,11 +533,11 @@
 	[_POSTData addItems: buffer
 		      count: length];
 
 	if ([_POSTData count] >= _contentLength) {
 		@try {
-			[self createReply];
+			[self createResponse];
 		} @catch (OFWriteFailedException *e) {
 			return false;
 		}
 
 		return false;
@@ -562,15 +562,15 @@
 	[_socket close];
 
 	return false;
 }
 
-- (void)createReply
+- (void)createResponse
 {
 	OFURL *URL;
 	OFHTTPRequest *request;
-	OFHTTPServerReply *reply;
+	OFHTTPServerResponse *response;
 	size_t pos;
 
 	[_timer invalidate];
 	[_timer release];
 	_timer = nil;
@@ -609,17 +609,17 @@
 	    (of_http_request_protocol_version_t){ 1, _HTTPMinorVersion }];
 	[request setHeaders: _headers];
 	[request setPOSTData: _POSTData];
 	[request setRemoteAddress: [_socket remoteAddress]];
 
-	reply = [[[OFHTTPServerReply alloc]
+	response = [[[OFHTTPServerResponse alloc]
 	    initWithSocket: _socket
 		    server: _server] autorelease];
 
 	[[_server delegate] server: _server
 		 didReceiveRequest: request
-			     reply: reply];
+			  response: response];
 }
 @end
 
 @implementation OFHTTPServer
 + (instancetype)server