diff --git a/api/zulip/__init__.py b/api/zulip/__init__.py
index 239441c771..0f1af50156 100644
--- a/api/zulip/__init__.py
+++ b/api/zulip/__init__.py
@@ -126,7 +126,7 @@ class Client(object):
                 return False
             if self.verbose:
                 if not query_state["had_error_retry"]:
-                    sys.stdout.write("humbug API(%s): connection error%s -- retrying." % \
+                    sys.stdout.write("zulip API(%s): connection error%s -- retrying." % \
                             (url.split(API_VERSTRING, 2)[0], error_string,))
                     query_state["had_error_retry"] = True
                 else:
diff --git a/bots/check-mirroring b/bots/check-mirroring
index 26eec3df6e..dc0e6f3ab8 100755
--- a/bots/check-mirroring
+++ b/bots/check-mirroring
@@ -27,7 +27,7 @@ parser.add_option('--root-path',
 (options, args) = parser.parse_args()
 
 # The 'api' directory needs to go first, so that 'import zulip' won't pick up
-# some other directory named 'humbug'.
+# some other directory named 'zulip'.
 pyzephyr_lib_path = "python-zephyr/build/lib.linux-%s-%s/" % (os.uname()[4], sys.version[0:3])
 sys.path[:0] = [os.path.join(options.root_path, "api/"),
                 os.path.join(options.root_path, "python-zephyr"),
diff --git a/tools/run-dev.py b/tools/run-dev.py
index 1ce7d6fc54..42caebb9d3 100755
--- a/tools/run-dev.py
+++ b/tools/run-dev.py
@@ -60,7 +60,7 @@ subprocess.check_call('./tools/clean-repo')
 os.setpgrp()
 
 # Pass --nostatic because we configure static serving ourselves in
-# humbug/urls.py.
+# zulip/urls.py.
 for cmd in ['python manage.py runserver --nostatic %s localhost:%d'
                 % (manage_args, django_port),
             'python manage.py runtornado %s localhost:%d'
diff --git a/zerver/lib/bugdown/__init__.py b/zerver/lib/bugdown/__init__.py
index d454306cda..f539515664 100644
--- a/zerver/lib/bugdown/__init__.py
+++ b/zerver/lib/bugdown/__init__.py
@@ -733,7 +733,7 @@ def do_convert(md, realm_domain=None, message=None):
 
         cleaned = _sanitize_for_log(md)
 
-        # Output error to log as well as sending a humbug and email
+        # Output error to log as well as sending a zulip and email
         logging.getLogger('').error('Exception in Markdown parser: %sInput (sanitized) was: %s'
             % (traceback.format_exc(), cleaned))
         subject = "Markdown parser failure on %s" % (platform.node(),)
diff --git a/zproject/wsgi.py b/zproject/wsgi.py
index 175820b46f..38d19d1dd3 100644
--- a/zproject/wsgi.py
+++ b/zproject/wsgi.py
@@ -1,5 +1,5 @@
 """
-WSGI config for humbug project.
+WSGI config for zulip project.
 
 This module contains the WSGI application used by Django's development server
 and any production WSGI deployments. It should expose a module-level variable