@@ -32,32 +32,32 @@
 } placeholder;
 
 @interface OFMutableArrayPlaceholder: OFMutableArray
 @end
 
-static of_comparison_result_t
+static OFComparisonResult
 compare(id left, id right, SEL selector)
 {
-	of_comparison_result_t (*comparator)(id, SEL, id) =
-	    (of_comparison_result_t (*)(id, SEL, id))
+	OFComparisonResult (*comparator)(id, SEL, id) =
+	    (OFComparisonResult (*)(id, SEL, id))
 	    [left methodForSelector: selector];
 
 	return comparator(left, selector, right);
 }
 
 static void
 quicksort(OFMutableArray *array, size_t left, size_t right, SEL selector,
     int options)
 {
-	of_comparison_result_t ascending, descending;
+	OFComparisonResult ascending, descending;
 
 	if (options & OF_ARRAY_SORT_DESCENDING) {
-		ascending = OF_ORDERED_DESCENDING;
-		descending = OF_ORDERED_ASCENDING;
+		ascending = OFOrderedDescending;
+		descending = OFOrderedAscending;
 	} else {
-		ascending = OF_ORDERED_ASCENDING;
-		descending = OF_ORDERED_DESCENDING;
+		ascending = OFOrderedAscending;
+		descending = OFOrderedDescending;
 	}
 
 	while (left < right) {
 		size_t i = left;
 		size_t j = right - 1;
@@ -90,20 +90,20 @@
 }
 
 #ifdef OF_HAVE_BLOCKS
 static void
 quicksortWithBlock(OFMutableArray *array, size_t left, size_t right,
-    of_comparator_t comparator, int options)
+    OFComparator comparator, int options)
 {
-	of_comparison_result_t ascending, descending;
+	OFComparisonResult ascending, descending;
 
 	if (options & OF_ARRAY_SORT_DESCENDING) {
-		ascending = OF_ORDERED_DESCENDING;
-		descending = OF_ORDERED_ASCENDING;
+		ascending = OFOrderedDescending;
+		descending = OFOrderedAscending;
 	} else {
-		ascending = OF_ORDERED_ASCENDING;
-		descending = OF_ORDERED_DESCENDING;
+		ascending = OFOrderedAscending;
+		descending = OFOrderedDescending;
 	}
 
 	while (left < right) {
 		size_t i = left;
 		size_t j = right - 1;
@@ -360,11 +360,11 @@
 			return;
 		}
 	}
 }
 
-- (void)removeObjectsInRange: (of_range_t)range
+- (void)removeObjectsInRange: (OFRange)range
 {
 	for (size_t i = 0; i < range.length; i++)
 		[self removeObjectAtIndex: range.location];
 }
 
@@ -378,11 +378,11 @@
 	[self removeObjectAtIndex: count - 1];
 }
 
 - (void)removeAllObjects
 {
-	[self removeObjectsInRange: of_range(0, self.count)];
+	[self removeObjectsInRange: OFMakeRange(0, self.count)];
 }
 
 #ifdef OF_HAVE_BLOCKS
 - (void)replaceObjectsUsingBlock: (of_array_replace_block_t)block
 {
@@ -425,11 +425,11 @@
 
 	quicksort(self, 0, count - 1, selector, options);
 }
 
 #ifdef OF_HAVE_BLOCKS
-- (void)sortUsingComparator: (of_comparator_t)comparator options: (int)options
+- (void)sortUsingComparator: (OFComparator)comparator options: (int)options
 {
 	size_t count = self.count;
 
 	if (count == 0 || count == 1)
 		return;