@@ -201,11 +201,11 @@
 		objc_autoreleasePoolPop(pool);
 		return @".";
 	}
 
 	components = [components objectsInRange:
-	    OFRangeMake(0, components.count - 1)];
+	    OFMakeRange(0, components.count - 1)];
 	ret = [OFString pathWithComponents: components];
 
 	[ret retain];
 	objc_autoreleasePoolPop(pool);
 	return [ret autorelease];
@@ -286,11 +286,11 @@
 			    ![parent hasSuffix: @":"] &&
 			    ![parent hasSuffix: @":\\"] &&
 			    ![parent hasSuffix: @"://"] &&
 			    (![parent hasPrefix: @"\\"] || i != 1)) {
 				[array removeObjectsInRange:
-				    OFRangeMake(i - 1, 2)];
+				    OFMakeRange(i - 1, 2)];
 
 				done = false;
 				break;
 			}
 		}
@@ -358,11 +358,11 @@
 
 		*URLEncodedHost = [[components objectAtIndex: 1]
 		     stringByURLEncodingWithAllowedCharacters:
 		     [OFCharacterSet URLHostAllowedCharacterSet]];
 		path = [OFString pathWithComponents: [components
-		    objectsInRange: OFRangeMake(2, components.count - 2)]];
+		    objectsInRange: OFMakeRange(2, components.count - 2)]];
 	}
 
 	path = [path stringByReplacingOccurrencesOfString: @"\\"
 					       withString: @"/"];
 	path = [path stringByPrependingString: @"/"];