diff --git a/tools/post-receive b/tools/post-receive
index 6131a2a46e..389b3784b4 100755
--- a/tools/post-receive
+++ b/tools/post-receive
@@ -1,18 +1,18 @@
 #!/usr/bin/env python
 #
-# Humbug's post-receive hook.  There is a symlink
+# Zulip's post-receive hook.  There is a symlink
 #   from /srv/git/humbug.git/hooks/post-receive
 #   to   ~humbug/humbug/tools/post-receive
 # on git.zulip.net.  So to deploy changes to this script, run
 #
 #   ssh humbug@git.zulip.net 'cd humbug; git pull'
 #
-# To send the Humbug notices, this script calls out to our
+# To send the Zulip notices, this script calls out to our
 # for-distribution git hook (under api/integrations/); since the git
 # hook needs to be in the same directory as the configuration script
 # for the git hook, this means that we need to have a shared directory
 # containing (a symlink to) both the the for-distribution git hook and
-# the Humbug configuration; for the moment those are
+# the Zulip configuration; for the moment those are
 # bots/githook-post-receive and bots/humbug_git_config.py,
 # respectively.  We need the intermediate symlink because the git hook
 # looks for its configuration in the directory that it sits in, and
diff --git a/tools/setup-git-repo b/tools/setup-git-repo
index 3f563e77e8..c7cc93f195 100755
--- a/tools/setup-git-repo
+++ b/tools/setup-git-repo
@@ -2,7 +2,7 @@
 
 if ! [ -d ".git/hooks/" ]; then
     echo "Error: Could not find .git/hooks directory"
-    echo "Please re-run this script from the root of your Humbug git checkout"
+    echo "Please re-run this script from the root of your humbug.git checkout"
     exit 1
 fi
 
diff --git a/tools/stress-test/stress-test.coffee b/tools/stress-test/stress-test.coffee
index 0b2d06c8d2..dcf48efb70 100644
--- a/tools/stress-test/stress-test.coffee
+++ b/tools/stress-test/stress-test.coffee
@@ -8,7 +8,7 @@ argv = require('optimist').default({
     'max-wait': 10
 }).argv
 
-class HumbugSession extends Session
+class ZulipSession extends Session
     constructor: (id, host, {@username, @password}) ->
         user = @username.split('@')[0]
         super(host, "#{id} #{user}")
@@ -154,7 +154,7 @@ if argv.users > users.length
 
 for i in [0..argv.users] then do ->
     user = users[i%users.length]
-    h = new HumbugSession(i, host, user)
+    h = new ZulipSession(i, host, user)
     setTimeout(h.run_test, i*user_start_step)
 
 stats = [
diff --git a/tools/stress-test/support.coffee b/tools/stress-test/support.coffee
index ef3414f39d..0127a67e95 100644
--- a/tools/stress-test/support.coffee
+++ b/tools/stress-test/support.coffee
@@ -7,7 +7,7 @@ class @Session
         @agent = new http.Agent()
         @agent._name = @name
         @jar = request.jar()
-        @headers = {'User-agent': "Humbug Load Tester"}
+        @headers = {'User-agent': "Zulip Load Tester"}
         @last_body = null
 
     request: (method, url, form, cb) ->