diff --git a/src/AbstractMessage.php b/src/AbstractMessage.php
index 697e4ed03..7faab6625 100644
--- a/src/AbstractMessage.php
+++ b/src/AbstractMessage.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_Http
  */
 
 namespace Zend\Http;
@@ -15,8 +14,6 @@
 /**
  * HTTP standard message (Request/Response)
  *
- * @category  Zend
- * @package   Zend_Http
  * @link      http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4
  */
 abstract class AbstractMessage extends Message
diff --git a/src/Client.php b/src/Client.php
index 07d388860..58d2abef4 100644
--- a/src/Client.php
+++ b/src/Client.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_Http
  */
 
 namespace Zend\Http;
@@ -19,9 +18,6 @@
 
 /**
  * Http client
- *
- * @category   Zend
- * @package    Zend\Http
  */
 class Client implements Stdlib\DispatchableInterface
 {
diff --git a/src/Client/Adapter/AdapterInterface.php b/src/Client/Adapter/AdapterInterface.php
index 7c8178bee..c870aa5cb 100644
--- a/src/Client/Adapter/AdapterInterface.php
+++ b/src/Client/Adapter/AdapterInterface.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_Http
  */
 
 namespace Zend\Http\Client\Adapter;
@@ -15,10 +14,6 @@
  *
  * These classes are used as connectors for Zend_Http_Client, performing the
  * tasks of connecting, writing, reading and closing connection to the server.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
  */
 interface AdapterInterface
 {
diff --git a/src/Client/Adapter/Curl.php b/src/Client/Adapter/Curl.php
index 961153cd9..d5becf8e0 100644
--- a/src/Client/Adapter/Curl.php
+++ b/src/Client/Adapter/Curl.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_Http
  */
 
 namespace Zend\Http\Client\Adapter;
@@ -20,10 +19,6 @@
 /**
  * An adapter class for Zend\Http\Client based on the curl extension.
  * Curl requires libcurl. See for full requirements the PHP manual: http://php.net/curl
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
  */
 class Curl implements HttpAdapter, StreamInterface
 {
diff --git a/src/Client/Adapter/Exception/ExceptionInterface.php b/src/Client/Adapter/Exception/ExceptionInterface.php
index 759b8074e..9bb3fb3f3 100644
--- a/src/Client/Adapter/Exception/ExceptionInterface.php
+++ b/src/Client/Adapter/Exception/ExceptionInterface.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_Http
  */
 
 namespace Zend\Http\Client\Adapter\Exception;
 
 use Zend\Http\Client\Exception\ExceptionInterface as HttpClientException;
 
-/**
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
- */
 interface ExceptionInterface extends HttpClientException
 {}
diff --git a/src/Client/Adapter/Exception/InitializationException.php b/src/Client/Adapter/Exception/InitializationException.php
index 0e8b264ac..6fea4a1c4 100644
--- a/src/Client/Adapter/Exception/InitializationException.php
+++ b/src/Client/Adapter/Exception/InitializationException.php
@@ -5,15 +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_Http
  */
 
 namespace Zend\Http\Client\Adapter\Exception;
 
 /**
- *
- * @category  Zend
- * @package   Zend_Application
  */
 class InitializationException extends RuntimeException
 {}
diff --git a/src/Client/Adapter/Exception/InvalidArgumentException.php b/src/Client/Adapter/Exception/InvalidArgumentException.php
index 80fa49ded..361790a19 100644
--- a/src/Client/Adapter/Exception/InvalidArgumentException.php
+++ b/src/Client/Adapter/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_Http
  */
 
 namespace Zend\Http\Client\Adapter\Exception;
@@ -13,9 +12,6 @@
 use Zend\Http\Client\Exception;
 
 /**
- *
- * @category  Zend
- * @package   Zend_Application
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements
     ExceptionInterface
diff --git a/src/Client/Adapter/Exception/OutOfRangeException.php b/src/Client/Adapter/Exception/OutOfRangeException.php
index 4b45649ea..c126a3f25 100644
--- a/src/Client/Adapter/Exception/OutOfRangeException.php
+++ b/src/Client/Adapter/Exception/OutOfRangeException.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_Http
  */
 
 namespace Zend\Http\Client\Adapter\Exception;
@@ -13,9 +12,6 @@
 use Zend\Http\Client\Exception;
 
 /**
- *
- * @category  Zend
- * @package   Zend_Application
  */
 class OutOfRangeException extends Exception\OutOfRangeException implements
     ExceptionInterface
diff --git a/src/Client/Adapter/Exception/RuntimeException.php b/src/Client/Adapter/Exception/RuntimeException.php
index 26128ed31..d26da0cd5 100644
--- a/src/Client/Adapter/Exception/RuntimeException.php
+++ b/src/Client/Adapter/Exception/RuntimeException.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_Http
  */
 
 namespace Zend\Http\Client\Adapter\Exception;
@@ -13,9 +12,6 @@
 use Zend\Http\Client\Exception;
 
 /**
- *
- * @category  Zend
- * @package   Zend_Application
  */
 class RuntimeException extends Exception\RuntimeException implements
     ExceptionInterface
diff --git a/src/Client/Adapter/Exception/TimeoutException.php b/src/Client/Adapter/Exception/TimeoutException.php
index 75024c44f..7928b0c78 100644
--- a/src/Client/Adapter/Exception/TimeoutException.php
+++ b/src/Client/Adapter/Exception/TimeoutException.php
@@ -5,15 +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_Http
  */
 
 namespace Zend\Http\Client\Adapter\Exception;
 
 /**
- *
- * @category  Zend
- * @package   Zend_Application
  */
 class TimeoutException extends RuntimeException implements ExceptionInterface
 {
diff --git a/src/Client/Adapter/Proxy.php b/src/Client/Adapter/Proxy.php
index 754d28ddb..f06aa866d 100644
--- a/src/Client/Adapter/Proxy.php
+++ b/src/Client/Adapter/Proxy.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_Http
  */
 
 namespace Zend\Http\Client\Adapter;
@@ -23,10 +22,6 @@
  * fall back to Zend_Http_Client_Adapter_Socket behavior. Just like the
  * default Socket adapter, this adapter does not require any special extensions
  * installed.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
  */
 class Proxy extends Socket
 {
diff --git a/src/Client/Adapter/Socket.php b/src/Client/Adapter/Socket.php
index 694e0a058..68604e01e 100644
--- a/src/Client/Adapter/Socket.php
+++ b/src/Client/Adapter/Socket.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_Http
  */
 
 namespace Zend\Http\Client\Adapter;
@@ -20,10 +19,6 @@
 /**
  * A sockets based (stream\socket\client) adapter class for Zend\Http\Client. Can be used
  * on almost every PHP environment, and does not require any special extensions.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
  */
 class Socket implements HttpAdapter, StreamInterface
 {
diff --git a/src/Client/Adapter/StreamInterface.php b/src/Client/Adapter/StreamInterface.php
index 065e10441..aaf72d92f 100644
--- a/src/Client/Adapter/StreamInterface.php
+++ b/src/Client/Adapter/StreamInterface.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_Http
  */
 
 namespace Zend\Http\Client\Adapter;
@@ -14,10 +13,6 @@
  * An interface description for Zend_Http_Client_Adapter_Stream classes.
  *
  * This interface describes Zend_Http_Client_Adapter which supports streaming.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
  */
 interface StreamInterface
 {
diff --git a/src/Client/Adapter/Test.php b/src/Client/Adapter/Test.php
index 92bedb980..cde513731 100644
--- a/src/Client/Adapter/Test.php
+++ b/src/Client/Adapter/Test.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_Http
  */
 
 namespace Zend\Http\Client\Adapter;
@@ -21,10 +20,6 @@
  * without actually performing an HTTP request. You should instantiate this
  * object manually, and then set it as the client's adapter. Then, you can
  * set the expected response using the setResponse() method.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
  */
 class Test implements AdapterInterface
 {
diff --git a/src/Client/Cookies.php b/src/Client/Cookies.php
index 0e8fa3e20..c2b4ecb84 100644
--- a/src/Client/Cookies.php
+++ b/src/Client/Cookies.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_Http
  */
 
 namespace Zend\Http\Client;
@@ -34,9 +33,6 @@
  * (by passing Zend\Http\Client\Cookies::COOKIE_STRING_CONCAT).
  *
  * @link       http://wp.netscape.com/newsref/std/cookie_spec.html for some specs.
- *
- * @category   Zend
- * @package    Zend\Http\Client
  */
 class Cookies
 {
diff --git a/src/Client/Exception/ExceptionInterface.php b/src/Client/Exception/ExceptionInterface.php
index 3f573c22d..dbb0d985a 100644
--- a/src/Client/Exception/ExceptionInterface.php
+++ b/src/Client/Exception/ExceptionInterface.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_Http
  */
 
 namespace Zend\Http\Client\Exception;
 
 use Zend\Http\Exception\ExceptionInterface as HttpException;
 
-/**
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client
- */
 interface ExceptionInterface extends HttpException
 {}
diff --git a/src/Client/Exception/InvalidArgumentException.php b/src/Client/Exception/InvalidArgumentException.php
index 4a899c900..9e0221d28 100644
--- a/src/Client/Exception/InvalidArgumentException.php
+++ b/src/Client/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_Http
  */
 
 namespace Zend\Http\Client\Exception;
@@ -13,9 +12,6 @@
 use Zend\Http\Exception;
 
 /**
- *
- * @category  Zend
- * @package   Zend_Application
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements
     ExceptionInterface
diff --git a/src/Client/Exception/OutOfRangeException.php b/src/Client/Exception/OutOfRangeException.php
index 1a9b035fe..309f575b2 100644
--- a/src/Client/Exception/OutOfRangeException.php
+++ b/src/Client/Exception/OutOfRangeException.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_Http
  */
 
 namespace Zend\Http\Client\Exception;
diff --git a/src/Client/Exception/RuntimeException.php b/src/Client/Exception/RuntimeException.php
index f1f8e73ee..24cff1bcf 100644
--- a/src/Client/Exception/RuntimeException.php
+++ b/src/Client/Exception/RuntimeException.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_Http
  */
 
 namespace Zend\Http\Client\Exception;
@@ -13,9 +12,6 @@
 use Zend\Http\Exception;
 
 /**
- *
- * @category  Zend
- * @package   Zend_Application
  */
 class RuntimeException extends Exception\RuntimeException implements
     ExceptionInterface
diff --git a/src/ClientStatic.php b/src/ClientStatic.php
index 758d2efa3..dfde5e2d4 100644
--- a/src/ClientStatic.php
+++ b/src/ClientStatic.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_Http
  */
 
 namespace Zend\Http;
@@ -14,9 +13,6 @@
 
 /**
  * Http static client
- *
- * @category   Zend
- * @package    Zend\Http
  */
 class ClientStatic
 {
diff --git a/src/Cookies.php b/src/Cookies.php
index f6ed250d3..a9a8da594 100644
--- a/src/Cookies.php
+++ b/src/Cookies.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_Http
  */
 
 namespace Zend\Http;
@@ -33,9 +32,6 @@
  * (by passing Zend\Http\Client\Cookies::COOKIE_STRING_CONCAT).
  *
  * @link       http://wp.netscape.com/newsref/std/cookie_spec.html for some specs.
- *
- * @category   Zend
- * @package    Zend\Http\Client
  */
 class Cookies extends Headers
 {
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
index d9bad0839..e3a35bfc9 100644
--- a/src/Exception/ExceptionInterface.php
+++ b/src/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_Http
  */
 
 namespace Zend\Http\Exception;
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index 299226653..a0f18445d 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_Http
  */
 
 namespace Zend\Http\Exception;
diff --git a/src/Exception/OutOfRangeException.php b/src/Exception/OutOfRangeException.php
index b7e6bacb9..ad931ff01 100644
--- a/src/Exception/OutOfRangeException.php
+++ b/src/Exception/OutOfRangeException.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_Http
  */
 
 namespace Zend\Http\Exception;
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
index 4890511d5..2a2770206 100644
--- a/src/Exception/RuntimeException.php
+++ b/src/Exception/RuntimeException.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_Http
  */
 
 namespace Zend\Http\Exception;
diff --git a/src/Header/AbstractAccept.php b/src/Header/AbstractAccept.php
index 3f46bc4d2..d74ff0ec4 100644
--- a/src/Header/AbstractAccept.php
+++ b/src/Header/AbstractAccept.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_Http
  */
 
 namespace Zend\Http\Header;
@@ -34,8 +33,6 @@
  *                        |---|                                priority
  *
  *
- * @category   Zend
- * @package    Zend\Http\Header
  * @see        http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
  * @author     Dolf Schimmel - Freeaqingme
  */
diff --git a/src/Header/AbstractDate.php b/src/Header/AbstractDate.php
index 583cbea68..3b6162339 100644
--- a/src/Header/AbstractDate.php
+++ b/src/Header/AbstractDate.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_Http
  */
 
 namespace Zend\Http\Header;
@@ -26,9 +25,6 @@
  * Note for 'Location' header:
  * While RFC 1945 requires an absolute URI, most of the browsers also support relative URI
  * This class allows relative URIs, and let user retrieve URI instance if strict validation needed
- *
- * @category   Zend
- * @package    Zend_Http
  */
 abstract class AbstractDate implements HeaderInterface
 {
diff --git a/src/Header/AbstractLocation.php b/src/Header/AbstractLocation.php
index 8088209c9..8898a39ac 100644
--- a/src/Header/AbstractLocation.php
+++ b/src/Header/AbstractLocation.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_Http
  */
 
 namespace Zend\Http\Header;
@@ -26,9 +25,6 @@
  * Note for 'Location' header:
  * While RFC 1945 requires an absolute URI, most of the browsers also support relative URI
  * This class allows relative URIs, and let user retrieve URI instance if strict validation needed
- *
- * @category   Zend
- * @package    Zend_Http
  */
 abstract class AbstractLocation implements HeaderInterface
 {
diff --git a/src/Header/Accept.php b/src/Header/Accept.php
index dadd6f83a..220a507ac 100644
--- a/src/Header/Accept.php
+++ b/src/Header/Accept.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_Http
  */
 
 namespace Zend\Http\Header;
@@ -15,8 +14,6 @@
 /**
  * Accept Header
  *
- * @category   Zend
- * @package    Zend\Http\Header
  * @see        http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
  */
 class Accept extends AbstractAccept
diff --git a/src/Header/Accept/FieldValuePart/AbstractFieldValuePart.php b/src/Header/Accept/FieldValuePart/AbstractFieldValuePart.php
index b5cfcda7b..7675854b1 100644
--- a/src/Header/Accept/FieldValuePart/AbstractFieldValuePart.php
+++ b/src/Header/Accept/FieldValuePart/AbstractFieldValuePart.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_Http
  */
 
 namespace Zend\Http\Header\Accept\FieldValuePart;
@@ -14,8 +13,6 @@
  * Field Value Part
  *
  *
- * @category   Zend
- * @package    Zend\Http\Header
  * @see        http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
  */
 abstract class AbstractFieldValuePart
diff --git a/src/Header/Accept/FieldValuePart/AcceptFieldValuePart.php b/src/Header/Accept/FieldValuePart/AcceptFieldValuePart.php
index 51bb9d02a..dc678d870 100644
--- a/src/Header/Accept/FieldValuePart/AcceptFieldValuePart.php
+++ b/src/Header/Accept/FieldValuePart/AcceptFieldValuePart.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_Http
  */
 
 namespace Zend\Http\Header\Accept\FieldValuePart;
@@ -14,8 +13,6 @@
  * Field Value Part
  *
  *
- * @category   Zend
- * @package    Zend\Http\Header
  * @see        http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
  */
 class AcceptFieldValuePart extends AbstractFieldValuePart
diff --git a/src/Header/Accept/FieldValuePart/CharsetFieldValuePart.php b/src/Header/Accept/FieldValuePart/CharsetFieldValuePart.php
index 87f547744..2a6d26290 100644
--- a/src/Header/Accept/FieldValuePart/CharsetFieldValuePart.php
+++ b/src/Header/Accept/FieldValuePart/CharsetFieldValuePart.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_Http
  */
 
 namespace Zend\Http\Header\Accept\FieldValuePart;
@@ -14,8 +13,6 @@
  * Field Value Part
  *
  *
- * @category   Zend
- * @package    Zend\Http\Header
  * @see        http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
  */
 class CharsetFieldValuePart extends AbstractFieldValuePart
diff --git a/src/Header/Accept/FieldValuePart/EncodingFieldValuePart.php b/src/Header/Accept/FieldValuePart/EncodingFieldValuePart.php
index 6fe18c542..3fba1d54d 100644
--- a/src/Header/Accept/FieldValuePart/EncodingFieldValuePart.php
+++ b/src/Header/Accept/FieldValuePart/EncodingFieldValuePart.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_Http
  */
 
 namespace Zend\Http\Header\Accept\FieldValuePart;
@@ -14,8 +13,6 @@
  * Field Value Part
  *
  *
- * @category   Zend
- * @package    Zend\Http\Header
  * @see        http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
  */
 class EncodingFieldValuePart extends AbstractFieldValuePart
diff --git a/src/Header/Accept/FieldValuePart/LanguageFieldValuePart.php b/src/Header/Accept/FieldValuePart/LanguageFieldValuePart.php
index c857563dc..832c1e00b 100644
--- a/src/Header/Accept/FieldValuePart/LanguageFieldValuePart.php
+++ b/src/Header/Accept/FieldValuePart/LanguageFieldValuePart.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_Http
  */
 
 namespace Zend\Http\Header\Accept\FieldValuePart;
@@ -14,8 +13,6 @@
  * Field Value Part
  *
  *
- * @category   Zend
- * @package    Zend\Http\Header
  * @see        http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
  */
 class LanguageFieldValuePart extends AbstractFieldValuePart
diff --git a/src/Header/AcceptCharset.php b/src/Header/AcceptCharset.php
index 8a54aae21..1b7755d19 100644
--- a/src/Header/AcceptCharset.php
+++ b/src/Header/AcceptCharset.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_Http
  */
 
 namespace Zend\Http\Header;
@@ -14,8 +13,6 @@
 /**
  * Accept Charset Header
  *
- * @category   Zend
- * @package    Zend\Http\Header
  * @see        http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.2
  */
 class AcceptCharset extends AbstractAccept
diff --git a/src/Header/AcceptEncoding.php b/src/Header/AcceptEncoding.php
index 9fe38ae77..b05733da7 100644
--- a/src/Header/AcceptEncoding.php
+++ b/src/Header/AcceptEncoding.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_Http
  */
 
 namespace Zend\Http\Header;
@@ -14,8 +13,6 @@
 /**
  * Accept Encoding Header
  *
- * @category   Zend
- * @package    Zend\Http\Header
  * @see        http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.3
  */
 class AcceptEncoding extends AbstractAccept
diff --git a/src/Header/AcceptLanguage.php b/src/Header/AcceptLanguage.php
index fd5509165..11d5a4430 100644
--- a/src/Header/AcceptLanguage.php
+++ b/src/Header/AcceptLanguage.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_Http
  */
 
 namespace Zend\Http\Header;
@@ -15,8 +14,6 @@
 /**
  * Accept Language Header
  *
- * @category   Zend
- * @package    Zend\Http\Header
  * @see        http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4
  */
 class AcceptLanguage extends AbstractAccept
diff --git a/src/Header/AcceptRanges.php b/src/Header/AcceptRanges.php
index 54ded133f..c0743ce8c 100644
--- a/src/Header/AcceptRanges.php
+++ b/src/Header/AcceptRanges.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_Http
  */
 
 namespace Zend\Http\Header;
@@ -13,8 +12,6 @@
 /**
  * Accept Ranges Header
  *
- * @category   Zend
- * @package    Zend\Http\Header
  * @see        http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.5
  */
 class AcceptRanges implements HeaderInterface
diff --git a/src/Header/Age.php b/src/Header/Age.php
index 89d63f4e7..123ef7bd1 100644
--- a/src/Header/Age.php
+++ b/src/Header/Age.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_Http
  */
 
 namespace Zend\Http\Header;
@@ -13,9 +12,6 @@
 /**
  * Age HTTP Header
  *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Headers
  * @link       http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.6
  */
 class Age implements HeaderInterface
diff --git a/src/Header/Allow.php b/src/Header/Allow.php
index 16a0914c9..c2418a1d0 100644
--- a/src/Header/Allow.php
+++ b/src/Header/Allow.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_Http
  */
 
 namespace Zend\Http\Header;
@@ -15,9 +14,6 @@
 /**
  * Allow Header
  *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Headers
  * @link       http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.7
  */
 class Allow implements HeaderInterface
diff --git a/src/Header/AuthenticationInfo.php b/src/Header/AuthenticationInfo.php
index 269f21f46..30bf3a566 100644
--- a/src/Header/AuthenticationInfo.php
+++ b/src/Header/AuthenticationInfo.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/Authorization.php b/src/Header/Authorization.php
index be9152fda..417b6b4c3 100644
--- a/src/Header/Authorization.php
+++ b/src/Header/Authorization.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/CacheControl.php b/src/Header/CacheControl.php
index 86a36b8ab..b9c61fc61 100644
--- a/src/Header/CacheControl.php
+++ b/src/Header/CacheControl.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/Connection.php b/src/Header/Connection.php
index ae1247e6e..208c50e34 100644
--- a/src/Header/Connection.php
+++ b/src/Header/Connection.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_Http
  */
 
 namespace Zend\Http\Header;
@@ -13,9 +12,6 @@
 /**
  * Connection Header
  *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Headers
  * @link       http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.10
  */
 class Connection implements HeaderInterface
diff --git a/src/Header/ContentDisposition.php b/src/Header/ContentDisposition.php
index 67691806e..722c847cb 100644
--- a/src/Header/ContentDisposition.php
+++ b/src/Header/ContentDisposition.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/ContentEncoding.php b/src/Header/ContentEncoding.php
index 2ec7a609a..aef8e49b8 100644
--- a/src/Header/ContentEncoding.php
+++ b/src/Header/ContentEncoding.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/ContentLanguage.php b/src/Header/ContentLanguage.php
index 81760dc28..19f24c9dc 100644
--- a/src/Header/ContentLanguage.php
+++ b/src/Header/ContentLanguage.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/ContentLength.php b/src/Header/ContentLength.php
index 0a9076921..c5879a7c8 100644
--- a/src/Header/ContentLength.php
+++ b/src/Header/ContentLength.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/ContentLocation.php b/src/Header/ContentLocation.php
index ab146755d..bf21fc763 100644
--- a/src/Header/ContentLocation.php
+++ b/src/Header/ContentLocation.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_Http
  */
 
 namespace Zend\Http\Header;
@@ -13,9 +12,6 @@
 /**
  * Content-Location Header
  *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Headers
  * @link       http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.14
  */
 class ContentLocation extends AbstractLocation
diff --git a/src/Header/ContentMD5.php b/src/Header/ContentMD5.php
index 33880db3a..bc73d7dd6 100644
--- a/src/Header/ContentMD5.php
+++ b/src/Header/ContentMD5.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/ContentRange.php b/src/Header/ContentRange.php
index 519ee1f08..c990df0d4 100644
--- a/src/Header/ContentRange.php
+++ b/src/Header/ContentRange.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/ContentTransferEncoding.php b/src/Header/ContentTransferEncoding.php
index d52368685..43dfe9c99 100644
--- a/src/Header/ContentTransferEncoding.php
+++ b/src/Header/ContentTransferEncoding.php
@@ -5,7 +5,6 @@
  * @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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/ContentType.php b/src/Header/ContentType.php
index 8176789d4..eb8444302 100644
--- a/src/Header/ContentType.php
+++ b/src/Header/ContentType.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/Cookie.php b/src/Header/Cookie.php
index e6f8fa385..abaea0076 100644
--- a/src/Header/Cookie.php
+++ b/src/Header/Cookie.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/Date.php b/src/Header/Date.php
index 4733fe3d4..daaf0c632 100644
--- a/src/Header/Date.php
+++ b/src/Header/Date.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_Http
  */
 
 namespace Zend\Http\Header;
@@ -13,9 +12,6 @@
 /**
  * Date Header
  *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Headers
  * @link       http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.18
  */
 class Date extends AbstractDate
diff --git a/src/Header/Etag.php b/src/Header/Etag.php
index 8a2252125..f9c4e9a3d 100644
--- a/src/Header/Etag.php
+++ b/src/Header/Etag.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/Exception/ExceptionInterface.php b/src/Header/Exception/ExceptionInterface.php
index 992eee03d..dcfc83e2b 100644
--- a/src/Header/Exception/ExceptionInterface.php
+++ b/src/Header/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_Http
  */
 
 namespace Zend\Http\Header\Exception;
diff --git a/src/Header/Exception/InvalidArgumentException.php b/src/Header/Exception/InvalidArgumentException.php
index 0a0ff67ac..ca7e8aad7 100644
--- a/src/Header/Exception/InvalidArgumentException.php
+++ b/src/Header/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_Http
  */
 
 namespace Zend\Http\Header\Exception;
diff --git a/src/Header/Exception/RuntimeException.php b/src/Header/Exception/RuntimeException.php
index 2c77c79bd..7e0c5b5e4 100644
--- a/src/Header/Exception/RuntimeException.php
+++ b/src/Header/Exception/RuntimeException.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_Http
  */
 
 namespace Zend\Http\Header\Exception;
diff --git a/src/Header/Expect.php b/src/Header/Expect.php
index b6072a1f8..bd8fed7fb 100644
--- a/src/Header/Expect.php
+++ b/src/Header/Expect.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/Expires.php b/src/Header/Expires.php
index 648a92356..70e52a324 100644
--- a/src/Header/Expires.php
+++ b/src/Header/Expires.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_Http
  */
 
 namespace Zend\Http\Header;
@@ -13,9 +12,6 @@
 /**
  * Expires Header
  *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Headers
  * @link       http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.21
  */
 class Expires extends AbstractDate
diff --git a/src/Header/From.php b/src/Header/From.php
index e7606c51c..a0d284c7b 100644
--- a/src/Header/From.php
+++ b/src/Header/From.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/GenericHeader.php b/src/Header/GenericHeader.php
index e2855be64..848f84a81 100644
--- a/src/Header/GenericHeader.php
+++ b/src/Header/GenericHeader.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_Http
  */
 
 namespace Zend\Http\Header;
@@ -13,9 +12,6 @@
 /**
  * Content-Location Header
  *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Headers
   */
 class GenericHeader implements HeaderInterface
 {
diff --git a/src/Header/GenericMultiHeader.php b/src/Header/GenericMultiHeader.php
index 94bc75cbf..91b0b67cc 100644
--- a/src/Header/GenericMultiHeader.php
+++ b/src/Header/GenericMultiHeader.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/HeaderInterface.php b/src/Header/HeaderInterface.php
index 07c7c5ba4..cde5cb1b0 100644
--- a/src/Header/HeaderInterface.php
+++ b/src/Header/HeaderInterface.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/Host.php b/src/Header/Host.php
index 5bbd8d9d0..b6fe876e0 100644
--- a/src/Header/Host.php
+++ b/src/Header/Host.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/IfMatch.php b/src/Header/IfMatch.php
index 785fc7eb7..265acc018 100644
--- a/src/Header/IfMatch.php
+++ b/src/Header/IfMatch.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/IfModifiedSince.php b/src/Header/IfModifiedSince.php
index d8d36600d..23690ae5c 100644
--- a/src/Header/IfModifiedSince.php
+++ b/src/Header/IfModifiedSince.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_Http
  */
 
 namespace Zend\Http\Header;
@@ -13,9 +12,6 @@
 /**
  * If-Modified-Since Header
  *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Headers
  * @link       http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.25
  */
 class IfModifiedSince extends AbstractDate
diff --git a/src/Header/IfNoneMatch.php b/src/Header/IfNoneMatch.php
index 16047bedd..71d31dc01 100644
--- a/src/Header/IfNoneMatch.php
+++ b/src/Header/IfNoneMatch.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/IfRange.php b/src/Header/IfRange.php
index 39e3d144f..ea6986ebd 100644
--- a/src/Header/IfRange.php
+++ b/src/Header/IfRange.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/IfUnmodifiedSince.php b/src/Header/IfUnmodifiedSince.php
index 4365b0a52..237cb9fa7 100644
--- a/src/Header/IfUnmodifiedSince.php
+++ b/src/Header/IfUnmodifiedSince.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_Http
  */
 
 namespace Zend\Http\Header;
@@ -13,9 +12,6 @@
 /**
  * If-Unmodified-Since Header
  *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Headers
  * @link       http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.28
  */
 class IfUnmodifiedSince extends AbstractDate
diff --git a/src/Header/KeepAlive.php b/src/Header/KeepAlive.php
index ecb2d9361..ec67a0cdb 100644
--- a/src/Header/KeepAlive.php
+++ b/src/Header/KeepAlive.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/LastModified.php b/src/Header/LastModified.php
index 0d0fb71dd..797164e6b 100644
--- a/src/Header/LastModified.php
+++ b/src/Header/LastModified.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_Http
  */
 
 namespace Zend\Http\Header;
@@ -13,9 +12,6 @@
 /**
  * Last-Modified Header
  *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Headers
  * @link       http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.29
  */
 class LastModified extends AbstractDate
diff --git a/src/Header/Location.php b/src/Header/Location.php
index 2018f9066..299b67b1e 100644
--- a/src/Header/Location.php
+++ b/src/Header/Location.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_Http
  */
 
 namespace Zend\Http\Header;
@@ -14,9 +13,6 @@
 /**
  * Location Header
  *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Headers
  * @link       http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.30
  */
 class Location extends AbstractLocation
diff --git a/src/Header/MaxForwards.php b/src/Header/MaxForwards.php
index f4b1baa8b..ba32ae156 100644
--- a/src/Header/MaxForwards.php
+++ b/src/Header/MaxForwards.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/MultipleHeaderInterface.php b/src/Header/MultipleHeaderInterface.php
index f0987fb2e..3a14c9083 100644
--- a/src/Header/MultipleHeaderInterface.php
+++ b/src/Header/MultipleHeaderInterface.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/Pragma.php b/src/Header/Pragma.php
index a0b90d794..77a811f25 100644
--- a/src/Header/Pragma.php
+++ b/src/Header/Pragma.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/ProxyAuthenticate.php b/src/Header/ProxyAuthenticate.php
index db508faf3..6399e8436 100644
--- a/src/Header/ProxyAuthenticate.php
+++ b/src/Header/ProxyAuthenticate.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/ProxyAuthorization.php b/src/Header/ProxyAuthorization.php
index 2a21198a3..2f66603b2 100644
--- a/src/Header/ProxyAuthorization.php
+++ b/src/Header/ProxyAuthorization.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/Range.php b/src/Header/Range.php
index 41832bccc..7cccdfe16 100644
--- a/src/Header/Range.php
+++ b/src/Header/Range.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/Referer.php b/src/Header/Referer.php
index 5b44c68a6..586074e89 100644
--- a/src/Header/Referer.php
+++ b/src/Header/Referer.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_Http
  */
 
 namespace Zend\Http\Header;
@@ -15,9 +14,6 @@
 /**
  * Content-Location Header
  *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Headers
  * @link       http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.36
  */
 class Referer extends AbstractLocation
diff --git a/src/Header/Refresh.php b/src/Header/Refresh.php
index d487aad32..dad263235 100644
--- a/src/Header/Refresh.php
+++ b/src/Header/Refresh.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/RetryAfter.php b/src/Header/RetryAfter.php
index a6729bb9e..71e3cef2f 100644
--- a/src/Header/RetryAfter.php
+++ b/src/Header/RetryAfter.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_Http
  */
 
 namespace Zend\Http\Header;
@@ -13,9 +12,6 @@
 /**
  * Retry-After HTTP Header
  *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Headers
  * @link       http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.37
  */
 class RetryAfter extends AbstractDate
diff --git a/src/Header/Server.php b/src/Header/Server.php
index 3d9bad757..260ac286f 100644
--- a/src/Header/Server.php
+++ b/src/Header/Server.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/SetCookie.php b/src/Header/SetCookie.php
index 0161e776f..fde66b9b5 100644
--- a/src/Header/SetCookie.php
+++ b/src/Header/SetCookie.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/TE.php b/src/Header/TE.php
index dde162f8a..f6358039b 100644
--- a/src/Header/TE.php
+++ b/src/Header/TE.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/Trailer.php b/src/Header/Trailer.php
index 5418bc6a3..24e2527a8 100644
--- a/src/Header/Trailer.php
+++ b/src/Header/Trailer.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/TransferEncoding.php b/src/Header/TransferEncoding.php
index e408a76b4..6378ced72 100644
--- a/src/Header/TransferEncoding.php
+++ b/src/Header/TransferEncoding.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/Upgrade.php b/src/Header/Upgrade.php
index 6898f707f..894c9dc10 100644
--- a/src/Header/Upgrade.php
+++ b/src/Header/Upgrade.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/UserAgent.php b/src/Header/UserAgent.php
index c19730a82..962e4aa9f 100644
--- a/src/Header/UserAgent.php
+++ b/src/Header/UserAgent.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/Vary.php b/src/Header/Vary.php
index aff7dd928..55a6008e0 100644
--- a/src/Header/Vary.php
+++ b/src/Header/Vary.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/Via.php b/src/Header/Via.php
index 5d82bd500..12ed85c7a 100644
--- a/src/Header/Via.php
+++ b/src/Header/Via.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/WWWAuthenticate.php b/src/Header/WWWAuthenticate.php
index 4c2c3355b..bf3f99ede 100644
--- a/src/Header/WWWAuthenticate.php
+++ b/src/Header/WWWAuthenticate.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/Header/Warning.php b/src/Header/Warning.php
index d0194df4a..5d60c27c7 100644
--- a/src/Header/Warning.php
+++ b/src/Header/Warning.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_Http
  */
 
 namespace Zend\Http\Header;
diff --git a/src/HeaderLoader.php b/src/HeaderLoader.php
index f10ae0a77..036fdbb15 100644
--- a/src/HeaderLoader.php
+++ b/src/HeaderLoader.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_Http
  */
 
 namespace Zend\Http;
@@ -14,9 +13,6 @@
 
 /**
  * Plugin Class Loader implementation for HTTP headers
- *
- * @category   Zend
- * @package    Zend_Http
  */
 class HeaderLoader extends PluginClassLoader
 {
diff --git a/src/Headers.php b/src/Headers.php
index 0bf760921..6263ac571 100644
--- a/src/Headers.php
+++ b/src/Headers.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_Http
  */
 
 namespace Zend\Http;
@@ -21,8 +20,6 @@
  * Basic HTTP headers collection functionality
  * Handles aggregation of headers
  *
- * @category   Zend
- * @package    Zend_Http
  * @see        http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2
  */
 class Headers implements Countable, Iterator
diff --git a/src/PhpEnvironment/RemoteAddress.php b/src/PhpEnvironment/RemoteAddress.php
index 4fdaf93b6..b714d46df 100644
--- a/src/PhpEnvironment/RemoteAddress.php
+++ b/src/PhpEnvironment/RemoteAddress.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_Http
  */
 
 namespace Zend\Http\PhpEnvironment;
 
 /**
  * Functionality for determining client IP address.
- *
- * @category   Zend
- * @package    Zend_Http
  */
 class RemoteAddress
 {
diff --git a/src/PhpEnvironment/Request.php b/src/PhpEnvironment/Request.php
index eaa33809b..38ee9a63c 100644
--- a/src/PhpEnvironment/Request.php
+++ b/src/PhpEnvironment/Request.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_Http
  */
 
 namespace Zend\Http\PhpEnvironment;
@@ -18,9 +17,6 @@
 
 /**
  * HTTP Request for current PHP environment
- *
- * @category   Zend
- * @package    Zend_Http
  */
 class Request extends HttpRequest
 {
diff --git a/src/PhpEnvironment/Response.php b/src/PhpEnvironment/Response.php
index df672a643..3a968ee1f 100644
--- a/src/PhpEnvironment/Response.php
+++ b/src/PhpEnvironment/Response.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_Http
  */
 
 namespace Zend\Http\PhpEnvironment;
@@ -15,9 +14,6 @@
 
 /**
  * HTTP Response for current PHP environment
- *
- * @category   Zend
- * @package    Zend_Http
  */
 class Response extends HttpResponse
 {
diff --git a/src/Request.php b/src/Request.php
index e92c4419f..df568f104 100644
--- a/src/Request.php
+++ b/src/Request.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_Http
  */
 
 namespace Zend\Http;
@@ -19,8 +18,6 @@
 /**
  * HTTP Request
  *
- * @category  Zend
- * @package   Zend_Http
  * @link      http://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html#sec5
  */
 class Request extends AbstractMessage implements RequestInterface
diff --git a/src/Response.php b/src/Response.php
index 6a703ecdf..59716b435 100644
--- a/src/Response.php
+++ b/src/Response.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_Http
  */
 
 namespace Zend\Http;
@@ -16,8 +15,6 @@
 /**
  * HTTP Response
  *
- * @category  Zend
- * @package   Zend_Http
  * @link      http://www.w3.org/Protocols/rfc2616/rfc2616-sec6.html#sec6
  */
 class Response extends AbstractMessage implements ResponseInterface
diff --git a/src/Response/Stream.php b/src/Response/Stream.php
index 4914d2424..990cadb22 100644
--- a/src/Response/Stream.php
+++ b/src/Response/Stream.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_Http
  */
 
 namespace Zend\Http\Response;
@@ -16,9 +15,6 @@
 
 /**
  * Represents an HTTP response message as PHP stream resource
- *
- * @package    Zend_Http
- * @subpackage Response
  */
 class Stream extends Response
 {