diff --git a/src/Admin/Controller/FrontendController.php b/src/Admin/Controller/FrontendController.php
index cac26120e..1ae262cbf 100644
--- a/src/Admin/Controller/FrontendController.php
+++ b/src/Admin/Controller/FrontendController.php
@@ -63,7 +63,7 @@ class FrontendController extends AbstractFrontendController
 
         $settings = $this->settings->all();
 
-        $this->events->fire(
+        $this->events->dispatch(
             new Deserializing($settings)
         );
 
diff --git a/src/Api/Controller/AbstractSerializeController.php b/src/Api/Controller/AbstractSerializeController.php
index a7ea98986..d51fa6d00 100644
--- a/src/Api/Controller/AbstractSerializeController.php
+++ b/src/Api/Controller/AbstractSerializeController.php
@@ -90,13 +90,13 @@ abstract class AbstractSerializeController implements ControllerInterface
     {
         $document = new Document;
 
-        static::$events->fire(
+        static::$events->dispatch(
             new WillGetData($this)
         );
 
         $data = $this->data($request, $document);
 
-        static::$events->fire(
+        static::$events->dispatch(
             new WillSerializeData($this, $data, $request, $document)
         );
 
diff --git a/src/Api/Controller/SetSettingsController.php b/src/Api/Controller/SetSettingsController.php
index f98d4645f..19ddb21ae 100644
--- a/src/Api/Controller/SetSettingsController.php
+++ b/src/Api/Controller/SetSettingsController.php
@@ -53,11 +53,11 @@ class SetSettingsController implements ControllerInterface
         $settings = $request->getParsedBody();
 
         foreach ($settings as $k => $v) {
-            $this->dispatcher->fire(new Serializing($k, $v));
+            $this->dispatcher->dispatch(new Serializing($k, $v));
 
             $this->settings->set($k, $v);
 
-            $this->dispatcher->fire(new Saved($k, $v));
+            $this->dispatcher->dispatch(new Saved($k, $v));
         }
 
         return new EmptyResponse(204);
diff --git a/src/Api/Serializer/AbstractSerializer.php b/src/Api/Serializer/AbstractSerializer.php
index 279c976a5..160fa25e9 100644
--- a/src/Api/Serializer/AbstractSerializer.php
+++ b/src/Api/Serializer/AbstractSerializer.php
@@ -70,7 +70,7 @@ abstract class AbstractSerializer extends BaseAbstractSerializer
 
         $attributes = $this->getDefaultAttributes($model);
 
-        static::$dispatcher->fire(
+        static::$dispatcher->dispatch(
             new Serializing($this, $model, $attributes)
         );
 
diff --git a/src/Database/AbstractModel.php b/src/Database/AbstractModel.php
index 5b0b3296d..87dd072df 100644
--- a/src/Database/AbstractModel.php
+++ b/src/Database/AbstractModel.php
@@ -75,7 +75,7 @@ abstract class AbstractModel extends Eloquent
     {
         $defaults = [];
 
-        static::$dispatcher->fire(
+        static::$dispatcher->dispatch(
             new ConfigureModelDefaultAttributes($this, $defaults)
         );
 
@@ -96,7 +96,7 @@ abstract class AbstractModel extends Eloquent
         $class = get_class($this);
 
         if (! isset($dates[$class])) {
-            static::$dispatcher->fire(
+            static::$dispatcher->dispatch(
                 new ConfigureModelDates($this, $this->dates)
             );
 
diff --git a/src/Database/ScopeVisibilityTrait.php b/src/Database/ScopeVisibilityTrait.php
index 62d73c028..9c407c039 100644
--- a/src/Database/ScopeVisibilityTrait.php
+++ b/src/Database/ScopeVisibilityTrait.php
@@ -25,7 +25,7 @@ trait ScopeVisibilityTrait
      */
     public function scopeWhereVisibleTo(Builder $query, User $actor)
     {
-        static::$dispatcher->fire(
+        static::$dispatcher->dispatch(
             new ScopeModelVisibility($query, $actor, 'view')
         );
     }
diff --git a/src/Discussion/Command/DeleteDiscussionHandler.php b/src/Discussion/Command/DeleteDiscussionHandler.php
index de0bb03b3..fd951c2a3 100644
--- a/src/Discussion/Command/DeleteDiscussionHandler.php
+++ b/src/Discussion/Command/DeleteDiscussionHandler.php
@@ -51,7 +51,7 @@ class DeleteDiscussionHandler
 
         $this->assertCan($actor, 'delete', $discussion);
 
-        $this->events->fire(
+        $this->events->dispatch(
             new Deleting($discussion, $actor, $command->data)
         );
 
diff --git a/src/Discussion/Command/EditDiscussionHandler.php b/src/Discussion/Command/EditDiscussionHandler.php
index 42e38f9e9..87bd0284f 100644
--- a/src/Discussion/Command/EditDiscussionHandler.php
+++ b/src/Discussion/Command/EditDiscussionHandler.php
@@ -74,7 +74,7 @@ class EditDiscussionHandler
             }
         }
 
-        $this->events->fire(
+        $this->events->dispatch(
             new Saving($discussion, $actor, $data)
         );
 
diff --git a/src/Discussion/Command/ReadDiscussionHandler.php b/src/Discussion/Command/ReadDiscussionHandler.php
index 0197d8684..d29529b1e 100644
--- a/src/Discussion/Command/ReadDiscussionHandler.php
+++ b/src/Discussion/Command/ReadDiscussionHandler.php
@@ -53,7 +53,7 @@ class ReadDiscussionHandler
         $state = $discussion->stateFor($actor);
         $state->read($command->readNumber);
 
-        $this->events->fire(
+        $this->events->dispatch(
             new UserDataSaving($state)
         );
 
diff --git a/src/Discussion/Command/StartDiscussionHandler.php b/src/Discussion/Command/StartDiscussionHandler.php
index c7399210a..bc4fbb47b 100644
--- a/src/Discussion/Command/StartDiscussionHandler.php
+++ b/src/Discussion/Command/StartDiscussionHandler.php
@@ -70,7 +70,7 @@ class StartDiscussionHandler
             $actor
         );
 
-        $this->events->fire(
+        $this->events->dispatch(
             new Saving($discussion, $actor, $data)
         );
 
diff --git a/src/Discussion/DiscussionPolicy.php b/src/Discussion/DiscussionPolicy.php
index 9a4a03019..269648638 100644
--- a/src/Discussion/DiscussionPolicy.php
+++ b/src/Discussion/DiscussionPolicy.php
@@ -82,7 +82,7 @@ class DiscussionPolicy extends AbstractPolicy
         $query->where(function ($query) use ($actor) {
             $query->where('discussions.is_private', false)
                 ->orWhere(function ($query) use ($actor) {
-                    $this->events->fire(
+                    $this->events->dispatch(
                         new ScopeModelVisibility($query, $actor, 'viewPrivate')
                     );
                 });
@@ -109,7 +109,7 @@ class DiscussionPolicy extends AbstractPolicy
                 $query->where('comments_count', '>', 0)
                     ->orWhere('start_user_id', $actor->id)
                     ->orWhere(function ($query) use ($actor) {
-                        $this->events->fire(
+                        $this->events->dispatch(
                             new ScopeModelVisibility($query, $actor, 'editPosts')
                         );
                     });
diff --git a/src/Extension/ExtensionManager.php b/src/Extension/ExtensionManager.php
index 5f434dcf8..6d0f0b789 100644
--- a/src/Extension/ExtensionManager.php
+++ b/src/Extension/ExtensionManager.php
@@ -116,7 +116,7 @@ class ExtensionManager
         if (! $this->isEnabled($name)) {
             $extension = $this->getExtension($name);
 
-            $this->dispatcher->fire(new Enabling($extension));
+            $this->dispatcher->dispatch(new Enabling($extension));
 
             $enabled = $this->getEnabled();
 
@@ -130,7 +130,7 @@ class ExtensionManager
 
             $extension->setEnabled(true);
 
-            $this->dispatcher->fire(new Enabled($extension));
+            $this->dispatcher->dispatch(new Enabled($extension));
         }
     }
 
@@ -146,7 +146,7 @@ class ExtensionManager
         if (($k = array_search($name, $enabled)) !== false) {
             $extension = $this->getExtension($name);
 
-            $this->dispatcher->fire(new Disabling($extension));
+            $this->dispatcher->dispatch(new Disabling($extension));
 
             unset($enabled[$k]);
 
@@ -154,7 +154,7 @@ class ExtensionManager
 
             $extension->setEnabled(false);
 
-            $this->dispatcher->fire(new Disabled($extension));
+            $this->dispatcher->dispatch(new Disabled($extension));
         }
     }
 
@@ -175,7 +175,7 @@ class ExtensionManager
 
         $extension->setInstalled(false);
 
-        $this->dispatcher->fire(new Uninstalled($extension));
+        $this->dispatcher->dispatch(new Uninstalled($extension));
     }
 
     /**
diff --git a/src/Formatter/Formatter.php b/src/Formatter/Formatter.php
index c080dcc08..58dfddd16 100644
--- a/src/Formatter/Formatter.php
+++ b/src/Formatter/Formatter.php
@@ -59,7 +59,7 @@ class Formatter
     {
         $parser = $this->getParser($context);
 
-        $this->events->fire(new Parsing($parser, $context, $text));
+        $this->events->dispatch(new Parsing($parser, $context, $text));
 
         return $parser->parse($text);
     }
@@ -75,7 +75,7 @@ class Formatter
     {
         $renderer = $this->getRenderer($context);
 
-        $this->events->fire(new Rendering($renderer, $context, $xml));
+        $this->events->dispatch(new Rendering($renderer, $context, $xml));
 
         return $renderer->render($xml);
     }
@@ -117,7 +117,7 @@ class Formatter
         $configurator->Autolink;
         $configurator->tags->onDuplicate('replace');
 
-        $this->events->fire(new Configuring($configurator));
+        $this->events->dispatch(new Configuring($configurator));
 
         $this->configureExternalLinks($configurator);
 
diff --git a/src/Forum/Controller/LogOutController.php b/src/Forum/Controller/LogOutController.php
index cc71a20af..c819fec7d 100644
--- a/src/Forum/Controller/LogOutController.php
+++ b/src/Forum/Controller/LogOutController.php
@@ -119,7 +119,7 @@ class LogOutController implements ControllerInterface
 
         $actor->accessTokens()->delete();
 
-        $this->events->fire(new LoggedOut($actor));
+        $this->events->dispatch(new LoggedOut($actor));
 
         return $this->rememberer->forget($response);
     }
diff --git a/src/Foundation/AbstractValidator.php b/src/Foundation/AbstractValidator.php
index 25108526f..13079c1c8 100644
--- a/src/Foundation/AbstractValidator.php
+++ b/src/Foundation/AbstractValidator.php
@@ -93,7 +93,7 @@ abstract class AbstractValidator
 
         $validator = $this->validator->make($attributes, $rules, $this->getMessages());
 
-        $this->events->fire(
+        $this->events->dispatch(
             new Validating($this, $validator)
         );
 
diff --git a/src/Foundation/DispatchEventsTrait.php b/src/Foundation/DispatchEventsTrait.php
index 081bfc64b..bec2b40c2 100644
--- a/src/Foundation/DispatchEventsTrait.php
+++ b/src/Foundation/DispatchEventsTrait.php
@@ -32,7 +32,7 @@ trait DispatchEventsTrait
         foreach ($entity->releaseEvents() as $event) {
             $event->actor = $actor;
 
-            $this->events->fire($event);
+            $this->events->dispatch($event);
         }
     }
 }
diff --git a/src/Frontend/AbstractFrontendController.php b/src/Frontend/AbstractFrontendController.php
index cd7eba06b..c924392dc 100644
--- a/src/Frontend/AbstractFrontendController.php
+++ b/src/Frontend/AbstractFrontendController.php
@@ -36,10 +36,10 @@ abstract class AbstractFrontendController extends AbstractHtmlController
     {
         $view = $this->getView($request);
 
-        $this->events->fire(
+        $this->events->dispatch(
             new ConfigureClientView($this, $view, $request)
         );
-        $this->events->fire(
+        $this->events->dispatch(
             new Rendering($this, $view, $request)
         );
 
diff --git a/src/Group/Command/CreateGroupHandler.php b/src/Group/Command/CreateGroupHandler.php
index e18ac566b..112840a9b 100644
--- a/src/Group/Command/CreateGroupHandler.php
+++ b/src/Group/Command/CreateGroupHandler.php
@@ -57,7 +57,7 @@ class CreateGroupHandler
             array_get($data, 'attributes.icon')
         );
 
-        $this->events->fire(
+        $this->events->dispatch(
             new Saving($group, $actor, $data)
         );
 
diff --git a/src/Group/Command/DeleteGroupHandler.php b/src/Group/Command/DeleteGroupHandler.php
index 568f92802..163254ba9 100644
--- a/src/Group/Command/DeleteGroupHandler.php
+++ b/src/Group/Command/DeleteGroupHandler.php
@@ -50,7 +50,7 @@ class DeleteGroupHandler
 
         $this->assertCan($actor, 'delete', $group);
 
-        $this->events->fire(
+        $this->events->dispatch(
             new Deleting($group, $actor, $command->data)
         );
 
diff --git a/src/Group/Command/EditGroupHandler.php b/src/Group/Command/EditGroupHandler.php
index d82020328..dd5f8b556 100644
--- a/src/Group/Command/EditGroupHandler.php
+++ b/src/Group/Command/EditGroupHandler.php
@@ -75,7 +75,7 @@ class EditGroupHandler
             $group->icon = $attributes['icon'];
         }
 
-        $this->events->fire(
+        $this->events->dispatch(
             new Saving($group, $actor, $data)
         );
 
diff --git a/src/Locale/LocaleServiceProvider.php b/src/Locale/LocaleServiceProvider.php
index 73eb156f5..69ce0d98b 100644
--- a/src/Locale/LocaleServiceProvider.php
+++ b/src/Locale/LocaleServiceProvider.php
@@ -29,7 +29,7 @@ class LocaleServiceProvider extends AbstractServiceProvider
 
         $locales->addLocale($this->getDefaultLocale(), 'Default');
 
-        $events->fire(new ConfigureLocales($locales));
+        $events->dispatch(new ConfigureLocales($locales));
     }
 
     /**
diff --git a/src/Post/Command/DeletePostHandler.php b/src/Post/Command/DeletePostHandler.php
index f21845ea4..dc13a5b73 100644
--- a/src/Post/Command/DeletePostHandler.php
+++ b/src/Post/Command/DeletePostHandler.php
@@ -50,7 +50,7 @@ class DeletePostHandler
 
         $this->assertCan($actor, 'delete', $post);
 
-        $this->events->fire(
+        $this->events->dispatch(
             new Deleting($post, $actor, $command->data)
         );
 
diff --git a/src/Post/Command/EditPostHandler.php b/src/Post/Command/EditPostHandler.php
index e4e3269e8..14ae6ca20 100644
--- a/src/Post/Command/EditPostHandler.php
+++ b/src/Post/Command/EditPostHandler.php
@@ -78,7 +78,7 @@ class EditPostHandler
             }
         }
 
-        $this->events->fire(
+        $this->events->dispatch(
             new Saving($post, $actor, $data)
         );
 
diff --git a/src/Post/Command/PostReplyHandler.php b/src/Post/Command/PostReplyHandler.php
index 519f515ec..a3e066c50 100644
--- a/src/Post/Command/PostReplyHandler.php
+++ b/src/Post/Command/PostReplyHandler.php
@@ -95,7 +95,7 @@ class PostReplyHandler
             $post->time = new DateTime($time);
         }
 
-        $this->events->fire(
+        $this->events->dispatch(
             new Saving($post, $actor, $command->data)
         );
 
diff --git a/src/Post/PostPolicy.php b/src/Post/PostPolicy.php
index e1dc8ac75..3b857a889 100644
--- a/src/Post/PostPolicy.php
+++ b/src/Post/PostPolicy.php
@@ -70,7 +70,7 @@ class PostPolicy extends AbstractPolicy
         $query->where(function ($query) use ($actor) {
             $query->where('posts.is_private', false)
                 ->orWhere(function ($query) use ($actor) {
-                    $this->events->fire(
+                    $this->events->dispatch(
                         new ScopeModelVisibility($query, $actor, 'viewPrivate')
                     );
                 });
diff --git a/src/User/Command/DeleteAvatarHandler.php b/src/User/Command/DeleteAvatarHandler.php
index 25eb3b39f..ba6546b4d 100644
--- a/src/User/Command/DeleteAvatarHandler.php
+++ b/src/User/Command/DeleteAvatarHandler.php
@@ -62,7 +62,7 @@ class DeleteAvatarHandler
 
         $this->uploader->remove($user);
 
-        $this->events->fire(
+        $this->events->dispatch(
             new AvatarDeleting($user, $actor)
         );
 
diff --git a/src/User/Command/DeleteUserHandler.php b/src/User/Command/DeleteUserHandler.php
index 006d5e17b..0a119b248 100644
--- a/src/User/Command/DeleteUserHandler.php
+++ b/src/User/Command/DeleteUserHandler.php
@@ -50,7 +50,7 @@ class DeleteUserHandler
 
         $this->assertCan($actor, 'delete', $user);
 
-        $this->events->fire(
+        $this->events->dispatch(
             new Deleting($user, $actor, $command->data)
         );
 
diff --git a/src/User/Command/EditUserHandler.php b/src/User/Command/EditUserHandler.php
index 5e9c48d38..09bbd69e1 100644
--- a/src/User/Command/EditUserHandler.php
+++ b/src/User/Command/EditUserHandler.php
@@ -168,7 +168,7 @@ class EditUserHandler
             $this->avatarUploader->remove($user);
         }
 
-        $this->events->fire(
+        $this->events->dispatch(
             new Saving($user, $actor, $data)
         );
 
diff --git a/src/User/Command/RegisterUserHandler.php b/src/User/Command/RegisterUserHandler.php
index 381e3e6a8..417fd79e0 100644
--- a/src/User/Command/RegisterUserHandler.php
+++ b/src/User/Command/RegisterUserHandler.php
@@ -116,7 +116,7 @@ class RegisterUserHandler
             $user->activate();
         }
 
-        $this->events->fire(
+        $this->events->dispatch(
             new Saving($user, $actor, $data)
         );
 
diff --git a/src/User/Command/UploadAvatarHandler.php b/src/User/Command/UploadAvatarHandler.php
index 18fa84c00..01722b283 100644
--- a/src/User/Command/UploadAvatarHandler.php
+++ b/src/User/Command/UploadAvatarHandler.php
@@ -97,7 +97,7 @@ class UploadAvatarHandler
 
             $image = (new ImageManager)->make($tmpFile);
 
-            $this->events->fire(
+            $this->events->dispatch(
                 new AvatarSaving($user, $actor, $image)
             );
 
diff --git a/src/User/User.php b/src/User/User.php
index f5f7954c8..3a695aa78 100644
--- a/src/User/User.php
+++ b/src/User/User.php
@@ -146,7 +146,7 @@ class User extends AbstractModel
             $user->notifications()->delete();
         });
 
-        static::$dispatcher->fire(
+        static::$dispatcher->dispatch(
             new ConfigureUserPreferences
         );
     }