diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig
index 50dfbb9d3a719..f7b8fc3104037 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig
@@ -159,9 +159,9 @@
                 <td>{{ profiler_dump(dispatchCall.message.value, maxDepth=2) }}</td>
             </tr>
             <tr>
-                <td class="text-bold">Envelope items</td>
+                <td class="text-bold">Envelope stamps</td>
                 <td>
-                    {% for item in dispatchCall.envelopeItems %}
+                    {% for item in dispatchCall.stamps %}
                         {{ profiler_dump(item) }}
                     {% else %}
                         <span class="text-muted">No items</span>
diff --git a/src/Symfony/Component/Messenger/Asynchronous/Middleware/SendMessageMiddleware.php b/src/Symfony/Component/Messenger/Asynchronous/Middleware/SendMessageMiddleware.php
index 9e7dc9baef42f..f09d7d6f5430c 100644
--- a/src/Symfony/Component/Messenger/Asynchronous/Middleware/SendMessageMiddleware.php
+++ b/src/Symfony/Component/Messenger/Asynchronous/Middleware/SendMessageMiddleware.php
@@ -13,10 +13,10 @@
 
 use Symfony\Component\Messenger\Asynchronous\Routing\AbstractSenderLocator;
 use Symfony\Component\Messenger\Asynchronous\Routing\SenderLocatorInterface;
-use Symfony\Component\Messenger\Asynchronous\Transport\ReceivedMessage;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\EnvelopeAwareInterface;
 use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
