@@ -47,11 +47,11 @@
        OFMutablePair.m			\
        OFMutableSet.m			\
        OFMutableString.m		\
        OFMutableTarArchiveEntry.m	\
        OFMutableTriple.m		\
-       OFMutableURL.m			\
+       OFMutableURI.m			\
        OFMutableZIPArchiveEntry.m	\
        OFNotification.m			\
        OFNotificationCenter.m		\
        OFNull.m				\
        OFNumber.m			\
@@ -80,13 +80,13 @@
        OFStdIOStream.m			\
        OFStream.m			\
        OFString.m			\
        OFString+CryptographicHashing.m	\
        OFString+JSONParsing.m		\
+       OFString+PercentEncoding.m	\
        OFString+PropertyListParsing.m	\
        OFString+Serialization.m		\
-       OFString+URLEncoding.m		\
        OFString+XMLEscaping.m		\
        OFString+XMLUnescaping.m		\
        ${OF_SUBPROCESS_M}		\
        OFSettings.m			\
        OFSystemInfo.m			\
@@ -93,12 +93,12 @@
        OFTarArchive.m			\
        OFTarArchiveEntry.m		\
        OFThread.m			\
        OFTimer.m			\
        OFTriple.m			\
-       OFURL.m				\
-       OFURLHandler.m			\
+       OFURI.m				\
+       OFURIHandler.m			\
        OFUUID.m				\
        OFValue.m			\
        OFXMLAttribute.m			\
        OFXMLCDATA.m			\
        OFXMLCharacters.m		\
@@ -181,11 +181,11 @@
 	OFBitSetCharacterSet.m		\
 	OFBytesValue.m			\
 	OFCRC16.m			\
 	OFCRC32.m			\
 	OFCountedMapTableSet.m		\
-	OFEmbeddedFileURLHandler.m	\
+	OFEmbeddedURIHandler.m		\
 	OFHuffmanTree.m			\
 	OFINIFileSettings.m		\
 	OFInvertedCharacterSet.m	\
 	OFLHADecompressingStream.m	\
 	OFMapTableDictionary.m		\
@@ -207,14 +207,14 @@
 	OFUTF8String.m			\
 	${LIBBASES_M}			\
 	${RUNTIME_AUTORELEASE_M}	\
 	${RUNTIME_INSTANCE_M}		\
        ${UNICODE_M}
-SRCS_FILES += OFFileURLHandler.m
+SRCS_FILES += OFFileURIHandler.m
 SRCS_SOCKETS += OFDNSResolverSettings.m			\
 		${OF_EPOLL_KERNEL_EVENT_OBSERVER_M}	\
-		OFHTTPURLHandler.m			\
+		OFHTTPURIHandler.m			\
 		OFHostAddressResolver.m			\
 		OFIPSocketAsyncConnector.m		\
 		OFKernelEventObserver.m			\
 		${OF_KQUEUE_KERNEL_EVENT_OBSERVER_M}	\
 		${OF_POLL_KERNEL_EVENT_OBSERVER_M}	\