diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index d684d48..b078432 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -24,7 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Text
- * @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
  */
diff --git a/src/Exception/OutOfBoundsException.php b/src/Exception/OutOfBoundsException.php
new file mode 100644
index 0000000..51f5634
--- /dev/null
+++ b/src/Exception/OutOfBoundsException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Zend\Text\Exception;
+
+use Zend\Text\Exception;
+
+class OutOfBoundsException 
+    extends \OutOfBoundsException
+    implements ExceptionInterface
+{}
\ No newline at end of file
diff --git a/src/Exception/OverflowException.php b/src/Exception/OverflowException.php
new file mode 100644
index 0000000..32dd2fa
--- /dev/null
+++ b/src/Exception/OverflowException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Zend\Text\Exception;
+
+use Zend\Text\Exception;
+
+class OverflowException
+    extends \OverflowException
+    implements ExceptionInterface
+{}
\ No newline at end of file
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
new file mode 100644
index 0000000..7174ed9
--- /dev/null
+++ b/src/Exception/RuntimeException.php
@@ -0,0 +1,32 @@
+<?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_Text
+ * @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 Zend\Text\Exception;
+
+/**
+ * @category  Zend
+ * @package   Zend_Text
+ * @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 ExceptionInterface
+{}
\ No newline at end of file
diff --git a/src/Exception/UnexpectedValueException.php b/src/Exception/UnexpectedValueException.php
new file mode 100644
index 0000000..916fd7e
--- /dev/null
+++ b/src/Exception/UnexpectedValueException.php
@@ -0,0 +1,33 @@
+<?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_Text
+ * @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 Zend\Text\Exception;
+
+/**
+ * @category  Zend
+ * @package   Zend_Text
+ * @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/Figlet/Exception/InvalidArgumentException.php b/src/Figlet/Exception/InvalidArgumentException.php
index b2d2813..983d395 100644
--- a/src/Figlet/Exception/InvalidArgumentException.php
+++ b/src/Figlet/Exception/InvalidArgumentException.php
@@ -21,16 +21,17 @@
 
 namespace Zend\Text\Figlet\Exception;
 
+use Zend\Text\Exception;
+
 /**
- * Exception class for Zend_Figlet
+ * Exception class for Zend_Text
  *
  * @category  Zend
- * @package   Zend_Text_Figlet
+ * @package   Zend_Text
  * @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
+    extends Exception\InvalidArgumentException
     implements ExceptionInterface
-{
-}
+{}
\ No newline at end of file
diff --git a/src/Figlet/Exception/RuntimeException.php b/src/Figlet/Exception/RuntimeException.php
index 0b1c9a8..7452703 100644
--- a/src/Figlet/Exception/RuntimeException.php
+++ b/src/Figlet/Exception/RuntimeException.php
@@ -20,8 +20,10 @@
 
 namespace Zend\Text\Figlet\Exception;
 
+use Zend\Text\Exception;
+
 /**
- * Exception class for Zend_Figlet
+ * Exception class for Zend_Text
  *
  * @category  Zend
  * @package   Zend_Text_Figlet
@@ -29,7 +31,6 @@
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException 
-    extends \RuntimeException
+    extends Exception\RuntimeException
     implements ExceptionInterface
-{
-}
+{}
\ No newline at end of file
diff --git a/src/Figlet/Exception/UnexpectedValueException.php b/src/Figlet/Exception/UnexpectedValueException.php
index b45ff7e..af1c7a6 100644
--- a/src/Figlet/Exception/UnexpectedValueException.php
+++ b/src/Figlet/Exception/UnexpectedValueException.php
@@ -20,8 +20,10 @@
 
 namespace Zend\Text\Figlet\Exception;
 
+use Zend\Text\Exception;
+
 /**
- * Exception class for Zend_Figlet
+ * Exception class for Zend_Text
  *
  * @category  Zend
  * @package   Zend_Text_Figlet
@@ -29,7 +31,6 @@
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 class UnexpectedValueException 
-    extends \UnexpectedValueException
+    extends Exception\UnexpectedValueException
     implements ExceptionInterface
-{
-}
+{}
\ No newline at end of file
diff --git a/src/Table/Exception/OutOfBoundsException.php b/src/Table/Exception/OutOfBoundsException.php
index 7f184cd..dc0e452 100644
--- a/src/Table/Exception/OutOfBoundsException.php
+++ b/src/Table/Exception/OutOfBoundsException.php
@@ -1,8 +1,10 @@
 <?php
+
 namespace Zend\Text\Table\Exception;
 
+use Zend\Text\Exception;
+
 class OutOfBoundsException 
-    extends \OutOfBoundsException
+    extends Exception\OutOfBoundsException
     implements ExceptionInterface
-{
-}
+{}
\ No newline at end of file
diff --git a/src/Table/Exception/OverflowException.php b/src/Table/Exception/OverflowException.php
index 7890aa0..c3be4c7 100644
--- a/src/Table/Exception/OverflowException.php
+++ b/src/Table/Exception/OverflowException.php
@@ -1,8 +1,10 @@
 <?php
+
 namespace Zend\Text\Table\Exception;
 
+use Zend\Text\Exception;
+
 class OverflowException
-    extends \OverflowException
+    extends Exception\OverflowException
     implements ExceptionInterface
-{
-}
+{}
\ No newline at end of file
diff --git a/src/Table/Exception/UnexpectedValueException.php b/src/Table/Exception/UnexpectedValueException.php
index 4926650..f40cc09 100644
--- a/src/Table/Exception/UnexpectedValueException.php
+++ b/src/Table/Exception/UnexpectedValueException.php
@@ -1,8 +1,10 @@
 <?php
+
 namespace Zend\Text\Table\Exception;
 
+use Zend\Text\Exception;
+
 class UnexpectedValueException
-    extends \UnexpectedValueException
+    extends Exception\UnexpectedValueException
     implements ExceptionInterface
-{
-}
+{}
\ No newline at end of file