diff --git a/templates/zephyr/index.html b/templates/zephyr/index.html
index 9df72a8087..8461d96821 100644
--- a/templates/zephyr/index.html
+++ b/templates/zephyr/index.html
@@ -12,8 +12,8 @@
 
 {% block customhead %}
 
-<script id="template_zephyr" type="text/x-handlebars-template">
-{% rawjstemplate "zephyr" %}
+<script id="template_message" type="text/x-handlebars-template">
+{% rawjstemplate "message" %}
 </script>
 
 <script id="template_subscription" type="text/x-handlebars-template">
diff --git a/zephyr/jstemplates/zephyr.html b/zephyr/jstemplates/message.html
similarity index 100%
rename from zephyr/jstemplates/zephyr.html
rename to zephyr/jstemplates/message.html
diff --git a/zephyr/static/js/setup.js b/zephyr/static/js/setup.js
index 57b3539a7d..00706b1a00 100644
--- a/zephyr/static/js/setup.js
+++ b/zephyr/static/js/setup.js
@@ -13,7 +13,7 @@ $(function () {
     }
 
     // Compile Handlebars templates.
-    templates.zephyr       = Handlebars.compile($("#template_zephyr").html());
+    templates.message       = Handlebars.compile($("#template_message").html());
     templates.subscription = Handlebars.compile($("#template_subscription").html());
 });
 
diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index 46d2efafb8..b224371cfe 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -326,7 +326,7 @@ function add_to_table(messages, table_name, filter_function, where) {
         message_groups[table_name] = message_groups[table_name].concat(new_message_groups);
     }
 
-    var rendered = templates.zephyr({
+    var rendered = templates.message({
         messages: messages_to_render,
         include_layout_row: (table.find('tr:first').length === 0)
     });