diff --git a/src/Generator/ClassGenerator.php b/src/Generator/ClassGenerator.php
index 2db218c8..ec1e4c9a 100644
--- a/src/Generator/ClassGenerator.php
+++ b/src/Generator/ClassGenerator.php
@@ -743,7 +743,7 @@ public function addUse($use, $useAlias = null)
 
     /**
      * @param string $use
-     * @return self
+     * @return bool
      */
     public function hasUse($use)
     {
diff --git a/src/Generator/DocBlock/Tag/AbstractTypeableTag.php b/src/Generator/DocBlock/Tag/AbstractTypeableTag.php
index 0e47a7ce..01693038 100644
--- a/src/Generator/DocBlock/Tag/AbstractTypeableTag.php
+++ b/src/Generator/DocBlock/Tag/AbstractTypeableTag.php
@@ -50,7 +50,7 @@ public function __construct($types = [], $description = null)
 
     /**
      * @param string $description
-     * @return ReturnTag
+     * @return AbstractTypeableTag
      */
     public function setDescription($description)
     {
@@ -71,7 +71,7 @@ public function getDescription()
      * e.g. array('int', 'null') or "int|null"
      *
      * @param array|string $types
-     * @return ReturnTag
+     * @return AbstractTypeableTag
      */
     public function setTypes($types)
     {
diff --git a/src/Generator/DocBlock/Tag/AuthorTag.php b/src/Generator/DocBlock/Tag/AuthorTag.php
index b4bd916d..b1aaf7f7 100644
--- a/src/Generator/DocBlock/Tag/AuthorTag.php
+++ b/src/Generator/DocBlock/Tag/AuthorTag.php
@@ -42,7 +42,7 @@ public function __construct($authorName = null, $authorEmail = null)
 
     /**
      * @param ReflectionTagInterface $reflectionTag
-     * @return ReturnTag
+     * @return AuthorTag
      * @deprecated Deprecated in 2.3. Use TagManager::createTagFromReflection() instead
      */
     public static function fromReflection(ReflectionTagInterface $reflectionTag)
diff --git a/src/Generator/DocBlock/Tag/ParamTag.php b/src/Generator/DocBlock/Tag/ParamTag.php
index 9c0f3a8a..914a6f13 100644
--- a/src/Generator/DocBlock/Tag/ParamTag.php
+++ b/src/Generator/DocBlock/Tag/ParamTag.php
@@ -37,7 +37,7 @@ public function __construct($variableName = null, $types = [], $description = nu
 
     /**
      * @param ReflectionTagInterface $reflectionTag
-     * @return ReturnTag
+     * @return ParamTag
      * @deprecated Deprecated in 2.3. Use TagManager::createTagFromReflection() instead
      */
     public static function fromReflection(ReflectionTagInterface $reflectionTag)
@@ -75,7 +75,7 @@ public function getVariableName()
 
     /**
      * @param string $datatype
-     * @return ReturnTag
+     * @return ParamTag
      * @deprecated Deprecated in 2.3. Use setTypes() instead
      */
     public function setDatatype($datatype)
diff --git a/src/Generator/DocBlockGenerator.php b/src/Generator/DocBlockGenerator.php
index c3b0f909..503778f0 100644
--- a/src/Generator/DocBlockGenerator.php
+++ b/src/Generator/DocBlockGenerator.php
@@ -49,6 +49,9 @@ class DocBlockGenerator extends AbstractGenerator
      */
     protected $wordwrap = true;
 
+    /**
+     * @var TagManager
+     */
     protected static $tagManager;
 
     /**
@@ -107,6 +110,9 @@ public static function fromArray(array $array)
         return $docBlock;
     }
 
+    /**
+     * @return TagManager
+     */
     protected static function getTagManager()
     {
         if (! isset(static::$tagManager)) {
diff --git a/src/Reflection/ClassReflection.php b/src/Reflection/ClassReflection.php
index 10b0c19f..c34235d3 100644
--- a/src/Reflection/ClassReflection.php
+++ b/src/Reflection/ClassReflection.php
@@ -50,7 +50,7 @@ public function getDeclaringFile()
     /**
      * Return the classes DocBlock reflection object
      *
-     * @return DocBlockReflection
+     * @return DocBlockReflection|false
      * @throws Exception\ExceptionInterface for missing DocBock or invalid reflection class
      */
     public function getDocBlock()
@@ -70,7 +70,7 @@ public function getDocBlock()
 
     /**
      * @param  AnnotationManager $annotationManager
-     * @return AnnotationCollection
+     * @return AnnotationCollection|false
      */
     public function getAnnotations(AnnotationManager $annotationManager)
     {
@@ -188,7 +188,7 @@ public function getMethods($filter = -1)
     /**
      * Returns an array of reflection classes of traits used by this class.
      *
-     * @return void|array
+     * @return null|array
      */
     public function getTraits()
     {
diff --git a/src/Reflection/DocBlock/Tag/MethodTag.php b/src/Reflection/DocBlock/Tag/MethodTag.php
index 5aa40f86..265bfa22 100644
--- a/src/Reflection/DocBlock/Tag/MethodTag.php
+++ b/src/Reflection/DocBlock/Tag/MethodTag.php
@@ -78,7 +78,7 @@ public function initialize($tagDocblockLine)
     /**
      * Get return value type
      *
-     * @return void|string
+     * @return null|string
      * @deprecated 2.0.4 use getTypes instead
      */
     public function getReturnType()
diff --git a/src/Reflection/DocBlock/Tag/PropertyTag.php b/src/Reflection/DocBlock/Tag/PropertyTag.php
index d3b5f55b..080e119d 100644
--- a/src/Reflection/DocBlock/Tag/PropertyTag.php
+++ b/src/Reflection/DocBlock/Tag/PropertyTag.php
@@ -64,7 +64,7 @@ public function initialize($tagDocblockLine)
     }
 
     /**
-     * @return void|string
+     * @return null|string
      * @deprecated 2.0.4 use getTypes instead
      */
     public function getType()
diff --git a/src/Reflection/DocBlockReflection.php b/src/Reflection/DocBlockReflection.php
index 6fad64af..63ade0b4 100644
--- a/src/Reflection/DocBlockReflection.php
+++ b/src/Reflection/DocBlockReflection.php
@@ -91,7 +91,6 @@ public static function export()
      * @param  Reflector|string $commentOrReflector
      * @param  null|DocBlockTagManager $tagManager
      * @throws Exception\InvalidArgumentException
-     * @return DocBlockReflection
      */
     public function __construct($commentOrReflector, DocBlockTagManager $tagManager = null)
     {
diff --git a/src/Reflection/FileReflection.php b/src/Reflection/FileReflection.php
index 706e7b41..afb302ac 100644
--- a/src/Reflection/FileReflection.php
+++ b/src/Reflection/FileReflection.php
@@ -158,7 +158,7 @@ public function getDocComment()
     }
 
     /**
-     * @return DocBlockReflection
+     * @return DocBlockReflection|false
      */
     public function getDocBlock()
     {
@@ -180,7 +180,7 @@ public function getNamespaces()
     }
 
     /**
-     * @return void|string
+     * @return null|string
      */
     public function getNamespace()
     {
diff --git a/src/Reflection/FunctionReflection.php b/src/Reflection/FunctionReflection.php
index 11501273..a9703acf 100644
--- a/src/Reflection/FunctionReflection.php
+++ b/src/Reflection/FunctionReflection.php
@@ -132,7 +132,7 @@ public function getContents($includeDocBlock = true)
      * Get method prototype
      *
      * @param string $format
-     * @return array
+     * @return array|string
      */
     public function getPrototype($format = FunctionReflection::PROTOTYPE_AS_ARRAY)
     {
diff --git a/src/Reflection/MethodReflection.php b/src/Reflection/MethodReflection.php
index d7b75a6c..325af6a0 100644
--- a/src/Reflection/MethodReflection.php
+++ b/src/Reflection/MethodReflection.php
@@ -64,7 +64,7 @@ public function getDocBlock()
 
     /**
      * @param  AnnotationManager $annotationManager
-     * @return AnnotationScanner
+     * @return AnnotationScanner|false
      */
     public function getAnnotations(AnnotationManager $annotationManager)
     {
@@ -123,7 +123,7 @@ public function getDeclaringClass()
      * Get method prototype
      *
      * @param string $format
-     * @return array
+     * @return array|string
      */
     public function getPrototype($format = MethodReflection::PROTOTYPE_AS_ARRAY)
     {
diff --git a/src/Reflection/ParameterReflection.php b/src/Reflection/ParameterReflection.php
index 4498679e..5c953e35 100644
--- a/src/Reflection/ParameterReflection.php
+++ b/src/Reflection/ParameterReflection.php
@@ -37,13 +37,13 @@ public function getDeclaringClass()
     /**
      * Get class reflection object
      *
-     * @return void|ClassReflection
+     * @return null|ClassReflection
      */
     public function getClass()
     {
         $phpReflection = parent::getClass();
         if ($phpReflection === null) {
-            return;
+            return null;
         }
 
         $zendReflection = new ClassReflection($phpReflection->getName());
diff --git a/src/Reflection/PropertyReflection.php b/src/Reflection/PropertyReflection.php
index c277f8e1..9936961f 100644
--- a/src/Reflection/PropertyReflection.php
+++ b/src/Reflection/PropertyReflection.php
@@ -64,7 +64,7 @@ public function getDocBlock()
 
     /**
      * @param  AnnotationManager $annotationManager
-     * @return AnnotationScanner
+     * @return AnnotationScanner|false
      */
     public function getAnnotations(AnnotationManager $annotationManager)
     {
diff --git a/src/Scanner/MethodScanner.php b/src/Scanner/MethodScanner.php
index 05c67412..5e1ef6f6 100644
--- a/src/Scanner/MethodScanner.php
+++ b/src/Scanner/MethodScanner.php
@@ -189,7 +189,7 @@ public function getDocComment()
 
     /**
      * @param  AnnotationManager $annotationManager
-     * @return AnnotationScanner
+     * @return AnnotationScanner|false
      */
     public function getAnnotations(AnnotationManager $annotationManager)
     {
diff --git a/src/Scanner/PropertyScanner.php b/src/Scanner/PropertyScanner.php
index b11dd9b3..7cea28cc 100644
--- a/src/Scanner/PropertyScanner.php
+++ b/src/Scanner/PropertyScanner.php
@@ -211,7 +211,7 @@ public function getDocComment()
 
     /**
      * @param Annotation\AnnotationManager $annotationManager
-     * @return AnnotationScanner
+     * @return AnnotationScanner|false
      */
     public function getAnnotations(Annotation\AnnotationManager $annotationManager)
     {
diff --git a/src/Scanner/TokenArrayScanner.php b/src/Scanner/TokenArrayScanner.php
index 9fa199bc..56193692 100644
--- a/src/Scanner/TokenArrayScanner.php
+++ b/src/Scanner/TokenArrayScanner.php
@@ -76,7 +76,7 @@ public function getAnnotationManager()
      * @todo Assignment of $this->docComment should probably be done in scan()
      *       and then $this->getDocComment() just retrieves it.
      *
-     * @return string
+     * @return string|null
      */
     public function getDocComment()
     {
@@ -176,7 +176,7 @@ public function getClasses()
      *
      * @param  string|int $name
      * @throws Exception\InvalidArgumentException
-     * @return ClassScanner
+     * @return ClassScanner|false
      */
     public function getClass($name)
     {
@@ -663,7 +663,7 @@ public function hasNamespace($namespace)
 
     /**
      * @param  string $namespace
-     * @return void|array
+     * @return null|array
      * @throws Exception\InvalidArgumentException
      */
     protected function getUsesNoScan($namespace)