+use Symfony\Component\Messenger\Stamp\ReceivedStamp;
 
 /**
  * @author Samuel Roze <samuel.roze@gmail.com>
@@ -40,7 +40,7 @@ public function __construct(SenderLocatorInterface $senderLocator, array $messag
      */
     public function handle($envelope, callable $next)
     {
-        if ($envelope->get(ReceivedMessage::class)) {
+        if ($envelope->get(ReceivedStamp::class)) {
             // It's a received message. Do not send it back:
             return $next($envelope);
         }
diff --git a/src/Symfony/Component/Messenger/Asynchronous/Transport/WrapIntoReceivedMessage.php b/src/Symfony/Component/Messenger/Asynchronous/Transport/WrapIntoReceivedMessage.php
deleted file mode 100644
index 22a858175f7ef..0000000000000
--- a/src/Symfony/Component/Messenger/Asynchronous/Transport/WrapIntoReceivedMessage.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Messenger\Asynchronous\Transport;
-
-use Symfony\Component\Messenger\Envelope;
-use Symfony\Component\Messenger\Transport\ReceiverInterface;
-
-/**
- * @author Samuel Roze <samuel.roze@gmail.com>
- */
-class WrapIntoReceivedMessage implements ReceiverInterface
-{
-    private $decoratedReceiver;
-
-    public function __construct(ReceiverInterface $decoratedReceiver)
-    {
-        $this->decoratedReceiver = $decoratedReceiver;
-    }
-
-    public function receive(callable $handler): void
-    {
-        $this->decoratedReceiver->receive(function (?Envelope $envelope) use ($handler) {
-            if (null !== $envelope) {
-                $envelope = $envelope->with(new ReceivedMessage());
-            }
-
-            $handler($envelope);
-        });
-    }
-
-    public function stop(): void
-    {
-        $this->decoratedReceiver->stop();
-    }
-}
diff --git a/src/Symfony/Component/Messenger/CHANGELOG.md b/src/Symfony/Component/Messenger/CHANGELOG.md
index 2abdada660a86..1588f73c68836 100644
--- a/src/Symfony/Component/Messenger/CHANGELOG.md
+++ b/src/Symfony/Component/Messenger/CHANGELOG.md
@@ -5,20 +5,25 @@ CHANGELOG
 -----
 
  * The component is not experimental anymore
- * [BC BREAK] The signature of `Amqp*` classes changed to take a `Connection` as a first argument and an optional
+ * All the changes below are BC BREAKS
+ * The signature of `Amqp*` classes changed to take a `Connection` as a first argument and an optional
    `Serializer` as a second argument.
- * [BC BREAK] `SenderLocator` has been renamed to `ContainerSenderLocator`
+ * `SenderLocator` has been renamed to `ContainerSenderLocator`
    Be careful as there is still a `SenderLocator` class, but it does not rely on a `ContainerInterface` to find senders.
    Instead, it accepts the sender instance itself instead of its identifier in the container.
- * [BC BREAK] `MessageSubscriberInterface::getHandledMessages()` return value has changed. The value of an array item
+ * `MessageSubscriberInterface::getHandledMessages()` return value has changed. The value of an array item
    needs to be an associative array or the method name.
  * `ValidationMiddleware::handle()` and `SendMessageMiddleware::handle()` now require an `Envelope` object
- * `EnvelopeItemInterface` doesn't extend `Serializable` anymore
- * [BC BREAK] The `ConsumeMessagesCommand` class now takes an instance of `Psr\Container\ContainerInterface` 
+ * `StampInterface` replaces `EnvelopeItemInterface` and doesn't extend `Serializable` anymore
+ * The `ConsumeMessagesCommand` class now takes an instance of `Psr\Container\ContainerInterface`
    as first constructor argument
- * [BC BREAK] The `EncoderInterface` and `DecoderInterface` have been replaced by a unified `Symfony\Component\Messenger\Transport\Serialization\SerializerInterface`.
- * [BC BREAK] The locator passed to `ContainerHandlerLocator` should not prefix its keys by "handler." anymore
- * [BC BREAK] The `AbstractHandlerLocator::getHandler()` method uses `?callable` as return type
+ * The `EncoderInterface` and `DecoderInterface` have been replaced by a unified `Symfony\Component\Messenger\Transport\Serialization\SerializerInterface`.
+ * The locator passed to `ContainerHandlerLocator` should not prefix its keys by "handler." anymore
+ * The `AbstractHandlerLocator::getHandler()` method uses `?callable` as return type
+ * Renamed `EnvelopeItemInterface` to `StampInterface`
+ * `Envelope`'s constructor and `with()` method now accept `StampInterface` objects as variadic parameters
+ * Renamed and moved `ReceivedMessage`, `ValidationConfiguration` and `SerializerConfiguration` in the `Stamp` namespace
+ * Removed the `WrapIntoReceivedMessage`
 
 4.1.0
 -----
diff --git a/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php b/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php
index 6713525ddf07f..eb34262909608 100644
--- a/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php
+++ b/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php
@@ -90,7 +90,7 @@ private function collectMessage(string $busName, array $tracedMessage)
 
         $debugRepresentation = array(
             'bus' => $busName,
-            'envelopeItems' => $tracedMessage['envelopeItems'] ?? null,
+            'stamps' => $tracedMessage['stamps'] ?? null,
             'message' => array(
                 'type' => new ClassStub(\get_class($message)),
                 'value' => $message,
diff --git a/src/Symfony/Component/Messenger/Envelope.php b/src/Symfony/Component/Messenger/Envelope.php
index 491179def87b6..c0f6141774145 100644
--- a/src/Symfony/Component/Messenger/Envelope.php
+++ b/src/Symfony/Component/Messenger/Envelope.php
@@ -11,25 +11,27 @@
 
 namespace Symfony\Component\Messenger;
 
+use Symfony\Component\Messenger\Stamp\StampInterface;
+
 /**
- * A message wrapped in an envelope with items (configurations, markers, ...).
+ * A message wrapped in an envelope with stamps (configurations, markers, ...).
  *
  * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
  */
 final class Envelope
 {
-    private $items = array();
+    private $stamps = array();
     private $message;
 
     /**
-     * @param object                  $message
-     * @param EnvelopeItemInterface[] $items
+     * @param object $message
      */
-    public function __construct($message, array $items = array())
+    public function __construct($message, StampInterface ...$stamps)
     {
         $this->message = $message;
-        foreach ($items as $item) {
-            $this->items[\get_class($item)] = $item;
+
+        foreach ($stamps as $stamp) {
+            $this->stamps[\get_class($stamp)] = $stamp;
         }
     }
 
@@ -44,13 +46,15 @@ public static function wrap($message): self
     }
 
     /**
-     * @return Envelope a new Envelope instance with additional item
+     * @return Envelope a new Envelope instance with additional stamp
      */
-    public function with(EnvelopeItemInterface $item): self
+    public function with(StampInterface ...$stamps): self
     {
         $cloned = clone $this;
 
-        $cloned->items[\get_class($item)] = $item;
+        foreach ($stamps as $stamp) {
+            $cloned->stamps[\get_class($stamp)] = $stamp;
+        }
 
         return $cloned;
     }
@@ -64,17 +68,17 @@ public function withMessage($message): self
         return $cloned;
     }
 
-    public function get(string $itemFqcn): ?EnvelopeItemInterface
+    public function get(string $stampFqcn): ?StampInterface
     {
-        return $this->items[$itemFqcn] ?? null;
+        return $this->stamps[$stampFqcn] ?? null;
     }
 
     /**
-     * @return EnvelopeItemInterface[] indexed by fqcn
+     * @return StampInterface[] indexed by fqcn
      */
     public function all(): array
     {
-        return $this->items;
+        return $this->stamps;
     }
 
     /**
diff --git a/src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php b/src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php
index 9f6f82e33c2bf..361fb7bbb34d2 100644
--- a/src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php
+++ b/src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\EnvelopeAwareInterface;
 use Symfony\Component\Messenger\Exception\ValidationFailedException;
-use Symfony\Component\Messenger\Middleware\Configuration\ValidationConfiguration;
+use Symfony\Component\Messenger\Stamp\ValidationStamp;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 /**
@@ -36,9 +36,9 @@ public function handle($envelope, callable $next)
     {
         $message = $envelope->getMessage();
         $groups = null;
-        /** @var ValidationConfiguration|null $validationConfig */
-        if ($validationConfig = $envelope->get(ValidationConfiguration::class)) {
-            $groups = $validationConfig->getGroups();
+        /** @var ValidationStamp|null $validationStamp */
+        if ($validationStamp = $envelope->get(ValidationStamp::class)) {
+            $groups = $validationStamp->getGroups();
         }
 
         $violations = $this->validator->validate($message, null, $groups);
diff --git a/src/Symfony/Component/Messenger/Asynchronous/Transport/ReceivedMessage.php b/src/Symfony/Component/Messenger/Stamp/ReceivedStamp.php
similarity index 76%
rename from src/Symfony/Component/Messenger/Asynchronous/Transport/ReceivedMessage.php
rename to src/Symfony/Component/Messenger/Stamp/ReceivedStamp.php
index ad2a98df73eb1..ecfb0d81b28b3 100644
--- a/src/Symfony/Component/Messenger/Asynchronous/Transport/ReceivedMessage.php
+++ b/src/Symfony/Component/Messenger/Stamp/ReceivedStamp.php
@@ -9,10 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Asynchronous\Transport;
+namespace Symfony\Component\Messenger\Stamp;
 
 use Symfony\Component\Messenger\Asynchronous\Middleware\SendMessageMiddleware;
-use Symfony\Component\Messenger\EnvelopeItemInterface;
 
 /**
  * Marker config for a received message.
@@ -24,6 +23,6 @@
  *
  * @author Samuel Roze <samuel.roze@gmail.com>
  */
-final class ReceivedMessage implements EnvelopeItemInterface
+final class ReceivedStamp implements StampInterface
 {
 }
diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/SerializerConfiguration.php b/src/Symfony/Component/Messenger/Stamp/SerializerStamp.php
similarity index 73%
rename from src/Symfony/Component/Messenger/Transport/Serialization/SerializerConfiguration.php
rename to src/Symfony/Component/Messenger/Stamp/SerializerStamp.php
index 963d77559308c..3df15ca46ec90 100644
--- a/src/Symfony/Component/Messenger/Transport/Serialization/SerializerConfiguration.php
+++ b/src/Symfony/Component/Messenger/Stamp/SerializerStamp.php
@@ -9,14 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Transport\Serialization;
-
-use Symfony\Component\Messenger\EnvelopeItemInterface;
+namespace Symfony\Component\Messenger\Stamp;
 
 /**
  * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
  */
-final class SerializerConfiguration implements EnvelopeItemInterface
+final class SerializerStamp implements StampInterface
 {
     private $context;
 
diff --git a/src/Symfony/Component/Messenger/EnvelopeItemInterface.php b/src/Symfony/Component/Messenger/Stamp/StampInterface.php
similarity index 64%
rename from src/Symfony/Component/Messenger/EnvelopeItemInterface.php
rename to src/Symfony/Component/Messenger/Stamp/StampInterface.php
index 7e94463662d89..dc1fc0a97fb81 100644
--- a/src/Symfony/Component/Messenger/EnvelopeItemInterface.php
+++ b/src/Symfony/Component/Messenger/Stamp/StampInterface.php
@@ -9,15 +9,15 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger;
+namespace Symfony\Component\Messenger\Stamp;
 
 /**
- * An envelope item related to a message.
+ * An envelope stamp related to a message.
  *
- * This item must be serializable for transport.
+ * Stamps must be serializable value objects for transport.
  *
  * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
  */
-interface EnvelopeItemInterface
+interface StampInterface
 {
 }
diff --git a/src/Symfony/Component/Messenger/Middleware/Configuration/ValidationConfiguration.php b/src/Symfony/Component/Messenger/Stamp/ValidationStamp.php
similarity index 76%
rename from src/Symfony/Component/Messenger/Middleware/Configuration/ValidationConfiguration.php
rename to src/Symfony/Component/Messenger/Stamp/ValidationStamp.php
index 17d519ca53a93..212718733ba47 100644
--- a/src/Symfony/Component/Messenger/Middleware/Configuration/ValidationConfiguration.php
+++ b/src/Symfony/Component/Messenger/Stamp/ValidationStamp.php
@@ -9,15 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Middleware\Configuration;
+namespace Symfony\Component\Messenger\Stamp;
 
-use Symfony\Component\Messenger\EnvelopeItemInterface;
 use Symfony\Component\Validator\Constraints\GroupSequence;
 
 /**
  * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
  */
-final class ValidationConfiguration implements EnvelopeItemInterface
+final class ValidationStamp implements StampInterface
 {
     private $groups;
 
diff --git a/src/Symfony/Component/Messenger/Tests/Asynchronous/Middleware/SendMessageMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Asynchronous/Middleware/SendMessageMiddlewareTest.php
index 91d4bbeea15bd..57ea2a7e4e932 100644
--- a/src/Symfony/Component/Messenger/Tests/Asynchronous/Middleware/SendMessageMiddlewareTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Asynchronous/Middleware/SendMessageMiddlewareTest.php
@@ -14,8 +14,8 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Asynchronous\Middleware\SendMessageMiddleware;
 use Symfony\Component\Messenger\Asynchronous\Routing\SenderLocatorInterface;
-use Symfony\Component\Messenger\Asynchronous\Transport\ReceivedMessage;
 use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Stamp\ReceivedStamp;
 use Symfony\Component\Messenger\Tests\Fixtures\ChildDummyMessage;
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessageInterface;
@@ -135,7 +135,7 @@ public function testItCallsTheNextMiddlewareWhenNoSenderForThisMessage()
 
     public function testItSkipsReceivedMessages()
     {
-        $envelope = Envelope::wrap(new DummyMessage('Hey'))->with(new ReceivedMessage());
+        $envelope = Envelope::wrap(new DummyMessage('Hey'))->with(new ReceivedStamp());
 
         $sender = $this->getMockBuilder(SenderInterface::class)->getMock();
         $next = $this->createPartialMock(\stdClass::class, array('__invoke'));
diff --git a/src/Symfony/Component/Messenger/Tests/DataCollector/MessengerDataCollectorTest.php b/src/Symfony/Component/Messenger/Tests/DataCollector/MessengerDataCollectorTest.php
index 7c4fafa34090b..62556edfd24f7 100644
--- a/src/Symfony/Component/Messenger/Tests/DataCollector/MessengerDataCollectorTest.php
+++ b/src/Symfony/Component/Messenger/Tests/DataCollector/MessengerDataCollectorTest.php
@@ -62,7 +62,7 @@ public function getHandleTestData()
         $file = __FILE__;
         $messageDump = <<<DUMP
   "bus" => "default"
-  "envelopeItems" => null
+  "stamps" => null
   "message" => array:2 [
     "type" => "Symfony\Component\Messenger\Tests\Fixtures\DummyMessage"
     "value" => Symfony\Component\Messenger\Tests\Fixtures\DummyMessage %A
@@ -145,7 +145,7 @@ public function testHandleWithException()
         $this->assertStringMatchesFormat(<<<DUMP
 array:5 [
   "bus" => "default"
-  "envelopeItems" => null
+  "stamps" => null
   "message" => array:2 [
     "type" => "Symfony\Component\Messenger\Tests\Fixtures\DummyMessage"
     "value" => Symfony\Component\Messenger\Tests\Fixtures\DummyMessage %A
diff --git a/src/Symfony/Component/Messenger/Tests/EnvelopeTest.php b/src/Symfony/Component/Messenger/Tests/EnvelopeTest.php
index 053275b6e714c..ed7255ef9863e 100644
--- a/src/Symfony/Component/Messenger/Tests/EnvelopeTest.php
+++ b/src/Symfony/Component/Messenger/Tests/EnvelopeTest.php
@@ -12,10 +12,9 @@
 namespace Symfony\Component\Messenger\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Messenger\Asynchronous\Transport\ReceivedMessage;
 use Symfony\Component\Messenger\Envelope;
-use Symfony\Component\Messenger\EnvelopeAwareInterface;
-use Symfony\Component\Messenger\Middleware\Configuration\ValidationConfiguration;
+use Symfony\Component\Messenger\Stamp\ReceivedStamp;
+use Symfony\Component\Messenger\Stamp\ValidationStamp;
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 
 /**
@@ -25,13 +24,12 @@ class EnvelopeTest extends TestCase
 {
     public function testConstruct()
     {
-        $envelope = new Envelope($dummy = new DummyMessage('dummy'), array(
-            $receivedConfig = new ReceivedMessage(),
-        ));
+        $receivedStamp = new ReceivedStamp();
+        $envelope = new Envelope($dummy = new DummyMessage('dummy'), $receivedStamp);
 
         $this->assertSame($dummy, $envelope->getMessage());
-        $this->assertArrayHasKey(ReceivedMessage::class, $configs = $envelope->all());
-        $this->assertSame($receivedConfig, $configs[ReceivedMessage::class]);
+        $this->assertArrayHasKey(ReceivedStamp::class, $stamps = $envelope->all());
+        $this->assertSame($receivedStamp, $stamps[ReceivedStamp::class]);
     }
 
     public function testWrap()
@@ -49,34 +47,29 @@ public function testWithReturnsNewInstance()
     {
         $envelope = Envelope::wrap($dummy = new DummyMessage('dummy'));
 
-        $this->assertNotSame($envelope, $envelope->with(new ReceivedMessage()));
+        $this->assertNotSame($envelope, $envelope->with(new ReceivedStamp()));
     }
 
     public function testGet()
     {
-        $envelope = Envelope::wrap($dummy = new DummyMessage('dummy'))
-            ->with($config = new ReceivedMessage())
-        ;
+        $receivedStamp = new ReceivedStamp();
+        $envelope = new Envelope($dummy = new DummyMessage('dummy'), $receivedStamp);
 
-        $this->assertSame($config, $envelope->get(ReceivedMessage::class));
-        $this->assertNull($envelope->get(ValidationConfiguration::class));
+        $this->assertSame($receivedStamp, $envelope->get(ReceivedStamp::class));
+        $this->assertNull($envelope->get(ValidationStamp::class));
     }
 
     public function testAll()
     {
         $envelope = Envelope::wrap($dummy = new DummyMessage('dummy'))
-            ->with($receivedConfig = new ReceivedMessage())
-            ->with($validationConfig = new ValidationConfiguration(array('foo')))
+            ->with($receivedStamp = new ReceivedStamp())
+            ->with($validationStamp = new ValidationStamp(array('foo')))
         ;
 
-        $configs = $envelope->all();
-        $this->assertArrayHasKey(ReceivedMessage::class, $configs);
-        $this->assertSame($receivedConfig, $configs[ReceivedMessage::class]);
-        $this->assertArrayHasKey(ValidationConfiguration::class, $configs);
-        $this->assertSame($validationConfig, $configs[ValidationConfiguration::class]);
+        $stamps = $envelope->all();
+        $this->assertArrayHasKey(ReceivedStamp::class, $stamps);
+        $this->assertSame($receivedStamp, $stamps[ReceivedStamp::class]);
+        $this->assertArrayHasKey(ValidationStamp::class, $stamps);
+        $this->assertSame($validationStamp, $stamps[ValidationStamp::class]);
     }
 }
-
-class FooConfigurationConsumer implements EnvelopeAwareInterface
-{
-}
diff --git a/src/Symfony/Component/Messenger/Tests/Fixtures/AnEnvelopeItem.php b/src/Symfony/Component/Messenger/Tests/Fixtures/AnEnvelopeStamp.php
similarity index 73%
rename from src/Symfony/Component/Messenger/Tests/Fixtures/AnEnvelopeItem.php
rename to src/Symfony/Component/Messenger/Tests/Fixtures/AnEnvelopeStamp.php
index e2cf685dccefd..26377b3c43d96 100644
--- a/src/Symfony/Component/Messenger/Tests/Fixtures/AnEnvelopeItem.php
+++ b/src/Symfony/Component/Messenger/Tests/Fixtures/AnEnvelopeStamp.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\Messenger\Tests\Fixtures;
 
-use Symfony\Component\Messenger\EnvelopeItemInterface;
+use Symfony\Component\Messenger\Stamp\StampInterface;
 
-class AnEnvelopeItem implements EnvelopeItemInterface
+class AnEnvelopeStamp implements StampInterface
 {
 }
diff --git a/src/Symfony/Component/Messenger/Tests/MessageBusTest.php b/src/Symfony/Component/Messenger/Tests/MessageBusTest.php
index 9dc93a9d15213..ae4d639adfe4e 100644
--- a/src/Symfony/Component/Messenger/Tests/MessageBusTest.php
+++ b/src/Symfony/Component/Messenger/Tests/MessageBusTest.php
@@ -12,13 +12,13 @@
 namespace Symfony\Component\Messenger\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Messenger\Asynchronous\Transport\ReceivedMessage;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\EnvelopeAwareInterface;
 use Symfony\Component\Messenger\MessageBus;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
-use Symfony\Component\Messenger\Tests\Fixtures\AnEnvelopeItem;
+use Symfony\Component\Messenger\Stamp\ReceivedStamp;
+use Symfony\Component\Messenger\Tests\Fixtures\AnEnvelopeStamp;
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 
 class MessageBusTest extends TestCase
@@ -69,7 +69,7 @@ public function testItCallsMiddlewareAndChainTheReturnValue()
     public function testItKeepsTheEnvelopeEvenThroughAMiddlewareThatIsNotEnvelopeAware()
     {
         $message = new DummyMessage('Hello');
-        $envelope = new Envelope($message, array(new ReceivedMessage()));
+        $envelope = new Envelope($message, new ReceivedStamp());
 
         $firstMiddleware = $this->getMockBuilder(MiddlewareInterface::class)->getMock();
         $firstMiddleware->expects($this->once())
@@ -93,18 +93,18 @@ public function testItKeepsTheEnvelopeEvenThroughAMiddlewareThatIsNotEnvelopeAwa
         $bus->dispatch($envelope);
     }
 
-    public function testThatAMiddlewareCanAddSomeItemsToTheEnvelope()
+    public function testThatAMiddlewareCanAddSomeStampsToTheEnvelope()
     {
         $message = new DummyMessage('Hello');
-        $envelope = new Envelope($message, array(new ReceivedMessage()));
-        $envelopeWithAnotherItem = $envelope->with(new AnEnvelopeItem());
+        $envelope = new Envelope($message, new ReceivedStamp());
+        $envelopeWithAnotherStamp = $envelope->with(new AnEnvelopeStamp());
 
         $firstMiddleware = $this->getMockBuilder(array(MiddlewareInterface::class, EnvelopeAwareInterface::class))->getMock();
         $firstMiddleware->expects($this->once())
             ->method('handle')
             ->with($envelope, $this->anything())
             ->will($this->returnCallback(function ($message, $next) {
-                return $next($message->with(new AnEnvelopeItem()));
+                return $next($message->with(new AnEnvelopeStamp()));
             }));
 
         $secondMiddleware = $this->getMockBuilder(MiddlewareInterface::class)->getMock();
@@ -118,7 +118,7 @@ public function testThatAMiddlewareCanAddSomeItemsToTheEnvelope()
         $thirdMiddleware = $this->getMockBuilder(array(MiddlewareInterface::class, EnvelopeAwareInterface::class))->getMock();
         $thirdMiddleware->expects($this->once())
             ->method('handle')
-            ->with($envelopeWithAnotherItem, $this->anything())
+            ->with($envelopeWithAnotherStamp, $this->anything())
         ;
 
         $bus = new MessageBus(array(
@@ -130,13 +130,13 @@ public function testThatAMiddlewareCanAddSomeItemsToTheEnvelope()
         $bus->dispatch($envelope);
     }
 
-    public function testThatAMiddlewareCanUpdateTheMessageWhileKeepingTheEnvelopeItems()
+    public function testThatAMiddlewareCanUpdateTheMessageWhileKeepingTheEnvelopeStamps()
     {
         $message = new DummyMessage('Hello');
-        $envelope = new Envelope($message, $items = array(new ReceivedMessage()));
+        $envelope = new Envelope($message, ...$stamps = array(new ReceivedStamp()));
 
         $changedMessage = new DummyMessage('Changed');
-        $expectedEnvelope = new Envelope($changedMessage, $items);
+        $expectedEnvelope = new Envelope($changedMessage, ...$stamps);
 
         $firstMiddleware = $this->getMockBuilder(MiddlewareInterface::class)->getMock();
         $firstMiddleware->expects($this->once())
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/Configuration/ValidationConfigurationTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/Configuration/ValidationConfigurationTest.php
deleted file mode 100644
index 6ab3d1487f01b..0000000000000
--- a/src/Symfony/Component/Messenger/Tests/Middleware/Configuration/ValidationConfigurationTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Messenger\Tests\Middleware\Configuration;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\Messenger\Middleware\Configuration\ValidationConfiguration;
-use Symfony\Component\Validator\Constraints\GroupSequence;
-
-/**
- * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
- */
-class ValidationConfigurationTest extends TestCase
-{
-    public function testConfig()
-    {
-        $config = new ValidationConfiguration($groups = array('Default', 'Extra'));
-        $this->assertSame($groups, $config->getGroups());
-
-        $config = new ValidationConfiguration($groups = new GroupSequence(array('Default', 'Then')));
-        $this->assertSame($groups, $config->getGroups());
-    }
-
-    public function testSerializable()
-    {
-        $this->assertEquals($config = new ValidationConfiguration(array('Default', 'Extra')), unserialize(serialize($config)));
-        $this->assertEquals($config = new ValidationConfiguration(new GroupSequence(array('Default', 'Then'))), unserialize(serialize($config)));
-    }
-}
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/ValidationMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/ValidationMiddlewareTest.php
index 23964c2e45e5a..27f7da675210c 100644
--- a/src/Symfony/Component/Messenger/Tests/Middleware/ValidationMiddlewareTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Middleware/ValidationMiddlewareTest.php
@@ -13,8 +13,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Envelope;
-use Symfony\Component\Messenger\Middleware\Configuration\ValidationConfiguration;
 use Symfony\Component\Messenger\Middleware\ValidationMiddleware;
+use Symfony\Component\Messenger\Stamp\ValidationStamp;
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Validator\ConstraintViolationListInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
@@ -46,9 +46,9 @@ public function testValidateAndNextMiddleware()
         $this->assertSame('Hello', $result);
     }
 
-    public function testValidateWithConfigurationAndNextMiddleware()
+    public function testValidateWithStampAndNextMiddleware()
     {
-        $envelope = Envelope::wrap($message = new DummyMessage('Hey'))->with(new ValidationConfiguration($groups = array('Default', 'Extra')));
+        $envelope = Envelope::wrap($message = new DummyMessage('Hey'))->with(new ValidationStamp($groups = array('Default', 'Extra')));
         $validator = $this->createMock(ValidatorInterface::class);
         $validator
             ->expects($this->once())
diff --git a/src/Symfony/Component/Messenger/Tests/Asynchronous/Transport/Serialization/SerializerConfigurationTest.php b/src/Symfony/Component/Messenger/Tests/Stamp/SerializerStampTest.php
similarity index 63%
rename from src/Symfony/Component/Messenger/Tests/Asynchronous/Transport/Serialization/SerializerConfigurationTest.php
rename to src/Symfony/Component/Messenger/Tests/Stamp/SerializerStampTest.php
index 6c3e72394db4f..bfe6754dcf280 100644
--- a/src/Symfony/Component/Messenger/Tests/Asynchronous/Transport/Serialization/SerializerConfigurationTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Stamp/SerializerStampTest.php
@@ -12,18 +12,18 @@
 namespace Symfony\Component\Messenger\Tests\Asynchronous\Serialization;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Messenger\Transport\Serialization\SerializerConfiguration;
+use Symfony\Component\Messenger\Stamp\SerializerStamp;
 use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 
 /**
  * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
  */
-class SerializerConfigurationTest extends TestCase
+class SerializerStampTest extends TestCase
 {
     public function testSerializable()
     {
-        $config = new SerializerConfiguration(array(ObjectNormalizer::GROUPS => array('Default', 'Extra')));
+        $stamp = new SerializerStamp(array(ObjectNormalizer::GROUPS => array('Default', 'Extra')));
 
-        $this->assertEquals($config, unserialize(serialize($config)));
+        $this->assertEquals($stamp, unserialize(serialize($stamp)));
     }
 }
diff --git a/src/Symfony/Component/Messenger/Tests/Stamp/ValidationStampTest.php b/src/Symfony/Component/Messenger/Tests/Stamp/ValidationStampTest.php
new file mode 100644
index 0000000000000..cabcf526a3835
--- /dev/null
+++ b/src/Symfony/Component/Messenger/Tests/Stamp/ValidationStampTest.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Messenger\Tests\Stamp;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Messenger\Stamp\ValidationStamp;
+use Symfony\Component\Validator\Constraints\GroupSequence;
+
+/**
+ * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
+ */
+class ValidationStampTest extends TestCase
+{
+    public function testStamp()
+    {
+        $stamp = new ValidationStamp($groups = array('Default', 'Extra'));
+        $this->assertSame($groups, $stamp->getGroups());
+
+        $stamp = new ValidationStamp($groups = new GroupSequence(array('Default', 'Then')));
+        $this->assertSame($groups, $stamp->getGroups());
+    }
+
+    public function testSerializable()
+    {
+        $this->assertEquals($stamp = new ValidationStamp(array('Default', 'Extra')), unserialize(serialize($stamp)));
+        $this->assertEquals($stamp = new ValidationStamp(new GroupSequence(array('Default', 'Then'))), unserialize(serialize($stamp)));
+    }
+}
diff --git a/src/Symfony/Component/Messenger/Tests/TraceableMessageBusTest.php b/src/Symfony/Component/Messenger/Tests/TraceableMessageBusTest.php
index 339dc9ae5264d..8de1ef05208ff 100644
--- a/src/Symfony/Component/Messenger/Tests/TraceableMessageBusTest.php
+++ b/src/Symfony/Component/Messenger/Tests/TraceableMessageBusTest.php
@@ -14,7 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\MessageBusInterface;
-use Symfony\Component\Messenger\Tests\Fixtures\AnEnvelopeItem;
+use Symfony\Component\Messenger\Tests\Fixtures\AnEnvelopeStamp;
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\TraceableMessageBus;
 
@@ -34,7 +34,7 @@ public function testItTracesResult()
         $this->assertArraySubset(array(
             'message' => $message,
             'result' => $result,
-            'envelopeItems' => null,
+            'stamps' => null,
             'caller' => array(
                 'name' => 'TraceableMessageBusTest.php',
                 'file' => __FILE__,
@@ -45,7 +45,7 @@ public function testItTracesResult()
 
     public function testItTracesResultWithEnvelope()
     {
-        $envelope = Envelope::wrap($message = new DummyMessage('Hello'))->with($envelopeItem = new AnEnvelopeItem());
+        $envelope = Envelope::wrap($message = new DummyMessage('Hello'))->with($stamp = new AnEnvelopeStamp());
 
         $bus = $this->getMockBuilder(MessageBusInterface::class)->getMock();
         $bus->expects($this->once())->method('dispatch')->with($envelope)->willReturn($result = array('foo' => 'bar'));
@@ -57,7 +57,7 @@ public function testItTracesResultWithEnvelope()
         $this->assertArraySubset(array(
             'message' => $message,
             'result' => $result,
-            'envelopeItems' => array($envelopeItem),
+            'stamps' => array($stamp),
             'caller' => array(
                 'name' => 'TraceableMessageBusTest.php',
                 'file' => __FILE__,
@@ -86,7 +86,7 @@ public function testItTracesExceptions()
         $this->assertArraySubset(array(
             'message' => $message,
             'exception' => $exception,
-            'envelopeItems' => null,
+            'stamps' => null,
             'caller' => array(
                 'name' => 'TraceableMessageBusTest.php',
                 'file' => __FILE__,
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpExtIntegrationTest.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpExtIntegrationTest.php
index 173fc6d95a974..3abd0bc535442 100644
--- a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpExtIntegrationTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpExtIntegrationTest.php
@@ -101,8 +101,8 @@ public function testItReceivesSignals()
         $this->assertLessThan($amqpReadTimeout, microtime(true) - $signalTime);
         $this->assertSame($expectedOutput.<<<'TXT'
 Get envelope with message: Symfony\Component\Messenger\Tests\Fixtures\DummyMessage
-with items: [
-    "Symfony\\Component\\Messenger\\Asynchronous\\Transport\\ReceivedMessage"
+with stamps: [
+    "Symfony\\Component\\Messenger\\Stamp\\ReceivedStamp"
 ]
 Done.
 
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/Fixtures/long_receiver.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/Fixtures/long_receiver.php
index ca491c41806ce..61a5466033b26 100644
--- a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/Fixtures/long_receiver.php
+++ b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/Fixtures/long_receiver.php
@@ -32,7 +32,7 @@
     public function dispatch($envelope)
     {
         echo 'Get envelope with message: '.get_class($envelope->getMessage())."\n";
-        echo sprintf("with items: %s\n", json_encode(array_keys($envelope->all()), JSON_PRETTY_PRINT));
+        echo sprintf("with stamps: %s\n", json_encode(array_keys($envelope->all()), JSON_PRETTY_PRINT));
 
         sleep(30);
         echo "Done.\n";
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Serialization/SerializerTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Serialization/SerializerTest.php
index 6475c65f7778e..ded634dfd5296 100644
--- a/src/Symfony/Component/Messenger/Tests/Transport/Serialization/SerializerTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Transport/Serialization/SerializerTest.php
@@ -13,10 +13,10 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Envelope;
-use Symfony\Component\Messenger\Middleware\Configuration\ValidationConfiguration;
+use Symfony\Component\Messenger\Stamp\SerializerStamp;
+use Symfony\Component\Messenger\Stamp\ValidationStamp;
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Transport\Serialization\Serializer;
-use Symfony\Component\Messenger\Transport\Serialization\SerializerConfiguration;
 use Symfony\Component\Serializer as SerializerComponent;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
@@ -34,15 +34,15 @@ public function testEncodedIsDecodable()
         $this->assertEquals($envelope, $serializer->decode($serializer->encode($envelope)));
     }
 
-    public function testEncodedWithConfigurationIsDecodable()
+    public function testEncodedWithStampsIsDecodable()
     {
         $serializer = new Serializer(
             new SerializerComponent\Serializer(array(new ObjectNormalizer()), array('json' => new JsonEncoder()))
         );
 
         $envelope = Envelope::wrap(new DummyMessage('Hello'))
-            ->with(new SerializerConfiguration(array(ObjectNormalizer::GROUPS => array('foo'))))
-            ->with(new ValidationConfiguration(array('foo', 'bar')))
+            ->with(new SerializerStamp(array(ObjectNormalizer::GROUPS => array('foo'))))
+            ->with(new ValidationStamp(array('foo', 'bar')))
         ;
 
         $this->assertEquals($envelope, $serializer->decode($serializer->encode($envelope)));
@@ -59,7 +59,6 @@ public function testEncodedIsHavingTheBodyAndTypeHeader()
         $this->assertArrayHasKey('body', $encoded);
         $this->assertArrayHasKey('headers', $encoded);
         $this->assertArrayHasKey('type', $encoded['headers']);
-        $this->assertArrayNotHasKey('X-Message-Envelope-Items', $encoded['headers']);
         $this->assertEquals(DummyMessage::class, $encoded['headers']['type']);
     }
 
@@ -80,7 +79,7 @@ public function testUsesTheCustomFormatAndContext()
         $this->assertSame($message, $decoded->getMessage());
     }
 
-    public function testEncodedWithSymfonySerializerForItems()
+    public function testEncodedWithSymfonySerializerForStamps()
     {
         $serializer = new Serializer(
             new SerializerComponent\Serializer(array(new ObjectNormalizer()), array('json' => new JsonEncoder())),
@@ -89,8 +88,8 @@ public function testEncodedWithSymfonySerializerForItems()
         );
 
         $envelope = Envelope::wrap(new DummyMessage('Hello'))
-            ->with($serializerConfiguration = new SerializerConfiguration(array(ObjectNormalizer::GROUPS => array('foo'))))
-            ->with($validationConfiguration = new ValidationConfiguration(array('foo', 'bar')))
+            ->with($serializerStamp = new SerializerStamp(array(ObjectNormalizer::GROUPS => array('foo'))))
+            ->with($validationStamp = new ValidationStamp(array('foo', 'bar')))
         ;
 
         $encoded = $serializer->encode($envelope);
@@ -98,12 +97,12 @@ public function testEncodedWithSymfonySerializerForItems()
         $this->assertArrayHasKey('body', $encoded);
         $this->assertArrayHasKey('headers', $encoded);
         $this->assertArrayHasKey('type', $encoded['headers']);
-        $this->assertArrayHasKey('X-Message-Envelope-Symfony\Component\Messenger\Transport\Serialization\SerializerConfiguration', $encoded['headers']);
-        $this->assertArrayHasKey('X-Message-Envelope-Symfony\Component\Messenger\Middleware\Configuration\ValidationConfiguration', $encoded['headers']);
+        $this->assertArrayHasKey('X-Message-Stamp-'.SerializerStamp::class, $encoded['headers']);
+        $this->assertArrayHasKey('X-Message-Stamp-'.ValidationStamp::class, $encoded['headers']);
 
         $decoded = $serializer->decode($encoded);
 
-        $this->assertEquals($serializerConfiguration, $decoded->get(SerializerConfiguration::class));
-        $this->assertEquals($validationConfiguration, $decoded->get(ValidationConfiguration::class));
+        $this->assertEquals($serializerStamp, $decoded->get(SerializerStamp::class));
+        $this->assertEquals($validationStamp, $decoded->get(ValidationStamp::class));
     }
 }
diff --git a/src/Symfony/Component/Messenger/Tests/WorkerTest.php b/src/Symfony/Component/Messenger/Tests/WorkerTest.php
index bdfa6fe188d62..2c14d3b024f19 100644
--- a/src/Symfony/Component/Messenger/Tests/WorkerTest.php
+++ b/src/Symfony/Component/Messenger/Tests/WorkerTest.php
@@ -12,9 +12,9 @@
 namespace Symfony\Component\Messenger\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Messenger\Asynchronous\Transport\ReceivedMessage;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\MessageBusInterface;
+use Symfony\Component\Messenger\Stamp\ReceivedStamp;
 use Symfony\Component\Messenger\Tests\Fixtures\CallbackReceiver;
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Worker;
@@ -33,8 +33,8 @@ public function testWorkerDispatchTheReceivedMessage()
 
         $bus = $this->getMockBuilder(MessageBusInterface::class)->getMock();
 
-        $bus->expects($this->at(0))->method('dispatch')->with(Envelope::wrap($apiMessage)->with(new ReceivedMessage()));
-        $bus->expects($this->at(1))->method('dispatch')->with(Envelope::wrap($ipaMessage)->with(new ReceivedMessage()));
+        $bus->expects($this->at(0))->method('dispatch')->with(Envelope::wrap($apiMessage)->with(new ReceivedStamp()));
+        $bus->expects($this->at(1))->method('dispatch')->with(Envelope::wrap($ipaMessage)->with(new ReceivedStamp()));
 
         $worker = new Worker($receiver, $bus);
         $worker->run();
@@ -42,7 +42,7 @@ public function testWorkerDispatchTheReceivedMessage()
 
     public function testWorkerDoesNotWrapMessagesAlreadyWrappedWithReceivedMessage()
     {
-        $envelop = Envelope::wrap(new DummyMessage('API'))->with(new ReceivedMessage());
+        $envelop = Envelope::wrap(new DummyMessage('API'))->with(new ReceivedStamp());
         $receiver = new CallbackReceiver(function ($handler) use ($envelop) {
             $handler($envelop);
         });
diff --git a/src/Symfony/Component/Messenger/TraceableMessageBus.php b/src/Symfony/Component/Messenger/TraceableMessageBus.php
index 2204f4e41ae2b..3efeaba94558b 100644
--- a/src/Symfony/Component/Messenger/TraceableMessageBus.php
+++ b/src/Symfony/Component/Messenger/TraceableMessageBus.php
@@ -32,13 +32,13 @@ public function dispatch($message)
         $caller = $this->getCaller();
         $callTime = microtime(true);
         $messageToTrace = $message instanceof Envelope ? $message->getMessage() : $message;
-        $envelopeItems = $message instanceof Envelope ? array_values($message->all()) : null;
+        $stamps = $message instanceof Envelope ? array_values($message->all()) : null;
 
         try {
             $result = $this->decoratedBus->dispatch($message);
 
             $this->dispatchedMessages[] = array(
-                'envelopeItems' => $envelopeItems,
+                'stamps' => $stamps,
                 'message' => $messageToTrace,
                 'result' => $result,
                 'callTime' => $callTime,
@@ -48,7 +48,7 @@ public function dispatch($message)
             return $result;
         } catch (\Throwable $e) {
             $this->dispatchedMessages[] = array(
-                'envelopeItems' => $envelopeItems,
+                'stamps' => $stamps,
                 'message' => $messageToTrace,
                 'exception' => $e,
                 'callTime' => $callTime,
diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php b/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php
index 2087503e5086c..aecfc82fa044d 100644
--- a/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php
+++ b/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Exception\InvalidArgumentException;
 use Symfony\Component\Messenger\Exception\LogicException;
+use Symfony\Component\Messenger\Stamp\SerializerStamp;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\Encoder\XmlEncoder;
 use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
@@ -62,17 +63,17 @@ public function decode(array $encodedEnvelope): Envelope
             throw new InvalidArgumentException('Encoded envelope does not have a "type" header.');
         }
 
-        $envelopeItems = $this->decodeEnvelopeItems($encodedEnvelope);
+        $stamps = $this->decodeStamps($encodedEnvelope);
 
         $context = $this->context;
-        /** @var SerializerConfiguration|null $serializerConfig */
-        if ($serializerConfig = $envelopeItems[SerializerConfiguration::class] ?? null) {
-            $context = $serializerConfig->getContext() + $context;
+        /** @var SerializerStamp|null $serializerStamp */
+        if ($serializerStamp = $stamps[SerializerStamp::class] ?? null) {
+            $context = $serializerStamp->getContext() + $context;
         }
 
         $message = $this->serializer->deserialize($encodedEnvelope['body'], $encodedEnvelope['headers']['type'], $this->format, $context);
 
-        return new Envelope($message, $envelopeItems);
+        return new Envelope($message, ...$stamps);
     }
 
     /**
@@ -81,12 +82,12 @@ public function decode(array $encodedEnvelope): Envelope
     public function encode(Envelope $envelope): array
     {
         $context = $this->context;
-        /** @var SerializerConfiguration|null $serializerConfig */
-        if ($serializerConfig = $envelope->get(SerializerConfiguration::class)) {
-            $context = $serializerConfig->getContext() + $context;
+        /** @var SerializerStamp|null $serializerStamp */
+        if ($serializerStamp = $envelope->get(SerializerStamp::class)) {
+            $context = $serializerStamp->getContext() + $context;
         }
 
-        $headers = array('type' => \get_class($envelope->getMessage())) + $this->encodeEnvelopeItems($envelope);
+        $headers = array('type' => \get_class($envelope->getMessage())) + $this->encodeStamps($envelope);
 
         return array(
             'body' => $this->serializer->serialize($envelope->getMessage(), $this->format, $context),
@@ -94,29 +95,30 @@ public function encode(Envelope $envelope): array
         );
     }
 
-    private function decodeEnvelopeItems($encodedEnvelope)
+    private function decodeStamps($encodedEnvelope)
     {
-        $items = array();
+        $prefix = 'X-Message-Stamp-';
+        $stamps = array();
         foreach ($encodedEnvelope['headers'] as $name => $value) {
-            if (0 !== strpos($name, $prefix = 'X-Message-Envelope-')) {
+            if (0 !== strpos($name, $prefix)) {
                 continue;
             }
 
-            $items[] = $this->serializer->deserialize($value, substr($name, \strlen($prefix)), $this->format, $this->context);
+            $stamps[] = $this->serializer->deserialize($value, substr($name, \strlen($prefix)), $this->format, $this->context);
         }
 
-        return $items;
+        return $stamps;
     }
 
-    private function encodeEnvelopeItems(Envelope $envelope)
+    private function encodeStamps(Envelope $envelope)
     {
-        if (!$configurations = $envelope->all()) {
+        if (!$stamps = $envelope->all()) {
             return array();
         }
 
         $headers = array();
-        foreach ($configurations as $configuration) {
-            $headers['X-Message-Envelope-'.\get_class($configuration)] = $this->serializer->serialize($configuration, $this->format, $this->context);
+        foreach ($stamps as $stamp) {
+            $headers['X-Message-Stamp-'.\get_class($stamp)] = $this->serializer->serialize($stamp, $this->format, $this->context);
         }
 
         return $headers;
diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/SerializerInterface.php b/src/Symfony/Component/Messenger/Transport/Serialization/SerializerInterface.php
index c93522c51d7ad..2f826e2215000 100644
--- a/src/Symfony/Component/Messenger/Transport/Serialization/SerializerInterface.php
+++ b/src/Symfony/Component/Messenger/Transport/Serialization/SerializerInterface.php
@@ -31,7 +31,7 @@ interface SerializerInterface
     public function decode(array $encodedEnvelope): Envelope;
 
     /**
-     * Encodes an envelope content (message & items) to a common format understandable by transports.
+     * Encodes an envelope content (message & stamps) to a common format understandable by transports.
      * The encoded array should only contain scalars and arrays.
      *
      * The most common keys of the encoded array are:
diff --git a/src/Symfony/Component/Messenger/Worker.php b/src/Symfony/Component/Messenger/Worker.php
index 5d5da9eb77794..86e882970cdbc 100644
--- a/src/Symfony/Component/Messenger/Worker.php
+++ b/src/Symfony/Component/Messenger/Worker.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Messenger;
 
-use Symfony\Component\Messenger\Asynchronous\Transport\ReceivedMessage;
+use Symfony\Component\Messenger\Stamp\ReceivedStamp;
 use Symfony\Component\Messenger\Transport\ReceiverInterface;
 
 /**
@@ -44,7 +44,7 @@ public function run()
                 return;
             }
 
-            $this->bus->dispatch($envelope->with(new ReceivedMessage()));
+            $this->bus->dispatch($envelope->with(new ReceivedStamp()));
         });
     }
 }

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/28911.diff" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/28911.diff" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/28911.diff" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/28911.diff" target="_blank">pFad v4 Proxy</a></p></body>
</html>