@@ -556,22 +556,22 @@
 
 	if (data == nil || data.itemSize != _itemSize)
 		@throw [OFInvalidArgumentException exception];
 
 	if ((searchLength = data.count) == 0)
-		return OFMakeRange(0, 0);
+		return OFRangeMake(0, 0);
 
 	if (searchLength > range.length)
-		return OFMakeRange(OFNotFound, 0);
+		return OFRangeMake(OFNotFound, 0);
 
 	search = data.items;
 
 	if (options & OFDataSearchBackwards) {
 		for (size_t i = range.length - searchLength;; i--) {
 			if (memcmp(_items + i * _itemSize, search,
 			    searchLength * _itemSize) == 0)
-				return OFMakeRange(i, searchLength);
+				return OFRangeMake(i, searchLength);
 
 			/* No match and we're at the last item */
 			if (i == 0)
 				break;
 		}
@@ -578,14 +578,14 @@
 	} else {
 		for (size_t i = range.location;
 		    i <= range.length - searchLength; i++)
 			if (memcmp(_items + i * _itemSize, search,
 			    searchLength * _itemSize) == 0)
-				return OFMakeRange(i, searchLength);
+				return OFRangeMake(i, searchLength);
 	}
 
-	return OFMakeRange(OFNotFound, 0);
+	return OFRangeMake(OFNotFound, 0);
 }
 
 #ifdef OF_HAVE_FILES
 - (void)writeToFile: (OFString *)path
 {