diff --git a/library/Zend/Authentication/Storage/NonPersistent.php b/library/Zend/Authentication/Storage/NonPersistent.php
index a85008c2bec..0d8afb728bc 100644
--- a/library/Zend/Authentication/Storage/NonPersistent.php
+++ b/library/Zend/Authentication/Storage/NonPersistent.php
@@ -31,7 +31,6 @@ class NonPersistent implements StorageInterface
     /**
      * Returns true if and only if storage is empty
      *
-     * @throws Zend\Authentication\Storage\Exception If it is impossible to determine whether storage is empty
      * @return boolean
      */
     public function isEmpty()
diff --git a/library/Zend/Barcode/Object/AbstractObject.php b/library/Zend/Barcode/Object/AbstractObject.php
index 7708297aa4d..633e1b591f9 100644
--- a/library/Zend/Barcode/Object/AbstractObject.php
+++ b/library/Zend/Barcode/Object/AbstractObject.php
@@ -403,7 +403,7 @@ public function setForeColor($value)
 
     /**
      * Retrieve color of the barcode and text
-     * @return unknown
+     * @return integer
      */
     public function getForeColor()
     {
@@ -462,7 +462,7 @@ public function getWithBorder()
     /**
      * Activate/deactivate drawing of the quiet zones
      * @param boolean $value
-     * @return Zend\Barcode\AbstractObject
+     * @return AbstractObject
      */
     public function setWithQuietZones($value)
     {
@@ -944,6 +944,7 @@ protected function calculateBarcodeHeight()
 
     /**
      * Get height of the result object
+     * @param bool $recalculate
      * @return integer
      */
     public function getHeight($recalculate = false)
@@ -958,6 +959,7 @@ public function getHeight($recalculate = false)
 
     /**
      * Get width of the result object
+     * @param bool $recalculate
      * @return integer
      */
     public function getWidth($recalculate = false)
diff --git a/library/Zend/Barcode/Object/Error.php b/library/Zend/Barcode/Object/Error.php
index 0f26db8bc20..18aa46e3089 100644
--- a/library/Zend/Barcode/Object/Error.php
+++ b/library/Zend/Barcode/Object/Error.php
@@ -39,6 +39,7 @@ public function getHeight($recalculate = false)
 
     /**
      * Width is forced
+     * @param bool $recalculate
      * @return integer
      */
     public function getWidth($recalculate = false)
diff --git a/library/Zend/Barcode/Object/ObjectInterface.php b/library/Zend/Barcode/Object/ObjectInterface.php
index 660957d7180..38fb3b9820a 100644
--- a/library/Zend/Barcode/Object/ObjectInterface.php
+++ b/library/Zend/Barcode/Object/ObjectInterface.php
@@ -29,7 +29,7 @@ public function __construct($options = null);
     /**
      * Set barcode state from options array
      * @param  array $options
-     * @return Object\ObjectInterface
+     * @return ObjectInterface
      */
     public function setOptions($options);
 
@@ -37,7 +37,7 @@ public function setOptions($options);
      * Set barcode namespace for autoloading
      *
      * @param string $namespace
-     * @return Object\ObjectInterface
+     * @return ObjectInterface
      */
     public function setBarcodeNamespace($namespace);
 
@@ -57,7 +57,7 @@ public function getType();
     /**
      * Set height of the barcode bar
      * @param integer $value
-     * @return Object\ObjectInterface
+     * @return ObjectInterface
      */
     public function setBarHeight($value);
 
@@ -70,7 +70,7 @@ public function getBarHeight();
     /**
      * Set thickness of thin bar
      * @param integer $value
-     * @return Object\ObjectInterface
+     * @return ObjectInterface
      */
     public function setBarThinWidth($value);
 
@@ -83,7 +83,7 @@ public function getBarThinWidth();
     /**
      * Set thickness of thick bar
      * @param integer $value
-     * @return Object\ObjectInterface
+     * @return ObjectInterface
      */
     public function setBarThickWidth($value);
 
@@ -97,7 +97,7 @@ public function getBarThickWidth();
      * Set factor applying to
      * thinBarWidth - thickBarWidth - barHeight - fontSize
      * @param integer $value
-     * @return Object\ObjectInterface
+     * @return ObjectInterface
      */
     public function setFactor($value);
 
@@ -111,20 +111,20 @@ public function getFactor();
     /**
      * Set color of the barcode and text
      * @param string $value
-     * @return Object\ObjectInterface
+     * @return ObjectInterface
      */
     public function setForeColor($value);
 
     /**
      * Retrieve color of the barcode and text
-     * @return unknown
+     * @return integer
      */
     public function getForeColor();
 
     /**
      * Set the color of the background
      * @param integer $value
-     * @return Object\ObjectInterface
+     * @return ObjectInterface
      */
     public function setBackgroundColor($value);
 
@@ -137,7 +137,7 @@ public function getBackgroundColor();
     /**
      * Activate/deactivate drawing of the bar
      * @param boolean $value
-     * @return Object\ObjectInterface
+     * @return ObjectInterface
      */
     public function setWithBorder($value);
 
@@ -149,14 +149,14 @@ public function getWithBorder();
 
     /**
      * Allow fast inversion of font/bars color and background color
-     * @return Object\ObjectInterface
+     * @return ObjectInterface
      */
     public function setReverseColor();
 
     /**
      * Set orientation of barcode and text
      * @param float $value
-     * @return Object\ObjectInterface
+     * @return ObjectInterface
      */
     public function setOrientation($value);
 
@@ -169,7 +169,7 @@ public function getOrientation();
     /**
      * Set text to encode
      * @param string $value
-     * @return Object\ObjectInterface
+     * @return ObjectInterface
      */
     public function setText($value);
 
@@ -194,7 +194,7 @@ public function getTextToDisplay();
     /**
      * Activate/deactivate drawing of text to encode
      * @param boolean $value
-     * @return Object\ObjectInterface
+     * @return ObjectInterface
      */
     public function setDrawText($value);
 
@@ -208,7 +208,7 @@ public function getDrawText();
      * Activate/deactivate the adjustment of the position
      * of the characters to the position of the bars
      * @param boolean $value
-     * @return Object\ObjectInterface
+     * @return ObjectInterface
      */
     public function setStretchText($value);
 
@@ -224,7 +224,7 @@ public function getStretchText();
      * of the checksum character
      * added to the barcode text
      * @param boolean $value
-     * @return Object\ObjectInterface
+     * @return ObjectInterface
      */
     public function setWithChecksum($value);
 
@@ -240,7 +240,7 @@ public function getWithChecksum();
      * of the checksum character
      * added to the barcode text
      * @param boolean $value
-     * @return Object\ObjectInterface
+     * @return ObjectInterface
      */
     public function setWithChecksumInText($value);
 
@@ -256,7 +256,7 @@ public function getWithChecksumInText();
      *  - if integer between 1 and 5, use gd built-in fonts
      *  - if string, $value is assumed to be the path to a TTF font
      * @param integer|string $value
-     * @return Object\ObjectInterface
+     * @return ObjectInterface
      */
     public function setFont($value);
 
@@ -269,7 +269,7 @@ public function getFont();
     /**
      * Set the size of the font in case of TTF
      * @param float $value
-     * @return Object\ObjectInterface
+     * @return ObjectInterface
      */
     public function setFontSize($value);
 
@@ -300,12 +300,14 @@ public function checkParams();
 
     /**
      * Get height of the result object
+     * @param boolean $recalculate
      * @return integer
      */
     public function getHeight($recalculate = false);
 
     /**
      * Get width of the result object
+     * @param boolean $recalculate
      * @return integer
      */
     public function getWidth($recalculate = false);
diff --git a/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php b/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
index 23a69e4fdb8..86a71428d87 100644
--- a/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
+++ b/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
@@ -31,7 +31,7 @@ class IgnoreUserAbort extends AbstractPlugin
     /**
      * The storage who activated ignore_user_abort.
      *
-     * @var null|Zend\Cache\Storage\StorageInterface
+     * @var null|\Zend\Cache\Storage\StorageInterface
      */
     protected $activatedTarget = null;
 
diff --git a/library/Zend/Cache/Storage/Plugin/PluginInterface.php b/library/Zend/Cache/Storage/Plugin/PluginInterface.php
index 17ab0d3cf6c..a657a5f7ab8 100644
--- a/library/Zend/Cache/Storage/Plugin/PluginInterface.php
+++ b/library/Zend/Cache/Storage/Plugin/PluginInterface.php
@@ -22,8 +22,8 @@ interface PluginInterface extends ListenerAggregateInterface
     /**
      * Set options
      *
-     * @param  Plugin\PluginOptions $options
-     * @return Plugin
+     * @param  PluginOptions $options
+     * @return PluginInterface
      */
     public function setOptions(PluginOptions $options);
 
diff --git a/library/Zend/Cache/StorageFactory.php b/library/Zend/Cache/StorageFactory.php
index 895a97f234a..a55227c2990 100644
--- a/library/Zend/Cache/StorageFactory.php
+++ b/library/Zend/Cache/StorageFactory.php
@@ -183,9 +183,9 @@ public static function resetAdapterPluginManager()
     /**
      * Instantiate a storage plugin
      *
-     * @param string|Storage\Plugin                          $pluginName
+     * @param string|Storage\Plugin\PluginInterface     $pluginName
      * @param array|Traversable|Storage\Plugin\PluginOptions $options
-     * @return Storage\Plugin
+     * @return Storage\Plugin\PluginInterface
      * @throws Exception\RuntimeException
      */
     public static function pluginFactory($pluginName, $options = array())
diff --git a/library/Zend/Db/Metadata/Metadata.php b/library/Zend/Db/Metadata/Metadata.php
index f3f87796664..b27c655e19c 100644
--- a/library/Zend/Db/Metadata/Metadata.php
+++ b/library/Zend/Db/Metadata/Metadata.php
@@ -47,7 +47,7 @@ public function __construct(Adapter $adapter)
      * Create source from adapter
      *
      * @param  Adapter $adapter
-     * @return Source\InformationSchemaMetadata
+     * @return Source\AbstractSource
      */
     protected function createSourceFromAdapter(Adapter $adapter)
     {
diff --git a/library/Zend/Db/Metadata/Source/AbstractSource.php b/library/Zend/Db/Metadata/Source/AbstractSource.php
index 19333170ce9..c5fed2cf210 100644
--- a/library/Zend/Db/Metadata/Source/AbstractSource.php
+++ b/library/Zend/Db/Metadata/Source/AbstractSource.php
@@ -375,8 +375,7 @@ public function getConstraint($constraintName, $table, $schema = null)
      * @param  string $constraint
      * @param  string $table
      * @param  string $schema
-     * @param  string $database
-     * @return Object\ConstraintKeyObject
+     * @return array
      */
     public function getConstraintKeys($constraint, $table, $schema = null)
     {
diff --git a/library/Zend/Db/RowGateway/RowGateway.php b/library/Zend/Db/RowGateway/RowGateway.php
index 7167b9729de..a7e9dcc00f5 100644
--- a/library/Zend/Db/RowGateway/RowGateway.php
+++ b/library/Zend/Db/RowGateway/RowGateway.php
@@ -11,8 +11,6 @@
 namespace Zend\Db\RowGateway;
 
 use Zend\Db\Adapter\Adapter;
-use Zend\Db\ResultSet\Row;
-use Zend\Db\ResultSet\RowObjectInterface;
 use Zend\Db\Sql\Sql;
 
 /**
@@ -26,10 +24,9 @@ class RowGateway extends AbstractRowGateway
     /**
      * Constructor
      *
-     * @param string $tableGateway
+     * @param string $primaryKeyColumn
      * @param string|\Zend\Db\Sql\TableIdentifier $table
-     * @param Adapter $adapter
-     * @param Sql\Sql $sql
+     * @param Adapter|Sql $adapterOrSql
      */
     public function __construct($primaryKeyColumn, $table, $adapterOrSql = null)
     {
diff --git a/library/Zend/Db/Sql/Platform/AbstractPlatform.php b/library/Zend/Db/Sql/Platform/AbstractPlatform.php
index 8c526e3fe53..47d24b3b2f4 100644
--- a/library/Zend/Db/Sql/Platform/AbstractPlatform.php
+++ b/library/Zend/Db/Sql/Platform/AbstractPlatform.php
@@ -15,6 +15,7 @@
 use Zend\Db\Adapter\Platform\PlatformInterface;
 use Zend\Db\Sql\PreparableSqlInterface;
 use Zend\Db\Sql\SqlInterface;
+use Zend\Db\Sql\Exception;
 
 class AbstractPlatform implements PlatformDecoratorInterface, PreparableSqlInterface, SqlInterface
 {
@@ -55,7 +56,7 @@ public function getDecorators()
 
     /**
      * @param Adapter $adapter
-     * @return StatementInterface
+     * @param StatementInterface $statement
      */
     public function prepareStatement(Adapter $adapter, StatementInterface $statement)
     {
diff --git a/library/Zend/Db/TableGateway/AbstractTableGateway.php b/library/Zend/Db/TableGateway/AbstractTableGateway.php
index 0dc50e66994..95fe6ea8f9b 100644
--- a/library/Zend/Db/TableGateway/AbstractTableGateway.php
+++ b/library/Zend/Db/TableGateway/AbstractTableGateway.php
@@ -63,7 +63,7 @@ abstract class AbstractTableGateway implements TableGatewayInterface
     protected $resultSetPrototype = null;
 
     /**
-     * @var Sql\Sql
+     * @var Sql
      */
     protected $sql = null;
 
@@ -198,7 +198,7 @@ public function select($where = null)
     }
 
     /**
-     * @param Sql\Select $select
+     * @param Select $select
      * @return null|ResultSetInterface
      * @throws \RuntimeException
      */
diff --git a/library/Zend/Feed/Reader/AbstractEntry.php b/library/Zend/Feed/Reader/AbstractEntry.php
index 69d7c8b3d7b..a52f147c78f 100644
--- a/library/Zend/Feed/Reader/AbstractEntry.php
+++ b/library/Zend/Feed/Reader/AbstractEntry.php
@@ -37,7 +37,7 @@ abstract class AbstractEntry
     /**
      * Entry instance
      *
-     * @var Zend\Feed\Entry
+     * @var DOMElement
      */
     protected $entry = null;
 
@@ -67,7 +67,7 @@ abstract class AbstractEntry
      *
      * @param  DOMElement $entry
      * @param  int $entryKey
-     * @param  string $type
+     * @param  null|string $type
      * @return void
      */
     public function __construct(DOMElement $entry, $entryKey, $type = null)
@@ -78,7 +78,7 @@ public function __construct(DOMElement $entry, $entryKey, $type = null)
         if ($type !== null) {
             $this->data['type'] = $type;
         } else {
-            $this->data['type'] = Reader::detectType($feed);
+            $this->data['type'] = Reader::detectType($entry);
         }
         $this->_loadExtensions();
     }
@@ -157,7 +157,7 @@ public function getXpath()
      * Set the XPath query
      *
      * @param  DOMXPath $xpath
-     * @return Zend\Feed\Reader\AbstractEntry
+     * @return \Zend\Feed\Reader\AbstractEntry
      */
     public function setXpath(DOMXPath $xpath)
     {
diff --git a/library/Zend/Feed/Reader/AbstractFeed.php b/library/Zend/Feed/Reader/AbstractFeed.php
index aee38599835..167e2b7c62e 100644
--- a/library/Zend/Feed/Reader/AbstractFeed.php
+++ b/library/Zend/Feed/Reader/AbstractFeed.php
@@ -127,7 +127,7 @@ public function count()
     /**
      * Return the current entry
      *
-     * @return \Zend\Feed\Reader\Entry
+     * @return \Zend\Feed\Reader\AbstractEntry
      */
     public function current()
     {
diff --git a/library/Zend/Feed/Reader/Extension/AbstractEntry.php b/library/Zend/Feed/Reader/Extension/AbstractEntry.php
index 259ea1d630e..e60d2de6603 100644
--- a/library/Zend/Feed/Reader/Extension/AbstractEntry.php
+++ b/library/Zend/Feed/Reader/Extension/AbstractEntry.php
@@ -175,7 +175,7 @@ public function getType()
      * Set the XPath query
      *
      * @param  DOMXPath $xpath
-     * @return Reader\Reader_Extension_EntryAbstract
+     * @return AbstractEntry
      */
     public function setXpath(DOMXPath $xpath)
     {
@@ -221,7 +221,7 @@ public function getXpathPrefix()
      * Set the XPath prefix
      *
      * @param  string $prefix
-     * @return Reader\Reader_Extension_EntryAbstract
+     * @return AbstractEntry
      */
     public function setXpathPrefix($prefix)
     {
diff --git a/library/Zend/Feed/Reader/Extension/AbstractFeed.php b/library/Zend/Feed/Reader/Extension/AbstractFeed.php
index 0f8b635b926..3770fc83a54 100644
--- a/library/Zend/Feed/Reader/Extension/AbstractFeed.php
+++ b/library/Zend/Feed/Reader/Extension/AbstractFeed.php
@@ -125,7 +125,7 @@ public function toArray() // untested
      * Set the XPath query
      *
      * @param  DOMXPath $xpath
-     * @return Reader\Reader_Extension_EntryAbstract
+     * @return AbstractEntry
      */
     public function setXpath(DOMXPath $xpath = null)
     {
diff --git a/library/Zend/Feed/Reader/Extension/Atom/Entry.php b/library/Zend/Feed/Reader/Extension/Atom/Entry.php
index 8742f8dedf1..b3c76f391af 100644
--- a/library/Zend/Feed/Reader/Extension/Atom/Entry.php
+++ b/library/Zend/Feed/Reader/Extension/Atom/Entry.php
@@ -521,7 +521,7 @@ public function getCategories()
     /**
      * Get source feed metadata from the entry
      *
-     * @return Reader\Reader_Feed_Atom_Source|null
+     * @return Reader\Feed\Atom\Source|null
      */
     public function getSource()
     {
diff --git a/library/Zend/Http/Client.php b/library/Zend/Http/Client.php
index 78f2c598c56..75dd37b60aa 100644
--- a/library/Zend/Http/Client.php
+++ b/library/Zend/Http/Client.php
@@ -1254,8 +1254,8 @@ protected function flattenParametersArray($parray, $prefix = null)
      * the interaction with the adapter
      *
      * @param Http $uri
-     * @param string $secure
      * @param string $method
+     * @param boolean $secure
      * @param array $headers
      * @param string $body
      * @return string the raw response
diff --git a/library/Zend/Http/Header/SetCookie.php b/library/Zend/Http/Header/SetCookie.php
index 09761c6ef09..4c55022b92d 100644
--- a/library/Zend/Http/Header/SetCookie.php
+++ b/library/Zend/Http/Header/SetCookie.php
@@ -75,7 +75,7 @@ class SetCookie implements MultipleHeaderInterface
     protected $secure = null;
 
     /**
-     * @var true
+     * @var boolean|null
      */
     protected $httponly = null;
 
@@ -432,7 +432,7 @@ public function isSecure()
     }
 
     /**
-     * @param \Zend\Http\Header\true $httponly
+     * @param boolean $httponly
      */
     public function setHttponly($httponly)
     {
@@ -440,7 +440,7 @@ public function setHttponly($httponly)
     }
 
     /**
-     * @return \Zend\Http\Header\true
+     * @return boolean
      */
     public function isHttponly()
     {
diff --git a/library/Zend/Json/Server/Response.php b/library/Zend/Json/Server/Response.php
index 34bd894947c..8365f626e0d 100644
--- a/library/Zend/Json/Server/Response.php
+++ b/library/Zend/Json/Server/Response.php
@@ -39,7 +39,7 @@ class Response
 
     /**
      * Service map
-     * @var Smd\Smd
+     * @var Smd
      */
     protected $serviceMap;
 
@@ -248,7 +248,7 @@ public function setArgs($args)
     /**
      * Set service map object
      *
-     * @param  Smd\Smd $serviceMap
+     * @param  Smd $serviceMap
      * @return Response
      */
     public function setServiceMap($serviceMap)
@@ -260,7 +260,7 @@ public function setServiceMap($serviceMap)
     /**
      * Retrieve service map
      *
-     * @return Smd\Smd|null
+     * @return Smd|null
      */
     public function getServiceMap()
     {
diff --git a/library/Zend/Json/Server/Smd.php b/library/Zend/Json/Server/Smd.php
index ee62a588fce..f1b9981bf19 100644
--- a/library/Zend/Json/Server/Smd.php
+++ b/library/Zend/Json/Server/Smd.php
@@ -97,7 +97,7 @@ class Smd
      * Set object state via options
      *
      * @param  array $options
-     * @return Zend\Json\Server\Smd
+     * @return Smd
      */
     public function setOptions(array $options)
     {
@@ -114,7 +114,7 @@ public function setOptions(array $options)
      * Set transport
      *
      * @param  string $transport
-     * @return Zend\Json\Server\Smd
+     * @return \Zend\Json\Server\Smd
      */
     public function setTransport($transport)
     {
@@ -139,7 +139,7 @@ public function getTransport()
      * Set envelope
      *
      * @param  string $envelopeType
-     * @return Zend\Json\Server\Smd
+     * @return Smd
      */
     public function setEnvelope($envelopeType)
     {
@@ -165,7 +165,7 @@ public function getEnvelope()
      * Set content type
      *
      * @param  string $type
-     * @return Zend\Json\Server\Smd
+     * @return \Zend\Json\Server\Smd
      */
     public function setContentType($type)
     {
@@ -190,7 +190,7 @@ public function getContentType()
      * Set service target
      *
      * @param  string $target
-     * @return Zend\Json\Server\Smd
+     * @return Smd
      */
     public function setTarget($target)
     {
@@ -212,7 +212,7 @@ public function getTarget()
      * Set service ID
      *
      * @param  string $Id
-     * @return Zend\Json\Server\Smd
+     * @return Smd
      */
     public function setId($id)
     {
@@ -234,7 +234,7 @@ public function getId()
      * Set service description
      *
      * @param  string $description
-     * @return Zend\Json\Server\Smd
+     * @return Smd
      */
     public function setDescription($description)
     {
@@ -256,7 +256,7 @@ public function getDescription()
      * Indicate whether or not to generate Dojo-compatible SMD
      *
      * @param  bool $flag
-     * @return Zend\Json\Server\Smd
+     * @return Smd
      */
     public function setDojoCompatible($flag)
     {
@@ -277,8 +277,8 @@ public function isDojoCompatible()
     /**
      * Add Service
      *
-     * @param Zend\Json\Server\Smd\Service|array $service
-     * @return void
+     * @param Smd\Service|array $service
+     * @return Smd
      */
     public function addService($service)
     {
@@ -302,7 +302,7 @@ public function addService($service)
      * Add many services
      *
      * @param  array $services
-     * @return Zend\Json\Server\Smd
+     * @return Smd
      */
     public function addServices(array $services)
     {
@@ -316,7 +316,7 @@ public function addServices(array $services)
      * Overwrite existing services with new ones
      *
      * @param  array $services
-     * @return Zend\Json\Server\Smd
+     * @return Smd
      */
     public function setServices(array $services)
     {
@@ -328,7 +328,7 @@ public function setServices(array $services)
      * Get service object
      *
      * @param  string $name
-     * @return false|Zend\Json\Server\Smd\Service
+     * @return boolean|Smd\Service
      */
     public function getService($name)
     {
diff --git a/library/Zend/Json/Server/Smd/Service.php b/library/Zend/Json/Server/Smd/Service.php
index 9552ca97c34..6ec7d38d45b 100644
--- a/library/Zend/Json/Server/Smd/Service.php
+++ b/library/Zend/Json/Server/Smd/Service.php
@@ -428,9 +428,10 @@ public function __toString()
     /**
      * Validate parameter type
      *
-     * @param  string $type
-     * @return true
-     * @throws Zend\Json\Server\Exception
+     * @param string  $type
+     * @param boolean $isReturn
+     * @return string
+     * @throws InvalidArgumentException
      */
     protected function _validateParamType($type, $isReturn = false)
     {
diff --git a/library/Zend/Log/Writer/MongoDB.php b/library/Zend/Log/Writer/MongoDB.php
index 3f57434f280..f7b4f8f676b 100644
--- a/library/Zend/Log/Writer/MongoDB.php
+++ b/library/Zend/Log/Writer/MongoDB.php
@@ -47,10 +47,10 @@ class MongoDB extends AbstractWriter
      * Constructor
      *
      * @param Mongo|array|Traversable $mongo
-     * @param string $database
+     * @param string|MongoDB $database
      * @param string $collection
-     * @param array  $saveOptions
-     * @return Zend\Log\Writer\MongoDB
+     * @param array $saveOptions
+     * @return void
      */
     public function __construct($mongo, $database, $collection, array $saveOptions = array())
     {
diff --git a/library/Zend/Memory/MemoryManager.php b/library/Zend/Memory/MemoryManager.php
index 60cb252828e..207c7348153 100644
--- a/library/Zend/Memory/MemoryManager.php
+++ b/library/Zend/Memory/MemoryManager.php
@@ -224,8 +224,8 @@ public function getMinSize()
      * Create new Zend_Memory value container
      *
      * @param string $value
-     * @return \Zend\Memory\Container
-     * @throws \Zend\Memory\Exception
+     * @return Container\ContainerInterface
+     * @throws Exception\ExceptionInterface
      */
     public function create($value = '')
     {
@@ -237,8 +237,8 @@ public function create($value = '')
      * locked in memory
      *
      * @param string $value
-     * @return \Zend\Memory\Container
-     * @throws \Zend\Memory\Exception
+     * @return Container\ContainerInterface
+     * @throws Exception\ExceptionInterface
      */
     public function createLocked($value = '')
     {
@@ -250,8 +250,8 @@ public function createLocked($value = '')
      *
      * @param string $value
      * @param boolean $locked
-     * @return \Zend\Memory\Container
-     * @throws \Zend\Memory\Exception
+     * @return \Zend\Memory\Container\ContainerInterface
+     * @throws \Zend\Memory\Exception\ExceptionInterface
      */
     private function _create($value, $locked)
     {
@@ -280,8 +280,9 @@ private function _create($value, $locked)
      * Used by Memory container destroy() method
      *
      * @internal
+     * @param Container\Movable $container
      * @param integer $id
-     * @return \Zend\Memory\Container\AbstractContainer
+     * @return null
      */
     public function unlink(Container\Movable $container, $id)
     {
diff --git a/library/Zend/ProgressBar/Adapter/AbstractAdapter.php b/library/Zend/ProgressBar/Adapter/AbstractAdapter.php
index 3a1befe47f7..d2e2cba6af7 100644
--- a/library/Zend/ProgressBar/Adapter/AbstractAdapter.php
+++ b/library/Zend/ProgressBar/Adapter/AbstractAdapter.php
@@ -53,7 +53,7 @@ public function __construct($options = null)
      * Set options via an array
      *
      * @param  array $options
-     * @return \Zend\ProgressBar\Adapter\Adapter
+     * @return AbstractAdapter
      */
     public function setOptions(array $options)
     {
diff --git a/library/Zend/ProgressBar/Adapter/Console.php b/library/Zend/ProgressBar/Adapter/Console.php
index a74e0e71921..e535ff89ddb 100644
--- a/library/Zend/ProgressBar/Adapter/Console.php
+++ b/library/Zend/ProgressBar/Adapter/Console.php
@@ -239,7 +239,7 @@ public function setWidth($width = null)
      * Set the elements to display with the progressbar
      *
      * @param  array $elements
-     * @throws \Zend\ProgressBar\Adapter\Exception When an invalid element is found in the array
+     * @throws \Zend\ProgressBar\Adapter\Exception\InvalidArgumentException When an invalid element is found in the array
      * @return \Zend\ProgressBar\Adapter\Console
      */
     public function setElements(array $elements)
@@ -264,7 +264,7 @@ public function setElements(array $elements)
      * Set the left-hand character for the bar
      *
      * @param  string $char
-     * @throws \Zend\ProgressBar\Adapter\Exception When character is empty
+     * @throws \Zend\ProgressBar\Adapter\Exception\InvalidArgumentException When character is empty
      * @return \Zend\ProgressBar\Adapter\Console
      */
     public function setBarLeftChar($char)
@@ -282,7 +282,7 @@ public function setBarLeftChar($char)
      * Set the right-hand character for the bar
      *
      * @param  string $char
-     * @throws \Zend\ProgressBar\Adapter\Exception When character is empty
+     * @throws \Zend\ProgressBar\Adapter\Exception\InvalidArgumentException When character is empty
      * @return \Zend\ProgressBar\Adapter\Console
      */
     public function setBarRightChar($char)
@@ -338,7 +338,7 @@ public function setCharset($charset)
      * Set the finish action
      *
      * @param  string $action
-     * @throws \Zend\ProgressBar\Adapter\Exception When an invalid action is specified
+     * @throws \Zend\ProgressBar\Adapter\Exception\InvalidArgumentException When an invalid action is specified
      * @return \Zend\ProgressBar\Adapter\Console
      */
     public function setFinishAction($action)
diff --git a/library/Zend/ProgressBar/ProgressBar.php b/library/Zend/ProgressBar/ProgressBar.php
index b7fe828a542..08bb4ebf514 100644
--- a/library/Zend/ProgressBar/ProgressBar.php
+++ b/library/Zend/ProgressBar/ProgressBar.php
@@ -59,7 +59,7 @@ class ProgressBar
     /**
      * Adapter for the output
      *
-     * @var \Zend\ProgressBar\Adapter\Adapter
+     * @var \Zend\ProgressBar\Adapter\AbstractAdapter
      */
     protected $adapter;
 
@@ -74,9 +74,9 @@ class ProgressBar
      * Create a new progressbar backend.
      *
      * @param  Adapter\AbstractAdapter $adapter
-     * @param  float                    $min
-     * @param  float                    $max
-     * @param  string                   $persistenceNamespace
+     * @param  float|int               $min
+     * @param  float|int               $max
+     * @param  string|null             $persistenceNamespace
      * @throws Exception\OutOfRangeException When $min is greater than $max
      */
     public function __construct(Adapter\AbstractAdapter $adapter, $min = 0, $max = 100, $persistenceNamespace = null)
diff --git a/library/Zend/Server/Definition.php b/library/Zend/Server/Definition.php
index ef53f18a147..0baecd52b97 100644
--- a/library/Zend/Server/Definition.php
+++ b/library/Zend/Server/Definition.php
@@ -59,7 +59,7 @@ public function setOverwriteExistingMethods($flag)
      * @param  array|\Zend\Server\Method\Definition $method
      * @param  null|string $name
      * @return \Zend\Server\Definition
-     * @throws \Zend\Server\Exception if duplicate or invalid method provided
+     * @throws \Zend\Server\Exception\ExceptionInterface if duplicate or invalid method provided
      */
     public function addMethod($method, $name = null)
     {
diff --git a/library/Zend/Server/Method/Callback.php b/library/Zend/Server/Method/Callback.php
index 004aeb956dc..9a1f42186ad 100644
--- a/library/Zend/Server/Method/Callback.php
+++ b/library/Zend/Server/Method/Callback.php
@@ -150,8 +150,8 @@ public function getMethod()
      * Set callback type
      *
      * @param  string $type
-     * @return \Zend\Server\Method\Callback
-     * @throws \Zend\Server\Exception
+     * @return Callback
+     * @throws Server\Exception\InvalidArgumentException
      */
     public function setType($type)
     {
diff --git a/library/Zend/Server/Reflection.php b/library/Zend/Server/Reflection.php
index aab6988e46a..75662970445 100644
--- a/library/Zend/Server/Reflection.php
+++ b/library/Zend/Server/Reflection.php
@@ -31,12 +31,12 @@ class Reflection
      * be provided as an array to $argv.
      *
      * @param string|object $class Class name or object
-     * @param null|array $argv Optional arguments to be used during the method call
+     * @param boolean|array $argv Optional arguments to be used during the method call
      * @param string $namespace Optional namespace with which to prefix the
      * method name (used for the signature key). Primarily to avoid collisions,
      * also for XmlRpc namespacing
-     * @return \Zend\Server\Reflection\ClassReflection
-     * @throws \Zend\Server\Reflection\Exception
+     * @return \Zend\Server\Reflection\ReflectionClass
+     * @throws \Zend\Server\Reflection\Exception\ExceptionInterface
      */
     public static function reflectClass($class, $argv = false, $namespace = '')
     {
@@ -65,12 +65,12 @@ public static function reflectClass($class, $argv = false, $namespace = '')
      * may be provided as an array to $argv.
      *
      * @param string $function Function name
-     * @param null|array $argv Optional arguments to be used during the method call
+     * @param boolean|array $argv Optional arguments to be used during the method call
      * @param string $namespace Optional namespace with which to prefix the
      * function name (used for the signature key). Primarily to avoid
      * collisions, also for XmlRpc namespacing
-     * @return \Zend\Server\Reflection\FunctionReflection
-     * @throws \Zend\Server\Reflection\Exception
+     * @return \Zend\Server\Reflection\ReflectionFunction
+     * @throws \Zend\Server\Reflection\Exception\ExceptionInterface
      */
     public static function reflectFunction($function, $argv = false, $namespace = '')
     {
diff --git a/library/Zend/Server/Reflection/Prototype.php b/library/Zend/Server/Reflection/Prototype.php
index e31a5b69cdb..8bd12131101 100644
--- a/library/Zend/Server/Reflection/Prototype.php
+++ b/library/Zend/Server/Reflection/Prototype.php
@@ -24,7 +24,7 @@ class Prototype
     /**
      * Constructor
      *
-     * @param Zend\Server\Reflection\ReflectionReturnValue $return
+     * @param ReflectionReturnValue $return
      * @param array $params
      * @return void
      */
@@ -61,7 +61,7 @@ public function getReturnType()
      * Retrieve the return value object
      *
      * @access public
-     * @return Zend\Server\Reflection\ReflectionReturnValue
+     * @return \Zend\Server\Reflection\ReflectionReturnValue
      */
     public function getReturnValue()
     {
diff --git a/library/Zend/Server/Reflection/ReflectionMethod.php b/library/Zend/Server/Reflection/ReflectionMethod.php
index 68905da3938..9e2096d752e 100644
--- a/library/Zend/Server/Reflection/ReflectionMethod.php
+++ b/library/Zend/Server/Reflection/ReflectionMethod.php
@@ -27,15 +27,15 @@ class ReflectionMethod extends AbstractFunction
 
     /**
      * Parent class reflection
-     * @var Zend\Server\Reflection\ReflectionClass
+     * @var ReflectionClass
      */
     protected $classReflection;
 
     /**
      * Constructor
      *
-     * @param \Zend\Server\Reflection\ReflectionClass $class
-     * @param ReflectionMethod $r
+     * @param ReflectionClass $class
+     * @param \ReflectionMethod $r
      * @param string $namespace
      * @param array $argv
      * @return void
diff --git a/library/Zend/Soap/Client.php b/library/Zend/Soap/Client.php
index ee9a993c4d0..c6d238d325f 100644
--- a/library/Zend/Soap/Client.php
+++ b/library/Zend/Soap/Client.php
@@ -15,7 +15,7 @@
 use Zend\Stdlib\ArrayUtils;
 
 /**
- * \Zend\Soap\Client\Client
+ * \Zend\Soap\Client
  *
  * @category   Zend
  * @package    Zend_Soap
@@ -69,7 +69,7 @@ class Client implements ServerClient
 
     /**
      * WSDL used to access server
-     * It also defines \Zend\Soap\Client\Client working mode (WSDL vs non-WSDL)
+     * It also defines \Zend\Soap\Client working mode (WSDL vs non-WSDL)
      *
      * @var string
      */
@@ -141,7 +141,7 @@ public function __construct($wsdl = null, $options = null)
      * Set wsdl
      *
      * @param string $wsdl
-     * @return \Zend\Soap\Client\Client
+     * @return \Zend\Soap\Client
      */
     public function setWSDL($wsdl)
     {
@@ -167,7 +167,7 @@ public function getWSDL()
      * Allows setting options as an associative array of option => value pairs.
      *
      * @param  array|Traversable $options
-     * @return \Zend\Soap\Client\Client
+     * @return \Zend\Soap\Client
      * @throws Exception\InvalidArgumentException
      */
     public function setOptions($options)
@@ -315,8 +315,8 @@ public function getOptions()
      * Set SOAP version
      *
      * @param  int $version One of the SOAP_1_1 or SOAP_1_2 constants
-     * @return \Zend\Soap\Client\Client
-     * @throws \Zend\Soap\Client\Exception with invalid soap version argument
+     * @return \Zend\Soap\Client
+     * @throws \Zend\Soap\Exception\ExceptionInterface with invalid soap version argument
      */
     public function setSoapVersion($version)
     {
@@ -344,8 +344,8 @@ public function getSoapVersion()
      * Set classmap
      *
      * @param  array $classmap
-     * @return \Zend\Soap\Client\Client
-     * @throws \Zend\Soap\Client\Exception for any invalid class in the class map
+     * @return \Zend\Soap\Client
+     * @throws \Zend\Soap\Exception\ExceptionInterface for any invalid class in the class map
      */
     public function setClassmap(array $classmap)
     {
@@ -376,8 +376,8 @@ public function getClassmap()
      * Set encoding
      *
      * @param  string $encoding
-     * @return \Zend\Soap\Client\Client
-     * @throws \Zend\Soap\Client\Exception with invalid encoding argument
+     * @return \Zend\Soap\Client
+     * @throws \Zend\Soap\Exception\ExceptionInterface with invalid encoding argument
      */
     public function setEncoding($encoding)
     {
@@ -406,8 +406,8 @@ public function getEncoding()
      * Check for valid URN
      *
      * @param  string $urn
-     * @return true
-     * @throws \Zend\Soap\Client\Exception on invalid URN
+     * @return boolean
+     * @throws \Zend\Soap\Exception\ExceptionInterface on invalid URN
      */
     public function validateUrn($urn)
     {
@@ -426,8 +426,8 @@ public function validateUrn($urn)
      * URI in Web Service the target namespace
      *
      * @param  string $uri
-     * @return \Zend\Soap\Client\Client
-     * @throws \Zend\Soap\Client\Exception with invalid uri argument
+     * @return \Zend\Soap\Client
+     * @throws \Zend\Soap\Exception\ExceptionInterface with invalid uri argument
      */
     public function setUri($uri)
     {
@@ -455,8 +455,8 @@ public function getUri()
      * URI in Web Service the target namespace
      *
      * @param  string $location
-     * @return \Zend\Soap\Client\Client
-     * @throws \Zend\Soap\Client\Exception with invalid uri argument
+     * @return \Zend\Soap\Client
+     * @throws \Zend\Soap\Exception\ExceptionInterface with invalid uri argument
      */
     public function setLocation($location)
     {
@@ -482,8 +482,8 @@ public function getLocation()
      * Set request style
      *
      * @param  int $style One of the SOAP_RPC or SOAP_DOCUMENT constants
-     * @return \Zend\Soap\Client\Client
-     * @throws \Zend\Soap\Client\Exception with invalid style argument
+     * @return \Zend\Soap\Client
+     * @throws \Zend\Soap\Exception\ExceptionInterface with invalid style argument
      */
     public function setStyle($style)
     {
@@ -512,8 +512,8 @@ public function getStyle()
      * Set message encoding method
      *
      * @param  int $use One of the SOAP_ENCODED or SOAP_LITERAL constants
-     * @return \Zend\Soap\Client\Client
-     * @throws \Zend\Soap\Client\Exception with invalid message encoding method argument
+     * @return \Zend\Soap\Client
+     * @throws \Zend\Soap\Exception\ExceptionInterface with invalid message encoding method argument
      */
     public function setEncodingMethod($use)
     {
@@ -542,7 +542,7 @@ public function getEncodingMethod()
      * Set HTTP login
      *
      * @param  string $login
-     * @return \Zend\Soap\Client\Client
+     * @return \Zend\Soap\Client
      */
     public function setHttpLogin($login)
     {
@@ -567,7 +567,7 @@ public function getHttpLogin()
      * Set HTTP password
      *
      * @param  string $password
-     * @return \Zend\Soap\Client\Client
+     * @return \Zend\Soap\Client
      */
     public function setHttpPassword($password)
     {
@@ -592,7 +592,7 @@ public function getHttpPassword()
      * Set proxy host
      *
      * @param  string $proxyHost
-     * @return \Zend\Soap\Client\Client
+     * @return \Zend\Soap\Client
      */
     public function setProxyHost($proxyHost)
     {
@@ -617,7 +617,7 @@ public function getProxyHost()
      * Set proxy port
      *
      * @param  int $proxyPort
-     * @return \Zend\Soap\Client\Client
+     * @return \Zend\Soap\Client
      */
     public function setProxyPort($proxyPort)
     {
@@ -642,7 +642,7 @@ public function getProxyPort()
      * Set proxy login
      *
      * @param  string $proxyLogin
-     * @return \Zend\Soap\Client\Client
+     * @return \Zend\Soap\Client
      */
     public function setProxyLogin($proxyLogin)
     {
@@ -667,7 +667,7 @@ public function getProxyLogin()
      * Set proxy password
      *
      * @param  string $proxyLogin
-     * @return \Zend\Soap\Client\Client
+     * @return \Zend\Soap\Client
      */
     public function setProxyPassword($proxyPassword)
     {
@@ -682,8 +682,8 @@ public function setProxyPassword($proxyPassword)
      * Set HTTPS client certificate path
      *
      * @param  string $localCert local certificate path
-     * @return \Zend\Soap\Client\Client
-     * @throws \Zend\Soap\Client\Exception with invalid local certificate path argument
+     * @return \Zend\Soap\Client
+     * @throws \Zend\Soap\Exception\ExceptionInterface with invalid local certificate path argument
      */
     public function setHttpsCertificate($localCert)
     {
@@ -712,7 +712,7 @@ public function getHttpsCertificate()
      * Set HTTPS client certificate passphrase
      *
      * @param  string $passphrase
-     * @return \Zend\Soap\Client\Client
+     * @return \Zend\Soap\Client
      */
     public function setHttpsCertPassphrase($passphrase)
     {
@@ -737,7 +737,7 @@ public function getHttpsCertPassphrase()
      * Set compression options
      *
      * @param  int|null $compressionOptions
-     * @return \Zend\Soap\Client\Client
+     * @return \Zend\Soap\Client
      */
     public function setCompressionOptions($compressionOptions)
     {
@@ -774,7 +774,7 @@ public function getProxyPassword()
     /**
      * Set Stream Context
      *
-     * @return \Zend\Soap\Client\Client
+     * @return \Zend\Soap\Client
      */
     public function setStreamContext($context)
     {
@@ -800,7 +800,7 @@ public function getStreamContext()
      * Set the SOAP Feature options.
      *
      * @param  string|int $feature
-     * @return \Zend\Soap\Client\Client
+     * @return \Zend\Soap\Client
      */
     public function setSoapFeatures($feature)
     {
@@ -824,7 +824,7 @@ public function getSoapFeatures()
      * Set the SOAP WSDL Caching Options
      *
      * @param string|int|boolean|null $caching
-     * @return \Zend\Soap\Client\Client
+     * @return \Zend\Soap\Client
      */
     public function setWSDLCache($caching)
     {
@@ -850,7 +850,7 @@ public function getWSDLCache()
      * Set the string to use in User-Agent header
      *
      * @param  string|null $userAgent
-     * @return \Zend\Soap\Client\Client
+     * @return \Zend\Soap\Client
      */
     public function setUserAgent($userAgent)
     {
@@ -964,7 +964,7 @@ public function _doRequest(Client\Common $client, $request, $location, $action,
     /**
      * Initialize SOAP Client object
      *
-     * @throws \Zend\Soap\Client\Exception
+     * @throws \Zend\Soap\Exception\ExceptionInterface
      */
     protected function _initSoapClientObject()
     {
@@ -1023,7 +1023,7 @@ protected function _preProcessResult($result)
      *
      * @param SoapHeader $header
      * @param boolean $permanent
-     * @return \Zend\Soap\Client\Client
+     * @return \Zend\Soap\Client
      */
     public function addSoapInputHeader(\SoapHeader $header, $permanent = false)
     {
@@ -1039,7 +1039,7 @@ public function addSoapInputHeader(\SoapHeader $header, $permanent = false)
     /**
      * Reset SOAP input headers
      *
-     * @return \Zend\Soap\Client\Client
+     * @return \Zend\Soap\Client
      */
     public function resetSoapInputHeaders()
     {
@@ -1101,7 +1101,7 @@ public function call($method, $params = array())
      * Return a list of available functions
      *
      * @return array
-     * @throws \Zend\Soap\Client\Exception
+     * @throws \Zend\Soap\Exception\ExceptionInterface
      */
     public function getFunctions()
     {
@@ -1124,7 +1124,7 @@ public function getFunctions()
      * Return a list of SOAP types
      *
      * @return array
-     * @throws \Zend\Soap\Client\Exception
+     * @throws \Zend\Soap\Exception\ExceptionInterface
      */
     public function getTypes()
     {
@@ -1139,7 +1139,7 @@ public function getTypes()
 
     /**
      * @param SoapClient $soapClient
-     * @return \Zend\Soap\Client\Client
+     * @return \Zend\Soap\Client
      */
     public function setSoapClient(\SoapClient $soapClient)
     {
@@ -1148,7 +1148,7 @@ public function setSoapClient(\SoapClient $soapClient)
     }
 
     /**
-     * @return SoapClient
+     * @return \SoapClient
      */
     public function getSoapClient()
     {
@@ -1159,9 +1159,9 @@ public function getSoapClient()
     }
 
     /**
-     * @param string $name
-     * @param string $value
-     * @return \Zend\Soap\Client\Client
+     * @param string $cookieName
+     * @param string $cookieValue
+     * @return \Zend\Soap\Client
      */
     public function setCookie($cookieName, $cookieValue=null)
     {
diff --git a/library/Zend/Soap/Client/DotNet.php b/library/Zend/Soap/Client/DotNet.php
index eaac318066a..f5274e2ce45 100644
--- a/library/Zend/Soap/Client/DotNet.php
+++ b/library/Zend/Soap/Client/DotNet.php
@@ -49,7 +49,8 @@ public function __construct($wsdl = null, $options = null)
      * My be overridden in descendant classes
      *
      * @param array $arguments
-     * @throws \Zend\Soap\ClientException
+     * @throws Exception\RuntimeException
+     * @return array
      */
     protected function _preProcessArguments($arguments)
     {
@@ -68,7 +69,7 @@ protected function _preProcessArguments($arguments)
      *
      * My be overridden in descendant classes
      *
-     * @param array $arguments
+     * @param object $result
      */
     protected function _preProcessResult($result)
     {
diff --git a/library/Zend/Soap/Wsdl.php b/library/Zend/Soap/Wsdl.php
index b0127e22b86..03b42d70f91 100644
--- a/library/Zend/Soap/Wsdl.php
+++ b/library/Zend/Soap/Wsdl.php
@@ -122,7 +122,7 @@ public function setClassMap($classMap)
      * Set a new uri for this WSDL
      *
      * @param  string|Uri $uri
-     * @return \Zend\Server\Wsdl
+     * @return \Zend\Soap\Wsdl
      */
     public function setUri($uri)
     {
diff --git a/library/Zend/View/Helper/Gravatar.php b/library/Zend/View/Helper/Gravatar.php
index 4e0e1542dbe..bc558bb3969 100644
--- a/library/Zend/View/Helper/Gravatar.php
+++ b/library/Zend/View/Helper/Gravatar.php
@@ -86,7 +86,7 @@ class Gravatar extends AbstractHtmlElement
      * @param  string|null $email Email address.
      * @param  null|array $options Options
      * @param  array $attribs Attributes for image tag (title, alt etc.)
-     * @return Zend\View\Helper\Gravatar
+     * @return Gravatar
      */
     public function __invoke($email = "", $options = array(), $attribs = array())
     {
diff --git a/library/Zend/View/Helper/Navigation.php b/library/Zend/View/Helper/Navigation.php
index bb4d8241e46..2938a568819 100644
--- a/library/Zend/View/Helper/Navigation.php
+++ b/library/Zend/View/Helper/Navigation.php
@@ -149,7 +149,7 @@ public function setPluginManager(Navigation\PluginManager $plugins)
      * Lazy-loads an instance of Navigation\HelperLoader if none currently
      * registered.
      *
-     * @return ShortNameLocator
+     * @return Navigation\PluginManager
      */
     public function getPluginManager()
     {
@@ -170,7 +170,7 @@ public function getPluginManager()
      *                                             exceptions should be
      *                                             thrown if something goes
      *                                             wrong. Default is true.
-     * @return \Zend\View\Helper\Navigation\Helper\HelperInterface  helper instance
+     * @return \Zend\View\Helper\Navigation\HelperInterface  helper instance
      * @throws \Zend\Loader\PluginLoader\Exception  if $strict is true and
      *         helper cannot be found
      * @throws Exception\InvalidArgumentException if $strict is true and
diff --git a/library/Zend/View/Helper/Navigation/HelperInterface.php b/library/Zend/View/Helper/Navigation/HelperInterface.php
index 0dc134d5436..eb64181b13f 100644
--- a/library/Zend/View/Helper/Navigation/HelperInterface.php
+++ b/library/Zend/View/Helper/Navigation/HelperInterface.php
@@ -64,7 +64,7 @@ public function getAcl();
      * @param  mixed $role [optional] role to set.  Expects a string, an
      *                     instance of type {@link Acl\Role}, or null. Default
      *                     is null.
-     * @throws \Zend\View\Exception if $role is invalid
+     * @throws \Zend\View\Exception\ExceptionInterface if $role is invalid
      * @return HelperInterface fluent interface, returns
      *                                             self
      */
@@ -73,7 +73,7 @@ public function setRole($role = null);
     /**
      * Returns ACL role to use when iterating pages, or null if it isn't set
      *
-     * @return string|Acl\Role|null  role or null
+     * @return string|Acl\Role\RoleInterface|null  role or null
      */
     public function getRole();
 
diff --git a/library/Zend/View/Helper/Navigation/Links.php b/library/Zend/View/Helper/Navigation/Links.php
index 6230c8b8dc9..90013f47d6b 100644
--- a/library/Zend/View/Helper/Navigation/Links.php
+++ b/library/Zend/View/Helper/Navigation/Links.php
@@ -100,7 +100,7 @@ class Links extends AbstractHelper
      * Helper entry point
      *
      * @param  string|AbstractContainer $container container to operate on
-     * @return Navigation
+     * @return Links
      */
     public function __invoke($container = null)
     {
@@ -124,7 +124,7 @@ public function __invoke($container = null)
      *
      * @param  string $method             method name
      * @param  array  $arguments          method arguments
-     * @throws Navigation\Exception\ExceptionInterface  if method does not exist in container
+     * @throws Exception\ExceptionInterface  if method does not exist in container
      */
     public function __call($method, array $arguments = array())
     {
diff --git a/library/Zend/View/Renderer/ConsoleRenderer.php b/library/Zend/View/Renderer/ConsoleRenderer.php
index ec61f03cc6e..45a40d231a1 100644
--- a/library/Zend/View/Renderer/ConsoleRenderer.php
+++ b/library/Zend/View/Renderer/ConsoleRenderer.php
@@ -25,9 +25,7 @@
 
 use ArrayAccess;
 use Zend\Filter\FilterChain;
-use Zend\Loader\Pluggable;
 use Zend\View\Exception;
-use Zend\View\HelperBroker;
 use Zend\View\Model;
 use Zend\View\Renderer;
 use Zend\View\Resolver;
@@ -98,7 +96,7 @@ public function init()
      * Set filter chain
      *
      * @param  FilterChain $filters
-     * @return Zend\View\PhpRenderer
+     * @return ConsoleRenderer
      */
     public function setFilterChain(FilterChain $filters)
     {
diff --git a/library/Zend/View/Resolver/TemplatePathStack.php b/library/Zend/View/Resolver/TemplatePathStack.php
index ae2a601c2db..1109a910462 100644
--- a/library/Zend/View/Resolver/TemplatePathStack.php
+++ b/library/Zend/View/Resolver/TemplatePathStack.php
@@ -233,7 +233,7 @@ public function getPaths()
      * Set LFI protection flag
      *
      * @param  bool $flag
-     * @return \Zend\View\TemplatePathStack
+     * @return TemplatePathStack
      */
     public function setLfiProtection($flag)
     {
@@ -255,7 +255,7 @@ public function isLfiProtectionOn()
      * Set flag indicating if stream wrapper should be used if short_open_tag is off
      *
      * @param  bool $flag
-     * @return \Zend\View\View
+     * @return TemplatePathStack
      */
     public function setUseStreamWrapper($flag)
     {
diff --git a/library/Zend/XmlRpc/AbstractValue.php b/library/Zend/XmlRpc/AbstractValue.php
index 18e0bc556b5..337e0bdb98c 100644
--- a/library/Zend/XmlRpc/AbstractValue.php
+++ b/library/Zend/XmlRpc/AbstractValue.php
@@ -47,7 +47,7 @@ abstract class AbstractValue
     protected $xml;
 
     /**
-     * @var Zend\XmlRpc\Generator\GeneratorAbstract
+     * @var \Zend\XmlRpc\Generator\GeneratorInterface
      */
     protected static $generator;
 
@@ -323,10 +323,10 @@ protected static function _phpVarToNativeXmlRpc($value)
     /**
      * Transform an XML string into a XML-RPC native value
      *
-     * @param string|SimpleXMLElement $xml A SimpleXMLElement object represent the XML string
+     * @param string|\SimpleXMLElement $xml A SimpleXMLElement object represent the XML string
      * It can be also a valid XML string for conversion
      *
-     * @return Zend\XmlRpc\Value\AbstractValue
+     * @return \Zend\XmlRpc\AbstractValue
      * @static
      */
     protected static function _xmlStringToNativeXmlRpc($xml)
@@ -431,7 +431,7 @@ protected static function _createSimpleXMLElement(&$xml)
     /**
      * Extract XML/RPC type and value from SimpleXMLElement object
      *
-     * @param SimpleXMLElement $xml
+     * @param \SimpleXMLElement $xml
      * @param string &$type Type bind variable
      * @param string &$value Value bind variable
      * @return void
diff --git a/library/Zend/XmlRpc/Client.php b/library/Zend/XmlRpc/Client.php
index 2647ec99b0e..f9520916947 100644
--- a/library/Zend/XmlRpc/Client.php
+++ b/library/Zend/XmlRpc/Client.php
@@ -32,25 +32,25 @@ class Client implements ServerClient
 
     /**
      * HTTP Client to use for requests
-     * @var Zend\Http\Client
+     * @var \Zend\Http\Client
      */
     protected $httpClient = null;
 
     /**
      * Introspection object
-     * @var Zend\Http\Client\ServerIntrospection
+     * @var \Zend\XmlRpc\Client\ServerIntrospection
      */
     protected $introspector = null;
 
     /**
      * Request of the last method call
-     * @var Zend\XmlRpc\Request
+     * @var \Zend\XmlRpc\Request
      */
     protected $lastRequest = null;
 
     /**
      * Response received from the last method call
-     * @var Zend\XmlRpc\Response
+     * @var \Zend\XmlRpc\Response
      */
     protected $lastResponse = null;
 
@@ -90,8 +90,8 @@ public function __construct($server, Http\Client $httpClient = null)
     /**
      * Sets the HTTP client object to use for connecting the XML-RPC server.
      *
-     * @param  Zend\Http\Client $httpClient
-     * @return Zend\Http\Client
+     * @param  \Zend\Http\Client $httpClient
+     * @return \Zend\Http\Client
      */
     public function setHttpClient(Http\Client $httpClient)
     {
@@ -102,7 +102,7 @@ public function setHttpClient(Http\Client $httpClient)
     /**
      * Gets the HTTP client object.
      *
-     * @return Zend\Http\Client
+     * @return \Zend\Http\Client
      */
     public function getHttpClient()
     {
@@ -113,8 +113,8 @@ public function getHttpClient()
     /**
      * Sets the object used to introspect remote servers
      *
-     * @param  Zend\XmlRpc\Client\ServerIntrospection
-     * @return Zend\XmlRpc\Client\ServerIntrospection
+     * @param  \Zend\XmlRpc\Client\ServerIntrospection
+     * @return \Zend\XmlRpc\Client\ServerIntrospection
      */
     public function setIntrospector(Client\ServerIntrospection $introspector)
     {
@@ -125,7 +125,7 @@ public function setIntrospector(Client\ServerIntrospection $introspector)
     /**
      * Gets the introspection object.
      *
-     * @return Zend\XmlRpc\Client\ServerIntrospection
+     * @return \Zend\XmlRpc\Client\ServerIntrospection
      */
     public function getIntrospector()
     {
@@ -136,7 +136,7 @@ public function getIntrospector()
    /**
      * The request of the last method call
      *
-     * @return Zend\XmlRpc\Request
+     * @return \Zend\XmlRpc\Request
      */
     public function getLastRequest()
     {
@@ -147,7 +147,7 @@ public function getLastRequest()
     /**
      * The response received from the last method call
      *
-     * @return Zend\XmlRpc\Response
+     * @return \Zend\XmlRpc\Response
      */
     public function getLastResponse()
     {
@@ -158,8 +158,8 @@ public function getLastResponse()
     /**
      * Returns a proxy object for more convenient method calls
      *
-     * @param $namespace  Namespace to proxy or empty string for none
-     * @return Zend\XmlRpc\Client\ServerProxy
+     * @param string $namespace  Namespace to proxy or empty string for none
+     * @return \Zend\XmlRpc\Client\ServerProxy
      */
     public function getProxy($namespace = '')
     {
@@ -174,7 +174,7 @@ public function getProxy($namespace = '')
      * Set skip system lookup flag
      *
      * @param  bool $flag
-     * @return Zend\XmlRpc\Client
+     * @return \Zend\XmlRpc\Client
      */
     public function setSkipSystemLookup($flag = true)
     {
@@ -195,10 +195,10 @@ public function skipSystemLookup()
     /**
      * Perform an XML-RPC request and return a response.
      *
-     * @param Zend\XmlRpc\Request $request
-     * @param null|Zend\XmlRpc\Response $response
+     * @param \Zend\XmlRpc\Request $request
+     * @param null|\Zend\XmlRpc\Response $response
      * @return void
-     * @throws Zend\XmlRpc\Client\HttpException
+     * @throws \Zend\XmlRpc\Client\Exception\HttpException
      */
     public function doRequest($request, $response = null)
     {
@@ -252,7 +252,7 @@ public function doRequest($request, $response = null)
      * @param  string $method Name of the method we want to call
      * @param  array $params Array of parameters for the method
      * @return mixed
-     * @throws Zend\XmlRpc\Client\FaultException
+     * @throws \Zend\XmlRpc\Client\Exception\FaultException
      */
     public function call($method, $params=array())
     {
@@ -335,7 +335,9 @@ public function call($method, $params=array())
     /**
      * Create request object
      *
-     * @return Zend\XmlRpc\Request
+     * @param string $method
+     * @param array $params
+     * @return \Zend\XmlRpc\Request
      */
     protected function _createRequest($method, $params)
     {
diff --git a/library/Zend/XmlRpc/Client/ServerIntrospection.php b/library/Zend/XmlRpc/Client/ServerIntrospection.php
index 3624c9d39f8..8d759d756c0 100644
--- a/library/Zend/XmlRpc/Client/ServerIntrospection.php
+++ b/library/Zend/XmlRpc/Client/ServerIntrospection.php
@@ -28,7 +28,7 @@ class ServerIntrospection
 
 
     /**
-     * @param Zend\XmlRpc\Client $client
+     * @param \Zend\XmlRpc\Client $client
      */
     public function __construct(XMLRPCClient $client)
     {
diff --git a/library/Zend/XmlRpc/Request.php b/library/Zend/XmlRpc/Request.php
index e5ef572a86d..ed7545f53af 100644
--- a/library/Zend/XmlRpc/Request.php
+++ b/library/Zend/XmlRpc/Request.php
@@ -52,7 +52,7 @@ class Request
 
     /**
      * Fault object, if any
-     * @var Zend\XmlRpc\Fault
+     * @var \Zend\XmlRpc\Fault
      */
     protected $fault = null;
 
@@ -90,7 +90,7 @@ public function __construct($method = null, $params = null)
      * Set encoding to use in request
      *
      * @param string $encoding
-     * @return Zend\XmlRpc\Request
+     * @return \Zend\XmlRpc\Request
      */
     public function setEncoding($encoding)
     {
@@ -350,7 +350,7 @@ public function isFault()
     /**
      * Retrieve the fault response, if any
      *
-     * @return null|Zend\XmlRpc\Fault
+     * @return null|\Zend\XmlRpc\Fault
      */
     public function getFault()
     {
diff --git a/library/Zend/XmlRpc/Response.php b/library/Zend/XmlRpc/Response.php
index 1410d90dcc7..3cf07dc2797 100644
--- a/library/Zend/XmlRpc/Response.php
+++ b/library/Zend/XmlRpc/Response.php
@@ -40,7 +40,7 @@ class Response
 
     /**
      * Fault, if response is a fault response
-     * @var null|Zend\XmlRpc\Fault
+     * @var null|\Zend\XmlRpc\Fault
      */
     protected $fault = null;
 
@@ -63,7 +63,7 @@ public function __construct($return = null, $type = null)
      * Set encoding to use in response
      *
      * @param string $encoding
-     * @return Zend\XmlRpc\Response
+     * @return \Zend\XmlRpc\Response
      */
     public function setEncoding($encoding)
     {
@@ -110,7 +110,7 @@ public function getReturnValue()
     /**
      * Retrieve the XMLRPC value for the return value
      *
-     * @return Zend\XmlRpc\Value
+     * @return \Zend\XmlRpc\AbstractValue
      */
     protected function _getXmlRpcReturn()
     {
@@ -130,7 +130,7 @@ public function isFault()
     /**
      * Returns the fault, if any.
      *
-     * @return null|Zend\XmlRpc\Fault
+     * @return null|\Zend\XmlRpc\Fault
      */
     public function getFault()
     {
diff --git a/library/Zend/XmlRpc/Server.php b/library/Zend/XmlRpc/Server.php
index 7c5059de4a9..1adce378df7 100644
--- a/library/Zend/XmlRpc/Server.php
+++ b/library/Zend/XmlRpc/Server.php
@@ -149,7 +149,7 @@ public function __construct()
      * @param  string $method
      * @param  array $params
      * @return mixed
-     * @throws Zend\XmlRpc\Server\Exception
+     * @throws Server\Exception\BadMethodCallException
      */
     public function __call($method, $params)
     {
@@ -174,7 +174,7 @@ public function __call($method, $params)
      * @param string|array|callable $function  Valid callback
      * @param string                $namespace Optional namespace prefix
      * @return void
-     * @throws Zend\XmlRpc\Server\Exception
+     * @throws \Zend\XmlRpc\Exception\InvalidArgumentException
      */
     public function addFunction($function, $namespace = '')
     {
@@ -213,7 +213,7 @@ public function addFunction($function, $namespace = '')
      * @param string $namespace Optional
      * @param mixed $argv Optional arguments to pass to methods
      * @return void
-     * @throws Zend\XmlRpc\Server\Exception on invalid input
+     * @throws Server\Exception\InvalidArgumentException on invalid input
      */
     public function setClass($class, $namespace = '', $argv = null)
     {
@@ -235,9 +235,9 @@ public function setClass($class, $namespace = '', $argv = null)
     /**
      * Raise an xmlrpc server fault
      *
-     * @param string|Exception $fault
+     * @param string|\Exception $fault
      * @param int $code
-     * @return Zend\XmlRpc\Server\Fault
+     * @return Server\Fault
      */
     public function fault($fault = null, $code = 404)
     {
@@ -327,7 +327,7 @@ public function handle($request = false)
      *
      * @param  array|Definition $definition
      * @return void
-     * @throws Server\Exception on invalid input
+     * @throws Server\Exception\InvalidArgumentException on invalid input
      */
     public function loadFunctions($definition)
     {
@@ -393,7 +393,7 @@ public function setPersistence($mode)
      *
      * @param  string|Request $request
      * @return Server
-     * @throws Server\Exception on invalid request class or object
+     * @throws Server\Exception\InvalidArgumentException on invalid request class or object
      */
     public function setRequest($request)
     {
@@ -527,7 +527,7 @@ protected function _fixType($type)
      *
      * @param  Request $request
      * @return Response
-     * @throws Server\Exception|Exception
+     * @throws Server\Exception\RuntimeException
      * Zend\XmlRpc\Server\Exceptions are thrown for internal errors; otherwise,
      * any other exception may be thrown by the callback
      */
diff --git a/library/Zend/XmlRpc/Server/System.php b/library/Zend/XmlRpc/Server/System.php
index 7488b6ac4d4..ffc5b7d8de4 100644
--- a/library/Zend/XmlRpc/Server/System.php
+++ b/library/Zend/XmlRpc/Server/System.php
@@ -27,7 +27,7 @@ class System
     /**
      * Constructor
      *
-     * @param  \Zend\XmlRpc\Server\Server $server
+     * @param \Zend\XmlRpc\Server $server
      * @return void
      */
     public function __construct(\Zend\XmlRpc\Server $server)