diff --git a/src/Adapter.php b/src/Adapter.php
deleted file mode 100644
index 120f18e..0000000
--- a/src/Adapter.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @namespace
- */
-namespace Zend\Paginator;
-      use \Countable;
-
-/**
- * Interface for pagination adapters.
- *
- * @uses       Countable
- * @category   Zend
- * @package    Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Adapter extends Countable
-{
-    /**
-     * Returns an collection of items for a page.
-     *
-     * @param  integer $offset Page offset
-     * @param  integer $itemCountPerPage Number of items per page
-     * @return array
-     */
-    public function getItems($offset, $itemCountPerPage);
-}
diff --git a/src/Adapter/AdapterInterface.php b/src/Adapter/AdapterInterface.php
new file mode 100644
index 0000000..474bfb7
--- /dev/null
+++ b/src/Adapter/AdapterInterface.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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_Paginator
+ */
+
+namespace Zend\Paginator\Adapter;
+
+use Countable;
+
+/**
+ * Interface for pagination adapters.
+ *
+ * @category   Zend
+ * @package    Paginator
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface AdapterInterface extends Countable
+{
+    /**
+     * Returns an collection of items for a page.
+     *
+     * @param  integer $offset Page offset
+     * @param  integer $itemCountPerPage Number of items per page
+     * @return array
+     */
+    public function getItems($offset, $itemCountPerPage);
+}
diff --git a/src/Adapter/ArrayAdapter.php b/src/Adapter/ArrayAdapter.php
index b74bee0..d2cdeba 100644
--- a/src/Adapter/ArrayAdapter.php
+++ b/src/Adapter/ArrayAdapter.php
@@ -1,37 +1,22 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @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_Paginator
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\Adapter;
-      use Zend\Paginator\Adapter;
 
 /**
- * @uses       \Zend\Paginator\Adapter
  * @category   Zend
  * @package    Paginator
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class ArrayAdapter implements Adapter
+class ArrayAdapter implements AdapterInterface
 {
     /**
      * ArrayAdapter
diff --git a/src/Adapter/DbSelect.php b/src/Adapter/DbSelect.php
index b6cc71a..f079892 100644
--- a/src/Adapter/DbSelect.php
+++ b/src/Adapter/DbSelect.php
@@ -1,45 +1,24 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @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_Paginator
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\Adapter;
 
-use Zend\Db\Select,
-    Zend\Db,
-    Zend\Paginator\Adapter,
-    Zend\Paginator\Adapter\Exception;
+use Zend\Db\Sql;
 
 /**
- * @uses       \Zend\Db\Db
- * @uses       \Zend\Db\Expr
- * @uses       \Zend\Db\Select
- * @uses       \Zend\Paginator\Adapter
- * @uses       Zend\Paginator\Adapter\Exception
  * @category   Zend
  * @package    Zend_Paginator
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class DbSelect implements Adapter
+class DbSelect implements AdapterInterface
 {
     /**
      * Name of the row count column
@@ -51,14 +30,14 @@ class DbSelect implements Adapter
     /**
      * The COUNT query
      *
-     * @var \Zend\Db\Select
+     * @var \Zend\Db\Sql\Select
      */
     protected $_countSelect = null;
 
     /**
      * Database query
      *
-     * @var \Zend\Db\Select
+     * @var \Zend\Db\Sql\Select
      */
     protected $_select = null;
 
@@ -72,9 +51,9 @@ class DbSelect implements Adapter
     /**
      * Constructor.
      *
-     * @param \Zend\Db\Select $select The select query
+     * @param \Zend\Db\Sql\Select $select The select query
      */
-    public function __construct(Select $select)
+    public function __construct(Sql\Select $select)
     {
         $this->_select = $select;
     }
@@ -89,19 +68,19 @@ public function __construct(Select $select)
      * Users are therefore encouraged to profile their queries to find
      * the solution that best meets their needs.
      *
-     * @param  \Zend\Db\Select|integer $totalRowCount Total row count integer
+     * @param  \Zend\Db\Sql\Select|integer $rowCount Total row count integer
      *                                               or query
