@@ -20,12 +20,12 @@
 
 #include "config.h"
 
 #import "OFString+PathAdditions.h"
 #import "OFArray.h"
-#import "OFFileURIHandler.h"
-#import "OFURI.h"
+#import "OFFileIRIHandler.h"
+#import "OFIRI.h"
 
 #import "OFInvalidFormatException.h"
 #import "OFOutOfRangeException.h"
 
 int _OFString_PathAdditions_reference;
@@ -341,14 +341,14 @@
 }
 
 - (bool)of_isDirectoryPath
 {
 	return ([self hasSuffix: @"\\"] || [self hasSuffix: @"/"] ||
-	    [OFFileURIHandler of_directoryExistsAtPath: self]);
+	    [OFFileIRIHandler of_directoryExistsAtPath: self]);
 }
 
-- (OFString *)of_pathToURIPathWithPercentEncodedHost:
+- (OFString *)of_pathToIRIPathWithPercentEncodedHost:
     (OFString **)percentEncodedHost
 {
 	OFString *path = self;
 
 	if ([path hasPrefix: @"\\\\"]) {
@@ -357,11 +357,11 @@
 		if (components.count < 2)
 			@throw [OFInvalidFormatException exception];
 
 		*percentEncodedHost = [[components objectAtIndex: 1]
 		     stringByAddingPercentEncodingWithAllowedCharacters:
-		     [OFCharacterSet URIHostAllowedCharacterSet]];
+		     [OFCharacterSet IRIHostAllowedCharacterSet]];
 		path = [OFString pathWithComponents: [components
 		    objectsInRange: OFMakeRange(2, components.count - 2)]];
 	}
 
 	path = [path stringByReplacingOccurrencesOfString: @"\\"
@@ -369,11 +369,11 @@
 	path = [@"/" stringByAppendingString: path];
 
 	return path;
 }
 
-- (OFString *)of_URIPathToPathWithPercentEncodedHost:
+- (OFString *)of_IRIPathToPathWithPercentEncodedHost:
     (OFString *)percentEncodedHost
 {
 	OFString *path = self;
 
 	if (path.length > 1 && [path hasSuffix: @"/"] &&
@@ -396,11 +396,11 @@
 	}
 
 	return path;
 }
 
-- (OFString *)of_pathComponentToURIPathComponent
+- (OFString *)of_pathComponentToIRIPathComponent
 {
 	return [self stringByReplacingOccurrencesOfString: @"\\"
 					       withString: @"/"];
 }
 @end