diff --git a/src/Core/Handlers/Events/DiscussionMetadataUpdater.php b/src/Core/Handlers/Events/DiscussionMetadataUpdater.php
index 51c903aa6..d8a83d739 100755
--- a/src/Core/Handlers/Events/DiscussionMetadataUpdater.php
+++ b/src/Core/Handlers/Events/DiscussionMetadataUpdater.php
@@ -5,16 +5,16 @@ use Flarum\Core\Events\PostWasPosted;
 use Flarum\Core\Events\PostWasDeleted;
 use Flarum\Core\Events\PostWasHidden;
 use Flarum\Core\Events\PostWasRestored;
+use Illuminate\Contracts\Events\Dispatcher;
 
 class DiscussionMetadataUpdater
 {
     /**
      * Register the listeners for the subscriber.
      *
-     * @param  Illuminate\Events\Dispatcher  $events
-     * @return array
+     * @param \Illuminate\Contracts\Events\Dispatcher $events
      */
-    public function subscribe($events)
+    public function subscribe(Dispatcher $events)
     {
         $events->listen('Flarum\Core\Events\PostWasPosted', __CLASS__.'@whenPostWasPosted');
         $events->listen('Flarum\Core\Events\PostWasDeleted', __CLASS__.'@whenPostWasDeleted');
diff --git a/src/Core/Handlers/Events/DiscussionRenamedNotifier.php b/src/Core/Handlers/Events/DiscussionRenamedNotifier.php
index 5b985198c..ad37a8e98 100755
--- a/src/Core/Handlers/Events/DiscussionRenamedNotifier.php
+++ b/src/Core/Handlers/Events/DiscussionRenamedNotifier.php
@@ -4,6 +4,7 @@ use Flarum\Core\Events\DiscussionWasRenamed;
 use Flarum\Core\Models\DiscussionRenamedPost;
 use Flarum\Core\Notifications\Types\DiscussionRenamedNotification;
 use Flarum\Core\Notifications\Notifier;
+use Illuminate\Contracts\Events\Dispatcher;
 
 class DiscussionRenamedNotifier
 {
@@ -15,10 +16,9 @@ class DiscussionRenamedNotifier
     /**
      * Register the listeners for the subscriber.
      *
-     * @param  Illuminate\Events\Dispatcher  $events
-     * @return array
+     * @param \Illuminate\Contracts\Events\Dispatcher $events
      */
-    public function subscribe($events)
+    public function subscribe(Dispatcher $events)
     {
         $events->listen('Flarum\Core\Events\DiscussionWasRenamed', __CLASS__.'@whenDiscussionWasRenamed');
     }
diff --git a/src/Core/Handlers/Events/EmailConfirmationMailer.php b/src/Core/Handlers/Events/EmailConfirmationMailer.php
index 2a5950bc5..8d15a5d2e 100755
--- a/src/Core/Handlers/Events/EmailConfirmationMailer.php
+++ b/src/Core/Handlers/Events/EmailConfirmationMailer.php
@@ -4,6 +4,7 @@ use Illuminate\Mail\Mailer;
 use Flarum\Core\Events\UserWasRegistered;
 use Flarum\Core\Events\EmailWasChanged;
 use Config;
+use Illuminate\Contracts\Events\Dispatcher;
 
 class EmailConfirmationMailer
 {
@@ -17,10 +18,9 @@ class EmailConfirmationMailer
     /**
      * Register the listeners for the subscriber.
      *
-     * @param  Illuminate\Events\Dispatcher  $events
-     * @return array
+     * @param \Illuminate\Contracts\Events\Dispatcher $events
      */
-    public function subscribe($events)
+    public function subscribe(Dispatcher $events)
     {
         $events->listen('Flarum\Core\Events\UserWasRegistered', __CLASS__.'@whenUserWasRegistered');
         $events->listen('Flarum\Core\Events\EmailWasChanged', __CLASS__.'@whenEmailWasChanged');
diff --git a/src/Core/Handlers/Events/UserMetadataUpdater.php b/src/Core/Handlers/Events/UserMetadataUpdater.php
index 8158dcad9..e8fedaffd 100755
--- a/src/Core/Handlers/Events/UserMetadataUpdater.php
+++ b/src/Core/Handlers/Events/UserMetadataUpdater.php
@@ -7,16 +7,16 @@ use Flarum\Core\Events\PostWasHidden;
 use Flarum\Core\Events\PostWasRestored;
 use Flarum\Core\Events\DiscussionWasStarted;
 use Flarum\Core\Events\DiscussionWasDeleted;
+use Illuminate\Contracts\Events\Dispatcher;
 
 class UserMetadataUpdater
 {
     /**
      * Register the listeners for the subscriber.
      *
-     * @param  Illuminate\Events\Dispatcher  $events
-     * @return array
+     * @param \Illuminate\Contracts\Events\Dispatcher $events
      */
-    public function subscribe($events)
+    public function subscribe(Dispatcher $events)
     {
         $events->listen('Flarum\Core\Events\PostWasPosted', __CLASS__.'@whenPostWasPosted');
         $events->listen('Flarum\Core\Events\PostWasDeleted', __CLASS__.'@whenPostWasDeleted');
@@ -28,22 +28,22 @@ class UserMetadataUpdater
 
     public function whenPostWasPosted(PostWasPosted $event)
     {
-        $this->updateRepliesCount($event->post->user, 1);
+        $this->updateCommentsCount($event->post->user, 1);
     }
 
     public function whenPostWasDeleted(PostWasDeleted $event)
     {
-        $this->updateRepliesCount($event->post->user, -1);
+        $this->updateCommentsCount($event->post->user, -1);
     }
 
     public function whenPostWasHidden(PostWasHidden $event)
     {
-        $this->updateRepliesCount($event->post->user, -1);
+        $this->updateCommentsCount($event->post->user, -1);
     }
 
     public function whenPostWasRestored(PostWasRestored $event)
     {
-        $this->updateRepliesCount($event->post->user, 1);
+        $this->updateCommentsCount($event->post->user, 1);
     }
 
     public function whenDiscussionWasStarted(DiscussionWasStarted $event)
@@ -56,7 +56,7 @@ class UserMetadataUpdater
         $this->updateDiscussionsCount($event->discussion->startUser, -1);
     }
 
-    protected function updateRepliesCount(User $user, $amount)
+    protected function updateCommentsCount(User $user, $amount)
     {
         $user->comments_count += $amount;
         $user->save();