diff --git a/src/panels/config/automation/action/types/ha-automation-action-device_id.ts b/src/panels/config/automation/action/types/ha-automation-action-device_id.ts
index db56b9aa84..059d1835eb 100644
--- a/src/panels/config/automation/action/types/ha-automation-action-device_id.ts
+++ b/src/panels/config/automation/action/types/ha-automation-action-device_id.ts
@@ -51,14 +51,18 @@ export class HaDeviceAction extends LitElement {
         .value=${deviceId}
         @value-changed=${this._devicePicked}
         .hass=${this.hass}
-        label="Device"
+        label=${this.hass.localize(
+          "ui.panel.config.automation.editor.actions.type.device_id.label"
+        )}
       ></ha-device-picker>
       <ha-device-action-picker
         .value=${this.action}
         .deviceId=${deviceId}
         @value-changed=${this._deviceActionPicked}
         .hass=${this.hass}
-        label="Action"
+        label=${this.hass.localize(
+          "ui.panel.config.automation.editor.actions.type.device_id.action"
+        )}
       ></ha-device-action-picker>
       ${extraFieldsData
         ? html`
@@ -125,7 +129,7 @@ export class HaDeviceAction extends LitElement {
     // Returns a callback for ha-form to calculate labels per schema object
     return (schema) =>
       localize(
-        `ui.panel.config.automation.editor.actions.type.device.extra_fields.${schema.name}`
+        `ui.panel.config.automation.editor.actions.type.device_id.extra_fields.${schema.name}`
       ) || schema.name;
   }
 }
diff --git a/src/panels/config/automation/condition/types/ha-automation-condition-device.ts b/src/panels/config/automation/condition/types/ha-automation-condition-device.ts
index 8ce4b90277..40eca3eb45 100644
--- a/src/panels/config/automation/condition/types/ha-automation-condition-device.ts
+++ b/src/panels/config/automation/condition/types/ha-automation-condition-device.ts
@@ -45,14 +45,18 @@ export class HaDeviceCondition extends LitElement {
         .value=${deviceId}
         @value-changed=${this._devicePicked}
         .hass=${this.hass}
-        label="Device"
+        label=${this.hass.localize(
+          "ui.panel.config.automation.editor.conditions.type.device.label"
+        )}
       ></ha-device-picker>
       <ha-device-condition-picker
         .value=${this.condition}
         .deviceId=${deviceId}
         @value-changed=${this._deviceConditionPicked}
         .hass=${this.hass}
-        label="Condition"
+        label=${this.hass.localize(
+          "ui.panel.config.automation.editor.conditions.type.device.condition"
+        )}
       ></ha-device-condition-picker>
       ${extraFieldsData
         ? html`
diff --git a/src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts b/src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts
index bc41a6da57..1dea9a2391 100644
--- a/src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts
+++ b/src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts
@@ -45,14 +45,18 @@ export class HaDeviceTrigger extends LitElement {
         .value=${deviceId}
         @value-changed=${this._devicePicked}
         .hass=${this.hass}
-        label="Device"
+        label=${this.hass.localize(
+          "ui.panel.config.automation.editor.triggers.type.device.label"
+        )}
       ></ha-device-picker>
       <ha-device-trigger-picker
         .value=${this.trigger}
         .deviceId=${deviceId}
         @value-changed=${this._deviceTriggerPicked}
         .hass=${this.hass}
-        label="Trigger"
+        label=${this.hass.localize(
+          "ui.panel.config.automation.editor.triggers.type.device.trigger"
+        )}
       ></ha-device-trigger-picker>
       ${extraFieldsData
         ? html`
diff --git a/src/translations/en.json b/src/translations/en.json
index 556fe91f9a..d297cc2d3e 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -781,6 +781,7 @@
               "type": {
                 "device": {
                   "label": "Device",
+                  "trigger": "Trigger",
                   "extra_fields": {
                     "above": "Above",
                     "below": "Below",
@@ -875,6 +876,7 @@
                 },
                 "device": {
                   "label": "Device",
+                  "condition": "Condition",
                   "extra_fields": {
                     "above": "Above",
                     "below": "Below",
@@ -957,6 +959,7 @@
                 },
                 "device_id": {
                   "label": "Device",
+                  "action": "Action",
                   "extra_fields": {
                     "code": "Code"
                   }