diff --git a/src/Options.php b/src/AbstractOptions.php
similarity index 97%
rename from src/Options.php
rename to src/AbstractOptions.php
index d69ca8c3a..67f7f0167 100644
--- a/src/Options.php
+++ b/src/AbstractOptions.php
@@ -28,11 +28,11 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-abstract class Options implements ParameterObjectInterface
+abstract class AbstractOptions implements ParameterObjectInterface
 {
     /**
      * @param  array|Traversable|null $options
-     * @return Options
+     * @return AbstractOptions
      * @throws Exception\InvalidArgumentException
      */
     public function __construct($options = null)
diff --git a/src/DispatchableInterface.php b/src/DispatchableInterface.php
index 794227074..a880bd3d0 100644
--- a/src/DispatchableInterface.php
+++ b/src/DispatchableInterface.php
@@ -1,8 +1,8 @@
 <?php
 namespace Zend\Stdlib;
 
-use Zend\Stdlib\ResponseInterface as Response,
-    Zend\Stdlib\RequestInterface as Request;
+use Zend\Stdlib\ResponseInterface as Response;
+use Zend\Stdlib\RequestInterface as Request;
 
 interface DispatchableInterface
 {
diff --git a/test/OptionsTest.php b/test/OptionsTest.php
index 2678f24f1..84b8866ab 100644
--- a/test/OptionsTest.php
+++ b/test/OptionsTest.php
@@ -2,10 +2,10 @@
 
 namespace ZendTest\Stdlib;
 
-use ArrayObject,
-    ZendTest\Stdlib\TestAsset\TestOptions,
-    ZendTest\Stdlib\TestAsset\TestTraversable,
-    Zend\Stdlib\Exception\InvalidArgumentException;
+use ArrayObject;
+use ZendTest\Stdlib\TestAsset\TestOptions;
+use ZendTest\Stdlib\TestAsset\TestTraversable;
+use Zend\Stdlib\Exception\InvalidArgumentException;
 
 class OptionsTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/test/PriorityQueueTest.php b/test/PriorityQueueTest.php
index efe464577..678445314 100644
--- a/test/PriorityQueueTest.php
+++ b/test/PriorityQueueTest.php
@@ -21,8 +21,8 @@
 
 namespace ZendTest\Stdlib;
 
-use Zend\Stdlib\PriorityQueue,
-    SplPriorityQueue;
+use Zend\Stdlib\PriorityQueue;
+use SplPriorityQueue;
 
 /**
  * @category   Zend
diff --git a/test/TestAsset/TestOptions.php b/test/TestAsset/TestOptions.php
index 85bcf5f0c..650e52a41 100644
--- a/test/TestAsset/TestOptions.php
+++ b/test/TestAsset/TestOptions.php
@@ -2,12 +2,12 @@
 
 namespace ZendTest\Stdlib\TestAsset;
 
-use Zend\Stdlib\Options;
+use Zend\Stdlib\AbstractOptions;
 
 /**
  * Dummy TestOptions used to test Stdlib\Options
  */
-class TestOptions extends Options
+class TestOptions extends AbstractOptions
 {
     protected $testField;