@@ -238,11 +238,11 @@
 {
 	size_t count = self.count;
 	id *buffer = of_alloc(count, sizeof(id));
 
 	@try {
-		[self getObjects: buffer inRange: OFMakeRange(0, count)];
+		[self getObjects: buffer inRange: OFRangeMake(0, count)];
 
 		return [[OFData dataWithItemsNoCopy: buffer
 					      count: count
 					   itemSize: sizeof(id)
 				       freeWhenDone: true] items];
@@ -743,11 +743,11 @@
 
 - (int)countByEnumeratingWithState: (OFFastEnumerationState *)state
 			   objects: (id *)objects
 			     count: (int)count
 {
-	OFRange range = OFMakeRange(state->state, count);
+	OFRange range = OFRangeMake(state->state, count);
 
 	if (range.length > SIZE_MAX - range.location)
 		@throw [OFOutOfRangeException exception];
 
 	if (range.location + range.length > self.count)