diff --git a/analytics/tests/test_support_views.py b/analytics/tests/test_support_views.py
index d5fe08f70b..83f197751b 100644
--- a/analytics/tests/test_support_views.py
+++ b/analytics/tests/test_support_views.py
@@ -78,7 +78,7 @@ class TestSupportEndpoint(ZulipTestCase):
                     f"<b>First human user</b>: {first_human_user.delivery_email}\n",
                     f'<input type="hidden" name="realm_id" value="{zulip_realm.id}"',
                     "Zulip Dev</h3>",
-                    '<option value="1" selected>Self hosted</option>',
+                    '<option value="1" selected>Self-hosted</option>',
                     '<option value="2" >Limited</option>',
                     'input type="number" name="discount" value="None"',
                     '<option value="active" selected>Active</option>',
@@ -96,7 +96,7 @@ class TestSupportEndpoint(ZulipTestCase):
                 [
                     f'<input type="hidden" name="realm_id" value="{lear_realm.id}"',
                     "Lear &amp; Co.</h3>",
-                    '<option value="1" selected>Self hosted</option>',
+                    '<option value="1" selected>Self-hosted</option>',
                     '<option value="2" >Limited</option>',
                     'input type="number" name="discount" value="None"',
                     '<option value="active" selected>Active</option>',
@@ -353,7 +353,7 @@ class TestSupportEndpoint(ZulipTestCase):
             )
             m.assert_called_once_with(get_realm("zulip"), 2, acting_user=iago)
             self.assert_in_success_response(
-                ["Plan type of zulip changed from self hosted to limited"], result
+                ["Plan type of zulip changed from self-hosted to limited"], result
             )
 
         with mock.patch("analytics.views.support.do_change_realm_plan_type") as m:
@@ -362,7 +362,7 @@ class TestSupportEndpoint(ZulipTestCase):
             )
             m.assert_called_once_with(get_realm("zulip"), 10, acting_user=iago)
             self.assert_in_success_response(
-                ["Plan type of zulip changed from self hosted to plus"], result
+                ["Plan type of zulip changed from self-hosted to plus"], result
             )
 
     def test_change_org_type(self) -> None:
diff --git a/analytics/views/support.py b/analytics/views/support.py
index e6012472b0..3301c9fe4c 100644
--- a/analytics/views/support.py
+++ b/analytics/views/support.py
@@ -59,7 +59,7 @@ if settings.BILLING_ENABLED:
 
 def get_plan_name(plan_type: int) -> str:
     return {
-        Realm.PLAN_TYPE_SELF_HOSTED: "self hosted",
+        Realm.PLAN_TYPE_SELF_HOSTED: "self-hosted",
         Realm.PLAN_TYPE_LIMITED: "limited",
         Realm.PLAN_TYPE_STANDARD: "standard",
         Realm.PLAN_TYPE_STANDARD_FREE: "open source",
diff --git a/docs/overview/release-lifecycle.md b/docs/overview/release-lifecycle.md
index 5ae3fa66f0..adb5371bc3 100644
--- a/docs/overview/release-lifecycle.md
+++ b/docs/overview/release-lifecycle.md
@@ -72,7 +72,7 @@ in a stable release.
   to chat.zulip.org to facilitate design feedback.
 - We maintain Git branches with names like `4.x` containing backported
   commits from `main` that we plan to include in the next maintenance
-  release. Self hosters can [upgrade][upgrade-from-git] to these
+  release. Self-hosters can [upgrade][upgrade-from-git] to these
   stable release branches to get bug fixes staged for the next stable
   release (which is very useful when you reported a bug whose fix we
   choose to backport). We support these branches as though they were a
diff --git a/templates/analytics/realm_details.html b/templates/analytics/realm_details.html
index 8320f2abf5..fe4aa74053 100644
--- a/templates/analytics/realm_details.html
+++ b/templates/analytics/realm_details.html
@@ -67,7 +67,7 @@
     {{ csrf_input }}
     <input type="hidden" name="realm_id" value="{{ realm.id }}" />
     <select name="plan_type">
-        <option value="1" {% if realm.plan_type == 1 %}selected{% endif %}>Self hosted</option>
+        <option value="1" {% if realm.plan_type == 1 %}selected{% endif %}>Self-hosted</option>
         <option value="2" {% if realm.plan_type == 2 %}selected{% endif %}>Limited</option>
         <option value="3" {% if realm.plan_type == 3 %}selected{% endif %}>Standard</option>
         <option value="4" {% if realm.plan_type == 4 %}selected{% endif %}>Standard Free</option>
diff --git a/templates/zerver/compare.html b/templates/zerver/compare.html
index ad1c62a254..b8d10e4e41 100644
--- a/templates/zerver/compare.html
+++ b/templates/zerver/compare.html
@@ -32,7 +32,7 @@
                         <td class="no"></td>
                     </tr>
                     <tr>
-                        <td>Self hosting available</td>
+                        <td>Self-hosting available</td>
                         <td class="yes"></td>
                         <td class="no"></td>
                         <td class="yes"></td>
diff --git a/templates/zerver/pricing_model.html b/templates/zerver/pricing_model.html
index 3a052fe8c1..c193ae4f28 100644
--- a/templates/zerver/pricing_model.html
+++ b/templates/zerver/pricing_model.html
@@ -107,12 +107,12 @@
 
             <div class="block">
                 <div class="plan-title responsive-title">
-                    Self host Zulip
+                    Self-host Zulip
                 </div>
 
                 <div class="price-box" tabindex="-1">
                     <div class="text-content">
-                        <h2>Self service</h2>
+                        <h2>Self-service</h2>
                         <div class="description">
                             Retain full control over your data.
                         </div>
@@ -148,7 +148,7 @@
                         </div>
                         <hr />
                         <ul class="feature-list">
-                            <li>All self service features included</li>
+                            <li>All self-service features included</li>
                             <li>Professional support with SLAs</li>
                             <li>High availability</li>
                             <li>Incident collaboration</li>
diff --git a/zerver/tests/test_docs.py b/zerver/tests/test_docs.py
index 0ce4e4514f..7744424ac9 100644
--- a/zerver/tests/test_docs.py
+++ b/zerver/tests/test_docs.py
@@ -394,7 +394,7 @@ class PlansPageTest(ZulipTestCase):
     def test_plans_auth(self) -> None:
         root_domain = ""
         result = self.client_get("/plans/", subdomain=root_domain)
-        self.assert_in_success_response(["Self host Zulip"], result)
+        self.assert_in_success_response(["Self-host Zulip"], result)
         self.assert_not_in_success_response(["/upgrade#sponsorship"], result)
         self.assert_in_success_response(["/accounts/go/?next=/upgrade%23sponsorship"], result)