diff --git a/bots/check-mirroring b/bots/check-mirroring
index 8ee85df42f..26eec3df6e 100755
--- a/bots/check-mirroring
+++ b/bots/check-mirroring
@@ -22,7 +22,7 @@ parser.add_option('--sharded',
                   action='store_true')
 parser.add_option('--root-path',
                   dest='root_path',
-                  default="/home/humbug",
+                  default="/home/zulip",
                   action='store')
 (options, args) = parser.parse_args()
 
diff --git a/bots/process_ccache b/bots/process_ccache
index 08f8e487e0..8d404cdd90 100755
--- a/bots/process_ccache
+++ b/bots/process_ccache
@@ -10,18 +10,18 @@ ccache_data_encoded = sys.argv[3]
 
 # Update the Kerberos ticket cache file
 program_name = "zmirror-%s" % (short_user,)
-with file("/home/humbug/ccache/%s" % (program_name,), "w") as f:
+with file("/home/zulip/ccache/%s" % (program_name,), "w") as f:
     f.write(base64.b64decode(ccache_data_encoded))
 
 # Setup API key
-api_key_path = "/home/humbug/api-keys/%s" % (program_name,)
+api_key_path = "/home/zulip/api-keys/%s" % (program_name,)
 file(api_key_path, "w").write(api_key + "\n")
 
 # Setup supervisord configuration
 supervisor_path = "/etc/supervisor/conf.d/%s.conf" % (program_name,)
-template = "/home/humbug/zulip/bots/zmirror_private.conf.template"
+template = "/home/zulip/zulip/bots/zmirror_private.conf.template"
 template_data = file(template).read()
-session_path = "/home/humbug/zephyr_sessions/%s" % (program_name,)
+session_path = "/home/zulip/zephyr_sessions/%s" % (program_name,)
 
 # Preserve mail zephyrs forwarding setting across rewriting the config file
 
diff --git a/bots/sync-public-streams b/bots/sync-public-streams
index d2ddaf7164..ebbbefb487 100755
--- a/bots/sync-public-streams
+++ b/bots/sync-public-streams
@@ -43,7 +43,7 @@ def fetch_public_streams():
     return public_streams
 
 if __name__ == "__main__":
-    log_file = "/home/humbug/sync_public_streams.log"
+    log_file = "/home/zulip/sync_public_streams.log"
     logger = logging.getLogger(__name__)
     log_format = "%(asctime)s: %(message)s"
     logging.basicConfig(format=log_format)
@@ -59,9 +59,9 @@ if __name__ == "__main__":
         if public_streams is None:
             continue
 
-        f = file("/home/humbug/public_streams.tmp", "w")
+        f = file("/home/zulip/public_streams.tmp", "w")
         f.write(simplejson.dumps(list(public_streams)) + "\n")
         f.close()
 
-        subprocess.call(["mv", "/home/humbug/public_streams.tmp", "/home/humbug/public_streams"])
+        subprocess.call(["mv", "/home/zulip/public_streams.tmp", "/home/zulip/public_streams"])
 
diff --git a/bots/zephyr_mirror.py b/bots/zephyr_mirror.py
index 925be92b84..a976131d6b 100755
--- a/bots/zephyr_mirror.py
+++ b/bots/zephyr_mirror.py
@@ -46,7 +46,7 @@ if options.sync_subscriptions:
     sys.exit(0)
 
 if options.forward_class_messages and not options.noshard:
-    sys.path.append("/home/humbug/zulip")
+    sys.path.append("/home/zulip/zulip")
     if options.on_startup_command is not None:
         subprocess.call([options.on_startup_command])
     from zerver.lib.parallel import run_parallel
