diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 1d35e351c6..65438bdb73 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -1920,9 +1920,9 @@ msgstr "Hallo,"
 #, python-format
 msgid ""
 "We received a request to add the email address %(new_email)s to your Zulip "
-"demo organization account on %(realm_uri)s. To confirm this update and set a"
+"demo organization account on %(realm_url)s. To confirm this update and set a"
 " password for this account, please click below:"
-msgstr "Wir haben eine Anfrage erhalten, die E-Mail-Adresse %(new_email)s zu deinem Zulip-Demo-Organisationskonto auf %(realm_uri)s hinzuzufügen. Um diese Änderung zu bestätigen und ein Passwort für dieses Konto festzulegen, klicke bitte unten:"
+msgstr "Wir haben eine Anfrage erhalten, die E-Mail-Adresse %(new_email)s zu deinem Zulip-Demo-Organisationskonto auf %(realm_url)s hinzuzufügen. Um diese Änderung zu bestätigen und ein Passwort für dieses Konto festzulegen, klicke bitte unten:"
 
 #: templates/zerver/emails/confirm_demo_organization_email.html:11
 msgid "Confirm and set password"
@@ -1953,9 +1953,9 @@ msgstr "Falls du diese Änderung nicht vorgenommen hast, kontaktiere uns bitte s
 #, python-format
 msgid ""
 "We received a request to change the email address for the Zulip account on "
-"%(realm_uri)s from %(old_email)s to %(new_email)s. To confirm this change, "
+"%(realm_url)s from %(old_email)s to %(new_email)s. To confirm this change, "
 "please click below:"
-msgstr "Wir haben eine Anfrage erhalten, die E-Mail-Adresse für den Zulip-Account auf %(realm_uri)s von %(old_email)s zu %(new_email)s zu ändern. Falls du diese Änderung bestätigen möchtest, klicke bitte hier unten: "
+msgstr "Wir haben eine Anfrage erhalten, die E-Mail-Adresse für den Zulip-Account auf %(realm_url)s von %(old_email)s zu %(new_email)s zu ändern. Falls du diese Änderung bestätigen möchtest, klicke bitte hier unten: "
 
 #: templates/zerver/emails/confirm_new_email.html:11
 msgid "Confirm email change"
@@ -2775,8 +2775,8 @@ msgstr ""
 #, python-format
 msgid ""
 "Somebody (possibly you) requested a new password for the Zulip account "
-"%(email)s on %(realm_uri)s."
-msgstr "Jemand (möglicherweise du selbst) hat ein neues Passwort für dein Zulip-Konto %(email)s bei %(realm_uri)s angefordert."
+"%(email)s on %(realm_url)s."
+msgstr "Jemand (möglicherweise du selbst) hat ein neues Passwort für dein Zulip-Konto %(email)s bei %(realm_url)s angefordert."
 
 #: templates/zerver/emails/password_reset.html:13
 msgid "Click the button below to reset your password."
diff --git a/templates/zerver/emails/account_registered.html b/templates/zerver/emails/account_registered.html
index eb22215d37..6dcc4ec232 100644
--- a/templates/zerver/emails/account_registered.html
+++ b/templates/zerver/emails/account_registered.html
@@ -31,7 +31,7 @@
 <p>
     {% trans apps_page_link="https://zulip.com/apps/" %}You will use the following info to log into the Zulip web, <a href="{{ apps_page_link }}">mobile and desktop</a> apps:{% endtrans %}
     <ul>
-        <li>{% trans organization_url=macros.link_tag(realm_uri) %}Organization URL: {{ organization_url }}{% endtrans %}<br /></li>
+        <li>{% trans organization_url=macros.link_tag(realm_url) %}Organization URL: {{ organization_url }}{% endtrans %}<br /></li>
         {% if ldap %}
             {% if ldap_username %}
             <li>{% trans %}Your username: {{ ldap_username }}{% endtrans %}<br /></li>
@@ -42,7 +42,7 @@
             <li>{% trans email=macros.email_tag(email) %}Your account email: {{ email }}{% endtrans %}<br /></li>
         {% endif %}
     </ul>
