@@ -27,12 +27,12 @@
 # import "OFFileManager.h"
 #endif
 #import "OFStream.h"
 #import "OFString.h"
 #import "OFSystemInfo.h"
-#import "OFURL.h"
-#import "OFURLHandler.h"
+#import "OFURI.h"
+#import "OFURIHandler.h"
 #import "OFXMLElement.h"
 
 #import "OFInvalidArgumentException.h"
 #import "OFInvalidFormatException.h"
 #import "OFNotImplementedException.h"
@@ -91,13 +91,13 @@
 {
 	return [[[self alloc] initWithContentsOfFile: path] autorelease];
 }
 #endif
 
-+ (instancetype)dataWithContentsOfURL: (OFURL *)URL
++ (instancetype)dataWithContentsOfURI: (OFURI *)URI
 {
-	return [[[self alloc] initWithContentsOfURL: URL] autorelease];
+	return [[[self alloc] initWithContentsOfURI: URI] autorelease];
 }
 
 + (instancetype)dataWithStringRepresentation: (OFString *)string
 {
 	return [[[self alloc]
@@ -213,17 +213,17 @@
 
 	return self;
 }
 #endif
 
-- (instancetype)initWithContentsOfURL: (OFURL *)URL
+- (instancetype)initWithContentsOfURI: (OFURI *)URI
 {
 	self = [super init];
 
 	@try {
 		void *pool = objc_autoreleasePoolPush();
-		OFStream *stream = [OFURLHandler openItemAtURL: URL mode: @"r"];
+		OFStream *stream = [OFURIHandler openItemAtURI: URI mode: @"r"];
 		size_t pageSize;
 		unsigned char *buffer;
 
 		_count = 0;
 		_itemSize = 1;
@@ -589,15 +589,15 @@
 		[file release];
 	}
 }
 #endif
 
-- (void)writeToURL: (OFURL *)URL
+- (void)writeToURI: (OFURI *)URI
 {
 	void *pool = objc_autoreleasePoolPush();
 
-	[[OFURLHandler openItemAtURL: URL mode: @"w"] writeData: self];
+	[[OFURIHandler openItemAtURI: URI mode: @"w"] writeData: self];
 
 	objc_autoreleasePoolPop(pool);
 }
 
 - (OFXMLElement *)XMLElementBySerializing