diff --git a/extensions/lock/js/admin/src/main.js b/extensions/lock/js/admin/src/main.js
index 8017f864f..8a1c80963 100644
--- a/extensions/lock/js/admin/src/main.js
+++ b/extensions/lock/js/admin/src/main.js
@@ -6,7 +6,7 @@ app.initializers.add('lock', () => {
   extend(PermissionGrid.prototype, 'moderateItems', items => {
     items.add('lock', {
       icon: 'lock',
-      label: 'Lock discussions',
+      label: app.translator.trans('flarum-lock.admin.permissions.lock_discussions_label'),
       permission: 'discussion.lock'
     }, 95);
   });
diff --git a/extensions/lock/js/forum/src/addLockBadge.js b/extensions/lock/js/forum/src/addLockBadge.js
index ed3f8b3e9..a5a91e469 100644
--- a/extensions/lock/js/forum/src/addLockBadge.js
+++ b/extensions/lock/js/forum/src/addLockBadge.js
@@ -7,7 +7,7 @@ export default function addLockBadge() {
     if (this.isLocked()) {
       badges.add('locked', Badge.component({
         type: 'locked',
-        label: app.translator.trans('flarum-lock.forum.locked'),
+        label: app.translator.trans('flarum-lock.forum.badge.locked'),
         icon: 'lock'
       }));
     }
diff --git a/extensions/lock/js/forum/src/addLockControl.js b/extensions/lock/js/forum/src/addLockControl.js
index 308851a03..c94cd5c86 100644
--- a/extensions/lock/js/forum/src/addLockControl.js
+++ b/extensions/lock/js/forum/src/addLockControl.js
@@ -7,7 +7,7 @@ export default function addLockControl() {
   extend(DiscussionControls, 'moderationControls', function(items, discussion) {
     if (discussion.canLock()) {
       items.add('lock', Button.component({
-        children: app.translator.trans(discussion.isLocked() ? 'flarum-lock.forum.unlock' : 'flarum-lock.forum.lock'),
+        children: app.translator.trans(discussion.isLocked() ? 'flarum-lock.forum.discussion_controls.unlock' : 'flarum-lock.forum.discussion_controls.lock'),
         icon: 'lock',
         onclick: this.lockAction.bind(discussion)
       }));
diff --git a/extensions/lock/js/forum/src/components/DiscussionLockedNotification.js b/extensions/lock/js/forum/src/components/DiscussionLockedNotification.js
index b74da8f64..eb77855b5 100644
--- a/extensions/lock/js/forum/src/components/DiscussionLockedNotification.js
+++ b/extensions/lock/js/forum/src/components/DiscussionLockedNotification.js
@@ -12,6 +12,6 @@ export default class DiscussionLockedNotification extends Notification {
   }
 
   content() {
-    return app.translator.trans('flarum-lock.forum.discussion_locked_notification', {user: this.props.notification.sender()});
+    return app.translator.trans('flarum-lock.forum.notifications.discussion_locked_text', {user: this.props.notification.sender()});
   }
 }
diff --git a/extensions/lock/js/forum/src/components/DiscussionLockedPost.js b/extensions/lock/js/forum/src/components/DiscussionLockedPost.js
index 9472c2a9e..a69ff40cd 100644
--- a/extensions/lock/js/forum/src/components/DiscussionLockedPost.js
+++ b/extensions/lock/js/forum/src/components/DiscussionLockedPost.js
@@ -9,7 +9,7 @@ export default class DiscussionLockedPost extends EventPost {
 
   descriptionKey() {
     return this.props.post.content().locked
-      ? 'flarum-lock.forum.discussion_locked_post'
-      : 'flarum-lock.forum.discussion_unlocked_post';
+      ? 'flarum-lock.forum.post_stream.discussion_locked_post'
+      : 'flarum-lock.forum.post_stream.discussion_unlocked_post';
   }
 }
diff --git a/extensions/lock/js/forum/src/main.js b/extensions/lock/js/forum/src/main.js
index b93f18117..26d230f2e 100644
--- a/extensions/lock/js/forum/src/main.js
+++ b/extensions/lock/js/forum/src/main.js
@@ -23,7 +23,7 @@ app.initializers.add('flarum-lock', () => {
     items.add('discussionLocked', {
       name: 'discussionLocked',
       icon: 'lock',
-      label: app.translator.trans('flarum-lock.forum.notify_discussion_locked')
+      label: app.translator.trans('flarum-lock.forum.settings.notify_discussion_locked_label')
     });
   });
 });