@@ -153,11 +153,11 @@
 		objc_autoreleasePoolPop(pool);
 		return @"";
 	}
 
 	components = [components objectsInRange:
-	    of_range(0, components.count - 1)];
+	    OFMakeRange(0, components.count - 1)];
 	ret = [OFString pathWithComponents: components];
 
 	[ret retain];
 	objc_autoreleasePoolPop(pool);
 	return [ret autorelease];
@@ -233,11 +233,11 @@
 			}
 
 			if ([component isEqual: @"/"] &&
 			    parent != nil && ![parent isEqual: @"/"]) {
 				[array removeObjectsInRange:
-				    of_range(i - 1, 2)];
+				    OFMakeRange(i - 1, 2)];
 
 				done = false;
 				break;
 			}
 		}