diff --git a/src/panels/config/dashboard/ha-config-navigation.ts b/src/panels/config/dashboard/ha-config-navigation.ts
index 56b899aeac..4901fac5ca 100644
--- a/src/panels/config/dashboard/ha-config-navigation.ts
+++ b/src/panels/config/dashboard/ha-config-navigation.ts
@@ -42,7 +42,8 @@ class HaConfigNavigation extends LitElement {
                   <ha-icon .icon=${page.icon} slot="item-icon"></ha-icon>
                   <paper-item-body two-line>
                     ${this.hass.localize(
-                      `ui.panel.config.${page.component}.caption`
+                      page.translationKey ||
+                        `ui.panel.config.${page.component}.caption`
                     )}
                     ${page.component === "cloud" && (page.info as CloudStatus)
                       ? page.info.logged_in
diff --git a/src/panels/config/ha-panel-config.ts b/src/panels/config/ha-panel-config.ts
index e07c26b86c..550e6d8d3f 100644
--- a/src/panels/config/ha-panel-config.ts
+++ b/src/panels/config/ha-panel-config.ts
@@ -132,13 +132,13 @@ export const configSections: { [name: string]: PageNavigation[] } = {
     {
       component: "zha",
       path: "/config/zha",
-      translationKey: "ui.panel.config.zha.caption",
+      translationKey: "component.zha.title",
       icon: "hass:zigbee",
     },
     {
       component: "zwave",
       path: "/config/zwave",
-      translationKey: "ui.panel.config.zwave.caption",
+      translationKey: "component.zwave.title",
       icon: "hass:z-wave",
     },
   ],
diff --git a/src/panels/config/zha/zha-config-dashboard.ts b/src/panels/config/zha/zha-config-dashboard.ts
index f277ae2e54..4acf5faa91 100644
--- a/src/panels/config/zha/zha-config-dashboard.ts
+++ b/src/panels/config/zha/zha-config-dashboard.ts
@@ -113,7 +113,7 @@ class ZHAConfigDashboard extends LitElement {
 
   protected render(): TemplateResult {
     return html`
-      <hass-subpage .header=${this.hass.localize("ui.panel.config.zha.title")}>
+      <hass-subpage .header=${this.hass.localize("component.zha.title")}>
         <ha-config-section .narrow=${this.narrow} .isWide=${this.isWide}>
           <div slot="header">
             ${this.hass.localize("ui.panel.config.zha.header")}
diff --git a/src/translations/en.json b/src/translations/en.json
index 81f6e23278..8c5074f0bc 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1431,8 +1431,6 @@
           }
         },
         "zha": {
-          "caption": "ZHA",
-          "title": "Zigbee Home Automation",
           "header": "Configure Zigbee Home Automation",
           "introduction": "Here it is possible to configure the ZHA component. Not everything is possible to configure from the UI yet, but we're working on it.",
           "description": "Zigbee Home Automation network management",