@@ -155,12 +155,12 @@
 	OFString *ret, *fileName;
 	size_t pos;
 
 	fileName = self.lastPathComponent;
 	pos = [fileName rangeOfString: @"."
-			      options: OF_STRING_SEARCH_BACKWARDS].location;
-	if (pos == OF_NOT_FOUND || pos == 0) {
+			      options: OFStringSearchBackwards].location;
+	if (pos == OFNotFound || pos == 0) {
 		objc_autoreleasePoolPop(pool);
 		return @"";
 	}
 
 	ret = [fileName substringFromIndex: pos + 1];
@@ -201,11 +201,11 @@
 		objc_autoreleasePoolPop(pool);
 		return @".";
 	}
 
 	components = [components objectsInRange:
-	    of_range(0, components.count - 1)];
+	    OFRangeMake(0, components.count - 1)];
 	ret = [OFString pathWithComponents: components];
 
 	[ret retain];
 	objc_autoreleasePoolPop(pool);
 	return [ret autorelease];
@@ -224,12 +224,12 @@
 	pool = objc_autoreleasePoolPush();
 	components = [[self.pathComponents mutableCopy] autorelease];
 	fileName = components.lastObject;
 
 	pos = [fileName rangeOfString: @"."
-			      options: OF_STRING_SEARCH_BACKWARDS].location;
-	if (pos == OF_NOT_FOUND || pos == 0) {
+			      options: OFStringSearchBackwards].location;
+	if (pos == OFNotFound || pos == 0) {
 		objc_autoreleasePoolPop(pool);
 		return [[self copy] autorelease];
 	}
 
 	fileName = [fileName substringToIndex: pos];
@@ -286,11 +286,11 @@
 			    ![parent hasSuffix: @":"] &&
 			    ![parent hasSuffix: @":\\"] &&
 			    ![parent hasSuffix: @"://"] &&
 			    (![parent hasPrefix: @"\\"] || i != 1)) {
 				[array removeObjectsInRange:
-				    of_range(i - 1, 2)];
+				    OFRangeMake(i - 1, 2)];
 
 				done = false;
 				break;
 			}
 		}
@@ -337,11 +337,11 @@
 
 		*URLEncodedHost = [[components objectAtIndex: 1]
 		     stringByURLEncodingWithAllowedCharacters:
 		     [OFCharacterSet URLHostAllowedCharacterSet]];
 		path = [OFString pathWithComponents: [components
-		    objectsInRange: of_range(2, components.count - 2)]];
+		    objectsInRange: OFRangeMake(2, components.count - 2)]];
 	}
 
 	path = [path stringByReplacingOccurrencesOfString: @"\\"
 					       withString: @"/"];
 	path = [path stringByPrependingString: @"/"];