@@ -69,11 +69,11 @@
 
 	/*
 	 * GZIP only compresses one file and thus has no path inside an
 	 * archive.
 	 */
-	if ([scheme isEqual: @"of-gzip"]) {
+	if ([scheme isEqual: @"gzip"]) {
 		stream = [OFURIHandler openItemAtURI: [OFURI URIWithString:
 							  URI.path]
 						mode: @"r"];
 		stream = [OFGZIPStream streamWithStream: stream mode: @"r"];
 		goto end;
@@ -90,11 +90,11 @@
 	    .stringByRemovingPercentEncoding];
 	path = [percentEncodedPath substringWithRange:
 	    OFMakeRange(pos + 1, percentEncodedPath.length - pos - 1)]
 	    .stringByRemovingPercentEncoding;
 
-	if ([scheme isEqual: @"of-lha"]) {
+	if ([scheme isEqual: @"lha"]) {
 		OFLHAArchive *archive = [OFLHAArchive archiveWithURI: archiveURI
 								mode: @"r"];
 		OFLHAArchiveEntry *entry;
 
 		while ((entry = [archive nextEntry]) != nil) {
@@ -105,11 +105,11 @@
 		}
 
 		@throw [OFOpenItemFailedException exceptionWithURI: URI
 							      mode: mode
 							     errNo: ENOENT];
-	} else if ([scheme isEqual: @"of-tar"]) {
+	} else if ([scheme isEqual: @"tar"]) {
 		OFTarArchive *archive = [OFTarArchive archiveWithURI: archiveURI
 								mode: @"r"];
 		OFTarArchiveEntry *entry;
 
 		while ((entry = [archive nextEntry]) != nil) {
@@ -120,11 +120,11 @@
 		}
 
 		@throw [OFOpenItemFailedException exceptionWithURI: URI
 							      mode: mode
 							     errNo: ENOENT];
-	} else if ([scheme isEqual: @"of-zip"]) {
+	} else if ([scheme isEqual: @"zip"]) {
 		OFZIPArchive *archive = [OFZIPArchive archiveWithURI: archiveURI
 								mode: @"r"];
 
 		stream = [archive streamForReadingFile: path];
 	} else