diff --git a/docs/bundle/job_queue.md b/docs/bundle/job_queue.md
index 8570b467a..738c3e8b5 100644
--- a/docs/bundle/job_queue.md
+++ b/docs/bundle/job_queue.md
@@ -14,21 +14,21 @@ Guaranty that there is only single job running with such name.
 
 ```php
 <?php 
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Processor;
-use Enqueue\Psr\Context;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrProcessor;
+use Enqueue\Psr\PsrContext;
 use Enqueue\Util\JSON;
 use Enqueue\JobQueue\JobRunner;
 use Enqueue\JobQueue\Job;
 
-class ReindexProcessor implements Processor
+class ReindexProcessor implements PsrProcessor
 {
     /**
      * @var JobRunner
      */
     private $jobRunner;
 
-    public function process(Message $message, Context $context)
+    public function process(PsrMessage $message, PsrContext $context)
     {
         $data = JSON::decode($message->getBody());
 
@@ -57,11 +57,11 @@ use Enqueue\JobQueue\JobRunner;
 use Enqueue\JobQueue\Job;
 use Enqueue\Client\ProducerInterface;
 use Enqueue\Util\JSON;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Context;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrProcessor;
 
-class Step1Processor implements Processor 
+class Step1Processor implements PsrProcessor 
 {
     /**
      * @var JobRunner
@@ -73,7 +73,7 @@ class Step1Processor implements Processor
      */
     private $producer;
 
-    public function process(Message $message, Context $context)
+    public function process(PsrMessage $message, PsrContext $context)
     {
         $data = JSON::decode($message->getBody());
 
@@ -104,14 +104,14 @@ class Step1Processor implements Processor
     }
 }
 
-class Step2Processor implements Processor 
+class Step2Processor implements PsrProcessor 
 {
     /**
      * @var JobRunner
      */
     private $jobRunner;
 
-    public function process(Message $message, Context $context)
+    public function process(PsrMessage $message, PsrContext $context)
     {
         $data = JSON::decode($message->getBody());
 
@@ -124,7 +124,7 @@ class Step2Processor implements Processor
             }
         );
 
-        return $result ? Result::ACK : Result::REJECT;
+        return $result ? self::ACK : self::REJECT;
     }
 }
 ```
@@ -140,11 +140,11 @@ use Enqueue\JobQueue\JobRunner;
 use Enqueue\JobQueue\Job;
 use Enqueue\JobQueue\DependentJobService;
 use Enqueue\Util\JSON;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Context;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrProcessor;
 
