diff --git a/docs/features/software-catalog/index.md b/docs/features/software-catalog/index.md
index 07b22808cd..9b5de16472 100644
--- a/docs/features/software-catalog/index.md
+++ b/docs/features/software-catalog/index.md
@@ -1,7 +1,7 @@
 ---
 id: software-catalog-overview
 title: Backstage Service Catalog (alpha)
-sidebar_label: Backstage Service Catalog
+sidebar_label: Overview
 ---
 
 ## What is a Service Catalog?
diff --git a/docs/features/software-templates/index.md b/docs/features/software-templates/index.md
index b594cfce2a..8989fa35eb 100644
--- a/docs/features/software-templates/index.md
+++ b/docs/features/software-templates/index.md
@@ -1,6 +1,7 @@
 ---
 id: software-templates-index
-title: Software Templates
+title: Backstage Software Templates
+sidebar_label: Overview
 ---
 
 The Software Templates part of Backstage is a tool that can help you create
diff --git a/microsite/sidebars.json b/microsite/sidebars.json
index d31c14fd1d..d1d1a0ecc4 100644
--- a/microsite/sidebars.json
+++ b/microsite/sidebars.json
@@ -31,7 +31,7 @@
         ]
       }
     ],
-    "Features": [
+    "Core Features": [
       {
         "type": "subcategory",
         "label": "Software Catalog",
@@ -46,7 +46,7 @@
       },
       {
         "type": "subcategory",
-        "label": "Software creation templates",
+        "label": "Software Templates",
         "ids": [
           "features/software-templates/software-templates-index",
           "features/software-templates/adding-templates",