diff --git a/src/ArrayObject/PhpReferenceCompatibility.php b/src/ArrayObject/PhpReferenceCompatibility.php
index 9e680abbf..117543995 100644
--- a/src/ArrayObject/PhpReferenceCompatibility.php
+++ b/src/ArrayObject/PhpReferenceCompatibility.php
@@ -76,7 +76,7 @@ public function __construct($input = array(), $flags = self::STD_PROP_LIST, $ite
      * Returns whether the requested key exists
      *
      * @param  mixed $key
-     * @return boolean
+     * @return bool
      */
     public function __isset($key)
     {
@@ -279,7 +279,7 @@ public function natsort()
      * Returns whether the requested key exists
      *
      * @param  mixed $key
-     * @return boolean
+     * @return bool
      */
     public function offsetExists($key)
     {
diff --git a/src/ErrorHandler.php b/src/ErrorHandler.php
index 92f399575..97b4e95d6 100644
--- a/src/ErrorHandler.php
+++ b/src/ErrorHandler.php
@@ -27,7 +27,7 @@ abstract class ErrorHandler
     /**
      * Check if this error handler is active
      *
-     * @return boolean
+     * @return bool
      */
     public static function started()
     {
diff --git a/src/Hydrator/ClassMethods.php b/src/Hydrator/ClassMethods.php
index 5938605c6..1b8e2c1b2 100644
--- a/src/Hydrator/ClassMethods.php
+++ b/src/Hydrator/ClassMethods.php
@@ -66,7 +66,7 @@ public function setOptions($options)
     }
 
     /**
-     * @param  boolean      $underscoreSeparatedKeys
+     * @param  bool      $underscoreSeparatedKeys
      * @return ClassMethods
      */
     public function setUnderscoreSeparatedKeys($underscoreSeparatedKeys)
@@ -77,7 +77,7 @@ public function setUnderscoreSeparatedKeys($underscoreSeparatedKeys)
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function getUnderscoreSeparatedKeys()
     {
diff --git a/src/StringUtils.php b/src/StringUtils.php
index ce463131f..2945f9aa6 100644
--- a/src/StringUtils.php
+++ b/src/StringUtils.php
@@ -154,7 +154,7 @@ public static function getSingleByteEncodings()
      * Check if a given encoding is a known single-byte character encoding
      *
      * @param string $encoding
-     * @return boolean
+     * @return bool
      */
     public static function isSingleByteEncoding($encoding)
     {
@@ -165,7 +165,7 @@ public static function isSingleByteEncoding($encoding)
      * Check if a given string is valid UTF-8 encoded
      *
      * @param string $str
-     * @return boolean
+     * @return bool
      */
     public static function isValidUtf8($str)
     {
diff --git a/src/StringWrapper/AbstractStringWrapper.php b/src/StringWrapper/AbstractStringWrapper.php
index f62d87d08..38a4d540d 100644
--- a/src/StringWrapper/AbstractStringWrapper.php
+++ b/src/StringWrapper/AbstractStringWrapper.php
@@ -110,7 +110,7 @@ public function getConvertEncoding()
      * Convert a string from defined character encoding to the defined convert encoding
      *
      * @param string  $str
-     * @param boolean $reverse
+     * @param bool $reverse
      * @return string|false
      */
     public function convert($str, $reverse = false)
@@ -142,7 +142,7 @@ public function convert($str, $reverse = false)
      * @param  string  $string
      * @param  integer $width
      * @param  string  $break
-     * @param  boolean $cut
+     * @param  bool $cut
      * @return string|false
      */
     public function wordWrap($string, $width = 75, $break = "\n", $cut = false)
diff --git a/src/StringWrapper/Iconv.php b/src/StringWrapper/Iconv.php
index 55c12942f..35dc39a1c 100644
--- a/src/StringWrapper/Iconv.php
+++ b/src/StringWrapper/Iconv.php
@@ -262,7 +262,7 @@ public function strpos($haystack, $needle, $offset = 0)
      * Convert a string from defined encoding to the defined convert encoding
      *
      * @param string  $str
-     * @param boolean $reverse
+     * @param bool $reverse
      * @return string|false
      */
     public function convert($str, $reverse = false)
diff --git a/src/StringWrapper/MbString.php b/src/StringWrapper/MbString.php
index 31df0244c..cc47d6ee3 100644
--- a/src/StringWrapper/MbString.php
+++ b/src/StringWrapper/MbString.php
@@ -96,7 +96,7 @@ public function strpos($haystack, $needle, $offset = 0)
      * Convert a string from defined encoding to the defined convert encoding
      *
      * @param string  $str
-     * @param boolean $reverse
+     * @param bool $reverse
      * @return string|false
      */
     public function convert($str, $reverse = false)
diff --git a/src/StringWrapper/StringWrapperInterface.php b/src/StringWrapper/StringWrapperInterface.php
index 0dea5720f..a6a79bfef 100644
--- a/src/StringWrapper/StringWrapperInterface.php
+++ b/src/StringWrapper/StringWrapperInterface.php
@@ -82,7 +82,7 @@ public function strpos($haystack, $needle, $offset = 0);
      * Convert a string from defined encoding to the defined convert encoding
      *
      * @param string  $str
-     * @param boolean $reverse
+     * @param bool $reverse
      * @return string|false
      */
     public function convert($str, $reverse = false);
@@ -93,7 +93,7 @@ public function convert($str, $reverse = false);
      * @param  string  $str
      * @param  integer $width
      * @param  string  $break
-     * @param  boolean $cut
+     * @param  bool $cut
      * @return string
      */
     public function wordWrap($str, $width = 75, $break = "\n", $cut = false);
diff --git a/test/StringUtilsTest.php b/test/StringUtilsTest.php
index 694d68ebf..7d049eacd 100644
--- a/test/StringUtilsTest.php
+++ b/test/StringUtilsTest.php
@@ -142,7 +142,7 @@ public function getUtf8StringValidity()
     /**
      * @dataProvider getUtf8StringValidity
      * @param string $str
-     * @param boolean $valid
+     * @param bool $valid
      */
     public function testIsValidUtf8($str, $valid)
     {
diff --git a/test/StringWrapper/CommonStringWrapperTest.php b/test/StringWrapper/CommonStringWrapperTest.php
index 7546c0d7b..e88b2a841 100644
--- a/test/StringWrapper/CommonStringWrapperTest.php
+++ b/test/StringWrapper/CommonStringWrapperTest.php
@@ -217,7 +217,7 @@ public function wordWrapProvider()
      * @param string  $str
      * @param integer $width
      * @param string  $break
-     * @param boolean $cut
+     * @param bool $cut
      * @param mixed   $expected
      */
     public function testWordWrap($encoding, $string, $width, $break, $cut, $expected)