diff --git a/templates/zephyr/home.html b/templates/zephyr/home.html
index a40bde80be..786dd06aff 100644
--- a/templates/zephyr/home.html
+++ b/templates/zephyr/home.html
@@ -112,7 +112,7 @@
                         </a>
                     </li>
                     <li>
-                        <a href="#personal-message" data-toggle="pill" title="Huddle" tabindex="110">
+                        <a href="#personal-message" data-toggle="pill" title="Private message" tabindex="110">
                             <i class="icon-user"></i>
                         </a>
                     </li>
diff --git a/templates/zephyr/keyboard_shortcuts.html b/templates/zephyr/keyboard_shortcuts.html
index 2aee670680..22ccbcf38a 100644
--- a/templates/zephyr/keyboard_shortcuts.html
+++ b/templates/zephyr/keyboard_shortcuts.html
@@ -21,7 +21,7 @@
               </tr>
               <tr>
                 <td class="hotkey">C</td>
-                <td class="definition">Compose new huddle message</td>
+                <td class="definition">Compose new private message</td>
               </tr>
               <tr>
                 <td class="hotkey">r</td>
@@ -33,7 +33,7 @@
               </tr>
               <tr>
                 <td class="hotkey">&lt;Tab&gt;</td>
-                <td class="definition">Switch between composing stream and huddle</td>
+                <td class="definition">Switch between composing stream and private message</td>
               </tr>
               <tr>
                 <td class="hotkey">&lt;Tab&gt; and Enter</td>
@@ -67,7 +67,7 @@
               </tr>
               <tr>
                 <td class="hotkey">h</td>
-                <td class="definition">Narrow to all huddles</td>
+                <td class="definition">Narrow to all private messages</td>
               </tr>
               <tr>
                 <td class="hotkey">Esc</td>
diff --git a/zephyr/jstemplates/message.html b/zephyr/jstemplates/message.html
index 00efe77496..40beba2c3e 100644
--- a/zephyr/jstemplates/message.html
+++ b/zephyr/jstemplates/message.html
@@ -41,7 +41,7 @@
     </td>
     <td class="message_label_clickable message_header message_header_huddle right_part"
         onclick="narrow.target({{id}}); narrow.by_recipient();"
-        title="Narrow to your huddles with {{display_reply_to}}">You and {{display_reply_to}}</td>
+        title="Narrow to your private messages with {{display_reply_to}}">You and {{display_reply_to}}</td>
 </tr>
 {{/if}}
 {{/include_recipient}}
diff --git a/zephyr/jstemplates/userinfo_popover_content.html b/zephyr/jstemplates/userinfo_popover_content.html
index 01808d9b10..da43175287 100644
--- a/zephyr/jstemplates/userinfo_popover_content.html
+++ b/zephyr/jstemplates/userinfo_popover_content.html
@@ -2,7 +2,7 @@
 <ul class="nav nav-list userinfo_popover">
   <li>
     <a onclick="respond_to_message();">
-      <i class="icon-share-alt"></i> Reply to this {{#if is_stream}}stream{{else}}huddle{{/if}}
+      <i class="icon-share-alt"></i> Reply to this {{#if is_stream}}stream{{else}}private message{{/if}}
     </a>
   </li>
   {{#unless is_personal}}