diff --git a/help/contact-support.md b/help/contact-support.md
index b8d9982034..ca6cafb342 100644
--- a/help/contact-support.md
+++ b/help/contact-support.md
@@ -33,7 +33,7 @@ feedback.
 
         * Response time: Usually within one business day.
 
-    * **Self-managed** and **Community** plan customers can ask for help in the
+    * **Free** and **Community** plan customers can ask for help in the
       [Zulip development community](#zulip-community). You will usually get a
       friendly reply within 1-3 business days.
 
diff --git a/help/self-hosted-billing.md b/help/self-hosted-billing.md
index 87cb378849..f261823d81 100644
--- a/help/self-hosted-billing.md
+++ b/help/self-hosted-billing.md
@@ -8,8 +8,8 @@ reach out at [sales@zulip.com](mailto:sales@zulip.com).
 
 ## Paid plan details and upgrades
 
-For businesses with up to 10 Zulip users, the Self-managed plan is a good
-option, and includes free access to the Mobile Push Notification Service.
+For businesses with up to 10 Zulip users, the Free plan is a good option, and
+includes free access to the Mobile Push Notification Service.
 
 For businesses with more than 10 Zulip users, both the Basic and Business plans
 include unlimited access to the Mobile Push Notification Service.
@@ -258,7 +258,7 @@ organization is considered to be a new customer if:
 {!self-hosted-billing-multiple-organizations.md!}
 
 If you cancel your plan, your organization will be downgraded to the
-**Self-managed** plan at the end of the current billing period.
+**Free** plan at the end of the current billing period.
 
 {start_tabs}
 
@@ -297,7 +297,7 @@ types of organizations are generally eligible for the free Community plan.
   friends, volunteer groups, etc.).
 
 Organizations that have up to 10 users, or do not require mobile push
-notifications, will likely find the Self-managed plan to be the most convenient
+notifications, will likely find the Free plan to be the most convenient
 option. Larger organizations are encouraged to apply for the free Community
 plan, which includes unlimited push notifications and support for many Zulip
 features.