@@ -13,12 +13,12 @@
  * file.
  */
 
 #include "config.h"
 
-#import "OFMutableURI.h"
-#import "OFURI+Private.h"
+#import "OFMutableIRI.h"
+#import "OFIRI+Private.h"
 #import "OFArray.h"
 #import "OFDictionary.h"
 #ifdef OF_HAVE_FILES
 # import "OFFileManager.h"
 #endif
@@ -27,17 +27,17 @@
 #import "OFString.h"
 
 #import "OFInvalidArgumentException.h"
 #import "OFInvalidFormatException.h"
 
-@implementation OFMutableURI
+@implementation OFMutableIRI
 @dynamic scheme, host, percentEncodedHost, port, user, percentEncodedUser;
 @dynamic password, percentEncodedPassword, path, percentEncodedPath;
 @dynamic pathComponents, query, percentEncodedQuery, queryItems, fragment;
 @dynamic percentEncodedFragment;
 
-+ (instancetype)URIWithScheme: (OFString *)scheme
++ (instancetype)IRIWithScheme: (OFString *)scheme
 {
 	return [[[self alloc] initWithScheme: scheme] autorelease];
 }
 
 - (instancetype)initWithScheme: (OFString *)scheme
@@ -61,12 +61,12 @@
 	OFString *old = _scheme;
 
 	if (scheme.length < 1 || !OFASCIIIsAlpha(*scheme.UTF8String))
 		@throw [OFInvalidFormatException exception];
 
-	OFURIVerifyIsEscaped(scheme,
-	    [OFCharacterSet URISchemeAllowedCharacterSet], false);
+	OFIRIVerifyIsEscaped(scheme,
+	    [OFCharacterSet IRISchemeAllowedCharacterSet], false);
 
 	_scheme = [scheme.lowercaseString copy];
 
 	[old release];
 
@@ -76,17 +76,17 @@
 - (void)setHost: (OFString *)host
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFString *old = _percentEncodedHost;
 
-	if (OFURIIsIPv6Host(host))
+	if (OFIRIIsIPv6Host(host))
 		_percentEncodedHost = [[OFString alloc]
 		    initWithFormat: @"[%@]", host];
 	else
 		_percentEncodedHost = [[host
 		    stringByAddingPercentEncodingWithAllowedCharacters:
-		    [OFCharacterSet URIHostAllowedCharacterSet]] copy];
+		    [OFCharacterSet IRIHostAllowedCharacterSet]] copy];
 
 	[old release];
 
 	objc_autoreleasePoolPop(pool);
 }
@@ -95,16 +95,16 @@
 {
 	OFString *old;
 
 	if ([percentEncodedHost hasPrefix: @"["] &&
 	    [percentEncodedHost hasSuffix: @"]"]) {
-		if (!OFURIIsIPv6Host([percentEncodedHost substringWithRange:
+		if (!OFIRIIsIPv6Host([percentEncodedHost substringWithRange:
 		    OFMakeRange(1, percentEncodedHost.length - 2)]))
 			@throw [OFInvalidFormatException exception];
 	} else if (percentEncodedHost != nil)
-		OFURIVerifyIsEscaped(percentEncodedHost,
-		    [OFCharacterSet URIHostAllowedCharacterSet], true);
+		OFIRIVerifyIsEscaped(percentEncodedHost,
+		    [OFCharacterSet IRIHostAllowedCharacterSet], true);
 
 	old = _percentEncodedHost;
 	_percentEncodedHost = [percentEncodedHost copy];
 	[old release];
 }
@@ -125,11 +125,11 @@
 	void *pool = objc_autoreleasePoolPush();
 	OFString *old = _percentEncodedUser;
 
 	_percentEncodedUser = [[user
 	    stringByAddingPercentEncodingWithAllowedCharacters:
-	    [OFCharacterSet URIUserAllowedCharacterSet]] copy];
+	    [OFCharacterSet IRIUserAllowedCharacterSet]] copy];
 
 	[old release];
 
 	objc_autoreleasePoolPop(pool);
 }
@@ -137,12 +137,12 @@
 - (void)setPercentEncodedUser: (OFString *)percentEncodedUser
 {
 	OFString *old;
 
 	if (percentEncodedUser != nil)
-		OFURIVerifyIsEscaped(percentEncodedUser,
-		    [OFCharacterSet URIUserAllowedCharacterSet], true);
+		OFIRIVerifyIsEscaped(percentEncodedUser,
+		    [OFCharacterSet IRIUserAllowedCharacterSet], true);
 
 	old = _percentEncodedUser;
 	_percentEncodedUser = [percentEncodedUser copy];
 	[old release];
 }
@@ -152,11 +152,11 @@
 	void *pool = objc_autoreleasePoolPush();
 	OFString *old = _percentEncodedPassword;
 
 	_percentEncodedPassword = [[password
 	    stringByAddingPercentEncodingWithAllowedCharacters:
-	    [OFCharacterSet URIPasswordAllowedCharacterSet]] copy];
+	    [OFCharacterSet IRIPasswordAllowedCharacterSet]] copy];
 
 	[old release];
 
 	objc_autoreleasePoolPop(pool);
 }
@@ -164,12 +164,12 @@
 - (void)setPercentEncodedPassword: (OFString *)percentEncodedPassword
 {
 	OFString *old;
 
 	if (percentEncodedPassword != nil)
-		OFURIVerifyIsEscaped(percentEncodedPassword,
-		    [OFCharacterSet URIPasswordAllowedCharacterSet], true);
+		OFIRIVerifyIsEscaped(percentEncodedPassword,
+		    [OFCharacterSet IRIPasswordAllowedCharacterSet], true);
 
 	old = _percentEncodedPassword;
 	_percentEncodedPassword = [percentEncodedPassword copy];
 	[old release];
 }
