diff --git a/src/UglyQueue.php b/src/UglyQueue.php
index ac21d54..4619b00 100644
--- a/src/UglyQueue.php
+++ b/src/UglyQueue.php
@@ -4,7 +4,7 @@ use DCarbone\Helpers\FileHelper;
 
 /**
  * Class UglyQueue
- * @package DCarbone
+ * @package Cybercinch
  */
 class UglyQueue implements \Serializable, \SplSubject, \Countable
 {
diff --git a/src/UglyQueueEnum.php b/src/UglyQueueEnum.php
index 9c629c4..82757f0 100644
--- a/src/UglyQueueEnum.php
+++ b/src/UglyQueueEnum.php
@@ -2,7 +2,7 @@
 
 /**
  * Class UglyQueueEnum
- * @package DCarbone
+ * @package Cybercinch
  *
  * Pseudo-enum thing.
  */
diff --git a/src/UglyQueueManager.php b/src/UglyQueueManager.php
index 7f51a75..fd85d84 100644
--- a/src/UglyQueueManager.php
+++ b/src/UglyQueueManager.php
@@ -1,8 +1,10 @@
 <?php namespace Cybercinch;
 
+use InvalidArgumentException;
+
 /**
  * Class UglyQueueManager
- * @package DCarbone
+ * @package Cybercinch
  */
 class UglyQueueManager implements \SplObserver, \Countable
 {
@@ -17,12 +19,12 @@ class UglyQueueManager implements \SplObserver, \Countable
      *
      * @param string $baseDir
      * @throws \RuntimeException
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function __construct($baseDir)
     {
         if (false === is_string($baseDir))
-            throw new \InvalidArgumentException('Argument 1 expected to be string, "'.gettype($baseDir).'" seen.');
+            throw new InvalidArgumentException('Argument 1 expected to be string, "'.gettype($baseDir).'" seen.');
 
         if (false === is_dir($baseDir))
             throw new \RuntimeException('"'.$baseDir.'" points to a directory that does not exist.');
@@ -40,7 +42,7 @@ class UglyQueueManager implements \SplObserver, \Countable
 
     /**
      * @param string $name
-     * @return UglyQueue|UglyQueueManager
+     * @return UglyQueue
      */
     public function getQueue($name)
     {
@@ -56,7 +58,7 @@ class UglyQueueManager implements \SplObserver, \Countable
 
     /**
      * @param UglyQueue $uglyQueue
-     * @return \DCarbone\UglyQueueManager
+     * @return UglyQueueManager
      * @throws \RuntimeException
      */
     public function addQueue(UglyQueue $uglyQueue)
@@ -111,7 +113,7 @@ class UglyQueueManager implements \SplObserver, \Countable
 
     /**
      * @param UglyQueue $uglyQueue
-     * @return \DCarbone\UglyQueueManager
+     * @return UglyQueueManager
      */
     public function removeQueue(UglyQueue $uglyQueue)
     {
@@ -124,7 +126,7 @@ class UglyQueueManager implements \SplObserver, \Countable
 
     /**
      * @param string $name
-     * @return \DCarbone\UglyQueueManager
+     * @return UglyQueueManager
      */
     public function removeQueueByName($name)
     {
@@ -136,15 +138,15 @@ class UglyQueueManager implements \SplObserver, \Countable
 
     /**
      * @param string $name
-     * @return \DCarbone\UglyQueue
-     * @throws \InvalidArgumentException
+     * @return UglyQueue
+     * @throws InvalidArgumentException
      */
     public function getQueueWithName($name)
     {
         if (isset($this->queues[$name]))
             return $this->queues[$name];
 
-        throw new \InvalidArgumentException('Argument 1 expected to be valid queue name.');
+        throw new InvalidArgumentException('Argument 1 expected to be valid queue name.');
     }
 
     /**