diff --git a/src/Adapter.php b/src/Adapter.php
index 120f18e..8a77d8b 100644
--- a/src/Adapter.php
+++ b/src/Adapter.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator;
       use \Countable;
 
diff --git a/src/Adapter/ArrayAdapter.php b/src/Adapter/ArrayAdapter.php
index b74bee0..ad06524 100644
--- a/src/Adapter/ArrayAdapter.php
+++ b/src/Adapter/ArrayAdapter.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\Adapter;
       use Zend\Paginator\Adapter;
 
diff --git a/src/Adapter/DbSelect.php b/src/Adapter/DbSelect.php
index b6cc71a..3736b61 100644
--- a/src/Adapter/DbSelect.php
+++ b/src/Adapter/DbSelect.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\Adapter;
 
 use Zend\Db\Select,
diff --git a/src/Adapter/DbTableSelect.php b/src/Adapter/DbTableSelect.php
index 63dfd6c..cb5f4a2 100644
--- a/src/Adapter/DbTableSelect.php
+++ b/src/Adapter/DbTableSelect.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\Adapter;
 
 /**
diff --git a/src/Adapter/Exception.php b/src/Adapter/Exception.php
index 6016837..472f568 100644
--- a/src/Adapter/Exception.php
+++ b/src/Adapter/Exception.php
@@ -20,9 +20,6 @@
  * @version    $Id$
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\Adapter;
 
 /**
diff --git a/src/Adapter/Exception/InvalidArgumentException.php b/src/Adapter/Exception/InvalidArgumentException.php
index 6785997..7b91d86 100644
--- a/src/Adapter/Exception/InvalidArgumentException.php
+++ b/src/Adapter/Exception/InvalidArgumentException.php
@@ -20,9 +20,6 @@
  * @version    $Id$
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\Adapter\Exception;
 
 /**
diff --git a/src/Adapter/Exception/RuntimeException.php b/src/Adapter/Exception/RuntimeException.php
index b191c57..03a81c4 100644
--- a/src/Adapter/Exception/RuntimeException.php
+++ b/src/Adapter/Exception/RuntimeException.php
@@ -20,9 +20,6 @@
  * @version    $Id$
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\Adapter\Exception;
 
 /**
diff --git a/src/Adapter/Exception/UnexpectedValueException.php b/src/Adapter/Exception/UnexpectedValueException.php
index 6b3f0ed..f1f0fdf 100644
--- a/src/Adapter/Exception/UnexpectedValueException.php
+++ b/src/Adapter/Exception/UnexpectedValueException.php
@@ -20,9 +20,6 @@
  * @version    $Id$
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\Adapter\Exception;
 
 /**
diff --git a/src/Adapter/Iterator.php b/src/Adapter/Iterator.php
index 4b45393..2eb01c8 100644
--- a/src/Adapter/Iterator.php
+++ b/src/Adapter/Iterator.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\Adapter;
 
 use Zend\Paginator\Adapter;
diff --git a/src/Adapter/Null.php b/src/Adapter/Null.php
index ebbedf3..4cf2c7a 100644
--- a/src/Adapter/Null.php
+++ b/src/Adapter/Null.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\Adapter;
 
 use Zend\Paginator\Adapter;
diff --git a/src/AdapterAggregate.php b/src/AdapterAggregate.php
index e8f2bf8..732d751 100644
--- a/src/AdapterAggregate.php
+++ b/src/AdapterAggregate.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator;
 
 /**
diff --git a/src/Exception.php b/src/Exception.php
index 9390b07..952dcc3 100644
--- a/src/Exception.php
+++ b/src/Exception.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator;
 
 /**
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index 795f14a..2e3b6bc 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -20,9 +20,6 @@
  * @version    $Id$
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\Exception;
 
 /**
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
index aba2858..abeb055 100644
--- a/src/Exception/RuntimeException.php
+++ b/src/Exception/RuntimeException.php
@@ -20,9 +20,6 @@
  * @version    $Id$
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\Exception;
 
 /**
diff --git a/src/Paginator.php b/src/Paginator.php
index bac95f4..a7ec77f 100644
--- a/src/Paginator.php
+++ b/src/Paginator.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator;
 
 use ArrayIterator,
diff --git a/src/ScrollingStyle.php b/src/ScrollingStyle.php
index 03a0fa3..88dc25e 100644
--- a/src/ScrollingStyle.php
+++ b/src/ScrollingStyle.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator;
 
 /**
diff --git a/src/ScrollingStyle/All.php b/src/ScrollingStyle/All.php
index 9dc2e21..ff55e93 100644
--- a/src/ScrollingStyle/All.php
+++ b/src/ScrollingStyle/All.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\ScrollingStyle;
 
 use Zend\Paginator\ScrollingStyle;
diff --git a/src/ScrollingStyle/Elastic.php b/src/ScrollingStyle/Elastic.php
index e13532e..1ca781a 100644
--- a/src/ScrollingStyle/Elastic.php
+++ b/src/ScrollingStyle/Elastic.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\ScrollingStyle;
 
 /**
diff --git a/src/ScrollingStyle/Jumping.php b/src/ScrollingStyle/Jumping.php
index 0b6eab3..96ab4c6 100644
--- a/src/ScrollingStyle/Jumping.php
+++ b/src/ScrollingStyle/Jumping.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\ScrollingStyle;
 
 use Zend\Paginator\ScrollingStyle;
diff --git a/src/ScrollingStyle/Sliding.php b/src/ScrollingStyle/Sliding.php
index 2e6c606..1cc303b 100644
--- a/src/ScrollingStyle/Sliding.php
+++ b/src/ScrollingStyle/Sliding.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\ScrollingStyle;
 
 use Zend\Paginator\ScrollingStyle;
diff --git a/src/SerializableLimitIterator.php b/src/SerializableLimitIterator.php
index 5d97262..1383cfd 100644
--- a/src/SerializableLimitIterator.php
+++ b/src/SerializableLimitIterator.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator;
 
 /**
diff --git a/test/Adapter/ArrayTest.php b/test/Adapter/ArrayTest.php
index 4918f46..f415685 100644
--- a/test/Adapter/ArrayTest.php
+++ b/test/Adapter/ArrayTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\Adapter;
 use Zend\Paginator\Adapter;
 
diff --git a/test/Adapter/DbSelect/OracleTest.php b/test/Adapter/DbSelect/OracleTest.php
index f850eab..977bd21 100644
--- a/test/Adapter/DbSelect/OracleTest.php
+++ b/test/Adapter/DbSelect/OracleTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\Adapter\DbSelect;
 
 use Zend\Paginator\Adapter,
diff --git a/test/Adapter/DbSelectTest.php b/test/Adapter/DbSelectTest.php
index 594b93c..2161862 100644
--- a/test/Adapter/DbSelectTest.php
+++ b/test/Adapter/DbSelectTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\Adapter;
 use Zend\Db\Adapter\Pdo;
 use Zend\Paginator\Adapter;
diff --git a/test/Adapter/DbTableSelect/OracleTest.php b/test/Adapter/DbTableSelect/OracleTest.php
index 1ad1199..2ae8059 100644
--- a/test/Adapter/DbTableSelect/OracleTest.php
+++ b/test/Adapter/DbTableSelect/OracleTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\Adapter\DbTableSelect;
 
 
diff --git a/test/Adapter/DbTableSelectTest.php b/test/Adapter/DbTableSelectTest.php
index 05f582b..c90cd19 100644
--- a/test/Adapter/DbTableSelectTest.php
+++ b/test/Adapter/DbTableSelectTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\Adapter;
 use Zend\Paginator\Adapter;
 
diff --git a/test/Adapter/IteratorTest.php b/test/Adapter/IteratorTest.php
index fc1638a..e58a737 100644
--- a/test/Adapter/IteratorTest.php
+++ b/test/Adapter/IteratorTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\Adapter;
 use Zend\Paginator\Adapter;
 use Zend\Paginator\Exception;
diff --git a/test/Adapter/NullTest.php b/test/Adapter/NullTest.php
index 5e292ef..c5070bd 100644
--- a/test/Adapter/NullTest.php
+++ b/test/Adapter/NullTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\Adapter;
 use Zend\Paginator\Adapter;
 use Zend\Paginator;
diff --git a/test/PaginatorTest.php b/test/PaginatorTest.php
index 4a6a0e7..26cfeec 100644
--- a/test/PaginatorTest.php
+++ b/test/PaginatorTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator;
 
 use PHPUnit_Framework_TestCase as TestCase,
diff --git a/test/ScrollingStyle/AllTest.php b/test/ScrollingStyle/AllTest.php
index 3a1fad0..24efd0f 100644
--- a/test/ScrollingStyle/AllTest.php
+++ b/test/ScrollingStyle/AllTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\ScrollingStyle;
 
 /**
diff --git a/test/ScrollingStyle/ElasticTest.php b/test/ScrollingStyle/ElasticTest.php
index b688b67..4b41a05 100644
--- a/test/ScrollingStyle/ElasticTest.php
+++ b/test/ScrollingStyle/ElasticTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\ScrollingStyle;
 
 /**
diff --git a/test/ScrollingStyle/JumpingTest.php b/test/ScrollingStyle/JumpingTest.php
index fbd9b35..54abffe 100644
--- a/test/ScrollingStyle/JumpingTest.php
+++ b/test/ScrollingStyle/JumpingTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\ScrollingStyle;
 
 /**
diff --git a/test/ScrollingStyle/SlidingTest.php b/test/ScrollingStyle/SlidingTest.php
index d3f76d3..6d2cea3 100644
--- a/test/ScrollingStyle/SlidingTest.php
+++ b/test/ScrollingStyle/SlidingTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\ScrollingStyle;
 
 
diff --git a/test/TestAsset/AdapterBroker.php b/test/TestAsset/AdapterBroker.php
index e32edf9..1888a8f 100644
--- a/test/TestAsset/AdapterBroker.php
+++ b/test/TestAsset/AdapterBroker.php
@@ -20,9 +20,6 @@
  * @version    $Id$
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\TestAsset;
 
 use Zend\Paginator\AdapterBroker as BaseAdapterBroker;
diff --git a/test/TestAsset/ScrollingStyleBroker.php b/test/TestAsset/ScrollingStyleBroker.php
index f15176c..a4add27 100644
--- a/test/TestAsset/ScrollingStyleBroker.php
+++ b/test/TestAsset/ScrollingStyleBroker.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\TestAsset;
 
 use Zend\Paginator\ScrollingStyleBroker as BaseScrollingStyleBroker;
diff --git a/test/TestAsset/TestAdapter.php b/test/TestAsset/TestAdapter.php
index 6e0a611..955ba5a 100644
--- a/test/TestAsset/TestAdapter.php
+++ b/test/TestAsset/TestAdapter.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\TestAsset;
 
 /**
diff --git a/test/_files/TestTable.php b/test/_files/TestTable.php
index a5906c3..d29c232 100644
--- a/test/_files/TestTable.php
+++ b/test/_files/TestTable.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\_files;
 
 /**