-     * @return \Zend\Paginator\Adapter\DbSelect $this
-     * @throws \Zend\Paginator\Adapter\Exception
+     * @throws Exception\InvalidArgumentException
+     * @return DbSelect
      */
     public function setRowCount($rowCount)
     {
-        if ($rowCount instanceof Select) {
-            $columns = $rowCount->getPart(Select::COLUMNS);
+        if ($rowCount instanceof Sql\Select) {
+            $columns = $rowCount->getPart(Sql\Select::COLUMNS);
 
             $countColumnPart = $columns[0][1];
 
-            if ($countColumnPart instanceof Db\Expr) {
+            if ($countColumnPart instanceof Sql\ExpressionInterface) {
                 $countColumnPart = $countColumnPart->__toString();
             }
 
@@ -127,7 +106,7 @@ public function setRowCount($rowCount)
     /**
      * Returns an array of items for a page.
      *
-     * @param  integer $offset Page offset
+     * @param  integer $offset           Page offset
      * @param  integer $itemCountPerPage Number of items per page
      * @return array
      */
@@ -161,7 +140,7 @@ public function count()
      * In that use-case I'm expecting problems when either GROUP BY or DISTINCT
      * has one column.
      *
-     * @return \Zend\Db\Select
+     * @return \Zend\Db\Sql\Select
      */
     public function getCountSelect()
     {
@@ -181,23 +160,23 @@ public function getCountSelect()
         $countColumn = $db->quoteIdentifier($db->foldCase(self::ROW_COUNT_COLUMN));
         $countPart   = 'COUNT(1) AS ';
         $groupPart   = null;
-        $unionParts  = $rowCount->getPart(Select::UNION);
+        $unionParts  = $rowCount->getPart(Sql\Select::UNION);
 
         /**
          * If we're dealing with a UNION query, execute the UNION as a subquery
          * to the COUNT query.
          */
         if (!empty($unionParts)) {
-            $expression = new Db\Expr($countPart . $countColumn);
-            $rowCount = $db
-                            ->select()
-                            ->bind($rowCount->getBind())
-                            ->from($rowCount, $expression);
+            $expression = new Sql\Expression($countPart . $countColumn);
+            $rowCount   = $db
+                ->select()
+                ->bind($rowCount->getBind())
+                ->from($rowCount, $expression);
         } else {
-            $columnParts = $rowCount->getPart(Select::COLUMNS);
-            $groupParts  = $rowCount->getPart(Select::GROUP);
-            $havingParts = $rowCount->getPart(Select::HAVING);
-            $isDistinct  = $rowCount->getPart(Select::DISTINCT);
+            $columnParts = $rowCount->getPart(Sql\Select::COLUMNS);
+            $groupParts  = $rowCount->getPart(Sql\Select::GROUP);
+            $havingParts = $rowCount->getPart(Sql\Select::HAVING);
+            $isDistinct  = $rowCount->getPart(Sql\Select::DISTINCT);
 
             /**
              * If there is more than one column AND it's a DISTINCT query, more
@@ -209,7 +188,7 @@ public function getCountSelect()
             } else if ($isDistinct) {
                 $part = $columnParts[0];
 
-                if ($part[1] !== Select::SQL_WILDCARD && !($part[1] instanceof Db\Expr)) {
+                if ($part[1] !== Sql\Select::SQL_WILDCARD && !($part[1] instanceof Sql\ExpressionInterface)) {
                     $column = $db->quoteIdentifier($part[1], true);
 
                     if (!empty($part[0])) {
@@ -218,8 +197,9 @@ public function getCountSelect()
 
                     $groupPart = $column;
                 }
-            } else if (!empty($groupParts) && $groupParts[0] !== Select::SQL_WILDCARD &&
-                       !($groupParts[0] instanceof Db\Expr)) {
+            } else if (!empty($groupParts) && $groupParts[0] !== Sql\Select::SQL_WILDCARD &&
+                !($groupParts[0] instanceof Sql\ExpressionInterface)
+            ) {
                 $groupPart = $db->quoteIdentifier($groupParts[0], true);
             }
 
@@ -235,15 +215,15 @@ public function getCountSelect()
             /**
              * Create the COUNT part of the query
              */
-            $expression = new Db\Expr($countPart . $countColumn);
-
-            $rowCount->reset(Select::COLUMNS)
-                     ->reset(Select::ORDER)
-                     ->reset(Select::LIMIT_OFFSET)
-                     ->reset(Select::GROUP)
-                     ->reset(Select::DISTINCT)
-                     ->reset(Select::HAVING)
-                     ->columns($expression);
+            $expression = new Sql\Expression($countPart . $countColumn);
+
+            $rowCount->reset(Sql\Select::COLUMNS)
+                ->reset(Sql\Select::ORDER)
+                ->reset(Sql\Select::LIMIT_OFFSET)
+                ->reset(Sql\Select::GROUP)
+                ->reset(Sql\Select::DISTINCT)
+                ->reset(Sql\Select::HAVING)
+                ->columns($expression);
         }
 
         $this->_countSelect = $rowCount;
diff --git a/src/Adapter/DbTableSelect.php b/src/Adapter/DbTableSelect.php
index 63dfd6c..b85eabf 100644
--- a/src/Adapter/DbTableSelect.php
+++ b/src/Adapter/DbTableSelect.php
@@ -1,30 +1,16 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @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_Paginator
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\Adapter;
 
 /**
- * @uses       \Zend\Paginator\Adapter\DbSelect
  * @category   Zend
  * @package    Zend_Paginator
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
@@ -33,7 +19,7 @@
 class DbTableSelect extends DbSelect
 {
     /**
-     * Returns a Zend_Db_Table_Rowset_Abstract of items for a page.
+     * Returns a Zend\Db\Table\AbstractRowset of items for a page.
      *
      * @param  integer $offset Page offset
      * @param  integer $itemCountPerPage Number of items per page
diff --git a/src/Adapter/Exception.php b/src/Adapter/Exception.php
deleted file mode 100644
index 6016837..0000000
--- a/src/Adapter/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @namespace
- */
-namespace Zend\Paginator\Adapter;
-
-/**
- * @uses       Zend\Paginator\Exception
- * @category   Zend
- * @package    Zend_Paginator
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Exception extends \Zend\Paginator\Exception
-{}
diff --git a/src/Adapter/Exception/ExceptionInterface.php b/src/Adapter/Exception/ExceptionInterface.php
new file mode 100644
index 0000000..315be04
--- /dev/null
+++ b/src/Adapter/Exception/ExceptionInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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_Paginator
+ */
+
+namespace Zend\Paginator\Adapter\Exception;
+
+use Zend\Paginator\Exception\ExceptionInterface as Exception;
+
+/**
+ * @category   Zend
+ * @package    Zend_Paginator
+ * @subpackage Adapter
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface ExceptionInterface extends Exception
+{}
diff --git a/src/Adapter/Exception/InvalidArgumentException.php b/src/Adapter/Exception/InvalidArgumentException.php
index 6785997..990c66c 100644
--- a/src/Adapter/Exception/InvalidArgumentException.php
+++ b/src/Adapter/Exception/InvalidArgumentException.php
@@ -1,39 +1,24 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend\Paginator\Adapter
- * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @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_Paginator
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\Adapter\Exception;
 
+use Zend\Paginator\Exception;
+
 /**
- * @uses       Zend\Paginator\Adapter\Exception
  * @category   Zend
  * @package    Zend\Paginator\Adapter
  * @subpackage Exception
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class InvalidArgumentException
-    extends \Zend\Paginator\Exception\InvalidArgumentException
-    implements \Zend\Paginator\Adapter\Exception
+class InvalidArgumentException extends Exception\InvalidArgumentException implements 
+    ExceptionInterface
 {}
diff --git a/src/Adapter/Exception/RuntimeException.php b/src/Adapter/Exception/RuntimeException.php
index b191c57..fb5b6cc 100644
--- a/src/Adapter/Exception/RuntimeException.php
+++ b/src/Adapter/Exception/RuntimeException.php
@@ -1,39 +1,24 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend\Paginator\Adapter
- * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @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_Paginator
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\Adapter\Exception;
 
+use Zend\Paginator\Exception;
+
 /**
- * @uses       Zend\Paginator\Adapter\Exception
  * @category   Zend
  * @package    Zend\Paginator\Adapter
  * @subpackage Exception
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class RuntimeException
-    extends \Zend\Paginator\Exception\RuntimeException
-    implements \Zend\Paginator\Adapter\Exception
+class RuntimeException extends Exception\RuntimeException implements 
+    ExceptionInterface
 {}
diff --git a/src/Adapter/Exception/UnexpectedValueException.php b/src/Adapter/Exception/UnexpectedValueException.php
index 6b3f0ed..552245e 100644
--- a/src/Adapter/Exception/UnexpectedValueException.php
+++ b/src/Adapter/Exception/UnexpectedValueException.php
@@ -1,37 +1,24 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend\Paginator\Adapter
- * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @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_Paginator
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\Adapter\Exception;
 
+use Zend\Paginator\Exception;
+
 /**
- * @uses       Zend\Paginator\Adapter\Exception
  * @category   Zend
  * @package    Zend\Paginator\Adapter
  * @subpackage Exception
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class UnexpectedValueException extends \UnexpectedValueException implements \Zend\Paginator\Adapter\Exception
+class UnexpectedValueException extends Exception\UnexpectedValueException implements 
+    ExceptionInterface
 {}
diff --git a/src/Adapter/Iterator.php b/src/Adapter/Iterator.php
index 4b45393..4ce895b 100644
--- a/src/Adapter/Iterator.php
+++ b/src/Adapter/Iterator.php
@@ -1,40 +1,24 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @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_Paginator
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\Adapter;
 
-use Zend\Paginator\Adapter;
+use Zend\Paginator;
 
 /**
- * @uses       \Zend\Paginator\Adapter
- * @uses       \Zend\Paginator\Adapter\Exception
- * @uses       \Zend\Paginator\SerializableLimitIterator
  * @category   Zend
  * @package    Zend_Paginator
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Iterator implements Adapter
+class Iterator implements AdapterInterface
 {
     /**
      * Iterator which implements Countable
@@ -53,8 +37,8 @@ class Iterator implements Adapter
     /**
      * Constructor.
      *
-     * @param  Iterator $iterator Iterator to paginate
-     * @throws \Zend\Paginator\Adapter\Exception
+     * @param  \Iterator $iterator Iterator to paginate
+     * @throws \Zend\Paginator\Adapter\Exception\InvalidArgumentException
      */
     public function __construct(\Iterator $iterator)
     {
@@ -71,14 +55,14 @@ public function __construct(\Iterator $iterator)
      *
      * @param  integer $offset Page offset
      * @param  integer $itemCountPerPage Number of items per page
-     * @return LimitIterator|array
+     * @return array|\Zend\Paginator\SerializableLimitIterator
      */
     public function getItems($offset, $itemCountPerPage)
     {
         if ($this->_count == 0) {
             return array();
         }
-        return new \Zend\Paginator\SerializableLimitIterator($this->_iterator, $offset, $itemCountPerPage);
+        return new Paginator\SerializableLimitIterator($this->_iterator, $offset, $itemCountPerPage);
     }
 
     /**
diff --git a/src/Adapter/Null.php b/src/Adapter/Null.php
index ebbedf3..cccc3b4 100644
--- a/src/Adapter/Null.php
+++ b/src/Adapter/Null.php
@@ -1,38 +1,22 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @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_Paginator
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\Adapter;
 
-use Zend\Paginator\Adapter;
-
 /**
- * @uses       \Zend\Paginator\Adapter
  * @category   Zend
  * @package    Zend_Paginator
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Null implements Adapter
+class Null implements AdapterInterface
 {
     /**
      * Item count
@@ -44,7 +28,7 @@ class Null implements Adapter
     /**
      * Constructor.
      *
-     * @param array $count Total item count
+     * @param integer $count Total item count (Optional)
      */
     public function __construct($count = 0)
     {;
diff --git a/src/AdapterAggregate.php b/src/AdapterAggregate.php
deleted file mode 100644
index e8f2bf8..0000000
--- a/src/AdapterAggregate.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @namespace
- */
-namespace Zend\Paginator;
-
-/**
- * Interface that aggregates a Zend_Paginator_Adapter_Abstract just like IteratorAggregate does for Iterators.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface AdapterAggregate
-{
-    /**
-     * Return a fully configured Paginator Adapter from this method.
-     *
-     * @return Zend_Paginator_Adapter_Interface
-     */
-    public function getPaginatorAdapter();
-}
\ No newline at end of file
diff --git a/src/AdapterAggregateInterface.php b/src/AdapterAggregateInterface.php
new file mode 100644
index 0000000..708ab09
--- /dev/null
+++ b/src/AdapterAggregateInterface.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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_Paginator
+ */
+
+namespace Zend\Paginator;
+
+use Zend\Paginator\Adapter\AdapterInterface;
+
+/**
+ * Interface that aggregates a Zend\Paginator\Adapter\Abstract just like IteratorAggregate does for Iterators.
+ *
+ * @category   Zend
+ * @package    Zend_Paginator
+ * @subpackage Adapter
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface AdapterAggregateInterface
+{
+    /**
+     * Return a fully configured Paginator Adapter from this method.
+     *
+     * @return AdapterInterface
+     */
+    public function getPaginatorAdapter();
+}
diff --git a/src/AdapterBroker.php b/src/AdapterBroker.php
index 97c5763..ff03c64 100644
--- a/src/AdapterBroker.php
+++ b/src/AdapterBroker.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @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_Paginator
  */
 
 namespace Zend\Paginator;
@@ -38,7 +28,7 @@ class AdapterBroker extends PluginBroker
     protected $defaultClassLoader = 'Zend\Paginator\AdapterLoader';
 
     /**
-     * @var boolean Adapters must not be registred on load
+     * @var boolean Adapters must not be registered on load
      */
     protected $registerPluginsOnLoad = false;
 
@@ -46,13 +36,14 @@ class AdapterBroker extends PluginBroker
      * Determine if we have a valid adapter
      * 
      * @param  mixed $plugin 
-     * @return true
-     * @throws Exception
+     * @return bool
+     * @throws Exception\InvalidArgumentException
      */
     protected function validatePlugin($plugin)
     {
-        if (!$plugin instanceof Adapter) {
-            throw new Exception('Pagination adapters must implement Zend\Paginator\Adapter');
+        if (!$plugin instanceof Adapter\AdapterInterface) {
+            throw new Exception\InvalidArgumentException(
+                'Pagination adapters must implement Zend\Paginator\Adapter\AdapterInterface');
         }
         return true;
     }
diff --git a/src/AdapterLoader.php b/src/AdapterLoader.php
index 1cdf12f..de4bdd7 100644
--- a/src/AdapterLoader.php
+++ b/src/AdapterLoader.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @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_Paginator
  */
 
 namespace Zend\Paginator;
diff --git a/src/Exception.php b/src/Exception.php
deleted file mode 100644
index 9390b07..0000000
--- a/src/Exception.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @namespace
- */
-namespace Zend\Paginator;
-
-/**
- * @uses       Zend\Exception
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Exception
-{}
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
new file mode 100644
index 0000000..5795a63
--- /dev/null
+++ b/src/Exception/ExceptionInterface.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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_Paginator
+ */
+
+namespace Zend\Paginator\Exception;
+
+/**
+ * @category   Zend
+ * @package    Zend_Paginator
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface ExceptionInterface
+{}
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index 795f14a..87af18d 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -1,37 +1,23 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend\Paginator
- * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @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_Paginator
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\Exception;
 
 /**
- * @uses       Zend\Paginator\Exception
  * @category   Zend
  * @package    Zend\Paginator
  * @subpackage Exception
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class InvalidArgumentException extends \InvalidArgumentException implements \Zend\Paginator\Exception
+class InvalidArgumentException
+    extends \InvalidArgumentException
+    implements ExceptionInterface
 {}
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
index aba2858..58223f0 100644
--- a/src/Exception/RuntimeException.php
+++ b/src/Exception/RuntimeException.php
@@ -1,37 +1,23 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend\Paginator
- * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @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_Paginator
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\Exception;
 
 /**
- * @uses       Zend\Paginator\Exception
  * @category   Zend
  * @package    Zend\Paginator
  * @subpackage Exception
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class RuntimeException extends \RuntimeException implements \Zend\Paginator\Exception
+class RuntimeException
+    extends \RuntimeException
+    implements ExceptionInterface
 {}
diff --git a/src/Exception/UnexpectedValueException.php b/src/Exception/UnexpectedValueException.php
new file mode 100644
index 0000000..d677097
--- /dev/null
+++ b/src/Exception/UnexpectedValueException.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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_Paginator
+ */
+
+namespace Zend\Paginator\Exception;
+
+/**
+ * @category   Zend
+ * @package    Zend\Paginator
+ * @subpackage Exception
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class UnexpectedValueException
+    extends \UnexpectedValueException
+    implements ExceptionInterface
+{}
diff --git a/src/Paginator.php b/src/Paginator.php
index bac95f4..700abf4 100644
--- a/src/Paginator.php
+++ b/src/Paginator.php
@@ -1,38 +1,28 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @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_Paginator
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator;
 
-use ArrayIterator,
+use Zend\Paginator\ScrollingStyle\ScrollingStyleInterface,
+    Zend\Paginator\Adapter\AdapterInterface,
+    ArrayIterator,
     Countable,
     Iterator,
     IteratorAggregate,
     Traversable,
-    Zend\Cache\Storage\Adapter as CacheAdapter,
-    Zend\Db\Select as DbSelect,
+    Zend\Cache\Storage\StorageInterface as CacheStorage,
+    Zend\Cache\Storage\IteratorInterface as CacheIterator,
     Zend\Db\Table\AbstractRowset as DbAbstractRowset,
     Zend\Db\Table\Select as DbTableSelect,
-    Zend\Filter\Filter,
+    Zend\Db\Sql,
+    Zend\Filter\FilterInterface,
     Zend\Json\Json,
     Zend\Stdlib\ArrayUtils,
     Zend\View;
@@ -96,12 +86,12 @@ class Paginator implements Countable, IteratorAggregate
     /**
      * Cache object
      *
-     * @var CacheAdapter
+     * @var CacheStorage
      */
     protected static $_cache;
 
     /**
-     * Enable or desable the cache by Zend_Paginator instance
+     * Enable or disable the cache by Zend\Paginator\Paginator instance
      *
      * @var bool
      */
@@ -110,7 +100,7 @@ class Paginator implements Countable, IteratorAggregate
     /**
      * Adapter
      *
-     * @var Adapter
+     * @var AdapterInterface
      */
     protected $_adapter = null;
 
@@ -138,7 +128,7 @@ class Paginator implements Countable, IteratorAggregate
     /**
      * Result filter
      *
-     * @var Filter
+     * @var FilterInterface
      */
     protected $_filter = null;
 
@@ -174,22 +164,23 @@ class Paginator implements Countable, IteratorAggregate
     /**
      * View instance used for self rendering
      *
-     * @var View\Renderer
+     * @var \Zend\View\Renderer\RendererInterface
      */
     protected $_view = null;
 
     /**
      * Factory.
      *
-     * @param  mixed $data
+     * @param  mixed  $data
      * @param  string $adapter
-     * @param  array $prefixPaths
+     * @param  array  $prefixPaths
+     * @throws Exception\InvalidArgumentException
      * @return Paginator
      */
     public static function factory($data, $adapter = self::INTERNAL_ADAPTER,
                                    array $prefixPaths = null)
     {
-        if ($data instanceof AdapterAggregate) {
+        if ($data instanceof AdapterAggregateInterface) {
             return new self($data->getPaginatorAdapter());
         }
 
@@ -217,9 +208,9 @@ public static function factory($data, $adapter = self::INTERNAL_ADAPTER,
 
     /**
      * Set the adapter broker
-     * 
-     * @param  Broker $broker 
-     * @return void
+     *
+     * @param string|\Zend\Loader\PluginBroker $broker
+     * @throws Exception\InvalidArgumentException
      */
     public static function setAdapterBroker($broker)
     {
@@ -258,9 +249,10 @@ public static function getAdapterBroker()
     /**
      * Set a global config
      *
-     * @param array|Traversable $config
+     * @param array|\Traversable $config
+     * @throws Exception\InvalidArgumentException
      */
-    public static function setConfig($config)
+    public static function setOptions($config)
     {
         if ($config instanceof Traversable) {
             $config = ArrayUtils::iteratorToArray($config);
@@ -271,13 +263,13 @@ public static function setConfig($config)
 
         self::$_config = $config;
 
-        if (isset($config['adapter_broker']) 
+        if (isset($config['adapter_broker'])
             && null !== ($broker = $config['adapter_broker'])
         ) {
             self::setAdapterBroker($broker);
         }
 
-        if (isset($config['scrolling_style_broker']) 
+        if (isset($config['scrolling_style_broker'])
             && null !== ($broker = $config['scrolling_style_broker'])
         ) {
             self::setScrollingStyleBroker($broker);
@@ -323,9 +315,9 @@ public static function setDefaultItemCountPerPage($count)
     /**
      * Sets a cache object
      *
-     * @param CacheAdapter $cache
+     * @param CacheStorage $cache
      */
-    public static function setCache(CacheAdapter $cache)
+    public static function setCache(CacheStorage $cache)
     {
         self::$_cache = $cache;
     }
@@ -378,18 +370,19 @@ public static function getScrollingStyleBroker()
     /**
      * Constructor.
      *
-     * @param Adapter|AdapterAggregate $adapter
+     * @param AdapterInterface|AdapterAggregateInterface $adapter
+     * @throws Exception\InvalidArgumentException
      */
     public function __construct($adapter)
     {
-        if ($adapter instanceof Adapter) {
+        if ($adapter instanceof AdapterInterface) {
             $this->_adapter = $adapter;
-        } else if ($adapter instanceof AdapterAggregate) {
+        } else if ($adapter instanceof AdapterAggregateInterface) {
             $this->_adapter = $adapter->getPaginatorAdapter();
         } else {
             throw new Exception\InvalidArgumentException(
                 'Zend_Paginator only accepts instances of the type ' .
-                'Zend_Paginator_Adapter_Interface or Zend_Paginator_AdapterAggregate.'
+                'Zend\Paginator\Adapter\AdapterInterface or Zend\Paginator\AdapterAggregateInterface.'
             );
         }
 
@@ -476,16 +469,15 @@ public function clearPageItemCache($pageNumber = null)
         }
 
         if (null === $pageNumber) {
-            self::$_cache->find(CacheAdapter::MATCH_TAGS_OR, array('tags' => array(
-                $this->_getCacheInternalId()
-            )));
-            $cacheIds = array();
-            while (($item = self::$_cache->fetch()) !== false) {
-                $cacheIds[] = $item['key'];
-            }
-            foreach ($cacheIds as $id) {
-                if (preg_match('|'.self::CACHE_TAG_PREFIX."(\d+)_.*|", $id, $page)) {
-                    self::$_cache->removeItem($this->_getCacheId($page[1]));
+            $prefixLength  = strlen(self::CACHE_TAG_PREFIX);
+            $cacheIterator = self::$_cache->getIterator();
+            $cacheIterator->setMode(CacheIterator::CURRENT_AS_KEY);
+            foreach ($cacheIterator as $key) {
+                $tags = self::$_cache->getTags($key);
+                if ($tags && in_array($this->_getCacheInternalId(), $tags)) {
+                    if (substr($key, 0, $prefixLength) == self::CACHE_TAG_PREFIX) {
+                        self::$_cache->removeItem($this->_getCacheId((int)substr($key, $prefixLength)));
+                    }
                 }
             }
         } else {
@@ -518,7 +510,7 @@ public function getAbsoluteItemNumber($relativeItemNumber, $pageNumber = null)
     /**
      * Returns the adapter.
      *
-     * @return Adapter
+     * @return AdapterInterface
      */
     public function getAdapter()
     {
@@ -581,7 +573,7 @@ public function setCurrentPageNumber($pageNumber)
     /**
      * Get the filter
      *
-     * @return Filter
+     * @return FilterInterface
      */
     public function getFilter()
     {
@@ -591,10 +583,10 @@ public function getFilter()
     /**
      * Set a filter chain
      *
-     * @param  Filter $filter
+     * @param  FilterInterface $filter
      * @return Paginator
      */
-    public function setFilter(Filter $filter)
+    public function setFilter(FilterInterface $filter)
     {
         $this->_filter = $filter;
 
@@ -603,10 +595,11 @@ public function setFilter(Filter $filter)
 
     /**
      * Returns an item from a page.  The current page is used if there's no
-     * page sepcified.
+     * page specified.
      *
      * @param  integer $itemNumber Item number (1 to itemCountPerPage)
      * @param  integer $pageNumber
+     * @throws Exception\InvalidArgumentException
      * @return mixed
      */
     public function getItem($itemNumber, $pageNumber = null)
@@ -693,7 +686,8 @@ public function getItemCount($items)
     /**
      * Returns the items for a given page.
      *
-     * @return Traversable
+     * @param integer $pageNumber
+     * @return mixed
      */
     public function getItemsByPage($pageNumber)
     {
@@ -701,7 +695,7 @@ public function getItemsByPage($pageNumber)
 
         if ($this->_cacheEnabled()) {
             $data = self::$_cache->getItem($this->_getCacheId($pageNumber));
-            if ($data !== false) {
+            if ($data) {
                 return $data;
             }
         }
@@ -721,11 +715,9 @@ public function getItemsByPage($pageNumber)
         }
 
         if ($this->_cacheEnabled()) {
-            self::$_cache->setItem(
-                $this->_getCacheId($pageNumber), 
-                $items, 
-                array('tags' => array($this->_getCacheInternalId()))
-            );
+            $cacheId = $this->_getCacheId($pageNumber);
+            self::$_cache->setItem($cacheId, $items);
+            self::$_cache->setTags($cacheId, array($this->_getCacheInternalId()));
         }
 
         return $items;
@@ -734,6 +726,7 @@ public function getItemsByPage($pageNumber)
     /**
      * Returns a foreach-compatible iterator.
      *
+     * @throws Exception\RuntimeException
      * @return Traversable
      */
     public function getIterator()
@@ -813,16 +806,15 @@ public function getPageItemCache()
     {
         $data = array();
         if ($this->_cacheEnabled()) {
-            $cacheIds = self::$_cache->find(CacheAdapter::MATCH_TAGS_OR, array(
-                'tags' => array($this->_getCacheInternalId()),
-            ));
-            $cacheIds = array();
-            while (($item = self::$_cache->fetch()) !== false) {
-                $cacheIds[] = $item['key'];
-            }
-            foreach ($cacheIds as $id) {
-                if (preg_match('|'.self::CACHE_TAG_PREFIX."(\d+)_.*|", $id, $page)) {
-                    $data[$page[1]] = self::$_cache->getItem($this->_getCacheId($page[1]));
+            $prefixLength  = strlen(self::CACHE_TAG_PREFIX);
+            $cacheIterator = self::$_cache->getIterator();
+            $cacheIterator->setMode(CacheIterator::CURRENT_AS_VALUE);
+            foreach ($cacheIterator as $key => $value) {
+                $tags = self::$_cache->getTags($key);
+                if ($tags && in_array($this->_getCacheInternalId(), $tags)) {
+                    if (substr($key, 0, $prefixLength) == self::CACHE_TAG_PREFIX) {
+                        $data[(int)substr($key, $prefixLength)] = $value;
+                    }
                 }
             }
         }
@@ -830,11 +822,11 @@ public function getPageItemCache()
     }
 
     /**
-     * Retrieves the view instance.  
+     * Retrieves the view instance.
      *
      * If none registered, instantiates a PhpRenderer instance.
      *
-     * @return View\Renderer|null
+     * @return \Zend\View\Renderer\RendererInterface|null
      */
     public function getView()
     {
@@ -848,10 +840,10 @@ public function getView()
     /**
      * Sets the view object.
      *
-     * @param  View\Renderer $view
+     * @param  \Zend\View\Renderer\RendererInterface $view
      * @return Paginator
      */
-    public function setView(View\Renderer $view = null)
+    public function setView(View\Renderer\RendererInterface $view = null)
     {
         $this->_view = $view;
 
@@ -905,10 +897,10 @@ public function normalizePageNumber($pageNumber)
     /**
      * Renders the paginator.
      *
-     * @param  View\Renderer $view
+     * @param  \Zend\View\Renderer\RendererInterface $view
      * @return string
      */
-    public function render(View\Renderer $view = null)
+    public function render(View\Renderer\RendererInterface $view = null)
     {
         if (null !== $view) {
             $this->setView($view);
@@ -937,7 +929,7 @@ public function toJson()
 
     /**
      * Tells if there is an active cache object
-     * and if the cache has not been desabled
+     * and if the cache has not been disabled
      *
      * @return bool
      */
@@ -1039,7 +1031,7 @@ protected function _createPages($scrollingStyle = null)
      * Loads a scrolling style.
      *
      * @param string $scrollingStyle
-     * @return ScrollingStyle
+     * @return ScrollingStyleInterface
      * @throws Exception\InvalidArgumentException
      */
     protected function _loadScrollingStyle($scrollingStyle = null)
@@ -1050,9 +1042,9 @@ protected function _loadScrollingStyle($scrollingStyle = null)
 
         switch (strtolower(gettype($scrollingStyle))) {
             case 'object':
-                if (!$scrollingStyle instanceof ScrollingStyle) {
+                if (!$scrollingStyle instanceof ScrollingStyleInterface) {
                     throw new Exception\InvalidArgumentException(
-                        'Scrolling style must implement Zend_Paginator_ScrollingStyle_Interface'
+                        'Scrolling style must implement Zend\Paginator\ScrollingStyle\ScrollingStyleInterface'
                     );
                 }
 
@@ -1067,7 +1059,7 @@ protected function _loadScrollingStyle($scrollingStyle = null)
             default:
                 throw new Exception\InvalidArgumentException(
                     'Scrolling style must be a class ' .
-                    'name or object implementing Zend\Paginator\ScrollingStyle'
+                    'name or object implementing Zend\Paginator\ScrollingStyle\ScrollingStyleInterface'
                 );
         }
     }
diff --git a/src/ScrollingStyle.php b/src/ScrollingStyle.php
deleted file mode 100644
index 03a0fa3..0000000
--- a/src/ScrollingStyle.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @namespace
- */
-namespace Zend\Paginator;
-
-/**
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface ScrollingStyle
-{
-    /**
-     * Returns an array of "local" pages given a page number and range.
-     *
-     * @param  \Zend\Paginator\Paginator $paginator
-     * @param  integer $pageRange (Optional) Page range
-     * @return array
-     */
-    public function getPages(\Zend\Paginator\Paginator $paginator, $pageRange = null);
-}
diff --git a/src/ScrollingStyle/All.php b/src/ScrollingStyle/All.php
index 9dc2e21..314cf2d 100644
--- a/src/ScrollingStyle/All.php
+++ b/src/ScrollingStyle/All.php
@@ -1,51 +1,37 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @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_Paginator
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\ScrollingStyle;
 
-use Zend\Paginator\ScrollingStyle;
+use Zend\Paginator\Paginator;
 
 /**
  * A scrolling style that returns every page in the collection.
  * Useful when it is necessary to make every page available at
- * once--for example, when using a dropdown menu pagination control.
+ * once--for example, when using a drop-down menu pagination control.
  *
- * @uses       \Zend\Paginator\ScrollingStyle
  * @category   Zend
  * @package    Zend_Paginator
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class All implements ScrollingStyle
+class All implements ScrollingStyleInterface
 {
     /**
      * Returns an array of all pages given a page number and range.
      *
-     * @param  \Zend\Paginator\Paginator $paginator
+     * @param  Paginator $paginator
      * @param  integer $pageRange Unused
      * @return array
      */
-    public function getPages(\Zend\Paginator\Paginator $paginator, $pageRange = null)
+    public function getPages(Paginator $paginator, $pageRange = null)
     {
         return $paginator->getPagesInRange(1, $paginator->count());
     }
diff --git a/src/ScrollingStyle/Elastic.php b/src/ScrollingStyle/Elastic.php
index e13532e..3809a9d 100644
--- a/src/ScrollingStyle/Elastic.php
+++ b/src/ScrollingStyle/Elastic.php
@@ -1,34 +1,22 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @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_Paginator
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\ScrollingStyle;
 
+use Zend\Paginator\Paginator;
+
 /**
  * A Google-like scrolling style.  Incrementally expands the range to about
  * twice the given page range, then behaves like a slider.  See the example
  * link.
  *
- * @uses       \Zend\Paginator\ScrollingStyle\Sliding
  * @link       http://www.google.com/search?q=Zend+Framework
  * @category   Zend
  * @package    Zend_Paginator
@@ -40,11 +28,11 @@ class Elastic extends Sliding
     /**
      * Returns an array of "local" pages given a page number and range.
      *
-     * @param  \Zend\Paginator\Paginator $paginator
+     * @param  Paginator $paginator
      * @param  integer $pageRange Unused
      * @return array
      */
-    public function getPages(\Zend\Paginator\Paginator $paginator, $pageRange = null)
+    public function getPages(Paginator $paginator, $pageRange = null)
     {
         $pageRange  = $paginator->getPageRange();
         $pageNumber = $paginator->getCurrentPageNumber();
diff --git a/src/ScrollingStyle/Jumping.php b/src/ScrollingStyle/Jumping.php
index 0b6eab3..6bfbe6c 100644
--- a/src/ScrollingStyle/Jumping.php
+++ b/src/ScrollingStyle/Jumping.php
@@ -1,51 +1,37 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @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_Paginator
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\ScrollingStyle;
 
-use Zend\Paginator\ScrollingStyle;
+use Zend\Paginator\Paginator;
 
 /**
  * A scrolling style in which the cursor advances to the upper bound
  * of the page range, the page range "jumps" to the next section, and
  * the cursor moves back to the beginning of the range.
  *
- * @uses       \Zend\Paginator\ScrollingStyle
  * @category   Zend
  * @package    Zend_Paginator
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Jumping implements ScrollingStyle
+class Jumping implements ScrollingStyleInterface
 {
     /**
      * Returns an array of "local" pages given a page number and range.
      *
-     * @param  \Zend\Paginator\Paginator $paginator
+     * @param  Paginator $paginator
      * @param  integer $pageRange Unused
      * @return array
      */
-    public function getPages(\Zend\Paginator\Paginator $paginator, $pageRange = null)
+    public function getPages(Paginator $paginator, $pageRange = null)
     {
         $pageRange  = $paginator->getPageRange();
         $pageNumber = $paginator->getCurrentPageNumber();
diff --git a/src/ScrollingStyle/ScrollingStyleInterface.php b/src/ScrollingStyle/ScrollingStyleInterface.php
new file mode 100644
index 0000000..95375c7
--- /dev/null
+++ b/src/ScrollingStyle/ScrollingStyleInterface.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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_Paginator
+ */
+
+namespace Zend\Paginator\ScrollingStyle;
+
+use Zend\Paginator\Paginator;
+
+/**
+ * @category   Zend
+ * @package    Zend_Paginator
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface ScrollingStyleInterface
+{
+    /**
+     * Returns an array of "local" pages given a page number and range.
+     *
+     * @param  Paginator $paginator
+     * @param  integer $pageRange (Optional) Page range
+     * @return array
+     */
+    public function getPages(Paginator $paginator, $pageRange = null);
+}
diff --git a/src/ScrollingStyle/Sliding.php b/src/ScrollingStyle/Sliding.php
index 2e6c606..e017142 100644
--- a/src/ScrollingStyle/Sliding.php
+++ b/src/ScrollingStyle/Sliding.php
@@ -1,29 +1,16 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @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_Paginator
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator\ScrollingStyle;
 
-use Zend\Paginator\ScrollingStyle;
+use Zend\Paginator\Paginator;
 
 /**
  * A Yahoo! Search-like scrolling style.  The cursor will advance to
@@ -31,23 +18,22 @@
  * the end of the page set, at which point it will continue on to
  * the end of the range and the last page in the set.
  *
- * @uses       \Zend\Paginator\ScrollingStyle
  * @link       http://search.yahoo.com/search?p=Zend+Framework
  * @category   Zend
  * @package    Zend_Paginator
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Sliding implements ScrollingStyle
+class Sliding implements ScrollingStyleInterface
 {
     /**
      * Returns an array of "local" pages given a page number and range.
      *
-     * @param  \Zend\Paginator\Paginator $paginator
+     * @param  Paginator $paginator
      * @param  integer $pageRange (Optional) Page range
      * @return array
      */
-    public function getPages(\Zend\Paginator\Paginator $paginator, $pageRange = null)
+    public function getPages(Paginator $paginator, $pageRange = null)
     {
         if ($pageRange === null) {
             $pageRange = $paginator->getPageRange();
diff --git a/src/ScrollingStyleBroker.php b/src/ScrollingStyleBroker.php
index 90161c2..eb7770b 100644
--- a/src/ScrollingStyleBroker.php
+++ b/src/ScrollingStyleBroker.php
@@ -1,26 +1,17 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @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_Paginator
  */
 
 namespace Zend\Paginator;
 
-use Zend\Loader\PluginBroker;
+use Zend\Loader\PluginBroker,
+    Zend\Paginator\ScrollingStyle\ScrollingStyleInterface;
 
 /**
  * Broker for scrolling-style adapter instances
@@ -40,14 +31,16 @@ class ScrollingStyleBroker extends PluginBroker
     /**
      * Determine if we have a valid adapter
      * 
-     * @param  mixed $plugin 
-     * @return true
-     * @throws Exception
+     * @param  mixed $plugin
+     * @return bool
+     * @throws Exception\InvalidArgumentException
      */
     protected function validatePlugin($plugin)
     {
-        if (!$plugin instanceof ScrollingStyle) {
-            throw new Exception('ScrollingStyle adapters must implement Zend\Paginator\ScrollingStyle');
+        if (!$plugin instanceof ScrollingStyleInterface) {
+            throw new Exception\InvalidArgumentException(
+                'ScrollingStyle adapters must implement Zend\Paginator\ScrollingStyle\ScrollingStyleInterface'
+            );
         }
         return true;
     }
diff --git a/src/ScrollingStyleLoader.php b/src/ScrollingStyleLoader.php
index f7a5752..b562b0c 100644
--- a/src/ScrollingStyleLoader.php
+++ b/src/ScrollingStyleLoader.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @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_Paginator
  */
 
 namespace Zend\Paginator;
diff --git a/src/SerializableLimitIterator.php b/src/SerializableLimitIterator.php
index 5d97262..03c2f90 100644
--- a/src/SerializableLimitIterator.php
+++ b/src/SerializableLimitIterator.php
@@ -1,31 +1,18 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @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_Paginator
  */
 
-/**
- * @namespace
- */
 namespace Zend\Paginator;
 
+use Iterator;
+
 /**
- * @uses       LimitIterator
- * @uses       Serializable
  * @category   Zend
  * @package    Zend_Paginator
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
@@ -49,14 +36,14 @@ class SerializableLimitIterator extends \LimitIterator implements \Serializable,
     private $_count;
 
     /**
-     * Construct a Zend_Paginator_SerializableLimitIterator
+     * Construct a Zend\Paginator\SerializableLimitIterator
      *
      * @param Iterator $it Iterator to limit (must be serializable by un-/serialize)
      * @param int $offset Offset to first element
      * @param int $count Maximum number of elements to show or -1 for all
      * @see LimitIterator::__construct
      */
-    public function __construct (\Iterator $it, $offset=0, $count=-1)
+    public function __construct (Iterator $it, $offset=0, $count=-1)
     {
         parent::__construct($it, $offset, $count);
         $this->_offset = $offset;
@@ -116,6 +103,7 @@ public function offsetSet($offset, $value)
      * Determine if a value of Iterator is set and is not NULL
      *
      * @param int $offset
+     * @return bool
      */
     public function offsetExists($offset)
     {
diff --git a/test/Adapter/ArrayTest.php b/test/Adapter/ArrayTest.php
index 4918f46..a83142b 100644
--- a/test/Adapter/ArrayTest.php
+++ b/test/Adapter/ArrayTest.php
@@ -19,10 +19,8 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\Adapter;
+
 use Zend\Paginator\Adapter;
 
 /**
@@ -36,7 +34,7 @@
 class ArrayTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Zend_Paginator_Adapter_Array
+     * @var Zend\Paginator\Adapter\Array
      */
     private $_adapter;
 
diff --git a/test/Adapter/DbSelect/OracleTest.php b/test/Adapter/DbSelect/OracleTest.php
index f850eab..31190e8 100644
--- a/test/Adapter/DbSelect/OracleTest.php
+++ b/test/Adapter/DbSelect/OracleTest.php
@@ -19,16 +19,13 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\Adapter\DbSelect;
 
-use Zend\Paginator\Adapter,
-    Zend\Db\Statement\Oracle,
-    Zend\Db\Statement\OracleException;
+use Zend\Paginator\Adapter;
+use Zend\Db\Statement\Oracle;
+use Zend\Db\Statement\OracleException;
+use ZendTest\Paginator\Adapter\DbSelectTest;
 
-require_once 'Zend/Paginator/Adapter/DbSelectTest.php';
 require_once __DIR__ . '/../../_files/TestTable.php';
 
 /**
@@ -39,7 +36,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Paginator
  */
-class OracleTest extends \ZendTest\Paginator\Adapter\DbSelectTest
+class OracleTest extends DbSelectTest
 {
 
     /**
@@ -47,21 +44,21 @@ class OracleTest extends \ZendTest\Paginator\Adapter\DbSelectTest
      */
     protected function setUp ()
     {
-        $this->markTestSkipped('Will skip until Zend\Db is refactored.');
-        
+        $this->markTestIncomplete('Will skip until Zend\Db is refactored.');
+
         if (! extension_loaded('oci8')) {
             $this->markTestSkipped('Oci8 extension is not loaded');
         }
 
-        if (! TESTS_ZEND_Db_ADAPTER_ORACLE_ENABLED) {
+        if (! TESTS_ZEND_DB_ADAPTER_ORACLE_ENABLED) {
             $this->markTestSkipped('Oracle is required');
         }
 
         $this->_db = new \Zend\Db\Adapter\Oracle(
-                array('host' => TESTS_ZEND_Db_ADAPTER_ORACLE_HOSTNAME ,
-                        'username' => TESTS_ZEND_Db_ADAPTER_ORACLE_USERNAME ,
-                        'password' => TESTS_ZEND_Db_ADAPTER_ORACLE_PASSWORD ,
-                        'dbname' => TESTS_ZEND_Db_ADAPTER_ORACLE_SID));
+                array('host' => TESTS_ZEND_DB_ADAPTER_ORACLE_HOSTNAME ,
+                        'username' => TESTS_ZEND_DB_ADAPTER_ORACLE_USERNAME ,
+                        'password' => TESTS_ZEND_DB_ADAPTER_ORACLE_PASSWORD ,
+                        'dbname' => TESTS_ZEND_DB_ADAPTER_ORACLE_SID));
 
         $this->_dropTable();
         $this->_createTable();
@@ -82,10 +79,7 @@ protected function setUp ()
      */
     protected function tearDown ()
     {
-        if (! TESTS_ZEND_Db_ADAPTER_ORACLE_ENABLED) {
-            return;
-        }
-
+        $this->markTestIncomplete('Will skip until Zend\Db is refactored.');
         $this->_dropTable();
         $this->_db = null;
         $this->_adapter = null;
diff --git a/test/Adapter/DbSelectTest.php b/test/Adapter/DbSelectTest.php
index 594b93c..ea5bbc8 100644
--- a/test/Adapter/DbSelectTest.php
+++ b/test/Adapter/DbSelectTest.php
@@ -19,14 +19,11 @@
  * @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;
-use Zend\Db;
-use Zend\Db\Select;
+use Zend\Db\Adapter as DbAdapter;
+use Zend\Db\Sql;
 use Zend\Paginator\Exception;
 
 require_once __DIR__ . '/../_files/TestTable.php';
@@ -42,22 +39,22 @@
 class DbSelectTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Zend_Paginator_Adapter_DbSelect
+     * @var \Zend\Paginator\Adapter\DbSelect
      */
     protected $_adapter;
 
     /**
-     * @var Zend_Db_Adapter_Pdo_Sqlite
+     * @var \Zend\Db\Adapter\Adapter
      */
     protected $_db;
 
     /**
-     * @var Zend_Db_Select
+     * @var \Zend\Db\Sql\Select
      */
     protected $_query;
 
     /**
-     * @var Zend_Db_Table_Abstract
+     * @var \Zend\Db\TableGateway\TableGateway
      */
     protected $_table;
 
@@ -66,21 +63,25 @@ class DbSelectTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
+        $this->markTestIncomplete('Will skip until Zend\Db is refactored.');
+
         if (!extension_loaded('pdo_sqlite')) {
            $this->markTestSkipped('Pdo_Sqlite extension is not loaded');
         }
 
         parent::setUp();
 
-        $this->_db = new Pdo\Sqlite(array(
-            'dbname' => __DIR__ . '/../_files/test.sqlite'
+        $this->_db = new DbAdapter\Adapter(array(
+            'driver'   => 'Pdo_Sqlite',
+            'database' =>  __DIR__ . '/../_files/test.sqlite',
         ));
 
-        $this->_table = new \ZendTest\Paginator\TestAsset\TestTable($this->_db);
+        $this->_table = new \ZendTest\Paginator\TestAsset\TestTable('test', $this->_db);
 
-        $this->_query = $this->_db->select()->from('test')
-                                            ->order('number ASC'); // ZF-3740
-                                            //->limit(1000, 0); // ZF-3727
+        $this->_query = new Sql\Select;
+        $this->_query->from('test')
+                     ->order('number ASC'); // ZF-3740
+                     //->limit(1000, 0); // ZF-3727
 
         $this->_adapter = new Adapter\DbSelect($this->_query);
     }
@@ -130,8 +131,9 @@ public function testThrowsExceptionIfInvalidQuerySuppliedForRowCount()
     public function testThrowsExceptionIfInvalidQuerySuppliedForRowCount2()
     {
         $wrongcolumn = $this->_db->quoteIdentifier('wrongcolumn');
-        $expr = new Db\Expr("COUNT(*) AS $wrongcolumn");
-        $query = $this->_db->select($expr)->from('test');
+        $expr = new Sql\Expression("COUNT(*) AS $wrongcolumn");
+        $query = new Sql\Select;
+        $query->from('test');
 
         $this->setExpectedException('Zend\Paginator\Adapter\Exception\InvalidArgumentException', 'Row count column not found');
         $this->_adapter->setRowCount($query);
@@ -140,13 +142,13 @@ public function testThrowsExceptionIfInvalidQuerySuppliedForRowCount2()
     public function testAcceptsQueryForRowCount()
     {
         $row_count_column = $this->_db->quoteIdentifier(Adapter\DbSelect::ROW_COUNT_COLUMN);
-        $expression = new Db\Expr("COUNT(*) AS $row_count_column");
+        $expression = new Sql\Expression("COUNT(*) AS $row_count_column");
 
         $rowCount = clone $this->_query;
-        $rowCount->reset(Select::COLUMNS)
-                 ->reset(Select::ORDER)        // ZF-3740
-                 ->reset(Select::LIMIT_OFFSET) // ZF-3727
-                 ->reset(Select::GROUP)        // ZF-4001
+        $rowCount->reset(Sql\Select::COLUMNS)
+                 ->reset(Sql\Select::ORDER)        // ZF-3740
+                 ->reset(Sql\Select::LIMIT_OFFSET) // ZF-3727
+                 ->reset(Sql\Select::GROUP)        // ZF-4001
                  ->columns($expression);
 
         $this->_adapter->setRowCount($rowCount);
@@ -180,10 +182,11 @@ public function testDbTableSelectDoesNotThrowException()
      */
     public function testGroupByQueryReturnsOneRow()
     {
-        $query = $this->_db->select()->from('test')
-                           ->order('number ASC')
-                           ->limit(1000, 0)
-                           ->group('number');
+        $query = new Sql\Select;
+        $query->from('test')
+               ->order('number ASC')
+               ->limit(1000, 0)
+               ->group('number');
 
         $adapter = new Adapter\DbSelect($query);
 
@@ -195,13 +198,15 @@ public function testGroupByQueryReturnsOneRow()
      */
     public function testGroupByQueryOnEmptyTableReturnsRowCountZero()
     {
-        $db = new Pdo\Sqlite(array(
-            'dbname' => __DIR__ . '/../_files/testempty.sqlite'
+        $db = new DbAdapter\Adapter(array(
+            'driver'   => 'Pdo_Sqlite',
+            'database' =>  __DIR__ . '/../_files/testempty.sqlite',
         ));
 
-        $query = $db->select()->from('test')
-                              ->order('number ASC')
-                              ->limit(1000, 0);
+        $query = new Sql\Select;
+        $query->from('test')
+              ->order('number ASC')
+              ->limit(1000, 0);
         $adapter = new Adapter\DbSelect($query);
 
         $this->assertEquals(0, $adapter->count());
@@ -212,10 +217,11 @@ public function testGroupByQueryOnEmptyTableReturnsRowCountZero()
      */
     public function testGroupByQueryReturnsCorrectResult()
     {
-        $query = $this->_db->select()->from('test')
-                                     ->order('number ASC')
-                                     ->limit(1000, 0)
-                                     ->group('testgroup');
+        $query = new Sql\Select;
+        $query->from('test')
+              ->order('number ASC')
+              ->limit(1000, 0)
+              ->group('testgroup');
         $adapter = new Adapter\DbSelect($query);
 
         $this->assertEquals(2, $adapter->count());
@@ -226,10 +232,11 @@ public function testGroupByQueryReturnsCorrectResult()
      */
     public function testDistinctColumnQueryReturnsCorrectResult()
     {
-        $query = $this->_db->select()->from('test', 'testgroup')
-                                     ->order('number ASC')
-                                     ->limit(1000, 0)
-                                     ->distinct();
+        $query = new Sql\Select;
+        $query->from('test')
+              ->order('number ASC')
+              ->limit(1000, 0)
+              ->distinct();
         $adapter = new Adapter\DbSelect($query);
 
         $this->assertEquals(2, $adapter->count());
@@ -469,9 +476,9 @@ public function testObjectSelectWithBind()
         $adapter = new Adapter\DbSelect($select);
         $this->assertEquals(1, $adapter->count());
 
-        $select->reset(\Zend\Db\Select::DISTINCT);
+        $select->reset(Sql\Select::DISTINCT);
         $select2 = clone $select;
-        $select2->reset(\Zend\Db\Select::WHERE)
+        $select2->reset(Sql\Select::WHERE)
                 ->where('number = 500');
 
         $selectUnion = $this->_db
diff --git a/test/Adapter/DbTableSelect/OracleTest.php b/test/Adapter/DbTableSelect/OracleTest.php
index 1ad1199..081525f 100644
--- a/test/Adapter/DbTableSelect/OracleTest.php
+++ b/test/Adapter/DbTableSelect/OracleTest.php
@@ -19,12 +19,8 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\Adapter\DbTableSelect;
 
-
 /**
  * @category   Zend
  * @package    Zend_Paginator
@@ -37,9 +33,9 @@ class OracleTest extends \ZendTest\Paginator\Adapter\DbSelect\OracleTest
 {
     public function setup()
     {
-        $this->markTestSkipped('Skipping until Zend\Db is refactored.');
+        $this->markTestIncomplete('Will skip until Zend\Db is refactored.');
     }
-    
+
     /**
      * @group ZF-3775
      */
diff --git a/test/Adapter/DbTableSelectTest.php b/test/Adapter/DbTableSelectTest.php
index 05f582b..1365b24 100644
--- a/test/Adapter/DbTableSelectTest.php
+++ b/test/Adapter/DbTableSelectTest.php
@@ -19,10 +19,8 @@
  * @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..0187ae9 100644
--- a/test/Adapter/IteratorTest.php
+++ b/test/Adapter/IteratorTest.php
@@ -19,10 +19,8 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\Adapter;
+
 use Zend\Paginator\Adapter;
 use Zend\Paginator\Exception;
 
@@ -37,7 +35,7 @@
 class IteratorTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Zend_Paginator_Adapter_Iterator
+     * @var \Zend\Paginator\Adapter\Iterator
      */
     private $_adapter;
 
diff --git a/test/Adapter/NullTest.php b/test/Adapter/NullTest.php
index 5e292ef..d8d10e5 100644
--- a/test/Adapter/NullTest.php
+++ b/test/Adapter/NullTest.php
@@ -19,25 +19,11 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\Adapter;
+
 use Zend\Paginator\Adapter;
 use Zend\Paginator;
 
-/**
- * @see Zend_Paginator
- */
-
-/**
- * @see Zend_Paginator_Adapter_Null
- */
-
-/**
- * @see PHPUnit_Framework_TestCase
- */
-
 /**
  * @category   Zend
  * @package    Zend_Paginator
@@ -49,7 +35,7 @@
 class NullTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Zend_Paginator_Adapter_Array
+     * @var \Zend\Paginator\Adapter\Array
      */
     private $_adapter;
 
diff --git a/test/PaginatorTest.php b/test/PaginatorTest.php
index 3064a5d..bc3a679 100644
--- a/test/PaginatorTest.php
+++ b/test/PaginatorTest.php
@@ -19,20 +19,19 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator;
 
-use PHPUnit_Framework_TestCase as TestCase,
-    Zend\Cache\StorageFactory as CacheFactory,
-    Zend\Cache\Storage\Adapter as CacheAdapter,
-    Zend\Config,
-    Zend\Paginator,
-    Zend\Paginator\Adapter,
-    Zend\Paginator\Exception,
-    Zend\View,
-    Zend\View\Helper;
+use Zend\Cache\StorageFactory as CacheFactory;
+use Zend\Cache\Storage\Adapter\AdapterInterface as CacheAdapter;
+use Zend\Config;
+use Zend\Db\Adapter as DbAdapter;
+use Zend\Db\Sql;
+use Zend\Paginator;
+use Zend\Paginator\Adapter;
+use Zend\Paginator\Exception;
+use Zend\View;
+use Zend\View\Helper;
+use ZendTest\Paginator\TestAsset\TestTable;
 
 
 /**
@@ -43,12 +42,12 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Paginator
  */
-class PaginatorTest extends TestCase
+class PaginatorTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * Paginator instance
      *
-     * @var Zend_Paginator
+     * @var \Zend\Paginator\Paginator
      */
     protected $_paginator = null;
 
@@ -60,6 +59,9 @@ class PaginatorTest extends TestCase
 
     protected $_config = null;
 
+    /**
+     * @var \Zend\Db\Adapter\Adapter
+     */
     protected $_adapter = null;
 
     protected function setUp()
@@ -68,36 +70,20 @@ protected function setUp()
            $this->markTestSkipped('Pdo_Sqlite extension is not loaded');
         }
 
-        $this->_adapter = new \Zend\Db\Adapter\Pdo\Sqlite(array(
-            'dbname' => __DIR__ . '/_files/test.sqlite'
+        $this->_adapter = new DbAdapter\Adapter(array(
+            'driver'   => 'Pdo_Sqlite',
+            'database' =>  __DIR__ . '/_files/test.sqlite',
         ));
 
-        $this->_query = $this->_adapter->select()->from('test');
+        $this->_query = new Sql\Select;
+        $this->_query->from('test');
 
         $this->_testCollection = range(1, 101);
         $this->_paginator = Paginator\Paginator::factory($this->_testCollection);
 
         $this->_config = Config\Factory::fromFile(__DIR__ . '/_files/config.xml', true);
 
-        $this->_cache = CacheFactory::factory(array(
-            'adapter' => array(
-                'name' => 'filesystem',
-                'options' => array(
-                    'ttl'       => 3600,
-                    'cache_dir' => $this->_getTmpDir(),
-                ),
-            ),
-            'plugins' => array(
-                array(
-                    'name' => 'serializer',
-                    'options' => array(
-                        'serializer' => 'php_serialize',
-                    ),
-                ),
-            ),
-        ));
-        $this->_cache->clear(CacheAdapter::MATCH_ALL);
-
+        $this->_cache = CacheFactory::adapterFactory('memory', array('memory_limit' => 0));
         Paginator\Paginator::setCache($this->_cache);
 
         $this->_restorePaginatorDefaults();
@@ -105,10 +91,6 @@ protected function setUp()
 
     protected function tearDown()
     {
-        if ($this->_cache) {
-            $this->_cache->clear(CacheAdapter::MATCH_ALL);
-            $this->_cache = null;
-        }
         $this->_dbConn = null;
         $this->_testCollection = null;
         $this->_paginator = null;
@@ -136,7 +118,7 @@ protected function _rmDirRecursive($path)
         }
         unset($file, $dir); // required on windows to remove file handle
         if (!rmdir($path)) {
-            throw new Exception('Unable to remove temporary directory ' . $path
+            throw new Exception\RuntimeException('Unable to remove temporary directory ' . $path
                                 . '; perhaps it has a nested structure?');
         }
     }
@@ -151,25 +133,25 @@ protected function _restorePaginatorDefaults()
         Paginator\Paginator::setDefaultScrollingStyle();
         Helper\PaginationControl::setDefaultViewPartial(null);
 
-        Paginator\Paginator::setConfig($this->_config->default);
+        Paginator\Paginator::setOptions($this->_config->default);
 
         Paginator\Paginator::setScrollingStyleBroker(new Paginator\ScrollingStyleBroker());
 
-        $this->_cache->clear(CacheAdapter::MATCH_ALL);
         $this->_paginator->setCacheEnabled(true);
     }
 
     public function testFactoryReturnsArrayAdapter()
     {
         $paginator = Paginator\Paginator::factory($this->_testCollection);
-        $this->assertInstanceOf('Zend\\Paginator\\Adapter\\ArrayAdapter', $paginator->getAdapter());
+        $this->assertInstanceOf('Zend\Paginator\Adapter\ArrayAdapter', $paginator->getAdapter());
     }
 
     public function testFactoryReturnsDbSelectAdapter()
     {
+        $this->markTestIncomplete('Will skip until Zend\Db is refactored.');
         $paginator = Paginator\Paginator::factory($this->_query);
 
-        $this->assertInstanceOf('Zend\\Paginator\\Adapter\\DbSelect', $paginator->getAdapter());
+        $this->assertInstanceOf('Zend\Paginator\Adapter\DbSelect', $paginator->getAdapter());
     }
 
     /**
@@ -177,34 +159,35 @@ public function testFactoryReturnsDbSelectAdapter()
      */
     public function testFactoryReturnsDbTableSelectAdapter()
     {
-        $table = new \ZendTest\Paginator\TestAsset\TestTable($this->_adapter);
+        $this->markTestIncomplete('Will skip until Zend\Db is refactored.');
+        $table = new TestTable('test', $this->_adapter);
 
         $paginator = Paginator\Paginator::factory($table->select());
 
-        $this->assertInstanceOf('Zend\\Paginator\\Adapter\\DbSelect', $paginator->getAdapter());
+        $this->assertInstanceOf('Zend\Paginator\Adapter\DbSelect', $paginator->getAdapter());
     }
 
     public function testFactoryReturnsIteratorAdapter()
     {
         $paginator = Paginator\Paginator::factory(new \ArrayIterator($this->_testCollection));
-        $this->assertInstanceOf('Zend\\Paginator\\Adapter\\Iterator', $paginator->getAdapter());
+        $this->assertInstanceOf('Zend\Paginator\Adapter\Iterator', $paginator->getAdapter());
     }
 
     public function testFactoryReturnsNullAdapter()
     {
         $paginator = Paginator\Paginator::factory(101);
-        $this->assertInstanceOf('Zend\\Paginator\\Adapter\\Null', $paginator->getAdapter());
+        $this->assertInstanceOf('Zend\Paginator\Adapter\Null', $paginator->getAdapter());
     }
 
     public function testFactoryThrowsInvalidClassExceptionAdapter()
     {
-        $this->setExpectedException('Zend\\Paginator\\Exception\\InvalidArgumentException', 'No adapter for type stdClass');
+        $this->setExpectedException('Zend\Paginator\Exception\InvalidArgumentException', 'No adapter for type stdClass');
         $paginator = Paginator\Paginator::factory(new \stdClass());
     }
 
     public function testFactoryThrowsInvalidTypeExceptionAdapter()
     {
-        $this->setExpectedException('Zend\\Paginator\\Exception\\InvalidArgumentException', 'No adapter for type string');
+        $this->setExpectedException('Zend\Paginator\Exception\InvalidArgumentException', 'No adapter for type string');
         $paginator = Paginator\Paginator::factory('invalid argument');
     }
 
@@ -230,14 +213,14 @@ public function testHasCorrectCountOfAllItemsAfterInit()
 
     public function testLoadsFromConfig()
     {
-        Paginator\Paginator::setConfig($this->_config->testing);
+        Paginator\Paginator::setOptions($this->_config->testing);
         $this->assertEquals('Scrolling', Paginator\Paginator::getDefaultScrollingStyle());
 
         $broker = Paginator\Paginator::getScrollingStyleBroker();
-        $this->assertInstanceOf('ZendTest\\Paginator\\TestAsset\\ScrollingStyleBroker', $broker);
+        $this->assertInstanceOf('ZendTest\Paginator\TestAsset\ScrollingStyleBroker', $broker);
 
         $broker = Paginator\Paginator::getAdapterBroker();
-        $this->assertInstanceOf('ZendTest\\Paginator\\TestAsset\\AdapterBroker', $broker);
+        $this->assertInstanceOf('ZendTest\Paginator\TestAsset\AdapterBroker', $broker);
 
         $paginator = Paginator\Paginator::factory(range(1, 101));
         $this->assertEquals(3, $paginator->getItemCountPerPage());
@@ -321,7 +304,7 @@ public function testGetsPageCount()
 
     public function testGetsAndSetsItemCountPerPage()
     {
-        Paginator\Paginator::setConfig(new Config\Config(array()));
+        Paginator\Paginator::setOptions(new Config\Config(array()));
         $this->_paginator = new Paginator\Paginator(new Adapter\ArrayAdapter(range(1, 101)));
         $this->assertEquals(10, $this->_paginator->getItemCountPerPage());
         $this->_paginator->setItemCountPerPage(15);
@@ -336,7 +319,7 @@ public function testGetsAndSetsItemCountPerPage()
      */
     public function testGetsAndSetsItemCounterPerPageOfNegativeOne()
     {
-        Paginator\Paginator::setConfig(new Config\Config(array()));
+        Paginator\Paginator::setOptions(new Config\Config(array()));
         $this->_paginator = new Paginator\Paginator(new Paginator\Adapter\ArrayAdapter(range(1, 101)));
         $this->_paginator->setItemCountPerPage(-1);
         $this->assertEquals(101, $this->_paginator->getItemCountPerPage());
@@ -348,7 +331,7 @@ public function testGetsAndSetsItemCounterPerPageOfNegativeOne()
      */
     public function testGetsAndSetsItemCounterPerPageOfZero()
     {
-        Paginator\Paginator::setConfig(new Config\Config(array()));
+        Paginator\Paginator::setOptions(new Config\Config(array()));
         $this->_paginator = new Paginator\Paginator(new Paginator\Adapter\ArrayAdapter(range(1, 101)));
         $this->_paginator->setItemCountPerPage(0);
         $this->assertEquals(101, $this->_paginator->getItemCountPerPage());
@@ -360,7 +343,7 @@ public function testGetsAndSetsItemCounterPerPageOfZero()
      */
     public function testGetsAndSetsItemCounterPerPageOfNull()
     {
-        Paginator\Paginator::setConfig(new Config\Config(array()));
+        Paginator\Paginator::setOptions(new Config\Config(array()));
         $this->_paginator = new Paginator\Paginator(new Paginator\Adapter\ArrayAdapter(range(1, 101)));
         $this->_paginator->setItemCountPerPage();
         $this->assertEquals(101, $this->_paginator->getItemCountPerPage());
@@ -532,18 +515,18 @@ public function testGetsItemCount()
 
     public function testGeneratesViewIfNonexistent()
     {
-        $this->assertInstanceOf('Zend\\View\\Renderer', $this->_paginator->getView());
+        $this->assertInstanceOf('Zend\\View\\Renderer\\RendererInterface', $this->_paginator->getView());
     }
 
     public function testGetsAndSetsView()
     {
         $this->_paginator->setView(new View\Renderer\PhpRenderer());
-        $this->assertInstanceOf('Zend\\View\\Renderer', $this->_paginator->getView());
+        $this->assertInstanceOf('Zend\\View\\Renderer\\RendererInterface', $this->_paginator->getView());
     }
 
     public function testRenders()
     {
-        $this->setExpectedException('Zend\\View\\Exception', 'view partial');
+        $this->setExpectedException('Zend\\View\\Exception\\ExceptionInterface', 'view partial');
         $this->_paginator->render(new View\Renderer\PhpRenderer());
     }
 
@@ -625,6 +608,7 @@ public function testCachedItem()
 
     public function testClearPageItemCache()
     {
+        $this->markTestIncomplete('Will skip until Zend\Db is refactored.');
         $this->_paginator->setCurrentPageNumber(1)->getCurrentItems();
         $this->_paginator->setCurrentPageNumber(2)->getCurrentItems();
         $this->_paginator->setCurrentPageNumber(3)->getCurrentItems();
@@ -726,7 +710,7 @@ public function filterCallback($value)
      */
     public function testGetSetDefaultItemCountPerPage()
     {
-        Paginator\Paginator::setConfig(new Config\Config(array()));
+        Paginator\Paginator::setOptions(new Config\Config(array()));
 
         $paginator = Paginator\Paginator::factory(range(1, 10));
         $this->assertEquals(10, $paginator->getItemCountPerPage());
@@ -767,19 +751,19 @@ public function testAcceptAndHandlePaginatorAdapterAggregateDataInFactory()
         $p = Paginator\Paginator::factory(new TestArrayAggregate());
 
         $this->assertEquals(1, count($p));
-        $this->assertInstanceOf('Zend\\Paginator\\Adapter\\ArrayAdapter', $p->getAdapter());
+        $this->assertInstanceOf('Zend\Paginator\Adapter\ArrayAdapter', $p->getAdapter());
         $this->assertEquals(4, count($p->getAdapter()));
     }
 
     /**
      * @group ZF-7602
      */
-    public function testAcceptAndHandlePaginatorAdapterAggreageInConstructor()
+    public function testAcceptAndHandlePaginatorAdapterAggregateInConstructor()
     {
         $p = new Paginator\Paginator(new TestArrayAggregate());
 
         $this->assertEquals(1, count($p));
-        $this->assertInstanceOf('Zend\\Paginator\\Adapter\\ArrayAdapter', $p->getAdapter());
+        $this->assertInstanceOf('Zend\Paginator\Adapter\ArrayAdapter', $p->getAdapter());
         $this->assertEquals(4, count($p->getAdapter()));
     }
 
@@ -788,9 +772,9 @@ public function testAcceptAndHandlePaginatorAdapterAggreageInConstructor()
      */
     public function testInvalidDataInConstructor_ThrowsException()
     {
-        $this->setExpectedException("Zend\Paginator\Exception");
+        $this->setExpectedException('Zend\Paginator\Exception\ExceptionInterface');
 
-        $p = new Paginator\Paginator(array());
+        new Paginator\Paginator(array());
     }
 
     /**
@@ -814,7 +798,7 @@ public function testArrayAccessInClassSerializableLimitIterator()
     }
 }
 
-class TestArrayAggregate implements Paginator\AdapterAggregate
+class TestArrayAggregate implements Paginator\AdapterAggregateInterface
 {
     public function getPaginatorAdapter()
     {
diff --git a/test/ScrollingStyle/AllTest.php b/test/ScrollingStyle/AllTest.php
index 3a1fad0..b19be1f 100644
--- a/test/ScrollingStyle/AllTest.php
+++ b/test/ScrollingStyle/AllTest.php
@@ -19,23 +19,8 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\ScrollingStyle;
 
-/**
- * @see Zend_Paginator
- */
-
-/**
- * @see Zend_Paginator_ScrollingStyle_All
- */
-
-/**
- * @see PHPUnit_Framework_TestCase
- */
-
 /**
  * @category   Zend
  * @package    Zend_Paginator
@@ -47,9 +32,13 @@
 class AllTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Zend_Paginator_ScrollingStyle_All
+     * @var \Zend\Paginator\ScrollingStyle\All
      */
     private $_scrollingStyle = null;
+
+    /**
+     * @var \Zend\Paginator\Paginator
+     */
     private $_paginator = null;
 
     /**
@@ -72,9 +61,6 @@ protected function tearDown ()
         parent::tearDown();
     }
 
-    /**
-     * Tests Zend_Paginator_ScrollingStyle_All->getPages()
-     */
     public function testGetsPages()
     {
         $expected = array_combine(range(1, 11), range(1, 11));
diff --git a/test/ScrollingStyle/ElasticTest.php b/test/ScrollingStyle/ElasticTest.php
index b688b67..f3a9030 100644
--- a/test/ScrollingStyle/ElasticTest.php
+++ b/test/ScrollingStyle/ElasticTest.php
@@ -19,27 +19,8 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\ScrollingStyle;
 
-/**
- * Test helper
- */
-
-/**
- * @see Zend_Paginator_ScrollingStyle_Elastic
- */
-
-/**
- * @see PHPUnit_Framework_TestCase
- */
-
-/**
- * @see Zend_Paginator
- */
-
 /**
  * @category   Zend
  * @package    Zend_Paginator
@@ -51,11 +32,11 @@
 class ElasticTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Zend_Paginator_ScrollingStyle_Elastic
+     * @var \Zend\Paginator\ScrollingStyle\Elastic
      */
     private $_scrollingStyle;
     /**
-     * @var Zend_Paginator
+     * @var \Zend\Paginator\Paginator
      */
     private $_paginator;
 
diff --git a/test/ScrollingStyle/JumpingTest.php b/test/ScrollingStyle/JumpingTest.php
index fbd9b35..f4da227 100644
--- a/test/ScrollingStyle/JumpingTest.php
+++ b/test/ScrollingStyle/JumpingTest.php
@@ -19,23 +19,8 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\ScrollingStyle;
 
-/**
- * @see Zend_Paginator
- */
-
-/**
- * @see Zend_Paginator_ScrollingStyle_Jumping
- */
-
-/**
- * @see PHPUnit_Framework_TestCase
- */
-
 /**
  * @category   Zend
  * @package    Zend_Paginator
@@ -47,11 +32,11 @@
 class JumpingTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Zend_Paginator_ScrollingStyle_Jumping
+     * @var \Zend\Paginator\ScrollingStyle\Jumping
      */
     private $_scrollingStyle;
     /**
-     * @var Zend_Paginator
+     * @var \Zend\Paginator\Paginator
      */
     private $_paginator;
 
diff --git a/test/ScrollingStyle/SlidingTest.php b/test/ScrollingStyle/SlidingTest.php
index d3f76d3..bcdb1e7 100644
--- a/test/ScrollingStyle/SlidingTest.php
+++ b/test/ScrollingStyle/SlidingTest.php
@@ -19,12 +19,8 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Paginator\ScrollingStyle;
 
-
 /**
  * @category   Zend
  * @package    Zend_Paginator
@@ -36,11 +32,11 @@
 class SlidingTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Zend_Paginator_ScrollingStyle_Sliding
+     * @var \Zend\Paginator\ScrollingStyle\Sliding
      */
     private $_scrollingStyle;
     /**
-     * @var Zend_Paginator
+     * @var \Zend\Paginator\Paginator
      */
     private $_paginator;
 
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..4e427f0 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;
 
 /**
@@ -31,7 +28,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class TestAdapter extends \ArrayObject implements \Zend\Paginator\Adapter
+class TestAdapter extends \ArrayObject implements \Zend\Paginator\Adapter\AdapterInterface
 {
     public function count()
     {
diff --git a/test/TestAsset/TestTable.php b/test/TestAsset/TestTable.php
index 0bcf83b..9a78510 100644
--- a/test/TestAsset/TestTable.php
+++ b/test/TestAsset/TestTable.php
@@ -2,8 +2,10 @@
 
 namespace ZendTest\Paginator\TestAsset;
 
-class TestTable extends \Zend\Db\Table\AbstractTable
+use Zend\Db\TableGateway;
+
+class TestTable extends TableGateway\TableGateway
 {
     protected $_primary = 'number';
     protected $_name = 'test';
-}
\ No newline at end of file
+}
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;
 
 /**