diff --git a/extensions/flags/js/admin/src/main.js b/extensions/flags/js/admin/src/main.js
index 7bc9dc143..7a87b4cb4 100644
--- a/extensions/flags/js/admin/src/main.js
+++ b/extensions/flags/js/admin/src/main.js
@@ -6,7 +6,7 @@ app.initializers.add('flarum-flags', () => {
   extend(PermissionGrid.prototype, 'moderateItems', items => {
     items.add('viewFlags', {
       icon: 'flag',
-      label: app.translator.trans('flarum-flags.admin.permissions.view_flags'),
+      label: app.translator.trans('flarum-flags.admin.permissions.view_flags_label'),
       permission: 'discussion.viewFlags'
     }, 65);
   });
@@ -14,7 +14,7 @@ app.initializers.add('flarum-flags', () => {
   extend(PermissionGrid.prototype, 'replyItems', items => {
     items.add('flagPosts', {
       icon: 'flag',
-      label: app.translator.trans('flarum-flags.admin.permissions.flag_posts'),
+      label: app.translator.trans('flarum-flags.admin.permissions.flag_posts_label'),
       permission: 'discussion.flagPosts'
     }, 70);
   });
diff --git a/extensions/flags/js/forum/src/addFlagsToPosts.js b/extensions/flags/js/forum/src/addFlagsToPosts.js
index 64d7dc685..0ff86d18f 100644
--- a/extensions/flags/js/forum/src/addFlagsToPosts.js
+++ b/extensions/flags/js/forum/src/addFlagsToPosts.js
@@ -101,7 +101,7 @@ export default function() {
       const detail = flag.reasonDetail();
 
       return [
-        app.translator.trans(reason ? 'flarum-flags.forum.post.flagged_by_with_reason' : 'flarum-flags.forum.post.flagged_by', {user, reason}),
+        app.translator.trans(reason ? 'flarum-flags.forum.post.flagged_by_with_reason_text' : 'flarum-flags.forum.post.flagged_by_text', {user, reason}),
         detail ? <span className="Post-flagged-detail">{detail}</span> : ''
       ];
     }
diff --git a/extensions/flags/js/forum/src/components/FlagList.js b/extensions/flags/js/forum/src/components/FlagList.js
index 918f30e33..e6c6f6ecc 100644
--- a/extensions/flags/js/forum/src/components/FlagList.js
+++ b/extensions/flags/js/forum/src/components/FlagList.js
@@ -50,7 +50,7 @@ export default class FlagList extends Component {
                 );
               })
               : !this.loading
-                ? <div className="NotificationList-empty">{app.translator.trans('flarum-flags.forum.flagged_posts.no_flags')}</div>
+                ? <div className="NotificationList-empty">{app.translator.trans('flarum-flags.forum.flagged_posts.empty_text')}</div>
                 : LoadingIndicator.component({className: 'LoadingIndicator--block'})}
           </ul>
         </div>