-    <a class="button" href="{{ realm_uri }}">{{ _('Go to organization') }}</a>
+    <a class="button" href="{{ realm_url }}">{{ _('Go to organization') }}</a>
 </p>
 
 <p>
diff --git a/templates/zerver/emails/account_registered.txt b/templates/zerver/emails/account_registered.txt
index 19a210c34d..c505e3323a 100644
--- a/templates/zerver/emails/account_registered.txt
+++ b/templates/zerver/emails/account_registered.txt
@@ -13,7 +13,7 @@
 
 {% trans apps_page_link="https://zulip.com/apps/" %}You will use the following info to log into the Zulip web, mobile and desktop apps ({{ apps_page_link}}):{% endtrans %}
 
-* {% trans organization_url=realm_uri %}Organization URL: {{ organization_url }}{% endtrans %}
+* {% trans organization_url=realm_url %}Organization URL: {{ organization_url }}{% endtrans %}
 
 {% if ldap %}
 {% if ldap_username %}
diff --git a/templates/zerver/emails/confirm_demo_organization_email.html b/templates/zerver/emails/confirm_demo_organization_email.html
index 7047fe33f8..8679d7a507 100644
--- a/templates/zerver/emails/confirm_demo_organization_email.html
+++ b/templates/zerver/emails/confirm_demo_organization_email.html
@@ -7,7 +7,7 @@
 {% block content %}
 <p>{% trans %}Hi,{% endtrans %}</p>
 
-<p>{% trans realm_uri=macros.link_tag(realm_uri), new_email=macros.email_tag(new_email) %}We received a request to add the email address {{ new_email }} to your Zulip demo organization account on {{ realm_uri }}. To confirm this update and set a password for this account, please click below:{% endtrans %}
+<p>{% trans realm_url=macros.link_tag(realm_url), new_email=macros.email_tag(new_email) %}We received a request to add the email address {{ new_email }} to your Zulip demo organization account on {{ realm_url }}. To confirm this update and set a password for this account, please click below:{% endtrans %}
     <a class="button" href="{{ activate_url }}">{{_('Confirm and set password') }}</a></p>
 
 <p>{% trans support_email=macros.email_tag(support_email) %}If you did not request this change, please contact us immediately at {{ support_email }}.{% endtrans %}</p>
diff --git a/templates/zerver/emails/confirm_demo_organization_email.txt b/templates/zerver/emails/confirm_demo_organization_email.txt
index 8f6d1e5585..1a649af517 100644
--- a/templates/zerver/emails/confirm_demo_organization_email.txt
+++ b/templates/zerver/emails/confirm_demo_organization_email.txt
@@ -4,7 +4,7 @@ Hi,
 
 
 {% trans -%}
-We received a request to add the email address {{ new_email }} to your Zulip demo organization account on {{ realm_uri }}. To confirm this update and set a password for this account, please click below:
+We received a request to add the email address {{ new_email }} to your Zulip demo organization account on {{ realm_url }}. To confirm this update and set a password for this account, please click below:
 {%- endtrans %}
 
 
diff --git a/templates/zerver/emails/confirm_new_email.html b/templates/zerver/emails/confirm_new_email.html
index 05c52694e4..a4b0e0bca5 100644
--- a/templates/zerver/emails/confirm_new_email.html
+++ b/templates/zerver/emails/confirm_new_email.html
@@ -7,7 +7,7 @@
 {% block content %}
 <p>{% trans %}Hi,{% endtrans %}</p>
 
-<p>{% trans realm_uri=macros.link_tag(realm_uri), old_email=macros.email_tag(old_email), new_email=macros.email_tag(new_email) %}We received a request to change the email address for the Zulip account on {{ realm_uri }} from {{ old_email }} to {{ new_email }}. To confirm this change, please click below:{% endtrans %}
+<p>{% trans realm_url=macros.link_tag(realm_url), old_email=macros.email_tag(old_email), new_email=macros.email_tag(new_email) %}We received a request to change the email address for the Zulip account on {{ realm_url }} from {{ old_email }} to {{ new_email }}. To confirm this change, please click below:{% endtrans %}
     <a class="button" href="{{ activate_url }}">{{_('Confirm email change') }}</a></p>
 
 <p>{% trans support_email=macros.email_tag(support_email) %}If you did not request this change, please contact us immediately at {{ support_email }}.{% endtrans %}</p>
