diff --git a/bots/check-mirroring b/bots/check-mirroring
index 26eec3d..dc0e6f3 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/zulip/__init__.py b/zulip/__init__.py
index 239441c..0f1af50 100644
--- a/zulip/__init__.py
+++ b/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: