diff --git a/README.md b/README.md
index cc0857b..652ea42 100644
--- a/README.md
+++ b/README.md
@@ -31,14 +31,14 @@ file is as follows:
     key=<api key from the web interface>
     email=<your email address>
 
-If you are using Zulip Enterprise, you should also add
+If you are using Zulip Voyager, you should also add
 
-    site=<your Zulip Enterprise server's URI>
+    site=<your Zulip Voyager server's URI>
 
 Alternatively, you may explicitly use "--user" and "--api-key" in our
 examples, which is especially useful if you are running several bots
 which share a home directory.  There is also a "--site" option for
-setting the Zulip Enterprise server on the command line.
+setting the Zulip Voyager server on the command line.
 
 You can obtain your Zulip API key, create bots, and manage bots all
 from your Zulip [settings page](https://zulip.com/#settings).
diff --git a/integrations/asana/zulip_asana_config.py b/integrations/asana/zulip_asana_config.py
index 7219bf8..971309e 100644
--- a/integrations/asana/zulip_asana_config.py
+++ b/integrations/asana/zulip_asana_config.py
@@ -49,7 +49,7 @@ RESUME_FILE = "/var/tmp/zulip_asana.state"
 # When initially started, how many hours of messages to include.
 ASANA_INITIAL_HISTORY_HOURS = 1
 
-# If you're using Zulip Enterprise, set this to your Zulip Enterprise server
+# If you're using Zulip Voyager, set this to your Zulip Voyager server
 ZULIP_SITE = "https://api.zulip.com"
 
 # If properly installed, the Zulip API should be in your import
diff --git a/integrations/basecamp/zulip_basecamp_config.py b/integrations/basecamp/zulip_basecamp_config.py
index baadc69..28fccbe 100644
--- a/integrations/basecamp/zulip_basecamp_config.py
+++ b/integrations/basecamp/zulip_basecamp_config.py
@@ -41,7 +41,7 @@ ZULIP_STREAM_NAME = "basecamp"
 ## path, but if not, set a custom path below
 ZULIP_API_PATH = None
 
-# If you're using Zulip Enterprise, set this to your Zulip Enterprise server
+# If you're using Zulip Voyager, set this to your Zulip Voyager server
 ZULIP_SITE = "https://api.zulip.com"
 
 # If you wish to log to a file rather than stdout/stderr,
diff --git a/integrations/codebase/zulip_codebase_config.py b/integrations/codebase/zulip_codebase_config.py
index 8f3333c..69f303e 100644
--- a/integrations/codebase/zulip_codebase_config.py
+++ b/integrations/codebase/zulip_codebase_config.py
@@ -50,7 +50,7 @@ ZULIP_TICKETS_STREAM_NAME = "tickets"
 # path, but if not, set a custom path below
 ZULIP_API_PATH = None
 
-# If you're using Zulip Enterprise, set this to your Zulip Enterprise server
+# If you're using Zulip Voyager, set this to your Zulip Voyager server
 ZULIP_SITE = "https://api.zulip.com"
 
 # If you wish to log to a file rather than stdout/stderr,
diff --git a/integrations/git/zulip_git_config.py b/integrations/git/zulip_git_config.py
index 2000fd7..37caf63 100644
--- a/integrations/git/zulip_git_config.py
+++ b/integrations/git/zulip_git_config.py
@@ -61,5 +61,5 @@ def format_commit_message(author, subject, commit_id):
 ## path, but if not, set a custom path below
 ZULIP_API_PATH = None
 
-# If you're using Zulip Enterprise, set this to your Zulip Enterprise server
+# If you're using Zulip Voyager, set this to your Zulip Voyager server
 ZULIP_SITE = "https://api.zulip.com"
diff --git a/integrations/svn/zulip_svn_config.py b/integrations/svn/zulip_svn_config.py
index 195fa84..45c2c6b 100644
--- a/integrations/svn/zulip_svn_config.py
+++ b/integrations/svn/zulip_svn_config.py
@@ -53,5 +53,5 @@ def commit_notice_destination(path, commit):
 ## path, but if not, set a custom path below
 ZULIP_API_PATH = None
 
-# If you're using Zulip Enterprise, set this to your Zulip Enterprise server
+# If you're using Zulip Voyager, set this to your Zulip Voyager server
 ZULIP_SITE = "https://api.zulip.com"
diff --git a/integrations/trac/zulip_trac_config.py b/integrations/trac/zulip_trac_config.py
index 176f04a..20eaff0 100644
--- a/integrations/trac/zulip_trac_config.py
+++ b/integrations/trac/zulip_trac_config.py
@@ -47,5 +47,5 @@ TRAC_NOTIFY_FIELDS = ["description", "summary", "resolution", "comment", "owner"
 ## path, but if not, set a custom path below
 ZULIP_API_PATH = None
 
-# If you're using Zulip Enterprise, set this to your Zulip Enterprise server
+# If you're using Zulip Voyager, set this to your Zulip Voyager server
 ZULIP_SITE = "https://api.zulip.com"
diff --git a/zulip/__init__.py b/zulip/__init__.py
index bca2c02..bdfae31 100644
--- a/zulip/__init__.py
+++ b/zulip/__init__.py
@@ -97,7 +97,7 @@ def generate_option_group(parser, prefix=''):
     group = optparse.OptionGroup(parser, 'Zulip API configuration')
     group.add_option('--%ssite' % (prefix,),
                      dest="zulip_site",
-                     help="Zulip Enterprise server URI (if using Zulip Enterprise)",
+                     help="Zulip Voyager server URI (if using Zulip Voyager)",
                      default=None)
     group.add_option('--%sapi-key' % (prefix,),
                      dest="zulip_api_key",