diff --git a/src/AbstractFactoryInterface.php b/src/AbstractFactoryInterface.php
index d678c2f1..64ab7598 100644
--- a/src/AbstractFactoryInterface.php
+++ b/src/AbstractFactoryInterface.php
@@ -5,15 +5,10 @@
  * @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_ServiceManager
  */
 
 namespace Zend\ServiceManager;
 
-/**
- * @category Zend
- * @package  Zend_ServiceManager
- */
 interface AbstractFactoryInterface
 {
     /**
diff --git a/src/AbstractPluginManager.php b/src/AbstractPluginManager.php
index 854461d4..605b4d4c 100644
--- a/src/AbstractPluginManager.php
+++ b/src/AbstractPluginManager.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_ServiceManager
  */
 
 namespace Zend\ServiceManager;
@@ -19,9 +18,6 @@
  * the plugin when retrieved. Finally, enables the allowOverride property by
  * default to allow registering factories, aliases, and invokables to take
  * the place of those provided by the implementing class.
- *
- * @category   Zend
- * @package    Zend_ServiceManager
  */
 abstract class AbstractPluginManager extends ServiceManager implements ServiceLocatorAwareInterface
 {
diff --git a/src/Config.php b/src/Config.php
index 352072e7..445e7c64 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -5,15 +5,10 @@
  * @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_ServiceManager
  */
 
 namespace Zend\ServiceManager;
 
-/**
- * @category Zend
- * @package  Zend_ServiceManager
- */
 class Config implements ConfigInterface
 {
     /**
diff --git a/src/ConfigInterface.php b/src/ConfigInterface.php
index 289c868a..68e7d275 100644
--- a/src/ConfigInterface.php
+++ b/src/ConfigInterface.php
@@ -5,15 +5,10 @@
  * @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_ServiceManager
  */
 
 namespace Zend\ServiceManager;
 
-/**
- * @category Zend
- * @package  Zend_ServiceManager
- */
 interface ConfigInterface
 {
     /**
diff --git a/src/Di/DiAbstractServiceFactory.php b/src/Di/DiAbstractServiceFactory.php
index 9831fe8e..a68a186d 100644
--- a/src/Di/DiAbstractServiceFactory.php
+++ b/src/Di/DiAbstractServiceFactory.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_ServiceManager
  */
 
 namespace Zend\ServiceManager\Di;
diff --git a/src/Di/DiInstanceManagerProxy.php b/src/Di/DiInstanceManagerProxy.php
index 1f46bd06..4f1cdb1e 100644
--- a/src/Di/DiInstanceManagerProxy.php
+++ b/src/Di/DiInstanceManagerProxy.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_ServiceManager
  */
 
 namespace Zend\ServiceManager\Di;
diff --git a/src/Di/DiServiceFactory.php b/src/Di/DiServiceFactory.php
index c3871924..f7ea241a 100644
--- a/src/Di/DiServiceFactory.php
+++ b/src/Di/DiServiceFactory.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_ServiceManager
  */
 
 namespace Zend\ServiceManager\Di;
diff --git a/src/Di/DiServiceInitializer.php b/src/Di/DiServiceInitializer.php
index 2b440c15..0a6ceec5 100644
--- a/src/Di/DiServiceInitializer.php
+++ b/src/Di/DiServiceInitializer.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_ServiceManager
  */
 
 namespace Zend\ServiceManager\Di;
diff --git a/src/Exception/CircularDependencyFoundException.php b/src/Exception/CircularDependencyFoundException.php
index ff17b216..fa6d1f10 100644
--- a/src/Exception/CircularDependencyFoundException.php
+++ b/src/Exception/CircularDependencyFoundException.php
@@ -5,16 +5,10 @@
  * @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_ServiceManager
  */
 
 namespace Zend\ServiceManager\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_ServiceManager
- * @subpackage Exception
- */
 class CircularDependencyFoundException extends RuntimeException
 {
 }
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
index 776901d0..8c9869db 100644
--- a/src/Exception/ExceptionInterface.php
+++ b/src/Exception/ExceptionInterface.php
@@ -5,16 +5,10 @@
  * @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_ServiceManager
  */
 
 namespace Zend\ServiceManager\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_ServiceManager
- * @subpackage Exception
- */
 interface ExceptionInterface
 {
 }
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index f81323e4..64f59ed4 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -5,16 +5,10 @@
  * @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_ServiceManager
  */
 
 namespace Zend\ServiceManager\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_ServiceManager
- * @subpackage Exception
- */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/src/Exception/InvalidServiceNameException.php b/src/Exception/InvalidServiceNameException.php
index a922f98a..6e44f9c9 100644
--- a/src/Exception/InvalidServiceNameException.php
+++ b/src/Exception/InvalidServiceNameException.php
@@ -5,16 +5,10 @@
  * @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_ServiceManager
  */
 
 namespace Zend\ServiceManager\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_ServiceManager
- * @subpackage Exception
- */
 class InvalidServiceNameException extends RuntimeException
 {
 }
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
index 8ee6d641..822a895b 100644
--- a/src/Exception/RuntimeException.php
+++ b/src/Exception/RuntimeException.php
@@ -5,16 +5,10 @@
  * @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_ServiceManager
  */
 
 namespace Zend\ServiceManager\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_ServiceManager
- * @subpackage Exception
- */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
 }
diff --git a/src/Exception/ServiceNotCreatedException.php b/src/Exception/ServiceNotCreatedException.php
index 45634289..4226e75b 100644
--- a/src/Exception/ServiceNotCreatedException.php
+++ b/src/Exception/ServiceNotCreatedException.php
@@ -5,16 +5,10 @@
  * @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_ServiceManager
  */
 
 namespace Zend\ServiceManager\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_ServiceManager
- * @subpackage Exception
- */
 class ServiceNotCreatedException extends RuntimeException
 {
 }
diff --git a/src/Exception/ServiceNotFoundException.php b/src/Exception/ServiceNotFoundException.php
index d0f926f0..877aa629 100644
--- a/src/Exception/ServiceNotFoundException.php
+++ b/src/Exception/ServiceNotFoundException.php
@@ -5,16 +5,10 @@
  * @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_ServiceManager
  */
 
 namespace Zend\ServiceManager\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_ServiceManager
- * @subpackage Exception
- */
 class ServiceNotFoundException extends InvalidArgumentException
 {
 }
diff --git a/src/FactoryInterface.php b/src/FactoryInterface.php
index aa1d1039..6b681225 100644
--- a/src/FactoryInterface.php
+++ b/src/FactoryInterface.php
@@ -5,15 +5,10 @@
  * @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_ServiceManager
  */
 
 namespace Zend\ServiceManager;
 
-/**
- * @category Zend
- * @package  Zend_ServiceManager
- */
 interface FactoryInterface
 {
     /**
diff --git a/src/InitializerInterface.php b/src/InitializerInterface.php
index 687bc8b8..0db23f34 100644
--- a/src/InitializerInterface.php
+++ b/src/InitializerInterface.php
@@ -5,17 +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_ServiceManager
  */
 
 namespace Zend\ServiceManager;
 
 use Zend\ServiceManager\ServiceLocatorInterface;
 
-/**
- * @category Zend
- * @package  Zend_ServiceManager
- */
 interface InitializerInterface
 {
     /**
diff --git a/src/ServiceLocatorAwareInterface.php b/src/ServiceLocatorAwareInterface.php
index 93c36189..cd666803 100644
--- a/src/ServiceLocatorAwareInterface.php
+++ b/src/ServiceLocatorAwareInterface.php
@@ -5,15 +5,10 @@
  * @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_ServiceManager
  */
 
 namespace Zend\ServiceManager;
 
-/**
- * @category Zend
- * @package  Zend_ServiceManager
- */
 interface ServiceLocatorAwareInterface
 {
     /**
diff --git a/src/ServiceLocatorAwareTrait.php b/src/ServiceLocatorAwareTrait.php
index ab81e565..a6c9669f 100644
--- a/src/ServiceLocatorAwareTrait.php
+++ b/src/ServiceLocatorAwareTrait.php
@@ -5,17 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_ServiceManager
  */
 
 namespace Zend\ServiceManager;
 
 use Zend\ServiceManager\ServiceLocatorInterface;
 
-/**
- * @category  Zend
- * @package   Zend_ServiceManager
- */
 trait ServiceLocatorAwareTrait
 {
     /**
diff --git a/src/ServiceLocatorInterface.php b/src/ServiceLocatorInterface.php
index 1cd98e65..46064c84 100644
--- a/src/ServiceLocatorInterface.php
+++ b/src/ServiceLocatorInterface.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_ServiceManager
  */
 
 namespace Zend\ServiceManager;
 
 /**
  * Service locator interface
- *
- * @category Zend
- * @package Zend_ServiceManager
  */
 interface ServiceLocatorInterface
 {
diff --git a/src/ServiceManager.php b/src/ServiceManager.php
index 5b787f23..b0d068d3 100644
--- a/src/ServiceManager.php
+++ b/src/ServiceManager.php
@@ -5,17 +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_ServiceManager
  */
 
 namespace Zend\ServiceManager;
 
 use ReflectionClass;
 
-/**
- * @category Zend
- * @package  Zend_ServiceManager
- */
 class ServiceManager implements ServiceLocatorInterface
 {
 
diff --git a/src/ServiceManagerAwareInterface.php b/src/ServiceManagerAwareInterface.php
index ac28bb83..4f6a0cc9 100644
--- a/src/ServiceManagerAwareInterface.php
+++ b/src/ServiceManagerAwareInterface.php
@@ -5,15 +5,10 @@
  * @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_ServiceManager
  */
 
 namespace Zend\ServiceManager;
 
-/**
- * @category Zend
- * @package  Zend_ServiceManager
- */
 interface ServiceManagerAwareInterface
 {
     /**