@@ -301,11 +301,11 @@
 	of_http_request_method_t _method;
 	OFString *_host, *_path;
 	uint16_t _port;
 	OFMutableDictionary *_headers;
 	size_t _contentLength;
-	OFDataArray *_entity;
+	OFDataArray *_body;
 }
 
 - initWithSocket: (OFTCPSocket*)socket
 	  server: (OFHTTPServer*)server;
 - (bool)socket: (OFTCPSocket*)socket
@@ -354,11 +354,11 @@
 	[_timer release];
 
 	[_host release];
 	[_path release];
 	[_headers release];
-	[_entity release];
+	[_body release];
 
 	[super dealloc];
 }
 
 - (bool)socket: (OFTCPSocket*)socket
@@ -468,11 +468,11 @@
 
 		if (contentLength > 0) {
 			char *buffer;
 
 			buffer = [self allocMemoryWithSize: BUFFER_SIZE];
-			_entity = [[OFDataArray alloc] init];
+			_body = [[OFDataArray alloc] init];
 
 			[_socket asyncReadIntoBuffer: buffer
 					      length: BUFFER_SIZE
 					      target: self
 					    selector: @selector(socket:
@@ -541,14 +541,14 @@
 	  exception: (OFException*)exception
 {
 	if ([socket isAtEndOfStream] || exception != nil)
 		return false;
 
-	[_entity addItems: buffer
-		    count: length];
+	[_body addItems: buffer
+		  count: length];
 
-	if ([_entity count] >= _contentLength) {
+	if ([_body count] >= _contentLength) {
 		/*
 		 * Manually free the buffer here. While this is not required
 		 * now as the async read is the only thing referencing self and
 		 * the buffer is allocated on self, it is required once
 		 * Connection: keep-alive is implemented.
@@ -626,11 +626,11 @@
 	request = [OFHTTPRequest requestWithURL: URL];
 	[request setMethod: _method];
 	[request setProtocolVersion:
 	    (of_http_request_protocol_version_t){ 1, _HTTPMinorVersion }];
 	[request setHeaders: _headers];
-	[request setEntity: _entity];
+	[request setBody: _body];
 	[request setRemoteAddress: [_socket remoteAddress]];
 
 	response = [[[OFHTTPServerResponse alloc]
 	    initWithSocket: _socket
 		    server: _server] autorelease];