diff --git a/templates/zerver/emails/confirm_new_email.txt b/templates/zerver/emails/confirm_new_email.txt
index debf0d672c..d79a87f082 100644
--- a/templates/zerver/emails/confirm_new_email.txt
+++ b/templates/zerver/emails/confirm_new_email.txt
@@ -4,7 +4,7 @@ Hi,
 
 
 {% trans -%}
-We received a request to change the email address for the Zulip account on {{ realm_uri }} from {{ old_email }} to {{ new_email }}. To confirm this change, please click below:
+We received a request to change the email address for the Zulip account on {{ realm_url }} from {{ old_email }} to {{ new_email }}. To confirm this change, please click below:
 {%- endtrans %}
 
 
diff --git a/templates/zerver/emails/custom_email_base.pre.html b/templates/zerver/emails/custom_email_base.pre.html
index d8ad3932c7..06edc72f6a 100644
--- a/templates/zerver/emails/custom_email_base.pre.html
+++ b/templates/zerver/emails/custom_email_base.pre.html
@@ -15,6 +15,6 @@
     {% if remote_server_email %}
     <p>You are receiving this email to update you about important changes to Zulip's Terms of Service.</p>
     {% elif unsubscribe_link %}
-    <p><a href="{{ realm_uri }}/#settings/notifications">{{ _("Manage email preferences") }}</a> | <a href="{{ unsubscribe_link }}">{{ _("Unsubscribe from marketing emails") }}</a></p>
+    <p><a href="{{ realm_url }}/#settings/notifications">{{ _("Manage email preferences") }}</a> | <a href="{{ unsubscribe_link }}">{{ _("Unsubscribe from marketing emails") }}</a></p>
     {% endif %}
 {% endblock %}
diff --git a/templates/zerver/emails/deactivate.html b/templates/zerver/emails/deactivate.html
index fe86fcdbee..eff7c2f61f 100644
--- a/templates/zerver/emails/deactivate.html
+++ b/templates/zerver/emails/deactivate.html
@@ -6,7 +6,7 @@
 
 {% block content %}
 {% trans %}
-Your Zulip account on <a href="{{ realm_uri }}">{{ realm_uri }}</a> has been deactivated, and you will no longer be able to log in.
+Your Zulip account on <a href="{{ realm_url }}">{{ realm_url }}</a> has been deactivated, and you will no longer be able to log in.
 {% endtrans %}
 
 <br/><br/>
diff --git a/templates/zerver/emails/deactivate.txt b/templates/zerver/emails/deactivate.txt
index 6c96153460..6bfa94764c 100644
--- a/templates/zerver/emails/deactivate.txt
+++ b/templates/zerver/emails/deactivate.txt
@@ -1,5 +1,5 @@
 {% trans %}
-Your Zulip account on {{ realm_uri }} has been deactivated, and you will no longer be able to log in.
+Your Zulip account on {{ realm_url }} has been deactivated, and you will no longer be able to log in.
 {% endtrans %}
 
 {% if deactivation_notification_comment %}
diff --git a/templates/zerver/emails/digest.html b/templates/zerver/emails/digest.html
index ee2673a561..c974527c24 100644
--- a/templates/zerver/emails/digest.html
+++ b/templates/zerver/emails/digest.html
@@ -31,12 +31,12 @@
 
     <br />
 
-    <p class="digest_paragraph"><a href="{{ realm_uri }}">{% trans %}Click here to log in to Zulip and catch up.{% endtrans %}</a></p>
+    <p class="digest_paragraph"><a href="{{ realm_url }}">{% trans %}Click here to log in to Zulip and catch up.{% endtrans %}</a></p>
 {% endblock %}
 
 {% block manage_preferences %}
 <p class="digest_paragraph">
