@@ -164,11 +164,11 @@
 		{ 'v', @"verbose", 0, NULL, NULL },
 		{ 'x', @"extract", 0, NULL, NULL },
 		{ '\0', nil, 0, NULL, NULL }
 	};
 	OFUnichar option, mode = '\0';
-	of_string_encoding_t encoding = OF_STRING_ENCODING_AUTODETECT;
+	OFStringEncoding encoding = OFStringEncodingAutodetect;
 	OFOptionsParser *optionsParser;
 	OFArray OF_GENERIC(OFString *) *remainingArguments, *files;
 	id <Archive> archive;
 
 #ifdef OF_HAVE_SANDBOX
@@ -294,11 +294,11 @@
 		}
 	}
 
 	@try {
 		if (encodingString != nil)
-			encoding = of_string_parse_encoding(encodingString);
+			encoding = OFParseStringEncodingName(encodingString);
 	} @catch (OFInvalidArgumentException *e) {
 		[of_stderr writeLine: OF_LOCALIZED(
 		    @"invalid_encoding",
 		    @"%[prog]: Invalid encoding: %[encoding]",
 		    @"prog", [OFApplication programName],
@@ -462,11 +462,11 @@
 }
 
 - (id <Archive>)openArchiveWithPath: (OFString *)path
 			       type: (OFString *)type
 			       mode: (char)mode
-			   encoding: (of_string_encoding_t)encoding
+			   encoding: (OFStringEncoding)encoding
 {
 	OFString *modeString, *fileModeString;
 	OFStream *file = nil;
 	id <Archive> archive = nil;