diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
index 9dceda5cf87..539101bdaf7 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard-shortcuts-help.hbs
@@ -11,7 +11,7 @@
         <li>{{{i18n 'keyboard_shortcuts_help.jump_to.top'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.jump_to.bookmarks'}}}</li>
         <li>{{{i18n 'keyboard_shortcuts_help.jump_to.profile'}}}</li>
-        {{#if siteSettings.enable_private_messages}}
+        {{#if siteSettings.enable_personal_messages}}
           <li>{{{i18n 'keyboard_shortcuts_help.jump_to.messages'}}}</li>
         {{/if}}
       </ul>
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 1c9678a69c1..ef2d4912ccd 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -42,7 +42,7 @@
         {{else}}
           <h1>
             {{#unless model.is_warning}}
-              {{#if siteSettings.enable_private_messages}}
+              {{#if siteSettings.enable_personal_messages}}
                 <a href={{pmPath}}>
                   <span class="private-message-glyph">{{d-icon "envelope"}}</span>
                 </a>
diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js
index f11eb01177a..e24782e70cc 100644
--- a/test/javascripts/helpers/site-settings.js
+++ b/test/javascripts/helpers/site-settings.js
@@ -39,11 +39,11 @@ Discourse.SiteSettingsOriginal = {
   "delete_user_max_post_age":60,
   "delete_all_posts_max":15,
   "min_post_length":20,
-  "min_private_message_post_length":10,
+  "min_personal_message_post_length":10,
   "max_post_length":32000,
   "min_topic_title_length":15,
   "max_topic_title_length":255,
-  "min_private_message_title_length":2,
+  "min_personal_message_title_length":2,
   "allow_uncategorized_topics":true,
   "min_title_similar_length":10,
   "edit_history_visible_to_public":true,