@@ -19,15 +19,15 @@
 
 #import "OFApplication.h"
 #import "OFArray.h"
 #import "OFFile.h"
 #import "OFFileManager.h"
+#import "OFIRI.h"
 #import "OFLocale.h"
 #import "OFOptionsParser.h"
 #import "OFSandbox.h"
 #import "OFStdIOStream.h"
-#import "OFURI.h"
 
 #import "OFArc.h"
 #import "GZIPArchive.h"
 #import "LHAArchive.h"
 #import "TarArchive.h"
@@ -205,15 +205,15 @@
 
 	[OFApplication of_activateSandbox: sandbox];
 #endif
 
 #ifndef OF_AMIGAOS
-	[OFLocale addLocalizationDirectoryURI:
-	    [OFURI fileURIWithPath: @LOCALIZATION_DIR]];
+	[OFLocale addLocalizationDirectoryIRI:
+	    [OFIRI fileIRIWithPath: @LOCALIZATION_DIR]];
 #else
-	[OFLocale addLocalizationDirectoryURI:
-	    [OFURI fileURIWithPath: @"PROGDIR:/share/ofarc/localization"]];
+	[OFLocale addLocalizationDirectoryIRI:
+	    [OFIRI fileIRIWithPath: @"PROGDIR:/share/ofarc/localization"]];
 #endif
 
 	optionsParser = [OFOptionsParser parserWithOptions: options];
 	while ((option = [optionsParser nextOption]) != '\0') {
 		switch (option) {
@@ -461,11 +461,11 @@
 				     encoding: [OFLocale encoding]];
 			[OFStdErr writeString: @"\r"];
 			[OFStdErr writeLine: OF_LOCALIZED(
 			    @"failed_to_create_directory",
 			    @"Failed to create directory %[dir]: %[error]",
-			    @"dir", e.URI.fileSystemRepresentation,
+			    @"dir", e.IRI.fileSystemRepresentation,
 			    @"error", error)];
 			_exitStatus = 1;
 		} @catch (OFOpenItemFailedException *e) {
 			OFString *error = [OFString
 			    stringWithCString: strerror(e.errNo)