diff --git a/templates/zerver/integrations/include/webhook-url-with-bot-email.md b/templates/zerver/integrations/include/webhook-url-with-bot-email.md
index 689476fa9d..eed2a5cb0a 100644
--- a/templates/zerver/integrations/include/webhook-url-with-bot-email.md
+++ b/templates/zerver/integrations/include/webhook-url-with-bot-email.md
@@ -1,7 +1,7 @@
 Construct the URL for the {{ integration_display_name }}
 bot using the bot's API key and email address:
 
-`{{ external_uri_scheme }}bot_email:bot_api_key@{{ api_url_scheme_relative }}{{ integration_url }}`
+`{{ external_url_scheme }}bot_email:bot_api_key@{{ api_url_scheme_relative }}{{ integration_url }}`
 
 Modify the parameters of the URL above, where `bot_email` is
 the bot's URL-encoded email address and `bot_api_key` is the
diff --git a/zerver/context_processors.py b/zerver/context_processors.py
index 94e75b9acb..04c8b18dae 100644
--- a/zerver/context_processors.py
+++ b/zerver/context_processors.py
@@ -44,7 +44,7 @@ def common_context(user: UserProfile) -> Dict[str, Any]:
         "realm_uri": user.realm.uri,
         "realm_name": user.realm.name,
         "root_domain_url": settings.ROOT_DOMAIN_URI,
-        "external_uri_scheme": settings.EXTERNAL_URI_SCHEME,
+        "external_url_scheme": settings.EXTERNAL_URI_SCHEME,
         "external_host": settings.EXTERNAL_HOST,
         "user_name": user.full_name,
     }
@@ -163,7 +163,7 @@ def zulip_default_context(request: HttpRequest) -> Dict[str, Any]:
         "login_url": settings.HOME_NOT_LOGGED_IN,
         "only_sso": settings.ONLY_SSO,
         "external_host": settings.EXTERNAL_HOST,
-        "external_uri_scheme": settings.EXTERNAL_URI_SCHEME,
+        "external_url_scheme": settings.EXTERNAL_URI_SCHEME,
         "realm_uri": realm_uri,
         "realm_name": realm_name,
         "realm_icon": realm_icon,
diff --git a/zerver/views/auth.py b/zerver/views/auth.py
index 084c48fe26..f8c5c94272 100644
--- a/zerver/views/auth.py
+++ b/zerver/views/auth.py
@@ -541,9 +541,9 @@ def oauth_redirect_to_root(
     mobile_flow_otp: Optional[str] = REQ(default=None),
     desktop_flow_otp: Optional[str] = REQ(default=None),
 ) -> HttpResponse:
-    main_site_uri = settings.ROOT_DOMAIN_URI + url
+    main_site_url = settings.ROOT_DOMAIN_URI + url
     if settings.SOCIAL_AUTH_SUBDOMAIN is not None and sso_type == "social":
-        main_site_uri = (
+        main_site_url = (
             settings.EXTERNAL_URI_SCHEME
             + settings.SOCIAL_AUTH_SUBDOMAIN
             + "."
@@ -570,7 +570,7 @@ def oauth_redirect_to_root(
 
     params = {**params, **extra_url_params}
 
-    return redirect(append_url_query_string(main_site_uri, urllib.parse.urlencode(params)))
+    return redirect(append_url_query_string(main_site_url, urllib.parse.urlencode(params)))
 
 
 def handle_desktop_flow(
diff --git a/zerver/views/documentation.py b/zerver/views/documentation.py
index 2211447a05..2d93438652 100644
--- a/zerver/views/documentation.py
+++ b/zerver/views/documentation.py
@@ -50,7 +50,7 @@ def add_api_uri_context(context: Dict[str, Any], request: HttpRequest) -> None:
     api_url = settings.EXTERNAL_URI_SCHEME + api_url_scheme_relative
     zulip_url = settings.EXTERNAL_URI_SCHEME + display_host
 
-    context["external_uri_scheme"] = settings.EXTERNAL_URI_SCHEME
+    context["external_url_scheme"] = settings.EXTERNAL_URI_SCHEME
     context["api_url"] = api_url
     context["api_url_scheme_relative"] = api_url_scheme_relative
     context["zulip_url"] = zulip_url
diff --git a/zerver/webhooks/stripe/doc.md b/zerver/webhooks/stripe/doc.md
index ff9ec3e464..4d2f1ec56a 100644
--- a/zerver/webhooks/stripe/doc.md
+++ b/zerver/webhooks/stripe/doc.md
@@ -19,7 +19,7 @@ Get Zulip notifications for Stripe events!
 Zulip currently supports Stripe events for Charges, Customers, Discounts,
 Sources, Subscriptions, Files, Invoices and Invoice items.
 
-{% if 'http:' in external_uri_scheme %}
+{% if 'http:' in external_url_scheme %}
 
 !!! tip ""