@@ -1823,11 +1823,11 @@
 
 	if ((searchLength = string.length) == 0)
 		return OFMakeRange(0, 0);
 
 	if (searchLength > range.length)
-		return OFMakeRange(OF_NOT_FOUND, 0);
+		return OFMakeRange(OFNotFound, 0);
 
 	if (range.length > SIZE_MAX / sizeof(of_unichar_t))
 		@throw [OFOutOfRangeException exception];
 
 	pool = objc_autoreleasePoolPush();
@@ -1866,11 +1866,11 @@
 		free(characters);
 	}
 
 	objc_autoreleasePoolPop(pool);
 
-	return OFMakeRange(OF_NOT_FOUND, 0);
+	return OFMakeRange(OFNotFound, 0);
 }
 
 - (size_t)indexOfCharacterFromSet: (OFCharacterSet *)characterSet
 {
 	return [self indexOfCharacterFromSet: characterSet
@@ -1894,11 +1894,11 @@
 	    (bool (*)(id, SEL, of_unichar_t))[characterSet
 	    methodForSelector: @selector(characterIsMember:)];
 	of_unichar_t *characters;
 
 	if (range.length == 0)
-		return OF_NOT_FOUND;
+		return OFNotFound;
 
 	if (range.length > SIZE_MAX / sizeof(of_unichar_t))
 		@throw [OFOutOfRangeException exception];
 
 	characters = of_alloc(range.length, sizeof(of_unichar_t));
@@ -1925,11 +1925,11 @@
 		}
 	} @finally {
 		free(characters);
 	}
 
-	return OF_NOT_FOUND;
+	return OFNotFound;
 }
 
 - (bool)containsString: (OFString *)string
 {
 	void *pool;