diff --git a/extensions/lock/js/forum/src/addLockBadge.js b/extensions/lock/js/forum/src/addLockBadge.js
index a5a91e469..5b7a3b185 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.badge.locked'),
+        label: app.translator.trans('flarum-lock.forum.badge.locked_discussion_tooltip'),
         icon: 'lock'
       }));
     }
diff --git a/extensions/lock/js/forum/src/addLockControl.js b/extensions/lock/js/forum/src/addLockControl.js
index c94cd5c86..5b7f02308 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.discussion_controls.unlock' : 'flarum-lock.forum.discussion_controls.lock'),
+        children: app.translator.trans(discussion.isLocked() ? 'flarum-lock.forum.discussion_controls.unlock_button' : 'flarum-lock.forum.discussion_controls.lock_button'),
         icon: 'lock',
         onclick: this.lockAction.bind(discussion)
       }));
diff --git a/extensions/lock/js/forum/src/components/DiscussionLockedPost.js b/extensions/lock/js/forum/src/components/DiscussionLockedPost.js
index a69ff40cd..d5434e4b1 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.post_stream.discussion_locked_post'
-      : 'flarum-lock.forum.post_stream.discussion_unlocked_post';
+      ? 'flarum-lock.forum.post_stream.discussion_locked_text'
+      : 'flarum-lock.forum.post_stream.discussion_unlocked_text';
   }
 }