diff --git a/templates/zerver/app/index.html b/templates/zerver/app/index.html
index 5f8134498a..fb169b76d8 100644
--- a/templates/zerver/app/index.html
+++ b/templates/zerver/app/index.html
@@ -238,7 +238,7 @@
                     </div>
                 </div>
                 <div id="message_feed_container">
-                    <div class="message_area_padder message_list" id="main_div">
+                    <div class="message-feed" id="main_div">
                         <div class="top-messages-logo">
                             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 773.12 773.12">
                                 <circle cx="386.56" cy="386.56" r="386.56"/>
diff --git a/web/styles/dark_theme.css b/web/styles/dark_theme.css
index 148746c3ff..e47095275c 100644
--- a/web/styles/dark_theme.css
+++ b/web/styles/dark_theme.css
@@ -606,7 +606,7 @@
 
     /* Not that .message_row (below) needs to be more contrast on dark theme */
     #compose-content,
-    .message_list .recipient_row,
+    .message-feed .recipient_row,
     .message_row,
     .overlay-message-row .overlay-message-info-box,
     .preview_message_area {
diff --git a/web/styles/print.css b/web/styles/print.css
index 92414e1bc2..a26b83effe 100644
--- a/web/styles/print.css
+++ b/web/styles/print.css
@@ -26,7 +26,7 @@
 
     /* Prevent headers from running on every page. */
     #navbar-fixed-container,
-    .message_list .message_header {
+    .message-feed .message_header {
         position: static;
     }
 
diff --git a/web/styles/zulip.css b/web/styles/zulip.css
index a42ee18031..3ad12cf32d 100644
--- a/web/styles/zulip.css
+++ b/web/styles/zulip.css
@@ -1357,7 +1357,7 @@ td.pointer {
     }
 }
 
-.message_list {
+.message-feed {
     .recipient_row {
         /* Browser overlaps extra top padding of message header and
            the bottom border message if this margin is not present. */