@@ -25,11 +25,11 @@
  *
  * @param object The object to replace
  * @param index The index of the object to replace
  * @return The object to replace the object with
  */
-typedef id _Nonnull (^of_array_replace_block_t)(id object, size_t index);
+typedef id _Nonnull (^OFArrayReplaceBlock)(id object, size_t index);
 #endif
 
 /**
  * @class OFMutableArray OFArray.h ObjFW/OFArray.h
  *
@@ -175,11 +175,11 @@
 /**
  * @brief Replaces each object with the object returned by the block.
  *
  * @param block The block which returns a new object for each object
  */
-- (void)replaceObjectsUsingBlock: (of_array_replace_block_t)block;
+- (void)replaceObjectsUsingBlock: (OFArrayReplaceBlock)block;
 #endif
 
 /**
  * @brief Exchange the objects at the specified indices.
  *
@@ -196,30 +196,23 @@
 /**
  * @brief Sorts the array using the specified selector and options.
  *
  * @param selector The selector to use to sort the array. It's signature
  *		   should be the same as that of -[compare:].
- * @param options The options to use when sorting the array.@n
- *		  Possible values are:
- *		  Value                      | Description
- *		  ---------------------------|-------------------------
- *		  `OF_ARRAY_SORT_DESCENDING` | Sort in descending order
+ * @param options The options to use when sorting the array
  */
-- (void)sortUsingSelector: (SEL)selector options: (int)options;
+- (void)sortUsingSelector: (SEL)selector options: (OFArraySortOptions)options;
 
 #ifdef OF_HAVE_BLOCKS
 /**
  * @brief Sorts the array using the specified comparator and options.
  *
  * @param comparator The comparator to use to sort the array
- * @param options The options to use when sorting the array.@n
- *		  Possible values are:
- *		  Value                      | Description
- *		  ---------------------------|-------------------------
- *		  `OF_ARRAY_SORT_DESCENDING` | Sort in descending order
+ * @param options The options to use when sorting the array
  */
-- (void)sortUsingComparator: (OFComparator)comparator options: (int)options;
+- (void)sortUsingComparator: (OFComparator)comparator
+		    options: (OFArraySortOptions)options;
 #endif
 
 /**
  * @brief Reverts the order of the objects in the array.
  */