-    <a href="{{ realm_uri }}/#settings/notifications">{% trans %}Manage email preferences{% endtrans %}</a> |
+    <a href="{{ realm_url }}/#settings/notifications">{% trans %}Manage email preferences{% endtrans %}</a> |
     <a href="{{ unsubscribe_link }}">{% trans %}Unsubscribe from digest emails{% endtrans %}</a>
 </p>
 {% endblock %}
diff --git a/templates/zerver/emails/digest.txt b/templates/zerver/emails/digest.txt
index cb3715f520..4ffa1c6878 100644
--- a/templates/zerver/emails/digest.txt
+++ b/templates/zerver/emails/digest.txt
@@ -9,12 +9,12 @@
     {{ new_channels.plain|display_list(1000) }}.
 {% endif %}
 
-{% trans organization_url=realm_uri %}Click here to log in to Zulip and catch up: {{ organization_url }}.{% endtrans %}
+{% trans organization_url=realm_url %}Click here to log in to Zulip and catch up: {{ organization_url }}.{% endtrans %}
 
 --
 {% trans %}Manage email preferences:{% endtrans %}
 
-{{ realm_uri }}/#settings/notifications
+{{ realm_url }}/#settings/notifications
 
 {% trans %}Unsubscribe from digest emails:{% endtrans %}
 
diff --git a/templates/zerver/emails/missed_message.html b/templates/zerver/emails/missed_message.html
index 4c3b4bbac3..10ee724f6e 100644
--- a/templates/zerver/emails/missed_message.html
+++ b/templates/zerver/emails/missed_message.html
@@ -14,9 +14,9 @@
     {% else %}
     <div class="missed_message no-content-explanation">
     {% if message_content_disabled_by_realm %}
-    {% trans help_url=realm_uri + "/help/hide-message-content-in-emails" %}This email does not include message content because your organization has disabled <a class="content_disabled_help_link" href="{{ help_url }}">message content appearing in email notifications</a>.{% endtrans %}
+    {% trans help_url=realm_url + "/help/hide-message-content-in-emails" %}This email does not include message content because your organization has disabled <a class="content_disabled_help_link" href="{{ help_url }}">message content appearing in email notifications</a>.{% endtrans %}
     {% elif message_content_disabled_by_user %}
-    {% trans alert_notif_url=realm_uri + "/help/dm-mention-alert-notifications" %}This email does not include message content because you have disabled <a class="content_disabled_help_link" href="{{ alert_notif_url }}">message content appearing in email notifications</a>.{% endtrans %}
+    {% trans alert_notif_url=realm_url + "/help/dm-mention-alert-notifications" %}This email does not include message content because you have disabled <a class="content_disabled_help_link" href="{{ alert_notif_url }}">message content appearing in email notifications</a>.{% endtrans %}
     {% endif %}
     </div>
     {% endif %}
@@ -43,11 +43,11 @@
     {% trans %}You are receiving this because you have email notifications enabled for #{{ channel_name }}.{% endtrans %}<br />
     {% endif %}
     {% if reply_to_zulip %}
-    {% trans notif_url=realm_uri + "/#settings/notifications" %}Reply to this email directly, <a href="{{ narrow_url }}">view it in {{ realm_name }} Zulip</a>, or <a href="{{ notif_url }}">manage email preferences</a>.{% endtrans %}
+    {% trans notif_url=realm_url + "/#settings/notifications" %}Reply to this email directly, <a href="{{ narrow_url }}">view it in {{ realm_name }} Zulip</a>, or <a href="{{ notif_url }}">manage email preferences</a>.{% endtrans %}
     {% elif not show_message_content %}
-    {% trans notif_url=realm_uri + "/#settings/notifications" %}<a href="{{ narrow_url }}">View or reply in {{ realm_name }} Zulip</a>, or <a href="{{ notif_url }}">manage email preferences</a>.{% endtrans %} <br />
+    {% trans notif_url=realm_url + "/#settings/notifications" %}<a href="{{ narrow_url }}">View or reply in {{ realm_name }} Zulip</a>, or <a href="{{ notif_url }}">manage email preferences</a>.{% endtrans %} <br />
     {% else %}
