Index: src/OFArchiveURIHandler.m
==================================================================
--- src/OFArchiveURIHandler.m
+++ src/OFArchiveURIHandler.m
@@ -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

Index: src/OFEmbeddedURIHandler.m
==================================================================
--- src/OFEmbeddedURIHandler.m
+++ src/OFEmbeddedURIHandler.m
@@ -74,11 +74,11 @@
 @implementation OFEmbeddedURIHandler
 - (OFStream *)openItemAtURI: (OFURI *)URI mode: (OFString *)mode
 {
 	const char *path;
 
-	if (![URI.scheme isEqual: @"of-embedded"] || URI.host.length > 0 ||
+	if (![URI.scheme isEqual: @"embedded"] || URI.host.length > 0 ||
 	    URI.port != nil || URI.user != nil || URI.password != nil ||
 	    URI.query != nil || URI.fragment != nil)
 		@throw [OFInvalidArgumentException exception];
 
 	if (![mode isEqual: @"r"])

Index: src/OFLHAArchive.m
==================================================================
--- src/OFLHAArchive.m
+++ src/OFLHAArchive.m
@@ -93,11 +93,11 @@
 	return [[[self alloc] initWithURI: URI mode: mode] autorelease];
 }
 
 + (OFURI *)URIForFile: (OFString *)path inArchive: (OFURI *)archive
 {
-	return OFArchiveURIHandlerURIForFileInArchive(@"of-lha", path, archive);
+	return OFArchiveURIHandlerURIForFileInArchive(@"lha", path, archive);
 }
 
 - (instancetype)init
 {
 	OF_INVALID_INIT_METHOD

Index: src/OFTarArchive.m
==================================================================
--- src/OFTarArchive.m
+++ src/OFTarArchive.m
@@ -79,11 +79,11 @@
 	return [[[self alloc] initWithURI: URI mode: mode] autorelease];
 }
 
 + (OFURI *)URIForFile: (OFString *)path inArchive: (OFURI *)archive
 {
-	return OFArchiveURIHandlerURIForFileInArchive(@"of-tar", path, archive);
+	return OFArchiveURIHandlerURIForFileInArchive(@"tar", path, archive);
 }
 
 - (instancetype)init
 {
 	OF_INVALID_INIT_METHOD

Index: src/OFURIHandler.m
==================================================================
--- src/OFURIHandler.m
+++ src/OFURIHandler.m
@@ -59,22 +59,22 @@
 	mutex = [[OFMutex alloc] init];
 	atexit(releaseMutex);
 #endif
 
 	[self registerClass: [OFEmbeddedURIHandler class]
-		  forScheme: @"of-embedded"];
+		  forScheme: @"embedded"];
 #ifdef OF_HAVE_FILES
 	[self registerClass: [OFFileURIHandler class] forScheme: @"file"];
 #endif
 #if defined(OF_HAVE_SOCKETS) && defined(OF_HAVE_THREADS)
 	[self registerClass: [OFHTTPURIHandler class] forScheme: @"http"];
 	[self registerClass: [OFHTTPURIHandler class] forScheme: @"https"];
 #endif
-	[self registerClass: [OFArchiveURIHandler class] forScheme: @"of-gzip"];
-	[self registerClass: [OFArchiveURIHandler class] forScheme: @"of-lha"];
-	[self registerClass: [OFArchiveURIHandler class] forScheme: @"of-tar"];
-	[self registerClass: [OFArchiveURIHandler class] forScheme: @"of-zip"];
+	[self registerClass: [OFArchiveURIHandler class] forScheme: @"gzip"];
+	[self registerClass: [OFArchiveURIHandler class] forScheme: @"lha"];
+	[self registerClass: [OFArchiveURIHandler class] forScheme: @"tar"];
+	[self registerClass: [OFArchiveURIHandler class] forScheme: @"zip"];
 }
 
 + (bool)registerClass: (Class)class forScheme: (OFString *)scheme
 {
 #ifdef OF_HAVE_THREADS

Index: src/OFZIPArchive.m
==================================================================
--- src/OFZIPArchive.m
+++ src/OFZIPArchive.m
@@ -174,11 +174,11 @@
 	return [[[self alloc] initWithURI: URI mode: mode] autorelease];
 }
 
 + (OFURI *)URIForFile: (OFString *)path inArchive: (OFURI *)archive
 {
-	return OFArchiveURIHandlerURIForFileInArchive(@"of-zip", path, archive);
+	return OFArchiveURIHandlerURIForFileInArchive(@"zip", path, archive);
 }
 
 - (instancetype)init
 {
 	OF_INVALID_INIT_METHOD

Index: tests/OFHMACTests.m
==================================================================
--- tests/OFHMACTests.m
+++ tests/OFHMACTests.m
@@ -49,11 +49,11 @@
 
 @implementation TestsAppDelegate (OFHMACTests)
 - (void)HMACTests
 {
 	void *pool = objc_autoreleasePoolPush();
-	OFURI *URI = [OFURI URIWithString: @"of-embedded:testfile.bin"];
+	OFURI *URI = [OFURI URIWithString: @"embedded:testfile.bin"];
 	OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
 	OFHMAC *HMACMD5, *HMACSHA1, *HMACRMD160;
 	OFHMAC *HMACSHA256, *HMACSHA384, *HMACSHA512;
 
 	TEST(@"+[HMACWithHashClass:] with MD5",

Index: tests/OFINIFileTests.m
==================================================================
--- tests/OFINIFileTests.m
+++ tests/OFINIFileTests.m
@@ -51,11 +51,11 @@
 	OFURI *writeURI;
 #endif
 
 	module = @"OFINIFile";
 
-	URI = [OFURI URIWithString: @"of-embedded:testfile.ini"];
+	URI = [OFURI URIWithString: @"embedded:testfile.ini"];
 	TEST(@"+[fileWithURI:encoding:]",
 	    (file = [OFINIFile fileWithURI: URI
 				  encoding: OFStringEncodingCodepage437]))
 
 	tests = [file categoryForName: @"tests"];

Index: tests/OFMD5HashTests.m
==================================================================
--- tests/OFMD5HashTests.m
+++ tests/OFMD5HashTests.m
@@ -27,11 +27,11 @@
 @implementation TestsAppDelegate (OFMD5HashTests)
 - (void)MD5HashTests
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFMD5Hash *MD5, *MD5Copy;
-	OFURI *URI = [OFURI URIWithString: @"of-embedded:testfile.bin"];
+	OFURI *URI = [OFURI URIWithString: @"embedded:testfile.bin"];
 	OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
 
 	TEST(@"+[hashWithAllowsSwappableMemory:]",
 	    (MD5 = [OFMD5Hash hashWithAllowsSwappableMemory: true]))
 

Index: tests/OFRIPEMD160HashTests.m
==================================================================
--- tests/OFRIPEMD160HashTests.m
+++ tests/OFRIPEMD160HashTests.m
@@ -28,11 +28,11 @@
 @implementation TestsAppDelegate (OFRIPEMD160HashTests)
 - (void)RIPEMD160HashTests
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFRIPEMD160Hash *RIPEMD160, *RIPEMD160Copy;
-	OFURI *URI = [OFURI URIWithString: @"of-embedded:testfile.bin"];
+	OFURI *URI = [OFURI URIWithString: @"embedded:testfile.bin"];
 	OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
 
 	TEST(@"+[hashWithAllowsSwappableMemory:]",
 	    (RIPEMD160 = [OFRIPEMD160Hash hashWithAllowsSwappableMemory: true]))
 

Index: tests/OFSHA1HashTests.m
==================================================================
--- tests/OFSHA1HashTests.m
+++ tests/OFSHA1HashTests.m
@@ -28,11 +28,11 @@
 @implementation TestsAppDelegate (SHA1HashTests)
 - (void)SHA1HashTests
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFSHA1Hash *SHA1, *SHA1Copy;
-	OFURI *URI = [OFURI URIWithString: @"of-embedded:testfile.bin"];
+	OFURI *URI = [OFURI URIWithString: @"embedded:testfile.bin"];
 	OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
 
 	TEST(@"+[hashWithAllowsSwappableMemory:]",
 	    (SHA1 = [OFSHA1Hash hashWithAllowsSwappableMemory: true]))
 

Index: tests/OFSHA224HashTests.m
==================================================================
--- tests/OFSHA224HashTests.m
+++ tests/OFSHA224HashTests.m
@@ -28,11 +28,11 @@
 @implementation TestsAppDelegate (SHA224HashTests)
 - (void)SHA224HashTests
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFSHA224Hash *SHA224, *SHA224Copy;
-	OFURI *URI = [OFURI URIWithString: @"of-embedded:testfile.bin"];
+	OFURI *URI = [OFURI URIWithString: @"embedded:testfile.bin"];
 	OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
 
 	TEST(@"+[hashWithAllowsSwappableMemory:]",
 	    (SHA224 = [OFSHA224Hash hashWithAllowsSwappableMemory: true]))
 

Index: tests/OFSHA256HashTests.m
==================================================================
--- tests/OFSHA256HashTests.m
+++ tests/OFSHA256HashTests.m
@@ -28,11 +28,11 @@
 @implementation TestsAppDelegate (SHA256HashTests)
 - (void)SHA256HashTests
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFSHA256Hash *SHA256, *SHA256Copy;
-	OFURI *URI = [OFURI URIWithString: @"of-embedded:testfile.bin"];
+	OFURI *URI = [OFURI URIWithString: @"embedded:testfile.bin"];
 	OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
 
 	TEST(@"+[hashWithAllowsSwappableMemory:]",
 	    (SHA256 = [OFSHA256Hash hashWithAllowsSwappableMemory: true]))
 

Index: tests/OFSHA384HashTests.m
==================================================================
--- tests/OFSHA384HashTests.m
+++ tests/OFSHA384HashTests.m
@@ -29,11 +29,11 @@
 @implementation TestsAppDelegate (SHA384HashTests)
 - (void)SHA384HashTests
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFSHA384Hash *SHA384, *SHA384Copy;
-	OFURI *URI = [OFURI URIWithString: @"of-embedded:testfile.bin"];
+	OFURI *URI = [OFURI URIWithString: @"embedded:testfile.bin"];
 	OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
 
 	TEST(@"+[hashWithAllowsSwappableMemory:]",
 	    (SHA384 = [OFSHA384Hash hashWithAllowsSwappableMemory: true]))
 

Index: tests/OFSHA512HashTests.m
==================================================================
--- tests/OFSHA512HashTests.m
+++ tests/OFSHA512HashTests.m
@@ -30,11 +30,11 @@
 @implementation TestsAppDelegate (SHA512HashTests)
 - (void)SHA512HashTests
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFSHA512Hash *SHA512, *SHA512Copy;
-	OFURI *URI = [OFURI URIWithString: @"of-embedded:testfile.bin"];
+	OFURI *URI = [OFURI URIWithString: @"embedded:testfile.bin"];
 	OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
 
 	TEST(@"+[hashWithAllowsSwappableMemory:]",
 	    (SHA512 = [OFSHA512Hash hashWithAllowsSwappableMemory: true]))
 

Index: tests/OFSerializationTests.m
==================================================================
--- tests/OFSerializationTests.m
+++ tests/OFSerializationTests.m
@@ -60,13 +60,13 @@
 	[dict setObject: @"uuid" forKey: UUID];
 
 	TEST(@"-[stringBySerializing]",
 	    (string = dict.stringBySerializing) && [string isEqual:
 	    [OFString stringWithContentsOfURI:
-	    [OFURI URIWithString: @"of-embedded:serialization.xml"]]])
+	    [OFURI URIWithString: @"embedded:serialization.xml"]]])
 
 	TEST(@"-[objectByDeserializing]",
 	    [string.objectByDeserializing isEqual: dict])
 
 	objc_autoreleasePoolPop(pool);
 }
 @end