@@ -40,12 +40,12 @@
 # import "OFFileManager.h"
 #endif
 #import "OFLocale.h"
 #import "OFStream.h"
 #import "OFSystemInfo.h"
-#import "OFURL.h"
-#import "OFURLHandler.h"
+#import "OFURI.h"
+#import "OFURIHandler.h"
 #import "OFUTF8String.h"
 #import "OFUTF8String+Private.h"
 #import "OFXMLElement.h"
 
 #import "OFGetItemAttributesFailedException.h"
@@ -131,13 +131,13 @@
 	_OFString_CryptographicHashing_reference = 1;
 	_OFString_JSONParsing_reference = 1;
 #ifdef OF_HAVE_FILES
 	_OFString_PathAdditions_reference = 1;
 #endif
+	_OFString_PercentEncoding_reference = 1;
 	_OFString_PropertyListParsing_reference = 1;
 	_OFString_Serialization_reference = 1;
-	_OFString_URLEncoding_reference = 1;
 	_OFString_XMLEscaping_reference = 1;
 	_OFString_XMLUnescaping_reference = 1;
 }
 
 void
@@ -580,19 +580,19 @@
 	return (id)[[OFUTF8String alloc] initWithContentsOfFile: path
 						       encoding: encoding];
 }
 #endif
 
-- (instancetype)initWithContentsOfURL: (OFURL *)URL
+- (instancetype)initWithContentsOfURI: (OFURI *)URI
 {
-	return (id)[[OFUTF8String alloc] initWithContentsOfURL: URL];
+	return (id)[[OFUTF8String alloc] initWithContentsOfURI: URI];
 }
 
-- (instancetype)initWithContentsOfURL: (OFURL *)URL
+- (instancetype)initWithContentsOfURI: (OFURI *)URI
 			     encoding: (OFStringEncoding)encoding
 {
-	return (id)[[OFUTF8String alloc] initWithContentsOfURL: URL
+	return (id)[[OFUTF8String alloc] initWithContentsOfURI: URI
 						      encoding: encoding];
 }
 
 - (instancetype)initWithSerialization: (OFXMLElement *)element
 {
@@ -794,19 +794,19 @@
 	return [[[self alloc] initWithContentsOfFile: path
 					    encoding: encoding] autorelease];
 }
 #endif
 
-+ (instancetype)stringWithContentsOfURL: (OFURL *)URL
++ (instancetype)stringWithContentsOfURI: (OFURI *)URI
 {
-	return [[[self alloc] initWithContentsOfURL: URL] autorelease];
+	return [[[self alloc] initWithContentsOfURI: URI] autorelease];
 }
 
-+ (instancetype)stringWithContentsOfURL: (OFURL *)URL
++ (instancetype)stringWithContentsOfURI: (OFURI *)URI
 			       encoding: (OFStringEncoding)encoding
 {
-	return [[[self alloc] initWithContentsOfURL: URL
+	return [[[self alloc] initWithContentsOfURI: URI
 					   encoding: encoding] autorelease];
 }
 
 - (instancetype)init
 {
@@ -1064,24 +1064,24 @@
 
 	return self;
 }
 #endif
 
-- (instancetype)initWithContentsOfURL: (OFURL *)URL
+- (instancetype)initWithContentsOfURI: (OFURI *)URI
 {
-	return [self initWithContentsOfURL: URL
+	return [self initWithContentsOfURI: URI
 				  encoding: OFStringEncodingAutodetect];
 }
 
-- (instancetype)initWithContentsOfURL: (OFURL *)URL
+- (instancetype)initWithContentsOfURI: (OFURI *)URI
 			     encoding: (OFStringEncoding)encoding
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFData *data;
 
 	@try {
-		data = [OFData dataWithContentsOfURL: URL];
+		data = [OFData dataWithContentsOfURI: URI];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
@@ -2739,21 +2739,21 @@
 	[file writeString: self encoding: encoding];
 	objc_autoreleasePoolPop(pool);
 }
 #endif
 
-- (void)writeToURL: (OFURL *)URL
+- (void)writeToURI: (OFURI *)URI
 {
-	[self writeToURL: URL encoding: OFStringEncodingUTF8];
+	[self writeToURI: URI encoding: OFStringEncodingUTF8];
 }
 
-- (void)writeToURL: (OFURL *)URL encoding: (OFStringEncoding)encoding
+- (void)writeToURI: (OFURI *)URI encoding: (OFStringEncoding)encoding
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFStream *stream;
 
-	stream = [OFURLHandler openItemAtURL: URL mode: @"w"];
+	stream = [OFURIHandler openItemAtURI: URI mode: @"w"];
 	[stream writeString: self encoding: encoding];
 
 	objc_autoreleasePoolPop(pool);
 }