@@ -14,45 +14,45 @@
  */
 
 #include "config.h"
 
 #import "OFCopyItemFailedException.h"
+#import "OFIRI.h"
 #import "OFString.h"
-#import "OFURI.h"
 
 @implementation OFCopyItemFailedException
-@synthesize sourceURI = _sourceURI, destinationURI = _destinationURI;
+@synthesize sourceIRI = _sourceIRI, destinationIRI = _destinationIRI;
 @synthesize errNo = _errNo;
 
 + (instancetype)exception
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-+ (instancetype)exceptionWithSourceURI: (OFURI *)sourceURI
-			destinationURI: (OFURI *)destinationURI
++ (instancetype)exceptionWithSourceIRI: (OFIRI *)sourceIRI
+			destinationIRI: (OFIRI *)destinationIRI
 				 errNo: (int)errNo
 {
-	return [[[self alloc] initWithSourceURI: sourceURI
-				 destinationURI: destinationURI
+	return [[[self alloc] initWithSourceIRI: sourceIRI
+				 destinationIRI: destinationIRI
 					  errNo: errNo] autorelease];
 }
 
 - (instancetype)init
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- (instancetype)initWithSourceURI: (OFURI *)sourceURI
-		   destinationURI: (OFURI *)destinationURI
+- (instancetype)initWithSourceIRI: (OFIRI *)sourceIRI
+		   destinationIRI: (OFIRI *)destinationIRI
 			    errNo: (int)errNo
 {
 	self = [super init];
 
 	@try {
-		_sourceURI = [sourceURI copy];
-		_destinationURI = [destinationURI copy];
+		_sourceIRI = [sourceIRI copy];
+		_destinationIRI = [destinationIRI copy];
 		_errNo = errNo;
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
@@ -60,17 +60,17 @@
 	return self;
 }
 
 - (void)dealloc
 {
-	[_sourceURI release];
-	[_destinationURI release];
+	[_sourceIRI release];
+	[_destinationIRI release];
 
 	[super dealloc];
 }
 
 - (OFString *)description
 {
 	return [OFString stringWithFormat: @"Failed to copy item %@ to %@: %@",
-	    _sourceURI, _destinationURI, OFStrError(_errNo)];
+	    _sourceIRI, _destinationIRI, OFStrError(_errNo)];
 }
 @end