-    {% trans notif_url=realm_uri + "/#settings/notifications" %}<a href="{{ narrow_url }}">Reply in {{ realm_name }} Zulip</a>, or <a href="{{ notif_url }}">manage email preferences</a>.{% endtrans %} <br />
+    {% trans notif_url=realm_url + "/#settings/notifications" %}<a href="{{ narrow_url }}">Reply in {{ realm_name }} Zulip</a>, or <a href="{{ notif_url }}">manage email preferences</a>.{% endtrans %} <br />
     <br />
     {% trans url="https://zulip.readthedocs.io/en/latest/production/email-gateway.html" %}
     Do not reply to this email. This Zulip server is not configured to accept incoming emails (<a href="{{ url }}">help</a>).
diff --git a/templates/zerver/emails/missed_message.txt b/templates/zerver/emails/missed_message.txt
index b806aabf54..01e29fb822 100644
--- a/templates/zerver/emails/missed_message.txt
+++ b/templates/zerver/emails/missed_message.txt
@@ -8,12 +8,12 @@
 {% endfor %}
 {% else %}
 {% if message_content_disabled_by_realm %}
-{% trans hide_content_url=realm_uri + "/help/hide-message-content-in-emails" %}
+{% trans hide_content_url=realm_url + "/help/hide-message-content-in-emails" %}
 This email does not include message content because your organization has disabled message content appearing in email notifications.
 See {{ hide_content_url }} for more details.
 {% endtrans %}
 {% elif message_content_disabled_by_user %}
-{% trans alert_notif_url=realm_uri + "/help/dm-mention-alert-notifications" %}
+{% trans alert_notif_url=realm_url + "/help/dm-mention-alert-notifications" %}
 This email does not include message content because you have disabled message content appearing in email notifications.
 See {{ alert_notif_url }} for more details.
 {% endtrans %}
@@ -61,4 +61,4 @@ https://zulip.readthedocs.io/en/latest/production/email-gateway.html
 
 {% trans %}Manage email preferences: {% endtrans %}
 
-{{ realm_uri }}/#settings/notifications
+{{ realm_url }}/#settings/notifications
diff --git a/templates/zerver/emails/notify_new_login.html b/templates/zerver/emails/notify_new_login.html
index 06814a3e54..a8ad9df33f 100644
--- a/templates/zerver/emails/notify_new_login.html
+++ b/templates/zerver/emails/notify_new_login.html
@@ -1,7 +1,7 @@
 {% extends "zerver/emails/email_base_default.html" %}
 
 {% block preheader %}
-    {% trans organization_url=realm_uri %}Organization: {{ organization_url }} Time: {{ login_time }} Email: {{ user_email }}{% endtrans %}
+    {% trans organization_url=realm_url %}Organization: {{ organization_url }} Time: {{ login_time }} Email: {{ user_email }}{% endtrans %}
 {% endblock %}
 
 {% block illustration %}
@@ -13,7 +13,7 @@
 <p>
     <ul>
         <li>
-            {% trans organization_link=macros.link_tag(realm_uri) %}Organization: {{ organization_link }}{% endtrans %}
+            {% trans organization_link=macros.link_tag(realm_url) %}Organization: {{ organization_link }}{% endtrans %}
         </li>
         <li>
             {% trans user_email=macros.email_tag(user_email) %}Email: {{ user_email }}{% endtrans %}
@@ -33,7 +33,7 @@
 <p>{{ _("If this was you, great! There's nothing else you need to do.") }}</p>
 
 <p>
-    {% trans support_email=macros.email_tag(support_email), reset_link=realm_uri + "/accounts/password/reset/" %}If you do not recognize this login, or think your account may have been compromised, please <a href="{{ reset_link }}">reset your password</a> or contact us immediately at {{ support_email }}.{% endtrans %}
+    {% trans support_email=macros.email_tag(support_email), reset_link=realm_url + "/accounts/password/reset/" %}If you do not recognize this login, or think your account may have been compromised, please <a href="{{ reset_link }}">reset your password</a> or contact us immediately at {{ support_email }}.{% endtrans %}
 </p>
 
 <p>
@@ -43,5 +43,5 @@
 {% endblock %}
 
 {% block manage_preferences %}
