diff --git a/panels/config/automation/ha-automation-picker.html b/panels/config/automation/ha-automation-picker.html
index b0bc4f7c23..af6969ce09 100644
--- a/panels/config/automation/ha-automation-picker.html
+++ b/panels/config/automation/ha-automation-picker.html
@@ -56,7 +56,7 @@
       <ha-config-section
         is-wide='[[isWide]]'
       >
-        <div slot='header'>Automation editor</div>
+        <div slot='header'>Automation Editor</div>
         <div slot='introduction'>
           The automation editor allows you to create and edit automations.
           Please read <a href='https://home-assistant.io/docs/automation/editor/' target='_blank'>the instructions</a> to make sure that you have configured Home Assistant correctly.
diff --git a/panels/config/core/ha-config-core.html b/panels/config/core/ha-config-core.html
index ed79e49075..d74ba56163 100644
--- a/panels/config/core/ha-config-core.html
+++ b/panels/config/core/ha-config-core.html
@@ -35,7 +35,7 @@
             icon='mdi:arrow-left'
             on-tap='_backTapped'
           ></paper-icon-button>
-          <div main-title>Core</div>
+          <div main-title>General</div>
         </app-toolbar>
       </app-header>
 
diff --git a/panels/config/core/ha-config-section-core.html b/panels/config/core/ha-config-section-core.html
index 94fe3758dc..578943b68a 100644
--- a/panels/config/core/ha-config-section-core.html
+++ b/panels/config/core/ha-config-section-core.html
@@ -44,7 +44,7 @@
     <ha-config-section
       is-wide='[[isWide]]'
     >
-      <span slot='header'>Server Management</span>
+      <span slot='header'>Configuration and Server Control</span>
       <span slot='introduction'>
         Changing your configuration can be a tiresome process. We know. This section will try to make your life a little bit easier.
       </span>
diff --git a/panels/config/script/ha-script-picker.html b/panels/config/script/ha-script-picker.html
index b31c0d2339..8c23f1f462 100644
--- a/panels/config/script/ha-script-picker.html
+++ b/panels/config/script/ha-script-picker.html
@@ -52,7 +52,7 @@
       <ha-config-section
         is-wide='[[isWide]]'
       >
-        <div slot='header'>Script editor</div>
+        <div slot='header'>Script Editor</div>
         <div slot='introduction'>
           The script editor allows you to create and edit scripts.
           Please read <a href='https://home-assistant.io/docs/scripts/editor/' target='_blank'>the instructions</a> to make sure that you have configured Home Assistant correctly.