diff --git a/puppet/zulip/templates/postfix/main.cf.erb b/puppet/zulip/templates/postfix/main.cf.erb
index 8417f81848..e51e021fc5 100644
--- a/puppet/zulip/templates/postfix/main.cf.erb
+++ b/puppet/zulip/templates/postfix/main.cf.erb
@@ -1,6 +1,6 @@
 # This file is managed by puppet; local changes will be overridden.
 
-smtpd_banner = $myhostname ESMTP $mail_name (Zulip Voyager)
+smtpd_banner = $myhostname ESMTP $mail_name (Zulip)
 biff = no
 
 # appending .domain is the MUA's job.
diff --git a/puppet/zulip_ops/files/nagios3/conf.d/services.cfg b/puppet/zulip_ops/files/nagios3/conf.d/services.cfg
index 60ed2859ca..71b49cdad9 100644
--- a/puppet/zulip_ops/files/nagios3/conf.d/services.cfg
+++ b/puppet/zulip_ops/files/nagios3/conf.d/services.cfg
@@ -547,7 +547,7 @@ define service {
 define service {
         use                             generic-service
         hostgroup_name                  staging_frontends
-        service_description             Check email deliverer process which is only used on Zulip Voyager
+        service_description             Check email deliverer process
         check_command                   check_email_deliverer_process
         contact_groups                  admins
 }
@@ -555,7 +555,7 @@ define service {
 define service {
         use                             generic-service
         hostgroup_name                  staging_frontends
-        service_description             Check email deliverer backlog which is only used on Zulip Voyager
+        service_description             Check email deliverer backlog
         check_command                   check_email_deliverer_backlog
         contact_groups                  admins
 }
diff --git a/scripts/setup/initialize-database b/scripts/setup/initialize-database
index 6bdee18b53..0bf8355898 100755
--- a/scripts/setup/initialize-database
+++ b/scripts/setup/initialize-database
@@ -32,7 +32,7 @@ cd "$THIS_DIR/../.."
 ./manage.py migrate --noinput
 ./manage.py createcachetable third_party_api_results
 
-if ! ./manage.py initialize_voyager_db; then
+if ! ./manage.py initialize_production_database; then
     set +x
     echo
     echo -e '\033[32mPopulating default database failed.'
diff --git a/zerver/lib/import_realm.py b/zerver/lib/import_realm.py
index dd48fecaeb..4d10e9e2df 100644
--- a/zerver/lib/import_realm.py
+++ b/zerver/lib/import_realm.py
@@ -1059,9 +1059,9 @@ def do_import_realm(import_dir: Path, subdomain: str, processes: int=1) -> Realm
         do_change_plan_type(realm, Realm.SELF_HOSTED)
     return realm
 
-# create_users and do_import_system_bots differ from their equivalent in
-# zerver/management/commands/initialize_voyager_db.py because here we check if the bots
-# don't already exist and only then create a user for these bots.
+# create_users and do_import_system_bots differ from their equivalent
+# in zerver/lib/server_initialization.py because here we check if the
+# bots don't already exist and only then create a user for these bots.
 def do_import_system_bots(realm: Any) -> None:
     internal_bots = [(bot['name'], bot['email_template'] % (settings.INTERNAL_BOT_DOMAIN,))
                      for bot in settings.INTERNAL_BOTS]
diff --git a/zerver/management/commands/checkconfig.py b/zerver/management/commands/checkconfig.py
index 47f6474436..1ead3a386d 100644
--- a/zerver/management/commands/checkconfig.py
+++ b/zerver/management/commands/checkconfig.py
@@ -6,7 +6,7 @@ from zerver.lib.management import check_config
 
 
 class Command(BaseCommand):
-    help = """Checks your Zulip Voyager Django configuration for issues."""
+    help = """Checks /etc/zulip/settings.py for common configuration issues."""
 
     def handle(self, *args: Any, **options: Any) -> None:
         check_config()
diff --git a/zerver/management/commands/initialize_voyager_db.py b/zerver/management/commands/initialize_production_database.py
similarity index 93%
rename from zerver/management/commands/initialize_voyager_db.py
rename to zerver/management/commands/initialize_production_database.py
index 0f7c7100cc..cdaf5939ac 100644
--- a/zerver/management/commands/initialize_voyager_db.py
+++ b/zerver/management/commands/initialize_production_database.py
@@ -9,7 +9,7 @@ from zerver.lib.server_initialization import create_internal_realm, server_initi
 settings.TORNADO_SERVER = None
 
 class Command(BaseCommand):
-    help = "Populate an initial database for Zulip Voyager"
+    help = "Populate system realm and bots for a Zulip production server"
 
     def add_arguments(self, parser: ArgumentParser) -> None:
         parser.add_argument('--extra-users',
diff --git a/zproject/dev_urls.py b/zproject/dev_urls.py
index 92a2329a64..1ede697174 100644
--- a/zproject/dev_urls.py
+++ b/zproject/dev_urls.py
@@ -76,8 +76,7 @@ i18n_urls = [
     url(r'^confirmation_key/$', zerver.views.development.registration.confirmation_key),
 ]
 
-# These are used for voyager development. On a real voyager instance,
-# these files would be served by nginx.
+# On a production instance, these files would be served by nginx.
 if settings.LOCAL_UPLOADS_DIR is not None:
     urls += [
         url(r'^user_avatars/(?P<path>.*)$', serve,
diff --git a/zproject/prod_settings_template.py b/zproject/prod_settings_template.py
index f390caca51..b88381a888 100644
--- a/zproject/prod_settings_template.py
+++ b/zproject/prod_settings_template.py
@@ -545,7 +545,7 @@ AUTH_LDAP_USER_ATTR_MAP = {
 # Miscellaneous settings.
 
 # The default CAMO_URI of '/external_content/' is served by the camo
-# setup in the default Voyager nginx configuration.  Setting CAMO_URI
+# setup in the default Zulip nginx configuration.  Setting CAMO_URI
 # to '' will disable the Camo integration.
 CAMO_URI = '/external_content/'