@@ -23,11 +23,11 @@
 #import "OFFileManager.h"
 #import "OFLocale.h"
 #import "OFOptionsParser.h"
 #import "OFSandbox.h"
 #import "OFStdIOStream.h"
-#import "OFURL.h"
+#import "OFURI.h"
 
 #import "OFArc.h"
 #import "GZIPArchive.h"
 #import "LHAArchive.h"
 #import "TarArchive.h"
@@ -205,13 +205,14 @@
 
 	[OFApplication of_activateSandbox: sandbox];
 #endif
 
 #ifndef OF_AMIGAOS
-	[OFLocale addLanguageDirectory: @LANGUAGE_DIR];
+	[OFLocale addLocalizationDirectory: @LOCALIZATION_DIR];
 #else
-	[OFLocale addLanguageDirectory: @"PROGDIR:/share/ofarc/lang"];
+	[OFLocale addLocalizationDirectory:
+	    @"PROGDIR:/share/ofarc/localization"];
 #endif
 
 	optionsParser = [OFOptionsParser parserWithOptions: options];
 	while ((option = [optionsParser nextOption]) != '\0') {
 		switch (option) {
@@ -335,11 +336,11 @@
 	case 'c':
 		if (remainingArguments.count < 1)
 			help(OFStdErr, false, 1);
 
 		files = [remainingArguments objectsInRange:
-		    OFRangeMake(1, remainingArguments.count - 1)];
+		    OFMakeRange(1, remainingArguments.count - 1)];
 
 #ifdef OF_HAVE_SANDBOX
 		if (![remainingArguments.firstObject isEqual: @"-"])
 			[sandbox unveilPath: remainingArguments.firstObject
 				permissions: (mode == 'a' ? @"rwc" : @"wc")];
@@ -392,11 +393,11 @@
 		sandbox.allowsUnveil = false;
 		[OFApplication of_activateSandbox: sandbox];
 #endif
 
 		files = [remainingArguments objectsInRange:
-		    OFRangeMake(1, remainingArguments.count - 1)];
+		    OFMakeRange(1, remainingArguments.count - 1)];
 
 		archive = [self
 		    openArchiveWithPath: remainingArguments.firstObject
 				   type: type
 				   mode: mode
@@ -407,11 +408,11 @@
 	case 'x':
 		if (remainingArguments.count < 1)
 			help(OFStdErr, false, 1);
 
 		files = [remainingArguments objectsInRange:
-		    OFRangeMake(1, remainingArguments.count - 1)];
+		    OFMakeRange(1, remainingArguments.count - 1)];
 
 #ifdef OF_HAVE_SANDBOX
 		if (![remainingArguments.firstObject isEqual: @"-"])
 			[sandbox unveilPath: remainingArguments.firstObject
 				permissions: @"r"];
@@ -459,11 +460,11 @@
 				     encoding: [OFLocale encoding]];
 			[OFStdErr writeString: @"\r"];
 			[OFStdErr writeLine: OF_LOCALIZED(
 			    @"failed_to_create_directory",
 			    @"Failed to create directory %[dir]: %[error]",
-			    @"dir", e.URL.fileSystemRepresentation,
+			    @"dir", e.URI.fileSystemRepresentation,
 			    @"error", error)];
 			_exitStatus = 1;
 		} @catch (OFOpenItemFailedException *e) {
 			OFString *error = [OFString
 			    stringWithCString: strerror(e.errNo)