@@ -32,11 +32,11 @@
 
 /*!
  * @brief The C type of a number stored in an OFNumber.
  */
 typedef enum of_number_type_t {
-	/*! BOOL */
+	/*! bool */
 	OF_NUMBER_BOOL		= 0x01,
 	/*! unsigned char */
 	OF_NUMBER_UCHAR		= 0x02,
 	/*! unsigned short */
 	OF_NUMBER_USHORT	= 0x03,
@@ -98,11 +98,11 @@
  */
 @interface OFNumber: OFObject <OFCopying, OFComparing, OFSerialization,
     OFJSONRepresentation, OFBinaryPackRepresentation>
 {
 	union of_number_value {
-		BOOL		   bool_;
+		bool		   bool_;
 		signed char	   schar;
 		signed short	   sshort;
 		signed int	   sint;
 		signed long	   slong;
 		signed long long   slonglong;
@@ -135,16 +135,16 @@
 #ifdef OF_HAVE_PROPERTIES
 @property (readonly) of_number_type_t type;
 #endif
 
 /*!
- * @brief Creates a new OFNumber with the specified BOOL.
+ * @brief Creates a new OFNumber with the specified bool.
  *
- * @param bool_ A BOOL which the OFNumber should contain
+ * @param bool_ A bool which the OFNumber should contain
  * @return A new autoreleased OFNumber
  */
-+ (instancetype)numberWithBool: (BOOL)bool_;
++ (instancetype)numberWithBool: (bool)bool_;
 
 /*!
  * @brief Creates a new OFNumber with the specified signed char.
  *
  * @param schar A signed char which the OFNumber should contain
@@ -359,16 +359,16 @@
  * @return A new autoreleased OFNumber
  */
 + (instancetype)numberWithDouble: (double)double_;
 
 /*!
- * @brief Initializes an already allocated OFNumber with the specified BOOL.
+ * @brief Initializes an already allocated OFNumber with the specified bool.
  *
- * @param bool_ A BOOL which the OFNumber should contain
+ * @param bool_ A bool which the OFNumber should contain
  * @return An initialized OFNumber
  */
-- initWithBool: (BOOL)bool_;
+- initWithBool: (bool)bool_;
 
 /*!
  * @brief Initializes an already allocated OFNumber with the specified signed
  *	  char.
  *
@@ -603,15 +603,15 @@
  * @return An of_number_type_t indicating the type of the number
  */
 - (of_number_type_t)type;
 
 /*!
- * @brief Returns the OFNumber as a BOOL.
+ * @brief Returns the OFNumber as a bool.
  *
- * @return The OFNumber as a BOOL
+ * @return The OFNumber as a bool
  */
-- (BOOL)boolValue;
+- (bool)boolValue;
 
 /*!
  * @brief Returns the OFNumber as a signed char.
  *
  * @return The OFNumber as a signed char