diff --git a/extensions/subscriptions/js/src/forum/components/NewPostNotification.js b/extensions/subscriptions/js/src/forum/components/NewPostNotification.js
index 580d8e4bb..c20298ed7 100644
--- a/extensions/subscriptions/js/src/forum/components/NewPostNotification.js
+++ b/extensions/subscriptions/js/src/forum/components/NewPostNotification.js
@@ -15,6 +15,6 @@ export default class NewPostNotification extends Notification {
   }
 
   content() {
-    return app.translator.trans('flarum-subscriptions.forum.notifications.new_post_text', {user: this.props.notification.sender()});
+    return app.translator.trans('flarum-subscriptions.forum.notifications.new_post_text', {user: this.props.notification.fromUser()});
   }
 }
diff --git a/extensions/subscriptions/migrations/2015_05_11_000000_add_subscription_to_users_discussions_table.php b/extensions/subscriptions/migrations/2015_05_11_000000_add_subscription_to_users_discussions_table.php
index 66b9bb935..437661016 100644
--- a/extensions/subscriptions/migrations/2015_05_11_000000_add_subscription_to_users_discussions_table.php
+++ b/extensions/subscriptions/migrations/2015_05_11_000000_add_subscription_to_users_discussions_table.php
@@ -11,6 +11,6 @@
 
 use Flarum\Database\Migration;
 
-return Migration::addColumns('users_discussions', [
+return Migration::addColumns('discussion_user', [
     'subscription' => ['enum', 'allowed' => ['follow', 'ignore'], 'nullable' => true]
 ]);
diff --git a/extensions/subscriptions/src/Gambit/SubscriptionGambit.php b/extensions/subscriptions/src/Gambit/SubscriptionGambit.php
index e3f0588c2..8c167220c 100644
--- a/extensions/subscriptions/src/Gambit/SubscriptionGambit.php
+++ b/extensions/subscriptions/src/Gambit/SubscriptionGambit.php
@@ -32,7 +32,7 @@ class SubscriptionGambit extends AbstractRegexGambit
         $method = $negate ? 'whereNotExists' : 'whereExists';
         $search->getQuery()->$method(function ($query) use ($actor, $matches) {
             $query->selectRaw('1')
-                  ->from('users_discussions')
+                  ->from('discussion_user')
                   ->whereColumn('discussions.id', 'discussion_id')
                   ->where('user_id', $actor->id)
                   ->where('subscription', $matches[1] === 'follow' ? 'follow' : 'ignore');
diff --git a/extensions/subscriptions/src/Listener/FilterDiscussionListBySubscription.php b/extensions/subscriptions/src/Listener/FilterDiscussionListBySubscription.php
index e8b4ac1f0..172bdf1dc 100755
--- a/extensions/subscriptions/src/Listener/FilterDiscussionListBySubscription.php
+++ b/extensions/subscriptions/src/Listener/FilterDiscussionListBySubscription.php
@@ -45,7 +45,7 @@ class FilterDiscussionListBySubscription
             $actor = $event->search->getActor();
             $event->search->getQuery()->whereNotExists(function ($query) use ($actor) {
                 $query->selectRaw(1)
-                      ->from('users_discussions')
+                      ->from('discussion_user')
                       ->whereColumn('discussions.id', 'discussion_id')
                       ->where('user_id', $actor->id)
                       ->where('subscription', 'ignore');
diff --git a/extensions/subscriptions/src/Listener/SendNotificationWhenReplyIsPosted.php b/extensions/subscriptions/src/Listener/SendNotificationWhenReplyIsPosted.php
index 582307282..303d33c49 100755
--- a/extensions/subscriptions/src/Listener/SendNotificationWhenReplyIsPosted.php
+++ b/extensions/subscriptions/src/Listener/SendNotificationWhenReplyIsPosted.php
@@ -68,8 +68,8 @@ class SendNotificationWhenReplyIsPosted
 
         $notify = $discussion->readers()
             ->where('users.id', '!=', $post->user_id)
-            ->where('users_discussions.subscription', 'follow')
-            ->where('users_discussions.read_number', $discussion->last_post_number - 1)
+            ->where('discussion_user.subscription', 'follow')
+            ->where('discussion_user.last_read_post_number', $discussion->last_post_number - 1)
             ->get();
 
         $this->notifications->sync(
diff --git a/extensions/subscriptions/src/Notification/NewPostBlueprint.php b/extensions/subscriptions/src/Notification/NewPostBlueprint.php
index e563619de..aaaa894b9 100644
--- a/extensions/subscriptions/src/Notification/NewPostBlueprint.php
+++ b/extensions/subscriptions/src/Notification/NewPostBlueprint.php
@@ -42,7 +42,7 @@ class NewPostBlueprint implements BlueprintInterface, MailableInterface
     /**
      * {@inheritdoc}
      */
-    public function getSender()
+    public function getFromUser()
     {
         return $this->post->user;
     }