diff --git a/bots/zephyr_mirror_backend.py b/bots/zephyr_mirror_backend.py
index 8d71f06ac6..c2c01e5d9f 100755
--- a/bots/zephyr_mirror_backend.py
+++ b/bots/zephyr_mirror_backend.py
@@ -960,7 +960,7 @@ def parse_args():
                       help=optparse.SUPPRESS_HELP)
     parser.add_option('--stream-file-path',
                       dest='stream_file_path',
-                      default="/home/humbug/public_streams",
+                      default="/home/zulip/public_streams",
                       help=optparse.SUPPRESS_HELP)
     parser.add_option('--no-forward-personals',
                       dest='forward_personals',
diff --git a/bots/zmirror-renew-kerberos b/bots/zmirror-renew-kerberos
index 3b68808709..d8fe9986a3 100755
--- a/bots/zmirror-renew-kerberos
+++ b/bots/zmirror-renew-kerberos
@@ -1,2 +1,2 @@
 #!/bin/sh
-env KRB5CCNAME=/tmp/krb5cc_1000.tmp kinit -k -t /home/humbug/tabbott.extra.keytab tabbott/extra@ATHENA.MIT.EDU; mv /tmp/krb5cc_1000.tmp /tmp/krb5cc_1000
+env KRB5CCNAME=/tmp/krb5cc_1000.tmp kinit -k -t /home/zulip/tabbott.extra.keytab tabbott/extra@ATHENA.MIT.EDU; mv /tmp/krb5cc_1000.tmp /tmp/krb5cc_1000
diff --git a/bots/zmirror_private.conf.template b/bots/zmirror_private.conf.template
index 30a49b2744..556de90eda 100644
--- a/bots/zmirror_private.conf.template
+++ b/bots/zmirror_private.conf.template
@@ -1,5 +1,5 @@
 [program:zmirror-USERNAME]
-command=python /home/humbug/zulip/bots/zephyr_mirror_backend.py --root-path=/home/humbug/zulip/bots --user=USERNAME --log-path=/home/humbug/logs/mirror-log-%(program_name)s --use-sessions --session-path=/home/humbug/zephyr_sessions/%(program_name)s --api-key-file=/home/humbug/api-keys/%(program_name)s --ignore-expired-tickets --nagios-path=/home/humbug/mirror_status/%(program_name)s --nagios-class=zulip-mirror-nagios
+command=python /home/zulip/zulip/bots/zephyr_mirror_backend.py --root-path=/home/zulip/zulip/bots --user=USERNAME --log-path=/home/zulip/logs/mirror-log-%(program_name)s --use-sessions --session-path=/home/zulip/zephyr_sessions/%(program_name)s --api-key-file=/home/zulip/api-keys/%(program_name)s --ignore-expired-tickets --nagios-path=/home/zulip/mirror_status/%(program_name)s --nagios-class=zulip-mirror-nagios
 priority=200                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -8,4 +8,4 @@ stopwaitsecs=30                ; max num secs to wait b4 SIGKILL (default 10)
 user=humbug                    ; setuid to this UNIX account to run the program
 redirect_stderr=true           ; redirect proc stderr to stdout (default false)
 stdout_logfile=/var/log/zulip/%(program_name)s.log         ; stdout log path, NONE for none; default AUTO
-environment=HOME="/home/humbug",USER="humbug",KRB5CCNAME="/home/humbug/ccache/%(program_name)s"
+environment=HOME="/home/zulip",USER="humbug",KRB5CCNAME="/home/zulip/ccache/%(program_name)s"
diff --git a/bots/zulip_git_config.py b/bots/zulip_git_config.py
index f3707eeb30..6ade66d606 100644
--- a/bots/zulip_git_config.py
+++ b/bots/zulip_git_config.py
@@ -30,5 +30,5 @@ def commit_notice_destination(repo, branch, commit):
     # Return None for cases where you don't want a notice sent
     return None
 
-ZULIP_API_PATH = "/home/humbug/zulip/api"
+ZULIP_API_PATH = "/home/zulip/zulip/api"
 ZULIP_SITE = "https://staging.zulip.com"
diff --git a/bots/zulip_trac_config.py b/bots/zulip_trac_config.py
index 47475254ad..ff7d5e740e 100644
--- a/bots/zulip_trac_config.py
+++ b/bots/zulip_trac_config.py
@@ -10,5 +10,5 @@ STREAM_FOR_NOTIFICATIONS = "trac"
 TRAC_BASE_TICKET_URL = "https://trac.zulip.net/ticket"
 
 TRAC_NOTIFY_FIELDS = ["description", "summary", "resolution", "comment", "owner"]
-ZULIP_API_PATH = "/home/humbug/zulip/api"
+ZULIP_API_PATH = "/home/zulip/zulip/api"
 ZULIP_SITE = "https://staging.zulip.com"
diff --git a/servers/install-server b/servers/install-server
index 16988b386b..f5a0f675c5 100755
--- a/servers/install-server
+++ b/servers/install-server
@@ -84,8 +84,8 @@ cp -a /root/zulip/servers/puppet/modules/zulip/files/puppet.conf /etc/puppet/
 userdel admin
 passwd -d root
 puppet apply -e 'class {"zulip": machinetype => "$type"}'
-cp -a /root/zulip /home/humbug/zulip
-chown -R humbug:humbug /home/humbug/zulip
+cp -a /root/zulip /home/zulip/zulip
+chown -R humbug:humbug /home/zulip/zulip
 # These server restarting bits should be moveable into puppet-land, ideally
 apt-get -y upgrade
 if [ -e "/etc/init.d/nginx" ]; then
@@ -98,9 +98,9 @@ fi
 EOF
 
 # TODO: Don't give servers push access to our git!
-scp $SSH_OPTS -i "$amazon_key_file" "$server_private_key_file" humbug@"$server":/home/humbug/.ssh/id_rsa
+scp $SSH_OPTS -i "$amazon_key_file" "$server_private_key_file" humbug@"$server":/home/zulip/.ssh/id_rsa
 ssh $SSH_OPTS "$server" -t -i "$amazon_key_file" -lhumbug <<EOF
-chmod 600 /home/humbug/.ssh/id_rsa
+chmod 600 /home/zulip/.ssh/id_rsa
 EOF
 
 set +x
diff --git a/servers/puppet/modules/zulip/files/apache/sites/trac b/servers/puppet/modules/zulip/files/apache/sites/trac
index 12ded3d70d..0befb8303f 100644
--- a/servers/puppet/modules/zulip/files/apache/sites/trac
+++ b/servers/puppet/modules/zulip/files/apache/sites/trac
@@ -32,17 +32,17 @@
     Header add Strict-Transport-Security "max-age=15768000"
     Header add X-Frame-Options DENY
 
-    Alias /chrome/common /home/humbug/trac/htdocs/common
-    Alias /chrome/site /home/humbug/trac/htdocs/site
+    Alias /chrome/common /home/zulip/trac/htdocs/common
+    Alias /chrome/site /home/zulip/trac/htdocs/site
 
-    <Directory "/home/humbug/trac/htdocs">
+    <Directory "/home/zulip/trac/htdocs">
         Order allow,deny
         Allow from all
     </Directory>
 
-    WSGIScriptAlias / /home/humbug/trac/cgi-bin/trac.wsgi
+    WSGIScriptAlias / /home/zulip/trac/cgi-bin/trac.wsgi
 
-    <Directory /home/humbug/trac>
+    <Directory /home/zulip/trac>
         WSGIApplicationGroup %{GLOBAL}
         Order deny,allow
         Allow from all
diff --git a/servers/puppet/modules/zulip/files/builder/sbuildrc b/servers/puppet/modules/zulip/files/builder/sbuildrc
index 22d8dc3b97..603d9d3a93 100644
--- a/servers/puppet/modules/zulip/files/builder/sbuildrc
+++ b/servers/puppet/modules/zulip/files/builder/sbuildrc
@@ -6,10 +6,10 @@ $mailto = 'buildd-maintainers@zulip.net';
 # umt compare-bin relies upon this being unset.
 #
 # The above comment is a lie. ~ lfaraone
-$build_dir='/home/humbug/ubuntu/build';
+$build_dir='/home/zulip/ubuntu/build';
 
 # Directory for writing build logs to
-$log_dir="/home/humbug/ubuntu/logs";
+$log_dir="/home/zulip/ubuntu/logs";
 
 # Override default sbuild dependency resolver (see 'man sbuild'). The default
 # resolver (apt) mostly works ok but not always (eg, oneiric libreoffice).
diff --git a/servers/puppet/modules/zulip/files/cron.d/clearsessions b/servers/puppet/modules/zulip/files/cron.d/clearsessions
index ba9663a6b1..8a9605b4c2 100644
--- a/servers/puppet/modules/zulip/files/cron.d/clearsessions
+++ b/servers/puppet/modules/zulip/files/cron.d/clearsessions
@@ -1,4 +1,4 @@
 MAILTO=root
 
 # Clear all expired Django sessions at 10:22 PM every day.
-22 22 * * *   humbug cd /home/humbug/deployments/current && python manage.py clearsessions
+22 22 * * *   humbug cd /home/zulip/deployments/current && python manage.py clearsessions
diff --git a/servers/puppet/modules/zulip/files/cron.d/email-mirror b/servers/puppet/modules/zulip/files/cron.d/email-mirror
index f0b998c56b..e5562ef7ee 100644
--- a/servers/puppet/modules/zulip/files/cron.d/email-mirror
+++ b/servers/puppet/modules/zulip/files/cron.d/email-mirror
@@ -1,3 +1,3 @@
 MAILTO=root
 
-* * * * *   humbug cd /home/humbug/deployments/current && python manage.py email-mirror
+* * * * *   humbug cd /home/zulip/deployments/current && python manage.py email-mirror
diff --git a/servers/puppet/modules/zulip/files/cron.d/graphite_backup b/servers/puppet/modules/zulip/files/cron.d/graphite_backup
index 50085992eb..97ec838e64 100644
--- a/servers/puppet/modules/zulip/files/cron.d/graphite_backup
+++ b/servers/puppet/modules/zulip/files/cron.d/graphite_backup
@@ -1,4 +1,4 @@
 MAILTO=root
 SHELL=/bin/bash
 
-0 3 * * * humbug /home/humbug/zulip/servers/puppet/modules/zulip/files/graphite/daily_rsync_backup.sh
+0 3 * * * humbug /home/zulip/zulip/servers/puppet/modules/zulip/files/graphite/daily_rsync_backup.sh
diff --git a/servers/puppet/modules/zulip/files/cron.d/rabbitmq-numconsumers b/servers/puppet/modules/zulip/files/cron.d/rabbitmq-numconsumers
index 44efeb001b..2024077ec6 100644
--- a/servers/puppet/modules/zulip/files/cron.d/rabbitmq-numconsumers
+++ b/servers/puppet/modules/zulip/files/cron.d/rabbitmq-numconsumers
@@ -2,9 +2,9 @@ SHELL=/bin/bash
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 USER=root
 
-* * * * * root /home/humbug/deployments/current/tools/write-rabbitmq-consumers-state-file notify_tornado
-* * * * * root /home/humbug/deployments/current/tools/write-rabbitmq-consumers-state-file user_activity
-* * * * * root /home/humbug/deployments/current/tools/write-rabbitmq-consumers-state-file user_activity_interval
-* * * * * root /home/humbug/deployments/current/tools/write-rabbitmq-consumers-state-file user_presence
-* * * * * root /home/humbug/deployments/current/tools/write-rabbitmq-consumers-state-file invites
-* * * * * root /home/humbug/deployments/current/tools/write-rabbitmq-consumers-state-file signups
+* * * * * root /home/zulip/deployments/current/tools/write-rabbitmq-consumers-state-file notify_tornado
+* * * * * root /home/zulip/deployments/current/tools/write-rabbitmq-consumers-state-file user_activity
+* * * * * root /home/zulip/deployments/current/tools/write-rabbitmq-consumers-state-file user_activity_interval
+* * * * * root /home/zulip/deployments/current/tools/write-rabbitmq-consumers-state-file user_presence
+* * * * * root /home/zulip/deployments/current/tools/write-rabbitmq-consumers-state-file invites
+* * * * * root /home/zulip/deployments/current/tools/write-rabbitmq-consumers-state-file signups
diff --git a/servers/puppet/modules/zulip/files/cron.d/rabbitmq-queuesize b/servers/puppet/modules/zulip/files/cron.d/rabbitmq-queuesize
index 24950dc1eb..8d37135433 100644
--- a/servers/puppet/modules/zulip/files/cron.d/rabbitmq-queuesize
+++ b/servers/puppet/modules/zulip/files/cron.d/rabbitmq-queuesize
@@ -22,4 +22,4 @@
 # m h  dom mon dow   command
 SHELL=/bin/bash
 
-* * * * * root /home/humbug/deployments/current/bots/check-rabbitmq-queue &> /var/lib/nagios_state/check-rabbitmq-results-tmp; mv /var/lib/nagios_state/check-rabbitmq-results-tmp /var/lib/nagios_state/check-rabbitmq-results
+* * * * * root /home/zulip/deployments/current/bots/check-rabbitmq-queue &> /var/lib/nagios_state/check-rabbitmq-results-tmp; mv /var/lib/nagios_state/check-rabbitmq-results-tmp /var/lib/nagios_state/check-rabbitmq-results
diff --git a/servers/puppet/modules/zulip/files/cron.d/test_zephyr_personal_mirrors b/servers/puppet/modules/zulip/files/cron.d/test_zephyr_personal_mirrors
index 536bbeb532..672fda5dc4 100644
--- a/servers/puppet/modules/zulip/files/cron.d/test_zephyr_personal_mirrors
+++ b/servers/puppet/modules/zulip/files/cron.d/test_zephyr_personal_mirrors
@@ -1,4 +1,4 @@
 # We don't actually need a valid Kerberos cache since these are sent
 # unauth anyway -- but a cache is required for zwrite to run.
 
-* * * * * humbug env KRB5CCNAME=/home/humbug/ccache/zmirror-tabbott zwrite -c zulip-mirror-nagios -i nagios-test -m test -Szulip-nagios@mit.edu -d -q >/dev/null 2>/dev/null
+* * * * * humbug env KRB5CCNAME=/home/zulip/ccache/zmirror-tabbott zwrite -c zulip-mirror-nagios -i nagios-test -m test -Szulip-nagios@mit.edu -d -q >/dev/null 2>/dev/null
diff --git a/servers/puppet/modules/zulip/files/cron.d/zephyr-mirror b/servers/puppet/modules/zulip/files/cron.d/zephyr-mirror
index 6664862c75..f7826c1f36 100644
--- a/servers/puppet/modules/zulip/files/cron.d/zephyr-mirror
+++ b/servers/puppet/modules/zulip/files/cron.d/zephyr-mirror
@@ -22,5 +22,5 @@ SHELL=/bin/bash
 # For more information see the manual pages of crontab(5) and cron(8)
 #
 # m h  dom mon dow   command
-35 * * * * humbug /home/humbug/zulip/bots/zmirror-renew-kerberos
-*/2 * * * * humbug /home/humbug/zulip/bots/check-mirroring --sharded &> /var/lib/nagios_state/check-mirroring-results-tmp; mv /var/lib/nagios_state/check-mirroring-results-tmp /var/lib/nagios_state/check-mirroring-results
+35 * * * * humbug /home/zulip/zulip/bots/zmirror-renew-kerberos
+*/2 * * * * humbug /home/zulip/zulip/bots/check-mirroring --sharded &> /var/lib/nagios_state/check-mirroring-results-tmp; mv /var/lib/nagios_state/check-mirroring-results-tmp /var/lib/nagios_state/check-mirroring-results
diff --git a/servers/puppet/modules/zulip/files/graphiti/settings.yml b/servers/puppet/modules/zulip/files/graphiti/settings.yml
index a7b407e656..2f28947e8d 100644
--- a/servers/puppet/modules/zulip/files/graphiti/settings.yml
+++ b/servers/puppet/modules/zulip/files/graphiti/settings.yml
@@ -3,7 +3,7 @@ graphiti_base_url: https://stats1.zulip.net/graphiti/
 graphite_base_url: https://graphiti:xxxxxxxxxxxxxxxxxx@stats1.zulip.net:444/
 graphite_userpw: "graphiti:xxxxxxxxxxxxxxxxxx"
 graphite_auth: :digest
-graphite_cert: "/home/humbug/graphiti/humbughq_cert_internal.pem"
+graphite_cert: "/home/zulip/graphiti/humbughq_cert_internal.pem"
 #graphite_base_url: https://user:pass@graphite01.pp.local
 redis_url: localhost:6978:1/graphiti
 tmp_dir: /tmp
diff --git a/servers/puppet/modules/zulip/files/munin-plugins/humbug_send_receive b/servers/puppet/modules/zulip/files/munin-plugins/humbug_send_receive
index 4e5634c4cc..ab2ebe898e 100755
--- a/servers/puppet/modules/zulip/files/munin-plugins/humbug_send_receive
+++ b/servers/puppet/modules/zulip/files/munin-plugins/humbug_send_receive
@@ -4,4 +4,4 @@ if [ "$(hostname)" = "staging.zulip.net" ]; then
 else
     site="https://api.zulip.com"
 fi
-/home/humbug/deployments/current/bots/check_send_receive.py --munin $1 --site="$site"
+/home/zulip/deployments/current/bots/check_send_receive.py --munin $1 --site="$site"
diff --git a/servers/puppet/modules/zulip/files/munin-plugins/tornado_event_queues b/servers/puppet/modules/zulip/files/munin-plugins/tornado_event_queues
index ed97910234..6acba46a53 100755
--- a/servers/puppet/modules/zulip/files/munin-plugins/tornado_event_queues
+++ b/servers/puppet/modules/zulip/files/munin-plugins/tornado_event_queues
@@ -58,5 +58,5 @@ fi
 # real work - i.e. display the data. Almost always this will be
 # "value" subfield for every data field.
 
-echo "active_queues.value $(cat /home/humbug/stats/tornado.active_queues)"
-echo "active_users.value $(cat /home/humbug/stats/tornado.active_users)"
+echo "active_queues.value $(cat /home/zulip/stats/tornado.active_queues)"
+echo "active_users.value $(cat /home/zulip/stats/tornado.active_users)"
diff --git a/servers/puppet/modules/zulip/files/nagios3/commands.cfg b/servers/puppet/modules/zulip/files/nagios3/commands.cfg
index b45122496d..c4daaad2e9 100644
--- a/servers/puppet/modules/zulip/files/nagios3/commands.cfg
+++ b/servers/puppet/modules/zulip/files/nagios3/commands.cfg
@@ -83,7 +83,7 @@ define command{
 
 define command{
         command_name    check_feedback_bot
-        command_line    /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l nagios -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_procs -u humbug -c 1:1 -a "python /home/humbug/zulip/bots/feedback-bot"'
+        command_line    /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l nagios -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_procs -u humbug -c 1:1 -a "python /home/zulip/zulip/bots/feedback-bot"'
 }
 
 define command{
@@ -103,7 +103,7 @@ define command{
 
 define command{
         command_name    check_sync_public_streams
-        command_line    /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l nagios -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_procs -u humbug -c 1:1 -a "/home/humbug/zulip/bots/sync-public-streams"'
+        command_line    /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l nagios -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_procs -u humbug -c 1:1 -a "/home/zulip/zulip/bots/sync-public-streams"'
 }
 
 define command{
diff --git a/servers/puppet/modules/zulip/files/nagios_plugins/check_personal_zephyr_mirrors b/servers/puppet/modules/zulip/files/nagios_plugins/check_personal_zephyr_mirrors
index 9d0a60852b..5c0b502efc 100644
--- a/servers/puppet/modules/zulip/files/nagios_plugins/check_personal_zephyr_mirrors
+++ b/servers/puppet/modules/zulip/files/nagios_plugins/check_personal_zephyr_mirrors
@@ -4,7 +4,7 @@
 Nagios plugin to check that Zephyr personals mirrors are forwarding.
 
 This script works by just monitoring the files under
-/home/humbug/mirror_status, which are updated by the Zephyr personals
+/home/zulip/mirror_status, which are updated by the Zephyr personals
 mirrors when they receive the messages sent every minute by
 /etc/cron.d/test_zephyr_personal_mirrors
 """
@@ -12,7 +12,7 @@ mirrors when they receive the messages sent every minute by
 import os
 import time
 
-RESULTS_DIR = "/home/humbug/mirror_status"
+RESULTS_DIR = "/home/zulip/mirror_status"
 
 states = {
     "OK": 0,
diff --git a/servers/puppet/modules/zulip/files/nagios_plugins/check_rabbitmq_consumers b/servers/puppet/modules/zulip/files/nagios_plugins/check_rabbitmq_consumers
index cf9fef976f..711126ca29 100755
--- a/servers/puppet/modules/zulip/files/nagios_plugins/check_rabbitmq_consumers
+++ b/servers/puppet/modules/zulip/files/nagios_plugins/check_rabbitmq_consumers
@@ -11,7 +11,7 @@ It is run by cron and can be found at bots/rabbitmq-numconsumers-crontab
 
 import sys
 
-sys.path.append('/home/humbug/deployments/current')
+sys.path.append('/home/zulip/deployments/current')
 from bots.cron_file_helper import nagios_from_file
 
 if len(sys.argv) < 2:
diff --git a/servers/puppet/modules/zulip/files/nagios_plugins/check_rabbitmq_queues b/servers/puppet/modules/zulip/files/nagios_plugins/check_rabbitmq_queues
index 07c39b37c6..5ea47e3b16 100755
--- a/servers/puppet/modules/zulip/files/nagios_plugins/check_rabbitmq_queues
+++ b/servers/puppet/modules/zulip/files/nagios_plugins/check_rabbitmq_queues
@@ -12,7 +12,7 @@ It is run by cron and can be found at bots/rabbitmq-queuesize-crontab
 
 import sys
 
-sys.path.append('/home/humbug/deployments/current')
+sys.path.append('/home/zulip/deployments/current')
 from bots.cron_file_helper import nagios_from_file
 
 RESULTS_FILE = "/var/lib/nagios_state/check-rabbitmq-results"
diff --git a/servers/puppet/modules/zulip/files/nagios_plugins/check_send_receive_time b/servers/puppet/modules/zulip/files/nagios_plugins/check_send_receive_time
index 1a28e6be86..345d1dcd41 100755
--- a/servers/puppet/modules/zulip/files/nagios_plugins/check_send_receive_time
+++ b/servers/puppet/modules/zulip/files/nagios_plugins/check_send_receive_time
@@ -58,7 +58,7 @@ sendreceive.warning 3
 sendreceive.critical 5"""
         sys.exit(0)
 
-sys.path.append('/home/humbug/deployments/current/api')
+sys.path.append('/home/zulip/deployments/current/api')
 import zulip
 
 states = {
diff --git a/servers/puppet/modules/zulip/files/nagios_plugins/check_user_zephyr_mirror_liveness b/servers/puppet/modules/zulip/files/nagios_plugins/check_user_zephyr_mirror_liveness
index ba7d029fd0..eff57665ad 100755
--- a/servers/puppet/modules/zulip/files/nagios_plugins/check_user_zephyr_mirror_liveness
+++ b/servers/puppet/modules/zulip/files/nagios_plugins/check_user_zephyr_mirror_liveness
@@ -12,8 +12,8 @@ import os
 import sys
 
 os.environ['DJANGO_SETTINGS_MODULE'] = "zproject.settings"
-sys.path.append('/home/humbug/deployments/current')
-sys.path.append('/home/humbug/deployments/current/zerver')
+sys.path.append('/home/zulip/deployments/current')
+sys.path.append('/home/zulip/deployments/current/zerver')
 
 from zerver.models import UserActivity
 
diff --git a/servers/puppet/modules/zulip/files/nginx/zulip-include/app b/servers/puppet/modules/zulip/files/nginx/zulip-include/app
index dbce08267a..fb0de91173 100644
--- a/servers/puppet/modules/zulip/files/nginx/zulip-include/app
+++ b/servers/puppet/modules/zulip/files/nginx/zulip-include/app
@@ -9,7 +9,7 @@ error_page 502 503 504 /static/html/5xx.html;
 
 # Serve static files directly
 location /static/ {
-    alias /home/humbug/prod-static/;
+    alias /home/zulip/prod-static/;
     error_page 404 /static/html/404.html;
 }
 
@@ -30,7 +30,7 @@ location ~ /json/get_updates|/api/v1/get_messages|/api/v1/messages/latest|/json/
 # Send everything else to Django via FastCGI
 location / {
     include fastcgi_params;
-    fastcgi_pass unix:/home/humbug/deployments/fastcgi-socket;
+    fastcgi_pass unix:/home/zulip/deployments/fastcgi-socket;
     fastcgi_split_path_info ^()(.*)$;
     # Second number set to `getconf PAGESIZE`
     fastcgi_buffers 1024 4k;
diff --git a/servers/puppet/modules/zulip/files/supervisor/conf.d/feedback-bot.conf b/servers/puppet/modules/zulip/files/supervisor/conf.d/feedback-bot.conf
index bd8010a112..8b876d326f 100644
--- a/servers/puppet/modules/zulip/files/supervisor/conf.d/feedback-bot.conf
+++ b/servers/puppet/modules/zulip/files/supervisor/conf.d/feedback-bot.conf
@@ -1,4 +1,4 @@
 [program:feedback-bot]
-command=/home/humbug/zulip/bots/feedback-bot
+command=/home/zulip/zulip/bots/feedback-bot
 autostart=true
 user=humbug
diff --git a/servers/puppet/modules/zulip/files/supervisor/conf.d/stats.conf b/servers/puppet/modules/zulip/files/supervisor/conf.d/stats.conf
index 48af963fbf..c0b21d32f5 100644
--- a/servers/puppet/modules/zulip/files/supervisor/conf.d/stats.conf
+++ b/servers/puppet/modules/zulip/files/supervisor/conf.d/stats.conf
@@ -12,7 +12,7 @@ stopwaitsecs=30                ; max num secs to wait b4 SIGKILL (default 10)
 user=root                    ; setuid to this UNIX account to run the program
 redirect_stderr=true           ; redirect proc stderr to stdout (default false)
 stdout_logfile=/var/log/zulip/carbon-cache.log         ; stdout log path, NONE for none; default AUTO
-directory=/home/humbug/
+directory=/home/zulip/
 
 [program:zulip-carbon-aggregator]
 command=python /opt/graphite/bin/carbon-aggregator.py --debug start
@@ -24,10 +24,10 @@ stopwaitsecs=30                ; max num secs to wait b4 SIGKILL (default 10)
 user=root                    ; setuid to this UNIX account to run the program
 redirect_stderr=true           ; redirect proc stderr to stdout (default false)
 stdout_logfile=/var/log/zulip/carbon-aggregator.log         ; stdout log path, NONE for none; default AUTO
-directory=/home/humbug/
+directory=/home/zulip/
 
 [program:zulip-statsd]
-command=node stats.js /home/humbug/zulip/servers/puppet/modules/zulip/files/statsd/local.js
+command=node stats.js /home/zulip/zulip/servers/puppet/modules/zulip/files/statsd/local.js
 priority=200                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -36,11 +36,11 @@ stopwaitsecs=30                ; max num secs to wait b4 SIGKILL (default 10)
 user=humbug                    ; setuid to this UNIX account to run the program
 redirect_stderr=true           ; redirect proc stderr to stdout (default false)
 stdout_logfile=/var/log/zulip/statsd.log         ; stdout log path, NONE for none; default AUTO
-directory=/home/humbug/statsd
+directory=/home/zulip/statsd
 
 
 [program:zulip-graphiti]
-command=/home/humbug/zulip/tools/run-graphiti
+command=/home/zulip/zulip/tools/run-graphiti
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
 stopsignal=TERM                 ; signal used to kill process (default TERM)
@@ -48,7 +48,7 @@ stopwaitsecs=30                ; max num secs to wait b4 SIGKILL (default 10)
 user=humbug                    ; setuid to this UNIX account to run the program
 redirect_stderr=true           ; redirect proc stderr to stdout (default false)
 stdout_logfile=/var/log/zulip/graphiti.log         ; stdout log path, NONE for none; default AUTO
-directory=/home/humbug/graphiti
+directory=/home/zulip/graphiti
 
 [group:zulip-stats]
 programs=zulip-carbon-cache,zulip-carbon-aggregator,zulip-statsd,zulip-graphiti
diff --git a/servers/puppet/modules/zulip/files/supervisor/conf.d/zmirror.conf b/servers/puppet/modules/zulip/files/supervisor/conf.d/zmirror.conf
index 1f810ad2fa..7a981592e7 100644
--- a/servers/puppet/modules/zulip/files/supervisor/conf.d/zmirror.conf
+++ b/servers/puppet/modules/zulip/files/supervisor/conf.d/zmirror.conf
@@ -1,5 +1,5 @@
 [program:zmirror]
-command=python /home/humbug/zulip/bots/zephyr_mirror.py --root-path=/home/humbug/ --user=tabbott/extra --forward-class-messages --log-path=/home/humbug/logs/mirror-log --on-startup-command="/home/humbug/zulip/bots/zmirror-renew-kerberos"
+command=python /home/zulip/zulip/bots/zephyr_mirror.py --root-path=/home/zulip/ --user=tabbott/extra --forward-class-messages --log-path=/home/zulip/logs/mirror-log --on-startup-command="/home/zulip/zulip/bots/zmirror-renew-kerberos"
 priority=200                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -8,10 +8,10 @@ stopwaitsecs=30                ; max num secs to wait b4 SIGKILL (default 10)
 user=humbug                    ; setuid to this UNIX account to run the program
 redirect_stderr=true           ; redirect proc stderr to stdout (default false)
 stdout_logfile=/var/log/zulip/zmirror.log         ; stdout log path, NONE for none; default AUTO
-environment=HOME="/home/humbug",USER="humbug"
+environment=HOME="/home/zulip",USER="humbug"
 
 [program:sync-public-streams]
-command=python /home/humbug/zulip/bots/sync-public-streams
+command=python /home/zulip/zulip/bots/sync-public-streams
 priority=200                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -20,4 +20,4 @@ stopwaitsecs=30                ; max num secs to wait b4 SIGKILL (default 10)
 user=humbug                    ; setuid to this UNIX account to run the program
 redirect_stderr=true           ; redirect proc stderr to stdout (default false)
 stdout_logfile=/var/log/zulip/sync-public-streams.log         ; stdout log path, NONE for none; default AUTO
-environment=HOME="/home/humbug"
+environment=HOME="/home/zulip"
diff --git a/servers/puppet/modules/zulip/files/supervisor/conf.d/zulip.conf b/servers/puppet/modules/zulip/files/supervisor/conf.d/zulip.conf
index cb156b6600..024529d099 100644
--- a/servers/puppet/modules/zulip/files/supervisor/conf.d/zulip.conf
+++ b/servers/puppet/modules/zulip/files/supervisor/conf.d/zulip.conf
@@ -8,7 +8,7 @@
 ; variables can be expanded using this syntax: "%(ENV_HOME)s".
 
 [fcgi-program:zulip-django]
-command=python /home/humbug/deployments/current/manage.py runfcgi daemonize=False maxchildren=20 ; the program (relative uses PATH, can take args)
+command=python /home/zulip/deployments/current/manage.py runfcgi daemonize=False maxchildren=20 ; the program (relative uses PATH, can take args)
 ;process_name=%(program_name)s ; process_name expr (default %(program_name)s)
 ;numprocs=1                    ; number of processes copies to start (def 1)
 ;directory=/tmp                ; directory to cwd to before exec (def no cwd)
@@ -37,13 +37,13 @@ stdout_logfile=/var/log/zulip/django.log        ; stdout log path, NONE for none
 ;stderr_events_enabled=false   ; emit events on stderr writes (default false)
 ;environment=A=1,B=2           ; process environment additions (def no adds)
 ;serverurl=AUTO                ; override serverurl computation (childutils)
-directory=/home/humbug/deployments/current/
-socket=unix:///home/humbug/deployments/fastcgi-socket
+directory=/home/zulip/deployments/current/
+socket=unix:///home/zulip/deployments/fastcgi-socket
 socket_owner=humbug:humbug
 socket_mode=0700
 
 [program:zulip-tornado]
-command=python /home/humbug/deployments/current/manage.py runtornado localhost:9993
+command=python /home/zulip/deployments/current/manage.py runtornado localhost:9993
 priority=200                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -52,10 +52,10 @@ stopwaitsecs=30                ; max num secs to wait b4 SIGKILL (default 10)
 user=humbug                    ; setuid to this UNIX account to run the program
 redirect_stderr=true           ; redirect proc stderr to stdout (default false)
 stdout_logfile=/var/log/zulip/tornado.log         ; stdout log path, NONE for none; default AUTO
-directory=/home/humbug/deployments/current/
+directory=/home/zulip/deployments/current/
 
 [program:zulip-events-user-activity]
-command=python /home/humbug/deployments/current/manage.py process_queue user_activity
+command=python /home/zulip/deployments/current/manage.py process_queue user_activity
 priority=300                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -64,10 +64,10 @@ stopwaitsecs=30                ; max num secs to wait b4 SIGKILL (default 10)
 user=humbug                    ; setuid to this UNIX account to run the program
 redirect_stderr=true           ; redirect proc stderr to stdout (default false)
 stdout_logfile=/var/log/zulip/events-user-activity.log         ; stdout log path, NONE for none; default AUTO
-directory=/home/humbug/deployments/current/
+directory=/home/zulip/deployments/current/
 
 [program:zulip-events-user-activity-interval]
-command=python /home/humbug/deployments/current/manage.py process_queue user_activity_interval
+command=python /home/zulip/deployments/current/manage.py process_queue user_activity_interval
 priority=300                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -76,10 +76,10 @@ stopwaitsecs=30                ; max num secs to wait b4 SIGKILL (default 10)
 user=humbug                    ; setuid to this UNIX account to run the program
 redirect_stderr=true           ; redirect proc stderr to stdout (default false)
 stdout_logfile=/var/log/zulip/events-user-activity-interval.log         ; stdout log path, NONE for none; default AUTO
-directory=/home/humbug/deployments/current/
+directory=/home/zulip/deployments/current/
 
 [program:zulip-events-user-presence]
-command=python /home/humbug/deployments/current/manage.py process_queue user_presence
+command=python /home/zulip/deployments/current/manage.py process_queue user_presence
 priority=300                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -88,10 +88,10 @@ stopwaitsecs=30                ; max num secs to wait b4 SIGKILL (default 10)
 user=humbug                    ; setuid to this UNIX account to run the program
 redirect_stderr=true           ; redirect proc stderr to stdout (default false)
 stdout_logfile=/var/log/zulip/events-user-presence.log         ; stdout log path, NONE for none; default AUTO
-directory=/home/humbug/deployments/current/
+directory=/home/zulip/deployments/current/
 
 [program:zulip-events-signups]
-command=python /home/humbug/deployments/current/manage.py process_queue signups
+command=python /home/zulip/deployments/current/manage.py process_queue signups
 priority=400                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -100,10 +100,10 @@ stopwaitsecs=30                ; max num secs to wait b4 SIGKILL (default 10)
 user=humbug                    ; setuid to this UNIX account to run the program
 redirect_stderr=true           ; redirect proc stderr to stdout (default false)
 stdout_logfile=/var/log/zulip/events-signups.log         ; stdout log path, NONE for none; default AUTO
-directory=/home/humbug/deployments/current/
+directory=/home/zulip/deployments/current/
 
 [program:zulip-events-confirmation-emails]
-command=python /home/humbug/deployments/current/manage.py process_queue invites
+command=python /home/zulip/deployments/current/manage.py process_queue invites
 priority=500                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -112,10 +112,10 @@ stopwaitsecs=30                ; max num secs to wait b4 SIGKILL (default 10)
 user=humbug                    ; setuid to this UNIX account to run the program
 redirect_stderr=true           ; redirect proc stderr to stdout (default false)
 stdout_logfile=/var/log/zulip/events-confirmation-emails.log         ; stdout log path, NONE for none; default AUTO
-directory=/home/humbug/deployments/current/
+directory=/home/zulip/deployments/current/
 
 [program:zulip-events-missedmessage_reminders]
-command=python /home/humbug/deployments/current/manage.py process_queue missedmessage_emails
+command=python /home/zulip/deployments/current/manage.py process_queue missedmessage_emails
 priority=600                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -124,10 +124,10 @@ stopwaitsecs=30                ; max num secs to wait b4 SIGKILL (default 10)
 user=humbug                    ; setuid to this UNIX account to run the program
 redirect_stderr=true           ; redirect proc stderr to stdout (default false)
 stdout_logfile=/var/log/zulip/events-missedmessage_reminders.log         ; stdout log path, NONE for none; default AUTO
-directory=/home/humbug/deployments/current/
+directory=/home/zulip/deployments/current/
 
 [program:humbug-events-slowqueries]
-command=python /home/humbug/deployments/current/manage.py process_queue slow_queries
+command=python /home/zulip/deployments/current/manage.py process_queue slow_queries
 priority=600                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
@@ -136,7 +136,7 @@ stopwaitsecs=30                ; max num secs to wait b4 SIGKILL (default 10)
 user=humbug                    ; setuid to this UNIX account to run the program
 redirect_stderr=true           ; redirect proc stderr to stdout (default false)
 stdout_logfile=/var/log/zulip/events-slow_queries.log         ; stdout log path, NONE for none; default AUTO
-directory=/home/humbug/deployments/current/
+directory=/home/zulip/deployments/current/
 
 ; The below sample group section shows all possible group values,
 ; create one or more 'real' group: sections to create "heterogeneous"
diff --git a/servers/puppet/modules/zulip/manifests/app_frontend.pp b/servers/puppet/modules/zulip/manifests/app_frontend.pp
index 64209b61bb..f11e007662 100644
--- a/servers/puppet/modules/zulip/manifests/app_frontend.pp
+++ b/servers/puppet/modules/zulip/manifests/app_frontend.pp
@@ -45,7 +45,7 @@ class zulip::app_frontend {
     source => "puppet:///modules/zulip/supervisor/conf.d/zulip.conf",
     notify => Service["supervisor"],
   }
-  file { "/home/humbug/tornado":
+  file { "/home/zulip/tornado":
     ensure => directory,
     owner => "humbug",
     group => "humbug",
diff --git a/servers/puppet/modules/zulip/manifests/base.pp b/servers/puppet/modules/zulip/manifests/base.pp
index fb33e35122..acc7d65998 100644
--- a/servers/puppet/modules/zulip/manifests/base.pp
+++ b/servers/puppet/modules/zulip/manifests/base.pp
@@ -27,18 +27,18 @@ class zulip::base {
     gid        => '1000',
     require    => Group['humbug'],
     shell      => '/bin/bash',
-    home       => '/home/humbug',
+    home       => '/home/zulip',
     managehome => true,
   }
-  file { '/home/humbug/.ssh/authorized_keys':
+  file { '/home/zulip/.ssh/authorized_keys':
     ensure     => file,
-    require    => File['/home/humbug/.ssh'],
+    require    => File['/home/zulip/.ssh'],
     mode       => 600,
     owner      => "humbug",
     group      => "humbug",
     source     => 'puppet:///modules/zulip/authorized_keys',
   }
-  file { '/home/humbug/.ssh':
+  file { '/home/zulip/.ssh':
     ensure     => directory,
     require    => User['humbug'],
     owner      => "humbug",
diff --git a/servers/puppet/modules/zulip/manifests/builder.pp b/servers/puppet/modules/zulip/manifests/builder.pp
index 45d4d4aba8..763a270928 100644
--- a/servers/puppet/modules/zulip/manifests/builder.pp
+++ b/servers/puppet/modules/zulip/manifests/builder.pp
@@ -10,7 +10,7 @@ class zulip::builder {
     ]
   package { $buildd_packages: ensure => "installed" }
 
-  file { "/home/humbug/.sbuildrc":
+  file { "/home/zulip/.sbuildrc":
     require => Package[sbuild],
     ensure => file,
     owner  => "humbug",
@@ -28,7 +28,7 @@ class zulip::builder {
 
   file { "/root/.sbuildrc":
     ensure => 'link',
-    target => '/home/humbug/.sbuildrc',
+    target => '/home/zulip/.sbuildrc',
   }
 
   exec { "adduser root sbuild": }
diff --git a/servers/puppet/modules/zulip/manifests/git.pp b/servers/puppet/modules/zulip/manifests/git.pp
index 10fe8b43f0..694f94f604 100644
--- a/servers/puppet/modules/zulip/manifests/git.pp
+++ b/servers/puppet/modules/zulip/manifests/git.pp
@@ -13,6 +13,6 @@ class zulip::git {
 
   file { '/home/git/repositories/eng/zulip.git/hooks/post-receive':
     ensure => 'link',
-    target => '/home/humbug/zulip/tools/post-receive',
+    target => '/home/zulip/zulip/tools/post-receive',
   }
 }
diff --git a/servers/puppet/modules/zulip/manifests/stats.pp b/servers/puppet/modules/zulip/manifests/stats.pp
index 0d8f852351..c1954feead 100644
--- a/servers/puppet/modules/zulip/manifests/stats.pp
+++ b/servers/puppet/modules/zulip/manifests/stats.pp
@@ -78,7 +78,7 @@ class zulip::stats {
     source => "puppet:///modules/zulip/graphite/graphite.wsgi",
   }
 
-  file { "/home/humbug/graphiti/config/settings.yml":
+  file { "/home/zulip/graphiti/config/settings.yml":
     ensure => file,
     owner  => "humbug",
     group  => "humbug",
diff --git a/servers/puppet/modules/zulip/manifests/trac.pp b/servers/puppet/modules/zulip/manifests/trac.pp
index 77a571cd5d..37e78dbb58 100644
--- a/servers/puppet/modules/zulip/manifests/trac.pp
+++ b/servers/puppet/modules/zulip/manifests/trac.pp
@@ -12,22 +12,22 @@ class zulip::trac {
                 ],
     ensure => present,
   }
-  file { "/home/humbug/trac/conf/trac.ini":
+  file { "/home/zulip/trac/conf/trac.ini":
     owner  => "humbug",
     group  => "humbug",
     mode => 644,
     source => "puppet:///modules/zulip/trac.ini",
     require => User['humbug'],
   }
-  file { '/home/humbug/trac/plugins/zulip_trac.py':
+  file { '/home/zulip/trac/plugins/zulip_trac.py':
     ensure => 'link',
-    target => '/home/humbug/zulip/api/integrations/trac/zulip_trac.py',
+    target => '/home/zulip/zulip/api/integrations/trac/zulip_trac.py',
   }
-  file { '/home/humbug/trac/plugins/zulip_trac_config.py':
+  file { '/home/zulip/trac/plugins/zulip_trac_config.py':
     ensure => 'link',
-    target => '/home/humbug/zulip/bots/zulip_trac_config.py',
+    target => '/home/zulip/zulip/bots/zulip_trac_config.py',
   }
-  # TODO: Add downloading and installing trac at /home/humbug/trac
+  # TODO: Add downloading and installing trac at /home/zulip/trac
 
   file { '/etc/sysctl.d/40-postgresql.conf':
     ensure => file,
diff --git a/servers/puppet/modules/zulip/manifests/zmirror.pp b/servers/puppet/modules/zulip/manifests/zmirror.pp
index b474ab669b..dcb2bd35c4 100644
--- a/servers/puppet/modules/zulip/manifests/zmirror.pp
+++ b/servers/puppet/modules/zulip/manifests/zmirror.pp
@@ -33,5 +33,5 @@ class zulip::zmirror {
 
   # TODO: Do the rest of our setup, which includes at least:
   # Building python-zephyr after cloning it from https://github.com/ebroder/python-zephyr
-  # Putting tabbott/extra's keytab on the system at /home/humbug/tabbott.extra.keytab
+  # Putting tabbott/extra's keytab on the system at /home/zulip/tabbott.extra.keytab
 }
diff --git a/servers/puppet/modules/zulip/manifests/zmirror_personals.pp b/servers/puppet/modules/zulip/manifests/zmirror_personals.pp
index 1f7fefb3f4..d82ff89c5a 100644
--- a/servers/puppet/modules/zulip/manifests/zmirror_personals.pp
+++ b/servers/puppet/modules/zulip/manifests/zmirror_personals.pp
@@ -13,8 +13,8 @@ class zulip::zmirror_personals {
     group      => "root",
     source     => 'puppet:///modules/zulip/debathena.list',
   }
-  file { ['/home/humbug/api-keys', '/home/humbug/zephyr_sessions', '/home/humbug/ccache',
-          '/home/humbug/mirror_status']:
+  file { ['/home/zulip/api-keys', '/home/zulip/zephyr_sessions', '/home/zulip/ccache',
+          '/home/zulip/mirror_status']:
     ensure     => directory,
     mode       => 644,
     owner      => "humbug",
diff --git a/tools/post-receive b/tools/post-receive
index 10eeda275e..13e32108e4 100755
--- a/tools/post-receive
+++ b/tools/post-receive
@@ -34,10 +34,10 @@ from zulip_tools import check_output, ENDC, FAIL
 
 def update_deployment(server, refname):
     return subprocess.call(["ssh", server, "--", "env", "-u", "GIT_DIR",
-                            "/home/humbug/deployments/current/tools/update-deployment", refname])
+                            "/home/zulip/deployments/current/tools/update-deployment", refname])
 
 def send_deployment_finished_message(branch, message):
-    subprocess.check_call(["/home/humbug/zulip/api/bin/zulip-send", "--user=commit-bot@zulip.com",
+    subprocess.check_call(["/home/zulip/zulip/api/bin/zulip-send", "--user=commit-bot@zulip.com",
                            "--api-key=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", "--stream=commits",
                            "--site=https://staging.zulip.com",
                            (u"--subject=deploy \u21D2 %s" % (branch,)).encode("utf-8"), "--message=%s" % (message,)])
@@ -51,7 +51,7 @@ deployments = {
 for ln in sys.stdin:
     oldrev, newrev, refname = ln.strip().split()
     if refname in deployments:
-        p = subprocess.Popen("/home/humbug/zulip/bots/githook-post-receive",
+        p = subprocess.Popen("/home/zulip/zulip/bots/githook-post-receive",
                              stdin=subprocess.PIPE)
         p.communicate(input=ln)
 
diff --git a/tools/run-graphiti b/tools/run-graphiti
index 047d7b6443..860c8830e6 100644
--- a/tools/run-graphiti
+++ b/tools/run-graphiti
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-export HOME=/home/humbug
-export PATH="/home/humbug/.rbenv/bin:$PATH"
+export HOME=/home/zulip
+export PATH="/home/zulip/.rbenv/bin:$PATH"
 
 eval "$(rbenv init -)"
 
-cd /home/humbug/graphiti
+cd /home/zulip/graphiti
 exec bundle exec unicorn -p 8088
diff --git a/tools/update-deployment b/tools/update-deployment
index c1a9950802..448e986d45 100755
--- a/tools/update-deployment
+++ b/tools/update-deployment
@@ -19,7 +19,7 @@ refname = sys.argv[1]
 
 subprocess.check_call(["mkdir", '-p',
                        DEPLOYMENTS_DIR,
-                       '/home/humbug/logs'])
+                       '/home/zulip/logs'])
 
 start_time = time.time()
 got_lock = False
diff --git a/tools/write-rabbitmq-consumers-state-file b/tools/write-rabbitmq-consumers-state-file
index 775dc2a752..61a72657ee 100755
--- a/tools/write-rabbitmq-consumers-state-file
+++ b/tools/write-rabbitmq-consumers-state-file
@@ -7,7 +7,7 @@ if [ -z "$queue" ]; then
     exit 2
 fi
 
-ZULIP_DIR=/home/humbug/deployments/current
+ZULIP_DIR=/home/zulip/deployments/current
 STATE_DIR=/var/lib/nagios_state
 STATE_FILE=$STATE_DIR/check-rabbitmq-consumers-$queue
 
diff --git a/tools/zulip_tools/__init__.py b/tools/zulip_tools/__init__.py
index 349bffe8a0..e444c0aea2 100755
--- a/tools/zulip_tools/__init__.py
+++ b/tools/zulip_tools/__init__.py
@@ -16,7 +16,7 @@ def check_output(*popenargs, **kwargs):
         raise subprocess.CalledProcessError(retcode, cmd, output=output)
     return output
 
-DEPLOYMENTS_DIR = "/home/humbug/deployments"
+DEPLOYMENTS_DIR = "/home/zulip/deployments"
 LOCK_DIR = os.path.join(DEPLOYMENTS_DIR, "lock")
 TIMESTAMP_FORMAT = '%Y-%m-%d-%H-%M-%S'
 
diff --git a/zerver/views/__init__.py b/zerver/views/__init__.py
index 09d2a3a09a..580293971b 100644
--- a/zerver/views/__init__.py
+++ b/zerver/views/__init__.py
@@ -445,7 +445,7 @@ def webathena_kerberos_login(request, user_profile,
     # TODO: Send these data via (say) rabbitmq
     try:
         subprocess.check_call(["ssh", "humbug@zmirror2.zulip.net", "--",
-                               "/home/humbug/zulip/bots/process_ccache",
+                               "/home/zulip/zulip/bots/process_ccache",
                                user,
                                user_profile.api_key,
                                base64.b64encode(ccache)])
diff --git a/zproject/settings.py b/zproject/settings.py
index 0f3c06785d..56060f1b5a 100644
--- a/zproject/settings.py
+++ b/zproject/settings.py
@@ -226,7 +226,7 @@ else:
         'zerver.finders.ZulipFinder',
     )
     if DEPLOYED:
-        STATIC_ROOT = '/home/humbug/prod-static'
+        STATIC_ROOT = '/home/zulip/prod-static'
     else:
         STATIC_ROOT = 'prod-static/serve'
 
@@ -451,9 +451,9 @@ CACHES = {
 if DEPLOYED:
     SERVER_LOG_PATH = "/var/log/zulip/server.log"
     WORKER_LOG_PATH = "/var/log/zulip/workers.log"
-    EVENT_LOG_DIR = '/home/humbug/logs/event_log'
-    STATS_DIR = '/home/humbug/stats'
-    PERSISTENT_QUEUE_FILENAME = "/home/humbug/tornado/event_queues.pickle"
+    EVENT_LOG_DIR = '/home/zulip/logs/event_log'
+    STATS_DIR = '/home/zulip/stats'
+    PERSISTENT_QUEUE_FILENAME = "/home/zulip/tornado/event_queues.pickle"
     EMAIL_LOG_PATH = "/var/log/zulip/email-mirror.log"
 else:
     EVENT_LOG_DIR = 'event_log'