Index: generators/TableGenerator.m
==================================================================
--- generators/TableGenerator.m
+++ generators/TableGenerator.m
@@ -21,13 +21,14 @@
 #import "OFString.h"
 #import "OFArray.h"
 #import "OFApplication.h"
 #import "OFURL.h"
 #import "OFHTTPRequest.h"
-#import "OFHTTPRequestReply.h"
+#import "OFHTTPResponse.h"
 #import "OFHTTPClient.h"
 #import "OFFile.h"
+#import "OFStdIOStream.h"
 
 #import "autorelease.h"
 
 #import "TableGenerator.h"
 #import "copyright.h"
@@ -70,21 +71,21 @@
 - (void)parseUnicodeData
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFHTTPRequest *request;
 	OFHTTPClient *client;
-	OFHTTPRequestReply *reply;
+	OFHTTPResponse *response;
 	OFString *line;
 
 	[of_stdout writeString: @"Downloading and parsing UnicodeData.txt..."];
 
 	request = [OFHTTPRequest requestWithURL:
 	    [OFURL URLWithString: UNICODE_DATA_URL]];
 	client = [OFHTTPClient client];
-	reply = [client performRequest: request];
+	response = [client performRequest: request];
 
-	while ((line = [reply readLine]) != nil) {
+	while ((line = [response readLine]) != nil) {
 		void *pool2;
 		OFArray *split;
 		OFString **splitObjects;
 		of_unichar_t codep;
 
@@ -119,21 +120,21 @@
 - (void)parseCaseFolding
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFHTTPRequest *request;
 	OFHTTPClient *client;
-	OFHTTPRequestReply *reply;
+	OFHTTPResponse *response;
 	OFString *line;
 
 	[of_stdout writeString: @"Downloading and parsing CaseFolding.txt..."];
 
 	request = [OFHTTPRequest requestWithURL:
 	    [OFURL URLWithString: CASE_FOLDING_URL]];
 	client = [OFHTTPClient client];
-	reply = [client performRequest: request];
+	response = [client performRequest: request];
 
-	while ((line = [reply readLine]) != nil) {
+	while ((line = [response readLine]) != nil) {
 		void *pool2;
 		OFArray *split;
 		OFString **splitObjects;
 		of_unichar_t codep;