@@ -22,10 +22,11 @@
 
 #include <assert.h>
 
 #import "OFHTTPClient.h"
 #import "OFHTTPRequest.h"
+#import "OFHTTPRequestReply.h"
 #import "OFString.h"
 #import "OFTCPSocket.h"
 #import "OFThread.h"
 #import "OFCondition.h"
 #import "OFURL.h"
@@ -93,12 +94,12 @@
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	OFHTTPClientTestsServer *server;
 	OFURL *url;
 	OFHTTPClient *client;
-	OFHTTPRequest *req;
-	OFHTTPRequestResult *res;
+	OFHTTPRequest *request;
+	OFHTTPRequestReply *reply;
 
 	cond = [OFCondition condition];
 	[cond lock];
 
 	server = [[[OFHTTPClientTestsServer alloc] init] autorelease];
@@ -111,16 +112,16 @@
 	    [OFString stringWithFormat: @"http://127.0.0.1:%" @PRIu16 "/foo",
 					server->port]];
 
 	TEST(@"-[performRequest:]",
 	    R(client = [OFHTTPClient client]) &&
-	    R(req = [OFHTTPRequest requestWithURL: url]) &&
-	    R(res = [client performRequest: req]))
+	    R(request = [OFHTTPRequest requestWithURL: url]) &&
+	    R(reply = [client performRequest: request]))
 
 	TEST(@"Normalization of server header keys",
-	     ([[res headers] objectForKey: @"Content-Length"] != nil))
+	     ([[reply headers] objectForKey: @"Content-Length"] != nil))
 
 	[server join];
 
 	[pool drain];
 }
 @end