@@ -15,20 +15,20 @@
 
 #include "config.h"
 
 #import "OFOpenItemFailedException.h"
 #import "OFString.h"
-#import "OFURL.h"
+#import "OFURI.h"
 
 @implementation OFOpenItemFailedException
-@synthesize URL = _URL, path = _path, mode = _mode, errNo = _errNo;
+@synthesize URI = _URI, path = _path, mode = _mode, errNo = _errNo;
 
-+ (instancetype)exceptionWithURL: (OFURL *)URL
++ (instancetype)exceptionWithURI: (OFURI *)URI
 			    mode: (OFString *)mode
 			   errNo: (int)errNo
 {
-	return [[[self alloc] initWithURL: URL
+	return [[[self alloc] initWithURI: URI
 				     mode: mode
 				    errNo: errNo] autorelease];
 }
 
 + (instancetype)exceptionWithPath: (OFString *)path
@@ -43,18 +43,18 @@
 + (instancetype)exception
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (instancetype)initWithURL: (OFURL *)URL
+- (instancetype)initWithURI: (OFURI *)URI
 		       mode: (OFString *)mode
 		      errNo: (int)errNo
 {
 	self = [super init];
 
 	@try {
-		_URL = [URL copy];
+		_URI = [URI copy];
 		_mode = [mode copy];
 		_errNo = errNo;
 	} @catch (id e) {
 		[self release];
 		@throw e;
@@ -86,11 +86,11 @@
 	OF_INVALID_INIT_METHOD
 }
 
 - (void)dealloc
 {
-	[_URL release];
+	[_URI release];
 	[_path release];
 	[_mode release];
 
 	[super dealloc];
 }
@@ -97,12 +97,12 @@
 
 - (OFString *)description
 {
 	id item = nil;
 
-	if (_URL != nil)
-		item = _URL;
+	if (_URI != nil)
+		item = _URI;
 	else if (_path != nil)
 		item = _path;
 
 	if (_mode != nil)
 		return [OFString stringWithFormat: