@@ -36,12 +36,12 @@
 	OF_SORT_OPTIONS_DESCENDING = 1
 };
 
 #ifdef OF_HAVE_BLOCKS
 typedef void (^of_array_enumeration_block_t)(id object, size_t index,
-    BOOL *stop);
-typedef BOOL (^of_array_filter_block_t)(id odject, size_t index);
+    bool *stop);
+typedef bool (^of_array_filter_block_t)(id odject, size_t index);
 typedef id (^of_array_map_block_t)(id object, size_t index);
 typedef id (^of_array_fold_block_t)(id left, id right);
 #endif
 
 /*!
@@ -194,11 +194,11 @@
  *
  * @param object The object which is checked for being in the array
  * @return A boolean whether the array contains an object with the specified
  *	   address.
  */
-- (BOOL)containsObjectIdenticalTo: (id)object;
+- (bool)containsObjectIdenticalTo: (id)object;
 
 /*!
  * @brief Returns the first object of the array or nil.
  *
  * @warning The returned object is *not* retained and autoreleased for
@@ -329,11 +329,11 @@
  */
 - (OFArray*)mappedArrayUsingBlock: (of_array_map_block_t)block;
 
 /*!
  * @brief Creates a new array, only containing the objects for which the block
- *	  returns YES.
+ *	  returns true.
  *
  * @param block A block which determines if the object should be in the new
  *		array
  * @return A new, autoreleased OFArray
  */