diff --git a/bootstrap.php b/bootstrap.php
index b2b14fc..a2c399f 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -13,10 +13,10 @@
 use CultuurNet\UDB3\EventSourcing\ExecutionContextMetadataEnricher;
 use CultuurNet\UDB3\LabelCollection;
 use CultuurNet\UDB3\SimpleEventBus;
-use CultuurNet\UDB3\UiTPASService\Command\RemotelySyncUiTPASCommandHandler;
+use CultuurNet\UDB3\UiTPASService\Sync\SyncCommandHandler;
 use CultuurNet\UDB3\UiTPASService\EventStoreSchemaConfigurator;
 use CultuurNet\UDB3\UiTPASService\Specification\IsUiTPASOrganizerAccordingToJSONLD;
-use CultuurNet\UDB3\UiTPASService\UiTPASAggregateRepository;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\UiTPASAggregateRepository;
 use CultuurNet\UDB3\UiTPASService\UiTPASEventSaga;
 use DerAlex\Silex\YamlConfigServiceProvider;
 use Monolog\Handler\StreamHandler;
@@ -376,7 +376,7 @@ function (Application $app) {
 
 $app['uitpas_sync_command_handler'] = $app->share(
     function (Application $app) {
-        return new RemotelySyncUiTPASCommandHandler(
+        return new SyncCommandHandler(
             $app['culturefeed_uitpas_client']
         );
     }
diff --git a/src/Command/RemotelyRegisterUiTPASEvent.php b/src/Command/RemotelyRegisterUiTPASEvent.php
deleted file mode 100644
index 19da035..0000000
--- a/src/Command/RemotelyRegisterUiTPASEvent.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace CultuurNet\UDB3\UiTPASService\Command;
-
-class RemotelyRegisterUiTPASEvent extends RemotelySyncUiTPASEvent
-{
-}
diff --git a/src/Command/RemotelyUpdateUiTPASEvent.php b/src/Command/RemotelyUpdateUiTPASEvent.php
deleted file mode 100644
index 538b1f9..0000000
--- a/src/Command/RemotelyUpdateUiTPASEvent.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace CultuurNet\UDB3\UiTPASService\Command;
-
-class RemotelyUpdateUiTPASEvent extends RemotelySyncUiTPASEvent
-{
-}
diff --git a/src/Sync/Command/RegisterUiTPASEvent.php b/src/Sync/Command/RegisterUiTPASEvent.php
new file mode 100644
index 0000000..1cb2fe7
--- /dev/null
+++ b/src/Sync/Command/RegisterUiTPASEvent.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace CultuurNet\UDB3\UiTPASService\Sync\Command;
+
+class RegisterUiTPASEvent extends SyncUiTPASEvent
+{
+}
diff --git a/src/Command/RemotelySyncUiTPASEvent.php b/src/Sync/Command/SyncUiTPASEvent.php
similarity index 93%
rename from src/Command/RemotelySyncUiTPASEvent.php
rename to src/Sync/Command/SyncUiTPASEvent.php
index e767cc5..bfea823 100644
--- a/src/Command/RemotelySyncUiTPASEvent.php
+++ b/src/Sync/Command/SyncUiTPASEvent.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace CultuurNet\UDB3\UiTPASService\Command;
+namespace CultuurNet\UDB3\UiTPASService\Sync\Command;
 
 use CultuurNet\UDB3\PriceInfo\PriceInfo;
 
-abstract class RemotelySyncUiTPASEvent
+abstract class SyncUiTPASEvent
 {
     /**
      * @var string
diff --git a/src/Sync/Command/UpdateUiTPASEvent.php b/src/Sync/Command/UpdateUiTPASEvent.php
new file mode 100644
index 0000000..a8eee97
--- /dev/null
+++ b/src/Sync/Command/UpdateUiTPASEvent.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace CultuurNet\UDB3\UiTPASService\Sync\Command;
+
+class UpdateUiTPASEvent extends SyncUiTPASEvent
+{
+}
diff --git a/src/Command/RemotelySyncUiTPASCommandHandler.php b/src/Sync/SyncCommandHandler.php
similarity index 85%
rename from src/Command/RemotelySyncUiTPASCommandHandler.php
rename to src/Sync/SyncCommandHandler.php
index 12c5166..c7627bb 100644
--- a/src/Command/RemotelySyncUiTPASCommandHandler.php
+++ b/src/Sync/SyncCommandHandler.php
@@ -3,18 +3,21 @@
  * @file
  */
 
-namespace CultuurNet\UDB3\UiTPASService\Command;
+namespace CultuurNet\UDB3\UiTPASService\Sync;
 
 use Broadway\CommandHandling\CommandHandler;
 use CultureFeed_Uitpas;
 use CultureFeed_Uitpas_DistributionKey;
 use CultureFeed_Uitpas_Event_CultureEvent;
+use CultuurNet\UDB3\UiTPASService\Sync\Command\RegisterUiTPASEvent;
+use CultuurNet\UDB3\UiTPASService\Sync\Command\SyncUiTPASEvent;
+use CultuurNet\UDB3\UiTPASService\Sync\Command\UpdateUiTPASEvent;
 use Exception;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\NullLogger;
 
-class RemotelySyncUiTPASCommandHandler extends CommandHandler implements LoggerAwareInterface
+class SyncCommandHandler extends CommandHandler implements LoggerAwareInterface
 {
     use LoggerAwareTrait;
 
@@ -30,31 +33,31 @@ public function __construct(CultureFeed_Uitpas $culturefeedClient)
     }
 
     /**
-     * @param RemotelyRegisterUiTPASEvent $command
+     * @param RegisterUiTPASEvent $command
      */
     protected function handleRemotelyRegisterUiTPASEvent(
-        RemotelyRegisterUiTPASEvent $command
+        RegisterUiTPASEvent $command
     ) {
         $event = $this->buildEvent($command);
         $this->syncEvent($event, ['registerEvent', 'updateEvent']);
     }
 
     /**
-     * @param RemotelyUpdateUiTPASEvent $command
+     * @param UpdateUiTPASEvent $command
      */
     protected function handleRemotelyUpdateUiTPASEvent(
-        RemotelyUpdateUiTPASEvent $command
+        UpdateUiTPASEvent $command
     ) {
         $event = $this->buildEvent($command);
         $this->syncEvent($event, ['updateEvent', 'registerEvent']);
     }
 
     /**
-     * @var RemotelySyncUiTPASEvent $command
+     * @var SyncUiTPASEvent $command
      *
      * @return CultureFeed_Uitpas_Event_CultureEvent
      */
-    private function buildEvent(RemotelySyncUiTPASEvent $command)
+    private function buildEvent(SyncUiTPASEvent $command)
     {
         $event = new CultureFeed_Uitpas_Event_CultureEvent();
         $event->cdbid = $command->getEventId();
diff --git a/src/Command/ClearDistributionKeys.php b/src/UiTPASAggregate/Command/ClearDistributionKeys.php
similarity index 84%
rename from src/Command/ClearDistributionKeys.php
rename to src/UiTPASAggregate/Command/ClearDistributionKeys.php
index d97a048..8e1e107 100644
--- a/src/Command/ClearDistributionKeys.php
+++ b/src/UiTPASAggregate/Command/ClearDistributionKeys.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CultuurNet\UDB3\UiTPASService\Command;
+namespace CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Command;
 
 class ClearDistributionKeys
 {
diff --git a/src/Command/CreateUiTPASAggregate.php b/src/UiTPASAggregate/Command/CreateUiTPASAggregate.php
similarity index 91%
rename from src/Command/CreateUiTPASAggregate.php
rename to src/UiTPASAggregate/Command/CreateUiTPASAggregate.php
index 6742f52..2c43d3e 100644
--- a/src/Command/CreateUiTPASAggregate.php
+++ b/src/UiTPASAggregate/Command/CreateUiTPASAggregate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CultuurNet\UDB3\UiTPASService\Command;
+namespace CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Command;
 
 class CreateUiTPASAggregate
 {
diff --git a/src/Command/UpdateDistributionKeys.php b/src/UiTPASAggregate/Command/UpdateDistributionKeys.php
similarity index 91%
rename from src/Command/UpdateDistributionKeys.php
rename to src/UiTPASAggregate/Command/UpdateDistributionKeys.php
index 1cc5362..b4b8e8c 100644
--- a/src/Command/UpdateDistributionKeys.php
+++ b/src/UiTPASAggregate/Command/UpdateDistributionKeys.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CultuurNet\UDB3\UiTPASService\Command;
+namespace CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Command;
 
 class UpdateDistributionKeys
 {
diff --git a/src/Event/AbstractUiTPASAggregateEvent.php b/src/UiTPASAggregate/Event/AbstractUiTPASAggregateEvent.php
similarity index 86%
rename from src/Event/AbstractUiTPASAggregateEvent.php
rename to src/UiTPASAggregate/Event/AbstractUiTPASAggregateEvent.php
index e1b8eb9..2581b98 100644
--- a/src/Event/AbstractUiTPASAggregateEvent.php
+++ b/src/UiTPASAggregate/Event/AbstractUiTPASAggregateEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CultuurNet\UDB3\UiTPASService\Event;
+namespace CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Event;
 
 abstract class AbstractUiTPASAggregateEvent
 {
diff --git a/src/Event/DistributionKeysCleared.php b/src/UiTPASAggregate/Event/DistributionKeysCleared.php
similarity index 55%
rename from src/Event/DistributionKeysCleared.php
rename to src/UiTPASAggregate/Event/DistributionKeysCleared.php
index 62fda5a..011981a 100644
--- a/src/Event/DistributionKeysCleared.php
+++ b/src/UiTPASAggregate/Event/DistributionKeysCleared.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CultuurNet\UDB3\UiTPASService\Event;
+namespace CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Event;
 
 class DistributionKeysCleared extends AbstractUiTPASAggregateEvent
 {
diff --git a/src/Event/DistributionKeysUpdated.php b/src/UiTPASAggregate/Event/DistributionKeysUpdated.php
similarity index 90%
rename from src/Event/DistributionKeysUpdated.php
rename to src/UiTPASAggregate/Event/DistributionKeysUpdated.php
index 45401ab..3ffb6b4 100644
--- a/src/Event/DistributionKeysUpdated.php
+++ b/src/UiTPASAggregate/Event/DistributionKeysUpdated.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CultuurNet\UDB3\UiTPASService\Event;
+namespace CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Event;
 
 class DistributionKeysUpdated extends AbstractUiTPASAggregateEvent
 {
diff --git a/src/Event/UiTPASAggregateCreated.php b/src/UiTPASAggregate/Event/UiTPASAggregateCreated.php
similarity index 89%
rename from src/Event/UiTPASAggregateCreated.php
rename to src/UiTPASAggregate/Event/UiTPASAggregateCreated.php
index da9c539..ccdb3ac 100644
--- a/src/Event/UiTPASAggregateCreated.php
+++ b/src/UiTPASAggregate/Event/UiTPASAggregateCreated.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CultuurNet\UDB3\UiTPASService\Event;
+namespace CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Event;
 
 class UiTPASAggregateCreated extends AbstractUiTPASAggregateEvent
 {
diff --git a/src/UiTPASAggregate.php b/src/UiTPASAggregate/UiTPASAggregate.php
similarity index 88%
rename from src/UiTPASAggregate.php
rename to src/UiTPASAggregate/UiTPASAggregate.php
index fd55640..c3b95b1 100644
--- a/src/UiTPASAggregate.php
+++ b/src/UiTPASAggregate/UiTPASAggregate.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace CultuurNet\UDB3\UiTPASService;
+namespace CultuurNet\UDB3\UiTPASService\UiTPASAggregate;
 
 use Broadway\EventSourcing\EventSourcedAggregateRoot;
-use CultuurNet\UDB3\UiTPASService\Event\DistributionKeysCleared;
-use CultuurNet\UDB3\UiTPASService\Event\DistributionKeysUpdated;
-use CultuurNet\UDB3\UiTPASService\Event\UiTPASAggregateCreated;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Event\DistributionKeysCleared;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Event\DistributionKeysUpdated;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Event\UiTPASAggregateCreated;
 
 class UiTPASAggregate extends EventSourcedAggregateRoot
 {
diff --git a/src/UiTPASAggregateCommandHandler.php b/src/UiTPASAggregate/UiTPASAggregateCommandHandler.php
similarity index 89%
rename from src/UiTPASAggregateCommandHandler.php
rename to src/UiTPASAggregate/UiTPASAggregateCommandHandler.php
index 2be1d27..69f3ff0 100644
--- a/src/UiTPASAggregateCommandHandler.php
+++ b/src/UiTPASAggregate/UiTPASAggregateCommandHandler.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace CultuurNet\UDB3\UiTPASService;
+namespace CultuurNet\UDB3\UiTPASService\UiTPASAggregate;
 
 use Broadway\CommandHandling\CommandHandlerInterface;
 use Broadway\Repository\RepositoryInterface;
-use CultuurNet\UDB3\UiTPASService\Command\ClearDistributionKeys;
-use CultuurNet\UDB3\UiTPASService\Command\CreateUiTPASAggregate;
-use CultuurNet\UDB3\UiTPASService\Command\UpdateDistributionKeys;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Command\ClearDistributionKeys;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Command\CreateUiTPASAggregate;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Command\UpdateDistributionKeys;
 
 class UiTPASAggregateCommandHandler implements CommandHandlerInterface
 {
diff --git a/src/UiTPASAggregateRepository.php b/src/UiTPASAggregate/UiTPASAggregateRepository.php
similarity index 93%
rename from src/UiTPASAggregateRepository.php
rename to src/UiTPASAggregate/UiTPASAggregateRepository.php
index 6631974..296d2c0 100644
--- a/src/UiTPASAggregateRepository.php
+++ b/src/UiTPASAggregate/UiTPASAggregateRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CultuurNet\UDB3\UiTPASService;
+namespace CultuurNet\UDB3\UiTPASService\UiTPASAggregate;
 
 use Broadway\EventHandling\EventBusInterface;
 use Broadway\EventSourcing\AggregateFactory\PublicConstructorAggregateFactory;
diff --git a/src/UiTPASEventSaga.php b/src/UiTPASEventSaga.php
index 1e5ad7b..cf5019e 100644
--- a/src/UiTPASEventSaga.php
+++ b/src/UiTPASEventSaga.php
@@ -13,14 +13,14 @@
 use CultuurNet\UDB3\Event\Events\PriceInfoUpdated;
 use CultuurNet\UDB3\Offer\Events\AbstractEvent;
 use CultuurNet\UDB3\PriceInfo\PriceInfo;
-use CultuurNet\UDB3\UiTPASService\Command\ClearDistributionKeys;
-use CultuurNet\UDB3\UiTPASService\Command\CreateUiTPASAggregate;
-use CultuurNet\UDB3\UiTPASService\Command\RemotelyRegisterUiTPASEvent;
-use CultuurNet\UDB3\UiTPASService\Command\RemotelyUpdateUiTPASEvent;
-use CultuurNet\UDB3\UiTPASService\Event\AbstractUiTPASAggregateEvent;
-use CultuurNet\UDB3\UiTPASService\Event\DistributionKeysCleared;
-use CultuurNet\UDB3\UiTPASService\Event\DistributionKeysUpdated;
-use CultuurNet\UDB3\UiTPASService\Event\UiTPASAggregateCreated;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Command\ClearDistributionKeys;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Command\CreateUiTPASAggregate;
+use CultuurNet\UDB3\UiTPASService\Sync\Command\RegisterUiTPASEvent;
+use CultuurNet\UDB3\UiTPASService\Sync\Command\UpdateUiTPASEvent;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Event\AbstractUiTPASAggregateEvent;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Event\DistributionKeysCleared;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Event\DistributionKeysUpdated;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Event\UiTPASAggregateCreated;
 use CultuurNet\UDB3\UiTPASService\Specification\OrganizerSpecificationInterface;
 
 class UiTPASEventSaga extends Saga implements StaticallyConfiguredSagaInterface
@@ -207,14 +207,14 @@ private function triggerSyncWhenConditionsAreMet(State $state)
                 new CreateUiTPASAggregate($aggregateId, $distributionKeyIds)
             );
 
-            $syncCommand = new RemotelyRegisterUiTPASEvent(
+            $syncCommand = new RegisterUiTPASEvent(
                 $aggregateId,
                 $organizerId,
                 $priceInfo,
                 $distributionKeyIds
             );
         } else {
-            $syncCommand = new RemotelyUpdateUiTPASEvent(
+            $syncCommand = new UpdateUiTPASEvent(
                 $aggregateId,
                 $organizerId,
                 $priceInfo,
diff --git a/tests/UiTPASAggregateCommandHandlerTest.php b/tests/UiTPASAggregate/UiTPASAggregateCommandHandlerTest.php
similarity index 86%
rename from tests/UiTPASAggregateCommandHandlerTest.php
rename to tests/UiTPASAggregate/UiTPASAggregateCommandHandlerTest.php
index 3bbdc3e..5a0c5eb 100644
--- a/tests/UiTPASAggregateCommandHandlerTest.php
+++ b/tests/UiTPASAggregate/UiTPASAggregateCommandHandlerTest.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace CultuurNet\UDB3\UiTPASService;
+namespace CultuurNet\UDB3\UiTPASService\UiTPASAggregate;
 
 use Broadway\CommandHandling\CommandHandlerInterface;
 use Broadway\CommandHandling\Testing\CommandHandlerScenarioTestCase;
 use Broadway\EventHandling\EventBusInterface;
 use Broadway\EventStore\EventStoreInterface;
-use CultuurNet\UDB3\UiTPASService\Command\ClearDistributionKeys;
-use CultuurNet\UDB3\UiTPASService\Command\CreateUiTPASAggregate;
-use CultuurNet\UDB3\UiTPASService\Command\UpdateDistributionKeys;
-use CultuurNet\UDB3\UiTPASService\Event\DistributionKeysCleared;
-use CultuurNet\UDB3\UiTPASService\Event\DistributionKeysUpdated;
-use CultuurNet\UDB3\UiTPASService\Event\UiTPASAggregateCreated;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Command\ClearDistributionKeys;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Command\CreateUiTPASAggregate;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Command\UpdateDistributionKeys;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Event\DistributionKeysCleared;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Event\DistributionKeysUpdated;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Event\UiTPASAggregateCreated;
 
 class UiTPASAggregateCommandHandlerTest extends CommandHandlerScenarioTestCase
 {
diff --git a/tests/UiTPASEventSagaTest.php b/tests/UiTPASEventSagaTest.php
index 6472c4f..3b73195 100644
--- a/tests/UiTPASEventSagaTest.php
+++ b/tests/UiTPASEventSagaTest.php
@@ -27,13 +27,13 @@
 use CultuurNet\UDB3\PriceInfo\PriceInfo;
 use CultuurNet\UDB3\PriceInfo\Tariff;
 use CultuurNet\UDB3\Title;
-use CultuurNet\UDB3\UiTPASService\Command\ClearDistributionKeys;
-use CultuurNet\UDB3\UiTPASService\Command\CreateUiTPASAggregate;
-use CultuurNet\UDB3\UiTPASService\Command\RemotelyRegisterUiTPASEvent;
-use CultuurNet\UDB3\UiTPASService\Command\RemotelyUpdateUiTPASEvent;
-use CultuurNet\UDB3\UiTPASService\Event\DistributionKeysCleared;
-use CultuurNet\UDB3\UiTPASService\Event\DistributionKeysUpdated;
-use CultuurNet\UDB3\UiTPASService\Event\UiTPASAggregateCreated;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Command\ClearDistributionKeys;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Command\CreateUiTPASAggregate;
+use CultuurNet\UDB3\UiTPASService\Sync\Command\RegisterUiTPASEvent;
+use CultuurNet\UDB3\UiTPASService\Sync\Command\UpdateUiTPASEvent;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Event\DistributionKeysCleared;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Event\DistributionKeysUpdated;
+use CultuurNet\UDB3\UiTPASService\UiTPASAggregate\Event\UiTPASAggregateCreated;
 use CultuurNet\UDB3\UiTPASService\Specification\OrganizerSpecificationInterface;
 use ValueObjects\Geography\Country;
 use ValueObjects\Money\Currency;
@@ -202,7 +202,7 @@ public function it_creates_an_uitpas_aggregate_and_registers_an_uitpas_event_whe
             ->then(
                 [
                     new CreateUiTPASAggregate($this->eventId, []),
-                    new RemotelyRegisterUiTPASEvent(
+                    new RegisterUiTPASEvent(
                         new StringLiteral($this->eventId),
                         new StringLiteral($this->uitpasOrganizerId),
                         $this->priceInfo
@@ -227,7 +227,7 @@ public function it_creates_an_uitpas_aggregate_and_registers_an_uitpas_event_whe
             ->then(
                 [
                     new CreateUiTPASAggregate($this->eventId, []),
-                    new RemotelyRegisterUiTPASEvent(
+                    new RegisterUiTPASEvent(
                         new StringLiteral($this->eventId),
                         new StringLiteral($this->uitpasOrganizerId),
                         $this->priceInfo
@@ -284,7 +284,7 @@ public function it_updates_an_uitpas_event_when_it_has_a_new_uitpas_organizer()
             ->when(new OrganizerUpdated($this->eventId, $this->updatedUitpasOrganizerId))
             ->then(
                 [
-                    new RemotelyUpdateUiTPASEvent(
+                    new UpdateUiTPASEvent(
                         $this->eventId,
                         $this->updatedUitpasOrganizerId,
                         $this->priceInfo
@@ -318,7 +318,7 @@ public function it_updates_an_uitpas_event_when_it_has_new_price_info()
             ->when(new PriceInfoUpdated($this->eventId, $updatedPriceInfo))
             ->then(
                 [
-                    new RemotelyUpdateUiTPASEvent(
+                    new UpdateUiTPASEvent(
                         $this->eventId,
                         $this->uitpasOrganizerId,
                         $updatedPriceInfo
@@ -373,7 +373,7 @@ public function it_updates_the_uitpas_event_with_distribution_keys_when_the_uitp
             )
             ->then(
                 [
-                    new RemotelyUpdateUiTPASEvent(
+                    new UpdateUiTPASEvent(
                         $this->eventId,
                         $this->uitpasOrganizerId,
                         $this->priceInfo,
@@ -405,7 +405,7 @@ public function it_updates_the_uitpas_event_when_the_distribution_keys_on_the_ui
             )
             ->then(
                 [
-                    new RemotelyUpdateUiTPASEvent(
+                    new UpdateUiTPASEvent(
                         $this->eventId,
                         $this->uitpasOrganizerId,
                         $this->priceInfo,
@@ -434,7 +434,7 @@ public function it_updates_the_uitpas_event_when_the_distribution_keys_on_the_ui
             )
             ->then(
                 [
-                    new RemotelyUpdateUiTPASEvent(
+                    new UpdateUiTPASEvent(
                         $this->eventId,
                         $this->uitpasOrganizerId,
                         $this->priceInfo,
@@ -466,7 +466,7 @@ public function it_clears_the_distribution_keys_if_the_organizer_is_changed()
             )
             ->then(
                 [
-                    new RemotelyUpdateUiTPASEvent(
+                    new UpdateUiTPASEvent(
                         $this->eventId,
                         $this->updatedUitpasOrganizerId,
                         $this->priceInfo,