@@ -117,12 +117,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];
@@ -153,11 +153,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];
@@ -176,12 +176,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];
@@ -233,11 +233,11 @@
 			}
 
 			if ([component isEqual: @"/"] &&
 			    parent != nil && ![parent isEqual: @"/"]) {
 				[array removeObjectsInRange:
-				    of_range(i - 1, 2)];
+				    OFRangeMake(i - 1, 2)];
 
 				done = false;
 				break;
 			}
 		}