diff --git a/src/Definition/ArrayDefinition.php b/src/Definition/ArrayDefinition.php
index 2a0552fc..13641fb8 100644
--- a/src/Definition/ArrayDefinition.php
+++ b/src/Definition/ArrayDefinition.php
@@ -2,7 +2,7 @@
 
 namespace Zend\Di\Definition;
 
-class ArrayDefinition implements Definition
+class ArrayDefinition implements DefinitionInterface
 {
     
     protected $dataArray = array();
diff --git a/src/Definition/BuilderDefinition.php b/src/Definition/BuilderDefinition.php
index bc233ae6..734edc95 100644
--- a/src/Definition/BuilderDefinition.php
+++ b/src/Definition/BuilderDefinition.php
@@ -4,7 +4,7 @@
 
 use Zend\Di\Exception;
 
-class BuilderDefinition implements Definition
+class BuilderDefinition implements DefinitionInterface
 {
     protected $defaultClassBuilder = 'Zend\Di\Definition\Builder\PhpClass';
     protected $classes = array();
diff --git a/src/Definition/ClassDefinition.php b/src/Definition/ClassDefinition.php
index 1c49db11..34f73d99 100644
--- a/src/Definition/ClassDefinition.php
+++ b/src/Definition/ClassDefinition.php
@@ -2,7 +2,7 @@
 
 namespace Zend\Di\Definition;
 
-class ClassDefinition implements Definition, PartialMarker
+class ClassDefinition implements DefinitionInterface, PartialMarker
 {
 
     protected $class = null;
diff --git a/src/Definition/CompilerDefinition.php b/src/Definition/CompilerDefinition.php
index 80fe4d9b..0f1b0882 100644
--- a/src/Definition/CompilerDefinition.php
+++ b/src/Definition/CompilerDefinition.php
@@ -12,7 +12,7 @@
     Zend\Code\Reflection,
     Zend\Code\Annotation\AnnotationCollection;
 
-class CompilerDefinition implements Definition
+class CompilerDefinition implements DefinitionInterface
 {
     protected $isCompiled = false;
 
diff --git a/src/Definition/Definition.php b/src/Definition/DefinitionInterface.php
similarity index 98%
rename from src/Definition/Definition.php
rename to src/Definition/DefinitionInterface.php
index dd864594..45ea83a5 100644
--- a/src/Definition/Definition.php
+++ b/src/Definition/DefinitionInterface.php
@@ -2,7 +2,7 @@
 
 namespace Zend\Di\Definition;
 
-interface Definition
+interface DefinitionInterface
 {
     /**
      * @abstract
diff --git a/src/Definition/RuntimeDefinition.php b/src/Definition/RuntimeDefinition.php
index abae1853..20a512a1 100644
--- a/src/Definition/RuntimeDefinition.php
+++ b/src/Definition/RuntimeDefinition.php
@@ -7,7 +7,7 @@
     Zend\Code\Annotation\AnnotationCollection,
     Zend\Code\Reflection;
 
-class RuntimeDefinition implements Definition
+class RuntimeDefinition implements DefinitionInterface
 {
 
     /**
diff --git a/src/DefinitionList.php b/src/DefinitionList.php
index 7d3f0cf6..d520f92c 100644
--- a/src/DefinitionList.php
+++ b/src/DefinitionList.php
@@ -4,7 +4,7 @@
 
 use SplDoublyLinkedList;
 
-class DefinitionList extends SplDoublyLinkedList implements Definition\Definition
+class DefinitionList extends SplDoublyLinkedList implements Definition\DefinitionInterface
 {
 
     public function __construct($definitions)
@@ -17,7 +17,7 @@ public function __construct($definitions)
         }
     }
     
-    public function addDefinition(Definition\Definition $definition, $addToBackOfList = true)
+    public function addDefinition(Definition\DefinitionInterface $definition, $addToBackOfList = true)
     {
         if ($addToBackOfList) {
             $this->push($definition);
@@ -57,7 +57,7 @@ public function getDefinitionByType($type)
 
     public function getDefinitionForClass($class)
     {
-        /** @var $definition Definition\Definition */
+        /** @var $definition Definition\DefinitionInterface */
         foreach ($this as $definition) {
             if ($definition->hasClass($class)) {
                 return $definition;
@@ -75,7 +75,7 @@ public function forClass($class)
     public function getClasses()
     {
         $classes = array();
-        /** @var $definition Definition\Definition */
+        /** @var $definition Definition\DefinitionInterface */
         foreach ($this as $definition) {
             $classes = array_merge($classes, $definition->getClasses());
         }
@@ -84,7 +84,7 @@ public function getClasses()
     
     public function hasClass($class)
     {
-        /** @var $definition Definition\Definition */
+        /** @var $definition Definition\DefinitionInterface */
         foreach ($this as $definition) {
             if ($definition->hasClass($class)) {
                 return true;
@@ -96,7 +96,7 @@ public function hasClass($class)
     public function getClassSupertypes($class)
     {
         $supertypes = array();
-        /** @var $definition Definition\Definition */
+        /** @var $definition Definition\DefinitionInterface */
         foreach ($this as $definition) {
             $supertypes = array_merge($supertypes, $definition->getClassSupertypes($class));
         }
@@ -106,7 +106,7 @@ public function getClassSupertypes($class)
     
     public function getInstantiator($class)
     {
-        /** @var $definition Definition\Definition */
+        /** @var $definition Definition\DefinitionInterface */
         foreach ($this as $definition) {
             if ($definition->hasClass($class)) {
                 $value = $definition->getInstantiator($class);
@@ -122,7 +122,7 @@ public function getInstantiator($class)
     
     public function hasMethods($class)
     {
-        /** @var $definition Definition\Definition */
+        /** @var $definition Definition\DefinitionInterface */
         foreach ($this as $definition) {
             if ($definition->hasClass($class)) {
                 if ($definition->hasMethods($class) === false && $definition instanceof Definition\PartialMarker) {
@@ -137,7 +137,7 @@ public function hasMethods($class)
     
     public function hasMethod($class, $method)
     {
-        /** @var $definition Definition\Definition */
+        /** @var $definition Definition\DefinitionInterface */
         foreach ($this as $definition) {
             if ($definition->hasClass($class)) {
                 if ($definition->hasMethods($class) === false && $definition instanceof Definition\PartialMarker) {
@@ -152,7 +152,7 @@ public function hasMethod($class, $method)
     
     public function getMethods($class)
     {
-        /** @var $definition Definition\Definition */
+        /** @var $definition Definition\DefinitionInterface */
         $methods = array();
         foreach ($this as $definition) {
             if ($definition->hasClass($class)) {
@@ -174,7 +174,7 @@ public function hasMethodParameters($class, $method)
 
     public function getMethodParameters($class, $method)
     {
-        /** @var $definition Definition\Definition */
+        /** @var $definition Definition\DefinitionInterface */
         foreach ($this as $definition) {
             if ($definition->hasClass($class) && $definition->hasMethod($class, $method) && $definition->hasMethodParameters($class, $method)) {
                 return $definition->getMethodParameters($class, $method);
diff --git a/src/DependencyInjection.php b/src/DependencyInjectionInterface.php
similarity index 87%
rename from src/DependencyInjection.php
rename to src/DependencyInjectionInterface.php
index 4e37f597..e09c3e57 100644
--- a/src/DependencyInjection.php
+++ b/src/DependencyInjectionInterface.php
@@ -2,7 +2,7 @@
 
 namespace Zend\Di;
 
-interface DependencyInjection extends Locator
+interface DependencyInjectionInterface extends LocatorInterface
 {
     /**
      * Retrieve a new instance of a class
diff --git a/src/Di.php b/src/Di.php
index 9a239e3a..3eca83e0 100644
--- a/src/Di.php
+++ b/src/Di.php
@@ -2,7 +2,7 @@
 
 namespace Zend\Di;
 
-class Di implements DependencyInjection
+class Di implements DependencyInjectionInterface
 {
     /**
      * @var DefinitionList
diff --git a/src/Exception.php b/src/Exception.php
deleted file mode 100644
index 4827dbd3..00000000
--- a/src/Exception.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-namespace Zend\Di;
-
-interface Exception
-{
-}
diff --git a/src/Exception/CircularDependencyException.php b/src/Exception/CircularDependencyException.php
index 16e8ab75..7662078f 100644
--- a/src/Exception/CircularDependencyException.php
+++ b/src/Exception/CircularDependencyException.php
@@ -1,9 +1,8 @@
 <?php
 namespace Zend\Di\Exception;
 
-use Zend\Di\Exception,
-    DomainException;
+use DomainException;
 
-class CircularDependencyException extends DomainException implements Exception
+class CircularDependencyException extends DomainException implements ExceptionInterface
 {
 }
diff --git a/src/Exception/ClassNotFoundException.php b/src/Exception/ClassNotFoundException.php
index 230ef5bb..d8c2739f 100644
--- a/src/Exception/ClassNotFoundException.php
+++ b/src/Exception/ClassNotFoundException.php
@@ -1,9 +1,8 @@
 <?php
 namespace Zend\Di\Exception;
 
-use Zend\Di\Exception,
-    DomainException;
+use DomainException;
 
-class ClassNotFoundException extends DomainException implements Exception
+class ClassNotFoundException extends DomainException implements ExceptionInterface
 {
 }
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
new file mode 100644
index 00000000..7cf778b8
--- /dev/null
+++ b/src/Exception/ExceptionInterface.php
@@ -0,0 +1,6 @@
+<?php
+namespace Zend\Di\Exception;
+
+interface ExceptionInterface
+{
+}
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index ca428a21..729c6768 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -1,10 +1,8 @@
 <?php
 namespace Zend\Di\Exception;
 
-use Zend\Di\Exception;
-
-class InvalidArgumentException 
-    extends \InvalidArgumentException 
-    implements Exception
+class InvalidArgumentException
+    extends \InvalidArgumentException
+    implements ExceptionInterface
 {
 }
diff --git a/src/Exception/InvalidParamNameException.php b/src/Exception/InvalidParamNameException.php
index a9958e2c..b58d59a7 100644
--- a/src/Exception/InvalidParamNameException.php
+++ b/src/Exception/InvalidParamNameException.php
@@ -1,10 +1,6 @@
 <?php
 namespace Zend\Di\Exception;
 
-use Zend\Di\Exception;
-
-class InvalidParamNameException 
-    extends InvalidArgumentException 
-    implements Exception
+class InvalidParamNameException extends InvalidArgumentException
 {
 }
diff --git a/src/Exception/InvalidPositionException.php b/src/Exception/InvalidPositionException.php
index 14dd5250..64189a92 100644
--- a/src/Exception/InvalidPositionException.php
+++ b/src/Exception/InvalidPositionException.php
@@ -1,10 +1,6 @@
 <?php
 namespace Zend\Di\Exception;
 
-use Zend\Di\Exception;
-
-class InvalidPositionException 
-    extends InvalidArgumentException 
-    implements Exception
+class InvalidPositionException extends InvalidArgumentException
 {
 }
diff --git a/src/Exception/MissingPropertyException.php b/src/Exception/MissingPropertyException.php
index 891ac894..0a31a99e 100644
--- a/src/Exception/MissingPropertyException.php
+++ b/src/Exception/MissingPropertyException.php
@@ -1,9 +1,8 @@
 <?php
 namespace Zend\Di\Exception;
 
-use Zend\Di\Exception,
-    DomainException;
+use DomainException;
 
-class MissingPropertyException extends DomainException implements Exception
+class MissingPropertyException extends DomainException implements ExceptionInterface
 {
 }
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
index c8e22a28..310581d7 100644
--- a/src/Exception/RuntimeException.php
+++ b/src/Exception/RuntimeException.php
@@ -1,8 +1,6 @@
 <?php
 namespace Zend\Di\Exception;
 
-use Zend\Di\Exception;
-
-class RuntimeException extends \RuntimeException implements Exception
+class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
 }
diff --git a/src/Exception/UndefinedReferenceException.php b/src/Exception/UndefinedReferenceException.php
index 369c0e43..88f7c1f0 100644
--- a/src/Exception/UndefinedReferenceException.php
+++ b/src/Exception/UndefinedReferenceException.php
@@ -1,9 +1,8 @@
 <?php
 namespace Zend\Di\Exception;
 
-use Zend\Di\Exception,
-    DomainException;
+use DomainException;
 
-class UndefinedReferenceException extends DomainException implements Exception
+class UndefinedReferenceException extends DomainException implements ExceptionInterface
 {
 }
diff --git a/src/InstanceManager.php b/src/InstanceManager.php
index 9f131456..9388afe9 100644
--- a/src/InstanceManager.php
+++ b/src/InstanceManager.php
@@ -2,7 +2,7 @@
 
 namespace Zend\Di;
 
-class InstanceManager /* implements InstanceCollection */
+class InstanceManager /* implements InstanceManagerInterface */
 {
     /**
      * Array of shared instances
diff --git a/src/Locator.php b/src/LocatorInterface.php
similarity index 92%
rename from src/Locator.php
rename to src/LocatorInterface.php
index acf8a79b..71483737 100644
--- a/src/Locator.php
+++ b/src/LocatorInterface.php
@@ -1,7 +1,7 @@
 <?php
 namespace Zend\Di;
 
-interface Locator
+interface LocatorInterface
 {
     /**
      * Retrieve a class instance
diff --git a/src/ServiceLocator.php b/src/ServiceLocator.php
index 6a3c2add..89852ce1 100644
--- a/src/ServiceLocator.php
+++ b/src/ServiceLocator.php
@@ -2,7 +2,7 @@
 
 namespace Zend\Di;
 
-class ServiceLocator implements ServiceLocation
+class ServiceLocator implements ServiceLocatorInterface
 {
     /**
      * Map of service names to methods
diff --git a/src/ServiceLocator/Generator.php b/src/ServiceLocator/Generator.php
index 2dba1f7d..3dd70883 100644
--- a/src/ServiceLocator/Generator.php
+++ b/src/ServiceLocator/Generator.php
@@ -4,7 +4,7 @@
 
 use Zend\Di\Di,
     Zend\CodeGenerator\Php as CodeGen,
-    Zend\Di\DependencyInjection,
+    Zend\Di\DependencyInjectionInterface,
     Zend\Di\Exception;
 
 class Generator
@@ -20,7 +20,7 @@ class Generator
      *
      * Requires a DependencyInjection manager on which to operate.
      * 
-     * @param  DependencyInjection $injector 
+     * @param  DependencyInjectionInterface $injector
      * @return void
      */
     public function __construct(Di $injector)
diff --git a/src/ServiceLocation.php b/src/ServiceLocatorInterface.php
similarity index 54%
rename from src/ServiceLocation.php
rename to src/ServiceLocatorInterface.php
index b130dfa4..ca773bd0 100644
--- a/src/ServiceLocation.php
+++ b/src/ServiceLocatorInterface.php
@@ -1,7 +1,7 @@
 <?php
 namespace Zend\Di;
 
-interface ServiceLocation extends Locator
+interface ServiceLocatorInterface extends LocatorInterface
 {
     public function set($name, $service);
 }
diff --git a/test/Definition/BuilderDefinitionTest.php b/test/Definition/BuilderDefinitionTest.php
index 04dd4ed8..5e006510 100644
--- a/test/Definition/BuilderDefinitionTest.php
+++ b/test/Definition/BuilderDefinitionTest.php
@@ -13,7 +13,7 @@ class BuilderDefinitionTest extends TestCase
     public function testBuilderImplementsDefinition()
     {
         $builder = new BuilderDefinition();
-        $this->assertInstanceOf('Zend\Di\Definition\Definition', $builder);
+        $this->assertInstanceOf('Zend\Di\Definition\DefinitionInterface', $builder);
     }
     
     public function testBuilderCanBuildClassWithMethods()