@@ -294,11 +294,11 @@
 		}
 	}
 
 	@try {
 		if (encodingString != nil)
-			encoding = OFParseStringEncodingName(encodingString);
+			encoding = OFStringEncodingParseName(encodingString);
 	} @catch (OFInvalidArgumentException *e) {
 		[of_stderr writeLine: OF_LOCALIZED(
 		    @"invalid_encoding",
 		    @"%[prog]: Invalid encoding: %[encoding]",
 		    @"prog", [OFApplication programName],
@@ -314,11 +314,11 @@
 	case 'c':
 		if (remainingArguments.count < 1)
 			help(of_stderr, false, 1);
 
 		files = [remainingArguments objectsInRange:
-		    OFMakeRange(1, remainingArguments.count - 1)];
+		    OFRangeMake(1, remainingArguments.count - 1)];
 
 #ifdef OF_HAVE_SANDBOX
 		if (![remainingArguments.firstObject isEqual: @"-"])
 			[sandbox unveilPath: remainingArguments.firstObject
 				permissions: (mode == 'a' ? @"rwc" : @"wc")];
@@ -371,11 +371,11 @@
 		sandbox.allowsUnveil = false;
 		[OFApplication of_activateSandbox: sandbox];
 #endif
 
 		files = [remainingArguments objectsInRange:
-		    OFMakeRange(1, remainingArguments.count - 1)];
+		    OFRangeMake(1, remainingArguments.count - 1)];
 
 		archive = [self
 		    openArchiveWithPath: remainingArguments.firstObject
 				   type: type
 				   mode: mode
@@ -386,11 +386,11 @@
 	case 'x':
 		if (remainingArguments.count < 1)
 			help(of_stderr, false, 1);
 
 		files = [remainingArguments objectsInRange:
-		    OFMakeRange(1, remainingArguments.count - 1)];
+		    OFRangeMake(1, remainingArguments.count - 1)];
 
 #ifdef OF_HAVE_SANDBOX
 		if (![remainingArguments.firstObject isEqual: @"-"])
 			[sandbox unveilPath: remainingArguments.firstObject
 				permissions: @"r"];