diff --git a/web/e2e-tests/compose.test.ts b/web/e2e-tests/compose.test.ts
index a9a700c4e8..648fc115d7 100644
--- a/web/e2e-tests/compose.test.ts
+++ b/web/e2e-tests/compose.test.ts
@@ -117,7 +117,7 @@ async function test_narrow_to_private_messages_with_cordelia(page: Page): Promis
         you_and_cordelia_selector,
     );
     const cordelia_user_id = await common.get_user_id_from_name(page, "Cordelia, Lear's daughter");
-    const pm_list_selector = `li[data-user-ids-string="${cordelia_user_id}"].pm-list-item.active-sub-filter`;
+    const pm_list_selector = `li[data-user-ids-string="${cordelia_user_id}"].dm-list-item.active-sub-filter`;
     await page.waitForSelector(pm_list_selector, {visible: true});
     await close_compose_box(page);
 
diff --git a/web/src/pm_list.js b/web/src/pm_list.js
index e0c07bc432..e69d5bdb80 100644
--- a/web/src/pm_list.js
+++ b/web/src/pm_list.js
@@ -202,14 +202,14 @@ function zoom_out() {
 }
 
 export function initialize() {
-    $(".private_messages_container").on("click", "#show_more_private_messages", (e) => {
+    $(".private_messages_container").on("click", "#show-more-direct-messages", (e) => {
         e.stopPropagation();
         e.preventDefault();
 
         zoom_in();
     });
 
-    $(".private_messages_container").on("click", "#hide_more_private_messages", (e) => {
+    $(".private_messages_container").on("click", "#hide-more-direct-messages", (e) => {
         e.stopPropagation();
         e.preventDefault();
 
diff --git a/web/styles/dark_theme.css b/web/styles/dark_theme.css
index 2b0a5fcaef..9a5d8d64ae 100644
--- a/web/styles/dark_theme.css
+++ b/web/styles/dark_theme.css
@@ -431,7 +431,7 @@
     .active_private_messages_section {
         #private_messages_section,
         #private_messages_list,
-        #hide_more_private_messages {
+        #hide-more-direct-messages {
             background-color: hsl(199deg 33% 46% / 20%);
         }
     }
diff --git a/web/styles/left_sidebar.css b/web/styles/left_sidebar.css
index 3a17f61c37..71a39a2da1 100644
--- a/web/styles/left_sidebar.css
+++ b/web/styles/left_sidebar.css
@@ -260,7 +260,7 @@ li.show-more-topics {
             font-size: 90%;
         }
 
-        & li.pm-list-item {
+        & li.dm-list-item {
             position: relative;
             padding: 1px 10px 1px 4px;
             margin-left: 2px;
@@ -290,7 +290,7 @@ li.show-more-topics {
             }
         }
 
-        & li#show_more_private_messages {
+        & li#show-more-direct-messages {
             cursor: pointer;
             padding-right: 26px;
             padding-left: 6px;
@@ -336,7 +336,7 @@ li.show-more-topics {
 .active_private_messages_section {
     #private_messages_section,
     #private_messages_list,
-    #hide_more_private_messages {
+    #hide-more-direct-messages {
         background-color: hsl(202deg 56% 91%);
     }
 
@@ -1027,7 +1027,7 @@ li.topic-list-item {
     }
 }
 
-.zero-pm-unreads .dm-box {
+.zero-dm-unreads .dm-box {
     margin-right: 15px;
 }
 
@@ -1176,7 +1176,7 @@ li.topic-list-item {
         display: inline;
     }
 
-    #hide_more_private_messages {
+    #hide-more-direct-messages {
         display: block;
         text-decoration: none;
         color: inherit;
diff --git a/web/templates/left_sidebar.hbs b/web/templates/left_sidebar.hbs
index bb16a05358..9933e86e1d 100644
--- a/web/templates/left_sidebar.hbs
+++ b/web/templates/left_sidebar.hbs
@@ -142,7 +142,7 @@
                 </a>
             </div>
         </div>
-        <a class="zoom-out-hide" id="hide_more_private_messages">
+        <a class="zoom-out-hide" id="hide-more-direct-messages">
             <span> {{t 'back to streams' }}</span>
         </a>
     </div>
diff --git a/web/templates/more_pms.hbs b/web/templates/more_pms.hbs
index 1804e9a31f..95fbaffc28 100644
--- a/web/templates/more_pms.hbs
+++ b/web/templates/more_pms.hbs
@@ -1,6 +1,6 @@
-<li id="show_more_private_messages" class="pm-list-item bottom_left_row {{#unless more_conversations_unread_count}}zero-pm-unreads{{/unless}}">
+<li id="show-more-direct-messages" class="dm-list-item bottom_left_row {{#unless more_conversations_unread_count}}zero-dm-unreads{{/unless}}">
     <span>
-        <a class="pm-name" tabindex="0">{{t "more conversations" }}</a>
+        <a class="dm-name" tabindex="0">{{t "more conversations" }}</a>
         <span class="unread_count {{#unless more_conversations_unread_count}}zero_count{{/unless}}">
             {{more_conversations_unread_count}}
         </span>
diff --git a/web/templates/pm_list_item.hbs b/web/templates/pm_list_item.hbs
index 544248a4c7..561b67dd93 100644
--- a/web/templates/pm_list_item.hbs
+++ b/web/templates/pm_list_item.hbs
@@ -1,4 +1,4 @@
-<li class="{{#if is_active}}active-sub-filter{{/if}} {{#if is_zero}}zero-pm-unreads{{/if}} pm-list-item bottom_left_row" data-user-ids-string="{{user_ids_string}}">
+<li class="{{#if is_active}}active-sub-filter{{/if}} {{#if is_zero}}zero-dm-unreads{{/if}} dm-list-item bottom_left_row" data-user-ids-string="{{user_ids_string}}">
     <div class="dm-box dm-user-status" data-user-ids-string="{{user_ids_string}}" data-is-group="{{is_group}}">
 
         {{#if is_group}}