diff --git a/src/Cloud.php b/src/Cloud.php
index bda2414..33c4a7c 100644
--- a/src/Cloud.php
+++ b/src/Cloud.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_Tag
  */
 
 namespace Zend\Tag;
@@ -13,10 +12,6 @@
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
 
-/**
- * @category   Zend
- * @package    Zend_Tag
- */
 class Cloud
 {
     /**
diff --git a/src/Cloud/Decorator/AbstractCloud.php b/src/Cloud/Decorator/AbstractCloud.php
index cfe1ca9..20da4c6 100644
--- a/src/Cloud/Decorator/AbstractCloud.php
+++ b/src/Cloud/Decorator/AbstractCloud.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_Tag
  */
 
 namespace Zend\Tag\Cloud\Decorator;
 
 /**
  * Abstract class for cloud decorators
- *
- * @category  Zend
- * @package   Zend_Tag
  */
 abstract class AbstractCloud extends AbstractDecorator
 {
diff --git a/src/Cloud/Decorator/AbstractDecorator.php b/src/Cloud/Decorator/AbstractDecorator.php
index 5479ce2..bc4c382 100644
--- a/src/Cloud/Decorator/AbstractDecorator.php
+++ b/src/Cloud/Decorator/AbstractDecorator.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_Tag
  */
 
 namespace Zend\Tag\Cloud\Decorator;
@@ -18,9 +17,6 @@
 
 /**
  * Abstract class for decorators
- *
- * @category  Zend
- * @package   Zend_Tag
  */
 abstract class AbstractDecorator implements Decorator
 {
diff --git a/src/Cloud/Decorator/AbstractTag.php b/src/Cloud/Decorator/AbstractTag.php
index 1a6706f..0d75eef 100644
--- a/src/Cloud/Decorator/AbstractTag.php
+++ b/src/Cloud/Decorator/AbstractTag.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_Tag
  */
 
 namespace Zend\Tag\Cloud\Decorator;
 
 /**
  * Abstract class for tag decorators
- *
- * @category  Zend
- * @package   Zend_Tag
  */
 abstract class AbstractTag extends AbstractDecorator
 {
diff --git a/src/Cloud/Decorator/DecoratorInterface.php b/src/Cloud/Decorator/DecoratorInterface.php
index d49e1a9..1b07b61 100644
--- a/src/Cloud/Decorator/DecoratorInterface.php
+++ b/src/Cloud/Decorator/DecoratorInterface.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_Tag
  */
 
 namespace Zend\Tag\Cloud\Decorator;
 
 /**
  * Interface for decorators
- *
- * @category   Zend
- * @package    Zend_Tag
- * @subpackage Cloud
  */
 interface DecoratorInterface
 {
diff --git a/src/Cloud/Decorator/Exception/ExceptionInterface.php b/src/Cloud/Decorator/Exception/ExceptionInterface.php
index 1f65934..2291dfe 100644
--- a/src/Cloud/Decorator/Exception/ExceptionInterface.php
+++ b/src/Cloud/Decorator/Exception/ExceptionInterface.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_Tag
  */
 
 namespace Zend\Tag\Cloud\Decorator\Exception;
@@ -14,9 +13,6 @@
 
 /**
  * Exception class for Zend_Tag_Cloud_Decorator
- *
- * @category  Zend
- * @package   Zend_Tag
  */
 interface ExceptionInterface extends Exception
 {}
diff --git a/src/Cloud/Decorator/Exception/InvalidArgumentException.php b/src/Cloud/Decorator/Exception/InvalidArgumentException.php
index ae62ba3..6b36583 100644
--- a/src/Cloud/Decorator/Exception/InvalidArgumentException.php
+++ b/src/Cloud/Decorator/Exception/InvalidArgumentException.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_Tag
  */
 
 namespace Zend\Tag\Cloud\Decorator\Exception;
diff --git a/src/Cloud/Decorator/HtmlCloud.php b/src/Cloud/Decorator/HtmlCloud.php
index da77d35..8afa634 100644
--- a/src/Cloud/Decorator/HtmlCloud.php
+++ b/src/Cloud/Decorator/HtmlCloud.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_Tag
  */
 
 namespace Zend\Tag\Cloud\Decorator;
 
 /**
  * Simple HTML decorator for clouds
- *
- * @category  Zend
- * @package   Zend_Tag
  */
 class HtmlCloud extends AbstractCloud
 {
diff --git a/src/Cloud/Decorator/HtmlTag.php b/src/Cloud/Decorator/HtmlTag.php
index 8b523bd..1f71f59 100644
--- a/src/Cloud/Decorator/HtmlTag.php
+++ b/src/Cloud/Decorator/HtmlTag.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_Tag
  */
 
 namespace Zend\Tag\Cloud\Decorator;
@@ -15,9 +14,6 @@
 
 /**
  * Simple HTML decorator for tags
- *
- * @category  Zend
- * @package   Zend_Tag
  */
 class HtmlTag extends AbstractTag
 {
diff --git a/src/Cloud/DecoratorPluginManager.php b/src/Cloud/DecoratorPluginManager.php
index 163b075..77c1fe4 100644
--- a/src/Cloud/DecoratorPluginManager.php
+++ b/src/Cloud/DecoratorPluginManager.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_Tag
  */
 
 namespace Zend\Tag\Cloud;
@@ -19,10 +18,6 @@
  * Enforces that decorators retrieved are instances of
  * Decorator\DecoratorInterface. Additionally, it registers a number of default
  * decorators available.
- *
- * @category   Zend
- * @package    Zend_Tag
- * @subpackage Cloud
  */
 class DecoratorPluginManager extends AbstractPluginManager
 {
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
index a6a0853..a700fa4 100644
--- a/src/Exception/ExceptionInterface.php
+++ b/src/Exception/ExceptionInterface.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_Tag
  */
 
 namespace Zend\Tag\Exception;
 
 /**
  * Exception interface for Zend\Tag
- *
- * @category  Zend
- * @package   Zend_Tag
  */
 interface ExceptionInterface
 {
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index 904fd49..070a9e3 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.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_Tag
  */
 
 namespace Zend\Tag\Exception;
diff --git a/src/Exception/InvalidAttributeNameException.php b/src/Exception/InvalidAttributeNameException.php
index 478c6f1..9d43088 100644
--- a/src/Exception/InvalidAttributeNameException.php
+++ b/src/Exception/InvalidAttributeNameException.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_Tag
  */
 
 namespace Zend\Tag\Exception;
diff --git a/src/Exception/InvalidElementNameException.php b/src/Exception/InvalidElementNameException.php
index ba856f9..bd6fb35 100644
--- a/src/Exception/InvalidElementNameException.php
+++ b/src/Exception/InvalidElementNameException.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_Tag
  */
 
 namespace Zend\Tag\Exception;
diff --git a/src/Exception/OutOfBoundsException.php b/src/Exception/OutOfBoundsException.php
index 9207f17..31614fe 100644
--- a/src/Exception/OutOfBoundsException.php
+++ b/src/Exception/OutOfBoundsException.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_Tag
  */
 
 namespace Zend\Tag\Exception;
diff --git a/src/Item.php b/src/Item.php
index fd1af19..4f41de5 100644
--- a/src/Item.php
+++ b/src/Item.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_Tag
  */
 
 namespace Zend\Tag;
@@ -13,10 +12,6 @@
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
 
-/**
- * @category   Zend
- * @package    Zend_Tag
- */
 class Item implements TaggableInterface
 {
     /**
diff --git a/src/ItemList.php b/src/ItemList.php
index 1fa83cf..0597694 100644
--- a/src/ItemList.php
+++ b/src/ItemList.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_Tag
  */
 
 namespace Zend\Tag;
@@ -16,10 +15,6 @@
 use Zend\Tag\Exception\InvalidArgumentException;
 use Zend\Tag\Exception\OutOfBoundsException;
 
-/**
- * @category   Zend
- * @package    Zend_Tag
- */
 class ItemList implements Countable, SeekableIterator, ArrayAccess
 {
     /**
diff --git a/src/TaggableInterface.php b/src/TaggableInterface.php
index 2a34bd6..c118b2c 100644
--- a/src/TaggableInterface.php
+++ b/src/TaggableInterface.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_Tag
  */
 
 namespace Zend\Tag;
 
-/**
- * @category   Zend
- * @package    Zend_Tag
- */
 interface TaggableInterface
 {
     /**