diff --git a/src/Exception.php b/src/Exception/ExceptionInterface.php
similarity index 93%
rename from src/Exception.php
rename to src/Exception/ExceptionInterface.php
index 1e229ba..c3c119c 100644
--- a/src/Exception.php
+++ b/src/Exception/ExceptionInterface.php
@@ -18,7 +18,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-namespace Zend\Mime;
+namespace Zend\Mime\Exception;
 
 /**
  * @category   Zend
@@ -26,6 +26,6 @@
  * @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
+interface ExceptionInterface
 {}
 
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
index ab616ff..1db9232 100644
--- a/src/Exception/RuntimeException.php
+++ b/src/Exception/RuntimeException.php
@@ -20,7 +20,8 @@
  */
 
 namespace Zend\Mime\Exception;
-use Zend\Mime\Exception;
+
+use RuntimeException;
 
 /**
  * Exception for Zend_Mime component.
@@ -32,7 +33,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException
-    extends \RuntimeException
-    implements Exception
+    extends RuntimeException
+    implements ExceptionInterface
 {
 }
\ No newline at end of file
diff --git a/src/Part.php b/src/Part.php
index 12f6adb..724bc4a 100644
--- a/src/Part.php
+++ b/src/Part.php
@@ -23,8 +23,6 @@
 /**
  * Class representing a MIME part.
  *
- * @uses       \Zend\Mime\Mime
- * @uses       \Zend\Mime\Exception
  * @category   Zend
  * @package    Zend_Mime
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
@@ -85,7 +83,7 @@ public function isStream()
      * reading the content. very useful for large file attachments.
      *
      * @return stream
-     * @throws \Zend\Mime\Exception if not a stream or unable to append filter
+     * @throws Exception\RuntimeException if not a stream or unable to append filter
      */
     public function getEncodedStream()
     {
diff --git a/test/MimeTest.php b/test/MimeTest.php
index e008b3a..6c555b3 100644
--- a/test/MimeTest.php
+++ b/test/MimeTest.php
@@ -19,10 +19,10 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-namespace Zend;
-use Zend\Mime;
-use Zend\Mail;
+namespace ZendTest\Mime;
 
+use Zend\Mime,
+    Zend\Mail;
 
 /**
  * @category   Zend