diff --git a/src/Fault.php b/src/Fault.php
index 2c14075..2397683 100644
--- a/src/Fault.php
+++ b/src/Fault.php
@@ -171,7 +171,7 @@ public function getEncoding()
      * Load an XMLRPC fault from XML
      *
      * @param string $fault
-     * @return boolean Returns true if successfully loaded fault response, false
+     * @return bool Returns true if successfully loaded fault response, false
      * if response was not a fault response
      * @throws Exception\ExceptionInterface if no or faulty XML provided, or if fault
      * response does not contain either code or message
@@ -250,7 +250,7 @@ public function loadXml($fault)
      * Determine if an XML response is an XMLRPC fault
      *
      * @param string $xml
-     * @return boolean
+     * @return bool
      */
     public static function isFault($xml)
     {
diff --git a/src/Request.php b/src/Request.php
index 17f54da..39099cd 100644
--- a/src/Request.php
+++ b/src/Request.php
@@ -117,7 +117,7 @@ public function getEncoding()
      * Set method to call
      *
      * @param string $method
-     * @return boolean Returns true on success, false if method name is invalid
+     * @return bool Returns true on success, false if method name is invalid
      */
     public function setMethod($method)
     {
@@ -277,7 +277,7 @@ public function getTypes()
      *
      * @param string $request
      * @throws Exception\ValueException if invalid XML
-     * @return boolean True on success, false if an error occurred.
+     * @return bool True on success, false if an error occurred.
      */
     public function loadXml($request)
     {
@@ -366,7 +366,7 @@ public function loadXml($request)
      * Does the current request contain errors and should it return a fault
      * response?
      *
-     * @return boolean
+     * @return bool
      */
     public function isFault()
     {
diff --git a/src/Response.php b/src/Response.php
index 3608896..9fa9926 100644
--- a/src/Response.php
+++ b/src/Response.php
@@ -119,7 +119,7 @@ protected function _getXmlRpcReturn()
     /**
      * Is the response a fault response?
      *
-     * @return boolean
+     * @return bool
      */
     public function isFault()
     {
@@ -144,7 +144,7 @@ public function getFault()
      *
      * @param string $response
      * @throws Exception\ValueException if invalid XML
-     * @return boolean True if a valid XMLRPC response, false if a fault
+     * @return bool True if a valid XMLRPC response, false if a fault
      * response or invalid input
      */
     public function loadXml($response)
diff --git a/src/Server.php b/src/Server.php
index 5449930..9d9a029 100644
--- a/src/Server.php
+++ b/src/Server.php
@@ -120,7 +120,7 @@ class Server extends AbstractServer
     /**
      * Flag: whether or not {@link handle()} should return a response instead
      * of automatically emitting it.
-     * @var boolean
+     * @var bool
      */
     protected $returnResponse = false;
 
@@ -259,7 +259,7 @@ public function fault($fault = null, $code = 404)
      *
      * The response is always available via {@link getResponse()}.
      *
-     * @param boolean $flag
+     * @param  bool $flag
      * @return Server
      */
     public function setReturnResponse($flag = true)
@@ -271,7 +271,7 @@ public function setReturnResponse($flag = true)
     /**
      * Retrieve return response flag
      *
-     * @return boolean
+     * @return bool
      */
     public function getReturnResponse()
     {
@@ -435,7 +435,7 @@ public function getResponse()
      *
      * @param  string $class
      * @throws Server\Exception\InvalidArgumentException if invalid response class
-     * @return boolean True if class was set, false if not
+     * @return bool True if class was set, false if not
      */
     public function setResponseClass($class)
     {
diff --git a/src/Server/Fault.php b/src/Server/Fault.php
index 9e61312..303dea8 100644
--- a/src/Server/Fault.php
+++ b/src/Server/Fault.php
@@ -135,7 +135,7 @@ public static function detachFaultException($classes)
      * 'observe' that accepts an exception as its sole argument.
      *
      * @param string $class
-     * @return boolean
+     * @return bool
      */
     public static function attachObserver($class)
     {
@@ -157,7 +157,7 @@ public static function attachObserver($class)
      * Detach an observer
      *
      * @param string $class
-     * @return boolean
+     * @return bool
      */
     public static function detachObserver($class)
     {