diff --git a/src/AbstractFilter.php b/src/AbstractFilter.php
index 2b14b6bd..22e805eb 100644
--- a/src/AbstractFilter.php
+++ b/src/AbstractFilter.php
@@ -32,7 +32,7 @@ public static function hasPcreUnicodeSupport()
 
     /**
      * @param  array|Traversable $options
-     * @return AbstractFilter
+     * @return self
      * @throws Exception\InvalidArgumentException
      */
     public function setOptions($options)
@@ -86,7 +86,6 @@ public function __invoke($value)
     }
 
     /**
-     *
      * @param  mixed $options
      * @return bool
      */
diff --git a/src/AbstractUnicode.php b/src/AbstractUnicode.php
index 8e893063..1c399c66 100644
--- a/src/AbstractUnicode.php
+++ b/src/AbstractUnicode.php
@@ -15,7 +15,7 @@ abstract class AbstractUnicode extends AbstractFilter
      * Set the input encoding for the given string
      *
      * @param  string|null $encoding
-     * @return StringToLower
+     * @return self
      * @throws Exception\InvalidArgumentException
      * @throws Exception\ExtensionNotLoadedException
      */
diff --git a/src/Boolean.php b/src/Boolean.php
index 38f22298..9de8b936 100644
--- a/src/Boolean.php
+++ b/src/Boolean.php
@@ -90,7 +90,7 @@ public function __construct($typeOrOptions = null, $casting = true, $translation
      *
      * @param  int|array $type
      * @throws Exception\InvalidArgumentException
-     * @return bool
+     * @return self
      */
     public function setType($type = null)
     {
@@ -137,7 +137,7 @@ public function getType()
      * @param  bool $flag When true this filter works like cast
      *                       When false it recognises only true and false
      *                       and all other values are returned as is
-     * @return bool
+     * @return self
      */
     public function setCasting($flag = true)
     {
@@ -158,7 +158,7 @@ public function getCasting()
     /**
      * @param  array|Traversable $translations
      * @throws Exception\InvalidArgumentException
-     * @return bool
+     * @return self
      */
     public function setTranslations($translations)
     {
diff --git a/src/Callback.php b/src/Callback.php
index e389b9fc..c4139924 100644
--- a/src/Callback.php
+++ b/src/Callback.php
@@ -68,7 +68,7 @@ public function getCallback()
      * Sets parameters for the callback
      *
      * @param  mixed $params
-     * @return Callback
+     * @return self
      */
     public function setCallbackParams($params)
     {
@@ -79,7 +79,7 @@ public function setCallbackParams($params)
     /**
      * Get parameters for the callback
      *
-     * @return mixed
+     * @return array
      */
     public function getCallbackParams()
     {
diff --git a/src/Compress.php b/src/Compress.php
index d63f4846..4c61179e 100644
--- a/src/Compress.php
+++ b/src/Compress.php
@@ -51,7 +51,7 @@ public function __construct($options = null)
      *
      * @param  array $options
      * @throws Exception\InvalidArgumentException if options is not an array or Traversable
-     * @return Compress
+     * @return self
      */
     public function setOptions($options)
     {
@@ -122,7 +122,7 @@ public function getAdapterName()
      * Sets compression adapter
      *
      * @param  string|Compress\CompressionAlgorithmInterface $adapter Adapter to use
-     * @return Compress
+     * @return self
      * @throws Exception\InvalidArgumentException
      */
     public function setAdapter($adapter)
@@ -153,7 +153,7 @@ public function getAdapterOptions()
      * Set adapter options
      *
      * @param  array $options
-     * @return Compress
+     * @return self
      */
     public function setAdapterOptions(array $options)
     {
diff --git a/src/Compress/AbstractCompressionAlgorithm.php b/src/Compress/AbstractCompressionAlgorithm.php
index 5d42b3a9..079d083d 100644
--- a/src/Compress/AbstractCompressionAlgorithm.php
+++ b/src/Compress/AbstractCompressionAlgorithm.php
@@ -61,7 +61,7 @@ public function getOptions($option = null)
      * Sets all or one option
      *
      * @param  array $options
-     * @return AbstractCompressionAlgorithm
+     * @return self
      */
     public function setOptions(array $options)
     {
diff --git a/src/Compress/Bz2.php b/src/Compress/Bz2.php
index 71a91839..376bbd45 100644
--- a/src/Compress/Bz2.php
+++ b/src/Compress/Bz2.php
@@ -59,7 +59,7 @@ public function getBlocksize()
      *
      * @param  int $blocksize
      * @throws Exception\InvalidArgumentException
-     * @return Bz2
+     * @return self
      */
     public function setBlocksize($blocksize)
     {
@@ -85,7 +85,7 @@ public function getArchive()
      * Sets the archive to use for de-/compression
      *
      * @param  string $archive Archive to use
-     * @return Bz2
+     * @return self
      */
     public function setArchive($archive)
     {
diff --git a/src/Compress/Gz.php b/src/Compress/Gz.php
index 02411731..5e8d50a9 100644
--- a/src/Compress/Gz.php
+++ b/src/Compress/Gz.php
@@ -61,7 +61,7 @@ public function getLevel()
      *
      * @param int $level
      * @throws Exception\InvalidArgumentException
-     * @return Gz
+     * @return self
      */
     public function setLevel($level)
     {
@@ -87,7 +87,7 @@ public function getMode()
      * Sets a new compression mode
      *
      * @param  string $mode Supported are 'compress', 'deflate' and 'file'
-     * @return Gz
+     * @return self
      * @throws Exception\InvalidArgumentException for invalid $mode value
      */
     public function setMode($mode)
@@ -114,7 +114,7 @@ public function getArchive()
      * Sets the archive to use for de-/compression
      *
      * @param  string $archive Archive to use
-     * @return Gz
+     * @return self
      */
     public function setArchive($archive)
     {
diff --git a/src/Compress/Rar.php b/src/Compress/Rar.php
index e6281f75..0de26b2b 100644
--- a/src/Compress/Rar.php
+++ b/src/Compress/Rar.php
@@ -62,7 +62,7 @@ public function getCallback()
      * Sets the callback to use
      *
      * @param  string $callback
-     * @return Rar
+     * @return self
      * @throws Exception\InvalidArgumentException if invalid callback provided
      */
     public function setCallback($callback)
@@ -89,7 +89,7 @@ public function getArchive()
      * Sets the archive to use for de-/compression
      *
      * @param  string $archive Archive to use
-     * @return Rar
+     * @return self
      */
     public function setArchive($archive)
     {
@@ -113,7 +113,7 @@ public function getPassword()
      * Sets the password to use
      *
      * @param  string $password
-     * @return Rar
+     * @return self
      */
     public function setPassword($password)
     {
@@ -135,7 +135,7 @@ public function getTarget()
      * Sets the targetpath to use
      *
      * @param  string $target
-     * @return Rar
+     * @return self
      * @throws Exception\InvalidArgumentException if specified target directory does not exist
      */
     public function setTarget($target)
diff --git a/src/Compress/Tar.php b/src/Compress/Tar.php
index 4eae005c..10a0cc15 100644
--- a/src/Compress/Tar.php
+++ b/src/Compress/Tar.php
@@ -65,7 +65,7 @@ public function getArchive()
      * Sets the archive to use for de-/compression
      *
      * @param  string $archive Archive to use
-     * @return Tar
+     * @return self
      */
     public function setArchive($archive)
     {
@@ -89,7 +89,7 @@ public function getTarget()
      * Sets the target path to use
      *
      * @param  string $target
-     * @return Tar
+     * @return self
      * @throws Exception\InvalidArgumentException if target path does not exist
      */
     public function setTarget($target)
@@ -119,7 +119,7 @@ public function getMode()
      * Either Gz or Bz2.
      *
      * @param string $mode
-     * @return Tar
+     * @return self
      * @throws Exception\InvalidArgumentException for invalid $mode values
      * @throws Exception\ExtensionNotLoadedException if bz2 mode selected but extension not loaded
      * @throws Exception\ExtensionNotLoadedException if gz mode selected but extension not loaded
diff --git a/src/Compress/Zip.php b/src/Compress/Zip.php
index b27045e4..f0e94982 100644
--- a/src/Compress/Zip.php
+++ b/src/Compress/Zip.php
@@ -60,7 +60,7 @@ public function getArchive()
      * Sets the archive to use for de-/compression
      *
      * @param  string $archive Archive to use
-     * @return Zip
+     * @return self
      */
     public function setArchive($archive)
     {
@@ -85,7 +85,7 @@ public function getTarget()
      *
      * @param  string $target
      * @throws Exception\InvalidArgumentException
-     * @return Zip
+     * @return self
      */
     public function setTarget($target)
     {
diff --git a/src/DateTimeFormatter.php b/src/DateTimeFormatter.php
index 08fcc202..fa484a8c 100644
--- a/src/DateTimeFormatter.php
+++ b/src/DateTimeFormatter.php
@@ -36,7 +36,7 @@ public function __construct($options = null)
      * Set the format string accepted by date() to use when formatting a string
      *
      * @param  string $format
-     * @return \Zend\Filter\DateTimeFormatter
+     * @return self
      */
     public function setFormat($format)
     {
@@ -66,8 +66,8 @@ public function filter($value)
     /**
      * Normalize the provided value to a formatted string
      *
-     * @param string|int|DateTime $value
-     * @returns string
+     * @param  string|int|DateTime $value
+     * @return string
      */
     protected function normalizeDateTime($value)
     {
diff --git a/src/Encrypt.php b/src/Encrypt.php
index 7ba7065e..d03104ea 100644
--- a/src/Encrypt.php
+++ b/src/Encrypt.php
@@ -50,7 +50,7 @@ public function getAdapter()
      * Sets new encryption options
      *
      * @param  string|array $options (Optional) Encryption options
-     * @return Encrypt
+     * @return self
      * @throws Exception\DomainException
      * @throws Exception\InvalidArgumentException
      */
diff --git a/src/Encrypt/BlockCipher.php b/src/Encrypt/BlockCipher.php
index 2de6461a..1415ed7a 100644
--- a/src/Encrypt/BlockCipher.php
+++ b/src/Encrypt/BlockCipher.php
@@ -98,7 +98,7 @@ public function getEncryption()
      * Sets new encryption options
      *
      * @param  string|array $options Encryption options
-     * @return BlockCipher
+     * @return self
      * @throws Exception\InvalidArgumentException
      */
     public function setEncryption($options)
@@ -162,7 +162,7 @@ public function getVector()
      * Set the inizialization vector
      *
      * @param  string $vector
-     * @return BlockCipher
+     * @return self
      * @throws Exception\InvalidArgumentException
      */
     public function setVector($vector)
@@ -180,7 +180,7 @@ public function setVector($vector)
      * Set the encryption key
      *
      * @param  string $key
-     * @return BlockCipher
+     * @return self
      * @throws Exception\InvalidArgumentException
      */
     public function setKey($key)
@@ -218,7 +218,7 @@ public function getCompression()
      * Sets a internal compression for values to encrypt
      *
      * @param  string|array $compression
-     * @return BlockCipher
+     * @return self
      */
     public function setCompression($compression)
     {
diff --git a/src/Encrypt/Openssl.php b/src/Encrypt/Openssl.php
index c5652fbb..4e433a2b 100644
--- a/src/Encrypt/Openssl.php
+++ b/src/Encrypt/Openssl.php
@@ -104,7 +104,7 @@ public function __construct($options = array())
      * Sets the encryption keys
      *
      * @param  string|array $keys Key with type association
-     * @return Openssl
+     * @return self
      * @throws Exception\InvalidArgumentException
      */
     protected function _setKeys($keys)
@@ -168,7 +168,7 @@ public function getPublicKey()
      * Sets public keys
      *
      * @param  string|array $key Public keys
-     * @return \Zend\Filter\Encrypt\Openssl
+     * @return self
      */
     public function setPublicKey($key)
     {
@@ -202,7 +202,7 @@ public function getPrivateKey()
      *
      * @param  string $key Private key
      * @param  string $passphrase
-     * @return Openssl
+     * @return self
      */
     public function setPrivateKey($key, $passphrase = null)
     {
@@ -239,7 +239,7 @@ public function getEnvelopeKey()
      * Sets envelope keys
      *
      * @param  string|array $key Envelope keys
-     * @return \Zend\Filter\Encrypt\Openssl
+     * @return self
      */
     public function setEnvelopeKey($key)
     {
@@ -271,7 +271,7 @@ public function getPassphrase()
      * Sets a new passphrase
      *
      * @param string $passphrase
-     * @return Openssl
+     * @return self
      */
     public function setPassphrase($passphrase)
     {
@@ -293,7 +293,7 @@ public function getCompression()
      * Sets a internal compression for values to encrypt
      *
      * @param string|array $compression
-     * @return Openssl
+     * @return self
      */
     public function setCompression($compression)
     {
@@ -319,7 +319,7 @@ public function getPackage()
      * Sets if the envelope keys should be included in the encrypted value
      *
      * @param  bool $package
-     * @return Openssl
+     * @return self
      */
     public function setPackage($package)
     {
diff --git a/src/File/Decrypt.php b/src/File/Decrypt.php
index ff2528ef..8f8de27d 100644
--- a/src/File/Decrypt.php
+++ b/src/File/Decrypt.php
@@ -38,7 +38,7 @@ public function getFilename()
      * Sets the new filename where the content will be stored
      *
      * @param  string $filename (Optional) New filename to set
-     * @return Decrypt
+     * @return self
      */
     public function setFilename($filename = null)
     {
diff --git a/src/File/Encrypt.php b/src/File/Encrypt.php
index 196fade3..038e5e00 100644
--- a/src/File/Encrypt.php
+++ b/src/File/Encrypt.php
@@ -38,7 +38,7 @@ public function getFilename()
      * Sets the new filename where the content will be stored
      *
      * @param  string $filename (Optional) New filename to set
-     * @return Encrypt
+     * @return self
      */
     public function setFilename($filename = null)
     {
diff --git a/src/File/Rename.php b/src/File/Rename.php
index 83c437e9..55a68834 100644
--- a/src/File/Rename.php
+++ b/src/File/Rename.php
@@ -69,7 +69,7 @@ public function getFile()
      * 'randomize' => Shall target files have a random postfix attached?
      *
      * @param  string|array $options Old file or directory to be rewritten
-     * @return \Zend\Filter\File\Rename
+     * @return self
      */
     public function setFile($options)
     {
diff --git a/src/File/RenameUpload.php b/src/File/RenameUpload.php
index a1451361..ff675685 100644
--- a/src/File/RenameUpload.php
+++ b/src/File/RenameUpload.php
@@ -51,7 +51,7 @@ public function __construct($targetOrOptions)
 
     /**
      * @param  string $target Target file path or directory
-     * @return RenameUpload
+     * @return self
      */
     public function setTarget($target)
     {
@@ -76,7 +76,7 @@ public function getTarget()
      * @param  bool $flag When true, this filter will use the $_FILES['name']
      *                       as the target filename.
      *                       Otherwise, it uses the default 'target' rules.
-     * @return RenameUpload
+     * @return self
      */
     public function setUseUploadName($flag = true)
     {
@@ -95,7 +95,7 @@ public function getUseUploadName()
     /**
      * @param  bool $flag When true, this filter will use the original file
      *                    extension for the target filename
-     * @return RenameUpload
+     * @return self
      */
     public function setUseUploadExtension($flag = true)
     {
@@ -113,7 +113,7 @@ public function getUseUploadExtension()
 
     /**
      * @param  bool $flag Shall existing files be overwritten?
-     * @return RenameUpload
+     * @return self
      */
     public function setOverwrite($flag = true)
     {
@@ -131,7 +131,7 @@ public function getOverwrite()
 
     /**
      * @param  bool $flag Shall target files have a random postfix attached?
-     * @return RenameUpload
+     * @return self
      */
     public function setRandomize($flag = true)
     {
@@ -198,7 +198,7 @@ public function filter($value)
     /**
      * @param  string $sourceFile Source file path
      * @param  string $targetFile Target file path
-     * @throws \Zend\Filter\Exception\RuntimeException
+     * @throws Exception\RuntimeException
      * @return bool
      */
     protected function moveUploadedFile($sourceFile, $targetFile)
@@ -218,7 +218,7 @@ protected function moveUploadedFile($sourceFile, $targetFile)
 
     /**
      * @param  string $targetFile Target file path
-     * @throws \Zend\Filter\Exception\InvalidArgumentException
+     * @throws Exception\InvalidArgumentException
      */
     protected function checkFileExists($targetFile)
     {
@@ -281,6 +281,7 @@ protected function getFinalTarget($uploadData)
     }
 
     /**
+     * @param  string $source
      * @param  string $filename
      * @return string
      */
diff --git a/src/FilterChain.php b/src/FilterChain.php
index 25576d1a..92ce1ddc 100644
--- a/src/FilterChain.php
+++ b/src/FilterChain.php
@@ -34,6 +34,7 @@ class FilterChain extends AbstractFilter implements Countable
     /**
      * Initialize filter chain
      *
+     * @param null|array|Traversable $options
      */
     public function __construct($options = null)
     {
@@ -44,6 +45,11 @@ public function __construct($options = null)
         }
     }
 
+    /**
+     * @param  array|Traversable $options
+     * @return self
+     * @throws Exception\InvalidArgumentException
+     */
     public function setOptions($options)
     {
         if (!is_array($options) && !$options instanceof \Traversable) {
@@ -110,7 +116,7 @@ public function getPluginManager()
      * Set plugin manager instance
      *
      * @param  FilterPluginManager $plugins
-     * @return FilterChain
+     * @return self
      */
     public function setPluginManager(FilterPluginManager $plugins)
     {
@@ -137,7 +143,7 @@ public function plugin($name, array $options = array())
      * @param  callable|FilterInterface $callback A Filter implementation or valid PHP callback
      * @param  int $priority Priority at which to enqueue filter; defaults to 1000 (higher executes earlier)
      * @throws Exception\InvalidArgumentException
-     * @return FilterChain
+     * @return self
      */
     public function attach($callback, $priority = self::DEFAULT_PRIORITY)
     {
@@ -163,7 +169,7 @@ public function attach($callback, $priority = self::DEFAULT_PRIORITY)
      * @param  string $name
      * @param  mixed $options
      * @param  int $priority Priority at which to enqueue filter; defaults to 1000 (higher executes earlier)
-     * @return FilterChain
+     * @return self
      */
     public function attachByName($name, $options = array(), $priority = self::DEFAULT_PRIORITY)
     {
@@ -180,7 +186,7 @@ public function attachByName($name, $options = array(), $priority = self::DEFAUL
      * Merge the filter chain with the one given in parameter
      *
      * @param FilterChain $filterChain
-     * @return FilterChain
+     * @return self
      */
     public function merge(FilterChain $filterChain)
     {
diff --git a/src/HtmlEntities.php b/src/HtmlEntities.php
index 2cbce4b0..368a6b6b 100644
--- a/src/HtmlEntities.php
+++ b/src/HtmlEntities.php
@@ -89,7 +89,7 @@ public function getQuoteStyle()
      * Sets the quoteStyle option
      *
      * @param  int $quoteStyle
-     * @return HtmlEntities Provides a fluent interface
+     * @return self Provides a fluent interface
      */
     public function setQuoteStyle($quoteStyle)
     {
@@ -112,7 +112,7 @@ public function getEncoding()
      * Set encoding
      *
      * @param  string $value
-     * @return HtmlEntities
+     * @return self
      */
     public function setEncoding($value)
     {
@@ -138,7 +138,7 @@ public function getCharSet()
      * Proxies to {@link setEncoding()}
      *
      * @param  string $charSet
-     * @return HtmlEntities Provides a fluent interface
+     * @return self Provides a fluent interface
      */
     public function setCharSet($charSet)
     {
@@ -159,7 +159,7 @@ public function getDoubleQuote()
      * Sets the doubleQuote option
      *
      * @param  bool $doubleQuote
-     * @return HtmlEntities Provides a fluent interface
+     * @return self Provides a fluent interface
      */
     public function setDoubleQuote($doubleQuote)
     {
diff --git a/src/Inflector.php b/src/Inflector.php
index 08045690..eca78a56 100644
--- a/src/Inflector.php
+++ b/src/Inflector.php
@@ -96,7 +96,7 @@ public function getPluginManager()
      * Set plugin manager
      *
      * @param  FilterPluginManager $manager
-     * @return Inflector
+     * @return self
      */
     public function setPluginManager(FilterPluginManager $manager)
     {
@@ -108,7 +108,7 @@ public function setPluginManager(FilterPluginManager $manager)
      * Set options
      *
      * @param  array|Traversable $options
-     * @return Inflector
+     * @return self
      */
     public function setOptions($options)
     {
@@ -147,8 +147,8 @@ public function setOptions($options)
      * Set Whether or not the inflector should throw an exception when a replacement
      * identifier is still found within an inflected target.
      *
-     * @param bool $throwTargetExceptionsOn
-     * @return Inflector
+     * @param  bool $throwTargetExceptionsOn
+     * @return self
      */
     public function setThrowTargetExceptionsOn($throwTargetExceptionsOn)
     {
@@ -169,8 +169,8 @@ public function isThrowTargetExceptionsOn()
     /**
      * Set the Target Replacement Identifier, by default ':'
      *
-     * @param string $targetReplacementIdentifier
-     * @return Inflector
+     * @param  string $targetReplacementIdentifier
+     * @return self
      */
     public function setTargetReplacementIdentifier($targetReplacementIdentifier)
     {
@@ -195,8 +195,8 @@ public function getTargetReplacementIdentifier()
      * Set a Target
      * ex: 'scripts/:controller/:action.:suffix'
      *
-     * @param string
-     * @return Inflector
+     * @param  string $target
+     * @return self
      */
     public function setTarget($target)
     {
@@ -217,8 +217,8 @@ public function getTarget()
     /**
      * Set Target Reference
      *
-     * @param reference $target
-     * @return Inflector
+     * @param  reference $target
+     * @return self
      */
     public function setTargetReference(&$target)
     {
@@ -227,13 +227,13 @@ public function setTargetReference(&$target)
     }
 
     /**
-     * SetRules() is the same as calling addRules() with the exception that it
+     * Is the same as calling addRules() with the exception that it
      * clears the rules before adding them.
      *
-     * @param array $rules
-     * @return Inflector
+     * @param  array $rules
+     * @return self
      */
-    public function setRules(Array $rules)
+    public function setRules(array $rules)
     {
         $this->clearRules();
         $this->addRules($rules);
@@ -241,7 +241,7 @@ public function setRules(Array $rules)
     }
 
     /**
-     * AddRules(): multi-call to setting filter rules.
+     * Multi-call to setting filter rules.
      *
      * If prefixed with a ":" (colon), a filter rule will be added.  If not
      * prefixed, a static replacement will be added.
@@ -253,10 +253,10 @@ public function setRules(Array $rules)
      *     'suffix'      => 'phtml'
      *     );
      *
-     * @param array
-     * @return Inflector
+     * @param  array $rules
+     * @return self
      */
-    public function addRules(Array $rules)
+    public function addRules(array $rules)
     {
         $keys = array_keys($rules);
         foreach ($keys as $spec) {
@@ -293,10 +293,10 @@ public function getRules($spec = null)
     }
 
     /**
-     * getRule() returns a rule set by setFilterRule(), a numeric index must be provided
+     * Returns a rule set by setFilterRule(), a numeric index must be provided
      *
-     * @param string $spec
-     * @param int $index
+     * @param  string $spec
+     * @param  int $index
      * @return FilterInterface|false
      */
     public function getRule($spec, $index)
@@ -311,9 +311,9 @@ public function getRule($spec, $index)
     }
 
     /**
-     * ClearRules() clears the rules currently in the inflector
+     * Clears the rules currently in the inflector
      *
-     * @return Inflector
+     * @return self
      */
     public function clearRules()
     {
@@ -325,9 +325,9 @@ public function clearRules()
      * Set a filtering rule for a spec.  $ruleSet can be a string, Filter object
      * or an array of strings or filter objects.
      *
-     * @param string $spec
-     * @param array|string|\Zend\Filter\FilterInterface $ruleSet
-     * @return Inflector
+     * @param  string $spec
+     * @param  array|string|\Zend\Filter\FilterInterface $ruleSet
+     * @return self
      */
     public function setFilterRule($spec, $ruleSet)
     {
@@ -339,9 +339,9 @@ public function setFilterRule($spec, $ruleSet)
     /**
      * Add a filter rule for a spec
      *
-     * @param mixed $spec
-     * @param mixed $ruleSet
-     * @return Inflector
+     * @param  mixed $spec
+     * @param  mixed $ruleSet
+     * @return self
      */
     public function addFilterRule($spec, $ruleSet)
     {
@@ -370,9 +370,9 @@ public function addFilterRule($spec, $ruleSet)
     /**
      * Set a static rule for a spec.  This is a single string value
      *
-     * @param string $name
-     * @param string $value
-     * @return Inflector
+     * @param  string $name
+     * @param  string $value
+     * @return self
      */
     public function setStaticRule($name, $value)
     {
@@ -388,9 +388,9 @@ public function setStaticRule($name, $value)
      * in to be referenced when its time to build the output string from the
      * target.
      *
-     * @param string $name
-     * @param mixed $reference
-     * @return Inflector
+     * @param  string $name
+     * @param  mixed $reference
+     * @return self
      */
     public function setStaticRuleReference($name, &$reference)
     {
diff --git a/src/Null.php b/src/Null.php
index 2f7ecca1..a47e86c2 100644
--- a/src/Null.php
+++ b/src/Null.php
@@ -70,7 +70,7 @@ public function __construct($typeOrOptions = null)
      *
      * @param  int|array $type
      * @throws Exception\InvalidArgumentException
-     * @return bool
+     * @return self
      */
     public function setType($type = null)
     {
diff --git a/src/PregReplace.php b/src/PregReplace.php
index 2ae2a31d..f5e4d756 100644
--- a/src/PregReplace.php
+++ b/src/PregReplace.php
@@ -52,7 +52,7 @@ public function __construct($options = null)
      * @see preg_replace()
      *
      * @param  string|array $pattern - same as the first argument of preg_replace
-     * @return PregReplace
+     * @return self
      * @throws Exception\InvalidArgumentException
      */
     public function setPattern($pattern)
@@ -94,7 +94,7 @@ public function getPattern()
      * @see preg_replace()
      *
      * @param  array|string $replacement - same as the second argument of preg_replace
-     * @return PregReplace
+     * @return self
      * @throws Exception\InvalidArgumentException
      */
     public function setReplacement($replacement)
diff --git a/src/RealPath.php b/src/RealPath.php
index b6217ce6..d2128a50 100644
--- a/src/RealPath.php
+++ b/src/RealPath.php
@@ -43,7 +43,7 @@ public function __construct($existsOrOptions = true)
      * FALSE when not existing paths can be given
      *
      * @param  bool $flag Path must exist
-     * @return RealPath
+     * @return self
      */
     public function setExists($flag = true)
     {
diff --git a/src/StringTrim.php b/src/StringTrim.php
index 3d777f3d..a85fcf9b 100644
--- a/src/StringTrim.php
+++ b/src/StringTrim.php
@@ -42,7 +42,7 @@ public function __construct($charlistOrOptions = null)
      * Sets the charList option
      *
      * @param  string $charList
-     * @return StringTrim Provides a fluent interface
+     * @return self Provides a fluent interface
      */
     public function setCharList($charList)
     {
diff --git a/src/StripTags.php b/src/StripTags.php
index 9dc63eda..280d8d08 100644
--- a/src/StripTags.php
+++ b/src/StripTags.php
@@ -90,7 +90,7 @@ public function getTagsAllowed()
      * Sets the tagsAllowed option
      *
      * @param  array|string $tagsAllowed
-     * @return StripTags Provides a fluent interface
+     * @return self Provides a fluent interface
      */
     public function setTagsAllowed($tagsAllowed)
     {
@@ -143,7 +143,7 @@ public function getAttributesAllowed()
      * Sets the attributesAllowed option
      *
      * @param  array|string $attributesAllowed
-     * @return StripTags Provides a fluent interface
+     * @return self Provides a fluent interface
      */
     public function setAttributesAllowed($attributesAllowed)
     {
diff --git a/src/UriNormalize.php b/src/UriNormalize.php
index 67dd6852..a3c89c75 100644
--- a/src/UriNormalize.php
+++ b/src/UriNormalize.php
@@ -50,7 +50,7 @@ public function __construct($options = null)
      * normalize the URI and thus may affect the resulting normalize URI.
      *
      * @param  string $defaultScheme
-     * @return \Zend\Filter\UriNormalize
+     * @return self
      */
     public function setDefaultScheme($defaultScheme)
     {
@@ -70,7 +70,7 @@ public function setDefaultScheme($defaultScheme)
      * real-world user mishaps, it may yield unexpected results at times.
      *
      * @param  string $enforcedScheme
-     * @return \Zend\Filter\UriNormalize
+     * @return self
      */
     public function setEnforcedScheme($enforcedScheme)
     {
diff --git a/src/Word/AbstractSeparator.php b/src/Word/AbstractSeparator.php
index 3ea8a726..3031d3b2 100644
--- a/src/Word/AbstractSeparator.php
+++ b/src/Word/AbstractSeparator.php
@@ -37,8 +37,8 @@ public function __construct($separator = ' ')
     /**
      * Sets a new separator
      *
-     * @param  string  $separator  Separator
-     * @return AbstractSeparator
+     * @param  string $separator Separator
+     * @return self
      * @throws Exception\InvalidArgumentException
      */
     public function setSeparator($separator)
@@ -53,7 +53,7 @@ public function setSeparator($separator)
     /**
      * Returns the actual set separator
      *
-     * @return  string
+     * @return string
      */
     public function getSeparator()
     {
diff --git a/src/Word/SeparatorToDash.php b/src/Word/SeparatorToDash.php
index 9f568047..c2b491d6 100644
--- a/src/Word/SeparatorToDash.php
+++ b/src/Word/SeparatorToDash.php
@@ -14,7 +14,7 @@ class SeparatorToDash extends SeparatorToSeparator
     /**
      * Constructor
      *
-     * @param  string  $searchSeparator  Separator to search for change
+     * @param string $searchSeparator Separator to search for change
      */
     public function __construct($searchSeparator = ' ')
     {
diff --git a/src/Word/SeparatorToSeparator.php b/src/Word/SeparatorToSeparator.php
index 8559ee35..a1d1135e 100644
--- a/src/Word/SeparatorToSeparator.php
+++ b/src/Word/SeparatorToSeparator.php
@@ -20,8 +20,8 @@ class SeparatorToSeparator extends AbstractFilter
     /**
      * Constructor
      *
-     * @param  string  $searchSeparator      Separator to search for
-     * @param  string  $replacementSeparator Separator to replace with
+     * @param  string $searchSeparator      Separator to search for
+     * @param  string $replacementSeparator Separator to replace with
      */
     public function __construct($searchSeparator = ' ', $replacementSeparator = '-')
     {
@@ -32,8 +32,8 @@ public function __construct($searchSeparator = ' ', $replacementSeparator = '-')
     /**
      * Sets a new seperator to search for
      *
-     * @param  string  $separator  Seperator to search for
-     * @return SeparatorToSeparator
+     * @param  string $separator Seperator to search for
+     * @return self
      */
     public function setSearchSeparator($separator)
     {
@@ -44,7 +44,7 @@ public function setSearchSeparator($separator)
     /**
      * Returns the actual set separator to search for
      *
-     * @return  string
+     * @return string
      */
     public function getSearchSeparator()
     {
@@ -54,8 +54,8 @@ public function getSearchSeparator()
     /**
      * Sets a new separator which replaces the searched one
      *
-     * @param  string  $separator  Separator which replaces the searched one
-     * @return SeparatorToSeparator
+     * @param  string $separator Separator which replaces the searched one
+     * @return self
      */
     public function setReplacementSeparator($separator)
     {
@@ -66,7 +66,7 @@ public function setReplacementSeparator($separator)
     /**
      * Returns the actual set separator which replaces the searched one
      *
-     * @return  string
+     * @return string
      */
     public function getReplacementSeparator()
     {