diff --git a/library/Zend/Loader/AutoloaderFactory.php b/library/Zend/Loader/AutoloaderFactory.php
index 0b92fa0df44..167fcd34c53 100644
--- a/library/Zend/Loader/AutoloaderFactory.php
+++ b/library/Zend/Loader/AutoloaderFactory.php
@@ -127,7 +127,7 @@ public static function getRegisteredAutoloaders()
     /**
      * Retrieves an autoloader by class name
      *
-     * @param string $class
+     * @param  string $class
      * @return SplAutoloader
      * @throws Exception\InvalidArgumentException for non-registered class
      */
@@ -204,8 +204,8 @@ protected static function getStandardAutoloader()
      * @see https://bugs.php.net/bug.php?id=53727
      * @see https://github.com/zendframework/zf2/pull/1807
      *
-     * @param string $className
-     * @param string $type
+     * @param  string $className
+     * @param  string $type
      * @return bool
      */
     protected static function isSubclassOf($className, $type)
diff --git a/library/Zend/Loader/ClassMapAutoloader.php b/library/Zend/Loader/ClassMapAutoloader.php
index 0547f765651..f5d27708453 100644
--- a/library/Zend/Loader/ClassMapAutoloader.php
+++ b/library/Zend/Loader/ClassMapAutoloader.php
@@ -195,7 +195,7 @@ protected function loadMapFromFile($location)
      * Resolve the real_path() to a file within a phar.
      *
      * @see https://bugs.php.net/bug.php?id=52769
-     * @param string $path
+     * @param  string $path
      * @return string
      */
     public static function realPharPath($path)
diff --git a/library/Zend/Loader/ModuleAutoloader.php b/library/Zend/Loader/ModuleAutoloader.php
index b97b301ece7..23235fa4ac2 100644
--- a/library/Zend/Loader/ModuleAutoloader.php
+++ b/library/Zend/Loader/ModuleAutoloader.php
@@ -161,8 +161,8 @@ public function autoload($class)
     /**
      * loadModuleFromDir
      *
-     * @param string $dirPath
-     * @param string $class
+     * @param  string $dirPath
+     * @param  string $class
      * @return  mixed
      *          False [if unable to load $class]
      *          get_class($class) [if $class is successfully loaded]
@@ -184,8 +184,8 @@ protected function loadModuleFromDir($dirPath, $class)
     /**
      * loadModuleFromPhar
      *
-     * @param string $pharPath
-     * @param string $class
+     * @param  string $pharPath
+     * @param  string $class
      * @return  mixed
      *          False [if unable to load $class]
      *          get_class($class) [if $class is successfully loaded]
@@ -261,7 +261,7 @@ public function unregister()
     /**
      * registerPaths
      *
-     * @param array|Traversable $paths
+     * @param  array|Traversable $paths
      * @throws \InvalidArgumentException
      * @return ModuleAutoloader
      */
@@ -289,8 +289,8 @@ public function registerPaths($paths)
     /**
      * registerPath
      *
-     * @param string $path
-     * @param bool|string $moduleName
+     * @param  string $path
+     * @param  bool|string $moduleName
      * @throws \InvalidArgumentException
      * @return ModuleAutoloader
      */
@@ -325,7 +325,7 @@ public function getPaths()
     /**
      * Returns the base module name from the path to a phar
      *
-     * @param string $pharPath
+     * @param  string $pharPath
      * @return string
      */
     protected function pharFileToModuleName($pharPath)
diff --git a/library/Zend/Loader/PluginClassLoader.php b/library/Zend/Loader/PluginClassLoader.php
index 58238c06ac0..bfcfa4c3584 100644
--- a/library/Zend/Loader/PluginClassLoader.php
+++ b/library/Zend/Loader/PluginClassLoader.php
@@ -147,7 +147,7 @@ public function registerPlugins($map)
     /**
      * Unregister a short name lookup
      *
-     * @param mixed $shortName
+     * @param  mixed $shortName
      * @return PluginClassLoader
      */
     public function unregisterPlugin($shortName)
diff --git a/library/Zend/Loader/PluginClassLocator.php b/library/Zend/Loader/PluginClassLocator.php
index 6e35359397b..2114a5a5087 100644
--- a/library/Zend/Loader/PluginClassLocator.php
+++ b/library/Zend/Loader/PluginClassLocator.php
@@ -32,7 +32,7 @@ public function registerPlugin($shortName, $className);
     /**
      * Unregister a short name lookup
      *
-     * @param mixed $shortName
+     * @param  mixed $shortName
      * @return void
      */
     public function unregisterPlugin($shortName);
diff --git a/library/Zend/Loader/StandardAutoloader.php b/library/Zend/Loader/StandardAutoloader.php
index dda46f0ae12..c0552e304fb 100644
--- a/library/Zend/Loader/StandardAutoloader.php
+++ b/library/Zend/Loader/StandardAutoloader.php
@@ -271,8 +271,8 @@ protected function transformClassNameToFilename($class, $directory)
     /**
      * Load a class, based on its type (namespaced or prefixed)
      *
-     * @param string $class
-     * @param string $type
+     * @param  string $class
+     * @param  string $type
      * @return bool|string
      * @throws Exception\InvalidArgumentException
      */