diff --git a/library/Zend/Authentication/Adapter/AbstractAdapter.php b/library/Zend/Authentication/Adapter/AbstractAdapter.php
index 4fe904e90b0..6671a40f594 100644
--- a/library/Zend/Authentication/Adapter/AbstractAdapter.php
+++ b/library/Zend/Authentication/Adapter/AbstractAdapter.php
@@ -61,7 +61,7 @@ public function getIdentity()
      * Sets the identity for binding
      *
      * @param  mixed          $identity
-     * @return AbstractAdpter
+     * @return AbstractAdapter
      */
     public function setIdentity($identity)
     {
diff --git a/library/Zend/Authentication/Adapter/DbTable.php b/library/Zend/Authentication/Adapter/DbTable.php
index 446f803113d..3b4113528f9 100644
--- a/library/Zend/Authentication/Adapter/DbTable.php
+++ b/library/Zend/Authentication/Adapter/DbTable.php
@@ -330,7 +330,7 @@ protected function _authenticateSetup()
      * _authenticateCreateSelect() - This method creates a Zend\Db\Sql\Select object that
      * is completely configured to be queried against the database.
      *
-     * @return DbSelect
+     * @return Sql\Select
      */
     protected function _authenticateCreateSelect()
     {
@@ -358,7 +358,7 @@ protected function _authenticateCreateSelect()
      * _authenticateQuerySelect() - This method accepts a Zend\Db\Sql\Select object and
      * performs a query against the database with that object.
      *
-     * @param  DbSelect $dbSelect
+     * @param  Sql\Select $dbSelect
      * @throws Exception\RuntimeException when an invalid select object is encountered
      * @return array
      */
diff --git a/library/Zend/Authentication/Validator/Authentication.php b/library/Zend/Authentication/Validator/Authentication.php
index 533c2126296..906841e9af2 100644
--- a/library/Zend/Authentication/Validator/Authentication.php
+++ b/library/Zend/Authentication/Validator/Authentication.php
@@ -46,7 +46,7 @@ class Authentication extends AbstractValidator
 
     /**
      * Authentication Adapter
-     * @var Zend\Authentication\Adapter\Adapter
+     * @var ValidatableAdapterInterface
      */
     protected $adapter;
 
@@ -64,7 +64,7 @@ class Authentication extends AbstractValidator
 
     /**
      * Authentication Service
-     * @var Zend\Authentication\AuthenticationService
+     * @var AuthenticationService
      */
     protected $service;
 
@@ -99,7 +99,7 @@ public function __construct($options = null)
     /**
      * Get Adapter
      *
-     * @return Zend\Authentication\Adapter\ValidatableAdapterInterface
+     * @return ValidatableAdapterInterface
      */
     public function getAdapter()
     {
@@ -109,7 +109,7 @@ public function getAdapter()
     /**
      * Set Adapter
      *
-     * @param  Zend\Authentication\Adapter\ValidatableAdapterInterface $adapter
+     * @param  ValidatableAdapterInterface $adapter
      * @return Authentication
      */
     public function setAdapter(ValidatableAdapterInterface $adapter)
@@ -168,7 +168,7 @@ public function setCredential($credential)
     /**
      * Get Service
      *
-     * @return Zend\Authentication\AuthenticationService
+     * @return AuthenticationService
      */
     public function getService()
     {
@@ -178,7 +178,7 @@ public function getService()
     /**
      * Set Service
      *
-     * @param  Zend\Authentication\AuthenticationService $service
+     * @param  AuthenticationService $service
      * @return Authentication
      */
     public function setService(AuthenticationService $service)
diff --git a/library/Zend/Crypt/BlockCipher.php b/library/Zend/Crypt/BlockCipher.php
index 34ab0de8595..6aa55f30fab 100644
--- a/library/Zend/Crypt/BlockCipher.php
+++ b/library/Zend/Crypt/BlockCipher.php
@@ -214,7 +214,7 @@ public function getSalt()
     /**
      * Get the original salt value
      *
-     * @return type
+     * @return string
      */
     public function getOriginalSalt()
     {
diff --git a/library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php b/library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php
index 4b3727d1e7b..2c9dbd9b279 100755
--- a/library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php
+++ b/library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php
@@ -242,7 +242,7 @@ public function rollback()
      * Execute
      *
      * @param  string $sql
-     * @return ResultInterface
+     * @return Result
      */
     public function execute($sql)
     {
diff --git a/library/Zend/Db/Sql/Predicate/Predicate.php b/library/Zend/Db/Sql/Predicate/Predicate.php
index bdc7fc7e89e..3cd8737b59b 100644
--- a/library/Zend/Db/Sql/Predicate/Predicate.php
+++ b/library/Zend/Db/Sql/Predicate/Predicate.php
@@ -295,7 +295,7 @@ public function isNotNull($identifier)
      * Utilizes In predicate
      *
      * @param  string $identifier
-     * @param  array|Select $valueSet
+     * @param  array|\Zend\Db\Sql\Select $valueSet
      * @return Predicate
      */
     public function in($identifier, $valueSet = null)
diff --git a/library/Zend/Db/TableGateway/Feature/MasterSlaveFeature.php b/library/Zend/Db/TableGateway/Feature/MasterSlaveFeature.php
index dd64c6081d0..571adf25d2a 100644
--- a/library/Zend/Db/TableGateway/Feature/MasterSlaveFeature.php
+++ b/library/Zend/Db/TableGateway/Feature/MasterSlaveFeature.php
@@ -33,7 +33,7 @@ class MasterSlaveFeature extends AbstractFeature
     /**
      * Constructor
      *
-     * @param Adapter $slaveAdapter
+     * @param AdapterInterface $slaveAdapter
      */
     public function __construct(AdapterInterface $slaveAdapter, Sql $slaveSql = null)
     {
diff --git a/library/Zend/Db/TableGateway/TableGateway.php b/library/Zend/Db/TableGateway/TableGateway.php
index 4fd31e622d6..781646f2f98 100644
--- a/library/Zend/Db/TableGateway/TableGateway.php
+++ b/library/Zend/Db/TableGateway/TableGateway.php
@@ -22,7 +22,7 @@ class TableGateway extends AbstractTableGateway
      * Constructor
      *
      * @param string $table
-     * @param Adapter $adapter
+     * @param AdapterInterface $adapter
      * @param Feature\AbstractFeature|Feature\FeatureSet|Feature\AbstractFeature[] $features
      * @param ResultSetInterface $resultSetPrototype
      * @param Sql $sql
diff --git a/library/Zend/Form/Element/DateSelect.php b/library/Zend/Form/Element/DateSelect.php
index c4ca3d0cdca..c1afb1600c2 100644
--- a/library/Zend/Form/Element/DateSelect.php
+++ b/library/Zend/Form/Element/DateSelect.php
@@ -87,7 +87,7 @@ public function getDayAttributes()
     }
 
     /**
-     * @param  string|array|ArrayAccess|PhpDateTime $value
+     * @param  string|array|\ArrayAccess|PhpDateTime $value
      * @throws \Zend\Form\Exception\InvalidArgumentException
      * @return void|\Zend\Form\Element
      */
diff --git a/library/Zend/Http/Client.php b/library/Zend/Http/Client.php
index 6236f24d8e9..ce76e1eb07a 100644
--- a/library/Zend/Http/Client.php
+++ b/library/Zend/Http/Client.php
@@ -1334,7 +1334,7 @@ protected function doRequest(Http $uri, $method, $secure = false, $headers = arr
      * @param string $password
      * @param string $type
      * @return string
-     * @throws Zend\Http\Client\Exception\InvalidArgumentException
+     * @throws Client\Exception\InvalidArgumentException
      */
     public static function encodeAuthHeader($user, $password, $type = self::AUTH_BASIC)
     {
diff --git a/library/Zend/Loader/ModuleAutoloader.php b/library/Zend/Loader/ModuleAutoloader.php
index cd88954c9b3..1c691a5e456 100644
--- a/library/Zend/Loader/ModuleAutoloader.php
+++ b/library/Zend/Loader/ModuleAutoloader.php
@@ -111,7 +111,7 @@ public function getModuleClassMap()
      * Sets the class map used to speed up the module autoloading.
      *
      * @param  array $classmap
-     * @return ModuleLoader
+     * @return ModuleAutoloader
      */
     public function setModuleClassMap(array $classmap)
     {
diff --git a/library/Zend/Log/Filter/SuppressFilter.php b/library/Zend/Log/Filter/SuppressFilter.php
index c7f637f4451..419154f589d 100644
--- a/library/Zend/Log/Filter/SuppressFilter.php
+++ b/library/Zend/Log/Filter/SuppressFilter.php
@@ -9,6 +9,7 @@
 
 namespace Zend\Log\Filter;
 
+use Traversable;
 use Zend\Log\Exception;
 
 class SuppressFilter implements FilterInterface
diff --git a/library/Zend/Log/Processor/ProcessorInterface.php b/library/Zend/Log/Processor/ProcessorInterface.php
index ef0c045e503..af97e2754d6 100644
--- a/library/Zend/Log/Processor/ProcessorInterface.php
+++ b/library/Zend/Log/Processor/ProcessorInterface.php
@@ -15,7 +15,7 @@ interface ProcessorInterface
      * Processes a log message before it is given to the writers
      *
      * @param  array $event
-     * @return WriterInterface
+     * @return array
      */
     public function process(array $event);
 
diff --git a/library/Zend/Log/Writer/AbstractWriter.php b/library/Zend/Log/Writer/AbstractWriter.php
index e5ea4429d1a..8a10475a452 100644
--- a/library/Zend/Log/Writer/AbstractWriter.php
+++ b/library/Zend/Log/Writer/AbstractWriter.php
@@ -41,7 +41,7 @@ abstract class AbstractWriter implements WriterInterface
     /**
      * Formats the log message before writing
      *
-     * @var Formatter
+     * @var Formatter\FormatterInterface
      */
     protected $formatter;
 
diff --git a/library/Zend/Log/Writer/FingersCrossed.php b/library/Zend/Log/Writer/FingersCrossed.php
index 6c2dd378418..a9228ec30a2 100644
--- a/library/Zend/Log/Writer/FingersCrossed.php
+++ b/library/Zend/Log/Writer/FingersCrossed.php
@@ -166,7 +166,7 @@ public function setWriterPluginManager($plugins)
      *
      * @param string $name
      * @param array|null $options
-     * @return Writer\WriterInterface
+     * @return WriterInterface
      */
     public function writerPlugin($name, array $options = null)
     {
@@ -243,7 +243,7 @@ public function reset()
      * Stub in accordance to parent method signature.
      * Fomatters must be set on the wrapped writer.
      *
-     * @param string|Formatter\FormatterInterface $formatter
+     * @param string|FormatterInterface $formatter
      * @return WriterInterface
      */
     public function setFormatter($formatter)
diff --git a/library/Zend/Log/Writer/MongoDB.php b/library/Zend/Log/Writer/MongoDB.php
index a75f37dc53b..7366398ae41 100644
--- a/library/Zend/Log/Writer/MongoDB.php
+++ b/library/Zend/Log/Writer/MongoDB.php
@@ -87,7 +87,7 @@ public function __construct($mongo, $database = null, $collection = null, array
     /**
      * This writer does not support formatting.
      *
-     * @param string|Zend\Log\Formatter\FormatterInterface $formatter
+     * @param string|FormatterInterface $formatter
      * @return WriterInterface
      */
     public function setFormatter($formatter)
@@ -100,7 +100,7 @@ public function setFormatter($formatter)
      *
      * @param array $event Event data
      * @return void
-     * @throws Zend\Log\Exception\RuntimeException
+     * @throws Exception\RuntimeException
      */
     protected function doWrite(array $event)
     {
diff --git a/library/Zend/Mvc/Application.php b/library/Zend/Mvc/Application.php
index fc49693fe09..7d42a849618 100644
--- a/library/Zend/Mvc/Application.php
+++ b/library/Zend/Mvc/Application.php
@@ -13,7 +13,6 @@
 use Zend\EventManager\EventManagerInterface;
 use Zend\ServiceManager\ServiceManager;
 use Zend\Stdlib\ResponseInterface;
-use Zend\Stdlib\Nop;
 
 /**
  * Main application class for invoking applications
diff --git a/library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php b/library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php
index 96daa2bc3a1..ce038a47539 100644
--- a/library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php
+++ b/library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php
@@ -39,7 +39,7 @@ class PostRedirectGet extends AbstractPlugin
      *
      * @param  null|string $redirect
      * @param  bool $redirectToUrl
-     * @return \Zend\Http\Response|array|Traversable|false
+     * @return \Zend\Http\Response|array|\Traversable|false
      */
     public function __invoke($redirect = null, $redirectToUrl = false)
     {
@@ -88,7 +88,7 @@ public function setSessionContainer(Container $container)
      *
      * @param  string  $redirect
      * @param  boolean $redirectToUrl
-     * @return Response
+     * @return \Zend\Http\Response
      * @throws \Zend\Mvc\Exception\RuntimeException
      */
     protected function redirect($redirect, $redirectToUrl)
diff --git a/library/Zend/Mvc/Service/FilterManagerFactory.php b/library/Zend/Mvc/Service/FilterManagerFactory.php
index b08f15d25d2..34ffb97dd84 100644
--- a/library/Zend/Mvc/Service/FilterManagerFactory.php
+++ b/library/Zend/Mvc/Service/FilterManagerFactory.php
@@ -20,7 +20,7 @@ class FilterManagerFactory extends AbstractPluginManagerFactory
      * Create and return the filter plugin manager
      *
      * @param  ServiceLocatorInterface $serviceLocator
-     * @return FilterPluginManager
+     * @return \Zend\Filter\FilterPluginManager
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
diff --git a/library/Zend/Mvc/Service/PaginatorPluginManagerFactory.php b/library/Zend/Mvc/Service/PaginatorPluginManagerFactory.php
index 8537f6f15c1..86fc9cc919a 100644
--- a/library/Zend/Mvc/Service/PaginatorPluginManagerFactory.php
+++ b/library/Zend/Mvc/Service/PaginatorPluginManagerFactory.php
@@ -19,7 +19,7 @@ class PaginatorPluginManagerFactory extends AbstractPluginManagerFactory
      * Create and return the MVC controller plugin manager
      *
      * @param  ServiceLocatorInterface $serviceLocator
-     * @return ControllerPluginManager
+     * @return \Zend\Paginator\AdapterPluginManager
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
diff --git a/library/Zend/Mvc/Service/ValidatorManagerFactory.php b/library/Zend/Mvc/Service/ValidatorManagerFactory.php
index dca8d8693a4..7ee8159099a 100644
--- a/library/Zend/Mvc/Service/ValidatorManagerFactory.php
+++ b/library/Zend/Mvc/Service/ValidatorManagerFactory.php
@@ -20,7 +20,7 @@ class ValidatorManagerFactory extends AbstractPluginManagerFactory
      * Create and return the validator plugin manager
      *
      * @param  ServiceLocatorInterface $serviceLocator
-     * @return ValidatorPluginManager
+     * @return \Zend\Validator\ValidatorPluginManager
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
diff --git a/library/Zend/Paginator/AdapterPluginManager.php b/library/Zend/Paginator/AdapterPluginManager.php
index 30a6410c8d9..f7d5315267e 100644
--- a/library/Zend/Paginator/AdapterPluginManager.php
+++ b/library/Zend/Paginator/AdapterPluginManager.php
@@ -46,7 +46,7 @@ class AdapterPluginManager extends AbstractPluginManager
      * @param  string $canonicalName
      * @param  string $requestedName
      * @return mixed
-     * @throws Exception\ServiceNotCreatedException If factory is not callable
+     * @throws \Zend\ServiceManager\Exception\ServiceNotCreatedException If factory is not callable
      */
     protected function createFromFactory($canonicalName, $requestedName)
     {
diff --git a/library/Zend/Session/SaveHandler/MongoDBOptions.php b/library/Zend/Session/SaveHandler/MongoDBOptions.php
index 9831d906ba5..aad7dfdbb6a 100644
--- a/library/Zend/Session/SaveHandler/MongoDBOptions.php
+++ b/library/Zend/Session/SaveHandler/MongoDBOptions.php
@@ -73,7 +73,7 @@ class MongoDBOptions extends AbstractOptions
      *
      * @param string $database
      * @return MongoDBOptions
-     * @throws Zend\Session\Exception\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function setDatabase($database)
     {
@@ -100,7 +100,7 @@ public function getDatabase()
      *
      * @param string $collection
      * @return MongoDBOptions
-     * @throws Zend\Session\Exception\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function setCollection($collection)
     {
@@ -150,7 +150,7 @@ public function getSaveOptions()
      *
      * @param string $nameField
      * @return MongoDBOptions
-     * @throws Zend\Session\Exception\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function setNameField($nameField)
     {
@@ -177,7 +177,7 @@ public function getNameField()
      *
      * @param string $dataField
      * @return MongoDBOptions
-     * @throws Zend\Session\Exception\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function setDataField($dataField)
     {
@@ -204,7 +204,7 @@ public function getDataField()
      *
      * @param string $lifetimeField
      * @return MongoDBOptions
-     * @throws Zend\Session\Exception\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function setLifetimeField($lifetimeField)
     {
@@ -231,7 +231,7 @@ public function getLifetimeField()
      *
      * @param string $modifiedField
      * @return MongoDBOptions
-     * @throws Zend\Session\Exception\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function setModifiedField($modifiedField)
     {
diff --git a/library/Zend/Stdlib/ArrayObject.php b/library/Zend/Stdlib/ArrayObject.php
index 98f3a09bdb9..e4ea47f0066 100644
--- a/library/Zend/Stdlib/ArrayObject.php
+++ b/library/Zend/Stdlib/ArrayObject.php
@@ -213,7 +213,7 @@ public function getFlags()
     /**
      * Create a new iterator from an ArrayObject instance
      *
-     * @return Iterator
+     * @return \Iterator
      */
     public function getIterator()
     {
diff --git a/library/Zend/Stdlib/Hydrator/AbstractHydrator.php b/library/Zend/Stdlib/Hydrator/AbstractHydrator.php
index 5d62edc8551..b7af0d2b1eb 100644
--- a/library/Zend/Stdlib/Hydrator/AbstractHydrator.php
+++ b/library/Zend/Stdlib/Hydrator/AbstractHydrator.php
@@ -158,7 +158,7 @@ public function getFilter()
      * </code>
      *
      * @param string $name Index in the composite
-     * @param callable|Zend\Stdlib\Hydrator\Filter\FilterInterface $filter
+     * @param callable|Filter\FilterInterface $filter
      * @param int $condition
      * @return Filter\FilterComposite
      */
diff --git a/library/Zend/Stdlib/Hydrator/Strategy/SerializableStrategy.php b/library/Zend/Stdlib/Hydrator/Strategy/SerializableStrategy.php
index 868fea543eb..d4a90d52131 100644
--- a/library/Zend/Stdlib/Hydrator/Strategy/SerializableStrategy.php
+++ b/library/Zend/Stdlib/Hydrator/Strategy/SerializableStrategy.php
@@ -65,7 +65,7 @@ public function hydrate($value)
      * Set serializer
      *
      * @param  string|SerializerAdapter $serializer
-     * @return Serializer
+     * @return SerializableStrategy
      */
     public function setSerializer($serializer)
     {
diff --git a/library/Zend/Validator/Barcode/Code128.php b/library/Zend/Validator/Barcode/Code128.php
index be031d50e90..d07213698fb 100644
--- a/library/Zend/Validator/Barcode/Code128.php
+++ b/library/Zend/Validator/Barcode/Code128.php
@@ -18,7 +18,7 @@ class Code128 extends AbstractAdapter
     /**
      * The used string wrapper used for basic UTF-8 string functions
      *
-     * @var SrtringWrapperInterface
+     * @var StringWrapperInterface
      */
     protected $utf8StringWrapper;
 
diff --git a/library/Zend/View/Helper/FlashMessenger.php b/library/Zend/View/Helper/FlashMessenger.php
index 7500a3ed2fa..9806aac61f8 100644
--- a/library/Zend/View/Helper/FlashMessenger.php
+++ b/library/Zend/View/Helper/FlashMessenger.php
@@ -56,7 +56,7 @@ class FlashMessenger extends AbstractTranslatorHelper implements ServiceLocatorA
     /**
      * Returns the flash messenger plugin controller
      *
-     * @return FlashMessenger|FlashMessenger\Controller\Plugin\FlashMessenger
+     * @return FlashMessenger|PluginFlashMessenger
      */
     public function __invoke($namespace = null)
     {
diff --git a/library/Zend/View/Renderer/JsonRenderer.php b/library/Zend/View/Renderer/JsonRenderer.php
index 831210b7cb1..60a1952040e 100644
--- a/library/Zend/View/Renderer/JsonRenderer.php
+++ b/library/Zend/View/Renderer/JsonRenderer.php
@@ -84,7 +84,7 @@ public function setMergeUnnamedChildren($mergeUnnamedChildren)
      * Set the JSONP callback function name
      *
      * @param  string $callback
-     * @return JsonpModel
+     * @return JsonRenderer
      */
     public function setJsonpCallback($callback)
     {