diff --git a/legacy/application/models/RabbitMq.php b/legacy/application/models/RabbitMq.php
index a6303e5b5..86dff6088 100644
--- a/legacy/application/models/RabbitMq.php
+++ b/legacy/application/models/RabbitMq.php
@@ -55,7 +55,7 @@ class Application_Model_RabbitMq
     {
         $md['event_type'] = $event_type;
 
-        $exchange = 'airtime-pypo';
+        $exchange = 'playout';
         $data = json_encode($md, JSON_FORCE_OBJECT);
         self::sendMessage($exchange, 'fanout', true, $data);
     }
@@ -71,7 +71,7 @@ class Application_Model_RabbitMq
 
     public static function SendMessageToShowRecorder($event_type)
     {
-        $exchange = 'airtime-pypo';
+        $exchange = 'playout';
 
         $now = new DateTime('@' . time()); // in UTC timezone
         $end_timestamp = new DateTime('@' . (time() + 3600 * 2)); // in UTC timezone
diff --git a/playout/libretime_playout/message_handler.py b/playout/libretime_playout/message_handler.py
index 5f524b80c..9b870bbf1 100644
--- a/playout/libretime_playout/message_handler.py
+++ b/playout/libretime_playout/message_handler.py
@@ -27,7 +27,7 @@ class MessageHandler(ConsumerMixin):
         self.fetch_queue = fetch_queue
 
     def get_consumers(self, Consumer, channel):
-        exchange = Exchange("airtime-pypo", "fanout", durable=True, auto_delete=True)
+        exchange = Exchange("playout", "fanout", durable=True, auto_delete=True)
         # RabbitMQ says to avoid temporary queues with well-known names
         # https://www.rabbitmq.com/docs/queues#shared-temporary-queues
         # A server named queue that expires is used so that if the service