diff --git a/library/Imbo/Database/MongoDB.php b/library/Imbo/Database/MongoDB.php
@@ -67,14 +67,14 @@ class MongoDB implements DatabaseInterface {
     /**
      * Mongo instance
      *
-     * @var Mongo
+     * @var \Mongo
      */
     private $mongo;
 
     /**
      * The collection instance used by the driver
      *
-     * @var MongoCollection
+     * @var \MongoCollection
      */
     private $collection;
 
@@ -100,8 +100,8 @@ class MongoDB implements DatabaseInterface {
      * Class constructor
      *
      * @param array $params Parameters for the driver
-     * @param Mongo $mongo Mongo instance
-     * @param MongoCollection $collection MongoCollection instance
+     * @param \Mongo $mongo Mongo instance
+     * @param \MongoCollection $collection MongoCollection instance
      */
     public function __construct(array $params = null, Mongo $mongo = null, MongoCollection $collection = null) {
         if ($params !== null) {
@@ -118,7 +118,7 @@ public function __construct(array $params = null, Mongo $mongo = null, MongoColl
     }
 
     /**
-     * @see Imbo\Database\DatabaseInterface::insertImage()
+     * {@inheritdoc}
      */
     public function insertImage($publicKey, $imageIdentifier, ImageInterface $image) {
         $now = time();
@@ -160,7 +160,7 @@ public function insertImage($publicKey, $imageIdentifier, ImageInterface $image)
     }
 
     /**
-     * @see Imbo\Database\DatabaseInterface::deleteImage()
+     * {@inheritdoc}
      */
     public function deleteImage($publicKey, $imageIdentifier) {
         try {
@@ -185,7 +185,7 @@ public function deleteImage($publicKey, $imageIdentifier) {
     }
 
     /**
-     * @see Imbo\Database\DatabaseInterface::updateMetadata()
+     * {@inheritdoc}
      */
     public function updateMetadata($publicKey, $imageIdentifier, array $metadata) {
         try {
@@ -206,7 +206,7 @@ public function updateMetadata($publicKey, $imageIdentifier, array $metadata) {
     }
 
     /**
-     * @see Imbo\Database\DatabaseInterface::getMetadata()
+     * {@inheritdoc}
      */
     public function getMetadata($publicKey, $imageIdentifier) {
         try {
@@ -226,7 +226,7 @@ public function getMetadata($publicKey, $imageIdentifier) {
     }
 
     /**
-     * @see Imbo\Database\DatabaseInterface::deleteMetadata()
+     * {@inheritdoc}
      */
     public function deleteMetadata($publicKey, $imageIdentifier) {
         try {
@@ -252,7 +252,7 @@ public function deleteMetadata($publicKey, $imageIdentifier) {
     }
 
     /**
-     * @see Imbo\Database\DatabaseInterface::getImages()
+     * {@inheritdoc}
      */
     public function getImages($publicKey, QueryInterface $query) {
         // Initialize return value
@@ -316,7 +316,7 @@ public function getImages($publicKey, QueryInterface $query) {
     }
 
     /**
-     * @see Imbo\Database\DatabaseInterface::load()
+     * {@inheritdoc}
      */
     public function load($publicKey, $imageIdentifier, ImageInterface $image) {
         try {
@@ -341,7 +341,7 @@ public function load($publicKey, $imageIdentifier, ImageInterface $image) {
     }
 
     /**
-     * @see Imbo\Database\DatabaseInterface::getLastModified()
+     * {@inheritdoc}
      */
     public function getLastModified($publicKey, $imageIdentifier = null) {
         try {
@@ -376,7 +376,7 @@ public function getLastModified($publicKey, $imageIdentifier = null) {
     }
 
     /**
-     * @see Imbo\Database\DatabaseInterface::getNumImages()
+     * {@inheritdoc}
      */
     public function getNumImages($publicKey) {
         try {
@@ -393,14 +393,14 @@ public function getNumImages($publicKey) {
     }
 
     /**
-     * @see Imbo\Database\DatabaseInterface::getStatus()
+     * {@inheritdoc}
      */
     public function getStatus() {
         return $this->getMongo()->connect();
     }
 
     /**
-     * @see Imbo\Database\DatabaseInterface::getImageMimeType()
+     * {@inheritdoc}
      */
     public function getImageMimeType($publicKey, $imageIdentifier) {
         try {
@@ -422,7 +422,7 @@ public function getImageMimeType($publicKey, $imageIdentifier) {
     /**
      * Get the mongo collection instance
      *
-     * @return MongoCollection
+     * @return \MongoCollection
      */
     protected function getCollection() {
         if ($this->collection === null) {
@@ -442,7 +442,7 @@ protected function getCollection() {
     /**
      * Get the mongo instance
      *
-     * @return Mongo
+     * @return \Mongo
      */
     protected function getMongo() {
         if ($this->mongo === null) {

diff --git a/library/Imbo/EventListener/AccessToken.php b/library/Imbo/EventListener/AccessToken.php
@@ -97,8 +97,9 @@ public function __construct(array $params = array()) {
             $this->params = array_replace_recursive($this->params, $params);
         }
     }
+
     /**
-     * @see Imbo\EventListener\ListenerInterface::getEvents()
+     * {@inheritdoc}
      */
     public function getEvents() {
         return array(
@@ -115,7 +116,7 @@ public function getEvents() {
     }
 
     /**
-     * @see Imbo\EventListener\ListenerInterface::invoke()
+     * {@inheritdoc}
      */
     public function invoke(EventInterface $event) {
         $request = $event->getContainer()->get('request');

diff --git a/library/Imbo/EventListener/Authenticate.php b/library/Imbo/EventListener/Authenticate.php
@@ -63,7 +63,7 @@ class Authenticate extends Listener implements ListenerInterface {
     private $algorithm = 'sha256';
 
     /**
-     * @see Imbo\EventListener\ListenerInterface::getEvents()
+     * {@inheritdoc}
      */
     public function getEvents() {
         return array(
@@ -80,7 +80,7 @@ public function getEvents() {
     }
 
     /**
-     * @see Imbo\EventListener\ListenerInterface::invoke()
+     * {@inheritdoc}
      */
     public function invoke(EventInterface $event) {
         $container = $event->getContainer();

diff --git a/library/Imbo/EventListener/ImageTransformationCache.php b/library/Imbo/EventListener/ImageTransformationCache.php
@@ -63,15 +63,15 @@ class ImageTransformationCache extends Listener implements ListenerInterface {
     /**
      * Content negotiation instance
      *
-     * @var Imbo\Http\ContentNegotiation
+     * @var ContentNegotiation
      */
     private $contentNegotiation;
 
     /**
      * Class constructor
      *
      * @param string $path Path to store the temp. images
-     * @param Imbo\Http\ContentNegotiation $contentNegotiation Content negotiation instance
+     * @param ContentNegotiation $contentNegotiation Content negotiation instance
      */
     public function __construct($path, ContentNegotiation $contentNegotiation = null) {
         $this->path = rtrim($path, '/');
@@ -84,7 +84,7 @@ public function __construct($path, ContentNegotiation $contentNegotiation = null
     }
 
     /**
-     * @see Imbo\EventListener\ListenerInterface::getEvents
+     * {@inheritdoc}
      */
     public function getEvents() {
         return array(
@@ -102,7 +102,7 @@ public function getEvents() {
     }
 
     /**
-     * @see Imbo\EventListener\ListenerInterface::invoke
+     * {@inheritdoc}
      */
     public function invoke(EventInterface $event) {
         $container = $event->getContainer();

diff --git a/library/Imbo/EventListener/Listener.php b/library/Imbo/EventListener/Listener.php
@@ -49,14 +49,14 @@ abstract class Listener implements ListenerInterface {
     private $publicKeys = array();
 
     /**
-     * @see Imbo\EventListener\ListenerInterface::getPublicKeys()
+     * {@inheritdoc}
      */
     public function getPublicKeys() {
         return $this->publicKeys;
     }
 
     /**
-     * @see Imbo\EventListener\ListenerInterface::setPublicKeys()
+     * {@inheritdoc}
      */
     public function setPublicKeys(array $keys) {
         $this->publicKeys = $keys;

diff --git a/library/Imbo/EventListener/ListenerInterface.php b/library/Imbo/EventListener/ListenerInterface.php
@@ -32,7 +32,8 @@
 
 namespace Imbo\EventListener;
 
-use Imbo\EventManager\EventInterface;
+use Imbo\EventManager\EventInterface,
+    Imbo\Exception;
 
 /**
  * Listener interface
@@ -65,7 +66,7 @@ function getPublicKeys();
      * Set the list of public keys the listener should be triggered for
      *
      * @param array $keys An array of public keys
-     * @return Imbo\EventListener\ListenerInterface
+     * @return ListenerInterface
      */
     function setPublicKeys(array $keys);
 
@@ -74,9 +75,9 @@ function setPublicKeys(array $keys);
      *
      * This method will get triggered by the event manager
      *
-     * @param Imbo\EventManager\EventInterface $event The triggered event
-     * @throws Imbo\Exception This method can throw exceptions implementing the base Imbo exception
-     *                        interface.
+     * @param EventInterface $event The triggered event
+     * @throws Exception This method can throw exceptions implementing the base Imbo exception
+     *                   interface.
      */
     function invoke(EventInterface $event);
 }
diff --git a/library/Imbo/EventListener/MaxImageSize.php b/library/Imbo/EventListener/MaxImageSize.php
@@ -72,7 +72,7 @@ public function __construct($width = null, $height = null) {
     }
 
     /**
-     * @see Imbo\EventListener\ListenerInterface::getEvents()
+     * {@inheritdoc}
      */
     public function getEvents() {
         return array(
@@ -81,7 +81,7 @@ public function getEvents() {
     }
 
     /**
-     * @see Imbo\EventListener\ListenerInterface::invoke()
+     * {@inheritdoc}
      */
     public function invoke(EventInterface $event) {
         $container = $event->getContainer();

diff --git a/library/Imbo/EventManager/Event.php b/library/Imbo/EventManager/Event.php
@@ -53,30 +53,30 @@ class Event implements EventInterface {
     /**
      * Container instance
      *
-     * @var Imbo\Container
+     * @var Container
      */
     private $container;
 
     /**
      * Class contsructor
      *
      * @param string $name The name of the current event
-     * @param Imbo\Container $container Container instance
+     * @param Container $container Container instance
      */
     public function __construct($name, Container $container) {
         $this->name = $name;
         $this->container = $container;
     }
 
     /**
-     * @see Imbo\EventManager\EventInterface::getName()
+     * {@inheritdoc}
      */
     public function getName() {
         return $this->name;
     }
 
     /**
-     * @see Imbo\EventManager\EventInterface::getContainer()
+     * {@inheritdoc}
      */
     public function getContainer() {
         return $this->container;

diff --git a/library/Imbo/EventManager/EventManager.php b/library/Imbo/EventManager/EventManager.php
@@ -55,21 +55,21 @@ class EventManager implements EventManagerInterface {
     /**
      * Container instance
      *
-     * @var Imbo\Container
+     * @var Container
      */
     private $container;
 
     /**
      * Class constructor
      *
-     * @param Imbo\Container $container Instance of a container
+     * @param Container $container Instance of a container
      */
     public function __construct(Container $container) {
         $this->container = $container;
     }
 
     /**
-     * @see Imbo\EveneManager\EventManagerInterface::attach()
+     * {@inheritdoc}
      */
     public function attach($events, $callback) {
         if (!is_array($events)) {
@@ -92,7 +92,7 @@ public function attach($events, $callback) {
     }
 
     /**
-     * @see Imbo\EventManager\EventManagagerInterface::attachListener()
+     * {@inheritdoc}
      */
     public function attachListener(ListenerInterface $listener) {
         // Fetch current public key
@@ -113,7 +113,7 @@ public function attachListener(ListenerInterface $listener) {
     }
 
     /**
-     * @see Imbo\EveneManager\EventManagerInterface::trigger()
+     * {@inheritdoc}
      */
     public function trigger($event) {
         if (!empty($this->events[$event])) {

diff --git a/library/Imbo/EventManager/EventManagerInterface.php b/library/Imbo/EventManager/EventManagerInterface.php
@@ -32,7 +32,8 @@
 
 namespace Imbo\EventManager;
 
-use Imbo\EventListener\ListenerInterface;
+use Imbo\EventListener\ListenerInterface,
+    Imbo\Exception\InvalidArgumentException;
 
 /**
  * Event manager interface
@@ -50,24 +51,24 @@ interface EventManagerInterface {
      *
      * @param array|string $events The event(s) to attach to
      * @param callback $callback Code that will be called when the event is triggered
-     * @throws Imbo\Exception\InvalidArgumentException
-     * @return Imbo\EventManager\EventManagerInterface
+     * @throws InvalidArgumentException
+     * @return EventManagerInterface
      */
     function attach($events, $callback);
 
     /**
      * Attach a listener to the event manager
      *
-     * @param Imbo\EventListener\ListenerInterface $listener The listener to attach
-     * @return Imbo\EventManager\EventManagerInterface
+     * @param ListenerInterface $listener The listener to attach
+     * @return EventManagerInterface
      */
     function attachListener(ListenerInterface $listener);
 
     /**
      * Trigger a given event
      *
      * @param string $event The event to trigger
-     * @return Imbo\EventManager\EventManagerInterface
+     * @return EventManagerInterface
      */
     function trigger($event);
 }
diff --git a/library/Imbo/Exception/InvalidArgumentException.php b/library/Imbo/Exception/InvalidArgumentException.php
@@ -52,7 +52,7 @@ class InvalidArgumentException extends BaseInvalidArgumentException implements E
     private $imboCode;
 
     /**
-     * @see Imbo\Exception::setImboErrorCode()
+     * {@inheritdoc}
      */
     public function setImboErrorCode($code) {
         $this->imboCode = (int) $code;
@@ -61,7 +61,7 @@ public function setImboErrorCode($code) {
     }
 
     /**
-     * @see Imbo\Exception::getImboErrorCode()
+     * {@inheritdoc}
      */
     public function getImboErrorCode() {
         return $this->imboCode;

diff --git a/library/Imbo/Exception/RuntimeException.php b/library/Imbo/Exception/RuntimeException.php
@@ -52,7 +52,7 @@ class RuntimeException extends BaseRuntimeException implements Exception {
     private $imboCode;
 
     /**
-     * @see Imbo\Exception::setImboErrorCode()
+     * {@inheritdoc}
      */
     public function setImboErrorCode($code) {
         $this->imboCode = (int) $code;
@@ -61,7 +61,7 @@ public function setImboErrorCode($code) {
     }
 
     /**
-     * @see Imbo\Exception::getImboErrorCode()
+     * {@inheritdoc}
      */
     public function getImboErrorCode() {
         return $this->imboCode;

diff --git a/library/Imbo/FrontController.php b/library/Imbo/FrontController.php
@@ -51,7 +51,7 @@ class FrontController {
     /**
      * Dependency injection container
      *
-     * @var Imbo\Container
+     * @var Container
      */
     private $container;
 
@@ -87,7 +87,7 @@ class FrontController {
     /**
      * Class constructor
      *
-     * @param Imbo\Container $container A container instance
+     * @param Container $container A container instance
      */
     public function __construct(Container $container) {
         $this->container = $container;
@@ -96,9 +96,9 @@ public function __construct(Container $container) {
     /**
      * Create a resource object based on the request
      *
-     * @param Imbo\Http\Request\RequestInterface $request A request instance
-     * @return Imbo\Resource\ResourceInterface
-     * @throws Imbo\Exception\RuntimeException
+     * @param RequestInterface $request A request instance
+     * @return ResourceInterface
+     * @throws RuntimeException
      */
     private function resolveResource(RequestInterface $request) {
         // Fetch current path
@@ -163,9 +163,9 @@ private function resolveResource(RequestInterface $request) {
     /**
      * Handle a request
      *
-     * @param Imbo\Http\Request\RequestInterface $request The request object
-     * @param Imbo\Http\Response\ResponseInterface $response The response object
-     * @throws Imbo\Exception\RuntimeException
+     * @param RequestInterface $request The request object
+     * @param ResponseInterface $response The response object
+     * @throws RuntimeException
      */
     public function handle(RequestInterface $request, ResponseInterface $response) {
         $httpMethod = $request->getMethod();

diff --git a/library/Imbo/Http/HeaderContainer.php b/library/Imbo/Http/HeaderContainer.php
@@ -67,28 +67,28 @@ private function getName($name) {
     }
 
     /**
-     * @see Imbo\Http\ParameterContainerInterface::set()
+     * {@inheritdoc}
      */
     public function set($key, $value) {
         return parent::set($this->getName($key), $value);
     }
 
     /**
-     * @see Imbo\Http\ParameterContainerInterface::get()
+     * {@inheritdoc}
      */
     public function get($key, $default = null) {
         return parent::get($this->getName($key), $default);
     }
 
     /**
-     * @see Imbo\Http\ParameterContainerInterface::remove()
+     * {@inheritdoc}
      */
     public function remove($key) {
         return parent::remove($this->getName($key));
     }
 
     /**
-     * @see Imbo\Http\ParameterContainerInterface::has()
+     * {@inheritdoc}
      */
     public function has($key) {
         return parent::has($this->getName($key));

diff --git a/library/Imbo/Http/ParameterContainer.php b/library/Imbo/Http/ParameterContainer.php
@@ -63,14 +63,14 @@ public function __construct(array $parameters) {
     }
 
     /**
-     * @see Imbo\Http\ParameterContainerInterface::getAll()
+     * {@inheritdoc}
      */
     public function getAll() {
         return $this->parameters;
     }
 
     /**
-     * @see Imbo\Http\ParameterContainerInterface::removeAll()
+     * {@inheritdoc}
      */
     public function removeAll() {
         $this->parameters = array();
@@ -79,7 +79,7 @@ public function removeAll() {
     }
 
     /**
-     * @see Imbo\Http\ParameterContainerInterface::set()
+     * {@inheritdoc}
      */
     public function set($key, $value) {
         $this->parameters[$key] = $value;
@@ -88,14 +88,14 @@ public function set($key, $value) {
     }
 
     /**
-     * @see Imbo\Http\ParameterContainerInterface::get()
+     * {@inheritdoc}
      */
     public function get($key, $default = null) {
         return isset($this->parameters[$key]) ? $this->parameters[$key] : $default;
     }
 
     /**
-     * @see Imbo\Http\ParameterContainerInterface::remove()
+     * {@inheritdoc}
      */
     public function remove($key) {
         unset($this->parameters[$key]);
@@ -104,14 +104,14 @@ public function remove($key) {
     }
 
     /**
-     * @see Imbo\Http\ParameterContainerInterface::has()
+     * {@inheritdoc}
      */
     public function has($key) {
         return isset($this->parameters[$key]);
     }
 
     /**
-     * @see Imbo\Http\ParameterContainerInterface::asString()
+     * {@inheritdoc}
      */
     public function asString() {
         // Translate %5B and %5D back to [] as the client uses [] when generating the access token

diff --git a/library/Imbo/Http/Request/Request.php b/library/Imbo/Http/Request/Request.php
@@ -58,28 +58,28 @@ class Request implements RequestInterface {
     /**
      * Query data
      *
-     * @var Imbo\Http\ParameterContainerInterface
+     * @var ParameterContainerInterface
      */
     private $query;
 
     /**
      * Request data
      *
-     * @var Imbo\Http\ParameterContainerInterface
+     * @var ParameterContainerInterface
      */
     private $request;
 
     /**
      * Server data
      *
-     * @var Imbo\Http\ServerContainerInterface
+     * @var ServerContainerInterface
      */
     private $server;
 
     /**
      * HTTP headers
      *
-     * @var Imbo\Http\HeaderContainer
+     * @var HeaderContainer
      */
     private $headers;
 
@@ -129,7 +129,7 @@ class Request implements RequestInterface {
     /**
      * Chain of image transformations
      *
-     * @var Imbo\Image\TransformationChain
+     * @var TransformationChain
      */
     private $transformationChain;
 
@@ -155,14 +155,14 @@ public function __construct(array $query = array(), array $request = array(), ar
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::getPublicKey()
+     * {@inheritdoc}
      */
     public function getPublicKey() {
         return $this->publicKey;
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::setPublicKey()
+     * {@inheritdoc}
      */
     public function setPublicKey($key) {
         $this->publicKey = $key;
@@ -171,14 +171,14 @@ public function setPublicKey($key) {
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::getPrivateKey()
+     * {@inheritdoc}
      */
     public function getPrivateKey() {
         return $this->privateKey;
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::setPrivateKey()
+     * {@inheritdoc}
      */
     public function setPrivateKey($key) {
         $this->privateKey = $key;
@@ -187,7 +187,7 @@ public function setPrivateKey($key) {
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::getTransformations()
+     * {@inheritdoc}
      */
     public function getTransformations() {
         if ($this->transformationChain === null) {
@@ -266,14 +266,14 @@ public function getTransformations() {
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::hasTransformations()
+     * {@inheritdoc}
      */
     public function hasTransformations() {
         return $this->getExtension() || $this->getQuery()->has('t');
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::getScheme()
+     * {@inheritdoc}
      */
     public function getScheme() {
         $https = strtolower($this->server->get('HTTPS'));
@@ -282,7 +282,7 @@ public function getScheme() {
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::getHost()
+     * {@inheritdoc}
      */
     public function getHost() {
         $host = $this->server->get('HTTP_HOST');
@@ -296,28 +296,28 @@ public function getHost() {
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::getPort()
+     * {@inheritdoc}
      */
     public function getPort() {
         return $this->server->get('SERVER_PORT');
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::getBaseUrl()
+     * {@inheritdoc}
      */
     public function getBaseUrl() {
         return $this->baseUrl;
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::getPath()
+     * {@inheritdoc}
      */
     public function getPath() {
         return $this->path;
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::getUrl()
+     * {@inheritdoc}
      */
     public function getUrl() {
         $port = (int) $this->getPort();
@@ -346,14 +346,14 @@ public function getUrl() {
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::getImageIdentifier()
+     * {@inheritdoc}
      */
     public function getImageIdentifier() {
         return $this->imageIdentifier;
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::setImageIdentifier()
+     * {@inheritdoc}
      */
     public function setImageIdentifier($imageIdentifier) {
         $this->imageIdentifier = $imageIdentifier;
@@ -362,7 +362,7 @@ public function setImageIdentifier($imageIdentifier) {
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::getRealImageIdentifier()
+     * {@inheritdoc}
      */
     public function getRealImageIdentifier() {
         if ($this->rawData === null) {
@@ -373,14 +373,14 @@ public function getRealImageIdentifier() {
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::getExtension()
+     * {@inheritdoc}
      */
     public function getExtension() {
         return $this->extension;
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::setExtension()
+     * {@inheritdoc}
      */
     public function setExtension($extension) {
         $this->extension = $extension;
@@ -389,14 +389,14 @@ public function setExtension($extension) {
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::getMethod()
+     * {@inheritdoc}
      */
     public function getMethod() {
         return $this->server->get('REQUEST_METHOD');
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::getRawData()
+     * {@inheritdoc}
      */
     public function getRawData() {
         if ($this->rawData === null) {
@@ -407,7 +407,7 @@ public function getRawData() {
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::setRawData()
+     * {@inheritdoc}
      */
     public function setRawData($data) {
         $this->rawData = $data;
@@ -416,35 +416,35 @@ public function setRawData($data) {
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::getQuery()
+     * {@inheritdoc}
      */
     public function getQuery() {
         return $this->query;
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::getRequest()
+     * {@inheritdoc}
      */
     public function getRequest() {
         return $this->request;
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::getServer()
+     * {@inheritdoc}
      */
     public function getServer() {
         return $this->server;
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::getHeaders()
+     * {@inheritdoc}
      */
     public function getHeaders() {
         return $this->headers;
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::isUnsafe()
+     * {@inheritdoc}
      */
     public function isUnsafe() {
         $method = $this->getMethod();
@@ -455,7 +455,7 @@ public function isUnsafe() {
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::splitAcceptHeader()
+     * {@inheritdoc}
      */
     public function splitAcceptHeader($header) {
         if (!$header) {
@@ -509,14 +509,14 @@ public function splitAcceptHeader($header) {
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::getAcceptableContentTypes()
+     * {@inheritdoc}
      */
     public function getAcceptableContentTypes() {
         return $this->splitAcceptHeader($this->headers->get('Accept'));
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::setResource()
+     * {@inheritdoc}
      */
     public function setResource($resource) {
         $this->resource = $resource;
@@ -525,7 +525,7 @@ public function setResource($resource) {
     }
 
     /**
-     * @see Imbo\Http\Request\RequestInterface::getResource()
+     * {@inheritdoc}
      */
     public function getResource() {
         return $this->resource;

diff --git a/library/Imbo/Http/Request/RequestInterface.php b/library/Imbo/Http/Request/RequestInterface.php
@@ -32,6 +32,9 @@
 
 namespace Imbo\Http\Request;
 
+use Imbo\Exception\InvalidArgumentException,
+    Imbo\Image\TransformationChain;
+
 /**
  * Request interface
  *
@@ -67,7 +70,7 @@ function getPublicKey();
      * Set the public key
      *
      * @param string $key The key to set
-     * @return Imbo\Http\Request\RequestInterface
+     * @return RequestInterface
      */
     function setPublicKey($key);
 
@@ -85,7 +88,7 @@ function getPrivateKey();
      * Set the private key
      *
      * @param string $key The key to set
-     * @return Imbo\Http\Request\RequestInterface
+     * @return RequestInterface
      */
     function setPrivateKey($key);
 
@@ -95,8 +98,8 @@ function setPrivateKey($key);
      * If someone specified a transformation that does not exist, an
      * Imbo\Exception\InvalidArgumentException exception must be thrown.
      *
-     * @throws Imbo\Exception\InvalidArgumentException
-     * @return Imbo\Image\TransformationChain
+     * @throws InvalidArgumentException
+     * @return TransformationChain
      */
     function getTransformations();
 
@@ -168,7 +171,7 @@ function getImageIdentifier();
      * Set the image identifier
      *
      * @param string $imageIdentifier The image identifier to set
-     * @return Imbo\Http\Request\RequestInterface
+     * @return RequestInterface
      */
     function setImageIdentifier($imageIdentifier);
 
@@ -192,7 +195,7 @@ function getExtension();
      * Set the extension requested
      *
      * @param string $extension The extension to set
-     * @return Imbo\Http\Request\RequestInterface
+     * @return RequestInterface
      */
     function setExtension($extension);
 
@@ -218,35 +221,35 @@ function getRawData();
      * This method must also update the current imageIdentifier
      *
      * @param string $data The data to set
-     * @return Imbo\Http\Request\RequestInterface
+     * @return RequestInterface
      */
     function setRawData($data);
 
     /**
      * Get the query container
      *
-     * @return Imbo\Http\ParameterContainerInterface
+     * @return ParameterContainerInterface
      */
     function getQuery();
 
     /**
      * Get the requerst container
      *
-     * @return Imbo\Http\ParameterContainer
+     * @return ParameterContainer
      */
     function getRequest();
 
     /**
      * Get the server container
      *
-     * @return Imbo\Http\ServerContainerInterface
+     * @return ServerContainerInterface
      */
     function getServer();
 
     /**
      * Get the HTTP headers
      *
-     * @return Imbo\Http\HeaderContainer
+     * @return HeaderContainer
      */
     function getHeaders();
 
@@ -279,7 +282,7 @@ function getAcceptableContentTypes();
      * Set the resource name (one of the constants defined in Imbo\Resource\ResourceInterface)
      *
      * @param string $resource The name of the resource
-     * @return Imbo\Http\Request\RequestInterface
+     * @return RequestInterface
      */
     function setResource($resource);
 

diff --git a/library/Imbo/Http/Response/Formatter/HTML.php b/library/Imbo/Http/Response/Formatter/HTML.php
@@ -48,7 +48,7 @@
  */
 class HTML implements FormatterInterface {
     /**
-     * @see Imbo\Http\Response\Formatter\FormatterInterface::format()
+     * {@inheritdoc}
      */
     public function format(array $data, RequestInterface $request, ResponseInterface $response) {
         // Fetch the name of the resource
@@ -68,7 +68,7 @@ public function format(array $data, RequestInterface $request, ResponseInterface
     }
 
     /**
-     * @see Imbo\Http\Response\Formatter\FormatterInterface::getContentType()
+     * {@inheritdoc}
      */
     public function getContentType() {
         return 'text/html';

diff --git a/library/Imbo/Http/Response/Formatter/JSON.php b/library/Imbo/Http/Response/Formatter/JSON.php
@@ -47,7 +47,7 @@
  */
 class JSON implements FormatterInterface {
     /**
-     * @see Imbo\Http\Response\Formatter\FormatterInterface::format()
+     * {@inheritdoc}
      */
     public function format(array $data, RequestInterface $request, ResponseInterface $response) {
         // Simply encode the data to JSON, no matter what resource we are dealing with
@@ -65,7 +65,7 @@ public function format(array $data, RequestInterface $request, ResponseInterface
     }
 
     /**
-     * @see Imbo\Http\Response\Formatter\FormatterInterface::getContentType()
+     * {@inheritdoc}
      */
     public function getContentType() {
         return 'application/json';

diff --git a/library/Imbo/Http/Response/Formatter/XML.php b/library/Imbo/Http/Response/Formatter/XML.php
@@ -49,7 +49,7 @@
  */
 class XML implements FormatterInterface {
     /**
-     * @see Imbo\Http\Response\Formatter\FormatterInterface::format()
+     * {@inheritdoc}
      */
     public function format(array $data, RequestInterface $request, ResponseInterface $response) {
         // Fetch the name of the resource
@@ -69,7 +69,7 @@ public function format(array $data, RequestInterface $request, ResponseInterface
     }
 
     /**
-     * @see Imbo\Http\Response\Formatter\FormatterInterface::getContentType()
+     * {@inheritdoc}
      */
     public function getContentType() {
         return 'text/xml';

diff --git a/library/Imbo/Http/Response/Response.php b/library/Imbo/Http/Response/Response.php
@@ -127,7 +127,7 @@ class Response implements ResponseInterface {
     /**
      * Response headers
      *
-     * @var Imbo\Http\HeaderContainer
+     * @var HeaderContainer
      */
     private $headers;
 
@@ -141,9 +141,8 @@ class Response implements ResponseInterface {
     /**
      * Class constructor
      *
-     * @param Imbo\Http\HeaderContainer $headerContainer An optional instance of a header
-     *                                                     container. An empty one will be created
-     *                                                     if not specified.
+     * @param HeaderContainer $headerContainer An optional instance of a header container. An empty
+     *                                         one will be created if not specified.
      */
     public function __construct(HeaderContainer $headerContainer = null) {
         if ($headerContainer === null) {
@@ -154,14 +153,14 @@ public function __construct(HeaderContainer $headerContainer = null) {
     }
 
     /**
-     * @see Imbo\Http\Response\ResponseInterface::getStatusCode()
+     * {@inheritdoc}
      */
     public function getStatusCode() {
         return $this->statusCode;
     }
 
     /**
-     * @see Imbo\Http\Response\ResponseInterface::setStatusCode()
+     * {@inheritdoc}
      */
     public function setStatusCode($code, $message = null) {
         $this->statusCode = (int) $code;
@@ -174,14 +173,14 @@ public function setStatusCode($code, $message = null) {
     }
 
     /**
-     * @see Imbo\Http\Response\ResponseInterface::getHeaders()
+     * {@inheritdoc}
      */
     public function getHeaders() {
         return $this->headers;
     }
 
     /**
-     * @see Imbo\Http\Response\ResponseInterface::setHeaders()
+     * {@inheritdoc}
      */
     public function setHeaders(HeaderContainer $headers) {
         $this->headers = $headers;
@@ -190,14 +189,14 @@ public function setHeaders(HeaderContainer $headers) {
     }
 
     /**
-     * @see Imbo\Http\Response\ResponseInterface::getBody()
+     * {@inheritdoc}
      */
     public function getBody() {
         return $this->body;
     }
 
     /**
-     * @see Imbo\Http\Response\ResponseInterface::setBody()
+     * {@inheritdoc}
      */
     public function setBody($content) {
         $this->body = $content;
@@ -206,14 +205,14 @@ public function setBody($content) {
     }
 
     /**
-     * @see Imbo\Http\Response\ResponseInterface::getProtocolVersion()
+     * {@inheritdoc}
      */
     public function getProtocolVersion() {
         return $this->protocolVersion;
     }
 
     /**
-     * @see Imbo\Http\Response\ResponseInterface::setProtocolVersion()
+     * {@inheritdoc}
      */
     public function setProtocolVersion($version) {
         $this->protocolVersion = $version;
@@ -222,15 +221,15 @@ public function setProtocolVersion($version) {
     }
 
     /**
-     * @see Imbo\Http\Response\ResponseInterface::send()
+     * {@inheritdoc}
      */
     public function send() {
         $this->sendHeaders();
         $this->sendContent();
     }
 
     /**
-     * @see Imbo\Http\Response\ResponseInterface::setNotModified()
+     * {@inheritdoc}
      */
     public function setNotModified() {
         $this->setStatusCode(304);
@@ -245,16 +244,14 @@ public function setNotModified() {
     }
 
     /**
-     * @see Imbo\Http\Response\ResponseInterface::isError()
+     * {@inheritdoc}
      */
     public function isError() {
         return $this->getStatusCode() >= 400;
     }
 
     /**
      * Send all headers to the client
-     *
-     * @codeCoverageIgnore
      */
     private function sendHeaders() {
         if (headers_sent()) {

diff --git a/library/Imbo/Http/Response/ResponseInterface.php b/library/Imbo/Http/Response/ResponseInterface.php
@@ -58,22 +58,22 @@ function getStatusCode();
      * @param int $code The HTTP status code to use in the response
      * @param string $message A custom message to send in the status line instead of the default
      *                        status messages defined in Imbo\Http\Response\Response.php.
-     * @return Imbo\Http\Response\ResponseInterface
+     * @return ResponseInterface
      */
     function setStatusCode($code, $message = null);
 
     /**
      * Get the header container
      *
-     * @return Imbo\Http\HeaderContainer
+     * @return HeaderContainer
      */
     function getHeaders();
 
     /**
      * Set the header container
      *
-     * @param Imbo\Http\HeaderContainer
-     * @return Imbo\Http\Response\ResponesInterface
+     * @param HeaderContainer $headers Container of headers
+     * @return ResponesInterface
      */
     function setHeaders(HeaderContainer $headers);
 
@@ -87,8 +87,8 @@ function getBody();
     /**
      * Set the body
      *
-     * @param Imbo\Image\ImageInterface|array $content Either an image instance, or an array
-     * @return Imbo\Http\Response\ResponseInterface
+     * @param ImageInterface|array $content Either an image instance, or an array
+     * @return ResponseInterface
      */
     function setBody($content);
 
@@ -103,7 +103,7 @@ function getProtocolVersion();
      * Set the protocol version header
      *
      * @param string $version The version to set
-     * @return Imbo\Http\Response\ResponseInterface
+     * @return ResponseInterface
      */
     function setProtocolVersion($version);
 
@@ -115,7 +115,7 @@ function send();
     /**
      * Prepare the response to send 304 Not Modified to the client
      *
-     * @return Imbo\Http\Response\ResponseInterface
+     * @return ResponseInterface
      */
     function setNotModified();
 

diff --git a/library/Imbo/Http/Response/ResponseWriter.php b/library/Imbo/Http/Response/ResponseWriter.php
@@ -51,7 +51,7 @@ class ResponseWriter implements ResponseWriterInterface {
     /**
      * Content negotiation instance
      *
-     * @var Imbo\Http\ContentNegotiation
+     * @var ContentNegotiation
      */
     private $cn;
 
@@ -87,7 +87,7 @@ class ResponseWriter implements ResponseWriterInterface {
     /**
      * Class constructor
      *
-     * @param Imbo\Http\ContentNegotiation $cn Content negotiation instance
+     * @param ContentNegotiation $cn Content negotiation instance
      */
     public function __construct(ContentNegotiation $cn = null) {
         if ($cn === null) {
@@ -98,7 +98,7 @@ public function __construct(ContentNegotiation $cn = null) {
     }
 
     /**
-     * @see Imbo\Http\Response\ResponseWriterInterface::write()
+     * {@inheritdoc}
      */
     public function write(array $data, RequestInterface $request, ResponseInterface $response, $strict = true) {
         // The formatter to use

diff --git a/library/Imbo/Http/Response/ResponseWriterInterface.php b/library/Imbo/Http/Response/ResponseWriterInterface.php
@@ -49,12 +49,12 @@ interface ResponseWriterInterface {
      * Return a formatted message using a chosen formatter based on the request
      *
      * @param array $data Data to write in another format
-     * @param Imbo\Http\Request\RequestInterface $request A request instance
-     * @param Imbo\Http\Response\ResponseInterface $response A response instance
+     * @param RequestInterface $request A request instance
+     * @param ResponseInterface $response A response instance
      * @param boolean $strict Whether or not the response writer will throw a RuntimeException with
      *                        status code 406 (Not Acceptable) if it can not produce acceptable
      *                        content for the user agent.
-     * @throws Imbo\Exception\RuntimeException
+     * @throws RuntimeException
      */
     function write(array $data, RequestInterface $request, ResponseInterface $response, $strict = true);
 }
diff --git a/library/Imbo/Http/ServerContainer.php b/library/Imbo/Http/ServerContainer.php
@@ -46,7 +46,7 @@
  */
 class ServerContainer extends ParameterContainer implements ServerContainerInterface {
     /**
-     * @see Imbo\Http\ServerContainerInterface::getHeaders()
+     * {@inheritdoc}
      */
     public function getHeaders() {
         $headers = array();

diff --git a/library/Imbo/Image/Image.php b/library/Imbo/Image/Image.php
@@ -102,21 +102,21 @@ class Image implements ImageInterface {
     private $height;
 
     /**
-     * @use Imbo\Image\ImageInterface::getFilesize()
+     * {@inheritdoc}
      */
     public function getFilesize() {
         return $this->filesize;
     }
 
     /**
-     * @use Imbo\Image\ImageInterface::getMimeType()
+     * {@inheritdoc}
      */
     public function getMimeType() {
         return $this->mimeType;
     }
 
     /**
-     * @use Imbo\Image\ImageInterface::setMimeType()
+     * {@inheritdoc}
      */
     public function setMimeType($mimeType) {
         $this->mimeType = $mimeType;
@@ -125,14 +125,14 @@ public function setMimeType($mimeType) {
     }
 
     /**
-     * @use Imbo\Image\ImageInterface::getExtension()
+     * {@inheritdoc}
      */
     public function getExtension() {
         return $this->extension;
     }
 
     /**
-     * @use Imbo\Image\ImageInterface::setExtension()
+     * {@inheritdoc}
      */
     public function setExtension($extension) {
         $this->extension = $extension;
@@ -141,14 +141,14 @@ public function setExtension($extension) {
     }
 
     /**
-     * @use Imbo\Image\ImageInterface::getBlob()
+     * {@inheritdoc}
      */
     public function getBlob() {
         return $this->blob;
     }
 
     /**
-     * @use Imbo\Image\ImageInterface::setBlob()
+     * {@inheritdoc}
      */
     public function setBlob($blob) {
         $this->blob = $blob;
@@ -158,14 +158,14 @@ public function setBlob($blob) {
     }
 
     /**
-     * @use Imbo\Image\ImageInterface::getMetadata()
+     * {@inheritdoc}
      */
     public function getMetadata() {
         return $this->metadata;
     }
 
     /**
-     * @use Imbo\Image\ImageInterface::setMetadata()
+     * {@inheritdoc}
      */
     public function setMetadata(array $metadata) {
         $this->metadata = $metadata;
@@ -174,14 +174,14 @@ public function setMetadata(array $metadata) {
     }
 
     /**
-     * @use Imbo\Image\ImageInterface::getWidth()
+     * {@inheritdoc}
      */
     public function getWidth() {
         return $this->width;
     }
 
     /**
-     * @use Imbo\Image\ImageInterface::setWidth()
+     * {@inheritdoc}
      */
     public function setWidth($width) {
         $this->width = (int) $width;
@@ -190,14 +190,14 @@ public function setWidth($width) {
     }
 
     /**
-     * @use Imbo\Image\ImageInterface::getHeight()
+     * {@inheritdoc}
      */
     public function getHeight() {
         return $this->height;
     }
 
     /**
-     * @use Imbo\Image\ImageInterface::setHeight()
+     * {@inheritdoc}
      */
     public function setHeight($height) {
         $this->height = (int) $height;
@@ -206,14 +206,14 @@ public function setHeight($height) {
     }
 
     /**
-     * @use Imbo\Image\ImageInterface::supportedMimeType()
+     * {@inheritdoc}
      */
     static public function supportedMimeType($mime) {
         return isset(self::$mimeTypes[$mime]);
     }
 
     /**
-     * @use Imbo\Image\ImageInterface::getFileExtension()
+     * {@inheritdoc}
      */
     static public function getFileExtension($mime) {
         return isset(self::$mimeTypes[$mime]) ? self::$mimeTypes[$mime] : false;

diff --git a/library/Imbo/Image/ImagePreparation.php b/library/Imbo/Image/ImagePreparation.php
@@ -47,7 +47,7 @@
  */
 class ImagePreparation implements ImagePreparationInterface {
     /**
-     * @see Imbo\Image\ImagePreparationInterface::prepareImage()
+     * {@inheritdoc}
      */
     public function prepareImage(RequestInterface $request, ImageInterface $image) {
         // Fetch image data from input

diff --git a/library/Imbo/Image/ImagePreparationInterface.php b/library/Imbo/Image/ImagePreparationInterface.php
@@ -32,7 +32,8 @@
 
 namespace Imbo\Image;
 
-use Imbo\Http\Request\RequestInterface;
+use Imbo\Http\Request\RequestInterface,
+    Imbo\Exception\ImageException;
 
 /**
  * Image preparation interface
@@ -51,10 +52,10 @@ interface ImagePreparationInterface {
      * This method should prepare an image object from php://input. The method must also figure out
      * the width, height, mime type  and extension of the image.
      *
-     * @param Imbo\Http\Request\RequestInterface $request A request instance
-     * @param Imbo\Image\ImageInterface $image An image instance
-     * @throws Imbo\Exception\ImageException
-     * @return Imbo\Image\ImagePreparationInterface
+     * @param RequestInterface $request A request instance
+     * @param ImageInterface $image An image instance
+     * @throws ImageException
+     * @return ImagePreparationInterface
      */
     function prepareImage(RequestInterface $request, ImageInterface $image);
 }
diff --git a/library/Imbo/Image/Transformation/Border.php b/library/Imbo/Image/Transformation/Border.php
@@ -91,7 +91,7 @@ public function __construct($color = null, $width = null, $height = null) {
     }
 
     /**
-     * @see Imbo\Image\Transformation\TransformationInterface::applyToImage()
+     * {@inheritdoc}
      */
     public function applyToImage(ImageInterface $image) {
         try {

diff --git a/library/Imbo/Image/Transformation/Canvas.php b/library/Imbo/Image/Transformation/Canvas.php
@@ -132,7 +132,7 @@ public function __construct($width, $height, $mode = 'free', $x = 0, $y = 0, $bg
     }
 
     /**
-     * @see Imbo\Image\Transformation\TransformationInterface::applyToImage()
+     * {@inheritdoc}
      */
     public function applyToImage(ImageInterface $image) {
         try {

diff --git a/library/Imbo/Image/Transformation/Compress.php b/library/Imbo/Image/Transformation/Compress.php
@@ -64,7 +64,7 @@ public function __construct($quality) {
     }
 
     /**
-     * @see Imbo\Image\Transformation\TransformationInterface::applyToImage()
+     * {@inheritdoc}
      */
     public function applyToImage(ImageInterface $image) {
         try {

diff --git a/library/Imbo/Image/Transformation/Convert.php b/library/Imbo/Image/Transformation/Convert.php
@@ -67,7 +67,7 @@ public function __construct($type) {
     }
 
     /**
-     * @see Imbo\Image\Transformation\TransformationInterface::applyToImage()
+     * {@inheritdoc}
      */
     public function applyToImage(ImageInterface $image) {
         if ($image->getExtension() === $this->type) {

diff --git a/library/Imbo/Image/Transformation/Crop.php b/library/Imbo/Image/Transformation/Crop.php
@@ -91,7 +91,7 @@ public function __construct($x, $y, $width, $height) {
     }
 
     /**
-     * @see Imbo\Image\Transformation\TransformationInterface::applyToImage()
+     * {@inheritdoc}
      */
     public function applyToImage(ImageInterface $image) {
         try {

diff --git a/library/Imbo/Image/Transformation/FlipHorizontally.php b/library/Imbo/Image/Transformation/FlipHorizontally.php
@@ -48,7 +48,7 @@
  */
 class FlipHorizontally extends Transformation implements TransformationInterface {
     /**
-     * @see Imbo\Image\Transformation\TransformationInterface::applyToImage()
+     * {@inheritdoc}
      */
     public function applyToImage(ImageInterface $image) {
         try {

diff --git a/library/Imbo/Image/Transformation/FlipVertically.php b/library/Imbo/Image/Transformation/FlipVertically.php
@@ -48,7 +48,7 @@
  */
 class FlipVertically extends Transformation implements TransformationInterface {
     /**
-     * @see Imbo\Image\Transformation\TransformationInterface::applyToImage()
+     * {@inheritdoc}
      */
     public function applyToImage(ImageInterface $image) {
         try {

diff --git a/library/Imbo/Image/Transformation/MaxSize.php b/library/Imbo/Image/Transformation/MaxSize.php
@@ -75,7 +75,7 @@ public function __construct($maxWidth = null, $maxHeight = null) {
     }
 
     /**
-     * @see Imbo\Image\Transformation\TransformationInterface::applyToImage()
+     * {@inheritdoc}
      */
     public function applyToImage(ImageInterface $image) {
         try {

diff --git a/library/Imbo/Image/Transformation/Resize.php b/library/Imbo/Image/Transformation/Resize.php
@@ -73,7 +73,7 @@ public function __construct($width = null, $height = null) {
     }
 
     /**
-     * @see Imbo\Image\Transformation\TransformationInterface::applyToImage()
+     * {@inheritdoc}
      */
     public function applyToImage(ImageInterface $image) {
         try {

diff --git a/library/Imbo/Image/Transformation/Rotate.php b/library/Imbo/Image/Transformation/Rotate.php
@@ -77,7 +77,7 @@ public function __construct($angle, $bg = null) {
     }
 
     /**
-     * @see Imbo\Image\Transformation\TransformationInterface::applyToImage()
+     * {@inheritdoc}
      */
     public function applyToImage(ImageInterface $image) {
         try {

diff --git a/library/Imbo/Image/Transformation/Thumbnail.php b/library/Imbo/Image/Transformation/Thumbnail.php
@@ -92,7 +92,7 @@ public function __construct($width = null, $height = null, $fit = null) {
     }
 
     /**
-     * @see Imbo\Image\Transformation\TransformationInterface::applyToImage()
+     * {@inheritdoc}
      */
     public function applyToImage(ImageInterface $image) {
         try {

diff --git a/library/Imbo/Image/Transformation/Transformation.php b/library/Imbo/Image/Transformation/Transformation.php
@@ -46,12 +46,12 @@ abstract class Transformation implements TransformationInterface {
     /**
      * Imagick instance
      *
-     * @var Imagick
+     * @var \Imagick
      */
     private $imagick;
 
     /**
-     * @see Imbo\Image\Transformation\TransformationInterface::getName()
+     * {@inheritdoc}
      */
     public function getName() {
         $className = get_class($this);
@@ -60,7 +60,7 @@ public function getName() {
     }
 
     /**
-     * @see Imbo\Image\Transformation\TransformationInterface::getImagick()
+     * {@inheritdoc}
      */
     public function getImagick() {
         if ($this->imagick === null) {
@@ -71,7 +71,7 @@ public function getImagick() {
     }
 
     /**
-     * @see Imbo\Image\Transformation\TransformationInterface::getImagick()
+     * {@inheritdoc}
      */
     public function setImagick(Imagick $imagick) {
         $this->imagick = $imagick;

diff --git a/library/Imbo/Image/Transformation/TransformationInterface.php b/library/Imbo/Image/Transformation/TransformationInterface.php
@@ -33,6 +33,7 @@
 namespace Imbo\Image\Transformation;
 
 use Imbo\Image\ImageInterface,
+    Imbo\Exception\TransformationException,
     Imagick;
 
 /**
@@ -59,23 +60,23 @@ function getName();
     /**
      * Get the imagick instance
      *
-     * @return Imagick
+     * @return \Imagick
      */
     function getImagick();
 
     /**
      * Set the imagick instance
      *
-     * @param Imagick $imagick
-     * @return Imbo\Image\Transformation\TransformationInterface
+     * @param \Imagick $imagick
+     * @return TransformationInterface
      */
     function setImagick(Imagick $imagick);
 
     /**
      * Apply a transformation to an image object
      *
-     * @param Imbo\Image\ImageInterface Image instance
-     * @throws Imbo\Exception\TransformationException
+     * @param ImageInterface Image instance
+     * @throws TransformationException
      */
     function applyToImage(ImageInterface $image);
 }
diff --git a/library/Imbo/Image/Transformation/Transpose.php b/library/Imbo/Image/Transformation/Transpose.php
@@ -50,7 +50,7 @@
  */
 class Transpose extends Transformation implements TransformationInterface {
     /**
-     * @see Imbo\Image\Transformation\TransformationInterface::applyToImage()
+     * {@inheritdoc}
      */
     public function applyToImage(ImageInterface $image) {
         try {

diff --git a/library/Imbo/Image/Transformation/Transverse.php b/library/Imbo/Image/Transformation/Transverse.php
@@ -50,7 +50,7 @@
  */
 class Transverse extends Transformation implements TransformationInterface {
     /**
-     * @see Imbo\Image\Transformation\TransformationInterface::applyToImage()
+     * {@inheritdoc}
      */
     public function applyToImage(ImageInterface $image) {
         try {

diff --git a/library/Imbo/Image/TransformationChain.php b/library/Imbo/Image/TransformationChain.php
@@ -61,42 +61,42 @@ class TransformationChain implements Iterator, Countable {
     private $position = 0;
 
     /**
-     * @see Iterator::rewind()
+     * {@inheritdoc}
      */
     public function rewind() {
         $this->position = 0;
     }
 
     /**
-     * @see Iterator::current()
+     * {@inheritdoc}
      */
     public function current() {
         return $this->transformations[$this->position];
     }
 
     /**
-     * @see Iterator::key()
+     * {@inheritdoc}
      */
     public function key() {
         return $this->position;
     }
 
     /**
-     * @see Iterator::next()
+     * {@inheritdoc}
      */
     public function next() {
         $this->position++;
     }
 
     /**
-     * @see Countable::count()
+     * {@inheritdoc}
      */
     public function count() {
         return count($this->transformations);
     }
 
     /**
-     * @see Iterator::valid()
+     * {@inheritdoc}
      */
     public function valid() {
         return isset($this->transformations[$this->position]);
@@ -105,8 +105,8 @@ public function valid() {
     /**
      * Apply all transformations to an image object
      *
-     * @param Imbo\Image\ImageInterface $image Image object
-     * @return Imbo\Image\TransformationChain
+     * @param ImageInterface $image Image object
+     * @return TransformationChain
      */
     public function applyToImage(ImageInterface $image) {
         foreach ($this->transformations as $transformation) {
@@ -119,9 +119,9 @@ public function applyToImage(ImageInterface $image) {
     /**
      * Transform an image
      *
-     * @param Imbo\Image\ImageInterface $image Image object
-     * @param Imbo\Image\Transformation\TransformationInterface $transformation Transformation object
-     * @return Imbo\Image\TransformationChain
+     * @param ImageInterface $image Image object
+     * @param TransformationInterface $transformation Transformation object
+     * @return TransformationChain
      */
     public function transformImage(ImageInterface $image, TransformationInterface $transformation) {
         $transformation->applyToImage($image);
@@ -132,8 +132,8 @@ public function transformImage(ImageInterface $image, TransformationInterface $t
     /**
      * Add a transformation to the chain
      *
-     * @param Imbo\Image\Transformation\TransformationInterface $transformation The transformation to add
-     * @return Imbo\Image\TransformationChain
+     * @param TransformationInterface $transformation The transformation to add
+     * @return TransformationChain
      */
     public function add(TransformationInterface $transformation) {
         $this->transformations[] = $transformation;
@@ -147,8 +147,8 @@ public function add(TransformationInterface $transformation) {
      * @param string $color The color to use
      * @param int $width Width of the border
      * @param int $height Height of the border
-     * @return Imbo\Image\TransformationChain
-     * @see Imbo\Image\Transformation\Border
+     * @return TransformationChain
+     * @see Transformation\Border
      */
     public function border($color = null, $width = null, $height = null) {
         return $this->add(new Transformation\Border($color, $width, $height));
@@ -159,8 +159,8 @@ public function border($color = null, $width = null, $height = null) {
      *
      * @param int $maxWidth Max width of the image
      * @param int $maxHeight Max height of the image
-     * @return Imbo\Image\TransformationChain
-     * @see Imbo\Image\Transformation\MaxSize
+     * @return TransformationChain
+     * @see Transformation\MaxSize
      */
     public function maxSize($maxWidth = null, $maxHeight = null) {
         return $this->add(new Transformation\MaxSize($maxWidth, $maxHeight));
@@ -170,8 +170,8 @@ public function maxSize($maxWidth = null, $maxHeight = null) {
      * Compression transformation
      *
      * @param int $quality Quality of the resulting image
-     * @return Imbo\Image\TransformationChain
-     * @see Imbo\Image\Transformation\Compress
+     * @return TransformationChain
+     * @see Transformation\Compress
      */
     public function compress($quality) {
         return $this->add(new Transformation\Compress($quality));
@@ -184,8 +184,8 @@ public function compress($quality) {
      * @param int $y Y coordinate of the top left corner of the crop
      * @param int $width Width of the crop
      * @param int $height Height of the crop
-     * @return Imbo\Image\TransformationChain
-     * @see Imbo\Image\Transformation\Crop
+     * @return TransformationChain
+     * @see Transformation\Crop
      */
     public function crop($x, $y, $width, $height) {
         return $this->add(new Transformation\Crop($x, $y, $width, $height));
@@ -196,8 +196,8 @@ public function crop($x, $y, $width, $height) {
      *
      * @param int $angle Angle of the rotation
      * @param string $bg Background color
-     * @return Imbo\Image\TransformationChain
-     * @see Imbo\Image\Transformation\Rotate
+     * @return TransformationChain
+     * @see Transformation\Rotate
      */
     public function rotate($angle, $bg = null) {
         return $this->add(new Transformation\Rotate($angle, $bg));
@@ -208,8 +208,8 @@ public function rotate($angle, $bg = null) {
      *
      * @param int $width Width of the resize
      * @param int $height Height of the resize
-     * @return Imbo\Image\TransformationChain
-     * @see Imbo\Image\Transformation\Resize
+     * @return TransformationChain
+     * @see Transformation\Resize
      */
     public function resize($width = null, $height = null) {
         return $this->add(new Transformation\Resize($width, $height));
@@ -221,8 +221,8 @@ public function resize($width = null, $height = null) {
      * @param int $width Width of the thumbnail
      * @param int $height height of the thumbnail
      * @param string $fit Fit style ('inset' or 'outbound')
-     * @return Imbo\Image\TransformationChain
-     * @see Imbo\Image\Transformation\Thumbnail
+     * @return TransformationChain
+     * @see Transformation\Thumbnail
      */
     public function thumbnail($width = null, $height = null, $fit = null) {
         return $this->add(new Transformation\Thumbnail($width, $height, $fit));
@@ -231,8 +231,8 @@ public function thumbnail($width = null, $height = null, $fit = null) {
     /**
      * Flip horizontally transformation
      *
-     * @return Imbo\Image\TransformationChain
-     * @see Imbo\Image\Transformation\FlipHorizontally
+     * @return TransformationChain
+     * @see Transformation\FlipHorizontally
      */
     public function flipHorizontally() {
         return $this->add(new Transformation\FlipHorizontally());
@@ -241,8 +241,8 @@ public function flipHorizontally() {
     /**
      * Flip vertically transformation
      *
-     * @return Imbo\Image\TransformationChain
-     * @see Imbo\Image\Transformation\FlipVertically
+     * @return TransformationChain
+     * @see Transformation\FlipVertically
      */
     public function flipVertically() {
         return $this->add(new Transformation\FlipVertically());
@@ -257,8 +257,8 @@ public function flipVertically() {
      * @param int $x X coordinate of the placement of the upper left corner of the existing image
      * @param int $y Y coordinate of the placement of the upper left corner of the existing image
      * @param string $bg Background color of the canvas
-     * @return Imbo\Image\TransformationChain
-     * @see Imbo\Image\Transformation\Canvas
+     * @return TransformationChain
+     * @see Transformation\Canvas
      */
     public function canvas($width, $height, $mode = null, $x = null, $y = null, $bg = null) {
         return $this->add(new Transformation\Canvas($width, $height, $mode, $x, $y, $bg));
@@ -267,8 +267,8 @@ public function canvas($width, $height, $mode = null, $x = null, $y = null, $bg
     /**
      * Transpose transformation
      *
-     * @return Imbo\Image\TransformationChain
-     * @see Imbo\Image\Transformation\Transpose
+     * @return TransformationChain
+     * @see Transformation\Transpose
      */
     public function transpose() {
         return $this->add(new Transformation\Transpose());
@@ -277,8 +277,8 @@ public function transpose() {
     /**
      * Transverse transformation
      *
-     * @return Imbo\Image\TransformationChain
-     * @see Imbo\Image\Transformation\Transverse
+     * @return TransformationChain
+     * @see Transformation\Transverse
      */
     public function transverse() {
         return $this->add(new Transformation\Transverse());

diff --git a/library/Imbo/Resource/Image.php b/library/Imbo/Resource/Image.php
@@ -57,30 +57,30 @@ class Image extends Resource implements ResourceInterface {
     /**
      * Image for the client
      *
-     * @var Imbo\Image\ImageInterface
+     * @var ImageInterface
      */
     private $image;
 
     /**
      * Image prepation instance
      *
-     * @var Imbo\Image\ImagePreparation
+     * @var ImagePreparation
      */
     private $imagePreparation;
 
     /**
      * Content negotiation instance
      *
-     * @var Imbo\Http\ContentNegotiation
+     * @var ContentNegotiation
      */
     private $contentNegotiation;
 
     /**
      * Class constructor
      *
-     * @param Imbo\Image\ImageInterface $image An image instance
-     * @param Imbo\Image\ImagePreparationInterface $imagePreparation An image preparation instance
-     * @param Imbo\Http\ContentNegotiation $contentNegotiation Content negotiation instance
+     * @param ImageInterface $image An image instance
+     * @param ImagePreparationInterface $imagePreparation An image preparation instance
+     * @param ContentNegotiation $contentNegotiation Content negotiation instance
      */
     public function __construct(ImageInterface $image = null, ImagePreparationInterface $imagePreparation = null, ContentNegotiation $contentNegotiation = null) {
         if ($image === null) {
@@ -101,7 +101,7 @@ public function __construct(ImageInterface $image = null, ImagePreparationInterf
     }
 
     /**
-     * @see Imbo\Resource\ResourceInterface::getAllowedMethods()
+     * {@inheritdoc}
      */
     public function getAllowedMethods() {
         return array(
@@ -113,7 +113,7 @@ public function getAllowedMethods() {
     }
 
     /**
-     * @see Imbo\Resource\ResourceInterface::put()
+     * {@inheritdoc}
      */
     public function put(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage) {
         // Prepare the image based on the input stream in the request
@@ -141,7 +141,7 @@ public function put(RequestInterface $request, ResponseInterface $response, Data
     }
 
     /**
-     * @see Imbo\Resource\ResourceInterface::delete()
+     * {@inheritdoc}
      */
     public function delete(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage) {
         $publicKey = $request->getPublicKey();
@@ -156,7 +156,7 @@ public function delete(RequestInterface $request, ResponseInterface $response, D
     }
 
     /**
-     * @see Imbo\Resource\ResourceInterface::get()
+     * {@inheritdoc}
      */
     public function get(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage) {
         $publicKey       = $request->getPublicKey();
@@ -234,7 +234,7 @@ public function get(RequestInterface $request, ResponseInterface $response, Data
     }
 
     /**
-     * @see Imbo\Resource\ResourceInterface::head()
+     * {@inheritdoc}
      */
     public function head(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage) {
         $this->get($request, $response, $database, $storage);

diff --git a/library/Imbo/Resource/Images.php b/library/Imbo/Resource/Images.php
@@ -67,7 +67,7 @@ class Images extends Resource implements ImagesInterface {
     private $query;
 
     /**
-     * @see Imbo\Resource\ImagesInterface::getQuery()
+     * {@inheritdoc}
      */
     public function getQuery() {
         if ($this->query === null) {
@@ -78,7 +78,7 @@ public function getQuery() {
     }
 
     /**
-     * @see Imbo\Resource\ImagesInterface::setQuery()
+     * {@inheritdoc}
      */
     public function setQuery(QueryInterface $query) {
         $this->query = $query;
@@ -87,7 +87,7 @@ public function setQuery(QueryInterface $query) {
     }
 
     /**
-     * @see Imbo\Resource\ResourceInterface::getAllowedMethods()
+     * {@inheritdoc}
      */
     public function getAllowedMethods() {
         return array(
@@ -97,7 +97,7 @@ public function getAllowedMethods() {
     }
 
     /**
-     * @see Imbo\Resource\ResourceInterface::get()
+     * {@inheritdoc}
      */
     public function get(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage) {
         $publicKey = $request->getPublicKey();
@@ -166,7 +166,7 @@ public function get(RequestInterface $request, ResponseInterface $response, Data
     }
 
     /**
-     * @see Imbo\Resource\ResourceInterface::head()
+     * {@inheritdoc}
      */
     public function head(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage) {
         $this->get($request, $response, $database, $storage);

diff --git a/library/Imbo/Resource/Images/Query.php b/library/Imbo/Resource/Images/Query.php
@@ -86,7 +86,7 @@ class Query implements QueryInterface {
     private $to;
 
     /**
-     * @see Imbo\Resource\Images\QueryInterface::page()
+     * {@inheritdoc}
      */
     public function page($page = null) {
         if ($page === null) {
@@ -99,7 +99,7 @@ public function page($page = null) {
     }
 
     /**
-     * @see Imbo\Resource\Images\QueryInterface::limit()
+     * {@inheritdoc}
      */
     public function limit($limit = null) {
         if ($limit === null) {
@@ -112,7 +112,7 @@ public function limit($limit = null) {
     }
 
     /**
-     * @see Imbo\Resource\Images\QueryInterface::returnMetadata()
+     * {@inheritdoc}
      */
     public function returnMetadata($returnMetadata = null) {
         if ($returnMetadata === null) {
@@ -125,7 +125,7 @@ public function returnMetadata($returnMetadata = null) {
     }
 
     /**
-     * @see Imbo\Resource\Images\QueryInterface::metadataQuery()
+     * {@inheritdoc}
      */
     public function metadataQuery(array $metadataQuery = null) {
         if ($metadataQuery === null) {
@@ -138,7 +138,7 @@ public function metadataQuery(array $metadataQuery = null) {
     }
 
     /**
-     * @see Imbo\Resource\Images\QueryInterface::from()
+     * {@inheritdoc}
      */
     public function from($from = null) {
         if ($from === null) {
@@ -151,7 +151,7 @@ public function from($from = null) {
     }
 
     /**
-     * @see Imbo\Resource\Images\QueryInterface::to()
+     * {@inheritdoc}
      */
     public function to($to = null) {
         if ($to === null) {

diff --git a/library/Imbo/Resource/Images/QueryInterface.php b/library/Imbo/Resource/Images/QueryInterface.php
@@ -47,47 +47,47 @@ interface QueryInterface {
      * Set or get the page property
      *
      * @param int $page Give this a value to set the page property
-     * @return int|Imbo\Resource\Images\QueryInterface
+     * @return int|QueryInterface
      */
     function page($page = null);
 
     /**
      * Set or get the limit property
      *
      * @param int $limit Give this a value to set the limit property
-     * @return int|Imbo\Resource\Images\QueryInterface
+     * @return int|QueryInterface
      */
     function limit($limit = null);
 
     /**
      * Set or get the returnMetadata flag
      *
      * @param boolean $returnMetadata Give this a value to set the returnMetadata flag
-     * @return boolean|Imbo\Resource\Images\QueryInterface
+     * @return boolean|QueryInterface
      */
     function returnMetadata($returnMetadata = null);
 
     /**
      * Set or get the metadataQuery property
      *
      * @param array $metadataQuery Give this a value to set the property
-     * @return array|Imbo\Resource\Images\QueryInterface
+     * @return array|QueryInterface
      */
     function metadataQuery(array $metadataQuery = null);
 
     /**
      * Set or get the from attribute
      *
      * @param int $from Give this a value to set the from property
-     * @return int|Imbo\Resource\Images\QueryInterface
+     * @return int|QueryInterface
      */
     function from($from = null);
 
     /**
      * Set or get the to attribute
      *
-     * @param int $from Give this a value to set the to property
-     * @return int|Imbo\Resource\Images\QueryInterface
+     * @param int $to Give this a value to set the to property
+     * @return int|QueryInterface
      */
     function to($to = null);
 }
diff --git a/library/Imbo/Resource/ImagesInterface.php b/library/Imbo/Resource/ImagesInterface.php
@@ -51,15 +51,15 @@ interface ImagesInterface extends ResourceInterface {
     /**
      * Fetch a query instance
      *
-     * @return Imbo\Resource\Images\QueryInterface
+     * @return QueryInterface
      */
     function getQuery();
 
     /**
      * Set a query instance
      *
-     * @param Imbo\Resource\Images\QueryInterface $query A query instance
-     * @return Imbo\Resource\ImagesInterface
+     * @param QueryInterface $query A query instance
+     * @return ImagesInterface
      */
     function setQuery(QueryInterface $query);
 }
diff --git a/library/Imbo/Resource/Metadata.php b/library/Imbo/Resource/Metadata.php
@@ -48,7 +48,7 @@
  */
 class Metadata extends Resource implements ResourceInterface {
     /**
-     * @see Imbo\Resource\ResourceInterface::getAllowedMethods()
+     * {@inheritdoc}
      */
     public function getAllowedMethods() {
         return array(
@@ -61,7 +61,7 @@ public function getAllowedMethods() {
     }
 
     /**
-     * @see Imbo\Resource\ResourceInterface::delete()
+     * {@inheritdoc}
      */
     public function delete(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage) {
         $imageIdentifier = $request->getImageIdentifier();
@@ -74,7 +74,7 @@ public function delete(RequestInterface $request, ResponseInterface $response, D
     }
 
     /**
-     * @see Imbo\Resource\ResourceInterface::put()
+     * {@inheritdoc}
      */
     public function put(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage) {
         $publicKey = $request->getPublicKey();
@@ -103,7 +103,7 @@ public function put(RequestInterface $request, ResponseInterface $response, Data
     }
 
     /**
-     * @see Imbo\Resource\ResourceInterface::post()
+     * {@inheritdoc}
      */
     public function post(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage) {
         $imageIdentifier = $request->getImageIdentifier();
@@ -133,7 +133,7 @@ public function post(RequestInterface $request, ResponseInterface $response, Dat
     }
 
     /**
-     * @see Imbo\Resource\ResourceInterface::get()
+     * {@inheritdoc}
      */
     public function get(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage) {
         $publicKey = $request->getPublicKey();
@@ -165,7 +165,7 @@ public function get(RequestInterface $request, ResponseInterface $response, Data
     }
 
     /**
-     * @see Imbo\Resource\ResourceInterface::head()
+     * {@inheritdoc}
      */
     public function head(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage) {
         $this->get($request, $response, $database, $storage);

diff --git a/library/Imbo/Resource/Resource.php b/library/Imbo/Resource/Resource.php
@@ -60,42 +60,42 @@ abstract class Resource implements ResourceInterface {
     protected $eventManager;
 
     /**
-     * @see Imbo\Resource\ResourceInterface::post()
+     * {@inheritdoc}
      */
     public function post(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage) {
         throw new ResourceException('Method not allowed', 405);
     }
 
     /**
-     * @see Imbo\Resource\ResourceInterface::get()
+     * {@inheritdoc}
      */
     public function get(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage) {
         throw new ResourceException('Method not allowed', 405);
     }
 
     /**
-     * @see Imbo\Resource\ResourceInterface::head()
+     * {@inheritdoc}
      */
     public function head(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage) {
         throw new ResourceException('Method not allowed', 405);
     }
 
     /**
-     * @see Imbo\Resource\ResourceInterface::delete()
+     * {@inheritdoc}
      */
     public function delete(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage) {
         throw new ResourceException('Method not allowed', 405);
     }
 
     /**
-     * @see Imbo\Resource\ResourceInterface::put()
+     * {@inheritdoc}
      */
     public function put(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage) {
         throw new ResourceException('Method not allowed', 405);
     }
 
     /**
-     * @see Imbo\Resource\ResourceInterface::setEventManager()
+     * {@inheritdoc}
      */
     public function setEventManager(EventManagerInterface $eventManager) {
         $this->eventManager = $eventManager;

diff --git a/library/Imbo/Resource/ResourceInterface.php b/library/Imbo/Resource/ResourceInterface.php
@@ -77,58 +77,58 @@ function getAllowedMethods();
     /**
      * POST handler
      *
-     * @param Imbo\Http\Request\RequestInterface $request A request instance
-     * @param Imbo\Http\Response\ResponseInterface $response A response instance
-     * @param Imbo\Database\DatabaseInterface $database A database instance
-     * @param Imbo\Storage\StorageInterface $storage A storage instance
+     * @param RequestInterface $request A request instance
+     * @param ResponseInterface $response A response instance
+     * @param DatabaseInterface $database A database instance
+     * @param StorageInterface $storage A storage instance
      */
     function post(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage);
 
     /**
      * GET handler
      *
-     * @param Imbo\Http\Request\RequestInterface $request A request instance
-     * @param Imbo\Http\Response\ResponseInterface $response A response instance
-     * @param Imbo\Database\DatabaseInterface $database A database instance
-     * @param Imbo\Storage\StorageInterface $storage A storage instance
+     * @param RequestInterface $request A request instance
+     * @param ResponseInterface $response A response instance
+     * @param DatabaseInterface $database A database instance
+     * @param StorageInterface $storage A storage instance
      */
     function get(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage);
 
     /**
      * HEAD handler
      *
-     * @param Imbo\Http\Request\RequestInterface $request A request instance
-     * @param Imbo\Http\Response\ResponseInterface $response A response instance
-     * @param Imbo\Database\DatabaseInterface $database A database instance
-     * @param Imbo\Storage\StorageInterface $storage A storage instance
+     * @param RequestInterface $request A request instance
+     * @param ResponseInterface $response A response instance
+     * @param DatabaseInterface $database A database instance
+     * @param StorageInterface $storage A storage instance
      */
     function head(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage);
 
     /**
      * DELETE handler
      *
-     * @param Imbo\Http\Request\RequestInterface $request A request instance
-     * @param Imbo\Http\Response\ResponseInterface $response A response instance
-     * @param Imbo\Database\DatabaseInterface $database A database instance
-     * @param Imbo\Storage\StorageInterface $storage A storage instance
+     * @param RequestInterface $request A request instance
+     * @param ResponseInterface $response A response instance
+     * @param DatabaseInterface $database A database instance
+     * @param StorageInterface $storage A storage instance
      */
     function delete(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage);
 
     /**
      * PUT handler
      *
-     * @param Imbo\Http\Request\RequestInterface $request A request instance
-     * @param Imbo\Http\Response\ResponseInterface $response A response instance
-     * @param Imbo\Database\DatabaseInterface $database A database instance
-     * @param Imbo\Storage\StorageInterface $storage A storage instance
+     * @param RequestInterface $request A request instance
+     * @param ResponseInterface $response A response instance
+     * @param DatabaseInterface $database A database instance
+     * @param StorageInterface $storage A storage instance
      */
     function put(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage);
 
     /**
      * Set the event manager
      *
-     * @param Imbo\EventManager\EventManagerInterface $eventManager An instance of an event manager
-     * @return Imbo\Resource\ResourceInterface
+     * @param EventManagerInterface $eventManager An instance of an event manager
+     * @return ResourceInterface
      */
     function setEventManager(EventManagerInterface $eventManager);
 }
diff --git a/library/Imbo/Resource/Status.php b/library/Imbo/Resource/Status.php
@@ -51,7 +51,7 @@
  */
 class Status extends Resource implements ResourceInterface {
     /**
-     * @see Imbo\Resource\ResourceInterface::getAllowedMethods()
+     * {@inheritdoc}
      */
     public function getAllowedMethods() {
         return array(
@@ -61,7 +61,7 @@ public function getAllowedMethods() {
     }
 
     /**
-     * @see Imbo\Resource\ResourceInterface::get()
+     * {@inheritdoc}
      */
     public function get(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage) {
         $response->getHeaders()->set('Cache-Control', 'max-age=0');
@@ -89,7 +89,7 @@ public function get(RequestInterface $request, ResponseInterface $response, Data
     }
 
     /**
-     * @see Imbo\Resource\ResourceInterface::head()
+     * {@inheritdoc}
      */
     public function head(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage) {
         $this->get($request, $response, $database, $storage);

diff --git a/library/Imbo/Resource/User.php b/library/Imbo/Resource/User.php
@@ -47,7 +47,7 @@
  */
 class User extends Resource implements ResourceInterface {
     /**
-     * @see Imbo\Resource\ResourceInterface::getAllowedMethods()
+     * {@inheritdoc}
      */
     public function getAllowedMethods() {
         return array(
@@ -57,7 +57,7 @@ public function getAllowedMethods() {
     }
 
     /**
-     * @see Imbo\Resource\ResourceInterface::get()
+     * {@inheritdoc}
      */
     public function get(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage) {
         $publicKey = $request->getPublicKey();
@@ -94,7 +94,7 @@ public function get(RequestInterface $request, ResponseInterface $response, Data
     }
 
     /**
-     * @see Imbo\Resource\ResourceInterface::head()
+     * {@inheritdoc}
      */
     public function head(RequestInterface $request, ResponseInterface $response, DatabaseInterface $database, StorageInterface $storage) {
         $this->get($request, $response, $database, $storage);

diff --git a/library/Imbo/Storage/Doctrine.php b/library/Imbo/Storage/Doctrine.php
@@ -79,16 +79,16 @@ class Doctrine implements StorageInterface {
     /**
      * Doctrine connection
      *
-     * @var Doctrine\DBAL\Connection
+     * @var \Doctrine\DBAL\Connection
      */
     private $connection;
 
     /**
      * Class constructor
      *
      * @param array $params Parameters for the driver
-     * @param Doctrine\DBAL\Connection $connection Optional connection instance. Primarily used for
-     *                                             testing
+     * @param \Doctrine\DBAL\Connection $connection Optional connection instance. Primarily used
+     *                                              for testing
      */
     public function __construct(array $params, Connection $connection = null) {
         $this->params = array_merge($this->params, $params);
@@ -99,7 +99,7 @@ public function __construct(array $params, Connection $connection = null) {
     }
 
     /**
-     * @see Imbo\Storage\StorageInterface::store()
+     * {@inheritdoc}
      */
     public function store($publicKey, $imageIdentifier, $imageData) {
         $query = $this->getConnection()->createQueryBuilder();
@@ -131,7 +131,7 @@ public function store($publicKey, $imageIdentifier, $imageData) {
     }
 
     /**
-     * @see Imbo\Storage\StorageInterface::delete()
+     * {@inheritdoc}
      */
     public function delete($publicKey, $imageIdentifier) {
         $query = $this->getConnection()->createQueryBuilder();
@@ -165,7 +165,7 @@ public function delete($publicKey, $imageIdentifier) {
     }
 
     /**
-     * @see Imbo\Storage\StorageInterface::getImage()
+     * {@inheritdoc}
      */
     public function getImage($publicKey, $imageIdentifier) {
         $query = $this->getConnection()->createQueryBuilder();
@@ -189,7 +189,7 @@ public function getImage($publicKey, $imageIdentifier) {
     }
 
     /**
-     * @see Imbo\Storage\StorageInterface::getLastModified()
+     * {@inheritdoc}
      */
     public function getLastModified($publicKey, $imageIdentifier) {
         $query = $this->getConnection()->createQueryBuilder();
@@ -215,7 +215,7 @@ public function getLastModified($publicKey, $imageIdentifier) {
     }
 
     /**
-     * @see Imbo\Storage\StorageInterface::getStatus()
+     * {@inheritdoc}
      */
     public function getStatus() {
         $connection = $this->getConnection();
@@ -226,8 +226,8 @@ public function getStatus() {
     /**
      * Set the connection instance
      *
-     * @param Doctrine\DBAL\Connection $connection The connection instance
-     * @return Imbo\Storage\Doctrine
+     * @param \Doctrine\DBAL\Connection $connection The connection instance
+     * @return Doctrine
      */
     private function setConnection(Connection $connection) {
         $this->connection = $connection;
@@ -238,7 +238,7 @@ private function setConnection(Connection $connection) {
     /**
      * Get the Doctrine connection
      *
-     * @return Doctrine\DBAL\Connection
+     * @return \Doctrine\DBAL\Connection
      */
     private function getConnection() {
         if ($this->connection === null) {

diff --git a/library/Imbo/Storage/Filesystem.php b/library/Imbo/Storage/Filesystem.php
@@ -71,7 +71,7 @@ public function __construct(array $params) {
     }
 
     /**
-     * @see Imbo\Storage\StorageInterface::store()
+     * {@inheritdoc}
      */
     public function store($publicKey, $imageIdentifier, $imageData) {
         if (!is_writable($this->params['dataDir'])) {
@@ -101,7 +101,7 @@ public function store($publicKey, $imageIdentifier, $imageData) {
     }
 
     /**
-     * @see Imbo\Storage\StorageInterface::delete()
+     * {@inheritdoc}
      */
     public function delete($publicKey, $imageIdentifier) {
         $path = $this->getImagePath($publicKey, $imageIdentifier);
@@ -114,7 +114,7 @@ public function delete($publicKey, $imageIdentifier) {
     }
 
     /**
-     * @see Imbo\Storage\StorageInterface::getImage()
+     * {@inheritdoc}
      */
     public function getImage($publicKey, $imageIdentifier) {
         $path = $this->getImagePath($publicKey, $imageIdentifier);
@@ -127,7 +127,7 @@ public function getImage($publicKey, $imageIdentifier) {
     }
 
     /**
-     * @see Imbo\Storage\StorageInterface::getLastModified()
+     * {@inheritdoc}
      */
     public function getLastModified($publicKey, $imageIdentifier) {
         $path = $this->getImagePath($publicKey, $imageIdentifier);
@@ -144,7 +144,7 @@ public function getLastModified($publicKey, $imageIdentifier) {
     }
 
     /**
-     * @see Imbo\Storage\StorageInterface::getStatus()
+     * {@inheritdoc}
      */
     public function getStatus() {
         return is_writable($this->params['dataDir']);

diff --git a/library/Imbo/Storage/GridFS.php b/library/Imbo/Storage/GridFS.php
@@ -64,14 +64,14 @@ class GridFS implements StorageInterface {
     /**
      * Mongo instance
      *
-     * @var Mongo
+     * @var \Mongo
      */
     private $mongo;
 
     /**
      * The grid instance
      *
-     * @var MongoGridFS
+     * @var \MongoGridFS
      */
     private $grid;
 
@@ -96,8 +96,8 @@ class GridFS implements StorageInterface {
      * Class constructor
      *
      * @param array $params Parameters for the driver
-     * @param Mongo $mongo Mongo instance
-     * @param MongoGridFS $grid MongoGridFS instance
+     * @param \Mongo $mongo Mongo instance
+     * @param \MongoGridFS $grid MongoGridFS instance
      */
     public function __construct(array $params = null, Mongo $mongo = null, MongoGridFS $grid = null) {
         if ($params !== null) {
@@ -114,7 +114,7 @@ public function __construct(array $params = null, Mongo $mongo = null, MongoGrid
     }
 
     /**
-     * @see Imbo\Storage\StorageInterface::store()
+     * {@inheritdoc}
      */
     public function store($publicKey, $imageIdentifier, $imageData) {
         if ($this->imageExists($publicKey, $imageIdentifier, true) !== false) {
@@ -142,7 +142,7 @@ public function store($publicKey, $imageIdentifier, $imageData) {
     }
 
     /**
-     * @see Imbo\Storage\StorageInterface::delete()
+     * {@inheritdoc}
      */
     public function delete($publicKey, $imageIdentifier) {
         if (($file = $this->imageExists($publicKey, $imageIdentifier)) === false) {
@@ -153,7 +153,7 @@ public function delete($publicKey, $imageIdentifier) {
     }
 
     /**
-     * @see Imbo\Storage\StorageInterface::getImage()
+     * {@inheritdoc}
      */
     public function getImage($publicKey, $imageIdentifier) {
         if (($file = $this->imageExists($publicKey, $imageIdentifier)) === false) {
@@ -164,7 +164,7 @@ public function getImage($publicKey, $imageIdentifier) {
     }
 
     /**
-     * @see Imbo\Storage\StorageInterface::getLastModified()
+     * {@inheritdoc}
      */
     public function getLastModified($publicKey, $imageIdentifier) {
         if (($file = $this->imageExists($publicKey, $imageIdentifier)) === false) {
@@ -177,7 +177,7 @@ public function getLastModified($publicKey, $imageIdentifier) {
     }
 
     /**
-     * @see Imbo\Storage\StorageInterface::getStatus()
+     * {@inheritdoc}
      */
     public function getStatus() {
         return $this->getMongo()->connect();
@@ -186,7 +186,7 @@ public function getStatus() {
     /**
      * Get the grid instance
      *
-     * @return MongoGridFS
+     * @return \MongoGridFS
      */
     protected function getGrid() {
         if ($this->grid === null) {
@@ -204,7 +204,7 @@ protected function getGrid() {
     /**
      * Get the mongo instance
      *
-     * @return Mongo
+     * @return \Mongo
      */
     protected function getMongo() {
         if ($this->mongo === null) {
@@ -227,8 +227,8 @@ protected function getMongo() {
      *
      * @param string $publicKey The public key of the user
      * @param string $imageIdentifier The image identifier
-     * @return boolean|MongoGridFSFile Returns false if the file does not exist or an instance of
-     *                                 MongoGridFSFile if the file exists
+     * @return boolean|\MongoGridFSFile Returns false if the file does not exist or an instance of
+     *                                  MongoGridFSFile if the file exists
      */
     private function imageExists($publicKey, $imageIdentifier) {
         $cursor = $this->getGrid()->find(array(

diff --git a/library/Imbo/Storage/StorageInterface.php b/library/Imbo/Storage/StorageInterface.php
@@ -32,7 +32,8 @@
 
 namespace Imbo\Storage;
 
-use Imbo\Image\ImageInterface;
+use Imbo\Image\ImageInterface,
+    Imbo\Exception\StorageException;
 
 /**
  * Storage driver interface
@@ -58,7 +59,7 @@ interface StorageInterface {
      * @param string $imageIdentifier The image identifier
      * @param string $imageData The image data to store
      * @return boolean Returns true on success or false on failure
-     * @throws Imbo\Exception\StorageException
+     * @throws StorageException
      */
     function store($publicKey, $imageIdentifier, $imageData);
 
@@ -70,7 +71,7 @@ function store($publicKey, $imageIdentifier, $imageData);
      * @param string $publicKey The public key of the user
      * @param string $imageIdentifier Image identifier
      * @return boolean Returns true on success or false on failure
-     * @throws Imbo\Exception\StorageException
+     * @throws StorageException
      */
     function delete($publicKey, $imageIdentifier);
 
@@ -80,7 +81,7 @@ function delete($publicKey, $imageIdentifier);
      * @param string $publicKey The public key of the user
      * @param string $imageIdentifier Image identifier
      * @return string The binary content of the image
-     * @throws Imbo\Exception\StorageException
+     * @throws StorageException
      */
     function getImage($publicKey, $imageIdentifier);
 
@@ -90,7 +91,7 @@ function getImage($publicKey, $imageIdentifier);
      * @param string $publicKey The public key of the user
      * @param string $imageIdentifier Image identifier
      * @return DateTime Returns an instance of DateTime
-     * @throws Imbo\Exception\StorageException
+     * @throws StorageException
      */
     function getLastModified($publicKey, $imageIdentifier);
 

diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml