Index: src/OFArray.h
==================================================================
--- src/OFArray.h
+++ src/OFArray.h
@@ -415,11 +415,11 @@
  *		  ---------------------------|-------------------------
  *		  `OF_ARRAY_SORT_DESCENDING` | Sort in descending order
  * @return A sorted copy of the array
  */
 - (OFArray OF_GENERIC(ObjectType) *)
-    sortedArrayUsingComparator: (of_comparator_t)comparator
+    sortedArrayUsingComparator: (OFComparator)comparator
 		       options: (int)options;
 #endif
 
 /**
  * @brief Creates a new array with the specified object added.

Index: src/OFArray.m
==================================================================
--- src/OFArray.m
+++ src/OFArray.m
@@ -721,11 +721,11 @@
 	[new makeImmutable];
 	return new;
 }
 
 #ifdef OF_HAVE_BLOCKS
-- (OFArray *)sortedArrayUsingComparator: (of_comparator_t)comparator
+- (OFArray *)sortedArrayUsingComparator: (OFComparator)comparator
 				options: (int)options
 {
 	OFMutableArray *new = [[self mutableCopy] autorelease];
 	[new sortUsingComparator: comparator options: options];
 	[new makeImmutable];

Index: src/OFMutableArray.h
==================================================================
--- src/OFMutableArray.h
+++ src/OFMutableArray.h
@@ -215,11 +215,11 @@
  *		  Possible values are:
  *		  Value                      | Description
  *		  ---------------------------|-------------------------
  *		  `OF_ARRAY_SORT_DESCENDING` | Sort in descending order
  */
-- (void)sortUsingComparator: (of_comparator_t)comparator options: (int)options;
+- (void)sortUsingComparator: (OFComparator)comparator options: (int)options;
 #endif
 
 /**
  * @brief Reverts the order of the objects in the array.
  */

Index: src/OFMutableArray.m
==================================================================
--- src/OFMutableArray.m
+++ src/OFMutableArray.m
@@ -90,11 +90,11 @@
 }
 
 #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)
 {
 	OFComparisonResult ascending, descending;
 
 	if (options & OF_ARRAY_SORT_DESCENDING) {
 		ascending = OFOrderedDescending;
@@ -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;

Index: src/OFObject.h
==================================================================
--- src/OFObject.h
+++ src/OFObject.h
@@ -69,12 +69,11 @@
  *
  * @param left The left object
  * @param right The right object
  * @return The order of the objects
  */
-typedef OFComparisonResult (^of_comparator_t)(id _Nonnull left,
-    id _Nonnull right);
+typedef OFComparisonResult (^OFComparator)(id _Nonnull left, id _Nonnull right);
 #endif
 
 /**
  * @brief An enum for storing endianess.
  */