@@ -491,11 +491,11 @@
 	OF_HASH_FINALIZE(hash);
 
 	return hash;
 }
 
-- (OFData *)subdataWithRange: (of_range_t)range
+- (OFData *)subdataWithRange: (OFRange)range
 {
 	OFData *ret;
 
 	if (range.length > SIZE_MAX - range.location ||
 	    range.location + range.length > _count)
@@ -543,13 +543,13 @@
 - (OFString *)stringByBase64Encoding
 {
 	return of_base64_encode(_items, _count * _itemSize);
 }
 
-- (of_range_t)rangeOfData: (OFData *)data
-		  options: (int)options
-		    range: (of_range_t)range
+- (OFRange)rangeOfData: (OFData *)data
+	       options: (int)options
+		 range: (OFRange)range
 {
 	const char *search;
 	size_t searchLength;
 
 	if (range.length > SIZE_MAX - range.location ||
@@ -558,22 +558,22 @@
 
 	if (data == nil || data.itemSize != _itemSize)
 		@throw [OFInvalidArgumentException exception];
 
 	if ((searchLength = data.count) == 0)
-		return of_range(0, 0);
+		return OFMakeRange(0, 0);
 
 	if (searchLength > range.length)
-		return of_range(OF_NOT_FOUND, 0);
+		return OFMakeRange(OF_NOT_FOUND, 0);
 
 	search = data.items;
 
 	if (options & OF_DATA_SEARCH_BACKWARDS) {
 		for (size_t i = range.length - searchLength;; i--) {
 			if (memcmp(_items + i * _itemSize, search,
 			    searchLength * _itemSize) == 0)
-				return of_range(i, searchLength);
+				return OFMakeRange(i, searchLength);
 
 			/* No match and we're at the last item */
 			if (i == 0)
 				break;
 		}
@@ -580,14 +580,14 @@
 	} else {
 		for (size_t i = range.location;
 		    i <= range.length - searchLength; i++)
 			if (memcmp(_items + i * _itemSize, search,
 			    searchLength * _itemSize) == 0)
-				return of_range(i, searchLength);
+				return OFMakeRange(i, searchLength);
 	}
 
-	return of_range(OF_NOT_FOUND, 0);
+	return OFMakeRange(OF_NOT_FOUND, 0);
 }
 
 #ifdef OF_HAVE_FILES
 - (void)writeToFile: (OFString *)path
 {