diff --git a/extensions/subscriptions/js/forum/src/addSubscriptionBadge.js b/extensions/subscriptions/js/forum/src/addSubscriptionBadge.js
index 8bee04c30..4db74d121 100644
--- a/extensions/subscriptions/js/forum/src/addSubscriptionBadge.js
+++ b/extensions/subscriptions/js/forum/src/addSubscriptionBadge.js
@@ -9,7 +9,7 @@ export default function addSubscriptionBadge() {
     switch (this.subscription()) {
       case 'follow':
         badge = Badge.component({
-          label: app.translator.trans('flarum-subscriptions.forum.following'),
+          label: app.translator.trans('flarum-subscriptions.forum.badge.following_tooltip'),
           icon: 'star',
           type: 'following'
         });
@@ -17,7 +17,7 @@ export default function addSubscriptionBadge() {
 
       case 'ignore':
         badge = Badge.component({
-          label: app.translator.trans('flarum-subscriptions.forum.ignoring'),
+          label: app.translator.trans('flarum-subscriptions.forum.badge.ignoring_tooltip'),
           icon: 'eye-slash',
           type: 'ignoring'
         });
diff --git a/extensions/subscriptions/js/forum/src/addSubscriptionControls.js b/extensions/subscriptions/js/forum/src/addSubscriptionControls.js
index 74401784a..196c6ddfc 100644
--- a/extensions/subscriptions/js/forum/src/addSubscriptionControls.js
+++ b/extensions/subscriptions/js/forum/src/addSubscriptionControls.js
@@ -9,9 +9,9 @@ export default function addSubscriptionControls() {
   extend(DiscussionControls, 'userControls', function(items, discussion, context) {
     if (app.session.user && !(context instanceof DiscussionPage)) {
       const states = {
-        none: {label: app.translator.trans('flarum-subscriptions.forum.follow'), icon: 'star', save: 'follow'},
-        follow: {label: app.translator.trans('flarum-subscriptions.forum.unfollow'), icon: 'star-o', save: false},
-        ignore: {label: app.translator.trans('flarum-subscriptions.forum.unignore'), icon: 'eye', save: false}
+        none: {label: app.translator.trans('flarum-subscriptions.forum.discussion_controls.follow_button'), icon: 'star', save: 'follow'},
+        follow: {label: app.translator.trans('flarum-subscriptions.forum.discussion_controls.unfollow_button'), icon: 'star-o', save: false},
+        ignore: {label: app.translator.trans('flarum-subscriptions.forum.discussion_controls.unignore_button'), icon: 'eye', save: false}
       };
 
       const subscription = discussion.subscription() || 'none';
diff --git a/extensions/subscriptions/js/forum/src/addSubscriptionFilter.js b/extensions/subscriptions/js/forum/src/addSubscriptionFilter.js
index 10e5243c1..f7ae93ba2 100644
--- a/extensions/subscriptions/js/forum/src/addSubscriptionFilter.js
+++ b/extensions/subscriptions/js/forum/src/addSubscriptionFilter.js
@@ -12,7 +12,7 @@ export default function addSubscriptionFilter() {
 
       items.add('following', LinkButton.component({
         href: app.route('index.filter', params),
-        children: app.translator.trans('flarum-subscriptions.forum.following'),
+        children: app.translator.trans('flarum-subscriptions.forum.index.following_link'),
         icon: 'star'
       }), 50);
     }
diff --git a/extensions/subscriptions/js/forum/src/components/NewPostNotification.js b/extensions/subscriptions/js/forum/src/components/NewPostNotification.js
index 35465dd9d..9262e4bff 100644
--- a/extensions/subscriptions/js/forum/src/components/NewPostNotification.js
+++ b/extensions/subscriptions/js/forum/src/components/NewPostNotification.js
@@ -15,6 +15,6 @@ export default class NewPostNotification extends Notification {
   }
 
   content() {
-    return app.translator.trans('flarum-subscriptions.forum.new_post_notification', {user: this.props.notification.sender()});
+    return app.translator.trans('flarum-subscriptions.forum.notifications:new_post_text', {user: this.props.notification.sender()});
   }
 }
diff --git a/extensions/subscriptions/js/forum/src/components/SubscriptionMenu.js b/extensions/subscriptions/js/forum/src/components/SubscriptionMenu.js
index 53874edde..c062f1b54 100644
--- a/extensions/subscriptions/js/forum/src/components/SubscriptionMenu.js
+++ b/extensions/subscriptions/js/forum/src/components/SubscriptionMenu.js
@@ -9,18 +9,18 @@ export default class SubscriptionMenu extends Component {
     const discussion = this.props.discussion;
     const subscription = discussion.subscription();
 
-    let buttonLabel = app.translator.trans('flarum-subscriptions.forum.follow');
+    let buttonLabel = app.translator.trans('flarum-subscriptions.forum.sub_controls.follow_button');
     let buttonIcon = 'star-o';
     const buttonClass = 'SubscriptionMenu-button--' + subscription;
 
     switch (subscription) {
       case 'follow':
-        buttonLabel = app.translator.trans('flarum-subscriptions.forum.following');
+        buttonLabel = app.translator.trans('flarum-subscriptions.forum.sub_controls.following_button');
         buttonIcon = 'star';
         break;
 
       case 'ignore':
-        buttonLabel = app.translator.trans('flarum-subscriptions.forum.ignoring');
+        buttonLabel = app.translator.trans('flarum-subscriptions.forum.sub_controls.ignoring_button');
         buttonIcon = 'eye-slash';
         break;
 
@@ -32,20 +32,20 @@ export default class SubscriptionMenu extends Component {
       {
         subscription: false,
         icon: 'star-o',
-        label: app.translator.trans('flarum-subscriptions.forum.not_following'),
-        description: app.translator.trans('flarum-subscriptions.forum.not_following_description')
+        label: app.translator.trans('flarum-subscriptions.forum.sub_controls.not_following_button'),
+        description: app.translator.trans('flarum-subscriptions.forum.sub_controls.not_following_text')
       },
       {
         subscription: 'follow',
         icon: 'star',
-        label: app.translator.trans('flarum-subscriptions.forum.following'),
-        description: app.translator.trans('flarum-subscriptions.forum.following_description')
+        label: app.translator.trans('flarum-subscriptions.forum.sub_controls.following_button'),
+        description: app.translator.trans('flarum-subscriptions.forum.sub_controls.following_text')
       },
       {
         subscription: 'ignore',
         icon: 'eye-slash',
-        label: app.translator.trans('flarum-subscriptions.forum.ignoring'),
-        description: app.translator.trans('flarum-subscriptions.forum.ignoring_description')
+        label: app.translator.trans('flarum-subscriptions.forum.sub_controls.ignoring_button'),
+        description: app.translator.trans('flarum-subscriptions.forum.sub_controls.ignoring_text')
       }
     ];
 
diff --git a/extensions/subscriptions/js/forum/src/main.js b/extensions/subscriptions/js/forum/src/main.js
index 07e4fcab5..b37752e72 100644
--- a/extensions/subscriptions/js/forum/src/main.js
+++ b/extensions/subscriptions/js/forum/src/main.js
@@ -22,7 +22,7 @@ app.initializers.add('subscriptions', function() {
     items.add('newPost', {
       name: 'newPost',
       icon: 'star',
-      label: app.translator.trans('flarum-subscriptions.forum.notify_new_post')
+      label: app.translator.trans('flarum-subscriptions.forum.settings.notify_new_post_label')
     });
   });
 });