@@ -26,11 +26,11 @@
 #import "OFDictionary.h"
 #import "OFInflate64Stream.h"
 #import "OFInflateStream.h"
 #import "OFSeekableStream.h"
 #import "OFStream.h"
-#import "OFURLHandler.h"
+#import "OFURIHandler.h"
 
 #import "OFChecksumMismatchException.h"
 #import "OFInvalidArgumentException.h"
 #import "OFInvalidFormatException.h"
 #import "OFNotImplementedException.h"
@@ -160,13 +160,13 @@
 + (instancetype)archiveWithStream: (OFStream *)stream mode: (OFString *)mode
 {
 	return [[[self alloc] initWithStream: stream mode: mode] autorelease];
 }
 
-+ (instancetype)archiveWithURL: (OFURL *)URL mode: (OFString *)mode
++ (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode
 {
-	return [[[self alloc] initWithURL: URL mode: mode] autorelease];
+	return [[[self alloc] initWithURI: URI mode: mode] autorelease];
 }
 
 - (instancetype)init
 {
 	OF_INVALID_INIT_METHOD
@@ -217,20 +217,20 @@
 	}
 
 	return self;
 }
 
-- (instancetype)initWithURL: (OFURL *)URL mode: (OFString *)mode
+- (instancetype)initWithURI: (OFURI *)URI mode: (OFString *)mode
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFStream *stream;
 
 	@try {
 		if ([mode isEqual: @"a"])
-			stream = [OFURLHandler openItemAtURL: URL mode: @"r+"];
+			stream = [OFURIHandler openItemAtURI: URI mode: @"r+"];
 		else
-			stream = [OFURLHandler openItemAtURL: URL mode: mode];
+			stream = [OFURIHandler openItemAtURI: URI mode: mode];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}