diff --git a/templates/corporate/policies/privacy.md b/templates/corporate/policies/privacy.md
index 9772fdacca..8b4f615852 100644
--- a/templates/corporate/policies/privacy.md
+++ b/templates/corporate/policies/privacy.md
@@ -72,7 +72,7 @@ provide them to us:
| **Web Analytics** | - Web page interactions
- Referring webpage/source through which you accessed the Services
- Statistics associated with the interaction between device or browser and the Services | - Service Providers
- Analytics Partners |
| **Social Network Data** | - Email address
- User name | - Service Providers |
| **Geolocation Data** | - IP-address-based coarse location information | - Service Providers
- Analytics Partners |
-| **Other Identifying Information that You Voluntarily Choose to Provide** | - Identifying information in emails, letters, Zulip messages or support communications you send us
- Zulip messages, uploaded files, stream descriptions, and other content you provide using our Services (e.g. in a Zulip client)
- Values of custom profile fields configured by your Zulip Organization, where you might choose to enter your phone number, job title, birthday, or other biographical details. | - Service Providers
- Parties You Authorize, Access or Authenticate |
+| **Other Identifying Information that You Voluntarily Choose to Provide** | - Identifying information in emails, letters, Zulip messages or support communications you send us
- Zulip messages, uploaded files, channel descriptions, and other content you provide using our Services (e.g. in a Zulip client)
- Values of custom profile fields configured by your Zulip Organization, where you might choose to enter your phone number, job title, birthday, or other biographical details. | - Service Providers
- Parties You Authorize, Access or Authenticate |
| **Other Identifying Information that Another User Chooses to Provide to You** | - Messages or other content that other Zulip users may send you.
- Messages or content that any Zulip Organization Administrator of a Zulip community that you may join may provide about you. | - Service Providers
- Parties You Authorize, Access or Authenticate |
@@ -193,10 +193,10 @@ parties listed in this section. We do not sell Personal Data.
include:
- Other Zulip users. When you send a message to another Zulip user or
otherwise provide data to Zulip, it may be shared with some or all other
- users in that Zulip Organization. Please note that some Zulip streams [may
+ users in that Zulip Organization. Please note that some Zulip channels [may
be accessible to the general
public](/help/channel-permissions), in addition to the
- stream’s current subscribers. For more information, please review our
+ channel’s current subscribers. For more information, please review our
[Terms of Service](/policies/terms).
- Zulip Organization Administrators may export all Zulip data for a Zulip
Organization for archival/backup purposes, to import the data into a
@@ -370,7 +370,7 @@ other content that you have sent to another Zulip user. If you request deletion
of your account, all such messages and content will be associated with a
“Deleted User.” In addition, please note that anyone that you send messages or
other content to (or who may otherwise have access to such messages or content
-through a Zulip Organization or stream) may have downloaded or copied such
+through a Zulip Organization or channel) may have downloaded or copied such
messages or content. Zulip will not be able to delete such downloaded or copied
messages or content.
@@ -553,7 +553,7 @@ to verify your identity and the nature of your request.
deletion of your account, all such messages and content will be associated
with a “Deleted User.” In addition, please note that anyone that you send
messages or other content to (or who may otherwise have access to such
- messages or content through a Zulip Organization or stream), may have
+ messages or content through a Zulip Organization or channel), may have
downloaded or copied such messages or content. Zulip will not be able to
delete such downloaded or copied messages or content.
- **Withdrawal of Consent**: If we are processing your Personal Data based on
diff --git a/templates/corporate/policies/terms.md b/templates/corporate/policies/terms.md
index a21623cbab..41ea128802 100644
--- a/templates/corporate/policies/terms.md
+++ b/templates/corporate/policies/terms.md
@@ -195,7 +195,7 @@ below.
To provide the Services, we need your permission to do things like storing your
User Submissions and showing them to the people you send messages to, or who
otherwise have permission to see them (for example, any member of your Zulip
-Organization for a message you send to a public stream.) Our Services also
+Organization for a message you send to a public channel.) Our Services also
provide you with features like sharing and searching. To provide these and other
features, Zulip may access, use, store, copy, process, adapt, distribute,
perform, export, and display your User Submissions. Note that the following
@@ -221,7 +221,7 @@ For example:
- Your Zulip Organization Administrators may [export the Zulip Organization’s
data](/help/export-your-organization) for archival or backup purposes, or to
import the data into a self-hosted Zulip server.
-- Messages on a web-public stream may be viewed by anyone on the Internet.
+- Messages on a web-public channel may be viewed by anyone on the Internet.
When you delete your Zulip account, we will stop displaying your User
Submissions in association with your account, if applicable. You understand that