@@ -210,11 +210,11 @@
 	size_t i;
 
 	for (i = 0; i <= index; i++)
 		if OF_UNLIKELY ((string[i] & 0xC0) == 0x80)
 			if (++index > length)
-				return OF_INVALID_INDEX;
+				return OF_NOT_FOUND;
 
 	return index;
 }
 
 @implementation OFString_UTF8
@@ -1059,11 +1059,11 @@
 	if (cStringLength == 0)
 		return of_range(0, 0);
 
 	if (cStringLength > rangeLength ||
 	    rangeStart + rangeLength > s->cStringLength)
-		return of_range(OF_INVALID_INDEX, 0);
+		return of_range(OF_NOT_FOUND, 0);
 
 	if (options & OF_STRING_SEARCH_BACKWARDS) {
 		for (i = rangeLength - cStringLength;; i--) {
 			if (!memcmp(s->cString + rangeStart + i, cString,
 			    cStringLength)) {
@@ -1074,11 +1074,11 @@
 				return range;
 			}
 
 			/* Did not match and we're at the last char */
 			if (i == 0)
-				return of_range(OF_INVALID_INDEX, 0);
+				return of_range(OF_NOT_FOUND, 0);
 		}
 	} else {
 		for (i = 0; i <= rangeLength - cStringLength; i++) {
 			if (!memcmp(s->cString + rangeStart + i, cString,
 			    cStringLength)) {
@@ -1089,11 +1089,11 @@
 				return range;
 			}
 		}
 	}
 
-	return of_range(OF_INVALID_INDEX, 0);
+	return of_range(OF_NOT_FOUND, 0);
 }
 
 - (BOOL)containsString: (OFString*)string
 {
 	const char *cString = [string UTF8String];