-class ReindexProcessor implements Processor 
+class ReindexProcessor implements PsrProcessor 
 {
     /**
      * @var JobRunner
@@ -156,7 +156,7 @@ class ReindexProcessor implements Processor
      */
     private $dependentJob;
 
-    public function process(Message $message, Context $context)
+    public function process(PsrMessage $message, PsrContext $context)
     {
         $data = JSON::decode($message->getBody());
 
diff --git a/docs/bundle/message_processor.md b/docs/bundle/message_processor.md
index 12504c16c..40c09e169 100644
--- a/docs/bundle/message_processor.md
+++ b/docs/bundle/message_processor.md
@@ -35,9 +35,9 @@ It allows to keep subscription login and process logic closer to each other.
 namespace AppBundle\Async;
 
 use Enqueue\Client\TopicSubscriberInterface;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrProcessor;
 
-class SayHelloProcessor implements Processor, TopicSubscriberInterface
+class SayHelloProcessor implements PsrProcessor, TopicSubscriberInterface
 {
     public static function getSubscribedTopics()
     {
@@ -51,9 +51,9 @@ On the topic subscriber you can also define queue and processor name:
 ```php
 <?php
 use Enqueue\Client\TopicSubscriberInterface;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrProcessor;
 
-class SayHelloProcessor implements Processor, TopicSubscriberInterface
+class SayHelloProcessor implements PsrProcessor, TopicSubscriberInterface
 {
     public static function getSubscribedTopics()
     {
diff --git a/docs/bundle/quick_tour.md b/docs/bundle/quick_tour.md
index 55462eddc..95eac7fdd 100644
--- a/docs/bundle/quick_tour.md
+++ b/docs/bundle/quick_tour.md
@@ -71,14 +71,14 @@ To consume messages you have to first create a message processor:
 
 ```php
 <?php
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Context;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrProcessor;
 use Enqueue\Client\TopicSubscriberInterface;
 
-class FooProcessor implements Processor, TopicSubscriberInterface
+class FooProcessor implements PsrProcessor, TopicSubscriberInterface
 {
-    public function process(Message $message, Context $session)
+    public function process(PsrMessage $message, PsrContext $session)
     {
         echo $message->getBody();
 
diff --git a/docs/consumption/message_processor.md b/docs/consumption/message_processor.md
index 69434f467..b6a1f96a9 100644
--- a/docs/consumption/message_processor.md
+++ b/docs/consumption/message_processor.md
@@ -5,13 +5,13 @@ Here's example:
 
 ```php
 <?php
-use Enqueue\Psr\Processor;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Context;
+use Enqueue\Psr\PsrProcessor;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrContext;
 
-class SendMailProcessor implements Processor
+class SendMailProcessor implements PsrProcessor
 {
-    public function process(Message $message, Context $context) 
+    public function process(PsrMessage $message, PsrContext $context) 
     {
         $this->mailer->send('foo@example.com', $message->getBody());
         
@@ -26,14 +26,14 @@ Sometimes you have to reject messages explicitly.
 
 ```php
 <?php
-use Enqueue\Psr\Processor;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Context;
+use Enqueue\Psr\PsrProcessor;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrContext;
 use Enqueue\Util\JSON;
 
-class SendMailProcessor implements Processor
+class SendMailProcessor implements PsrProcessor
 {
-    public function process(Message $message, Context $context) 
+    public function process(PsrMessage $message, PsrContext $context) 
     {
         $data = JSON::decode($message->getBody());
         if ($user  = $this->userRepository->find($data['userId'])) {
@@ -53,13 +53,13 @@ If it returns true than there was attempt to process message.
    
 ```php
 <?php
-use Enqueue\Psr\Processor;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Context;
+use Enqueue\Psr\PsrProcessor;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrContext;
 
-class SendMailProcessor implements Processor
+class SendMailProcessor implements PsrProcessor
 {
-    public function process(Message $message, Context $context) 
+    public function process(PsrMessage $message, PsrContext $context) 
     {
         if ($message->isRedelivered()) {
             return self::REQUEUE;
@@ -76,13 +76,13 @@ The second argument is your context. You can use it to send messages to other qu
  
 ```php
 <?php
-use Enqueue\Psr\Processor;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Context;
+use Enqueue\Psr\PsrProcessor;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrContext;
 
-class SendMailProcessor implements Processor
+class SendMailProcessor implements PsrProcessor
 {
-    public function process(Message $message, Context $context) 
+    public function process(PsrMessage $message, PsrContext $context) 
     {
         $this->mailer->send('foo@example.com', $message->getBody());
         
@@ -99,17 +99,17 @@ The consumption component provide some useful extensions, for example there is a
  
 ```php
 <?php
-use Enqueue\Psr\Processor;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Context;
+use Enqueue\Psr\PsrProcessor;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrContext;
 use Enqueue\Consumption\ChainExtension;
 use Enqueue\Consumption\QueueConsumer;
 use Enqueue\Consumption\Extension\ReplyExtension;
 use Enqueue\Consumption\Result;
 
-class SendMailProcessor implements Processor
+class SendMailProcessor implements PsrProcessor
 {
-    public function process(Message $message, Context $context) 
+    public function process(PsrMessage $message, PsrContext $context) 
     {
         $this->mailer->send('foo@example.com', $message->getBody());
         
@@ -119,7 +119,7 @@ class SendMailProcessor implements Processor
     }
 }
 
-/** @var \Enqueue\Psr\Context $psrContext */
+/** @var \Enqueue\Psr\PsrContext $psrContext */
 
 $queueConsumer = new QueueConsumer($psrContext, new ChainExtension([
     new ReplyExtension()
diff --git a/docs/job_queue/run_sub_job.md b/docs/job_queue/run_sub_job.md
index 2bd2eb618..3e946ce8b 100644
--- a/docs/job_queue/run_sub_job.md
+++ b/docs/job_queue/run_sub_job.md
@@ -7,14 +7,14 @@ They will be executed in parallel.
 ```php
 <?php
 use Enqueue\Client\ProducerInterface;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Context;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrProcessor;
 use Enqueue\JobQueue\JobRunner;
 use Enqueue\JobQueue\Job;
 use Enqueue\Util\JSON;
 
-class RootJobProcessor implements Processor
+class RootJobProcessor implements PsrProcessor
 {
     /** @var JobRunner */
     private $jobRunner;
@@ -22,7 +22,7 @@ class RootJobProcessor implements Processor
     /** @var  ProducerInterface */
     private $producer;
 
-    public function process(Message $message, Context $context)
+    public function process(PsrMessage $message, PsrContext $context)
     {
         $result = $this->jobRunner->runUnique($message->getMessageId(), 'aJobName', function (JobRunner $runner) {
             $runner->createDelayed('aSubJobName1', function (JobRunner $runner, Job $childJob) {
@@ -39,12 +39,12 @@ class RootJobProcessor implements Processor
     }
 }
 
-class SubJobProcessor implements Processor
+class SubJobProcessor implements PsrProcessor
 {
     /** @var JobRunner */
     private $jobRunner;
 
-    public function process(Message $message, Context $context)
+    public function process(PsrMessage $message, PsrContext $context)
     {
         $data = JSON::decode($message->getBody());
 
@@ -54,7 +54,7 @@ class SubJobProcessor implements Processor
             return true;
         });
 
-        return $result ? Result::ACK : Result::REJECT;
+        return $result ? self::ACK : self::REJECT;
     }
 }
 ```
diff --git a/docs/job_queue/run_unique_job.md b/docs/job_queue/run_unique_job.md
index cfb145d2e..d64faa2e8 100644
--- a/docs/job_queue/run_unique_job.md
+++ b/docs/job_queue/run_unique_job.md
@@ -12,17 +12,17 @@ It shows how you can run unique job using job queue (The configuration is descri
 
 ```php
 <?php 
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Context;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrProcessor;
 use Enqueue\JobQueue\JobRunner;
 
-class UniqueJobProcessor implements Processor 
+class UniqueJobProcessor implements PsrProcessor 
 {
     /** @var JobRunner */
     private $jobRunner;
 
-    public function process(Message $message, Context $context)
+    public function process(PsrMessage $message, PsrContext $context)
     {
         $result = $this->jobRunner->runUnique($message->getMessageId(), 'aJobName', function () {
             // do your job, there is no any other processes executing same job,
diff --git a/docs/quick_tour.md b/docs/quick_tour.md
index bb0a87684..75f8ba00e 100644
--- a/docs/quick_tour.md
+++ b/docs/quick_tour.md
@@ -20,9 +20,9 @@ Produce a message:
 
 ```php
 <?php
-use Enqueue\Psr\ConnectionFactory;
+use Enqueue\Psr\PsrConnectionFactory;
 
-/** @var ConnectionFactory $connectionFactory **/
+/** @var PsrConnectionFactory $connectionFactory **/
 $psrContext = $connectionFactory->createContext();
 
 $destination = $psrContext->createQueue('foo');
@@ -37,9 +37,9 @@ Consume a message:
 
 ```php
 <?php
-use Enqueue\Psr\ConnectionFactory;
+use Enqueue\Psr\PsrConnectionFactory;
 
-/** @var ConnectionFactory $connectionFactory **/
+/** @var PsrConnectionFactory $connectionFactory **/
 $psrContext = $connectionFactory->createContext();
 
 $destination = $psrContext->createQueue('foo');
@@ -64,23 +64,24 @@ The `consume` method starts the consumption process which last as long as it is
 
 ```php
 <?php
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrProcessor;
+use Enqueue\Psr\PsrContext;
 use Enqueue\Consumption\QueueConsumer;
 
-/** @var \Enqueue\Psr\Context $psrContext */
+/** @var PsrContext $psrContext */
 
 $queueConsumer = new QueueConsumer($psrContext);
 
-$queueConsumer->bind('foo_queue', function(Message $message) {
+$queueConsumer->bind('foo_queue', function(PsrMessage $message) {
     // process messsage
     
-    return Processor::ACK;
+    return PsrProcessor::ACK;
 });
-$queueConsumer->bind('bar_queue', function(Message $message) {
+$queueConsumer->bind('bar_queue', function(PsrMessage $message) {
     // process messsage
     
-    return Processor::ACK;
+    return PsrProcessor::ACK;
 });
 
 $queueConsumer->consume();
@@ -98,7 +99,7 @@ use Enqueue\Consumption\QueueConsumer;
 use Enqueue\Consumption\Extension\SignalExtension;
 use Enqueue\Consumption\Extension\LimitConsumptionTimeExtension;
 
-/** @var \Enqueue\Psr\Context $psrContext */
+/** @var \Enqueue\Psr\PsrContext $psrContext */
 
 $queueConsumer = new QueueConsumer($psrContext, new ChainExtension([
     new SignalExtension(),
@@ -115,7 +116,7 @@ You can do several calls asynchronously. This is how you can send a RPC message
 <?php
 use Enqueue\Rpc\RpcClient;
 
-/** @var \Enqueue\Psr\Context $psrContext */
+/** @var \Enqueue\Psr\PsrContext $psrContext */
 
 $queue = $psrContext->createQueue('foo');
 $message = $psrContext->createMessage('Hi there!');
@@ -131,20 +132,20 @@ It simplifies a server side of RPC.
 
 ```php
 <?php
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Context;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrContext;
 use Enqueue\Consumption\ChainExtension;
 use Enqueue\Consumption\QueueConsumer;
 use Enqueue\Consumption\Extension\ReplyExtension;
 use Enqueue\Consumption\Result;
 
-/** @var \Enqueue\Psr\Context $psrContext */
+/** @var \Enqueue\Psr\PsrContext $psrContext */
 
 $queueConsumer = new QueueConsumer($psrContext, new ChainExtension([
     new ReplyExtension()
 ]));
 
-$queueConsumer->bind('foo', function(Message $message, Context $context) {
+$queueConsumer->bind('foo', function(PsrMessage $message, PsrContext $context) {
     $replyMessage = $context->createMessage('Hello');
     
     return Result::reply($replyMessage);
@@ -167,16 +168,16 @@ Here's an example of how you can send and consume messages.
 ```php
 <?php
 use Enqueue\Client\SimpleClient;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrProcessor;
 
-/** @var \Enqueue\Psr\Context $psrContext */
+/** @var \Enqueue\Psr\PsrContext $psrContext */
 
 $client = new SimpleClient($psrContext);
-$client->bind('foo_topic', 'processor_name', function (Message $message) {
+$client->bind('foo_topic', 'processor_name', function (PsrMessage $message) {
     // process message
 
-    return Processor::ACK;
+    return PsrProcessor::ACK;
 });
 
 $client->send('foo_topic', 'Hello there!');
@@ -199,13 +200,13 @@ Let's see how you can use consumption one:
 // app.php
 
 use Symfony\Component\Console\Application;
-use Enqueue\Psr\Message;
+use Enqueue\Psr\PsrMessage;
 use Enqueue\Consumption\QueueConsumer;
 use Enqueue\Symfony\Consumption\ConsumeMessagesCommand;
 
 /** @var QueueConsumer $queueConsumer */
 
-$queueConsumer->bind('a_queue', function(Message $message) {
+$queueConsumer->bind('a_queue', function(PsrMessage $message) {
     // process message    
 });
 
diff --git a/pkg/amqp-ext/AmqpConnectionFactory.php b/pkg/amqp-ext/AmqpConnectionFactory.php
index 174ab4532..8bff4c62d 100644
--- a/pkg/amqp-ext/AmqpConnectionFactory.php
+++ b/pkg/amqp-ext/AmqpConnectionFactory.php
@@ -2,9 +2,9 @@
 
 namespace Enqueue\AmqpExt;
 
-use Enqueue\Psr\ConnectionFactory;
+use Enqueue\Psr\PsrConnectionFactory;
 
-class AmqpConnectionFactory implements ConnectionFactory
+class AmqpConnectionFactory implements PsrConnectionFactory
 {
     /**
      * @var array
diff --git a/pkg/amqp-ext/AmqpConsumer.php b/pkg/amqp-ext/AmqpConsumer.php
index afc45eaae..bf5db633f 100644
--- a/pkg/amqp-ext/AmqpConsumer.php
+++ b/pkg/amqp-ext/AmqpConsumer.php
@@ -2,11 +2,11 @@
 
 namespace Enqueue\AmqpExt;
 
-use Enqueue\Psr\Consumer;
 use Enqueue\Psr\InvalidMessageException;
-use Enqueue\Psr\Message;
+use Enqueue\Psr\PsrConsumer;
+use Enqueue\Psr\PsrMessage;
 
-class AmqpConsumer implements Consumer
+class AmqpConsumer implements PsrConsumer
 {
     /**
      * @var AmqpContext
@@ -129,7 +129,7 @@ public function receiveNoWait()
      *
      * @param AmqpMessage $message
      */
-    public function acknowledge(Message $message)
+    public function acknowledge(PsrMessage $message)
     {
         InvalidMessageException::assertMessageInstanceOf($message, AmqpMessage::class);
 
@@ -141,7 +141,7 @@ public function acknowledge(Message $message)
      *
      * @param AmqpMessage $message
      */
-    public function reject(Message $message, $requeue = false)
+    public function reject(PsrMessage $message, $requeue = false)
     {
         InvalidMessageException::assertMessageInstanceOf($message, AmqpMessage::class);
 
diff --git a/pkg/amqp-ext/AmqpContext.php b/pkg/amqp-ext/AmqpContext.php
index 68c8b2ca1..24e4900c3 100644
--- a/pkg/amqp-ext/AmqpContext.php
+++ b/pkg/amqp-ext/AmqpContext.php
@@ -2,13 +2,13 @@
 
 namespace Enqueue\AmqpExt;
 
-use Enqueue\Psr\Context;
-use Enqueue\Psr\Destination;
 use Enqueue\Psr\InvalidDestinationException;
-use Enqueue\Psr\Queue;
-use Enqueue\Psr\Topic;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrDestination;
+use Enqueue\Psr\PsrQueue;
+use Enqueue\Psr\PsrTopic;
 
-class AmqpContext implements Context
+class AmqpContext implements PsrContext
 {
     /**
      * @var \AMQPChannel
@@ -64,9 +64,9 @@ public function createTopic($topicName)
     }
 
     /**
-     * @param AmqpTopic|Destination $destination
+     * @param AmqpTopic|PsrDestination $destination
      */
-    public function deleteTopic(Destination $destination)
+    public function deleteTopic(PsrDestination $destination)
     {
         InvalidDestinationException::assertDestinationInstanceOf($destination, AmqpTopic::class);
 
@@ -75,9 +75,9 @@ public function deleteTopic(Destination $destination)
     }
 
     /**
-     * @param AmqpTopic|Destination $destination
+     * @param AmqpTopic|PsrDestination $destination
      */
-    public function declareTopic(Destination $destination)
+    public function declareTopic(PsrDestination $destination)
     {
         InvalidDestinationException::assertDestinationInstanceOf($destination, AmqpTopic::class);
 
@@ -101,9 +101,9 @@ public function createQueue($queueName)
     }
 
     /**
-     * @param AmqpQueue|Destination $destination
+     * @param AmqpQueue|PsrDestination $destination
      */
-    public function deleteQueue(Destination $destination)
+    public function deleteQueue(PsrDestination $destination)
     {
         InvalidDestinationException::assertDestinationInstanceOf($destination, AmqpQueue::class);
 
@@ -113,9 +113,9 @@ public function deleteQueue(Destination $destination)
     }
 
     /**
-     * @param AmqpQueue|Destination $destination
+     * @param AmqpQueue|PsrDestination $destination
      */
-    public function declareQueue(Destination $destination)
+    public function declareQueue(PsrDestination $destination)
     {
         InvalidDestinationException::assertDestinationInstanceOf($destination, AmqpQueue::class);
 
@@ -162,13 +162,13 @@ public function createProducer()
     /**
      * {@inheritdoc}
      *
-     * @param Destination|AmqpQueue $destination
+     * @param PsrDestination|AmqpQueue $destination
      *
      * @return AmqpConsumer
      */
-    public function createConsumer(Destination $destination)
+    public function createConsumer(PsrDestination $destination)
     {
-        $destination instanceof Topic
+        $destination instanceof PsrTopic
             ? InvalidDestinationException::assertDestinationInstanceOf($destination, AmqpTopic::class)
             : InvalidDestinationException::assertDestinationInstanceOf($destination, AmqpQueue::class)
         ;
@@ -192,10 +192,10 @@ public function close()
     }
 
     /**
-     * @param AmqpTopic|Destination $source
-     * @param AmqpQueue|Destination $target
+     * @param AmqpTopic|PsrDestination $source
+     * @param AmqpQueue|PsrDestination $target
      */
-    public function bind(Destination $source, Destination $target)
+    public function bind(PsrDestination $source, PsrDestination $target)
     {
         InvalidDestinationException::assertDestinationInstanceOf($source, AmqpTopic::class);
         InvalidDestinationException::assertDestinationInstanceOf($target, AmqpQueue::class);
@@ -236,9 +236,9 @@ public function getExtChannel()
     /**
      * Purge all messages from the given queue.
      *
-     * @param Queue $queue
+     * @param PsrQueue $queue
      */
-    public function purge(Queue $queue)
+    public function purge(PsrQueue $queue)
     {
         InvalidDestinationException::assertDestinationInstanceOf($queue, AmqpQueue::class);
 
diff --git a/pkg/amqp-ext/AmqpMessage.php b/pkg/amqp-ext/AmqpMessage.php
index c92bd2dac..b65b42b7c 100644
--- a/pkg/amqp-ext/AmqpMessage.php
+++ b/pkg/amqp-ext/AmqpMessage.php
@@ -2,9 +2,9 @@
 
 namespace Enqueue\AmqpExt;
 
-use Enqueue\Psr\Message;
+use Enqueue\Psr\PsrMessage;
 
-class AmqpMessage implements Message
+class AmqpMessage implements PsrMessage
 {
     /**
      * @var string
diff --git a/pkg/amqp-ext/AmqpProducer.php b/pkg/amqp-ext/AmqpProducer.php
index 39d9d3ad1..9b09f25ea 100644
--- a/pkg/amqp-ext/AmqpProducer.php
+++ b/pkg/amqp-ext/AmqpProducer.php
@@ -2,14 +2,14 @@
 
 namespace Enqueue\AmqpExt;
 
-use Enqueue\Psr\Destination;
 use Enqueue\Psr\InvalidDestinationException;
 use Enqueue\Psr\InvalidMessageException;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Producer;
-use Enqueue\Psr\Topic;
+use Enqueue\Psr\PsrDestination;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrProducer;
+use Enqueue\Psr\PsrTopic;
 
-class AmqpProducer implements Producer
+class AmqpProducer implements PsrProducer
 {
     /**
      * @var \AMQPChannel
@@ -30,9 +30,9 @@ public function __construct(\AMQPChannel $ampqChannel)
      * @param AmqpTopic|AmqpQueue $destination
      * @param AmqpMessage         $message
      */
-    public function send(Destination $destination, Message $message)
+    public function send(PsrDestination $destination, PsrMessage $message)
     {
-        $destination instanceof Topic
+        $destination instanceof PsrTopic
             ? InvalidDestinationException::assertDestinationInstanceOf($destination, AmqpTopic::class)
             : InvalidDestinationException::assertDestinationInstanceOf($destination, AmqpQueue::class)
         ;
diff --git a/pkg/amqp-ext/AmqpQueue.php b/pkg/amqp-ext/AmqpQueue.php
index b11454a00..921e8e4d8 100644
--- a/pkg/amqp-ext/AmqpQueue.php
+++ b/pkg/amqp-ext/AmqpQueue.php
@@ -2,9 +2,9 @@
 
 namespace Enqueue\AmqpExt;
 
-use Enqueue\Psr\Queue;
+use Enqueue\Psr\PsrQueue;
 
-class AmqpQueue implements Queue
+class AmqpQueue implements PsrQueue
 {
     /**
      * @var string
diff --git a/pkg/amqp-ext/AmqpTopic.php b/pkg/amqp-ext/AmqpTopic.php
index fbe45a9f7..69dc4c7f9 100644
--- a/pkg/amqp-ext/AmqpTopic.php
+++ b/pkg/amqp-ext/AmqpTopic.php
@@ -2,9 +2,9 @@
 
 namespace Enqueue\AmqpExt;
 
-use Enqueue\Psr\Topic;
+use Enqueue\Psr\PsrTopic;
 
-class AmqpTopic implements Topic
+class AmqpTopic implements PsrTopic
 {
     /**
      * @var string
diff --git a/pkg/amqp-ext/Client/AmqpDriver.php b/pkg/amqp-ext/Client/AmqpDriver.php
index 52fd8d87b..60a1536ad 100644
--- a/pkg/amqp-ext/Client/AmqpDriver.php
+++ b/pkg/amqp-ext/Client/AmqpDriver.php
@@ -11,7 +11,7 @@
 use Enqueue\Client\Message;
 use Enqueue\Client\Meta\QueueMetaRegistry;
 use Enqueue\AmqpExt\DeliveryMode;
-use Enqueue\Psr\Message as TransportMessage;
+use Enqueue\Psr\PsrMessage;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
@@ -154,7 +154,7 @@ public function createTransportMessage(Message $message)
      *
      * {@inheritdoc}
      */
-    public function createClientMessage(TransportMessage $message)
+    public function createClientMessage(PsrMessage $message)
     {
         $clientMessage = new Message();
 
diff --git a/pkg/amqp-ext/Client/RabbitMqDriver.php b/pkg/amqp-ext/Client/RabbitMqDriver.php
index dbd3af9fb..100f91dee 100644
--- a/pkg/amqp-ext/Client/RabbitMqDriver.php
+++ b/pkg/amqp-ext/Client/RabbitMqDriver.php
@@ -11,7 +11,7 @@
 use Enqueue\Client\MessagePriority;
 use Enqueue\Client\Meta\QueueMetaRegistry;
 use Enqueue\Consumption\Exception\LogicException;
-use Enqueue\Psr\Message as TransportMessage;
+use Enqueue\Psr\PsrMessage;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
@@ -132,7 +132,7 @@ public function createTransportMessage(Message $message)
      *
      * {@inheritdoc}
      */
-    public function createClientMessage(TransportMessage $message)
+    public function createClientMessage(PsrMessage $message)
     {
         $clientMessage = parent::createClientMessage($message);
 
diff --git a/pkg/amqp-ext/Tests/AmqpConnectionFactoryTest.php b/pkg/amqp-ext/Tests/AmqpConnectionFactoryTest.php
index f0692e5ef..17017090e 100644
--- a/pkg/amqp-ext/Tests/AmqpConnectionFactoryTest.php
+++ b/pkg/amqp-ext/Tests/AmqpConnectionFactoryTest.php
@@ -4,7 +4,7 @@
 
 use Enqueue\AmqpExt\AmqpConnectionFactory;
 use Enqueue\AmqpExt\AmqpContext;
-use Enqueue\Psr\ConnectionFactory;
+use Enqueue\Psr\PsrConnectionFactory;
 use Enqueue\Test\ClassExtensionTrait;
 
 class AmqpConnectionFactoryTest extends \PHPUnit_Framework_TestCase
@@ -13,7 +13,7 @@ class AmqpConnectionFactoryTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementConnectionFactoryInterface()
     {
-        $this->assertClassImplements(ConnectionFactory::class, AmqpConnectionFactory::class);
+        $this->assertClassImplements(PsrConnectionFactory::class, AmqpConnectionFactory::class);
     }
 
     public function testCouldBeConstructedWithEmptyConfiguration()
diff --git a/pkg/amqp-ext/Tests/AmqpConsumerTest.php b/pkg/amqp-ext/Tests/AmqpConsumerTest.php
index c5cad4f30..7615dc6c6 100644
--- a/pkg/amqp-ext/Tests/AmqpConsumerTest.php
+++ b/pkg/amqp-ext/Tests/AmqpConsumerTest.php
@@ -6,7 +6,7 @@
 use Enqueue\AmqpExt\AmqpContext;
 use Enqueue\AmqpExt\AmqpQueue;
 use Enqueue\AmqpExt\Buffer;
-use Enqueue\Psr\Consumer;
+use Enqueue\Psr\PsrConsumer;
 use Enqueue\Test\ClassExtensionTrait;
 
 class AmqpConsumerTest extends \PHPUnit_Framework_TestCase
@@ -15,7 +15,7 @@ class AmqpConsumerTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementConsumerInterface()
     {
-        $this->assertClassImplements(Consumer::class, AmqpConsumer::class);
+        $this->assertClassImplements(PsrConsumer::class, AmqpConsumer::class);
     }
 
     public function testCouldBeConstructedWithContextAndQueueAndBufferAsArguments()
diff --git a/pkg/amqp-ext/Tests/AmqpContextTest.php b/pkg/amqp-ext/Tests/AmqpContextTest.php
index 1b94405f3..0ee05d06c 100644
--- a/pkg/amqp-ext/Tests/AmqpContextTest.php
+++ b/pkg/amqp-ext/Tests/AmqpContextTest.php
@@ -9,7 +9,7 @@
 use Enqueue\AmqpExt\AmqpQueue;
 use Enqueue\AmqpExt\AmqpTopic;
 use Enqueue\AmqpExt\Buffer;
-use Enqueue\Psr\Context;
+use Enqueue\Psr\PsrContext;
 use Enqueue\Psr\InvalidDestinationException;
 use Enqueue\Test\ClassExtensionTrait;
 use Enqueue\Transport\Null\NullQueue;
@@ -21,7 +21,7 @@ class AmqpContextTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementPsrContextInterface()
     {
-        $this->assertClassImplements(Context::class, AmqpContext::class);
+        $this->assertClassImplements(PsrContext::class, AmqpContext::class);
     }
 
     public function testCouldBeConstructedWithExtChannelAsFirstArgument()
diff --git a/pkg/amqp-ext/Tests/AmqpMessageTest.php b/pkg/amqp-ext/Tests/AmqpMessageTest.php
index 11d77f64f..0754d9199 100644
--- a/pkg/amqp-ext/Tests/AmqpMessageTest.php
+++ b/pkg/amqp-ext/Tests/AmqpMessageTest.php
@@ -3,7 +3,7 @@
 namespace Enqueue\AmqpExt\Tests;
 
 use Enqueue\AmqpExt\AmqpMessage;
-use Enqueue\Psr\Message;
+use Enqueue\Psr\PsrMessage;
 use Enqueue\Test\ClassExtensionTrait;
 
 class AmqpMessageTest extends \PHPUnit_Framework_TestCase
@@ -12,7 +12,7 @@ class AmqpMessageTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementQueueInterface()
     {
-        $this->assertClassImplements(Message::class, AmqpMessage::class);
+        $this->assertClassImplements(PsrMessage::class, AmqpMessage::class);
     }
 
     public function testCouldBeConstructedWithoutArguments()
diff --git a/pkg/amqp-ext/Tests/AmqpProducerTest.php b/pkg/amqp-ext/Tests/AmqpProducerTest.php
index b467441c8..1871bf444 100644
--- a/pkg/amqp-ext/Tests/AmqpProducerTest.php
+++ b/pkg/amqp-ext/Tests/AmqpProducerTest.php
@@ -3,7 +3,7 @@
 namespace Enqueue\AmqpExt\Tests;
 
 use Enqueue\AmqpExt\AmqpProducer;
-use Enqueue\Psr\Producer;
+use Enqueue\Psr\PsrProducer;
 use Enqueue\Test\ClassExtensionTrait;
 
 class AmqpProducerTest extends \PHPUnit_Framework_TestCase
@@ -12,6 +12,6 @@ class AmqpProducerTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementProducerInterface()
     {
-        $this->assertClassImplements(Producer::class, AmqpProducer::class);
+        $this->assertClassImplements(PsrProducer::class, AmqpProducer::class);
     }
 }
diff --git a/pkg/amqp-ext/Tests/AmqpQueueTest.php b/pkg/amqp-ext/Tests/AmqpQueueTest.php
index 56e234764..33c2ee31e 100644
--- a/pkg/amqp-ext/Tests/AmqpQueueTest.php
+++ b/pkg/amqp-ext/Tests/AmqpQueueTest.php
@@ -3,7 +3,7 @@
 namespace Enqueue\AmqpExt\Tests;
 
 use Enqueue\AmqpExt\AmqpQueue;
-use Enqueue\Psr\Queue;
+use Enqueue\Psr\PsrQueue;
 use Enqueue\Test\ClassExtensionTrait;
 
 class AmqpQueueTest extends \PHPUnit_Framework_TestCase
@@ -12,7 +12,7 @@ class AmqpQueueTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementQueueInterface()
     {
-        $this->assertClassImplements(Queue::class, AmqpQueue::class);
+        $this->assertClassImplements(PsrQueue::class, AmqpQueue::class);
     }
 
     public function testCouldBeConstructedWithQueueNameArgument()
diff --git a/pkg/amqp-ext/Tests/AmqpTopicTest.php b/pkg/amqp-ext/Tests/AmqpTopicTest.php
index d132eef3c..fb730e511 100644
--- a/pkg/amqp-ext/Tests/AmqpTopicTest.php
+++ b/pkg/amqp-ext/Tests/AmqpTopicTest.php
@@ -3,7 +3,7 @@
 namespace Enqueue\AmqpExt\Tests;
 
 use Enqueue\AmqpExt\AmqpTopic;
-use Enqueue\Psr\Topic;
+use Enqueue\Psr\PsrTopic;
 use Enqueue\Test\ClassExtensionTrait;
 
 class AmqpTopicTest extends \PHPUnit_Framework_TestCase
@@ -12,7 +12,7 @@ class AmqpTopicTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementTopicInterface()
     {
-        $this->assertClassImplements(Topic::class, AmqpTopic::class);
+        $this->assertClassImplements(PsrTopic::class, AmqpTopic::class);
     }
 
     public function testCouldBeConstructedWithTopicNameAsArgument()
diff --git a/pkg/amqp-ext/Tests/Client/AmqpDriverTest.php b/pkg/amqp-ext/Tests/Client/AmqpDriverTest.php
index 3bdfccfa9..4c68da865 100644
--- a/pkg/amqp-ext/Tests/Client/AmqpDriverTest.php
+++ b/pkg/amqp-ext/Tests/Client/AmqpDriverTest.php
@@ -11,7 +11,7 @@
 use Enqueue\Client\DriverInterface;
 use Enqueue\Client\Message;
 use Enqueue\Client\Meta\QueueMetaRegistry;
-use Enqueue\Psr\Producer;
+use Enqueue\Psr\PsrProducer;
 use Enqueue\Test\ClassExtensionTrait;
 
 class AmqpDriverTest extends \PHPUnit_Framework_TestCase
@@ -356,11 +356,11 @@ private function createPsrContextMock()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Producer
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrProducer
      */
     private function createPsrProducerMock()
     {
-        return $this->createMock(Producer::class);
+        return $this->createMock(PsrProducer::class);
     }
 
     /**
diff --git a/pkg/amqp-ext/Tests/Client/RabbitMqDriverTest.php b/pkg/amqp-ext/Tests/Client/RabbitMqDriverTest.php
index e17464d82..af44bc563 100644
--- a/pkg/amqp-ext/Tests/Client/RabbitMqDriverTest.php
+++ b/pkg/amqp-ext/Tests/Client/RabbitMqDriverTest.php
@@ -13,7 +13,7 @@
 use Enqueue\Client\Message;
 use Enqueue\Client\MessagePriority;
 use Enqueue\Client\Meta\QueueMetaRegistry;
-use Enqueue\Psr\Producer;
+use Enqueue\Psr\PsrProducer;
 use Enqueue\Test\ClassExtensionTrait;
 
 class RabbitMqDriverTest extends \PHPUnit_Framework_TestCase
@@ -571,11 +571,11 @@ private function createPsrContextMock()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Producer
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrProducer
      */
     private function createPsrProducerMock()
     {
-        return $this->createMock(Producer::class);
+        return $this->createMock(PsrProducer::class);
     }
 
     /**
diff --git a/pkg/amqp-ext/Tests/Functional/AmqpConsumptionUseCasesTest.php b/pkg/amqp-ext/Tests/Functional/AmqpConsumptionUseCasesTest.php
index 76abbfce9..463e05b4b 100644
--- a/pkg/amqp-ext/Tests/Functional/AmqpConsumptionUseCasesTest.php
+++ b/pkg/amqp-ext/Tests/Functional/AmqpConsumptionUseCasesTest.php
@@ -9,9 +9,9 @@
 use Enqueue\Consumption\Extension\ReplyExtension;
 use Enqueue\Consumption\QueueConsumer;
 use Enqueue\Consumption\Result;
-use Enqueue\Psr\Context;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrProcessor;
 use Enqueue\Test\RabbitmqAmqpExtension;
 use Enqueue\Test\RabbitmqManagmentExtensionTrait;
 
@@ -58,7 +58,7 @@ public function testConsumeOneMessageAndExit()
 
         $queueConsumer->consume();
 
-        $this->assertInstanceOf(Message::class, $processor->lastProcessedMessage);
+        $this->assertInstanceOf(PsrMessage::class, $processor->lastProcessedMessage);
         $this->assertEquals(__METHOD__, $processor->lastProcessedMessage->getBody());
     }
 
@@ -91,22 +91,22 @@ public function testConsumeOneMessageAndSendReplyExit()
         $queueConsumer->bind($replyQueue, $replyProcessor);
         $queueConsumer->consume();
 
-        $this->assertInstanceOf(Message::class, $processor->lastProcessedMessage);
+        $this->assertInstanceOf(PsrMessage::class, $processor->lastProcessedMessage);
         $this->assertEquals(__METHOD__, $processor->lastProcessedMessage->getBody());
 
-        $this->assertInstanceOf(Message::class, $replyProcessor->lastProcessedMessage);
+        $this->assertInstanceOf(PsrMessage::class, $replyProcessor->lastProcessedMessage);
         $this->assertEquals(__METHOD__.'.reply', $replyProcessor->lastProcessedMessage->getBody());
     }
 }
 
-class StubProcessor implements Processor
+class StubProcessor implements PsrProcessor
 {
-    public $result = Result::ACK;
+    public $result = self::ACK;
 
-    /** @var \Enqueue\Psr\Message */
+    /** @var PsrMessage */
     public $lastProcessedMessage;
 
-    public function process(Message $message, Context $context)
+    public function process(PsrMessage $message, PsrContext $context)
     {
         $this->lastProcessedMessage = $message;
 
diff --git a/pkg/enqueue-bundle/Tests/Functional/ContextTest.php b/pkg/enqueue-bundle/Tests/Functional/ContextTest.php
index f11a9b17a..4b85b51d6 100644
--- a/pkg/enqueue-bundle/Tests/Functional/ContextTest.php
+++ b/pkg/enqueue-bundle/Tests/Functional/ContextTest.php
@@ -2,7 +2,7 @@
 
 namespace Enqueue\Bundle\Tests\Functional;
 
-use Enqueue\Psr\Context;
+use Enqueue\Psr\PsrContext;
 
 /**
  * @group functional
@@ -13,6 +13,6 @@ public function testCouldBeGetFromContainerAsService()
     {
         $connection = $this->container->get('enqueue.transport.context');
 
-        $this->assertInstanceOf(Context::class, $connection);
+        $this->assertInstanceOf(PsrContext::class, $connection);
     }
 }
diff --git a/pkg/enqueue-bundle/Tests/Functional/TestProcessor.php b/pkg/enqueue-bundle/Tests/Functional/TestProcessor.php
index 0f977dd80..b7824034b 100644
--- a/pkg/enqueue-bundle/Tests/Functional/TestProcessor.php
+++ b/pkg/enqueue-bundle/Tests/Functional/TestProcessor.php
@@ -3,20 +3,20 @@
 namespace Enqueue\Bundle\Tests\Functional;
 
 use Enqueue\Client\TopicSubscriberInterface;
-use Enqueue\Psr\Context;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrProcessor;
 
-class TestProcessor implements Processor, TopicSubscriberInterface
+class TestProcessor implements PsrProcessor, TopicSubscriberInterface
 {
     const TOPIC = 'test-topic';
 
     /**
-     * @var Message
+     * @var PsrMessage
      */
     public $message;
 
-    public function process(Message $message, Context $context)
+    public function process(PsrMessage $message, PsrContext $context)
     {
         $this->message = $message;
 
diff --git a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClearIdentityMapExtensionTest.php b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClearIdentityMapExtensionTest.php
index 7bf9eaa36..a05a1203a 100644
--- a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClearIdentityMapExtensionTest.php
+++ b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrineClearIdentityMapExtensionTest.php
@@ -5,9 +5,9 @@
 use Doctrine\Common\Persistence\ObjectManager;
 use Enqueue\Bundle\Consumption\Extension\DoctrineClearIdentityMapExtension;
 use Enqueue\Consumption\Context;
-use Enqueue\Psr\Consumer;
-use Enqueue\Psr\Context as PsrContext;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrConsumer;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrProcessor;
 use Psr\Log\LoggerInterface;
 use Symfony\Bridge\Doctrine\RegistryInterface;
 
@@ -51,8 +51,8 @@ protected function createPsrContext()
     {
         $context = new Context($this->createMock(PsrContext::class));
         $context->setLogger($this->createMock(LoggerInterface::class));
-        $context->setPsrConsumer($this->createMock(Consumer::class));
-        $context->setPsrProcessor($this->createMock(Processor::class));
+        $context->setPsrConsumer($this->createMock(PsrConsumer::class));
+        $context->setPsrProcessor($this->createMock(PsrProcessor::class));
 
         return $context;
     }
diff --git a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrinePingConnectionExtensionTest.php b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrinePingConnectionExtensionTest.php
index 8e4f40bdf..d6d621df0 100644
--- a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrinePingConnectionExtensionTest.php
+++ b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrinePingConnectionExtensionTest.php
@@ -5,9 +5,9 @@
 use Doctrine\DBAL\Connection;
 use Enqueue\Bundle\Consumption\Extension\DoctrinePingConnectionExtension;
 use Enqueue\Consumption\Context;
-use Enqueue\Psr\Consumer;
-use Enqueue\Psr\Context as PsrContext;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrConsumer;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrProcessor;
 use Psr\Log\LoggerInterface;
 use Symfony\Bridge\Doctrine\RegistryInterface;
 
@@ -99,8 +99,8 @@ protected function createPsrContext()
     {
         $context = new Context($this->createMock(PsrContext::class));
         $context->setLogger($this->createMock(LoggerInterface::class));
-        $context->setPsrConsumer($this->createMock(Consumer::class));
-        $context->setPsrProcessor($this->createMock(Processor::class));
+        $context->setPsrConsumer($this->createMock(PsrConsumer::class));
+        $context->setPsrProcessor($this->createMock(PsrProcessor::class));
 
         return $context;
     }
diff --git a/pkg/enqueue/Client/ArrayProcessorRegistry.php b/pkg/enqueue/Client/ArrayProcessorRegistry.php
index ab8278893..9a3dfafff 100644
--- a/pkg/enqueue/Client/ArrayProcessorRegistry.php
+++ b/pkg/enqueue/Client/ArrayProcessorRegistry.php
@@ -2,17 +2,17 @@
 
 namespace Enqueue\Client;
 
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrProcessor;
 
 class ArrayProcessorRegistry implements ProcessorRegistryInterface
 {
     /**
-     * @var Processor[]
+     * @var PsrProcessor[]
      */
     private $processors;
 
     /**
-     * @param Processor[] $processors
+     * @param PsrProcessor[] $processors
      */
     public function __construct(array $processors = [])
     {
@@ -21,9 +21,9 @@ public function __construct(array $processors = [])
 
     /**
      * @param string    $name
-     * @param Processor $processor
+     * @param PsrProcessor $processor
      */
-    public function add($name, Processor $processor)
+    public function add($name, PsrProcessor $processor)
     {
         $this->processors[$name] = $processor;
     }
diff --git a/pkg/enqueue/Client/DelegateProcessor.php b/pkg/enqueue/Client/DelegateProcessor.php
index 910a9e504..230dcea8f 100644
--- a/pkg/enqueue/Client/DelegateProcessor.php
+++ b/pkg/enqueue/Client/DelegateProcessor.php
@@ -2,11 +2,11 @@
 
 namespace Enqueue\Client;
 
-use Enqueue\Psr\Context;
-use Enqueue\Psr\Message as PsrMessage;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrProcessor;
 
-class DelegateProcessor implements Processor
+class DelegateProcessor implements PsrProcessor
 {
     /**
      * @var ProcessorRegistryInterface
@@ -24,7 +24,7 @@ public function __construct(ProcessorRegistryInterface $registry)
     /**
      * {@inheritdoc}
      */
-    public function process(PsrMessage $message, Context $context)
+    public function process(PsrMessage $message, PsrContext $context)
     {
         $processorName = $message->getProperty(Config::PARAMETER_PROCESSOR_NAME);
         if (false == $processorName) {
diff --git a/pkg/enqueue/Client/DriverInterface.php b/pkg/enqueue/Client/DriverInterface.php
index 9e0c1ede2..3737165e3 100644
--- a/pkg/enqueue/Client/DriverInterface.php
+++ b/pkg/enqueue/Client/DriverInterface.php
@@ -2,8 +2,8 @@
 
 namespace Enqueue\Client;
 
-use Enqueue\Psr\Message as TransportMessage;
-use Enqueue\Psr\Queue;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrQueue;
 use Psr\Log\LoggerInterface;
 
 interface DriverInterface
@@ -11,16 +11,16 @@ interface DriverInterface
     /**
      * @param Message $message
      *
-     * @return TransportMessage
+     * @return PsrMessage
      */
     public function createTransportMessage(Message $message);
 
     /**
-     * @param TransportMessage $message
+     * @param PsrMessage $message
      *
      * @return Message
      */
-    public function createClientMessage(TransportMessage $message);
+    public function createClientMessage(PsrMessage $message);
 
     /**
      * @param Message $message
@@ -35,7 +35,7 @@ public function sendToProcessor(Message $message);
     /**
      * @param string $queueName
      *
-     * @return Queue
+     * @return PsrQueue
      */
     public function createQueue($queueName);
 
diff --git a/pkg/enqueue/Client/NullDriver.php b/pkg/enqueue/Client/NullDriver.php
index dc2f74014..5ea35c725 100644
--- a/pkg/enqueue/Client/NullDriver.php
+++ b/pkg/enqueue/Client/NullDriver.php
@@ -2,7 +2,7 @@
 
 namespace Enqueue\Client;
 
-use Enqueue\Psr\Message as TransportMessage;
+use Enqueue\Psr\PsrMessage;
 use Enqueue\Transport\Null\NullContext;
 use Enqueue\Transport\Null\NullMessage;
 use Psr\Log\LoggerInterface;
@@ -58,7 +58,7 @@ public function createTransportMessage(Message $message)
      *
      * @param NullMessage $message
      */
-    public function createClientMessage(TransportMessage $message)
+    public function createClientMessage(PsrMessage $message)
     {
         $clientMessage = new Message();
         $clientMessage->setBody($message->getBody());
diff --git a/pkg/enqueue/Client/ProcessorRegistryInterface.php b/pkg/enqueue/Client/ProcessorRegistryInterface.php
index 599b54127..65ae49bc0 100644
--- a/pkg/enqueue/Client/ProcessorRegistryInterface.php
+++ b/pkg/enqueue/Client/ProcessorRegistryInterface.php
@@ -2,14 +2,14 @@
 
 namespace Enqueue\Client;
 
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrProcessor;
 
 interface ProcessorRegistryInterface
 {
     /**
      * @param string $processorName
      *
-     * @return Processor
+     * @return PsrProcessor
      */
     public function get($processorName);
 }
diff --git a/pkg/enqueue/Client/RouterProcessor.php b/pkg/enqueue/Client/RouterProcessor.php
index 09f53d1b9..2566fe71c 100644
--- a/pkg/enqueue/Client/RouterProcessor.php
+++ b/pkg/enqueue/Client/RouterProcessor.php
@@ -2,11 +2,11 @@
 
 namespace Enqueue\Client;
 
-use Enqueue\Psr\Context as PsrContext;
-use Enqueue\Psr\Message as PsrMessage;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrProcessor;
 
-class RouterProcessor implements Processor
+class RouterProcessor implements PsrProcessor
 {
     /**
      * @var DriverInterface
diff --git a/pkg/enqueue/Consumption/CallbackProcessor.php b/pkg/enqueue/Consumption/CallbackProcessor.php
index d9ef19d73..21b5758c6 100644
--- a/pkg/enqueue/Consumption/CallbackProcessor.php
+++ b/pkg/enqueue/Consumption/CallbackProcessor.php
@@ -2,11 +2,11 @@
 
 namespace Enqueue\Consumption;
 
-use Enqueue\Psr\Context as PsrContext;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrProcessor;
 
-class CallbackProcessor implements Processor
+class CallbackProcessor implements PsrProcessor
 {
     /**
      * @var callable
@@ -24,7 +24,7 @@ public function __construct(callable $callback)
     /**
      * {@inheritdoc}
      */
-    public function process(Message $message, PsrContext $context)
+    public function process(PsrMessage $message, PsrContext $context)
     {
         return call_user_func($this->callback, $message, $context);
     }
diff --git a/pkg/enqueue/Consumption/Context.php b/pkg/enqueue/Consumption/Context.php
index d753ff806..93a57e5f7 100644
--- a/pkg/enqueue/Consumption/Context.php
+++ b/pkg/enqueue/Consumption/Context.php
@@ -3,11 +3,11 @@
 namespace Enqueue\Consumption;
 
 use Enqueue\Consumption\Exception\IllegalContextModificationException;
-use Enqueue\Psr\Consumer;
-use Enqueue\Psr\Context as PsrContext;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Processor;
-use Enqueue\Psr\Queue;
+use Enqueue\Psr\PsrConsumer;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrProcessor;
+use Enqueue\Psr\PsrQueue;
 use Psr\Log\LoggerInterface;
 
 class Context
@@ -18,12 +18,12 @@ class Context
     private $psrContext;
 
     /**
-     * @var \Enqueue\Psr\Consumer
+     * @var PsrConsumer
      */
     private $psrConsumer;
 
     /**
-     * @var Processor
+     * @var PsrProcessor
      */
     private $psrProcessor;
 
@@ -33,7 +33,7 @@ class Context
     private $logger;
 
     /**
-     * @var Message
+     * @var PsrMessage
      */
     private $psrMessage;
 
@@ -48,7 +48,7 @@ class Context
     private $result;
 
     /**
-     * @var \Enqueue\Psr\Queue
+     * @var PsrQueue
      */
     private $psrQueue;
 
@@ -68,7 +68,7 @@ public function __construct(PsrContext $psrContext)
     }
 
     /**
-     * @return \Enqueue\Psr\Message
+     * @return PsrMessage
      */
     public function getPsrMessage()
     {
@@ -76,9 +76,9 @@ public function getPsrMessage()
     }
 
     /**
-     * @param Message $psrMessage
+     * @param PsrMessage $psrMessage
      */
-    public function setPsrMessage(Message $psrMessage)
+    public function setPsrMessage(PsrMessage $psrMessage)
     {
         if ($this->psrMessage) {
             throw new IllegalContextModificationException('The message could be set once');
@@ -96,7 +96,7 @@ public function getPsrContext()
     }
 
     /**
-     * @return Consumer
+     * @return PsrConsumer
      */
     public function getPsrConsumer()
     {
@@ -104,9 +104,9 @@ public function getPsrConsumer()
     }
 
     /**
-     * @param Consumer $psrConsumer
+     * @param PsrConsumer $psrConsumer
      */
-    public function setPsrConsumer(Consumer $psrConsumer)
+    public function setPsrConsumer(PsrConsumer $psrConsumer)
     {
         if ($this->psrConsumer) {
             throw new IllegalContextModificationException('The message consumer could be set once');
@@ -116,7 +116,7 @@ public function setPsrConsumer(Consumer $psrConsumer)
     }
 
     /**
-     * @return Processor
+     * @return PsrProcessor
      */
     public function getPsrProcessor()
     {
@@ -124,9 +124,9 @@ public function getPsrProcessor()
     }
 
     /**
-     * @param Processor $psrProcessor
+     * @param PsrProcessor $psrProcessor
      */
-    public function setPsrProcessor(Processor $psrProcessor)
+    public function setPsrProcessor(PsrProcessor $psrProcessor)
     {
         if ($this->psrProcessor) {
             throw new IllegalContextModificationException('The message processor could be set once');
@@ -212,7 +212,7 @@ public function setLogger(LoggerInterface $logger)
     }
 
     /**
-     * @return \Enqueue\Psr\Queue
+     * @return PsrQueue
      */
     public function getPsrQueue()
     {
@@ -220,9 +220,9 @@ public function getPsrQueue()
     }
 
     /**
-     * @param \Enqueue\Psr\Queue $psrQueue
+     * @param PsrQueue $psrQueue
      */
-    public function setPsrQueue(Queue $psrQueue)
+    public function setPsrQueue(PsrQueue $psrQueue)
     {
         if ($this->psrQueue) {
             throw new IllegalContextModificationException('The queue modification is not allowed');
diff --git a/pkg/enqueue/Consumption/Extension/LoggerExtension.php b/pkg/enqueue/Consumption/Extension/LoggerExtension.php
index 57823bca0..d6c06c6f5 100644
--- a/pkg/enqueue/Consumption/Extension/LoggerExtension.php
+++ b/pkg/enqueue/Consumption/Extension/LoggerExtension.php
@@ -6,7 +6,7 @@
 use Enqueue\Consumption\EmptyExtensionTrait;
 use Enqueue\Consumption\ExtensionInterface;
 use Enqueue\Consumption\Result;
-use Enqueue\Psr\Message;
+use Enqueue\Psr\PsrMessage;
 use Psr\Log\LoggerInterface;
 
 class LoggerExtension implements ExtensionInterface
@@ -67,11 +67,11 @@ public function onPostReceived(Context $context)
     }
 
     /**
-     * @param Message $message
+     * @param PsrMessage $message
      *
      * @return array
      */
-    private function messageToLogContext(Message $message)
+    private function messageToLogContext(PsrMessage $message)
     {
         return [
             'body' => $message->getBody(),
diff --git a/pkg/enqueue/Consumption/QueueConsumer.php b/pkg/enqueue/Consumption/QueueConsumer.php
index 51820ab2e..4a3b39aac 100644
--- a/pkg/enqueue/Consumption/QueueConsumer.php
+++ b/pkg/enqueue/Consumption/QueueConsumer.php
@@ -5,10 +5,10 @@
 use Enqueue\Consumption\Exception\ConsumptionInterruptedException;
 use Enqueue\Consumption\Exception\InvalidArgumentException;
 use Enqueue\Consumption\Exception\LogicException;
-use Enqueue\Psr\Consumer;
-use Enqueue\Psr\Context as PsrContext;
-use Enqueue\Psr\Processor;
-use Enqueue\Psr\Queue;
+use Enqueue\Psr\PsrConsumer;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrProcessor;
+use Enqueue\Psr\PsrQueue;
 use Enqueue\Util\VarExport;
 use Psr\Log\NullLogger;
 
@@ -26,7 +26,7 @@ class QueueConsumer
 
     /**
      * [
-     *   [Queue, Processor],
+     *   [PsrQueue, PsrProcessor],
      * ].
      *
      * @var array
@@ -64,8 +64,8 @@ public function getPsrContext()
     }
 
     /**
-     * @param Queue|string       $queue
-     * @param Processor|callable $processor
+     * @param PsrQueue|string       $queue
+     * @param PsrProcessor|callable $processor
      *
      * @return QueueConsumer
      */
@@ -78,8 +78,8 @@ public function bind($queue, $processor)
             $processor = new CallbackProcessor($processor);
         }
 
-        InvalidArgumentException::assertInstanceOf($queue, Queue::class);
-        InvalidArgumentException::assertInstanceOf($processor, Processor::class);
+        InvalidArgumentException::assertInstanceOf($queue, PsrQueue::class);
+        InvalidArgumentException::assertInstanceOf($processor, PsrProcessor::class);
 
         if (empty($queue->getQueueName())) {
             throw new LogicException('The queue name must be not empty.');
@@ -103,11 +103,11 @@ public function bind($queue, $processor)
      */
     public function consume(ExtensionInterface $runtimeExtension = null)
     {
-        /** @var Consumer[] $messageConsumers */
-        $messageConsumers = [];
-        /** @var \Enqueue\Psr\Queue $queue */
+        /** @var PsrConsumer[] $consumers */
+        $consumers = [];
+        /** @var PsrQueue $queue */
         foreach ($this->boundProcessors as list($queue, $processor)) {
-            $messageConsumers[$queue->getQueueName()] = $this->psrContext->createConsumer($queue);
+            $consumers[$queue->getQueueName()] = $this->psrContext->createConsumer($queue);
         }
 
         $extension = $this->extension ?: new ChainExtension([]);
@@ -121,23 +121,23 @@ public function consume(ExtensionInterface $runtimeExtension = null)
         $logger = $context->getLogger() ?: new NullLogger();
         $logger->info('Start consuming');
 
-        /** @var Queue|null $previousQueue */
+        /** @var PsrQueue|null $previousQueue */
         $previousQueue = null;
 
         while (true) {
             try {
-                /** @var Queue $queue */
+                /** @var PsrQueue $queue */
                 foreach ($this->boundProcessors as list($queue, $processor)) {
                     if (false == $previousQueue || $previousQueue->getQueueName() != $queue->getQueueName()) {
                         $logger->debug(sprintf('Switch to a queue %s', $queue->getQueueName()));
                     }
 
-                    $messageConsumer = $messageConsumers[$queue->getQueueName()];
+                    $consumer = $consumers[$queue->getQueueName()];
 
                     $context = new Context($this->psrContext);
                     $context->setLogger($logger);
                     $context->setPsrQueue($queue);
-                    $context->setPsrConsumer($messageConsumer);
+                    $context->setPsrConsumer($consumer);
                     $context->setPsrProcessor($processor);
 
                     $this->doConsume($extension, $context);
diff --git a/pkg/enqueue/Consumption/Result.php b/pkg/enqueue/Consumption/Result.php
index 74ab6e1d2..893cb96ed 100644
--- a/pkg/enqueue/Consumption/Result.php
+++ b/pkg/enqueue/Consumption/Result.php
@@ -2,25 +2,25 @@
 
 namespace Enqueue\Consumption;
 
-use Enqueue\Psr\Message as PsrMessage;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrProcessor;
 
 class Result
 {
     /**
-     * @see Processor::ACK for more details
+     * @see PsrProcessor::ACK for more details
      */
-    const ACK = Processor::ACK;
+    const ACK = PsrProcessor::ACK;
 
     /**
-     * @see Processor::ACK for more details
+     * @see PsrProcessor::ACK for more details
      */
-    const REJECT = Processor::REJECT;
+    const REJECT = PsrProcessor::REJECT;
 
     /**
-     * @see Processor::ACK for more details
+     * @see PsrProcessor::ACK for more details
      */
-    const REQUEUE = Processor::REQUEUE;
+    const REQUEUE = PsrProcessor::REQUEUE;
 
     /**
      * @var string
diff --git a/pkg/enqueue/Router/Recipient.php b/pkg/enqueue/Router/Recipient.php
index 892c0e511..b7bfa7791 100644
--- a/pkg/enqueue/Router/Recipient.php
+++ b/pkg/enqueue/Router/Recipient.php
@@ -2,33 +2,33 @@
 
 namespace Enqueue\Router;
 
-use Enqueue\Psr\Destination;
-use Enqueue\Psr\Message;
+use Enqueue\Psr\PsrDestination;
+use Enqueue\Psr\PsrMessage;
 
 class Recipient
 {
     /**
-     * @var Destination
+     * @var PsrDestination
      */
     private $destination;
 
     /**
-     * @var Message
+     * @var PsrMessage
      */
     private $message;
 
     /**
-     * @param Destination $destination
-     * @param Message     $message
+     * @param PsrDestination $destination
+     * @param PsrMessage     $message
      */
-    public function __construct(Destination $destination, Message $message)
+    public function __construct(PsrDestination $destination, PsrMessage $message)
     {
         $this->destination = $destination;
         $this->message = $message;
     }
 
     /**
-     * @return Destination
+     * @return PsrDestination
      */
     public function getDestination()
     {
@@ -36,7 +36,7 @@ public function getDestination()
     }
 
     /**
-     * @return Message
+     * @return PsrMessage
      */
     public function getMessage()
     {
diff --git a/pkg/enqueue/Router/RecipientListRouterInterface.php b/pkg/enqueue/Router/RecipientListRouterInterface.php
index de7669bae..046a092ef 100644
--- a/pkg/enqueue/Router/RecipientListRouterInterface.php
+++ b/pkg/enqueue/Router/RecipientListRouterInterface.php
@@ -2,14 +2,14 @@
 
 namespace Enqueue\Router;
 
-use Enqueue\Psr\Message;
+use Enqueue\Psr\PsrMessage;
 
 interface RecipientListRouterInterface
 {
     /**
-     * @param Message $message
+     * @param PsrMessage $message
      *
      * @return \Traversable|Recipient[]
      */
-    public function route(Message $message);
+    public function route(PsrMessage $message);
 }
diff --git a/pkg/enqueue/Router/RouteRecipientListProcessor.php b/pkg/enqueue/Router/RouteRecipientListProcessor.php
index 1cc2daef2..2241277db 100644
--- a/pkg/enqueue/Router/RouteRecipientListProcessor.php
+++ b/pkg/enqueue/Router/RouteRecipientListProcessor.php
@@ -2,11 +2,11 @@
 
 namespace Enqueue\Router;
 
-use Enqueue\Psr\Context;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrProcessor;
 
-class RouteRecipientListProcessor implements Processor
+class RouteRecipientListProcessor implements PsrProcessor
 {
     /**
      * @var RecipientListRouterInterface
@@ -24,7 +24,7 @@ public function __construct(RecipientListRouterInterface $router)
     /**
      * {@inheritdoc}
      */
-    public function process(Message $message, Context $context)
+    public function process(PsrMessage $message, PsrContext $context)
     {
         $producer = $context->createProducer();
         foreach ($this->router->route($message) as $recipient) {
diff --git a/pkg/enqueue/Rpc/Promise.php b/pkg/enqueue/Rpc/Promise.php
index b0265f115..90c2cd1b1 100644
--- a/pkg/enqueue/Rpc/Promise.php
+++ b/pkg/enqueue/Rpc/Promise.php
@@ -2,12 +2,12 @@
 
 namespace Enqueue\Rpc;
 
-use Enqueue\Psr\Consumer;
+use Enqueue\Psr\PsrConsumer;
 
 class Promise
 {
     /**
-     * @var Consumer
+     * @var PsrConsumer
      */
     private $consumer;
 
@@ -21,11 +21,11 @@ class Promise
     private $correlationId;
 
     /**
-     * @param Consumer $consumer
+     * @param PsrConsumer $consumer
      * @param string   $correlationId
      * @param int      $timeout
      */
-    public function __construct(Consumer $consumer, $correlationId, $timeout)
+    public function __construct(PsrConsumer $consumer, $correlationId, $timeout)
     {
         $this->consumer = $consumer;
         $this->timeout = $timeout;
diff --git a/pkg/enqueue/Rpc/RpcClient.php b/pkg/enqueue/Rpc/RpcClient.php
index fad0bcd69..025ab0183 100644
--- a/pkg/enqueue/Rpc/RpcClient.php
+++ b/pkg/enqueue/Rpc/RpcClient.php
@@ -2,46 +2,46 @@
 
 namespace Enqueue\Rpc;
 
-use Enqueue\Psr\Context;
-use Enqueue\Psr\Destination;
-use Enqueue\Psr\Message;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrDestination;
+use Enqueue\Psr\PsrMessage;
 use Enqueue\Util\UUID;
 
 class RpcClient
 {
     /**
-     * @var Context
+     * @var PsrContext
      */
     private $context;
 
     /**
-     * @param Context $context
+     * @param PsrContext $context
      */
-    public function __construct(Context $context)
+    public function __construct(PsrContext $context)
     {
         $this->context = $context;
     }
 
     /**
-     * @param Destination $destination
-     * @param Message     $message
+     * @param PsrDestination $destination
+     * @param PsrMessage     $message
      * @param $timeout
      *
-     * @return Message
+     * @return PsrMessage
      */
-    public function call(Destination $destination, Message $message, $timeout)
+    public function call(PsrDestination $destination, PsrMessage $message, $timeout)
     {
         return $this->callAsync($destination, $message, $timeout)->getMessage();
     }
 
     /**
-     * @param Destination $destination
-     * @param Message     $message
+     * @param PsrDestination $destination
+     * @param PsrMessage     $message
      * @param $timeout
      *
      * @return Promise
      */
-    public function callAsync(Destination $destination, Message $message, $timeout)
+    public function callAsync(PsrDestination $destination, PsrMessage $message, $timeout)
     {
         if ($timeout < 1) {
             throw new \InvalidArgumentException(sprintf('Timeout must be positive not zero integer. Got %s', $timeout));
diff --git a/pkg/enqueue/Symfony/Client/ContainerAwareProcessorRegistry.php b/pkg/enqueue/Symfony/Client/ContainerAwareProcessorRegistry.php
index f199167dc..3ffa1cba5 100644
--- a/pkg/enqueue/Symfony/Client/ContainerAwareProcessorRegistry.php
+++ b/pkg/enqueue/Symfony/Client/ContainerAwareProcessorRegistry.php
@@ -3,7 +3,7 @@
 namespace Enqueue\Symfony\Client;
 
 use Enqueue\Client\ProcessorRegistryInterface;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrProcessor;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
@@ -12,7 +12,7 @@ class ContainerAwareProcessorRegistry implements ProcessorRegistryInterface, Con
     use ContainerAwareTrait;
 
     /**
-     * @var Processor[]
+     * @var PsrProcessor[]
      */
     protected $processors;
 
@@ -48,10 +48,10 @@ public function get($processorName)
 
         $processor = $this->container->get($this->processors[$processorName]);
 
-        if (false == $processor instanceof Processor) {
+        if (false == $processor instanceof PsrProcessor) {
             throw new \LogicException(sprintf(
                 'Invalid instance of message processor. expected: "%s", got: "%s"',
-                Processor::class,
+                PsrProcessor::class,
                 is_object($processor) ? get_class($processor) : gettype($processor)
             ));
         }
diff --git a/pkg/enqueue/Symfony/Consumption/ContainerAwareConsumeMessagesCommand.php b/pkg/enqueue/Symfony/Consumption/ContainerAwareConsumeMessagesCommand.php
index ad899cae6..4723d8c64 100644
--- a/pkg/enqueue/Symfony/Consumption/ContainerAwareConsumeMessagesCommand.php
+++ b/pkg/enqueue/Symfony/Consumption/ContainerAwareConsumeMessagesCommand.php
@@ -5,7 +5,7 @@
 use Enqueue\Consumption\ChainExtension;
 use Enqueue\Consumption\Extension\LoggerExtension;
 use Enqueue\Consumption\QueueConsumer;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrProcessor;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -60,12 +60,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $queueName = $input->getArgument('queue');
 
-        /** @var Processor $processor */
+        /** @var PsrProcessor $processor */
         $processor = $this->container->get($input->getArgument('processor-service'));
-        if (!$processor instanceof  Processor) {
+        if (!$processor instanceof  PsrProcessor) {
             throw new \LogicException(sprintf(
                 'Invalid message processor service given. It must be an instance of %s but %s',
-                Processor::class,
+                PsrProcessor::class,
                 get_class($processor)
             ));
         }
diff --git a/pkg/enqueue/Tests/Client/ArrayProcessorRegistryTest.php b/pkg/enqueue/Tests/Client/ArrayProcessorRegistryTest.php
index dce55f4a5..f11e34012 100644
--- a/pkg/enqueue/Tests/Client/ArrayProcessorRegistryTest.php
+++ b/pkg/enqueue/Tests/Client/ArrayProcessorRegistryTest.php
@@ -4,7 +4,7 @@
 
 use Enqueue\Client\ArrayProcessorRegistry;
 use Enqueue\Client\ProcessorRegistryInterface;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrProcessor;
 use Enqueue\Test\ClassExtensionTrait;
 
 class ArrayProcessorRegistryTest extends \PHPUnit_Framework_TestCase
@@ -50,10 +50,10 @@ public function testShouldAllowGetProcessorAddedViaAddMethod()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Processor
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrProcessor
      */
     protected function createProcessorMock()
     {
-        return $this->createMock(Processor::class);
+        return $this->createMock(PsrProcessor::class);
     }
 }
diff --git a/pkg/enqueue/Tests/Client/ConsumptionExtension/DelayRedeliveredMessageExtensionTest.php b/pkg/enqueue/Tests/Client/ConsumptionExtension/DelayRedeliveredMessageExtensionTest.php
index f248a4b9f..e9f6450fc 100644
--- a/pkg/enqueue/Tests/Client/ConsumptionExtension/DelayRedeliveredMessageExtensionTest.php
+++ b/pkg/enqueue/Tests/Client/ConsumptionExtension/DelayRedeliveredMessageExtensionTest.php
@@ -7,7 +7,7 @@
 use Enqueue\Client\Message;
 use Enqueue\Consumption\Context;
 use Enqueue\Consumption\Result;
-use Enqueue\Psr\Context as PsrContext;
+use Enqueue\Psr\PsrContext;
 use Enqueue\Transport\Null\NullMessage;
 use Enqueue\Transport\Null\NullQueue;
 use Psr\Log\LoggerInterface;
diff --git a/pkg/enqueue/Tests/Client/ConsumptionExtension/SetRouterPropertiesExtensionTest.php b/pkg/enqueue/Tests/Client/ConsumptionExtension/SetRouterPropertiesExtensionTest.php
index df4de33b3..0bfbf41e9 100644
--- a/pkg/enqueue/Tests/Client/ConsumptionExtension/SetRouterPropertiesExtensionTest.php
+++ b/pkg/enqueue/Tests/Client/ConsumptionExtension/SetRouterPropertiesExtensionTest.php
@@ -7,7 +7,7 @@
 use Enqueue\Client\DriverInterface;
 use Enqueue\Consumption\Context;
 use Enqueue\Consumption\ExtensionInterface;
-use Enqueue\Psr\Context as PsrContext;
+use Enqueue\Psr\PsrContext;
 use Enqueue\Test\ClassExtensionTrait;
 use Enqueue\Transport\Null\NullMessage;
 
diff --git a/pkg/enqueue/Tests/Client/ConsumptionExtension/SetupBrokerExtensionTest.php b/pkg/enqueue/Tests/Client/ConsumptionExtension/SetupBrokerExtensionTest.php
index 8cd460258..8ae1fbd71 100644
--- a/pkg/enqueue/Tests/Client/ConsumptionExtension/SetupBrokerExtensionTest.php
+++ b/pkg/enqueue/Tests/Client/ConsumptionExtension/SetupBrokerExtensionTest.php
@@ -6,7 +6,7 @@
 use Enqueue\Client\DriverInterface;
 use Enqueue\Consumption\Context;
 use Enqueue\Consumption\ExtensionInterface;
-use Enqueue\Psr\Context as PsrContext;
+use Enqueue\Psr\PsrContext;
 use Enqueue\Test\ClassExtensionTrait;
 use Psr\Log\NullLogger;
 
diff --git a/pkg/enqueue/Tests/Client/DelegateProcessorTest.php b/pkg/enqueue/Tests/Client/DelegateProcessorTest.php
index 6a6f466a6..11b374a78 100644
--- a/pkg/enqueue/Tests/Client/DelegateProcessorTest.php
+++ b/pkg/enqueue/Tests/Client/DelegateProcessorTest.php
@@ -5,8 +5,8 @@
 use Enqueue\Client\Config;
 use Enqueue\Client\DelegateProcessor;
 use Enqueue\Client\ProcessorRegistryInterface;
-use Enqueue\Psr\Context;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrProcessor;
 use Enqueue\Transport\Null\NullMessage;
 
 class DelegateProcessorTest extends \PHPUnit_Framework_TestCase
@@ -66,18 +66,18 @@ protected function createProcessorRegistryMock()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Context
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext
      */
     protected function createPsrContextMock()
     {
-        return $this->createMock(Context::class);
+        return $this->createMock(PsrContext::class);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Processor
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrProcessor
      */
     protected function createProcessorMock()
     {
-        return $this->createMock(Processor::class);
+        return $this->createMock(PsrProcessor::class);
     }
 }
diff --git a/pkg/enqueue/Tests/Consumption/CallbackProcessorTest.php b/pkg/enqueue/Tests/Consumption/CallbackProcessorTest.php
index ac3e4992b..91e5c49c7 100644
--- a/pkg/enqueue/Tests/Consumption/CallbackProcessorTest.php
+++ b/pkg/enqueue/Tests/Consumption/CallbackProcessorTest.php
@@ -3,7 +3,7 @@
 namespace Enqueue\Tests\Consumption;
 
 use Enqueue\Consumption\CallbackProcessor;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrProcessor;
 use Enqueue\Test\ClassExtensionTrait;
 use Enqueue\Transport\Null\NullContext;
 use Enqueue\Transport\Null\NullMessage;
@@ -14,7 +14,7 @@ class CallbackProcessorTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementProcessorInterface()
     {
-        $this->assertClassImplements(Processor::class, CallbackProcessor::class);
+        $this->assertClassImplements(PsrProcessor::class, CallbackProcessor::class);
     }
 
     public function testCouldBeConstructedWithCallableAsArgument()
diff --git a/pkg/enqueue/Tests/Consumption/ContextTest.php b/pkg/enqueue/Tests/Consumption/ContextTest.php
index 3d891e232..cdbc5e443 100644
--- a/pkg/enqueue/Tests/Consumption/ContextTest.php
+++ b/pkg/enqueue/Tests/Consumption/ContextTest.php
@@ -4,10 +4,10 @@
 
 use Enqueue\Consumption\Context;
 use Enqueue\Consumption\Exception\IllegalContextModificationException;
-use Enqueue\Psr\Consumer;
-use Enqueue\Psr\Context as PsrContext;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrConsumer;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrProcessor;
 use Enqueue\Test\ClassExtensionTrait;
 use Enqueue\Transport\Null\NullQueue;
 use Psr\Log\NullLogger;
@@ -97,8 +97,8 @@ public function testShouldSetExecutionInterruptedToFalseInConstructor()
 
     public function testShouldAllowGetPreviouslySetMessage()
     {
-        /** @var Message $message */
-        $message = $this->createMock(Message::class);
+        /** @var PsrMessage $message */
+        $message = $this->createMock(PsrMessage::class);
 
         $context = new Context($this->createPsrContext());
 
@@ -109,8 +109,8 @@ public function testShouldAllowGetPreviouslySetMessage()
 
     public function testThrowOnTryToChangeMessageIfAlreadySet()
     {
-        /** @var Message $message */
-        $message = $this->createMock(Message::class);
+        /** @var PsrMessage $message */
+        $message = $this->createMock(PsrMessage::class);
 
         $context = new Context($this->createPsrContext());
 
@@ -240,18 +240,18 @@ protected function createPsrContext()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Consumer
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrConsumer
      */
     protected function createPsrConsumer()
     {
-        return $this->createMock(Consumer::class);
+        return $this->createMock(PsrConsumer::class);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Processor
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrProcessor
      */
     protected function createProcessorMock()
     {
-        return $this->createMock(Processor::class);
+        return $this->createMock(PsrProcessor::class);
     }
 }
diff --git a/pkg/enqueue/Tests/Consumption/Extension/LimitConsumedMessagesExtensionTest.php b/pkg/enqueue/Tests/Consumption/Extension/LimitConsumedMessagesExtensionTest.php
index e9b783737..f01cbc2f1 100644
--- a/pkg/enqueue/Tests/Consumption/Extension/LimitConsumedMessagesExtensionTest.php
+++ b/pkg/enqueue/Tests/Consumption/Extension/LimitConsumedMessagesExtensionTest.php
@@ -4,9 +4,9 @@
 
 use Enqueue\Consumption\Context;
 use Enqueue\Consumption\Extension\LimitConsumedMessagesExtension;
-use Enqueue\Psr\Consumer;
-use Enqueue\Psr\Context as PsrContext;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrConsumer;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrProcessor;
 use Psr\Log\LoggerInterface;
 
 class LimitConsumedMessagesExtensionTest extends \PHPUnit_Framework_TestCase
@@ -100,8 +100,8 @@ protected function createContext()
     {
         $context = new Context($this->createMock(PsrContext::class));
         $context->setLogger($this->createMock(LoggerInterface::class));
-        $context->setPsrConsumer($this->createMock(Consumer::class));
-        $context->setPsrProcessor($this->createMock(Processor::class));
+        $context->setPsrConsumer($this->createMock(PsrConsumer::class));
+        $context->setPsrProcessor($this->createMock(PsrProcessor::class));
 
         return $context;
     }
diff --git a/pkg/enqueue/Tests/Consumption/Extension/LimitConsumerMemoryExtensionTest.php b/pkg/enqueue/Tests/Consumption/Extension/LimitConsumerMemoryExtensionTest.php
index c7f42a207..3b8c7af4e 100644
--- a/pkg/enqueue/Tests/Consumption/Extension/LimitConsumerMemoryExtensionTest.php
+++ b/pkg/enqueue/Tests/Consumption/Extension/LimitConsumerMemoryExtensionTest.php
@@ -4,9 +4,9 @@
 
 use Enqueue\Consumption\Context;
 use Enqueue\Consumption\Extension\LimitConsumerMemoryExtension;
-use Enqueue\Psr\Consumer;
-use Enqueue\Psr\Context as PsrContext;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrConsumer;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrProcessor;
 use Psr\Log\LoggerInterface;
 
 class LimitConsumerMemoryExtensionTest extends \PHPUnit_Framework_TestCase
@@ -129,8 +129,8 @@ protected function createPsrContext()
     {
         $context = new Context($this->createMock(PsrContext::class));
         $context->setLogger($this->createMock(LoggerInterface::class));
-        $context->setPsrConsumer($this->createMock(Consumer::class));
-        $context->setPsrProcessor($this->createMock(Processor::class));
+        $context->setPsrConsumer($this->createMock(PsrConsumer::class));
+        $context->setPsrProcessor($this->createMock(PsrProcessor::class));
 
         return $context;
     }
diff --git a/pkg/enqueue/Tests/Consumption/Extension/LimitConsumptionTimeExtensionTest.php b/pkg/enqueue/Tests/Consumption/Extension/LimitConsumptionTimeExtensionTest.php
index 2abb75ecd..ba0e01d63 100644
--- a/pkg/enqueue/Tests/Consumption/Extension/LimitConsumptionTimeExtensionTest.php
+++ b/pkg/enqueue/Tests/Consumption/Extension/LimitConsumptionTimeExtensionTest.php
@@ -4,9 +4,9 @@
 
 use Enqueue\Consumption\Context;
 use Enqueue\Consumption\Extension\LimitConsumptionTimeExtension;
-use Enqueue\Psr\Consumer;
-use Enqueue\Psr\Context as PsrContext;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrConsumer;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrProcessor;
 use Psr\Log\LoggerInterface;
 
 class LimitConsumptionTimeExtensionTest extends \PHPUnit_Framework_TestCase
@@ -113,8 +113,8 @@ protected function createContext()
     {
         $context = new Context($this->createMock(PsrContext::class));
         $context->setLogger($this->createMock(LoggerInterface::class));
-        $context->setPsrConsumer($this->createMock(Consumer::class));
-        $context->setPsrProcessor($this->createMock(Processor::class));
+        $context->setPsrConsumer($this->createMock(PsrConsumer::class));
+        $context->setPsrProcessor($this->createMock(PsrProcessor::class));
 
         return $context;
     }
diff --git a/pkg/enqueue/Tests/Consumption/Extension/LoggerExtensionTest.php b/pkg/enqueue/Tests/Consumption/Extension/LoggerExtensionTest.php
index 62998e82d..63ff58861 100644
--- a/pkg/enqueue/Tests/Consumption/Extension/LoggerExtensionTest.php
+++ b/pkg/enqueue/Tests/Consumption/Extension/LoggerExtensionTest.php
@@ -6,8 +6,8 @@
 use Enqueue\Consumption\Extension\LoggerExtension;
 use Enqueue\Consumption\ExtensionInterface;
 use Enqueue\Consumption\Result;
-use Enqueue\Psr\Consumer;
-use Enqueue\Psr\Context as PsrContext;
+use Enqueue\Psr\PsrConsumer;
+use Enqueue\Psr\PsrContext;
 use Enqueue\Test\ClassExtensionTrait;
 use Enqueue\Transport\Null\NullMessage;
 use Psr\Log\LoggerInterface;
@@ -167,10 +167,10 @@ protected function createLogger()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Consumer
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrConsumer
      */
     protected function createConsumerMock()
     {
-        return $this->createMock(Consumer::class);
+        return $this->createMock(PsrConsumer::class);
     }
 }
diff --git a/pkg/enqueue/Tests/Consumption/Extension/ReplyExtensionTest.php b/pkg/enqueue/Tests/Consumption/Extension/ReplyExtensionTest.php
index 9e23b426d..66e973b26 100644
--- a/pkg/enqueue/Tests/Consumption/Extension/ReplyExtensionTest.php
+++ b/pkg/enqueue/Tests/Consumption/Extension/ReplyExtensionTest.php
@@ -6,8 +6,8 @@
 use Enqueue\Consumption\Extension\ReplyExtension;
 use Enqueue\Consumption\ExtensionInterface;
 use Enqueue\Consumption\Result;
-use Enqueue\Psr\Context as PsrContext;
-use Enqueue\Psr\Producer;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrProducer;
 use Enqueue\Test\ClassExtensionTrait;
 use Enqueue\Transport\Null\NullContext;
 use Enqueue\Transport\Null\NullMessage;
@@ -110,7 +110,7 @@ public function testShouldSendReplyMessageToReplyQueueOnPostReceived()
 
         $replyQueue = new NullQueue('aReplyName');
 
-        $producerMock = $this->createMock(Producer::class);
+        $producerMock = $this->createMock(PsrProducer::class);
         $producerMock
             ->expects($this->once())
             ->method('send')
diff --git a/pkg/enqueue/Tests/Consumption/QueueConsumerTest.php b/pkg/enqueue/Tests/Consumption/QueueConsumerTest.php
index 65e476a8a..972321175 100644
--- a/pkg/enqueue/Tests/Consumption/QueueConsumerTest.php
+++ b/pkg/enqueue/Tests/Consumption/QueueConsumerTest.php
@@ -9,11 +9,11 @@
 use Enqueue\Consumption\ExtensionInterface;
 use Enqueue\Consumption\QueueConsumer;
 use Enqueue\Consumption\Result;
-use Enqueue\Psr\Consumer;
-use Enqueue\Psr\Context as PsrContext;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Processor;
-use Enqueue\Psr\Queue;
+use Enqueue\Psr\PsrConsumer;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrProcessor;
+use Enqueue\Psr\PsrQueue;
 use Enqueue\Tests\Consumption\Mock\BreakCycleExtension;
 use Enqueue\Transport\Null\NullQueue;
 use Psr\Log\NullLogger;
@@ -94,7 +94,7 @@ public function testThrowIfQueueNeitherInstanceOfQueueNorString()
         $consumer = new QueueConsumer($this->createPsrContextStub(), null, 0);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The argument must be an instance of Enqueue\Psr\Queue but got stdClass.');
+        $this->expectExceptionMessage('The argument must be an instance of Enqueue\Psr\PsrQueue but got stdClass.');
         $consumer->bind(new \stdClass(), $processorMock);
     }
 
@@ -103,7 +103,7 @@ public function testThrowIfProcessorNeitherInstanceOfProcessorNorCallable()
         $consumer = new QueueConsumer($this->createPsrContextStub(), null, 0);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The argument must be an instance of Enqueue\Psr\Processor but got stdClass.');
+        $this->expectExceptionMessage('The argument must be an instance of Enqueue\Psr\PsrProcessor but got stdClass.');
         $consumer->bind(new NullQueue(''), new \stdClass());
     }
 
@@ -152,7 +152,7 @@ public function testShouldSubscribeToGivenQueueAndQuitAfterFifthIdleCycle()
     {
         $expectedQueue = new NullQueue('theQueueName');
 
-        $messageConsumerMock = $this->createMock(Consumer::class);
+        $messageConsumerMock = $this->createMock(PsrConsumer::class);
         $messageConsumerMock
             ->expects($this->exactly(5))
             ->method('receive')
@@ -1069,11 +1069,11 @@ public function testShouldCallEachQueueOneByOne()
     /**
      * @param null|mixed $message
      *
-     * @return \PHPUnit_Framework_MockObject_MockObject|Consumer
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrConsumer
      */
     protected function createMessageConsumerStub($message = null)
     {
-        $messageConsumerMock = $this->createMock(Consumer::class);
+        $messageConsumerMock = $this->createMock(PsrConsumer::class);
         $messageConsumerMock
             ->expects($this->any())
             ->method('receive')
@@ -1099,7 +1099,7 @@ protected function createPsrContextStub($messageConsumer = null)
         $context
             ->expects($this->any())
             ->method('createQueue')
-            ->willReturn($this->createMock(Queue::class))
+            ->willReturn($this->createMock(PsrQueue::class))
         ;
         $context
             ->expects($this->any())
@@ -1110,15 +1110,15 @@ protected function createPsrContextStub($messageConsumer = null)
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Processor
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrProcessor
      */
     protected function createProcessorMock()
     {
-        return $this->createMock(Processor::class);
+        return $this->createMock(PsrProcessor::class);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Processor
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrProcessor
      */
     protected function createProcessorStub()
     {
@@ -1133,11 +1133,11 @@ protected function createProcessorStub()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Message
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrMessage
      */
     protected function createMessageMock()
     {
-        return $this->createMock(Message::class);
+        return $this->createMock(PsrMessage::class);
     }
 
     /**
diff --git a/pkg/enqueue/Tests/Functional/Client/SimpleClientTest.php b/pkg/enqueue/Tests/Functional/Client/SimpleClientTest.php
index 346fb7b57..1c4b1a2b5 100644
--- a/pkg/enqueue/Tests/Functional/Client/SimpleClientTest.php
+++ b/pkg/enqueue/Tests/Functional/Client/SimpleClientTest.php
@@ -8,7 +8,7 @@
 use Enqueue\Consumption\Extension\LimitConsumedMessagesExtension;
 use Enqueue\Consumption\Extension\LimitConsumptionTimeExtension;
 use Enqueue\Consumption\Result;
-use Enqueue\Psr\Message;
+use Enqueue\Psr\PsrMessage;
 use Enqueue\Test\RabbitmqAmqpExtension;
 use Enqueue\Test\RabbitmqManagmentExtensionTrait;
 
@@ -34,7 +34,7 @@ public function testProduceAndConsumeOneMessage()
         $actualMessage = null;
 
         $client = new SimpleClient($this->context);
-        $client->bind('foo_topic', 'foo_processor', function (Message $message) use (&$actualMessage) {
+        $client->bind('foo_topic', 'foo_processor', function (PsrMessage $message) use (&$actualMessage) {
             $actualMessage = $message;
 
             return Result::ACK;
@@ -47,7 +47,7 @@ public function testProduceAndConsumeOneMessage()
             new LimitConsumedMessagesExtension(2),
         ]));
 
-        $this->assertInstanceOf(Message::class, $actualMessage);
+        $this->assertInstanceOf(PsrMessage::class, $actualMessage);
         $this->assertSame('Hello there!', $actualMessage->getBody());
     }
 
diff --git a/pkg/enqueue/Tests/Router/RecipientTest.php b/pkg/enqueue/Tests/Router/RecipientTest.php
index db893fee2..edb2a78a2 100644
--- a/pkg/enqueue/Tests/Router/RecipientTest.php
+++ b/pkg/enqueue/Tests/Router/RecipientTest.php
@@ -2,26 +2,26 @@
 
 namespace Enqueue\Tests\Router;
 
-use Enqueue\Psr\Destination;
-use Enqueue\Psr\Message;
+use Enqueue\Psr\PsrDestination;
+use Enqueue\Psr\PsrMessage;
 use Enqueue\Router\Recipient;
 
 class RecipientTest extends \PHPUnit_Framework_TestCase
 {
     public function testShouldAllowGetMessageSetInConstructor()
     {
-        $message = $this->createMock(Message::class);
+        $message = $this->createMock(PsrMessage::class);
 
-        $recipient = new Recipient($this->createMock(Destination::class), $message);
+        $recipient = new Recipient($this->createMock(PsrDestination::class), $message);
 
         $this->assertSame($message, $recipient->getMessage());
     }
 
     public function testShouldAllowGetDestinationSetInConstructor()
     {
-        $destination = $this->createMock(Destination::class);
+        $destination = $this->createMock(PsrDestination::class);
 
-        $recipient = new Recipient($destination, $this->createMock(Message::class));
+        $recipient = new Recipient($destination, $this->createMock(PsrMessage::class));
 
         $this->assertSame($destination, $recipient->getDestination());
     }
diff --git a/pkg/enqueue/Tests/Router/RouteRecipientListProcessorTest.php b/pkg/enqueue/Tests/Router/RouteRecipientListProcessorTest.php
index 780470cad..807ca35d2 100644
--- a/pkg/enqueue/Tests/Router/RouteRecipientListProcessorTest.php
+++ b/pkg/enqueue/Tests/Router/RouteRecipientListProcessorTest.php
@@ -3,9 +3,9 @@
 namespace Enqueue\Tests\Router;
 
 use Enqueue\Consumption\Result;
-use Enqueue\Psr\Context;
-use Enqueue\Psr\Processor;
-use Enqueue\Psr\Producer;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrProcessor;
+use Enqueue\Psr\PsrProducer;
 use Enqueue\Router\Recipient;
 use Enqueue\Router\RecipientListRouterInterface;
 use Enqueue\Router\RouteRecipientListProcessor;
@@ -19,7 +19,7 @@ class RouteRecipientListProcessorTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementProcessorInterface()
     {
-        $this->assertClassImplements(Processor::class, RouteRecipientListProcessor::class);
+        $this->assertClassImplements(PsrProcessor::class, RouteRecipientListProcessor::class);
     }
 
     public function testCouldBeConstructedWithRouterAsFirstArgument()
@@ -69,19 +69,19 @@ public function testShouldProduceRecipientsMessagesAndAckOriginalMessage()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Producer
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrProducer
      */
     protected function createProducerMock()
     {
-        return $this->createMock(Producer::class);
+        return $this->createMock(PsrProducer::class);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Context
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext
      */
     protected function createPsrContextMock()
     {
-        return $this->createMock(Context::class);
+        return $this->createMock(PsrContext::class);
     }
 
     /**
diff --git a/pkg/enqueue/Tests/Rpc/PromiseTest.php b/pkg/enqueue/Tests/Rpc/PromiseTest.php
index 1e7057b1a..245e92f37 100644
--- a/pkg/enqueue/Tests/Rpc/PromiseTest.php
+++ b/pkg/enqueue/Tests/Rpc/PromiseTest.php
@@ -2,7 +2,7 @@
 
 namespace Enqueue\Tests\Rpc;
 
-use Enqueue\Psr\Consumer;
+use Enqueue\Psr\PsrConsumer;
 use Enqueue\Rpc\Promise;
 use Enqueue\Transport\Null\NullMessage;
 
@@ -131,10 +131,10 @@ public function testShouldTrySeveralTimesToReceiveReplyMessage()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Consumer
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrConsumer
      */
     private function createPsrConsumerMock()
     {
-        return $this->createMock(Consumer::class);
+        return $this->createMock(PsrConsumer::class);
     }
 }
diff --git a/pkg/enqueue/Tests/Rpc/RpcClientTest.php b/pkg/enqueue/Tests/Rpc/RpcClientTest.php
index 4e35c32ba..814b214e0 100644
--- a/pkg/enqueue/Tests/Rpc/RpcClientTest.php
+++ b/pkg/enqueue/Tests/Rpc/RpcClientTest.php
@@ -2,9 +2,9 @@
 
 namespace Enqueue\Tests\Rpc;
 
-use Enqueue\Psr\Consumer;
-use Enqueue\Psr\Context;
-use Enqueue\Psr\Producer;
+use Enqueue\Psr\PsrConsumer;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrProducer;
 use Enqueue\Rpc\Promise;
 use Enqueue\Rpc\RpcClient;
 use Enqueue\Transport\Null\NullContext;
@@ -90,7 +90,7 @@ public function testShouldPopulatePromiseWithExpectedArguments()
         $this->assertInstanceOf(Promise::class, $promise);
         $this->assertAttributeEquals('theCorrelationId', 'correlationId', $promise);
         $this->assertAttributeEquals(123, 'timeout', $promise);
-        $this->assertAttributeInstanceOf(Consumer::class, 'consumer', $promise);
+        $this->assertAttributeInstanceOf(PsrConsumer::class, 'consumer', $promise);
     }
 
     public function testShouldProduceMessageToQueueAndCreateConsumerForReplyQueue()
@@ -160,26 +160,26 @@ public function testShouldDoSyncCall()
     }
 
     /**
-     * @return Context|\PHPUnit_Framework_MockObject_MockObject|Producer
+     * @return PsrContext|\PHPUnit_Framework_MockObject_MockObject|PsrProducer
      */
     private function createPsrProducerMock()
     {
-        return $this->createMock(Producer::class);
+        return $this->createMock(PsrProducer::class);
     }
 
     /**
-     * @return \Enqueue\Psr\Context|\PHPUnit_Framework_MockObject_MockObject|Consumer
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrConsumer
      */
     private function createPsrConsumerMock()
     {
-        return $this->createMock(Consumer::class);
+        return $this->createMock(PsrConsumer::class);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Context
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext
      */
     private function createPsrContextMock()
     {
-        return $this->createMock(Context::class);
+        return $this->createMock(PsrContext::class);
     }
 }
diff --git a/pkg/enqueue/Tests/Symfony/Client/ConsumeMessagesCommandTest.php b/pkg/enqueue/Tests/Symfony/Client/ConsumeMessagesCommandTest.php
index 2247a6478..2d57316bc 100644
--- a/pkg/enqueue/Tests/Symfony/Client/ConsumeMessagesCommandTest.php
+++ b/pkg/enqueue/Tests/Symfony/Client/ConsumeMessagesCommandTest.php
@@ -8,7 +8,7 @@
 use Enqueue\Client\Meta\QueueMetaRegistry;
 use Enqueue\Consumption\ChainExtension;
 use Enqueue\Consumption\QueueConsumer;
-use Enqueue\Psr\Context;
+use Enqueue\Psr\PsrContext;
 use Enqueue\Symfony\Client\ConsumeMessagesCommand;
 use Enqueue\Transport\Null\NullQueue;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -198,11 +198,11 @@ private function createQueueMetaRegistry(array $destinationNames)
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Context
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext
      */
     private function createPsrContextMock()
     {
-        return $this->createMock(Context::class);
+        return $this->createMock(PsrContext::class);
     }
 
     /**
diff --git a/pkg/enqueue/Tests/Symfony/Client/ContainerAwareProcessorRegistryTest.php b/pkg/enqueue/Tests/Symfony/Client/ContainerAwareProcessorRegistryTest.php
index aa2f744b4..42f8fb7cb 100644
--- a/pkg/enqueue/Tests/Symfony/Client/ContainerAwareProcessorRegistryTest.php
+++ b/pkg/enqueue/Tests/Symfony/Client/ContainerAwareProcessorRegistryTest.php
@@ -3,7 +3,7 @@
 namespace Enqueue\Tests\Symfony\Client;
 
 use Enqueue\Client\ProcessorRegistryInterface;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrProcessor;
 use Enqueue\Symfony\Client\ContainerAwareProcessorRegistry;
 use Enqueue\Test\ClassExtensionTrait;
 use Symfony\Component\DependencyInjection\Container;
@@ -74,10 +74,10 @@ public function testShouldReturnInstanceOfProcessor()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Processor
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrProcessor
      */
     protected function createProcessorMock()
     {
-        return $this->createMock(Processor::class);
+        return $this->createMock(PsrProcessor::class);
     }
 }
diff --git a/pkg/enqueue/Tests/Symfony/Consumption/ConsumeMessagesCommandTest.php b/pkg/enqueue/Tests/Symfony/Consumption/ConsumeMessagesCommandTest.php
index a3bd6e05c..23ab12049 100644
--- a/pkg/enqueue/Tests/Symfony/Consumption/ConsumeMessagesCommandTest.php
+++ b/pkg/enqueue/Tests/Symfony/Consumption/ConsumeMessagesCommandTest.php
@@ -4,7 +4,7 @@
 
 use Enqueue\Consumption\ChainExtension;
 use Enqueue\Consumption\QueueConsumer;
-use Enqueue\Psr\Context;
+use Enqueue\Psr\PsrContext;
 use Enqueue\Symfony\Consumption\ConsumeMessagesCommand;
 use Symfony\Component\Console\Tester\CommandTester;
 
@@ -70,11 +70,11 @@ public function testShouldExecuteConsumption()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Context
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext
      */
     private function createContextMock()
     {
-        return $this->createMock(Context::class);
+        return $this->createMock(PsrContext::class);
     }
 
     /**
diff --git a/pkg/enqueue/Tests/Symfony/Consumption/ContainerAwareConsumeMessagesCommandTest.php b/pkg/enqueue/Tests/Symfony/Consumption/ContainerAwareConsumeMessagesCommandTest.php
index f5262aec4..8a7649c8f 100644
--- a/pkg/enqueue/Tests/Symfony/Consumption/ContainerAwareConsumeMessagesCommandTest.php
+++ b/pkg/enqueue/Tests/Symfony/Consumption/ContainerAwareConsumeMessagesCommandTest.php
@@ -4,9 +4,9 @@
 
 use Enqueue\Consumption\ChainExtension;
 use Enqueue\Consumption\QueueConsumer;
-use Enqueue\Psr\Context;
-use Enqueue\Psr\Processor;
-use Enqueue\Psr\Queue;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrProcessor;
+use Enqueue\Psr\PsrQueue;
 use Enqueue\Symfony\Consumption\ContainerAwareConsumeMessagesCommand;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\DependencyInjection\Container;
@@ -51,7 +51,7 @@ public function testShouldHaveExpectedAttributes()
     public function testShouldThrowExceptionIfProcessorInstanceHasWrongClass()
     {
         $this->setExpectedException(\LogicException::class, 'Invalid message processor service given.'.
-            ' It must be an instance of Enqueue\Psr\Processor but stdClass');
+            ' It must be an instance of Enqueue\Psr\PsrProcessor but stdClass');
 
         $container = new Container();
         $container->set('processor-service', new \stdClass());
@@ -114,27 +114,27 @@ public function testShouldExecuteConsumption()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Context
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext
      */
     protected function createContextMock()
     {
-        return $this->createMock(Context::class);
+        return $this->createMock(PsrContext::class);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Queue
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrQueue
      */
     protected function createQueueMock()
     {
-        return $this->createMock(Queue::class);
+        return $this->createMock(PsrQueue::class);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Processor
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrProcessor
      */
     protected function createProcessor()
     {
-        return $this->createMock(Processor::class);
+        return $this->createMock(PsrProcessor::class);
     }
 
     /**
diff --git a/pkg/enqueue/Tests/Transport/Null/NullConnectionFactoryTest.php b/pkg/enqueue/Tests/Transport/Null/NullConnectionFactoryTest.php
index 6b9c549e4..6b7235c1a 100644
--- a/pkg/enqueue/Tests/Transport/Null/NullConnectionFactoryTest.php
+++ b/pkg/enqueue/Tests/Transport/Null/NullConnectionFactoryTest.php
@@ -2,7 +2,7 @@
 
 namespace Enqueue\Tests\Transport\Null;
 
-use Enqueue\Psr\ConnectionFactory;
+use Enqueue\Psr\PsrConnectionFactory;
 use Enqueue\Test\ClassExtensionTrait;
 use Enqueue\Transport\Null\NullConnectionFactory;
 use Enqueue\Transport\Null\NullContext;
@@ -13,7 +13,7 @@ class NullConnectionFactoryTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementConnectionFactoryInterface()
     {
-        $this->assertClassImplements(ConnectionFactory::class, NullConnectionFactory::class);
+        $this->assertClassImplements(PsrConnectionFactory::class, NullConnectionFactory::class);
     }
 
     public function testCouldBeConstructedWithoutAnyArguments()
diff --git a/pkg/enqueue/Tests/Transport/Null/NullConsumerTest.php b/pkg/enqueue/Tests/Transport/Null/NullConsumerTest.php
index 92a644e7b..e5c66fc34 100644
--- a/pkg/enqueue/Tests/Transport/Null/NullConsumerTest.php
+++ b/pkg/enqueue/Tests/Transport/Null/NullConsumerTest.php
@@ -2,7 +2,7 @@
 
 namespace Enqueue\Tests\Transport\Null;
 
-use Enqueue\Psr\Consumer;
+use Enqueue\Psr\PsrConsumer;
 use Enqueue\Test\ClassExtensionTrait;
 use Enqueue\Transport\Null\NullConsumer;
 use Enqueue\Transport\Null\NullMessage;
@@ -14,7 +14,7 @@ class NullConsumerTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementMessageConsumerInterface()
     {
-        $this->assertClassImplements(Consumer::class, NullConsumer::class);
+        $this->assertClassImplements(PsrConsumer::class, NullConsumer::class);
     }
 
     public function testCouldBeConstructedWithQueueAsArgument()
diff --git a/pkg/enqueue/Tests/Transport/Null/NullContextTest.php b/pkg/enqueue/Tests/Transport/Null/NullContextTest.php
index 7e6425396..9e7531653 100644
--- a/pkg/enqueue/Tests/Transport/Null/NullContextTest.php
+++ b/pkg/enqueue/Tests/Transport/Null/NullContextTest.php
@@ -2,7 +2,7 @@
 
 namespace Enqueue\Tests\Transport\Null;
 
-use Enqueue\Psr\Context;
+use Enqueue\Psr\PsrContext;
 use Enqueue\Test\ClassExtensionTrait;
 use Enqueue\Transport\Null\NullConsumer;
 use Enqueue\Transport\Null\NullContext;
@@ -17,7 +17,7 @@ class NullContextTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementSessionInterface()
     {
-        $this->assertClassImplements(Context::class, NullContext::class);
+        $this->assertClassImplements(PsrContext::class, NullContext::class);
     }
 
     public function testCouldBeConstructedWithoutAnyArguments()
@@ -89,31 +89,6 @@ public function testShouldAllowCreateProducer()
         $this->assertInstanceOf(NullProducer::class, $producer);
     }
 
-    public function testShouldDoNothingOnDeclareQueue()
-    {
-        $queue = new NullQueue('theQueueName');
-
-        $context = new NullContext();
-        $context->declareQueue($queue);
-    }
-
-    public function testShouldDoNothingOnDeclareTopic()
-    {
-        $topic = new NullTopic('theTopicName');
-
-        $context = new NullContext();
-        $context->declareTopic($topic);
-    }
-
-    public function testShouldDoNothingOnDeclareBind()
-    {
-        $topic = new NullTopic('theTopicName');
-        $queue = new NullQueue('theQueueName');
-
-        $context = new NullContext();
-        $context->declareBind($topic, $queue);
-    }
-
     public function testShouldCreateTempraryQueueWithUnqiueName()
     {
         $context = new NullContext();
diff --git a/pkg/enqueue/Tests/Transport/Null/NullMessageTest.php b/pkg/enqueue/Tests/Transport/Null/NullMessageTest.php
index ddf9cd2d5..f124d6dd8 100644
--- a/pkg/enqueue/Tests/Transport/Null/NullMessageTest.php
+++ b/pkg/enqueue/Tests/Transport/Null/NullMessageTest.php
@@ -2,7 +2,7 @@
 
 namespace Enqueue\Tests\Transport\Null;
 
-use Enqueue\Psr\Message;
+use Enqueue\Psr\PsrMessage;
 use Enqueue\Test\ClassExtensionTrait;
 use Enqueue\Transport\Null\NullMessage;
 
@@ -12,7 +12,7 @@ class NullMessageTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementMessageInterface()
     {
-        $this->assertClassImplements(Message::class, NullMessage::class);
+        $this->assertClassImplements(PsrMessage::class, NullMessage::class);
     }
 
     public function testCouldBeConstructedWithoutAnyArguments()
diff --git a/pkg/enqueue/Tests/Transport/Null/NullProducerTest.php b/pkg/enqueue/Tests/Transport/Null/NullProducerTest.php
index 1e90bf349..9a4ea39e0 100644
--- a/pkg/enqueue/Tests/Transport/Null/NullProducerTest.php
+++ b/pkg/enqueue/Tests/Transport/Null/NullProducerTest.php
@@ -2,7 +2,7 @@
 
 namespace Enqueue\Tests\Transport\Null;
 
-use Enqueue\Psr\Producer;
+use Enqueue\Psr\PsrProducer;
 use Enqueue\Test\ClassExtensionTrait;
 use Enqueue\Transport\Null\NullMessage;
 use Enqueue\Transport\Null\NullProducer;
@@ -14,7 +14,7 @@ class NullProducerTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementMessageProducerInterface()
     {
-        $this->assertClassImplements(Producer::class, NullProducer::class);
+        $this->assertClassImplements(PsrProducer::class, NullProducer::class);
     }
 
     public function testCouldBeConstructedWithoutAnyArguments()
diff --git a/pkg/enqueue/Tests/Transport/Null/NullQueueTest.php b/pkg/enqueue/Tests/Transport/Null/NullQueueTest.php
index 989383b87..b4ae85c58 100644
--- a/pkg/enqueue/Tests/Transport/Null/NullQueueTest.php
+++ b/pkg/enqueue/Tests/Transport/Null/NullQueueTest.php
@@ -2,7 +2,7 @@
 
 namespace Enqueue\Tests\Transport\Null;
 
-use Enqueue\Psr\Queue;
+use Enqueue\Psr\PsrQueue;
 use Enqueue\Test\ClassExtensionTrait;
 use Enqueue\Transport\Null\NullQueue;
 
@@ -12,7 +12,7 @@ class NullQueueTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementQueueInterface()
     {
-        $this->assertClassImplements(Queue::class, NullQueue::class);
+        $this->assertClassImplements(PsrQueue::class, NullQueue::class);
     }
 
     public function testCouldBeConstructedWithNameAsArgument()
diff --git a/pkg/enqueue/Tests/Transport/Null/NullTopicTest.php b/pkg/enqueue/Tests/Transport/Null/NullTopicTest.php
index 3a14cff0b..e8972af07 100644
--- a/pkg/enqueue/Tests/Transport/Null/NullTopicTest.php
+++ b/pkg/enqueue/Tests/Transport/Null/NullTopicTest.php
@@ -2,7 +2,7 @@
 
 namespace Enqueue\Tests\Transport\Null;
 
-use Enqueue\Psr\Topic;
+use Enqueue\Psr\PsrTopic;
 use Enqueue\Test\ClassExtensionTrait;
 use Enqueue\Transport\Null\NullTopic;
 
@@ -12,7 +12,7 @@ class NullTopicTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementTopicInterface()
     {
-        $this->assertClassImplements(Topic::class, NullTopic::class);
+        $this->assertClassImplements(PsrTopic::class, NullTopic::class);
     }
 
     public function testCouldBeConstructedWithNameAsArgument()
diff --git a/pkg/enqueue/Transport/Null/NullConnectionFactory.php b/pkg/enqueue/Transport/Null/NullConnectionFactory.php
index 00ac21afc..69767cfbb 100644
--- a/pkg/enqueue/Transport/Null/NullConnectionFactory.php
+++ b/pkg/enqueue/Transport/Null/NullConnectionFactory.php
@@ -2,9 +2,9 @@
 
 namespace Enqueue\Transport\Null;
 
-use Enqueue\Psr\ConnectionFactory;
+use Enqueue\Psr\PsrConnectionFactory;
 
-class NullConnectionFactory implements ConnectionFactory
+class NullConnectionFactory implements PsrConnectionFactory
 {
     /**
      * {@inheritdoc}
diff --git a/pkg/enqueue/Transport/Null/NullConsumer.php b/pkg/enqueue/Transport/Null/NullConsumer.php
index 6b537dc23..94b2f8b6e 100644
--- a/pkg/enqueue/Transport/Null/NullConsumer.php
+++ b/pkg/enqueue/Transport/Null/NullConsumer.php
@@ -2,21 +2,21 @@
 
 namespace Enqueue\Transport\Null;
 
-use Enqueue\Psr\Consumer;
-use Enqueue\Psr\Destination;
-use Enqueue\Psr\Message;
+use Enqueue\Psr\PsrConsumer;
+use Enqueue\Psr\PsrDestination;
+use Enqueue\Psr\PsrMessage;
 
-class NullConsumer implements Consumer
+class NullConsumer implements PsrConsumer
 {
     /**
-     * @var Destination
+     * @var PsrDestination
      */
     private $queue;
 
     /**
-     * @param Destination $queue
+     * @param PsrDestination $queue
      */
-    public function __construct(Destination $queue)
+    public function __construct(PsrDestination $queue)
     {
         $this->queue = $queue;
     }
@@ -48,14 +48,14 @@ public function receiveNoWait()
     /**
      * {@inheritdoc}
      */
-    public function acknowledge(Message $message)
+    public function acknowledge(PsrMessage $message)
     {
     }
 
     /**
      * {@inheritdoc}
      */
-    public function reject(Message $message, $requeue = false)
+    public function reject(PsrMessage $message, $requeue = false)
     {
     }
 }
diff --git a/pkg/enqueue/Transport/Null/NullContext.php b/pkg/enqueue/Transport/Null/NullContext.php
index bdce45309..fac3fc1ec 100644
--- a/pkg/enqueue/Transport/Null/NullContext.php
+++ b/pkg/enqueue/Transport/Null/NullContext.php
@@ -2,10 +2,10 @@
 
 namespace Enqueue\Transport\Null;
 
-use Enqueue\Psr\Context;
-use Enqueue\Psr\Destination;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrDestination;
 
-class NullContext implements Context
+class NullContext implements PsrContext
 {
     /**
      * {@inheritdoc}
@@ -55,7 +55,7 @@ public function createTopic($name)
      *
      * @return NullConsumer
      */
-    public function createConsumer(Destination $destination)
+    public function createConsumer(PsrDestination $destination)
     {
         return new NullConsumer($destination);
     }
@@ -68,27 +68,6 @@ public function createProducer()
         return new NullProducer();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function declareTopic(Destination $destination)
-    {
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function declareQueue(Destination $destination)
-    {
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function declareBind(Destination $source, Destination $target)
-    {
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/pkg/enqueue/Transport/Null/NullMessage.php b/pkg/enqueue/Transport/Null/NullMessage.php
index 1dc12a395..6f734e2e9 100644
--- a/pkg/enqueue/Transport/Null/NullMessage.php
+++ b/pkg/enqueue/Transport/Null/NullMessage.php
@@ -2,9 +2,9 @@
 
 namespace Enqueue\Transport\Null;
 
-use Enqueue\Psr\Message;
+use Enqueue\Psr\PsrMessage;
 
-class NullMessage implements Message
+class NullMessage implements PsrMessage
 {
     /**
      * @var string
diff --git a/pkg/enqueue/Transport/Null/NullProducer.php b/pkg/enqueue/Transport/Null/NullProducer.php
index b60bc410c..4e3ab157a 100644
--- a/pkg/enqueue/Transport/Null/NullProducer.php
+++ b/pkg/enqueue/Transport/Null/NullProducer.php
@@ -2,16 +2,16 @@
 
 namespace Enqueue\Transport\Null;
 
-use Enqueue\Psr\Destination;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Producer;
+use Enqueue\Psr\PsrDestination;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrProducer;
 
-class NullProducer implements Producer
+class NullProducer implements PsrProducer
 {
     /**
      * {@inheritdoc}
      */
-    public function send(Destination $destination, Message $message)
+    public function send(PsrDestination $destination, PsrMessage $message)
     {
     }
 }
diff --git a/pkg/enqueue/Transport/Null/NullQueue.php b/pkg/enqueue/Transport/Null/NullQueue.php
index 5ec5da4d0..b5d24150b 100644
--- a/pkg/enqueue/Transport/Null/NullQueue.php
+++ b/pkg/enqueue/Transport/Null/NullQueue.php
@@ -2,9 +2,9 @@
 
 namespace Enqueue\Transport\Null;
 
-use Enqueue\Psr\Queue;
+use Enqueue\Psr\PsrQueue;
 
-class NullQueue implements Queue
+class NullQueue implements PsrQueue
 {
     /**
      * @var string
diff --git a/pkg/enqueue/Transport/Null/NullTopic.php b/pkg/enqueue/Transport/Null/NullTopic.php
index 313d600b5..d2b7d0d89 100644
--- a/pkg/enqueue/Transport/Null/NullTopic.php
+++ b/pkg/enqueue/Transport/Null/NullTopic.php
@@ -2,9 +2,9 @@
 
 namespace Enqueue\Transport\Null;
 
-use Enqueue\Psr\Topic;
+use Enqueue\Psr\PsrTopic;
 
-class NullTopic implements Topic
+class NullTopic implements PsrTopic
 {
     /**
      * @var string
diff --git a/pkg/fs/Client/FsDriver.php b/pkg/fs/Client/FsDriver.php
index 4704e6940..8a2a53cb4 100644
--- a/pkg/fs/Client/FsDriver.php
+++ b/pkg/fs/Client/FsDriver.php
@@ -10,7 +10,7 @@
 use Enqueue\Fs\FsContext;
 use Enqueue\Fs\FsDestination;
 use Enqueue\Fs\FsMessage;
-use Enqueue\Psr\Message as TransportMessage;
+use Enqueue\Psr\PsrMessage;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
@@ -143,7 +143,7 @@ public function createTransportMessage(Message $message)
      *
      * {@inheritdoc}
      */
-    public function createClientMessage(TransportMessage $message)
+    public function createClientMessage(PsrMessage $message)
     {
         $clientMessage = new Message();
 
diff --git a/pkg/fs/FsConnectionFactory.php b/pkg/fs/FsConnectionFactory.php
index 417e63542..f7031e46f 100644
--- a/pkg/fs/FsConnectionFactory.php
+++ b/pkg/fs/FsConnectionFactory.php
@@ -2,9 +2,9 @@
 
 namespace Enqueue\Fs;
 
-use Enqueue\Psr\ConnectionFactory;
+use Enqueue\Psr\PsrConnectionFactory;
 
-class FsConnectionFactory implements ConnectionFactory
+class FsConnectionFactory implements PsrConnectionFactory
 {
     /**
      * @var string
diff --git a/pkg/fs/FsConsumer.php b/pkg/fs/FsConsumer.php
index ba47de3cb..7555686bc 100644
--- a/pkg/fs/FsConsumer.php
+++ b/pkg/fs/FsConsumer.php
@@ -2,10 +2,10 @@
 
 namespace Enqueue\Fs;
 
-use Enqueue\Psr\Consumer;
-use Enqueue\Psr\Message;
+use Enqueue\Psr\PsrConsumer;
+use Enqueue\Psr\PsrMessage;
 
-class FsConsumer implements Consumer
+class FsConsumer implements PsrConsumer
 {
     /**
      * @var FsDestination
@@ -108,7 +108,7 @@ public function receiveNoWait()
     /**
      * {@inheritdoc}
      */
-    public function acknowledge(Message $message)
+    public function acknowledge(PsrMessage $message)
     {
         // do nothing. fs transport always works in auto ack mode
     }
@@ -116,7 +116,7 @@ public function acknowledge(Message $message)
     /**
      * {@inheritdoc}
      */
-    public function reject(Message $message, $requeue = false)
+    public function reject(PsrMessage $message, $requeue = false)
     {
         // do nothing on reject. fs transport always works in auto ack mode
 
diff --git a/pkg/fs/FsContext.php b/pkg/fs/FsContext.php
index d90fc0d9e..cb8afef51 100644
--- a/pkg/fs/FsContext.php
+++ b/pkg/fs/FsContext.php
@@ -2,14 +2,14 @@
 
 namespace Enqueue\Fs;
 
-use Enqueue\Psr\Context;
-use Enqueue\Psr\Destination;
 use Enqueue\Psr\InvalidDestinationException;
-use Enqueue\Psr\Queue;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrDestination;
+use Enqueue\Psr\PsrQueue;
 use Makasim\File\TempFile;
 use Symfony\Component\Filesystem\LockHandler;
 
-class FsContext implements Context
+class FsContext implements PsrContext
 {
     /**
      * @var string
@@ -76,9 +76,9 @@ public function createQueue($queueName)
     }
 
     /**
-     * @param Destination|FsDestination $destination
+     * @param PsrDestination|FsDestination $destination
      */
-    public function declareDestination(Destination $destination)
+    public function declareDestination(PsrDestination $destination)
     {
         InvalidDestinationException::assertDestinationInstanceOf($destination, FsDestination::class);
 
@@ -148,11 +148,11 @@ public function createProducer()
     /**
      * {@inheritdoc}
      *
-     * @param FsDestination $destination
+     * @param FsDestination|PsrDestination $destination
      *
      * @return FsConsumer
      */
-    public function createConsumer(Destination $destination)
+    public function createConsumer(PsrDestination $destination)
     {
         InvalidDestinationException::assertDestinationInstanceOf($destination, FsDestination::class);
 
@@ -169,9 +169,9 @@ public function close()
     }
 
     /**
-     * @param Queue|FsDestination $queue
+     * @param PsrQueue|FsDestination $queue
      */
-    public function purge(Queue $queue)
+    public function purge(PsrQueue $queue)
     {
         InvalidDestinationException::assertDestinationInstanceOf($queue, FsDestination::class);
 
diff --git a/pkg/fs/FsDestination.php b/pkg/fs/FsDestination.php
index c357a262a..a27d68673 100644
--- a/pkg/fs/FsDestination.php
+++ b/pkg/fs/FsDestination.php
@@ -2,10 +2,10 @@
 
 namespace Enqueue\Fs;
 
-use Enqueue\Psr\Queue;
-use Enqueue\Psr\Topic;
+use Enqueue\Psr\PsrQueue;
+use Enqueue\Psr\PsrTopic;
 
-class FsDestination implements Queue, Topic
+class FsDestination implements PsrQueue, PsrTopic
 {
     /**
      * @var \SplFileInfo
diff --git a/pkg/fs/FsMessage.php b/pkg/fs/FsMessage.php
index 881d3dbb9..890f0ccbe 100644
--- a/pkg/fs/FsMessage.php
+++ b/pkg/fs/FsMessage.php
@@ -2,9 +2,9 @@
 
 namespace Enqueue\Fs;
 
-use Enqueue\Psr\Message;
+use Enqueue\Psr\PsrMessage;
 
-class FsMessage implements Message, \JsonSerializable
+class FsMessage implements PsrMessage, \JsonSerializable
 {
     /**
      * @var string
diff --git a/pkg/fs/FsProducer.php b/pkg/fs/FsProducer.php
index 2f5864bf4..9366c24e8 100644
--- a/pkg/fs/FsProducer.php
+++ b/pkg/fs/FsProducer.php
@@ -2,14 +2,14 @@
 
 namespace Enqueue\Fs;
 
-use Enqueue\Psr\Destination;
+use Enqueue\Psr\PsrDestination;
 use Enqueue\Psr\InvalidDestinationException;
 use Enqueue\Psr\InvalidMessageException;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Producer;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrProducer;
 use Makasim\File\TempFile;
 
-class FsProducer implements Producer
+class FsProducer implements PsrProducer
 {
     /**
      * @var FsContext
@@ -30,7 +30,7 @@ public function __construct(FsContext $context)
      * @param FsDestination $destination
      * @param FsMessage     $message
      */
-    public function send(Destination $destination, Message $message)
+    public function send(PsrDestination $destination, PsrMessage $message)
     {
         InvalidDestinationException::assertDestinationInstanceOf($destination, FsDestination::class);
         InvalidMessageException::assertMessageInstanceOf($message, FsMessage::class);
diff --git a/pkg/fs/Tests/Driver/FsDriverTest.php b/pkg/fs/Tests/Driver/FsDriverTest.php
index fbe2100b6..cd4237a85 100644
--- a/pkg/fs/Tests/Driver/FsDriverTest.php
+++ b/pkg/fs/Tests/Driver/FsDriverTest.php
@@ -11,7 +11,7 @@
 use Enqueue\Fs\FsContext;
 use Enqueue\Fs\FsDestination;
 use Enqueue\Fs\FsMessage;
-use Enqueue\Psr\Producer;
+use Enqueue\Psr\PsrProducer;
 use Enqueue\Test\ClassExtensionTrait;
 use Makasim\File\TempFile;
 
@@ -343,11 +343,11 @@ private function createPsrContextMock()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Producer
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrProducer
      */
     private function createPsrProducerMock()
     {
-        return $this->createMock(Producer::class);
+        return $this->createMock(PsrProducer::class);
     }
 
     /**
diff --git a/pkg/fs/Tests/FsConnectionFactoryTest.php b/pkg/fs/Tests/FsConnectionFactoryTest.php
index fa356cd12..02910952e 100644
--- a/pkg/fs/Tests/FsConnectionFactoryTest.php
+++ b/pkg/fs/Tests/FsConnectionFactoryTest.php
@@ -4,7 +4,7 @@
 
 use Enqueue\Fs\FsConnectionFactory;
 use Enqueue\Fs\FsContext;
-use Enqueue\Psr\ConnectionFactory;
+use Enqueue\Psr\PsrConnectionFactory;
 use Enqueue\Test\ClassExtensionTrait;
 
 class FsConnectionFactoryTest extends \PHPUnit_Framework_TestCase
@@ -13,7 +13,7 @@ class FsConnectionFactoryTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementConnectionFactoryInterface()
     {
-        $this->assertClassImplements(ConnectionFactory::class, FsConnectionFactory::class);
+        $this->assertClassImplements(PsrConnectionFactory::class, FsConnectionFactory::class);
     }
 
     public function testCouldBeConstructedWithEmptyConfiguration()
diff --git a/pkg/fs/Tests/FsConsumerTest.php b/pkg/fs/Tests/FsConsumerTest.php
index 8fcf062f8..b1a48d9fc 100644
--- a/pkg/fs/Tests/FsConsumerTest.php
+++ b/pkg/fs/Tests/FsConsumerTest.php
@@ -7,7 +7,7 @@
 use Enqueue\Fs\FsDestination;
 use Enqueue\Fs\FsMessage;
 use Enqueue\Fs\FsProducer;
-use Enqueue\Psr\Consumer;
+use Enqueue\Psr\PsrConsumer;
 use Enqueue\Test\ClassExtensionTrait;
 use Makasim\File\TempFile;
 
@@ -17,7 +17,7 @@ class FsConsumerTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementConsumerInterface()
     {
-        $this->assertClassImplements(Consumer::class, FsConsumer::class);
+        $this->assertClassImplements(PsrConsumer::class, FsConsumer::class);
     }
 
     public function testCouldBeConstructedWithContextAndDestinationAndPreFetchCountAsArguments()
diff --git a/pkg/fs/Tests/FsContextTest.php b/pkg/fs/Tests/FsContextTest.php
index f51a0b242..467cbe631 100644
--- a/pkg/fs/Tests/FsContextTest.php
+++ b/pkg/fs/Tests/FsContextTest.php
@@ -7,8 +7,8 @@
 use Enqueue\Fs\FsDestination;
 use Enqueue\Fs\FsMessage;
 use Enqueue\Fs\FsProducer;
-use Enqueue\Psr\Context;
 use Enqueue\Psr\InvalidDestinationException;
+use Enqueue\Psr\PsrContext;
 use Enqueue\Test\ClassExtensionTrait;
 use Enqueue\Transport\Null\NullQueue;
 use Makasim\File\TempFile;
@@ -19,7 +19,7 @@ class FsContextTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementContextInterface()
     {
-        $this->assertClassImplements(Context::class, FsContext::class);
+        $this->assertClassImplements(PsrContext::class, FsContext::class);
     }
 
     public function testCouldBeConstructedWithExpectedArguments()
diff --git a/pkg/fs/Tests/FsDestinationTest.php b/pkg/fs/Tests/FsDestinationTest.php
index 199243a44..f04d1030b 100644
--- a/pkg/fs/Tests/FsDestinationTest.php
+++ b/pkg/fs/Tests/FsDestinationTest.php
@@ -3,8 +3,8 @@
 namespace Enqueue\Fs\Tests;
 
 use Enqueue\Fs\FsDestination;
-use Enqueue\Psr\Queue;
-use Enqueue\Psr\Topic;
+use Enqueue\Psr\PsrQueue;
+use Enqueue\Psr\PsrTopic;
 use Enqueue\Test\ClassExtensionTrait;
 use Makasim\File\TempFile;
 
@@ -14,8 +14,8 @@ class FsDestinationTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementsTopicAndQueueInterfaces()
     {
-        $this->assertClassImplements(Topic::class, FsDestination::class);
-        $this->assertClassImplements(Queue::class, FsDestination::class);
+        $this->assertClassImplements(PsrTopic::class, FsDestination::class);
+        $this->assertClassImplements(PsrQueue::class, FsDestination::class);
     }
 
     public function testCouldBeConstructedWithSplFileAsFirstArgument()
diff --git a/pkg/fs/Tests/FsMessageTest.php b/pkg/fs/Tests/FsMessageTest.php
index 7412b8c4e..2e1ab30ce 100644
--- a/pkg/fs/Tests/FsMessageTest.php
+++ b/pkg/fs/Tests/FsMessageTest.php
@@ -3,7 +3,7 @@
 namespace Enqueue\Fs\Tests;
 
 use Enqueue\Fs\FsMessage;
-use Enqueue\Psr\Message;
+use Enqueue\Psr\PsrMessage;
 use Enqueue\Test\ClassExtensionTrait;
 
 class FsMessageTest extends \PHPUnit_Framework_TestCase
@@ -12,7 +12,7 @@ class FsMessageTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementMessageInterface()
     {
-        $this->assertClassImplements(Message::class, FsMessage::class);
+        $this->assertClassImplements(PsrMessage::class, FsMessage::class);
     }
 
     public function testShouldImplementJsonSerializableInterface()
diff --git a/pkg/fs/Tests/FsProducerTest.php b/pkg/fs/Tests/FsProducerTest.php
index 0ad135661..be2c764cf 100644
--- a/pkg/fs/Tests/FsProducerTest.php
+++ b/pkg/fs/Tests/FsProducerTest.php
@@ -8,7 +8,7 @@
 use Enqueue\Fs\FsProducer;
 use Enqueue\Psr\InvalidDestinationException;
 use Enqueue\Psr\InvalidMessageException;
-use Enqueue\Psr\Producer;
+use Enqueue\Psr\PsrProducer;
 use Enqueue\Test\ClassExtensionTrait;
 use Enqueue\Transport\Null\NullMessage;
 use Enqueue\Transport\Null\NullQueue;
@@ -20,7 +20,7 @@ class FsProducerTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementProducerInterface()
     {
-        $this->assertClassImplements(Producer::class, FsProducer::class);
+        $this->assertClassImplements(PsrProducer::class, FsProducer::class);
     }
 
     public function testCouldBeConstructedWithContextAsFirstArgument()
diff --git a/pkg/fs/Tests/Functional/FsConsumptionUseCasesTest.php b/pkg/fs/Tests/Functional/FsConsumptionUseCasesTest.php
index c3d2448e6..a55718151 100644
--- a/pkg/fs/Tests/Functional/FsConsumptionUseCasesTest.php
+++ b/pkg/fs/Tests/Functional/FsConsumptionUseCasesTest.php
@@ -10,9 +10,9 @@
 use Enqueue\Consumption\Result;
 use Enqueue\Fs\FsConnectionFactory;
 use Enqueue\Fs\FsContext;
-use Enqueue\Psr\Context;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrProcessor;
 use Makasim\File\TempFile;
 
 /**
@@ -54,7 +54,7 @@ public function testConsumeOneMessageAndExit()
 
         $queueConsumer->consume();
 
-        $this->assertInstanceOf(Message::class, $processor->lastProcessedMessage);
+        $this->assertInstanceOf(PsrMessage::class, $processor->lastProcessedMessage);
         $this->assertEquals(__METHOD__, $processor->lastProcessedMessage->getBody());
     }
 
@@ -85,22 +85,22 @@ public function testConsumeOneMessageAndSendReplyExit()
         $queueConsumer->bind($replyQueue, $replyProcessor);
         $queueConsumer->consume();
 
-        $this->assertInstanceOf(Message::class, $processor->lastProcessedMessage);
+        $this->assertInstanceOf(PsrMessage::class, $processor->lastProcessedMessage);
         $this->assertEquals(__METHOD__, $processor->lastProcessedMessage->getBody());
 
-        $this->assertInstanceOf(Message::class, $replyProcessor->lastProcessedMessage);
+        $this->assertInstanceOf(PsrMessage::class, $replyProcessor->lastProcessedMessage);
         $this->assertEquals(__METHOD__.'.reply', $replyProcessor->lastProcessedMessage->getBody());
     }
 }
 
-class StubProcessor implements Processor
+class StubProcessor implements PsrProcessor
 {
-    public $result = Result::ACK;
+    public $result = self::ACK;
 
-    /** @var \Enqueue\Psr\Message */
+    /** @var PsrMessage */
     public $lastProcessedMessage;
 
-    public function process(Message $message, Context $context)
+    public function process(PsrMessage $message, PsrContext $context)
     {
         $this->lastProcessedMessage = $message;
 
diff --git a/pkg/job-queue/CalculateRootJobStatusProcessor.php b/pkg/job-queue/CalculateRootJobStatusProcessor.php
index 838236275..b2a8aab3a 100644
--- a/pkg/job-queue/CalculateRootJobStatusProcessor.php
+++ b/pkg/job-queue/CalculateRootJobStatusProcessor.php
@@ -5,13 +5,13 @@
 use Enqueue\Client\ProducerInterface;
 use Enqueue\Client\TopicSubscriberInterface;
 use Enqueue\Consumption\Result;
-use Enqueue\Psr\Context;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrProcessor;
 use Enqueue\Util\JSON;
 use Psr\Log\LoggerInterface;
 
-class CalculateRootJobStatusProcessor implements Processor, TopicSubscriberInterface
+class CalculateRootJobStatusProcessor implements PsrProcessor, TopicSubscriberInterface
 {
     /**
      * @var JobStorage
@@ -54,7 +54,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function process(Message $message, Context $context)
+    public function process(PsrMessage $message, PsrContext $context)
     {
         $data = JSON::decode($message->getBody());
 
diff --git a/pkg/job-queue/DependentJobProcessor.php b/pkg/job-queue/DependentJobProcessor.php
index 8ff632e77..c968e4271 100644
--- a/pkg/job-queue/DependentJobProcessor.php
+++ b/pkg/job-queue/DependentJobProcessor.php
@@ -6,13 +6,13 @@
 use Enqueue\Client\ProducerInterface;
 use Enqueue\Client\TopicSubscriberInterface;
 use Enqueue\Consumption\Result;
-use Enqueue\Psr\Context;
-use Enqueue\Psr\Message as PsrMessage;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrProcessor;
 use Enqueue\Util\JSON;
 use Psr\Log\LoggerInterface;
 
-class DependentJobProcessor implements Processor, TopicSubscriberInterface
+class DependentJobProcessor implements PsrProcessor, TopicSubscriberInterface
 {
     /**
      * @var JobStorage
@@ -44,7 +44,7 @@ public function __construct(JobStorage $jobStorage, ProducerInterface $producer,
     /**
      * {@inheritdoc}
      */
-    public function process(PsrMessage $message, Context $context)
+    public function process(PsrMessage $message, PsrContext $context)
     {
         $data = JSON::decode($message->getBody());
 
diff --git a/pkg/job-queue/Tests/CalculateRootJobStatusProcessorTest.php b/pkg/job-queue/Tests/CalculateRootJobStatusProcessorTest.php
index 2dc9aaf65..3c520ede2 100644
--- a/pkg/job-queue/Tests/CalculateRootJobStatusProcessorTest.php
+++ b/pkg/job-queue/Tests/CalculateRootJobStatusProcessorTest.php
@@ -9,7 +9,7 @@
 use Enqueue\JobQueue\Job;
 use Enqueue\JobQueue\JobStorage;
 use Enqueue\JobQueue\Topics;
-use Enqueue\Psr\Context;
+use Enqueue\Psr\PsrContext;
 use Enqueue\Transport\Null\NullMessage;
 use Psr\Log\LoggerInterface;
 
@@ -20,7 +20,7 @@ public function testCouldBeConstructedWithRequiredArguments()
         new CalculateRootJobStatusProcessor(
             $this->createJobStorageMock(),
             $this->createCalculateRootJobStatusCaseMock(),
-            $this->createMessageProducerMock(),
+            $this->createProducerMock(),
             $this->createLoggerMock()
         );
     }
@@ -48,7 +48,7 @@ public function testShouldLogErrorAndRejectMessageIfMessageIsInvalid()
         $processor = new CalculateRootJobStatusProcessor(
             $this->createJobStorageMock(),
             $this->createCalculateRootJobStatusCaseMock(),
-            $this->createMessageProducerMock(),
+            $this->createProducerMock(),
             $logger
         );
         $result = $processor->process($message, $this->createContextMock());
@@ -78,7 +78,7 @@ public function testShouldRejectMessageAndLogErrorIfJobWasNotFound()
             ->method('calculate')
         ;
 
-        $producer = $this->createMessageProducerMock();
+        $producer = $this->createProducerMock();
         $producer
             ->expects($this->never())
             ->method('send')
@@ -118,7 +118,7 @@ public function testShouldCallCalculateJobRootStatusAndACKMessage()
             ->with($this->identicalTo($job))
         ;
 
-        $producer = $this->createMessageProducerMock();
+        $producer = $this->createProducerMock();
         $producer
             ->expects($this->never())
             ->method('send')
@@ -158,7 +158,7 @@ public function testShouldSendRootJobStoppedMessageIfJobHasStopped()
             ->will($this->returnValue(true))
         ;
 
-        $producer = $this->createMessageProducerMock();
+        $producer = $this->createProducerMock();
         $producer
             ->expects($this->once())
             ->method('send')
@@ -177,17 +177,17 @@ public function testShouldSendRootJobStoppedMessageIfJobHasStopped()
     /**
      * @return \PHPUnit_Framework_MockObject_MockObject|ProducerInterface
      */
-    private function createMessageProducerMock()
+    private function createProducerMock()
     {
         return $this->createMock(ProducerInterface::class);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Context
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext
      */
     private function createContextMock()
     {
-        return $this->createMock(Context::class);
+        return $this->createMock(PsrContext::class);
     }
 
     /**
diff --git a/pkg/job-queue/Tests/DependentJobProcessorTest.php b/pkg/job-queue/Tests/DependentJobProcessorTest.php
index 7aaaf7d5f..219f6bf7d 100644
--- a/pkg/job-queue/Tests/DependentJobProcessorTest.php
+++ b/pkg/job-queue/Tests/DependentJobProcessorTest.php
@@ -9,7 +9,7 @@
 use Enqueue\JobQueue\Job;
 use Enqueue\JobQueue\JobStorage;
 use Enqueue\JobQueue\Topics;
-use Enqueue\Psr\Context;
+use Enqueue\Psr\PsrContext;
 use Enqueue\Transport\Null\NullMessage;
 use Psr\Log\LoggerInterface;
 
@@ -317,11 +317,11 @@ public function testShouldPublishDependentMessageWithPriority()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Context
+     * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext
      */
     private function createContextMock()
     {
-        return $this->createMock(Context::class);
+        return $this->createMock(PsrContext::class);
     }
 
     /**
diff --git a/pkg/psr-queue/ConnectionFactory.php b/pkg/psr-queue/ConnectionFactory.php
index 5c7a2b0be..3df5cb449 100644
--- a/pkg/psr-queue/ConnectionFactory.php
+++ b/pkg/psr-queue/ConnectionFactory.php
@@ -2,10 +2,11 @@
 
 namespace Enqueue\Psr;
 
-interface ConnectionFactory
+@trigger_error('The class is deprecated.', E_USER_DEPRECATED);
+
+/**
+ * @deprecated use PsrConnectionFactory
+ */
+interface ConnectionFactory extends PsrConnectionFactory
 {
-    /**
-     * @return Context
-     */
-    public function createContext();
 }
diff --git a/pkg/psr-queue/Consumer.php b/pkg/psr-queue/Consumer.php
index 85a975429..f9762a26f 100644
--- a/pkg/psr-queue/Consumer.php
+++ b/pkg/psr-queue/Consumer.php
@@ -2,52 +2,11 @@
 
 namespace Enqueue\Psr;
 
+@trigger_error('The class is deprecated.', E_USER_DEPRECATED);
+
 /**
- * A client uses a MessageConsumer object to receive messages from a destination.
- * A MessageConsumer object is created by passing a Destination object
- * to a message-consumer creation method supplied by a session.
- *
- * @see https://docs.oracle.com/javaee/7/api/javax/jms/MessageConsumer.html
+ * @deprecated use PsrConsumer
  */
-interface Consumer
+interface Consumer extends PsrConsumer
 {
-    /**
-     * Gets the Queue associated with this queue receiver.
-     *
-     * @return Queue
-     */
-    public function getQueue();
-
-    /**
-     * Receives the next message that arrives within the specified timeout interval.
-     * This call blocks until a message arrives, the timeout expires, or this message consumer is closed.
-     * A timeout of zero never expires, and the call blocks indefinitely.
-     *
-     * @param int $timeout the timeout value (in milliseconds)
-     *
-     * @return Message|null
-     */
-    public function receive($timeout = 0);
-
-    /**
-     * Receives the next message if one is immediately available.
-     *
-     * @return Message|null
-     */
-    public function receiveNoWait();
-
-    /**
-     * Tell the MQ broker that the message was processed successfully.
-     *
-     * @param Message $message
-     */
-    public function acknowledge(Message $message);
-
-    /**
-     * Tell the MQ broker that the message was rejected.
-     *
-     * @param Message $message
-     * @param bool    $requeue
-     */
-    public function reject(Message $message, $requeue = false);
 }
diff --git a/pkg/psr-queue/Context.php b/pkg/psr-queue/Context.php
index 6717e86f4..c9f612670 100644
--- a/pkg/psr-queue/Context.php
+++ b/pkg/psr-queue/Context.php
@@ -2,51 +2,11 @@
 
 namespace Enqueue\Psr;
 
-interface Context
-{
-    /**
-     * @param string $body
-     * @param array  $properties
-     * @param array  $headers
-     *
-     * @return Message
-     */
-    public function createMessage($body = '', array $properties = [], array $headers = []);
-
-    /**
-     * @param string $topicName
-     *
-     * @return Topic
-     */
-    public function createTopic($topicName);
-
-    /**
-     * @param string $queueName
-     *
-     * @return Queue
-     */
-    public function createQueue($queueName);
-
-    /**
-     * Create temporary queue.
-     * The queue is visible by this connection only.
-     * It will be deleted once the connection is closed.
-     *
-     * @return Queue
-     */
-    public function createTemporaryQueue();
+@trigger_error('The class is deprecated.', E_USER_DEPRECATED);
 
-    /**
-     * @return Producer
-     */
-    public function createProducer();
-
-    /**
-     * @param Destination $destination
-     *
-     * @return Consumer
-     */
-    public function createConsumer(Destination $destination);
-
-    public function close();
+/**
+ * @deprecated use PsrContext
+ */
+interface Context extends PsrContext
+{
 }
diff --git a/pkg/psr-queue/Destination.php b/pkg/psr-queue/Destination.php
index 2a1147b6f..e70cf4903 100644
--- a/pkg/psr-queue/Destination.php
+++ b/pkg/psr-queue/Destination.php
@@ -2,18 +2,11 @@
 
 namespace Enqueue\Psr;
 
+@trigger_error('The class is deprecated.', E_USER_DEPRECATED);
+
 /**
- * A Destination object encapsulates a provider-specific address.
- * The transport API does not define a standard address syntax.
- * Although a standard address syntax was considered,
- * it was decided that the differences in address semantics between existing message-oriented middleware (MOM)
- * products were too wide to bridge with a single syntax.
- *
- * Since Destination is an administered object,
- * it may contain provider-specific configuration information in addition to its address.
- *
- * @see https://docs.oracle.com/javaee/7/api/javax/jms/Destination.html
+ * @deprecated use PsrDestination
  */
-interface Destination
+interface Destination extends PsrDestination
 {
 }
diff --git a/pkg/psr-queue/InvalidMessageException.php b/pkg/psr-queue/InvalidMessageException.php
index 3d84c17e5..566be19f9 100644
--- a/pkg/psr-queue/InvalidMessageException.php
+++ b/pkg/psr-queue/InvalidMessageException.php
@@ -5,12 +5,12 @@
 class InvalidMessageException extends Exception
 {
     /**
-     * @param Message $message
+     * @param PsrMessage $message
      * @param string  $class
      *
      * @throws static
      */
-    public static function assertMessageInstanceOf(Message $message, $class)
+    public static function assertMessageInstanceOf(PsrMessage $message, $class)
     {
         if (!$message instanceof $class) {
             throw new static(sprintf(
diff --git a/pkg/psr-queue/Message.php b/pkg/psr-queue/Message.php
index 879aaac85..bfe6356f2 100644
--- a/pkg/psr-queue/Message.php
+++ b/pkg/psr-queue/Message.php
@@ -2,177 +2,11 @@
 
 namespace Enqueue\Psr;
 
+@trigger_error('The class is deprecated.', E_USER_DEPRECATED);
+
 /**
- * The Message interface is the root interface of all transport messages.
- * Most message-oriented middleware (MOM) products
- * treat messages as lightweight entities that consist of a header and a payload.
- * The header contains fields used for message routing and identification;
- * the payload contains the application data being sent.
- *
- * Within this general form, the definition of a message varies significantly across products.
- *
- * @see https://docs.oracle.com/javaee/7/api/javax/jms/Message.html
+ * @deprecated use PsrMessage
  */
-interface Message
+interface Message extends PsrMessage
 {
-    /**
-     * @return string
-     */
-    public function getBody();
-
-    /**
-     * @param string $body
-     */
-    public function setBody($body);
-
-    /**
-     * @param array $properties
-     */
-    public function setProperties(array $properties);
-
-    /**
-     * @return array [name => value, ...]
-     */
-    public function getProperties();
-
-    /**
-     * @param string $name
-     * @param mixed  $value
-     */
-    public function setProperty($name, $value);
-
-    /**
-     * @param string $name
-     * @param mixed  $default
-     *
-     * @return mixed
-     */
-    public function getProperty($name, $default = null);
-
-    /**
-     * @param array $headers
-     */
-    public function setHeaders(array $headers);
-
-    /**
-     * @return array [name => value, ...]
-     */
-    public function getHeaders();
-
-    /**
-     * @param string $name
-     * @param mixed  $value
-     */
-    public function setHeader($name, $value);
-
-    /**
-     * @param string $name
-     * @param mixed  $default
-     *
-     * @return mixed
-     */
-    public function getHeader($name, $default = null);
-
-    /**
-     * @param bool $redelivered
-     */
-    public function setRedelivered($redelivered);
-
-    /**
-     * Gets an indication of whether this message is being redelivered.
-     * The message is considered as redelivered,
-     * when it was sent by a broker to consumer but consumer does not ACK or REJECT it.
-     * The broker brings the message back to the queue and mark it as redelivered.
-     *
-     * @return bool
-     */
-    public function isRedelivered();
-
-    /**
-     * Sets the correlation ID for the message.
-     * A client can use the correlation header field to link one message with another.
-     * A typical use is to link a response message with its request message.
-     *
-     * @param string $correlationId the message ID of a message being referred to
-     *
-     * @throws Exception if the provider fails to set the correlation ID due to some internal error
-     */
-    public function setCorrelationId($correlationId);
-
-    /**
-     * Gets the correlation ID for the message.
-     * This method is used to return correlation ID values that are either provider-specific message IDs
-     * or application-specific String values.
-     *
-     * @throws Exception if the provider fails to get the correlation ID due to some internal error
-     *
-     * @return string
-     */
-    public function getCorrelationId();
-
-    /**
-     * Sets the message ID.
-     * Providers set this field when a message is sent.
-     * This method can be used to change the value for a message that has been received.
-     *
-     * @param string $messageId the ID of the message
-     *
-     * @throws Exception if the provider fails to set the message ID due to some internal error
-     */
-    public function setMessageId($messageId);
-
-    /**
-     * Gets the message Id.
-     * The MessageId header field contains a value that uniquely identifies each message sent by a provider.
-     *
-     * When a message is sent, MessageId can be ignored.
-     *
-     * @throws Exception if the provider fails to get the message ID due to some internal error
-     *
-     * @return string
-     */
-    public function getMessageId();
-
-    /**
-     * Gets the message timestamp.
-     * The timestamp header field contains the time a message was handed off to a provider to be sent.
-     * It is not the time the message was actually transmitted,
-     * because the actual send may occur later due to transactions or other client-side queueing of messages.
-     *
-     * @return int
-     */
-    public function getTimestamp();
-
-    /**
-     * Sets the message timestamp.
-     * Providers set this field when a message is sent.
-     * This method can be used to change the value for a message that has been received.
-     *
-     * @param int $timestamp
-     *
-     * @throws Exception if the provider fails to set the timestamp due to some internal error
-     */
-    public function setTimestamp($timestamp);
-
-    /**
-     * Sets the destination to which a reply to this message should be sent.
-     * The ReplyTo header field contains the destination where a reply to the current message should be sent. If it is null, no reply is expected.
-     * The destination may be a Queue only. A topic is not supported at the moment.
-     * Messages sent with a null ReplyTo value may be a notification of some event, or they may just be some data the sender thinks is of interest.
-     * Messages with a ReplyTo value typically expect a response.
-     * A response is optional; it is up to the client to decide. These messages are called requests.
-     * A message sent in response to a request is called a reply.
-     * In some cases a client may wish to match a request it sent earlier with a reply it has just received.
-     * The client can use the CorrelationID header field for this purpose.
-     *
-     * @param string|null $replyTo
-     */
-    public function setReplyTo($replyTo);
-
-    /**
-     * Gets the destination to which a reply to this message should be sent.
-     *
-     * @return string|null
-     */
-    public function getReplyTo();
 }
diff --git a/pkg/psr-queue/Processor.php b/pkg/psr-queue/Processor.php
index 66bb42475..c00159f14 100644
--- a/pkg/psr-queue/Processor.php
+++ b/pkg/psr-queue/Processor.php
@@ -2,35 +2,11 @@
 
 namespace Enqueue\Psr;
 
-interface Processor
-{
-    /**
-     * Use this constant when the message is processed successfully and the message could be removed from the queue.
-     */
-    const ACK = 'enqueue.ack';
-
-    /**
-     * Use this constant when the message is not valid or could not be processed
-     * The message is removed from the queue.
-     */
-    const REJECT = 'enqueue.reject';
+@trigger_error('The class is deprecated.', E_USER_DEPRECATED);
 
-    /**
-     * Use this constant when the message is not valid or could not be processed right now but we can try again later
-     * The original message is removed from the queue but a copy is publsihed to the queue again.
-     */
-    const REQUEUE = 'enqueue.requeue';
-
-    /**
-     * The method has to return either self::ACK, self::REJECT, self::REQUEUE string.
-     *
-     * The method also can return an object.
-     * It must implement __toString method and the method must return one of the constants from above.
-     *
-     * @param Message $message
-     * @param Context $context
-     *
-     * @return string|object
-     */
-    public function process(Message $message, Context $context);
+/**
+ * @deprecated use PsrProcessor
+ */
+interface Processor extends PsrProcessor
+{
 }
diff --git a/pkg/psr-queue/Producer.php b/pkg/psr-queue/Producer.php
index 29fd72393..4799558d8 100644
--- a/pkg/psr-queue/Producer.php
+++ b/pkg/psr-queue/Producer.php
@@ -2,18 +2,11 @@
 
 namespace Enqueue\Psr;
 
-interface Producer
+@trigger_error('The class is deprecated.', E_USER_DEPRECATED);
+
+/**
+ * @deprecated use PsrProducer
+ */
+interface Producer extends PsrProducer
 {
-    /**
-     * @param Destination $destination
-     * @param Message     $message
-     *
-     * @throws Exception                   - if the provider fails to send
-     *                                     the message due to some internal error
-     * @throws InvalidDestinationException - if a client uses
-     *                                     this method with an invalid destination
-     * @throws InvalidMessageException     - if an invalid message
-     *                                     is specified
-     */
-    public function send(Destination $destination, Message $message);
 }
diff --git a/pkg/psr-queue/PsrConnectionFactory.php b/pkg/psr-queue/PsrConnectionFactory.php
new file mode 100644
index 000000000..72721bbda
--- /dev/null
+++ b/pkg/psr-queue/PsrConnectionFactory.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Enqueue\Psr;
+
+interface PsrConnectionFactory
+{
+    /**
+     * @return PsrContext
+     */
+    public function createContext();
+}
diff --git a/pkg/psr-queue/PsrConsumer.php b/pkg/psr-queue/PsrConsumer.php
new file mode 100644
index 000000000..3363792f0
--- /dev/null
+++ b/pkg/psr-queue/PsrConsumer.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Enqueue\Psr;
+
+/**
+ * A client uses a MessageConsumer object to receive messages from a destination.
+ * A MessageConsumer object is created by passing a Destination object
+ * to a message-consumer creation method supplied by a session.
+ *
+ * @see https://docs.oracle.com/javaee/7/api/javax/jms/MessageConsumer.html
+ */
+interface PsrConsumer
+{
+    /**
+     * Gets the Queue associated with this queue receiver.
+     *
+     * @return PsrQueue
+     */
+    public function getQueue();
+
+    /**
+     * Receives the next message that arrives within the specified timeout interval.
+     * This call blocks until a message arrives, the timeout expires, or this message consumer is closed.
+     * A timeout of zero never expires, and the call blocks indefinitely.
+     *
+     * @param int $timeout the timeout value (in milliseconds)
+     *
+     * @return PsrMessage|null
+     */
+    public function receive($timeout = 0);
+
+    /**
+     * Receives the next message if one is immediately available.
+     *
+     * @return PsrMessage|null
+     */
+    public function receiveNoWait();
+
+    /**
+     * Tell the MQ broker that the message was processed successfully.
+     *
+     * @param PsrMessage $message
+     */
+    public function acknowledge(PsrMessage $message);
+
+    /**
+     * Tell the MQ broker that the message was rejected.
+     *
+     * @param PsrMessage $message
+     * @param bool    $requeue
+     */
+    public function reject(PsrMessage $message, $requeue = false);
+}
diff --git a/pkg/psr-queue/PsrContext.php b/pkg/psr-queue/PsrContext.php
new file mode 100644
index 000000000..8ccd33498
--- /dev/null
+++ b/pkg/psr-queue/PsrContext.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Enqueue\Psr;
+
+interface PsrContext
+{
+    /**
+     * @param string $body
+     * @param array  $properties
+     * @param array  $headers
+     *
+     * @return PsrMessage
+     */
+    public function createMessage($body = '', array $properties = [], array $headers = []);
+
+    /**
+     * @param string $topicName
+     *
+     * @return PsrTopic
+     */
+    public function createTopic($topicName);
+
+    /**
+     * @param string $queueName
+     *
+     * @return PsrQueue
+     */
+    public function createQueue($queueName);
+
+    /**
+     * Create temporary queue.
+     * The queue is visible by this connection only.
+     * It will be deleted once the connection is closed.
+     *
+     * @return PsrQueue
+     */
+    public function createTemporaryQueue();
+
+    /**
+     * @return PsrProducer
+     */
+    public function createProducer();
+
+    /**
+     * @param PsrDestination $destination
+     *
+     * @return PsrConsumer
+     */
+    public function createConsumer(PsrDestination $destination);
+
+    public function close();
+}
diff --git a/pkg/psr-queue/PsrDestination.php b/pkg/psr-queue/PsrDestination.php
new file mode 100644
index 000000000..acab887bc
--- /dev/null
+++ b/pkg/psr-queue/PsrDestination.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Enqueue\Psr;
+
+/**
+ * A Destination object encapsulates a provider-specific address.
+ * The transport API does not define a standard address syntax.
+ * Although a standard address syntax was considered,
+ * it was decided that the differences in address semantics between existing message-oriented middleware (MOM)
+ * products were too wide to bridge with a single syntax.
+ *
+ * Since Destination is an administered object,
+ * it may contain provider-specific configuration information in addition to its address.
+ *
+ * @see https://docs.oracle.com/javaee/7/api/javax/jms/Destination.html
+ */
+interface PsrDestination
+{
+}
diff --git a/pkg/psr-queue/PsrMessage.php b/pkg/psr-queue/PsrMessage.php
new file mode 100644
index 000000000..05a0dc6ed
--- /dev/null
+++ b/pkg/psr-queue/PsrMessage.php
@@ -0,0 +1,178 @@
+<?php
+
+namespace Enqueue\Psr;
+
+/**
+ * The Message interface is the root interface of all transport messages.
+ * Most message-oriented middleware (MOM) products
+ * treat messages as lightweight entities that consist of a header and a payload.
+ * The header contains fields used for message routing and identification;
+ * the payload contains the application data being sent.
+ *
+ * Within this general form, the definition of a message varies significantly across products.
+ *
+ * @see https://docs.oracle.com/javaee/7/api/javax/jms/Message.html
+ */
+interface PsrMessage
+{
+    /**
+     * @return string
+     */
+    public function getBody();
+
+    /**
+     * @param string $body
+     */
+    public function setBody($body);
+
+    /**
+     * @param array $properties
+     */
+    public function setProperties(array $properties);
+
+    /**
+     * @return array [name => value, ...]
+     */
+    public function getProperties();
+
+    /**
+     * @param string $name
+     * @param mixed  $value
+     */
+    public function setProperty($name, $value);
+
+    /**
+     * @param string $name
+     * @param mixed  $default
+     *
+     * @return mixed
+     */
+    public function getProperty($name, $default = null);
+
+    /**
+     * @param array $headers
+     */
+    public function setHeaders(array $headers);
+
+    /**
+     * @return array [name => value, ...]
+     */
+    public function getHeaders();
+
+    /**
+     * @param string $name
+     * @param mixed  $value
+     */
+    public function setHeader($name, $value);
+
+    /**
+     * @param string $name
+     * @param mixed  $default
+     *
+     * @return mixed
+     */
+    public function getHeader($name, $default = null);
+
+    /**
+     * @param bool $redelivered
+     */
+    public function setRedelivered($redelivered);
+
+    /**
+     * Gets an indication of whether this message is being redelivered.
+     * The message is considered as redelivered,
+     * when it was sent by a broker to consumer but consumer does not ACK or REJECT it.
+     * The broker brings the message back to the queue and mark it as redelivered.
+     *
+     * @return bool
+     */
+    public function isRedelivered();
+
+    /**
+     * Sets the correlation ID for the message.
+     * A client can use the correlation header field to link one message with another.
+     * A typical use is to link a response message with its request message.
+     *
+     * @param string $correlationId the message ID of a message being referred to
+     *
+     * @throws Exception if the provider fails to set the correlation ID due to some internal error
+     */
+    public function setCorrelationId($correlationId);
+
+    /**
+     * Gets the correlation ID for the message.
+     * This method is used to return correlation ID values that are either provider-specific message IDs
+     * or application-specific String values.
+     *
+     * @throws Exception if the provider fails to get the correlation ID due to some internal error
+     *
+     * @return string
+     */
+    public function getCorrelationId();
+
+    /**
+     * Sets the message ID.
+     * Providers set this field when a message is sent.
+     * This method can be used to change the value for a message that has been received.
+     *
+     * @param string $messageId the ID of the message
+     *
+     * @throws Exception if the provider fails to set the message ID due to some internal error
+     */
+    public function setMessageId($messageId);
+
+    /**
+     * Gets the message Id.
+     * The MessageId header field contains a value that uniquely identifies each message sent by a provider.
+     *
+     * When a message is sent, MessageId can be ignored.
+     *
+     * @throws Exception if the provider fails to get the message ID due to some internal error
+     *
+     * @return string
+     */
+    public function getMessageId();
+
+    /**
+     * Gets the message timestamp.
+     * The timestamp header field contains the time a message was handed off to a provider to be sent.
+     * It is not the time the message was actually transmitted,
+     * because the actual send may occur later due to transactions or other client-side queueing of messages.
+     *
+     * @return int
+     */
+    public function getTimestamp();
+
+    /**
+     * Sets the message timestamp.
+     * Providers set this field when a message is sent.
+     * This method can be used to change the value for a message that has been received.
+     *
+     * @param int $timestamp
+     *
+     * @throws Exception if the provider fails to set the timestamp due to some internal error
+     */
+    public function setTimestamp($timestamp);
+
+    /**
+     * Sets the destination to which a reply to this message should be sent.
+     * The ReplyTo header field contains the destination where a reply to the current message should be sent. If it is null, no reply is expected.
+     * The destination may be a Queue only. A topic is not supported at the moment.
+     * Messages sent with a null ReplyTo value may be a notification of some event, or they may just be some data the sender thinks is of interest.
+     * Messages with a ReplyTo value typically expect a response.
+     * A response is optional; it is up to the client to decide. These messages are called requests.
+     * A message sent in response to a request is called a reply.
+     * In some cases a client may wish to match a request it sent earlier with a reply it has just received.
+     * The client can use the CorrelationID header field for this purpose.
+     *
+     * @param string|null $replyTo
+     */
+    public function setReplyTo($replyTo);
+
+    /**
+     * Gets the destination to which a reply to this message should be sent.
+     *
+     * @return string|null
+     */
+    public function getReplyTo();
+}
diff --git a/pkg/psr-queue/PsrProcessor.php b/pkg/psr-queue/PsrProcessor.php
new file mode 100644
index 000000000..be9f78925
--- /dev/null
+++ b/pkg/psr-queue/PsrProcessor.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Enqueue\Psr;
+
+interface PsrProcessor
+{
+    /**
+     * Use this constant when the message is processed successfully and the message could be removed from the queue.
+     */
+    const ACK = 'enqueue.ack';
+
+    /**
+     * Use this constant when the message is not valid or could not be processed
+     * The message is removed from the queue.
+     */
+    const REJECT = 'enqueue.reject';
+
+    /**
+     * Use this constant when the message is not valid or could not be processed right now but we can try again later
+     * The original message is removed from the queue but a copy is publsihed to the queue again.
+     */
+    const REQUEUE = 'enqueue.requeue';
+
+    /**
+     * The method has to return either self::ACK, self::REJECT, self::REQUEUE string.
+     *
+     * The method also can return an object.
+     * It must implement __toString method and the method must return one of the constants from above.
+     *
+     * @param PsrMessage $message
+     * @param PsrContext $context
+     *
+     * @return string|object with __toString method implemented
+     */
+    public function process(PsrMessage $message, PsrContext $context);
+}
diff --git a/pkg/psr-queue/PsrProducer.php b/pkg/psr-queue/PsrProducer.php
new file mode 100644
index 000000000..60c817577
--- /dev/null
+++ b/pkg/psr-queue/PsrProducer.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Enqueue\Psr;
+
+interface PsrProducer
+{
+    /**
+     * @param PsrDestination $destination
+     * @param PsrMessage     $message
+     *
+     * @throws Exception if the provider fails to send the message due to some internal error
+     * @throws InvalidDestinationException if a client uses this method with an invalid destination
+     * @throws InvalidMessageException if an invalid message is specified
+     */
+    public function send(PsrDestination $destination, PsrMessage $message);
+}
diff --git a/pkg/psr-queue/PsrQueue.php b/pkg/psr-queue/PsrQueue.php
new file mode 100644
index 000000000..b7ca9f9ec
--- /dev/null
+++ b/pkg/psr-queue/PsrQueue.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Enqueue\Psr;
+
+/**
+ * A Queue object encapsulates a provider-specific queue name.
+ * It is the way a client specifies the identity of a queue to transport methods.
+ * For those methods that use a Destination as a parameter, a Queue object used as an argument.
+ *
+ * @see https://docs.oracle.com/javaee/7/api/javax/jms/Queue.html
+ */
+interface PsrQueue extends PsrDestination
+{
+    /**
+     * Gets the name of this queue. This is a destination one consumes messages from.
+     *
+     * @return string
+     */
+    public function getQueueName();
+}
diff --git a/pkg/psr-queue/PsrTopic.php b/pkg/psr-queue/PsrTopic.php
new file mode 100644
index 000000000..3decab959
--- /dev/null
+++ b/pkg/psr-queue/PsrTopic.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Enqueue\Psr;
+
+/**
+ * A Topic object encapsulates a provider-specific topic name.
+ * It is the way a client specifies the identity of a topic to transport methods.
+ * For those methods that use a Destination as a parameter, a Topic object may used as an argument.
+ *
+ * @see https://docs.oracle.com/javaee/7/api/javax/jms/Topic.html
+ */
+interface PsrTopic extends PsrDestination
+{
+    /**
+     * Gets the name of this topic. This is a destination one sends messages to.
+     *
+     * @return string
+     */
+    public function getTopicName();
+}
diff --git a/pkg/psr-queue/Queue.php b/pkg/psr-queue/Queue.php
index 0d4f32251..f345f14e0 100644
--- a/pkg/psr-queue/Queue.php
+++ b/pkg/psr-queue/Queue.php
@@ -2,19 +2,11 @@
 
 namespace Enqueue\Psr;
 
+@trigger_error('The class is deprecated.', E_USER_DEPRECATED);
+
 /**
- * A Queue object encapsulates a provider-specific queue name.
- * It is the way a client specifies the identity of a queue to transport methods.
- * For those methods that use a Destination as a parameter, a Queue object used as an argument.
- *
- * @see https://docs.oracle.com/javaee/7/api/javax/jms/Queue.html
+ * @deprecated use PsrQueue
  */
-interface Queue extends Destination
+interface Queue extends PsrQueue, Destination
 {
-    /**
-     * Gets the name of this queue. This is a destination one consumes messages from.
-     *
-     * @return string
-     */
-    public function getQueueName();
 }
diff --git a/pkg/psr-queue/Tests/InvalidDestinationExceptionTest.php b/pkg/psr-queue/Tests/InvalidDestinationExceptionTest.php
index 48101f6e1..a3c965fd5 100644
--- a/pkg/psr-queue/Tests/InvalidDestinationExceptionTest.php
+++ b/pkg/psr-queue/Tests/InvalidDestinationExceptionTest.php
@@ -2,9 +2,9 @@
 
 namespace Enqueue\Psr\Tests;
 
-use Enqueue\Psr\Destination;
 use Enqueue\Psr\Exception as ExceptionInterface;
 use Enqueue\Psr\InvalidDestinationException;
+use Enqueue\Psr\PsrDestination;
 use Enqueue\Test\ClassExtensionTrait;
 
 class InvalidDestinationExceptionTest extends \PHPUnit_Framework_TestCase
@@ -38,10 +38,10 @@ public function testShouldDoNothingIfAssertDestinationInstanceOfSameAsExpected()
     }
 }
 
-class DestinationBar implements Destination
+class DestinationBar implements PsrDestination
 {
 }
 
-class DestinationFoo implements Destination
+class DestinationFoo implements PsrDestination
 {
 }
diff --git a/pkg/psr-queue/Topic.php b/pkg/psr-queue/Topic.php
index 0f58d28f0..f4d01d1d0 100644
--- a/pkg/psr-queue/Topic.php
+++ b/pkg/psr-queue/Topic.php
@@ -2,19 +2,11 @@
 
 namespace Enqueue\Psr;
 
+@trigger_error('The class is deprecated.', E_USER_DEPRECATED);
+
 /**
- * A Topic object encapsulates a provider-specific topic name.
- * It is the way a client specifies the identity of a topic to transport methods.
- * For those methods that use a Destination as a parameter, a Topic object may used as an argument.
- *
- * @see https://docs.oracle.com/javaee/7/api/javax/jms/Topic.html
+ * @deprecated use PsrTopic
  */
-interface Topic extends Destination
+interface Topic extends PsrTopic, Destination
 {
-    /**
-     * Gets the name of this topic. This is a destination one sends messages to.
-     *
-     * @return string
-     */
-    public function getTopicName();
 }
diff --git a/pkg/stomp/Client/RabbitMqStompDriver.php b/pkg/stomp/Client/RabbitMqStompDriver.php
index 9a006b054..82f2dbcb1 100644
--- a/pkg/stomp/Client/RabbitMqStompDriver.php
+++ b/pkg/stomp/Client/RabbitMqStompDriver.php
@@ -6,7 +6,7 @@
 use Enqueue\Client\Message;
 use Enqueue\Client\MessagePriority;
 use Enqueue\Client\Meta\QueueMetaRegistry;
-use Enqueue\Psr\Message as TransportMessage;
+use Enqueue\Psr\PsrMessage;
 use Enqueue\Stomp\StompContext;
 use Enqueue\Stomp\StompDestination;
 use Enqueue\Stomp\StompMessage;
@@ -101,7 +101,7 @@ public function createTransportMessage(Message $message)
      *
      * {@inheritdoc}
      */
-    public function createClientMessage(TransportMessage $message)
+    public function createClientMessage(PsrMessage $message)
     {
         $clientMessage = parent::createClientMessage($message);
 
diff --git a/pkg/stomp/Client/StompDriver.php b/pkg/stomp/Client/StompDriver.php
index 6500ae887..f5fd43492 100644
--- a/pkg/stomp/Client/StompDriver.php
+++ b/pkg/stomp/Client/StompDriver.php
@@ -5,7 +5,7 @@
 use Enqueue\Client\Config;
 use Enqueue\Client\DriverInterface;
 use Enqueue\Client\Message;
-use Enqueue\Psr\Message as TransportMessage;
+use Enqueue\Psr\PsrMessage;
 use Enqueue\Stomp\StompContext;
 use Enqueue\Stomp\StompDestination;
 use Enqueue\Stomp\StompMessage;
@@ -109,7 +109,7 @@ public function createTransportMessage(Message $message)
      *
      * {@inheritdoc}
      */
-    public function createClientMessage(TransportMessage $message)
+    public function createClientMessage(PsrMessage $message)
     {
         $clientMessage = new Message();
 
diff --git a/pkg/stomp/StompConnectionFactory.php b/pkg/stomp/StompConnectionFactory.php
index bf34fd07b..b62bc3af3 100644
--- a/pkg/stomp/StompConnectionFactory.php
+++ b/pkg/stomp/StompConnectionFactory.php
@@ -2,10 +2,10 @@
 
 namespace Enqueue\Stomp;
 
-use Enqueue\Psr\ConnectionFactory;
+use Enqueue\Psr\PsrConnectionFactory;
 use Stomp\Network\Connection;
 
-class StompConnectionFactory implements ConnectionFactory
+class StompConnectionFactory implements PsrConnectionFactory
 {
     /**
      * @var array
diff --git a/pkg/stomp/StompConsumer.php b/pkg/stomp/StompConsumer.php
index 873b7a247..9a499cdde 100644
--- a/pkg/stomp/StompConsumer.php
+++ b/pkg/stomp/StompConsumer.php
@@ -2,13 +2,13 @@
 
 namespace Enqueue\Stomp;
 
-use Enqueue\Psr\Consumer;
+use Enqueue\Psr\PsrConsumer;
+use Enqueue\Psr\PsrMessage;
 use Enqueue\Psr\InvalidMessageException;
-use Enqueue\Psr\Message;
 use Stomp\Client;
 use Stomp\Transport\Frame;
 
-class StompConsumer implements Consumer
+class StompConsumer implements PsrConsumer
 {
     const ACK_AUTO = 'auto';
     const ACK_CLIENT = 'client';
@@ -144,7 +144,7 @@ public function receiveNoWait()
      *
      * @param StompMessage $message
      */
-    public function acknowledge(Message $message)
+    public function acknowledge(PsrMessage $message)
     {
         InvalidMessageException::assertMessageInstanceOf($message, StompMessage::class);
 
@@ -158,7 +158,7 @@ public function acknowledge(Message $message)
      *
      * @param StompMessage $message
      */
-    public function reject(Message $message, $requeue = false)
+    public function reject(PsrMessage $message, $requeue = false)
     {
         InvalidMessageException::assertMessageInstanceOf($message, StompMessage::class);
 
diff --git a/pkg/stomp/StompContext.php b/pkg/stomp/StompContext.php
index 35130ff37..1e67c36f0 100644
--- a/pkg/stomp/StompContext.php
+++ b/pkg/stomp/StompContext.php
@@ -2,11 +2,11 @@
 
 namespace Enqueue\Stomp;
 
-use Enqueue\Psr\Context;
-use Enqueue\Psr\Destination;
 use Enqueue\Psr\InvalidDestinationException;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrDestination;
 
-class StompContext implements Context
+class StompContext implements PsrContext
 {
     /**
      * @var BufferedStompClient
@@ -161,7 +161,7 @@ public function createDestination($destination)
      *
      * @return StompConsumer
      */
-    public function createConsumer(Destination $destination)
+    public function createConsumer(PsrDestination $destination)
     {
         InvalidDestinationException::assertDestinationInstanceOf($destination, StompDestination::class);
 
diff --git a/pkg/stomp/StompDestination.php b/pkg/stomp/StompDestination.php
index bf3d84212..236ee4f9e 100644
--- a/pkg/stomp/StompDestination.php
+++ b/pkg/stomp/StompDestination.php
@@ -2,10 +2,10 @@
 
 namespace Enqueue\Stomp;
 
-use Enqueue\Psr\Queue;
-use Enqueue\Psr\Topic;
+use Enqueue\Psr\PsrQueue;
+use Enqueue\Psr\PsrTopic;
 
-class StompDestination implements Topic, Queue
+class StompDestination implements PsrTopic, PsrQueue
 {
     const TYPE_TOPIC = 'topic';
     const TYPE_EXCHANGE = 'exchange';
diff --git a/pkg/stomp/StompMessage.php b/pkg/stomp/StompMessage.php
index ed90f6317..9fc60e2cc 100644
--- a/pkg/stomp/StompMessage.php
+++ b/pkg/stomp/StompMessage.php
@@ -2,10 +2,10 @@
 
 namespace Enqueue\Stomp;
 
-use Enqueue\Psr\Message;
+use Enqueue\Psr\PsrMessage;
 use Stomp\Transport\Frame;
 
-class StompMessage implements Message
+class StompMessage implements PsrMessage
 {
     /**
      * @var string
diff --git a/pkg/stomp/StompProducer.php b/pkg/stomp/StompProducer.php
index 609c5e1de..8e8f829af 100644
--- a/pkg/stomp/StompProducer.php
+++ b/pkg/stomp/StompProducer.php
@@ -2,15 +2,15 @@
 
 namespace Enqueue\Stomp;
 
-use Enqueue\Psr\Destination;
+use Enqueue\Psr\PsrDestination;
 use Enqueue\Psr\InvalidDestinationException;
 use Enqueue\Psr\InvalidMessageException;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Producer;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrProducer;
 use Stomp\Client;
 use Stomp\Transport\Message as StompLibMessage;
 
-class StompProducer implements Producer
+class StompProducer implements PsrProducer
 {
     /**
      * @var Client
@@ -31,7 +31,7 @@ public function __construct(Client $stomp)
      * @param StompDestination $destination
      * @param StompMessage     $message
      */
-    public function send(Destination $destination, Message $message)
+    public function send(PsrDestination $destination, PsrMessage $message)
     {
         InvalidDestinationException::assertDestinationInstanceOf($destination, StompDestination::class);
 
diff --git a/pkg/stomp/Tests/Functional/StompConsumptionUseCasesTest.php b/pkg/stomp/Tests/Functional/StompConsumptionUseCasesTest.php
index 15f50010e..0feb404c9 100644
--- a/pkg/stomp/Tests/Functional/StompConsumptionUseCasesTest.php
+++ b/pkg/stomp/Tests/Functional/StompConsumptionUseCasesTest.php
@@ -8,9 +8,9 @@
 use Enqueue\Consumption\Extension\ReplyExtension;
 use Enqueue\Consumption\QueueConsumer;
 use Enqueue\Consumption\Result;
-use Enqueue\Psr\Context;
-use Enqueue\Psr\Message;
-use Enqueue\Psr\Processor;
+use Enqueue\Psr\PsrContext;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrProcessor;
 use Enqueue\Stomp\StompContext;
 use Enqueue\Test\RabbitmqManagmentExtensionTrait;
 use Enqueue\Test\RabbitmqStompExtension;
@@ -57,7 +57,7 @@ public function testConsumeOneMessageAndExit()
 
         $queueConsumer->consume();
 
-        $this->assertInstanceOf(Message::class, $processor->lastProcessedMessage);
+        $this->assertInstanceOf(PsrMessage::class, $processor->lastProcessedMessage);
         $this->assertEquals(__METHOD__, $processor->lastProcessedMessage->getBody());
     }
 
@@ -88,22 +88,22 @@ public function testConsumeOneMessageAndSendReplyExit()
         $queueConsumer->bind($replyQueue, $replyProcessor);
         $queueConsumer->consume();
 
-        $this->assertInstanceOf(Message::class, $processor->lastProcessedMessage);
+        $this->assertInstanceOf(PsrMessage::class, $processor->lastProcessedMessage);
         $this->assertEquals(__METHOD__, $processor->lastProcessedMessage->getBody());
 
-        $this->assertInstanceOf(Message::class, $replyProcessor->lastProcessedMessage);
+        $this->assertInstanceOf(PsrMessage::class, $replyProcessor->lastProcessedMessage);
         $this->assertEquals(__METHOD__.'.reply', $replyProcessor->lastProcessedMessage->getBody());
     }
 }
 
-class StubProcessor implements Processor
+class StubProcessor implements PsrProcessor
 {
-    public $result = Result::ACK;
+    public $result = self::ACK;
 
-    /** @var Message */
+    /** @var PsrMessage */
     public $lastProcessedMessage;
 
-    public function process(Message $message, Context $context)
+    public function process(PsrMessage $message, PsrContext $context)
     {
         $this->lastProcessedMessage = $message;
 
diff --git a/pkg/stomp/Tests/StompConnectionFactoryTest.php b/pkg/stomp/Tests/StompConnectionFactoryTest.php
index 5b73e4137..80421f300 100644
--- a/pkg/stomp/Tests/StompConnectionFactoryTest.php
+++ b/pkg/stomp/Tests/StompConnectionFactoryTest.php
@@ -2,7 +2,7 @@
 
 namespace Enqueue\Stomp\Tests;
 
-use Enqueue\Psr\ConnectionFactory;
+use Enqueue\Psr\PsrConnectionFactory;
 use Enqueue\Stomp\StompConnectionFactory;
 use Enqueue\Stomp\StompContext;
 use Enqueue\Test\ClassExtensionTrait;
@@ -13,7 +13,7 @@ class StompConnectionFactoryTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementConnectionFactoryInterface()
     {
-        $this->assertClassImplements(ConnectionFactory::class, StompConnectionFactory::class);
+        $this->assertClassImplements(PsrConnectionFactory::class, StompConnectionFactory::class);
     }
 
     public function testCouldBeConstructedWithEmptyConfiguration()
diff --git a/pkg/stomp/Tests/StompConsumerTest.php b/pkg/stomp/Tests/StompConsumerTest.php
index 4a7f71727..2e46bab41 100644
--- a/pkg/stomp/Tests/StompConsumerTest.php
+++ b/pkg/stomp/Tests/StompConsumerTest.php
@@ -2,9 +2,9 @@
 
 namespace Enqueue\Stomp\Tests;
 
-use Enqueue\Psr\Consumer;
+use Enqueue\Psr\PsrConsumer;
 use Enqueue\Psr\InvalidMessageException;
-use Enqueue\Psr\Message;
+use Enqueue\Psr\PsrMessage;
 use Enqueue\Stomp\BufferedStompClient;
 use Enqueue\Stomp\StompConsumer;
 use Enqueue\Stomp\StompDestination;
@@ -19,7 +19,7 @@ class StompConsumerTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementMessageConsumerInterface()
     {
-        $this->assertClassImplements(Consumer::class, StompConsumer::class);
+        $this->assertClassImplements(PsrConsumer::class, StompConsumer::class);
     }
 
     public function testCouldBeConstructedWithRequiredAttributes()
@@ -79,7 +79,7 @@ public function testAcknowledgeShouldThrowInvalidMessageExceptionIfMessageIsWron
         $this->expectExceptionMessage('The message must be an instance of');
 
         $consumer = new StompConsumer($this->createStompClientMock(), new StompDestination());
-        $consumer->acknowledge($this->createMock(Message::class));
+        $consumer->acknowledge($this->createMock(PsrMessage::class));
     }
 
     public function testShouldAcknowledgeMessage()
@@ -116,7 +116,7 @@ public function testRejectShouldThrowInvalidMessageExceptionIfMessageIsWrongType
         $this->expectExceptionMessage('The message must be an instance of');
 
         $consumer = new StompConsumer($this->createStompClientMock(), new StompDestination());
-        $consumer->reject($this->createMock(Message::class));
+        $consumer->reject($this->createMock(PsrMessage::class));
     }
 
     public function testShouldRejectMessage()
diff --git a/pkg/stomp/Tests/StompContextTest.php b/pkg/stomp/Tests/StompContextTest.php
index 81a52dbe4..d57337570 100644
--- a/pkg/stomp/Tests/StompContextTest.php
+++ b/pkg/stomp/Tests/StompContextTest.php
@@ -2,9 +2,9 @@
 
 namespace Enqueue\Stomp\Tests;
 
-use Enqueue\Psr\Context;
+use Enqueue\Psr\PsrContext;
 use Enqueue\Psr\InvalidDestinationException;
-use Enqueue\Psr\Queue;
+use Enqueue\Psr\PsrQueue;
 use Enqueue\Stomp\BufferedStompClient;
 use Enqueue\Stomp\StompConsumer;
 use Enqueue\Stomp\StompContext;
@@ -19,7 +19,7 @@ class StompContextTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementSessionInterface()
     {
-        $this->assertClassImplements(Context::class, StompContext::class);
+        $this->assertClassImplements(PsrContext::class, StompContext::class);
     }
 
     public function testCouldBeCreatedWithRequiredArguments()
@@ -110,7 +110,7 @@ public function testThrowInvalidDestinationException()
         $this->expectExceptionMessage('The destination must be an instance of');
 
         $session = new StompContext($this->createStompClientMock());
-        $session->createConsumer($this->createMock(Queue::class));
+        $session->createConsumer($this->createMock(PsrQueue::class));
     }
 
     public function testShouldCreateMessageConsumerInstance()
diff --git a/pkg/stomp/Tests/StompDestinationTest.php b/pkg/stomp/Tests/StompDestinationTest.php
index d0a9e82ef..660e68f25 100644
--- a/pkg/stomp/Tests/StompDestinationTest.php
+++ b/pkg/stomp/Tests/StompDestinationTest.php
@@ -2,8 +2,8 @@
 
 namespace Enqueue\Stomp\Tests;
 
-use Enqueue\Psr\Queue;
-use Enqueue\Psr\Topic;
+use Enqueue\Psr\PsrQueue;
+use Enqueue\Psr\PsrTopic;
 use Enqueue\Stomp\StompDestination;
 use Enqueue\Test\ClassExtensionTrait;
 
@@ -13,8 +13,8 @@ class StompDestinationTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementsTopicAndQueueInterfaces()
     {
-        $this->assertClassImplements(Topic::class, StompDestination::class);
-        $this->assertClassImplements(Queue::class, StompDestination::class);
+        $this->assertClassImplements(PsrTopic::class, StompDestination::class);
+        $this->assertClassImplements(PsrQueue::class, StompDestination::class);
     }
 
     public function testShouldReturnDestinationStringWithRoutingKey()
diff --git a/pkg/stomp/Tests/StompMessageTest.php b/pkg/stomp/Tests/StompMessageTest.php
index c434e2d4d..c39f4a084 100644
--- a/pkg/stomp/Tests/StompMessageTest.php
+++ b/pkg/stomp/Tests/StompMessageTest.php
@@ -2,7 +2,7 @@
 
 namespace Enqueue\Stomp\Tests;
 
-use Enqueue\Psr\Message;
+use Enqueue\Psr\PsrMessage;
 use Enqueue\Stomp\StompMessage;
 use Enqueue\Test\ClassExtensionTrait;
 use Stomp\Transport\Frame;
@@ -13,7 +13,7 @@ class StompMessageTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementMessageInterface()
     {
-        $this->assertClassImplements(Message::class, StompMessage::class);
+        $this->assertClassImplements(PsrMessage::class, StompMessage::class);
     }
 
     public function testCouldConstructMessageWithBody()
diff --git a/pkg/stomp/Tests/StompProducerTest.php b/pkg/stomp/Tests/StompProducerTest.php
index 3d58d5e80..ea674bdea 100644
--- a/pkg/stomp/Tests/StompProducerTest.php
+++ b/pkg/stomp/Tests/StompProducerTest.php
@@ -4,9 +4,9 @@
 
 use Enqueue\Psr\InvalidDestinationException;
 use Enqueue\Psr\InvalidMessageException;
-use Enqueue\Psr\Message as PsrMessage;
-use Enqueue\Psr\Producer;
-use Enqueue\Psr\Queue;
+use Enqueue\Psr\PsrMessage;
+use Enqueue\Psr\PsrProducer;
+use Enqueue\Psr\PsrQueue;
 use Enqueue\Stomp\StompDestination;
 use Enqueue\Stomp\StompMessage;
 use Enqueue\Stomp\StompProducer;
@@ -20,7 +20,7 @@ class StompProducerTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldImplementMessageProducerInterface()
     {
-        $this->assertClassImplements(Producer::class, StompProducer::class);
+        $this->assertClassImplements(PsrProducer::class, StompProducer::class);
     }
 
     public function testShouldThrowInvalidDestinationExceptionWhenDestinationIsWrongType()
@@ -30,7 +30,7 @@ public function testShouldThrowInvalidDestinationExceptionWhenDestinationIsWrong
 
         $producer = new StompProducer($this->createStompClientMock());
 
-        $producer->send($this->createMock(Queue::class), new StompMessage());
+        $producer->send($this->createMock(PsrQueue::class), new StompMessage());
     }
 
     public function testShouldThrowInvalidMessageExceptionWhenMessageIsWrongType()