diff --git a/api/integrations/git/post-receive b/api/integrations/git/post-receive
index c11fe3601e..fd7a5f9207 100755
--- a/api/integrations/git/post-receive
+++ b/api/integrations/git/post-receive
@@ -35,7 +35,7 @@ import subprocess
 import os.path
 
 sys.path.insert(0, os.path.dirname(__file__))
-import humbug_git_config as config
+import zulip_git_config as config
 
 if config.HUMBUG_API_PATH is not None:
     sys.path.append(config.HUMBUG_API_PATH)
diff --git a/api/integrations/git/humbug_git_config.py b/api/integrations/git/zulip_git_config.py
similarity index 100%
rename from api/integrations/git/humbug_git_config.py
rename to api/integrations/git/zulip_git_config.py
diff --git a/api/integrations/svn/post-commit b/api/integrations/svn/post-commit
index 0e1b69823e..de77c0348c 100755
--- a/api/integrations/svn/post-commit
+++ b/api/integrations/svn/post-commit
@@ -35,7 +35,7 @@ import os.path
 import pysvn
 
 sys.path.insert(0, os.path.dirname(__file__))
-import humbug_svn_config as config
+import zulip_svn_config as config
 
 if config.HUMBUG_API_PATH is not None:
     sys.path.append(config.HUMBUG_API_PATH)
diff --git a/api/integrations/svn/humbug_svn_config.py b/api/integrations/svn/zulip_svn_config.py
similarity index 100%
rename from api/integrations/svn/humbug_svn_config.py
rename to api/integrations/svn/zulip_svn_config.py
diff --git a/api/integrations/trac/humbug_trac.py b/api/integrations/trac/humbug_trac.py
index f89d69e9e5..3478f4ea0c 100644
--- a/api/integrations/trac/humbug_trac.py
+++ b/api/integrations/trac/humbug_trac.py
@@ -23,9 +23,9 @@
 
 # Zulip trac plugin -- sends humbugs when tickets change.
 #
-# Install by copying this file and humbug_trac_config.py to the trac
+# Install by copying this file and zulip_trac_config.py to the trac
 # plugins/ subdirectory, customizing the constants in
-# humbug_trac_config.py, and then adding "humbug_trac" to the
+# zulip_trac_config.py, and then adding "humbug_trac" to the
 # components section of the conf/trac.ini file, like so:
 #
 # [components]
@@ -39,7 +39,7 @@ from trac.ticket import ITicketChangeListener
 import sys
 import os.path
 sys.path.insert(0, os.path.dirname(__file__))
-import humbug_trac_config as config
+import zulip_trac_config as config
 
 if config.HUMBUG_API_PATH is not None:
     sys.path.append(config.HUMBUG_API_PATH)
diff --git a/api/integrations/trac/humbug_trac_config.py b/api/integrations/trac/zulip_trac_config.py
similarity index 100%
rename from api/integrations/trac/humbug_trac_config.py
rename to api/integrations/trac/zulip_trac_config.py
diff --git a/bots/humbug_git_config.py b/bots/zulip_git_config.py
similarity index 100%
rename from bots/humbug_git_config.py
rename to bots/zulip_git_config.py
diff --git a/bots/humbug_trac_config.py b/bots/zulip_trac_config.py
similarity index 100%
rename from bots/humbug_trac_config.py
rename to bots/zulip_trac_config.py
diff --git a/servers/puppet/modules/zulip/manifests/trac.pp b/servers/puppet/modules/zulip/manifests/trac.pp
index e128837cde..40409aff43 100644
--- a/servers/puppet/modules/zulip/manifests/trac.pp
+++ b/servers/puppet/modules/zulip/manifests/trac.pp
@@ -23,9 +23,9 @@ class zulip::trac {
     ensure => 'link',
     target => '/home/humbug/humbug/api/integrations/trac/humbug_trac.py',
   }
