diff --git a/extensions/mentions/src/Listeners/AddApiRelationships.php b/extensions/mentions/src/Listeners/AddApiRelationships.php
index c1878d882..b3ac0a20d 100755
--- a/extensions/mentions/src/Listeners/AddApiRelationships.php
+++ b/extensions/mentions/src/Listeners/AddApiRelationships.php
@@ -11,8 +11,8 @@ class AddApiRelationships
 {
     public function subscribe(Dispatcher $events)
     {
-        $events->listen(ApiRelationship::class, __CLASS__.'@addRelationships');
-        $events->listen(BuildApiAction::class, __CLASS__.'@includeRelationships');
+        $events->listen(ApiRelationship::class, [$this, 'addRelationships']);
+        $events->listen(BuildApiAction::class, [$this, 'includeRelationships']);
     }
 
     public function addRelationships(ApiRelationship $event)
diff --git a/extensions/mentions/src/Listeners/AddClientAssets.php b/extensions/mentions/src/Listeners/AddClientAssets.php
index f85b5cbef..29ea045ab 100755
--- a/extensions/mentions/src/Listeners/AddClientAssets.php
+++ b/extensions/mentions/src/Listeners/AddClientAssets.php
@@ -8,8 +8,8 @@ class AddClientAssets
 {
     public function subscribe(Dispatcher $events)
     {
-        $events->listen(RegisterLocales::class, __CLASS__.'@addLocale');
-        $events->listen(BuildClientView::class, __CLASS__.'@addAssets');
+        $events->listen(RegisterLocales::class, [$this, 'addLocale']);
+        $events->listen(BuildClientView::class, [$this, 'addAssets']);
     }
 
     public function addLocale(RegisterLocales $event)
diff --git a/extensions/mentions/src/Listeners/AddModelRelationships.php b/extensions/mentions/src/Listeners/AddModelRelationships.php
index 2b1bbfa76..d7f9360ee 100755
--- a/extensions/mentions/src/Listeners/AddModelRelationships.php
+++ b/extensions/mentions/src/Listeners/AddModelRelationships.php
@@ -8,7 +8,7 @@ class AddModelRelationships
 {
     public function subscribe($events)
     {
-        $events->listen(ModelRelationship::class, __CLASS__.'@addRelationships');
+        $events->listen(ModelRelationship::class, [$this, 'addRelationships']);
     }
 
     public function addRelationships(ModelRelationship $event)
diff --git a/extensions/mentions/src/Listeners/AddPostMentionsFormatter.php b/extensions/mentions/src/Listeners/AddPostMentionsFormatter.php
index df6143601..3b3b56b70 100755
--- a/extensions/mentions/src/Listeners/AddPostMentionsFormatter.php
+++ b/extensions/mentions/src/Listeners/AddPostMentionsFormatter.php
@@ -8,8 +8,8 @@ class AddPostMentionsFormatter
 {
     public function subscribe($events)
     {
-        $events->listen(FormatterConfigurator::class, __CLASS__.'@configure');
-        $events->listen(FormatterRenderer::class, __CLASS__.'@render');
+        $events->listen(FormatterConfigurator::class, [$this, 'configure']);
+        $events->listen(FormatterRenderer::class, [$this, 'render']);
     }
 
     public function configure(FormatterConfigurator $event)
diff --git a/extensions/mentions/src/Listeners/AddUserMentionsFormatter.php b/extensions/mentions/src/Listeners/AddUserMentionsFormatter.php
index a72211071..a5c01dab7 100755
--- a/extensions/mentions/src/Listeners/AddUserMentionsFormatter.php
+++ b/extensions/mentions/src/Listeners/AddUserMentionsFormatter.php
@@ -16,9 +16,9 @@ class AddUserMentionsFormatter
 
     public function subscribe($events)
     {
-        $events->listen(FormatterConfigurator::class, __CLASS__.'@configure');
-        $events->listen(FormatterParser::class, __CLASS__.'@parse');
-        $events->listen(FormatterRenderer::class, __CLASS__.'@render');
+        $events->listen(FormatterConfigurator::class, [$this, 'configure']);
+        $events->listen(FormatterParser::class, [$this, 'parse']);
+        $events->listen(FormatterRenderer::class, [$this, 'render']);
     }
 
     public function configure(FormatterConfigurator $event)
diff --git a/extensions/mentions/src/Listeners/UpdatePostMentionsMetadata.php b/extensions/mentions/src/Listeners/UpdatePostMentionsMetadata.php
index 8c9a2a5ca..d4c027ed4 100755
--- a/extensions/mentions/src/Listeners/UpdatePostMentionsMetadata.php
+++ b/extensions/mentions/src/Listeners/UpdatePostMentionsMetadata.php
@@ -23,13 +23,13 @@ class UpdatePostMentionsMetadata
 
     public function subscribe(Dispatcher $events)
     {
-        $events->listen(RegisterNotificationTypes::class, __CLASS__.'@registerNotificationType');
+        $events->listen(RegisterNotificationTypes::class, [$this, 'registerNotificationType']);
 
-        $events->listen(PostWasPosted::class, __CLASS__.'@whenPostWasPosted');
-        $events->listen(PostWasRevised::class, __CLASS__.'@whenPostWasRevised');
-        $events->listen(PostWasHidden::class, __CLASS__.'@whenPostWasHidden');
-        $events->listen(PostWasRestored::class, __CLASS__.'@whenPostWasRestored');
-        $events->listen(PostWasDeleted::class, __CLASS__.'@whenPostWasDeleted');
+        $events->listen(PostWasPosted::class, [$this, 'whenPostWasPosted']);
+        $events->listen(PostWasRevised::class, [$this, 'whenPostWasRevised']);
+        $events->listen(PostWasHidden::class, [$this, 'whenPostWasHidden']);
+        $events->listen(PostWasRestored::class, [$this, 'whenPostWasRestored']);
+        $events->listen(PostWasDeleted::class, [$this, 'whenPostWasDeleted']);
     }
 
     public function registerNotificationType(RegisterNotificationTypes $event)
diff --git a/extensions/mentions/src/Listeners/UpdateUserMentionsMetadata.php b/extensions/mentions/src/Listeners/UpdateUserMentionsMetadata.php
index 233799d9b..9790f7152 100755
--- a/extensions/mentions/src/Listeners/UpdateUserMentionsMetadata.php
+++ b/extensions/mentions/src/Listeners/UpdateUserMentionsMetadata.php
@@ -24,13 +24,13 @@ class UpdateUserMentionsMetadata
 
     public function subscribe(Dispatcher $events)
     {
-        $events->listen(RegisterNotificationTypes::class, __CLASS__.'@registerNotificationType');
+        $events->listen(RegisterNotificationTypes::class, );
 
-        $events->listen(PostWasPosted::class, __CLASS__.'@whenPostWasPosted');
-        $events->listen(PostWasRevised::class, __CLASS__.'@whenPostWasRevised');
-        $events->listen(PostWasHidden::class, __CLASS__.'@whenPostWasHidden');
-        $events->listen(PostWasRestored::class, __CLASS__.'@whenPostWasRestored');
-        $events->listen(PostWasDeleted::class, __CLASS__.'@whenPostWasDeleted');
+        $events->listen(PostWasPosted::class, );
+        $events->listen(PostWasRevised::class, );
+        $events->listen(PostWasHidden::class, );
+        $events->listen(PostWasRestored::class, );
+        $events->listen(PostWasDeleted::class, );
     }
 
     public function registerNotificationType(RegisterNotificationTypes $event)