-<p><a href="{{ realm_uri }}/#settings/notifications">{{ _("Manage email preferences") }}</a> | <a href="{{ unsubscribe_link }}">{{ _("Unsubscribe from login notifications") }}</a></p>
+<p><a href="{{ realm_url }}/#settings/notifications">{{ _("Manage email preferences") }}</a> | <a href="{{ unsubscribe_link }}">{{ _("Unsubscribe from login notifications") }}</a></p>
 {% endblock %}
diff --git a/templates/zerver/emails/notify_new_login.txt b/templates/zerver/emails/notify_new_login.txt
index e5f49b9a4b..027ea6ca37 100644
--- a/templates/zerver/emails/notify_new_login.txt
+++ b/templates/zerver/emails/notify_new_login.txt
@@ -1,6 +1,6 @@
 {{ _("We noticed a recent login for the following Zulip account.") }}
 
-{% trans organization_url=realm_uri %}Organization: {{ organization_url }}{% endtrans %}
+{% trans organization_url=realm_url %}Organization: {{ organization_url }}{% endtrans %}
 
 {% trans %}Email: {{ user_email }}{% endtrans %}
 
@@ -13,7 +13,7 @@
 
 {{ _("If this was you, great! There's nothing else you need to do.") }}
 
-{% trans reset_link=realm_uri + "/accounts/password/reset/" %}
+{% trans reset_link=realm_url + "/accounts/password/reset/" %}
 If you do not recognize this login, or think your account may have been compromised, please reset your password at {{ reset_link }} or contact us immediately at {{ support_email }}.
 {%- endtrans %}
 
diff --git a/templates/zerver/emails/onboarding_zulip_topics.html b/templates/zerver/emails/onboarding_zulip_topics.html
index 092e40a7ce..91e4b49d78 100644
--- a/templates/zerver/emails/onboarding_zulip_topics.html
+++ b/templates/zerver/emails/onboarding_zulip_topics.html
@@ -25,7 +25,7 @@
     {% trans %}Don't stress about picking the perfect name for your topic. If anything is out of place, it's easy to <a href="{{ move_messages_link }}">move messages</a>, <a href="{{ rename_topics_link }}">rename topics</a>, or even <a href="{{ move_channels_link }}">move a topic to a different channel</a>.{% endtrans %}
 </p>
 
-<a class="button" href="{{ realm_uri }}">{{ _("Go to Zulip") }}</a>
+<a class="button" href="{{ realm_url }}">{{ _("Go to Zulip") }}</a>
 
 {% endblock %}
 
diff --git a/templates/zerver/emails/onboarding_zulip_topics.txt b/templates/zerver/emails/onboarding_zulip_topics.txt
index 005d6c23c9..d7e6c1e02f 100644
--- a/templates/zerver/emails/onboarding_zulip_topics.txt
+++ b/templates/zerver/emails/onboarding_zulip_topics.txt
@@ -8,7 +8,7 @@
 
 
 {{ _("Go to Zulip") }}:
-<{{ realm_uri }}>
+<{{ realm_url }}>
 
 ----
 {% trans %}Unsubscribe from welcome emails for {{ realm_name }}{% endtrans %}:
diff --git a/templates/zerver/emails/password_reset.html b/templates/zerver/emails/password_reset.html
index 2c3dc07f0f..d071773f73 100644
--- a/templates/zerver/emails/password_reset.html
+++ b/templates/zerver/emails/password_reset.html
@@ -6,7 +6,7 @@
 
 {% block content %}
     <p>
-        {% trans email=macros.email_tag(email), realm_uri=macros.link_tag(realm_uri) %}Somebody (possibly you) requested a new password for the Zulip account {{ email }} on {{ realm_uri }}.{% endtrans %}
+        {% trans email=macros.email_tag(email), realm_url=macros.link_tag(realm_url) %}Somebody (possibly you) requested a new password for the Zulip account {{ email }} on {{ realm_url }}.{% endtrans %}
     </p>
     {% if active_account_in_realm %}
     <p>
@@ -16,7 +16,7 @@
     {% else %}
     <p>
         {% if user_deactivated %}
