@@ -15,11 +15,11 @@
 
 #include "config.h"
 
 #import "OFString+PathAdditions.h"
 #import "OFArray.h"
-#import "OFFileURLHandler.h"
+#import "OFFileURIHandler.h"
 
 #import "OFOutOfRangeException.h"
 
 int _OFString_PathAdditions_reference;
 
@@ -279,11 +279,11 @@
 			}
 
 			if ([component isEqual: @".."] &&
 			    parent != nil && ![parent isEqual: @".."]) {
 				[array removeObjectsInRange:
-				    OFRangeMake(i - 1, 2)];
+				    OFMakeRange(i - 1, 2)];
 
 				done = false;
 				break;
 			}
 		}
@@ -337,28 +337,30 @@
 }
 
 - (bool)of_isDirectoryPath
 {
 	return ([self hasSuffix: @"/"] ||
-	    [OFFileURLHandler of_directoryExistsAtPath: self]);
+	    [OFFileURIHandler of_directoryExistsAtPath: self]);
 }
 
-- (OFString *)of_pathToURLPathWithURLEncodedHost: (OFString **)URLEncodedHost
+- (OFString *)of_pathToURIPathWithPercentEncodedHost:
+    (OFString **)percentEncodedHost
 {
-	return [self stringByPrependingString: @"/"];
+	return [@"/" stringByAppendingString: self];
 }
 
-- (OFString *)of_URLPathToPathWithURLEncodedHost: (OFString *)URLEncodedHost
+- (OFString *)of_URIPathToPathWithPercentEncodedHost:
+    (OFString *)percentEncodedHost
 {
 	OFString *path = self;
 
 	if (path.length > 1 && [path hasSuffix: @"/"])
 		path = [path substringToIndex: path.length - 1];
 
 	return [path substringFromIndex: 1];
 }
 
-- (OFString *)of_pathComponentToURLPathComponent
+- (OFString *)of_pathComponentToURIPathComponent
 {
 	return self;
 }
 @end