diff --git a/templates/confirmation/invite_email_body.txt b/templates/confirmation/invite_email_body.txt
index cdee1e9787..e26b0b28fe 100644
--- a/templates/confirmation/invite_email_body.txt
+++ b/templates/confirmation/invite_email_body.txt
@@ -1,6 +1,6 @@
 Hi there,
 
-{{ referrer.full_name }} ({{ referrer.email }}) wants you to join them on Humbug -- the group communication tool you've always wished you had at work.
+{{ referrer.full_name }} ({{ referrer.email }}) wants you to join them on Zulip -- the group communication tool you've always wished you had at work.
 
 To get started, visit the link below:
     <{{ activate_url }}>
@@ -9,4 +9,4 @@ Feel free to give us a shout at <support@humbughq.com> if you have any questions
 
 Cheers,
 
-The Humbug Team
+The Zulip Team
diff --git a/templates/confirmation/invite_email_subject.txt b/templates/confirmation/invite_email_subject.txt
index bd3351f48f..76816b371b 100644
--- a/templates/confirmation/invite_email_subject.txt
+++ b/templates/confirmation/invite_email_subject.txt
@@ -1 +1 @@
-{{referrer.full_name}} invited you to join Humbug
+{{referrer.full_name}} invited you to join Zulip
diff --git a/templates/confirmation/mituser_confirmation_email_body.txt b/templates/confirmation/mituser_confirmation_email_body.txt
index 73d12c9e13..e157ebd4b3 100644
--- a/templates/confirmation/mituser_confirmation_email_body.txt
+++ b/templates/confirmation/mituser_confirmation_email_body.txt
@@ -1,8 +1,8 @@
 Hello,
 
-Thanks for giving Humbug a try!
+Thanks for giving Zulip a try!
 
-There are a few steps you need to take to ensure Humbug works with your
+There are a few steps you need to take to ensure Zulip works with your
 MIT Zephyr account.
 
  1) Create a password and activate your account:
@@ -18,5 +18,5 @@ problems.
 
 Cheers,
 
-All of us here at Humbug
+All of us here at Zulip
 
diff --git a/templates/confirmation/mituser_confirmation_email_subject.txt b/templates/confirmation/mituser_confirmation_email_subject.txt
index 6339b50b79..eba022bcd9 100644
--- a/templates/confirmation/mituser_confirmation_email_subject.txt
+++ b/templates/confirmation/mituser_confirmation_email_subject.txt
@@ -1 +1 @@
-Activate your Humbug account
+Activate your Zulip account
diff --git a/templates/confirmation/preregistrationuser_confirmation_email_body.txt b/templates/confirmation/preregistrationuser_confirmation_email_body.txt
index deec0575cf..4e184b8a68 100644
--- a/templates/confirmation/preregistrationuser_confirmation_email_body.txt
+++ b/templates/confirmation/preregistrationuser_confirmation_email_body.txt
@@ -1,6 +1,6 @@
 Hello there.
 
-You recently signed up for Humbug. Awesome!
+You recently signed up for Zulip. Awesome!
 
 To complete signup, visit this link below:
     <{{ activate_url }}>
@@ -9,4 +9,4 @@ Feel free to give us a shout at <support@humbughq.com> if you have any questions
 
 Cheers,
 
-The Humbug Team
+The Zulip Team
diff --git a/templates/confirmation/preregistrationuser_confirmation_email_subject.txt b/templates/confirmation/preregistrationuser_confirmation_email_subject.txt
index 6339b50b79..eba022bcd9 100644
--- a/templates/confirmation/preregistrationuser_confirmation_email_subject.txt
+++ b/templates/confirmation/preregistrationuser_confirmation_email_subject.txt
@@ -1 +1 @@
-Activate your Humbug account
+Activate your Zulip account
diff --git a/templates/openid_error.html b/templates/openid_error.html
index 5712a305f2..80d3278dbd 100644
--- a/templates/openid_error.html
+++ b/templates/openid_error.html
@@ -10,6 +10,6 @@
 <p>You might want to <a href="{% url 'django_openid_auth.views.login_begin' %}">try logging in via Google again</a>
   or <a href="{% url 'django.contrib.auth.views.login' %}">log in with a username or password.</a></p>
 
-<p>If you'd like, you can also <a href="mailto:support@humbughq.com?Subject=Error%20logging%20in%20with%20Google%20Apps&Body=Hi%20there%2C%0A%0AI%20encountered%20an%20error%20when%20attempting%20to%20log%20in%20with%20Google%20Apps%20on%20Humbug%20using%20my%20email%20address%20youremailgoeshere@yourdomain.example.com%0A%0AError%20message%3A%20%20{{ message|escape }}%0A%0ASincerely%2C%20%0A%0AYour%20name%20here">drop us a line</a> to let us know what happened.</p>
+<p>If you'd like, you can also <a href="mailto:support@humbughq.com?Subject=Error%20logging%20in%20with%20Google%20Apps&Body=Hi%20there%2C%0A%0AI%20encountered%20an%20error%20when%20attempting%20to%20log%20in%20with%20Google%20Apps%20on%20Zulip%20using%20my%20email%20address%20youremailgoeshere@yourdomain.example.com%0A%0AError%20message%3A%20%20{{ message|escape }}%0A%0ASincerely%2C%20%0A%0AYour%20name%20here">drop us a line</a> to let us know what happened.</p>
 
 {% endblock %}
diff --git a/templates/registration/password_reset_email.txt b/templates/registration/password_reset_email.txt
index 7647d5d70d..73594e1729 100644
--- a/templates/registration/password_reset_email.txt
+++ b/templates/registration/password_reset_email.txt
@@ -4,4 +4,4 @@ It's all good. Follow the link below and we'll take care of the rest:
     <{{ protocol}}://{{ domain }}{% url 'django.contrib.auth.views.password_reset_confirm' uidb36=uid token=token %}>
 
 Thanks,
-Your friends at Humbug HQ
+Your friends at Zulip HQ
diff --git a/templates/registration/password_reset_subject.txt b/templates/registration/password_reset_subject.txt
index ffb9a74782..4ce2d72b85 100644
--- a/templates/registration/password_reset_subject.txt
+++ b/templates/registration/password_reset_subject.txt
@@ -1 +1 @@
-Humbug password reset
+Zulip password reset
diff --git a/templates/zephyr/accounts_accept_terms.html b/templates/zephyr/accounts_accept_terms.html
index a94f2b4aa9..aaecd7b811 100644
--- a/templates/zephyr/accounts_accept_terms.html
+++ b/templates/zephyr/accounts_accept_terms.html
@@ -12,7 +12,7 @@ Allow the user to accept the terms, creating an email record of that fact.
 <div class="pitch">
     <hr/>
     <p>You're almost there. We just need you to do one last thing.</p>
-    <h3>Accept the Humbug terms of service</h3>
+    <h3>Accept the Zulip terms of service</h3>
 </div>
 
 <form method="post" class="form-horizontal" id="registration" action="{% url 'zephyr.views.accounts_accept_terms' %}">