diff --git a/templates/zephyr/index.html b/templates/zephyr/index.html
index 6fdca71f59..b0dbb098ab 100644
--- a/templates/zephyr/index.html
+++ b/templates/zephyr/index.html
@@ -79,12 +79,12 @@ var have_initial_messages = {{ have_initial_messages }};
                 </div>
                 <div class="alert alert_sidebar" id="home-error"></div>
                 <div class="alert alert_sidebar" id="stream-dne">
-                  <p>The class <span class="classname" id="stream-dne-name"></span> does not exist.</p>
+                  <p>The stream <span class="streamname" id="stream-dne-name"></span> does not exist.</p>
                   <button type="button" id="create-it" class="btn btn-primary">Create and send</button>
                   <button type="button" class="btn" onClick="$('#stream-dne').stop(true).fadeOut(500);">Cancel message</button>
                 </div>
                 <div class="alert alert_sidebar" id="stream-nosub">
-                  <p>You're not subscribed to the class <span class="classname" id="stream-nosub-name"></span>.</p>
+                  <p>You're not subscribed to the stream <span class="streamname" id="stream-nosub-name"></span>.</p>
                   <button type="button" id="sub-it" class="btn btn-primary">Subscribe and send</button>
                   <button type="button" class="btn" onClick="$('#stream-nosub').stop(true).fadeOut(500);">Cancel message</button>
                 </div>
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index b1f4facabd..cbc46f396b 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -54,7 +54,7 @@ td.pointer {
     padding-top: 5px;
 }
 
-.ztable_col1 {    /* classname */
+.ztable_col1 {    /* streamname */
 }
 .ztable_col2 {    /* pointer */
     width: 2px;
@@ -253,7 +253,7 @@ img.profile_picture {
     display: none;
 }
 
-.classname {
+.streamname {
     font-weight: bold;
 }