-            {% trans organization_url=macros.link_tag(realm_uri), help_link=realm_uri + "/help/deactivate-or-reactivate-a-user" %}You previously had an account on {{ organization_url }}, but it has been deactivated. You can contact an organization administrator to <a href="{{ help_link }}">reactivate your account</a>.{% endtrans %}
+            {% trans organization_url=macros.link_tag(realm_url), help_link=realm_url + "/help/deactivate-or-reactivate-a-user" %}You previously had an account on {{ organization_url }}, but it has been deactivated. You can contact an organization administrator to <a href="{{ help_link }}">reactivate your account</a>.{% endtrans %}
         {% else %}
             {% trans %}You do not have an account in that Zulip organization.{% endtrans %}
         {% endif %}
diff --git a/templates/zerver/emails/password_reset.txt b/templates/zerver/emails/password_reset.txt
index 36a1377d97..29a40a05e5 100644
--- a/templates/zerver/emails/password_reset.txt
+++ b/templates/zerver/emails/password_reset.txt
@@ -1,5 +1,5 @@
 {% trans -%}
-Somebody (possibly you) requested a new password for the Zulip account {{ email }} on {{ realm_uri }}.
+Somebody (possibly you) requested a new password for the Zulip account {{ email }} on {{ realm_url }}.
 {%- endtrans %}
 
 {% if active_account_in_realm %}
