diff --git a/src/Repository.php b/src/Repository.php
index 44902c3..daec3d6 100644
--- a/src/Repository.php
+++ b/src/Repository.php
@@ -119,7 +119,7 @@ public function __construct(
             $this->repositoryMapping[$repository->getType()] = $repository;
         }
 
-        $dispatcher->dispatch('makaira.connect.repository', new Event\RepositoryCollectEvent($this));
+        $dispatcher->dispatch(new Event\RepositoryCollectEvent($this), 'makaira.connect.repository');
     }
 
     /**
diff --git a/src/Repository/ModifierList.php b/src/Repository/ModifierList.php
index 230d412..6744604 100644
--- a/src/Repository/ModifierList.php
+++ b/src/Repository/ModifierList.php
@@ -19,7 +19,7 @@ abstract class ModifierList
     public function __construct(string $tag, EventDispatcherInterface $dispatcher, array $modifiers)
     {
         $this->modifiers = $modifiers;
-        $dispatcher->dispatch($tag, new ModifierCollectEvent($this));
+        $dispatcher->dispatch(new ModifierCollectEvent($this), $tag);
     }
 
     /**