diff --git a/zephyr/jstemplates/zephyr.html b/zephyr/jstemplates/zephyr.html
index 3b037d9be6..7107442f9a 100644
--- a/zephyr/jstemplates/zephyr.html
+++ b/zephyr/jstemplates/zephyr.html
@@ -38,7 +38,7 @@
 {{/if}}
 {{/include_recipient}}
 <tr zid="{{id}}" id="{{dom_id}}"
-    class="zephyr_row{{^is_class}} personal-message{{/is_class}}"
+    class="message_row{{^is_class}} personal-message{{/is_class}}"
     onclick="select_message_by_id({{id}});">
     <td class="message_picture">
     {{#include_sender}}
diff --git a/zephyr/static/js/dom_access.js b/zephyr/static/js/dom_access.js
index 8daaed59b4..8000c687a4 100644
--- a/zephyr/static/js/dom_access.js
+++ b/zephyr/static/js/dom_access.js
@@ -1,21 +1,21 @@
 function get_next_visible(message_row) {
     if (message_row === undefined)
         return [];
-    return message_row.nextAll('.zephyr_row:first');
+    return message_row.nextAll('.message_row:first');
 }
 
 function get_prev_visible(message_row) {
     if (message_row === undefined)
         return [];
-    return message_row.prevAll('.zephyr_row:first');
+    return message_row.prevAll('.message_row:first');
 }
 
 function get_first_visible() {
-    return $('.focused_table .zephyr_row:first');
+    return $('.focused_table .message_row:first');
 }
 
 function get_last_visible() {
-    return $('.focused_table .zephyr_row:last');
+    return $('.focused_table .message_row:last');
 }
 
 function get_id(message_row) {
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index 05ec1b7d23..816d73f216 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -28,7 +28,7 @@ body {
     padding-right: 30px;
 }
 
-.zephyr_row {
+.message_row {
     cursor: pointer;
 }