-  file { '/home/humbug/trac/plugins/humbug_trac_config.py':
+  file { '/home/humbug/trac/plugins/zulip_trac_config.py':
     ensure => 'link',
-    target => '/home/humbug/humbug/bots/humbug_trac_config.py',
+    target => '/home/humbug/humbug/bots/zulip_trac_config.py',
   }
   # TODO: Add downloading and installing trac at /home/humbug/trac
 
diff --git a/templates/zerver/integrations.html b/templates/zerver/integrations.html
index b3ad0347b6..f40ea53076 100644
--- a/templates/zerver/integrations.html
+++ b/templates/zerver/integrations.html
@@ -125,7 +125,7 @@
       <p>First, download and install our <a href="/api">Python
       bindings and example scripts</a> on your Git server.</p>
 
-      <p>Next, open <code>integrations/git/humbug_git_config.py</code>
+      <p>Next, open <code>integrations/git/zulip_git_config.py</code>
       in your favorite editor, and change the following lines to
       specify the email address and API key for your Git bot:</p>
 
@@ -136,12 +136,12 @@
       <p>You can also specify which pushes will result in
       notifications and to what stream the notifications will be sent
       by modifying the <code>commit_notice_destination</code> function
-      in <code>humbug_git_config.py</code>.  By default, pushes to
+      in <code>zulip_git_config.py</code>.  By default, pushes to
       the <code>master</code> and <code>test-post-receive</code>
       branches will result in a notification to
       stream <code>commits</code>.</p>
 
-      <p>Save <code>integrations/git/humbug_git_config.py</code> to
+      <p>Save <code>integrations/git/zulip_git_config.py</code> to
       the <code>.git/hooks</code> directory of your git
       repository.</p>
 
@@ -431,17 +431,17 @@ x      <p><code>https://api.zulip.com/v1/external/pivotal?api_key=abcdefgh&amp;s
         a binary or from source following
         the <a href="http://pysvn.tigris.org/project_downloads.html">instructions
         on the pysvn website</a>.</li>
-        <li>Copy <code>integrations/svn/humbug_svn_config.py</code>
+        <li>Copy <code>integrations/svn/zulip_svn_config.py</code>
         and <code>integrations/svn/post-commit</code> from the API bindings
         directory to the <code>hooks</code> subdirectory of your SVN
         repository.</li>
-        <li>Open <code>humbug_svn_config.py</code> in your favorite editor and
+        <li>Open <code>zulip_svn_config.py</code> in your favorite editor and
         change the <code>HUMBUG_USER</code> and <code>HUMBUG_API_KEY</code>
         variables at the top of the file to the credentials for the bot you'd
         like to use for this integration.</li>
         <li>The default stream used by this post-commit hook
         is <code>commits</code>; if you'd prefer a different stream, change it
-        now in <code>humbug_svn_config.py</code>. Make sure that everyone
+        now in <code>zulip_svn_config.py</code>. Make sure that everyone
         interested in getting these post-commit Zulips is subscribed to that
         stream!</li>
       </ol>
@@ -460,7 +460,7 @@ x      <p><code>https://api.zulip.com/v1/external/pivotal?api_key=abcdefgh&amp;s
       <p>First, download and install our <a href="/api">Python
       bindings and example scripts</a> on your Trac server.</p>
 
-      <p>Next, open <code>integrations/trac/humbug_trac_config.py</code> in
+      <p>Next, open <code>integrations/trac/zulip_trac_config.py</code> in
       your favorite editor, and change the following lines to specify
       your bot's email address, API key, and where you'd like your
       notification messages to go (by default,
@@ -472,7 +472,7 @@ x      <p><code>https://api.zulip.com/v1/external/pivotal?api_key=abcdefgh&amp;s
 <span class="n">TRAC_BASE_TICKET_URL</span> <span class="o">=</span> <span class="s">"https://trac.example.com/ticket"</span></pre></div>
 
       <p>Copy <code>integrations/trac/humbug_trac.py</code>
-      and <code>integrations/trac/humbug_trac_config.py</code> into
+      and <code>integrations/trac/zulip_trac_config.py</code> into
       your Trac installation's <code>plugins/</code>
       subdirectory. Once you've done that, edit your Trac
       installation's <code>conf/trac.ini</code> to
@@ -495,7 +495,7 @@ x      <p><code>https://api.zulip.com/v1/external/pivotal?api_key=abcdefgh&amp;s
       for a while, you may want to customize which changes to tickets
       result in a Zulip notification using
       the <code>TRAC_NOTIFY_FIELDS</code> setting
-      in <code>humbug_trac_config.py</code>.</p>
+      in <code>zulip_trac_config.py</code>.</p>
 
       <p>
         <a href="#services">^ Back to top</a>
diff --git a/tools/post-receive b/tools/post-receive
index 551e42ae61..cff36a97ab 100755
--- a/tools/post-receive
+++ b/tools/post-receive
@@ -13,7 +13,7 @@
 # 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 Zulip configuration; for the moment those are
-# bots/githook-post-receive and bots/humbug_git_config.py,
+# bots/githook-post-receive and bots/zulip_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
 # api/integrations/git/ has the example configuration.