diff --git a/templates/zephyr/home.html b/templates/zephyr/home.html
index 02aefae438..fde17fdbbe 100644
--- a/templates/zephyr/home.html
+++ b/templates/zephyr/home.html
@@ -37,7 +37,7 @@
                                             <td class="ztable_col2" />
                                             <td class="ztable_col3" />
                                           </tr>
-                                          <tr id="class-message">
+                                          <tr id="stream-message">
                                             <td colspan="2" class="message_newstyle_class">
                                               <input type="text" class="recipient_box" name="stream" id="class" onchange="focus_on('instance')" value="" placeholder="Stream" autocomplete="off"/>
                                             </td>
@@ -54,7 +54,7 @@
                                             <td class="message_picture">
                                               <div id="stream_or_huddle">
                                                 <ul class="nav nav-pills nav-stacked" id="message-type-tabs">
-                                                  <li class="active"><a href="#class-message" data-toggle="pill">Stream</a></li>
+                                                  <li class="active"><a href="#stream-message" data-toggle="pill">Stream</a></li>
                                                   <li><a href="#personal-message" data-toggle="pill">Huddle</a></li>
                                                 </ul>
                                               </div>
diff --git a/zephyr/static/js/compose.js b/zephyr/static/js/compose.js
index d7fb0ae602..90b458728f 100644
--- a/zephyr/static/js/compose.js
+++ b/zephyr/static/js/compose.js
@@ -22,20 +22,20 @@ function clear_compose_box() {
 function compose_button() {
     clear_compose_box();
     $('#sidebar a[href="#home"]').tab('show');
-    show_compose('class', $("#class"));
+    show_compose('stream', $("#class"));
 }
 
 function toggle_compose() {
-    if ($("#message-type-tabs li.active").find("a[href=#class-message]").length !== 0) {
+    if ($("#message-type-tabs li.active").find("a[href=#stream-message]").length !== 0) {
         // In class tab, switch to personals.
         show_compose('personal', $("#huddle_recipient"));
     } else {
-        show_compose('class', $("#class"));
+        show_compose('stream', $("#class"));
     }
 }
 
 function composing_class_message() {
-    return $("#class-message").is(":visible");
+    return $("#stream-message").is(":visible");
 }
 
 function composing_huddle_message() {
diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js
index a0484c2c7d..5b24729fda 100644
--- a/zephyr/static/js/ui.js
+++ b/zephyr/static/js/ui.js
@@ -116,16 +116,16 @@ $(function () {
     // NB: This just binds to current elements, and won't bind to elements
     // created after ready() is called.
 
-    $('#message-type-tabs a[href="#class-message"]').on('shown', function (e) {
+    $('#message-type-tabs a[href="#stream-message"]').on('shown', function (e) {
         $('#personal-message').hide();
-        $('#class-message').show();
+        $('#stream-message').show();
         $('#new_message_type').val('stream');
         $("#send-status").removeClass(status_classes).hide();
         focus_on("stream");
     });
     $('#message-type-tabs a[href="#personal-message"]').on('shown', function (e) {
         $('#personal-message').show();
-        $('#class-message').hide();
+        $('#stream-message').hide();
         $('#new_message_type').val('personal');
         $("#send-status").removeClass(status_classes).hide();
         focus_on("huddle_recipient");
@@ -187,7 +187,7 @@ $(function () {
     });
 
     $('.button-slide').click(function () {
-        show_compose('class', $("#class"));
+        show_compose('stream', $("#class"));
     });
 
     $('#sidebar a[href="#subscriptions"]').click(fetch_subs);