@@ -179,11 +179,11 @@
 	void *pool = objc_autoreleasePoolPush();
 	OFString *old = _percentEncodedPath;
 
 	_percentEncodedPath = [[path
 	    stringByAddingPercentEncodingWithAllowedCharacters:
-	    [OFCharacterSet URIPathAllowedCharacterSet]] copy];
+	    [OFCharacterSet IRIPathAllowedCharacterSet]] copy];
 
 	[old release];
 
 	objc_autoreleasePoolPop(pool);
 }
@@ -190,12 +190,12 @@
 
 - (void)setPercentEncodedPath: (OFString *)percentEncodedPath
 {
 	OFString *old;
 
-	OFURIVerifyIsEscaped(percentEncodedPath,
-	    [OFCharacterSet URIPathAllowedCharacterSet], true);
+	OFIRIVerifyIsEscaped(percentEncodedPath,
+	    [OFCharacterSet IRIPathAllowedCharacterSet], true);
 
 	old = _percentEncodedPath;
 	_percentEncodedPath = [percentEncodedPath copy];
 	[old release];
 }
@@ -224,11 +224,11 @@
 	void *pool = objc_autoreleasePoolPush();
 	OFString *old = _percentEncodedQuery;
 
 	_percentEncodedQuery = [[query
 	    stringByAddingPercentEncodingWithAllowedCharacters:
-	    [OFCharacterSet URIQueryAllowedCharacterSet]] copy];
+	    [OFCharacterSet IRIQueryAllowedCharacterSet]] copy];
 
 	[old release];
 
 	objc_autoreleasePoolPop(pool);
 }
@@ -236,12 +236,12 @@
 - (void)setPercentEncodedQuery: (OFString *)percentEncodedQuery
 {
 	OFString *old;
 
 	if (percentEncodedQuery != nil)
-		OFURIVerifyIsEscaped(percentEncodedQuery,
-		    [OFCharacterSet URIQueryAllowedCharacterSet], true);
+		OFIRIVerifyIsEscaped(percentEncodedQuery,
+		    [OFCharacterSet IRIQueryAllowedCharacterSet], true);
 
 	old = _percentEncodedQuery;
 	_percentEncodedQuery = [percentEncodedQuery copy];
 	[old release];
 }
@@ -261,11 +261,11 @@
 		return;
 	}
 
 	pool = objc_autoreleasePoolPush();
 	percentEncodedQuery = [OFMutableString string];
-	characterSet = [OFCharacterSet URIQueryKeyValueAllowedCharacterSet];
+	characterSet = [OFCharacterSet IRIQueryKeyValueAllowedCharacterSet];
 
 	for (OFPair OF_GENERIC(OFString *, OFString *) *item in queryItems) {
 		OFString *key = [item.firstObject
 		    stringByAddingPercentEncodingWithAllowedCharacters:
 		    characterSet];
@@ -291,11 +291,11 @@
 	void *pool = objc_autoreleasePoolPush();
 	OFString *old = _percentEncodedFragment;
 
 	_percentEncodedFragment = [[fragment
 	    stringByAddingPercentEncodingWithAllowedCharacters:
-	    [OFCharacterSet URIFragmentAllowedCharacterSet]] copy];
+	    [OFCharacterSet IRIFragmentAllowedCharacterSet]] copy];
 
 	[old release];
 
 	objc_autoreleasePoolPop(pool);
 }
@@ -303,21 +303,21 @@
 - (void)setPercentEncodedFragment: (OFString *)percentEncodedFragment
 {
 	OFString *old;
 
 	if (percentEncodedFragment != nil)
-		OFURIVerifyIsEscaped(percentEncodedFragment,
-		    [OFCharacterSet URIFragmentAllowedCharacterSet], true);
+		OFIRIVerifyIsEscaped(percentEncodedFragment,
+		    [OFCharacterSet IRIFragmentAllowedCharacterSet], true);
 
 	old = _percentEncodedFragment;
 	_percentEncodedFragment = [percentEncodedFragment copy];
 	[old release];
 }
 
 - (id)copy
 {
-	OFMutableURI *copy = [self mutableCopy];
+	OFMutableIRI *copy = [self mutableCopy];
 
 	[copy makeImmutable];
 
 	return copy;
 }
@@ -327,11 +327,11 @@
 	[self appendPathComponent: component isDirectory: false];
 
 #ifdef OF_HAVE_FILES
 	if ([_scheme isEqual: @"file"] &&
 	    ![_percentEncodedPath hasSuffix: @"/"] &&
-	    [[OFFileManager defaultManager] directoryExistsAtURI: self]) {
+	    [[OFFileManager defaultManager] directoryExistsAtIRI: self]) {
 		void *pool = objc_autoreleasePoolPush();
 		OFString *path = [_percentEncodedPath
 		    stringByAppendingString: @"/"];
 
 		[_percentEncodedPath release];
@@ -352,11 +352,11 @@
 		return;
 
 	pool = objc_autoreleasePoolPush();
 	component = [component
 	    stringByAddingPercentEncodingWithAllowedCharacters:
-	    [OFCharacterSet URIPathAllowedCharacterSet]];
+	    [OFCharacterSet IRIPathAllowedCharacterSet]];
 
 #if defined(OF_WINDOWS) || defined(OF_MSDOS)
 	if ([_percentEncodedPath hasSuffix: @"/"] ||
 	    ([_scheme isEqual: @"file"] &&
 	    [_percentEncodedPath hasSuffix: @":"]))
@@ -432,8 +432,8 @@
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)makeImmutable
 {
-	object_setClass(self, [OFURI class]);
+	object_setClass(self, [OFIRI class]);
 }
 @end