diff --git a/bots/zulip_git_config.py b/bots/zulip_git_config.py
index 8688f5e..985c12a 100644
--- a/bots/zulip_git_config.py
+++ b/bots/zulip_git_config.py
@@ -4,8 +4,8 @@
 # Leaving all the instructions out of this file to avoid having to
 # sync them as we update the comments.
 
-HUMBUG_USER = "commit-bot@zulip.com"
-HUMBUG_API_KEY = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ZULIP_USER = "commit-bot@zulip.com"
+ZULIP_API_KEY = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 
 # commit_notice_destination() lets you customize where commit notices
 # are sent to.
@@ -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
 
-HUMBUG_API_PATH = "/home/humbug/humbug/api"
-HUMBUG_SITE = "https://staging.zulip.com"
+ZULIP_API_PATH = "/home/humbug/humbug/api"
+ZULIP_SITE = "https://staging.zulip.com"
diff --git a/integrations/git/post-receive b/integrations/git/post-receive
index fd7a5f9..6169fad 100755
--- a/integrations/git/post-receive
+++ b/integrations/git/post-receive
@@ -37,14 +37,14 @@ import os.path
 sys.path.insert(0, os.path.dirname(__file__))
 import zulip_git_config as config
 
-if config.HUMBUG_API_PATH is not None:
-    sys.path.append(config.HUMBUG_API_PATH)
+if config.ZULIP_API_PATH is not None:
+    sys.path.append(config.ZULIP_API_PATH)
 
 import zulip
 client = zulip.Client(
-    email=config.HUMBUG_USER,
-    site=config.HUMBUG_SITE,
-    api_key=config.HUMBUG_API_KEY)
+    email=config.ZULIP_USER,
+    site=config.ZULIP_SITE,
+    api_key=config.ZULIP_API_KEY)
 
 # check_output is backported from subprocess.py in Python 2.7
 def check_output(*popenargs, **kwargs):
diff --git a/integrations/git/zulip_git_config.py b/integrations/git/zulip_git_config.py
index b91a7eb..0093b3a 100644
--- a/integrations/git/zulip_git_config.py
+++ b/integrations/git/zulip_git_config.py
@@ -23,8 +23,8 @@
 
 
 # Change these values to configure authentication for the plugin
-HUMBUG_USER = "git-bot@example.com"
-HUMBUG_API_KEY = "0123456789abcdef0123456789abcdef"
+ZULIP_USER = "git-bot@example.com"
+ZULIP_API_KEY = "0123456789abcdef0123456789abcdef"
 
 # commit_notice_destination() lets you customize where commit notices
 # are sent to with the full power of a Python function.
@@ -51,7 +51,7 @@ def commit_notice_destination(repo, branch, commit):
 
 ## If properly installed, the Zulip API should be in your import
 ## path, but if not, set a custom path below
-HUMBUG_API_PATH = None
+ZULIP_API_PATH = None
 
 # This should not need to change unless you have a custom Zulip subdomain.
-HUMBUG_SITE = "https://api.zulip.com"
+ZULIP_SITE = "https://api.zulip.com"