diff --git a/src/Client/Exception/ExceptionInterface.php b/src/Client/Exception/ExceptionInterface.php
index 05d0df9..bcf8b4a 100644
--- a/src/Client/Exception/ExceptionInterface.php
+++ b/src/Client/Exception/ExceptionInterface.php
@@ -12,7 +12,7 @@
 use Zend\XmlRpc\Exception\ExceptionInterface as Exception;
 
 /**
- * Base class for all Zend_XmlRpc_Client_* exceptions
+ * Base class for all Zend\XmlRpc\Client\* exceptions
  */
 interface ExceptionInterface extends Exception
 {
diff --git a/src/Client/Exception/FaultException.php b/src/Client/Exception/FaultException.php
index a32af28..c8cdf0c 100644
--- a/src/Client/Exception/FaultException.php
+++ b/src/Client/Exception/FaultException.php
@@ -12,7 +12,7 @@
 use Zend\XmlRpc\Exception;
 
 /**
- * Thrown by Zend_XmlRpc_Client when an XML-RPC fault response is returned.
+ * Thrown by Zend\XmlRpc\Client when an XML-RPC fault response is returned.
  */
 class FaultException extends Exception\BadMethodCallException implements ExceptionInterface
 {
diff --git a/src/Client/Exception/HttpException.php b/src/Client/Exception/HttpException.php
index f28b1e6..d7778be 100644
--- a/src/Client/Exception/HttpException.php
+++ b/src/Client/Exception/HttpException.php
@@ -10,7 +10,7 @@
 namespace Zend\XmlRpc\Client\Exception;
 
 /**
- * Thrown by Zend_XmlRpc_Client when an HTTP error occurs during an
+ * Thrown by Zend\XmlRpc\Client when an HTTP error occurs during an
  * XML-RPC method call.
  */
 class HttpException extends RuntimeException
diff --git a/src/Client/Exception/IntrospectException.php b/src/Client/Exception/IntrospectException.php
index d35863f..f8aa609 100644
--- a/src/Client/Exception/IntrospectException.php
+++ b/src/Client/Exception/IntrospectException.php
@@ -10,7 +10,7 @@
 namespace Zend\XmlRpc\Client\Exception;
 
 /**
- * Thrown by Zend_XmlRpc_Client_Introspection when any error occurs.
+ * Thrown by Zend\XmlRpc\Client\ServerIntrospection when any error occurs.
  */
 class IntrospectException extends InvalidArgumentException
 {
diff --git a/src/Fault.php b/src/Fault.php
index 7f85ad9..2480baa 100644
--- a/src/Fault.php
+++ b/src/Fault.php
@@ -19,7 +19,7 @@
  * fault, as well as generating the XML for an XMLRPC fault response.
  *
  * To allow method chaining, you may only use the {@link getInstance()} factory
- * to instantiate a Zend_XmlRpc_Server_Fault.
+ * to instantiate a Zend\XmlRpc\Server\Fault.
  */
 class Fault
 {
diff --git a/src/Request/Http.php b/src/Request/Http.php
index 1b903e1..c8425d3 100644
--- a/src/Request/Http.php
+++ b/src/Request/Http.php
@@ -16,7 +16,7 @@
 /**
  * XmlRpc Request object -- Request via HTTP
  *
- * Extends {@link Zend_XmlRpc_Request} to accept a request via HTTP. Request is
+ * Extends {@link Zend\XmlRpc\Request} to accept a request via HTTP. Request is
  * built at construction time using a raw POST; if no data is available, the
  * request is declared a fault.
  */
diff --git a/src/Request/Stdin.php b/src/Request/Stdin.php
index 9b3201b..058204b 100644
--- a/src/Request/Stdin.php
+++ b/src/Request/Stdin.php
@@ -15,7 +15,7 @@
 /**
  * XmlRpc Request object -- Request via STDIN
  *
- * Extends {@link Zend_XmlRpc_Request} to accept a request via STDIN. Request is
+ * Extends {@link Zend\XmlRpc\Request} to accept a request via STDIN. Request is
  * built at construction time using data from STDIN; if no data is available, the
  * request is declared a fault.
  */
diff --git a/src/Server.php b/src/Server.php
index 3943acc..4921b1c 100644
--- a/src/Server.php
+++ b/src/Server.php
@@ -331,7 +331,7 @@ public function loadFunctions($definition)
             } else {
                 $type = gettype($definition);
             }
-            throw new Server\Exception\InvalidArgumentException('Unable to load server definition; must be an array or Zend_Server_Definition, received ' . $type, 612);
+            throw new Server\Exception\InvalidArgumentException('Unable to load server definition; must be an array or Zend\Server\Definition, received ' . $type, 612);
         }
 
         $this->table->clearMethods();
diff --git a/src/Server/Cache.php b/src/Server/Cache.php
index cf6ae85..9bf293d 100644
--- a/src/Server/Cache.php
+++ b/src/Server/Cache.php
@@ -10,7 +10,7 @@
 namespace Zend\XmlRpc\Server;
 
 /**
- * Zend_XmlRpc_Server_Cache: cache Zend_XmlRpc_Server server definition
+ * Zend\XmlRpc\Server\Cache: cache Zend\XmlRpc\Server server definition
  */
 class Cache extends \Zend\Server\Cache
 {
diff --git a/src/Server/Exception/ExceptionInterface.php b/src/Server/Exception/ExceptionInterface.php
index a62e9f8..d90fcfc 100644
--- a/src/Server/Exception/ExceptionInterface.php
+++ b/src/Server/Exception/ExceptionInterface.php
@@ -12,7 +12,7 @@
 use Zend\XmlRpc\Exception\ExceptionInterface as Exception;
 
 /**
- * Zend_XmlRpc_Server_Exception
+ * Zend\XmlRpc\Server\Exception
  */
 interface ExceptionInterface extends Exception
 {
diff --git a/src/Server/Fault.php b/src/Server/Fault.php
index b25aa31..0518ec0 100644
--- a/src/Server/Fault.php
+++ b/src/Server/Fault.php
@@ -22,7 +22,7 @@
  * need only implement a static 'observe' method.
  *
  * To allow method chaining, you may use the {@link getInstance()} factory
- * to instantiate a Zend_XmlRpc_Server_Fault.
+ * to instantiate a Zend\XmlRpc\Server\Fault.
  */
 class Fault extends \Zend\XmlRpc\Fault
 {
diff --git a/src/Value/AbstractCollection.php b/src/Value/AbstractCollection.php
index dfab232..a65eb03 100644
--- a/src/Value/AbstractCollection.php
+++ b/src/Value/AbstractCollection.php
@@ -23,7 +23,7 @@ public function __construct($value)
     {
         $values = (array)$value;   // Make sure that the value is an array
         foreach ($values as $key => $value) {
-            // If the elements of the given array are not Zend_XmlRpc_Value objects,
+            // If the elements of the given array are not Zend\XmlRpc\Value objects,
             // we need to convert them as such (using auto-detection from PHP value)
             if (!$value instanceof parent) {
                 $value = static::getXmlRpcValue($value, self::AUTO_DETECT_TYPE);
diff --git a/test/ServerTest.php b/test/ServerTest.php
index bba7a4d..a9bcf04 100644
--- a/test/ServerTest.php
+++ b/test/ServerTest.php
@@ -461,13 +461,13 @@ public function testAddFunctionThrowsExceptionWithBadData()
     public function testLoadFunctionsThrowsExceptionWithBadData()
     {
         $o = new \stdClass();
-        $this->setExpectedException('Zend\XmlRpc\Server\Exception\InvalidArgumentException', 'Unable to load server definition; must be an array or Zend_Server_Definition, received stdClass');
+        $this->setExpectedException('Zend\XmlRpc\Server\Exception\InvalidArgumentException', 'Unable to load server definition; must be an array or Zend\Server\Definition, received stdClass');
         $this->_server->loadFunctions($o);
     }
 
     public function testLoadFunctionsThrowsExceptionsWithBadData2()
     {
-        $this->setExpectedException('Zend\XmlRpc\Server\Exception\InvalidArgumentException', 'Unable to load server definition; must be an array or Zend_Server_Definition, received string');
+        $this->setExpectedException('Zend\XmlRpc\Server\Exception\InvalidArgumentException', 'Unable to load server definition; must be an array or Zend\Server\Definition, received string');
         $this->_server->loadFunctions('foo');
     }