@@ -144,12 +144,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];
@@ -213,12 +213,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];
@@ -275,21 +275,20 @@
 			}
 
 			if ([component isEqual: @".."] &&
 			    parent != nil && ![parent isEqual: @".."]) {
 				[array removeObjectsInRange:
-				    of_range(i - 1, 2)];
+				    OFRangeMake(i - 1, 2)];
 
 				done = false;
 				break;
 			}
 		}
 	}
 
 	if (startsWithSlash)
-		[array insertObject: @""
-			    atIndex: 0];
+		[array insertObject: @"" atIndex: 0];
 
 	if ([self hasSuffix: @"/"])
 		[array addObject: @""];
 
 	ret = [[array componentsJoinedByString: @"/"] retain];