@@ -8,9 +8,9 @@ Somebody (possibly you) requested a new password for the Zulip account {{ email
 {% else %}
 {% if user_deactivated %}
 {% trans -%}
-You previously had an account on {{ realm_uri }}, but it has been deactivated. You can contact an organization administrator to reactivate your account.
+You previously had an account on {{ realm_url }}, but it has been deactivated. You can contact an organization administrator to reactivate your account.
 {%- endtrans %}
-{{ realm_uri }}/help/deactivate-or-reactivate-a-user
+{{ realm_url }}/help/deactivate-or-reactivate-a-user
 {% else %}
 {% trans -%}
 You do not have an account in that Zulip organization.
diff --git a/templates/zerver/emails/realm_reactivation.html b/templates/zerver/emails/realm_reactivation.html
index 01e0b91bb8..7d57e64964 100644
--- a/templates/zerver/emails/realm_reactivation.html
+++ b/templates/zerver/emails/realm_reactivation.html
@@ -7,7 +7,7 @@
 {% block content %}
 <p>{% trans %}Dear former administrators of {{ realm_name }},{% endtrans %}</p>
 
-<p>{% trans realm_uri=macros.link_tag(realm_uri) %}One of your administrators requested reactivation of the previously deactivated Zulip organization hosted at {{ realm_uri }}.{% endtrans %}</p>
+<p>{% trans realm_url=macros.link_tag(realm_url) %}One of your administrators requested reactivation of the previously deactivated Zulip organization hosted at {{ realm_url }}.{% endtrans %}</p>
 
 <p>
     {{ _('Click the button below to reactivate your organization.') }}
diff --git a/templates/zerver/emails/realm_reactivation.txt b/templates/zerver/emails/realm_reactivation.txt
index 8684bf1f76..2da9501aa5 100644
--- a/templates/zerver/emails/realm_reactivation.txt
+++ b/templates/zerver/emails/realm_reactivation.txt
@@ -1,7 +1,7 @@
 {% trans %}Dear former administrators of {{ realm_name }},{% endtrans %}
 
 
-{% trans %}One of your administrators requested reactivation of the previously deactivated Zulip organization hosted at {{ realm_uri }}.{% endtrans %}
+{% trans %}One of your administrators requested reactivation of the previously deactivated Zulip organization hosted at {{ realm_url }}.{% endtrans %}
 
 
 {{ _('Click the link below to reactivate your organization.') }}
diff --git a/version.py b/version.py
index 59ba6694f6..f3df5bbdf9 100644
--- a/version.py
+++ b/version.py
@@ -48,4 +48,4 @@ API_FEATURE_LEVEL = 262
 #   historical commits sharing the same major version, in which case a
 #   minor version bump suffices.
 
-PROVISION_VERSION = (270, 3)  # last bumped 2024-05-15 for patching @types/plotly.js
+PROVISION_VERSION = (271, 0)  # last bumped 2024-05-24 for translation string changes
diff --git a/zerver/actions/realm_settings.py b/zerver/actions/realm_settings.py
index b9b74a5d6b..6360db91b2 100644
--- a/zerver/actions/realm_settings.py
+++ b/zerver/actions/realm_settings.py
@@ -757,7 +757,7 @@ def do_send_realm_reactivation_email(realm: Realm, *, acting_user: Optional[User
     )
     context = {
         "confirmation_url": url,
-        "realm_uri": realm.url,
+        "realm_url": realm.url,
         "realm_name": realm.name,
         "corporate_enabled": settings.CORPORATE_ENABLED,
     }
diff --git a/zerver/context_processors.py b/zerver/context_processors.py
index 9fb2250e4c..45ac6e81fd 100644
--- a/zerver/context_processors.py
+++ b/zerver/context_processors.py
@@ -42,7 +42,7 @@ def common_context(user: UserProfile) -> Dict[str, Any]:
     have a request.
     """
     return {
-        "realm_uri": user.realm.url,
+        "realm_url": user.realm.url,
         "realm_name": user.realm.name,
         "root_domain_url": settings.ROOT_DOMAIN_URI,
         "external_url_scheme": settings.EXTERNAL_URI_SCHEME,
diff --git a/zerver/forms.py b/zerver/forms.py
index fc02ebb91a..cf55fc1711 100644
--- a/zerver/forms.py
+++ b/zerver/forms.py
@@ -431,7 +431,7 @@ class ZulipPasswordResetForm(PasswordResetForm):
 
         context = {
             "email": email,
-            "realm_uri": realm.url,
+            "realm_url": realm.url,
             "realm_name": realm.name,
         }
 
diff --git a/zerver/lib/send_email.py b/zerver/lib/send_email.py
index 6740179d20..785b894231 100644
--- a/zerver/lib/send_email.py
+++ b/zerver/lib/send_email.py
@@ -612,7 +612,7 @@ def send_custom_email(
         context: Dict[str, object] = {
             "realm": user_profile.realm,
             "realm_string_id": user_profile.realm.string_id,
-            "realm_uri": user_profile.realm.url,
+            "realm_url": user_profile.realm.url,
             "realm_name": user_profile.realm.name,
         }
         if add_context is not None:
diff --git a/zerver/management/commands/send_password_reset_email.py b/zerver/management/commands/send_password_reset_email.py
index 72e8693df3..1cf6efc8b2 100644
--- a/zerver/management/commands/send_password_reset_email.py
+++ b/zerver/management/commands/send_password_reset_email.py
@@ -62,7 +62,7 @@ class Command(ZulipBaseCommand):
             context = {
                 "email": user_profile.delivery_email,
                 "reset_url": generate_password_reset_url(user_profile, default_token_generator),
-                "realm_uri": user_profile.realm.url,
+                "realm_url": user_profile.realm.url,
                 "realm_name": user_profile.realm.name,
                 "active_account_in_realm": True,
             }
diff --git a/zerver/tests/test_signup.py b/zerver/tests/test_signup.py
index 0706da466b..95c0571765 100644
--- a/zerver/tests/test_signup.py
+++ b/zerver/tests/test_signup.py
@@ -1151,7 +1151,7 @@ class EmailUnsubscribeTests(ZulipTestCase):
         # Enqueue a fake digest email.
         context = {
             "name": "",
-            "realm_uri": "",
+            "realm_url": "",
             "unread_pms": [],
             "hot_conversations": [],
             "new_users": [],
diff --git a/zerver/views/users.py b/zerver/views/users.py
index dca602c21a..48c683b16c 100644
--- a/zerver/views/users.py
+++ b/zerver/views/users.py
@@ -168,7 +168,7 @@ def _deactivate_user_profile_backend(
             from_address=FromAddress.NOREPLY,
             context={
                 "deactivation_notification_comment": deactivation_notification_comment,
-                "realm_uri": target.realm.url,
+                "realm_url": target.realm.url,
                 "realm_name": target.realm.name,
             },
         )