diff --git a/static/templates/settings/organization_settings_admin.hbs b/static/templates/settings/organization_settings_admin.hbs
index 8316079ef2..b35bb05bb9 100644
--- a/static/templates/settings/organization_settings_admin.hbs
+++ b/static/templates/settings/organization_settings_admin.hbs
@@ -186,7 +186,7 @@
             <div class="inline-block organization-settings-parent">
                 <div class="input-group">
                     <label for="realm_video_chat_provider" class="dropdown-title">
-                        {{t 'Video chat provider' }}
+                        {{t 'Video call provider' }}
                     </label>
                     <select name="realm_video_chat_provider" class ="setting-widget prop-element" id="id_realm_video_chat_provider" data-setting-widget-type="number">
                         {{#each realm_available_video_chat_providers}}
diff --git a/templates/zerver/help/start-a-call.md b/templates/zerver/help/start-a-call.md
index cf309eab54..7767c09f41 100644
--- a/templates/zerver/help/start-a-call.md
+++ b/templates/zerver/help/start-a-call.md
@@ -18,12 +18,12 @@ compose box.
 
 {end_tabs}
 
-## Change your video chat provider
+## Change your video call provider
 
 By default, Zulip integrates with
 [Jitsi Meet](https://jitsi.org/jitsi-meet/), a fully-encrypted, 100% open
 source video conferencing solution. Organization administrators can also
-change the organization's video chat provider. Video chat providers
+change the organization's video call provider. The video call providers
 supported by zulip are:
 
 * [Jitsi Meet](/integrations/doc/jitsi)
@@ -34,13 +34,13 @@ supported by zulip are:
     It is also possible to disable the video call button for your organization by
     setting the provider to "None".
 
-### Change your organization's video chat provider
+### Change your organization's video call provider
 
 {start_tabs}
 
 {settings_tab|organization-settings}
 
-1. Under **Other settings** select appropriate provider from **Video chat provider** dropdown.
+1. Under **Other settings** select appropriate provider from **Video call provider** dropdown.
 
 1. Click **Save changes**.
 
diff --git a/templates/zerver/integrations/big-blue-button.md b/templates/zerver/integrations/big-blue-button.md
index 73a8180e80..4ce7fe764f 100644
--- a/templates/zerver/integrations/big-blue-button.md
+++ b/templates/zerver/integrations/big-blue-button.md
@@ -1,4 +1,4 @@
-Zulip supports using Big Blue Button as its video call video chat
+Zulip supports using Big Blue Button as its video call video call
 provider. This is currently only possible on self-hosted Zulip
 installations.
 
@@ -29,7 +29,7 @@ configure your zulip server to use that Big Blue Button server.
 
 ### Using Big Blue Button
 
-1. Select Big Blue Button as the organization's [video call provider](/help/start-a-call#changing-your-organizations-video-chat-provider).
+1. Select Big Blue Button as the organization's [video call provider](/help/start-a-call#changing-your-organizations-video-call-provider).
 
 1. Zulip's [call button](/help/start-a-call) will now create meetings
    using Big Blue Button.
diff --git a/templates/zerver/integrations/jitsi.md b/templates/zerver/integrations/jitsi.md
index 13026008ba..889e540867 100644
--- a/templates/zerver/integrations/jitsi.md
+++ b/templates/zerver/integrations/jitsi.md
@@ -4,14 +4,14 @@ conferencing solution.
 
 ### Using Jitsi Meet
 
-1. Set Jitsi as the organization's [video chat
-   provider](/help/start-a-call#changing-your-organizations-video-chat-provider),
+1. Set Jitsi as the organization's [video call
+   provider](/help/start-a-call#changing-your-organizations-video-call-provider),
    if it isn't already.
 
 2. Zulip's [call button](/help/start-a-call) will now create meetings
    using Jitsi Meet.
 
-Zulip's default video chat provider is the cloud version of [Jitsi
+Zulip's default video call provider is the cloud version of [Jitsi
 Meet](https://meet.jit.si/) but it also possible to use Zulip with a
 self-hosted instance of Jitsi Meet; to configure this, just set
 `JITSI_SERVER_URL` in `/etc/zulip/settings.py`.
diff --git a/templates/zerver/integrations/zoom.md b/templates/zerver/integrations/zoom.md
index 34a6572b78..a9593c57f1 100644
--- a/templates/zerver/integrations/zoom.md
+++ b/templates/zerver/integrations/zoom.md
@@ -2,7 +2,7 @@ Zulip supports using Zoom as its video call provider.
 
 ### Using Zoom
 
-1. Select Zoom as the organization's [video call provider](/help/start-a-call#changing-your-organizations-video-chat-provider).
+1. Select Zoom as the organization's [video call provider](/help/start-a-call#changing-your-organizations-video-call-provider).
 
 1. Zulip's [call button](/help/start-a-call) will now create meetings
    using Zoom.
diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml
index 4e0cecf0a0..c2fa391dc4 100644
--- a/zerver/openapi/zulip.yaml
+++ b/zerver/openapi/zulip.yaml
@@ -3301,11 +3301,11 @@ paths:
                                         organization administrator.
 
                                         Useful for administrative settings UI that allows changing the
-                                        video chat provider.
+                                        video call provider.
                                       additionalProperties:
                                         description: |
                                           `{provider_name}`: Dictionary containing the details of the
-                                          video chat provider with the name of the chat provider as
+                                          video call provider with the name of the chat provider as
                                           the key.
                                         type: object
                                         additionalProperties: false
@@ -3313,11 +3313,11 @@ paths:
                                           name:
                                             type: string
                                             description: |
-                                              The name of the video chat provider.
+                                              The name of the video call provider.
                                           id:
                                             type: integer
                                             description: |
-                                              The ID of the video chat provider.
+                                              The ID of the video call provider.
                                     presence_disabled:
                                       type: boolean
                                       description: |
@@ -8224,11 +8224,11 @@ paths:
                           organization administrator.
 
                           Useful for administrative settings UI that allows changing the
-                          video chat provider.
+                          video call provider.
                         additionalProperties:
                           description: |
                             `{provider_name}`: Dictionary containing the details of the
-                            video chat provider with the name of the chat provider as
+                            video call provider with the name of the chat provider as
                             the key.
                           type: object
                           additionalProperties: false
@@ -8236,11 +8236,11 @@ paths:
                             name:
                               type: string
                               description: |
-                                The name of the video chat provider.
+                                The name of the video call provider.
                             id:
                               type: integer
                               description: |
-                                The ID of the video chat provider.
+                                The ID of the video call provider.
                       realm_presence_disabled:
                         type: boolean
                         description: |