diff --git a/zephyr/jstemplates/zephyr.html b/zephyr/jstemplates/zephyr.html
index 9319058b9c..580a0858e5 100644
--- a/zephyr/jstemplates/zephyr.html
+++ b/zephyr/jstemplates/zephyr.html
@@ -22,7 +22,7 @@
     {{/include_recipient}}
         <br />
     </td>
-    <td class="messagebox{{^include_sender}} collapsed_child{{/include_sender}}" onclick="select_zephyr_by_id({{id}}); respond_to_zephyr();">
+    <td class="messagebox{{^include_sender}} prev_is_same_sender{{/include_sender}}" onclick="select_zephyr_by_id({{id}}); respond_to_zephyr();">
     {{#include_sender}}
         <img class="profile_picture" src="https://secure.gravatar.com/avatar/{{gravatar_hash}}?d=identicon&s=30"/>
         <span class="zephyr_label_clickable zephyr_sender" onmouseover="select_zephyr_by_id({{id}}); show_email();" onmouseout="hide_email();">
diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index 82210a77f4..5f74c33428 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -644,7 +644,7 @@ function add_to_table(zephyrs, table_name, filter_function) {
 
         if (same_sender(prev, zephyr) && !zephyr.include_recipient) {
             zephyr.include_sender = false;
-            table.find('tr:last-child td:last-child').addClass("collapsed_parent");
+            table.find('tr:last-child td:last-child').addClass("next_is_same_sender");
         } else {
             zephyr.include_sender = true;
         }
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index 78245178e7..366f9b5b83 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -152,11 +152,11 @@ td.bookend {
     padding-top: 5px;
 }
 
-td.collapsed_child {
+td.prev_is_same_sender {
     padding-top: 0px;
     border-top: 1px; solid white
 }
-td.collapsed_parent {
+td.next_is_same_sender {
     border-bottom: 0px;
     padding-bottom: 0px;
 }