diff --git a/templates/zephyr/home.html b/templates/zephyr/home.html
index af09c170d5..9af05091df 100644
--- a/templates/zephyr/home.html
+++ b/templates/zephyr/home.html
@@ -53,7 +53,7 @@
                                           <tr>
                                             <td class="zephyr_picture">
                                               <div id="stream_or_huddle">
-                                                <ul class="nav nav-pills nav-stacked" id="zephyr-type-tabs">
+                                                <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><a href="#personal-message" data-toggle="pill">Huddle</a></li>
                                                 </ul>
diff --git a/zephyr/static/js/compose.js b/zephyr/static/js/compose.js
index 88259c1ad1..20c677f759 100644
--- a/zephyr/static/js/compose.js
+++ b/zephyr/static/js/compose.js
@@ -3,7 +3,7 @@ var status_classes = 'alert-error alert-success alert-info';
 function show_compose(tabname, focus_area) {
     $('#zephyr_compose').css({visibility: "visible"});
     $('.zephyr_comp').slideDown(100);
-    $('#zephyr-type-tabs a[href="#' + tabname + '-message"]').tab('show');
+    $('#message-type-tabs a[href="#' + tabname + '-message"]').tab('show');
     focus_area.focus();
     focus_area.select();
 }
@@ -25,7 +25,7 @@ function compose_button() {
 }
 
 function toggle_compose() {
-    if ($("#zephyr-type-tabs li.active").find("a[href=#class-message]").length !== 0) {
+    if ($("#message-type-tabs li.active").find("a[href=#class-message]").length !== 0) {
         // In class tab, switch to personals.
         show_compose('personal', $("#huddle_recipient"));
     } else {
diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js
index 92f146b494..1d40dba735 100644
--- a/zephyr/static/js/ui.js
+++ b/zephyr/static/js/ui.js
@@ -116,12 +116,12 @@ $(function () {
     // NB: This just binds to current elements, and won't bind to elements
     // created after ready() is called.
 
-    $('#zephyr-type-tabs a[href="#class-message"]').on('shown', function (e) {
+    $('#message-type-tabs a[href="#class-message"]').on('shown', function (e) {
         $('#personal-message').hide();
         $('#class-message').show();
         $('#new_message_type').val('class');
     });
-    $('#zephyr-type-tabs a[href="#personal-message"]').on('shown', function (e) {
+    $('#message-type-tabs a[href="#personal-message"]').on('shown', function (e) {
         $('#personal-message').show();
         $('#class-message').hide();
         $('#new_message_type').val('personal');
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index 27d2e4feef..d21c67f19c 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -348,7 +348,7 @@ input.send_zephyr {
     border: 1px solid grey;
 }
 
-#zephyr-type-tabs {
+#message-type-tabs {
     margin-top: 0px;
     margin-bottom: 0px;
 }