diff --git a/src/AutoloaderFactory.php b/src/AutoloaderFactory.php
index f8f343f..d9d71a1 100644
--- a/src/AutoloaderFactory.php
+++ b/src/AutoloaderFactory.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader;
@@ -19,10 +18,6 @@
     return;
 }
 
-/**
- * @category   Zend
- * @package    Zend_Loader
- */
 abstract class AutoloaderFactory
 {
     const STANDARD_AUTOLOADER = 'Zend\Loader\StandardAutoloader';
diff --git a/src/ClassMapAutoloader.php b/src/ClassMapAutoloader.php
index 55087f5..d6f4769 100644
--- a/src/ClassMapAutoloader.php
+++ b/src/ClassMapAutoloader.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader;
@@ -19,9 +18,6 @@
  * Class-map autoloader
  *
  * Utilizes class-map files to lookup classfile locations.
- *
- * @category   Zend
- * @package    Zend_Loader
  */
 class ClassMapAutoloader implements SplAutoloader
 {
diff --git a/src/Exception/BadMethodCallException.php b/src/Exception/BadMethodCallException.php
index 71c2d1d..b81099a 100644
--- a/src/Exception/BadMethodCallException.php
+++ b/src/Exception/BadMethodCallException.php
@@ -5,18 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader\Exception;
 
 require_once __DIR__ . '/ExceptionInterface.php';
 
-/**
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage Exception
- */
 class BadMethodCallException extends \BadMethodCallException implements
     ExceptionInterface
 {
diff --git a/src/Exception/DomainException.php b/src/Exception/DomainException.php
index fe6e798..3da81b0 100644
--- a/src/Exception/DomainException.php
+++ b/src/Exception/DomainException.php
@@ -5,17 +5,11 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader\Exception;
 
 require_once __DIR__ . '/ExceptionInterface.php';
 
-/**
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage Exception
- */
 class DomainException extends \DomainException implements ExceptionInterface
 {}
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
index 42cec9f..cbdf7c4 100644
--- a/src/Exception/ExceptionInterface.php
+++ b/src/Exception/ExceptionInterface.php
@@ -5,14 +5,9 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Loader
- */
 interface ExceptionInterface
 {}
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index 122dafa..d0076c2 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -5,18 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader\Exception;
 
 require_once __DIR__ . '/ExceptionInterface.php';
 
-/**
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage Exception
- */
 class InvalidArgumentException extends \InvalidArgumentException implements
     ExceptionInterface
 {}
diff --git a/src/Exception/InvalidPathException.php b/src/Exception/InvalidPathException.php
index 93ac22b..8b94045 100644
--- a/src/Exception/InvalidPathException.php
+++ b/src/Exception/InvalidPathException.php
@@ -5,17 +5,11 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader\Exception;
 
 require_once __DIR__ . '/ExceptionInterface.php';
 
-/**
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage Exception
- */
 class InvalidPathException extends \Exception implements ExceptionInterface
 {}
diff --git a/src/Exception/MissingResourceNamespaceException.php b/src/Exception/MissingResourceNamespaceException.php
index 6cc85b4..43fbd03 100644
--- a/src/Exception/MissingResourceNamespaceException.php
+++ b/src/Exception/MissingResourceNamespaceException.php
@@ -5,18 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader\Exception;
 
 require_once __DIR__ . '/ExceptionInterface.php';
 
-/**
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage Exception
- */
 class MissingResourceNamespaceException extends \Exception implements
     ExceptionInterface
 {}
diff --git a/src/Exception/PluginLoaderException.php b/src/Exception/PluginLoaderException.php
index 88037ed..9b3bf21 100644
--- a/src/Exception/PluginLoaderException.php
+++ b/src/Exception/PluginLoaderException.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader\Exception;
@@ -14,10 +13,6 @@
 
 /**
  * Plugin class loader exceptions
- *
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage Exception
  */
 class PluginLoaderException extends DomainException
 {
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
index 1c989d5..d0c322d 100644
--- a/src/Exception/RuntimeException.php
+++ b/src/Exception/RuntimeException.php
@@ -5,17 +5,11 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader\Exception;
 
 require_once __DIR__ . '/ExceptionInterface.php';
 
-/**
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage Exception
- */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {}
diff --git a/src/Exception/SecurityException.php b/src/Exception/SecurityException.php
index 22d3c53..13ca1a1 100644
--- a/src/Exception/SecurityException.php
+++ b/src/Exception/SecurityException.php
@@ -5,17 +5,11 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader\Exception;
 
 require_once __DIR__ . '/DomainException.php';
 
-/**
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage Exception
- */
 class SecurityException extends DomainException
 {}
diff --git a/src/ModuleAutoloader.php b/src/ModuleAutoloader.php
index c1432b6..c2b5e85 100644
--- a/src/ModuleAutoloader.php
+++ b/src/ModuleAutoloader.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader;
diff --git a/src/PluginClassLoader.php b/src/PluginClassLoader.php
index 3c4d33c..1c9e8ac 100644
--- a/src/PluginClassLoader.php
+++ b/src/PluginClassLoader.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader;
@@ -16,9 +15,6 @@
 
 /**
  * Plugin class locator interface
- *
- * @category   Zend
- * @package    Zend_Loader
  */
 class PluginClassLoader implements PluginClassLocator
 {
diff --git a/src/PluginClassLocator.php b/src/PluginClassLocator.php
index 2b93e8b..ef9556e 100644
--- a/src/PluginClassLocator.php
+++ b/src/PluginClassLocator.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader;
@@ -14,9 +13,6 @@
 
 /**
  * Plugin class locator interface
- *
- * @category   Zend
- * @package    Zend_Loader
  */
 interface PluginClassLocator extends ShortNameLocator, \IteratorAggregate
 {
diff --git a/src/ShortNameLocator.php b/src/ShortNameLocator.php
index 61c5d03..4428cd5 100644
--- a/src/ShortNameLocator.php
+++ b/src/ShortNameLocator.php
@@ -5,16 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader;
 
 /**
  * Short name locator interface
- *
- * @category   Zend
- * @package    Zend_Loader
  */
 interface ShortNameLocator
 {
diff --git a/src/SplAutoloader.php b/src/SplAutoloader.php
index 4a2ff6b..214066b 100644
--- a/src/SplAutoloader.php
+++ b/src/SplAutoloader.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader;
@@ -17,8 +16,6 @@
 /**
  * Defines an interface for classes that may register with the spl_autoload
  * registry
- *
- * @package    Zend_Loader
  */
 interface SplAutoloader
 {
diff --git a/src/StandardAutoloader.php b/src/StandardAutoloader.php
index 500cdea..dd2a898 100644
--- a/src/StandardAutoloader.php
+++ b/src/StandardAutoloader.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader;
@@ -19,8 +18,6 @@
  * Allows autoloading both namespaced and vendor-prefixed classes. Class
  * lookups are performed on the filesystem. If a class file for the referenced
  * class is not found, a PHP warning will be raised by include().
- *
- * @package    Zend_Loader
  */
 class StandardAutoloader implements SplAutoloader
 {