@@ -18,11 +18,11 @@
 #include <string.h>
 
 #import "OFString.h"
 #import "OFArray.h"
 #import "OFApplication.h"
-#import "OFURL.h"
+#import "OFURI.h"
 #import "OFHTTPRequest.h"
 #import "OFHTTPResponse.h"
 #import "OFHTTPClient.h"
 #import "OFFile.h"
 #import "OFStdIOStream.h"
@@ -30,13 +30,13 @@
 #import "OFOutOfRangeException.h"
 
 #import "TableGenerator.h"
 #import "copyright.h"
 
-static OFString *const unicodeDataURL =
+static OFString *const unicodeDataURI =
     @"http://www.unicode.org/Public/UNIDATA/UnicodeData.txt";
-static OFString *const caseFoldingURL =
+static OFString *const caseFoldingURI =
     @"http://www.unicode.org/Public/UNIDATA/CaseFolding.txt";
 
 OF_APPLICATION_DELEGATE(TableGenerator)
 
 @implementation TableGenerator
@@ -66,12 +66,12 @@
 {
 	OFHTTPRequest *request;
 
 	[OFStdOut writeString: @"Downloading UnicodeData.txt…"];
 	_state = stateUnicodeData;
-	request = [OFHTTPRequest requestWithURL:
-	    [OFURL URLWithString: unicodeDataURL]];
+	request = [OFHTTPRequest requestWithURI:
+	    [OFURI URIWithString: unicodeDataURI]];
 	[_HTTPClient asyncPerformRequest: request];
 }
 
 -      (void)client: (OFHTTPClient *)client
   didPerformRequest: (OFHTTPRequest *)request
@@ -166,12 +166,12 @@
 
 	[OFStdOut writeLine: @" done"];
 
 	[OFStdOut writeString: @"Downloading CaseFolding.txt…"];
 	_state = stateCaseFolding;
-	request = [OFHTTPRequest requestWithURL:
-	    [OFURL URLWithString: caseFoldingURL]];
+	request = [OFHTTPRequest requestWithURI:
+	    [OFURI URIWithString: caseFoldingURI]];
 	[_HTTPClient asyncPerformRequest: request];
 }
 
 - (void)parseCaseFolding: (OFHTTPResponse *)response
 {
@@ -268,19 +268,19 @@
 	} while (!done);
 }
 
 - (void)writeFiles
 {
-	OFURL *URL;
+	OFURI *URI;
 
 	[OFStdOut writeString: @"Writing files…"];
 
-	URL = [OFURL fileURLWithPath: @"../../src/unicode.m"];
-	[self writeTablesToFile: URL.fileSystemRepresentation];
+	URI = [OFURI fileURIWithPath: @"../../src/unicode.m"];
+	[self writeTablesToFile: URI.fileSystemRepresentation];
 
-	URL = [OFURL fileURLWithPath: @"../../src/unicode.h"];
-	[self writeHeaderToFile: URL.fileSystemRepresentation];
+	URI = [OFURI fileURIWithPath: @"../../src/unicode.h"];
+	[self writeHeaderToFile: URI.fileSystemRepresentation];
 
 	[OFStdOut writeLine: @" done"];
 
 	[OFApplication terminate];
 }