diff --git a/homeassistant/components/alarm_control_panel/strings.json b/homeassistant/components/alarm_control_panel/strings.json
index f05d04dd78c..f055d6646b6 100644
--- a/homeassistant/components/alarm_control_panel/strings.json
+++ b/homeassistant/components/alarm_control_panel/strings.json
@@ -28,6 +28,7 @@
   },
   "entity_component": {
     "_": {
+      "name": "[%key:component::alarm_control_panel::title%]",
       "state": {
         "armed": "Armed",
         "disarmed": "Disarmed",
diff --git a/homeassistant/components/alert/strings.json b/homeassistant/components/alert/strings.json
index 9975e6ee0df..4d948b2f4d1 100644
--- a/homeassistant/components/alert/strings.json
+++ b/homeassistant/components/alert/strings.json
@@ -2,6 +2,7 @@
   "title": "Alert",
   "entity_component": {
     "_": {
+      "name": "[%key:component::alert::title%]",
       "state": {
         "idle": "[%key:common::state::idle%]",
         "off": "Acknowledged",
diff --git a/homeassistant/components/automation/strings.json b/homeassistant/components/automation/strings.json
index ffadc47a48c..1663443f045 100644
--- a/homeassistant/components/automation/strings.json
+++ b/homeassistant/components/automation/strings.json
@@ -2,6 +2,7 @@
   "title": "Automation",
   "entity_component": {
     "_": {
+      "name": "[%key:component::automation::title%]",
       "state": {
         "off": "[%key:common::state::off%]",
         "on": "[%key:common::state::on%]"
diff --git a/homeassistant/components/binary_sensor/strings.json b/homeassistant/components/binary_sensor/strings.json
index 8d787204dba..a0dc2020f01 100644
--- a/homeassistant/components/binary_sensor/strings.json
+++ b/homeassistant/components/binary_sensor/strings.json
@@ -108,162 +108,189 @@
   },
   "entity_component": {
     "_": {
+      "name": "[%key:component::binary_sensor::title%]",
       "state": {
         "off": "[%key:common::state::off%]",
         "on": "[%key:common::state::on%]"
       }
     },
     "battery": {
+      "name": "Battery",
       "state": {
         "off": "Normal",
         "on": "Low"
       }
     },
     "battery_charging": {
+      "name": "Charging",
       "state": {
         "off": "Not charging",
         "on": "Charging"
       }
     },
     "carbon_monoxide": {
+      "name": "Carbon monoxide",
       "state": {
         "off": "[%key:component::binary_sensor::entity_component::gas::state::off%]",
         "on": "[key:component::binary_sensor::entity_component::gas::state::on%]"
       }
     },
     "cold": {
+      "name": "Cold",
       "state": {
         "off": "[%key:component::binary_sensor::entity_component::battery::state::off%]",
         "on": "Cold"
       }
     },
     "connectivity": {
+      "name": "Connectivity",
       "state": {
         "off": "[%key:common::state::disconnected%]",
         "on": "[%key:common::state::connected%]"
       }
     },
     "door": {
+      "name": "Door",
       "state": {
         "off": "[%key:common::state::closed%]",
         "on": "[%key:common::state::open%]"
       }
     },
     "garage_door": {
+      "name": "Garage door",
       "state": {
         "off": "[%key:common::state::closed%]",
         "on": "[%key:common::state::open%]"
       }
     },
     "gas": {
+      "name": "Gas",
       "state": {
         "off": "Clear",
         "on": "Detected"
       }
     },
     "heat": {
+      "name": "Heat",
       "state": {
         "off": "[%key:component::binary_sensor::entity_component::battery::state::off%]",
         "on": "Hot"
       }
     },
     "light": {
+      "name": "Light",
       "state": {
         "off": "No light",
         "on": "Light detected"
       }
     },
     "lock": {
+      "name": "Lock",
       "state": {
         "off": "[%key:common::state::locked%]",
         "on": "[%key:common::state::unlocked%]"
       }
     },
     "moisture": {
+      "name": "Moisture",
       "state": {
         "off": "Dry",
         "on": "Wet"
       }
     },
     "motion": {
+      "name": "Motion",
       "state": {
         "off": "[key:component::binary_sensor::entity_component::gas::state::off%]",
         "on": "[key:component::binary_sensor::entity_component::gas::state::on%]"
       }
     },
     "moving": {
+      "name": "Moving",
       "state": {
         "off": "Not moving",
         "on": "Moving"
       }
     },
     "occupancy": {
+      "name": "Occupancy",
       "state": {
         "off": "[key:component::binary_sensor::entity_component::gas::state::off%]",
         "on": "[key:component::binary_sensor::entity_component::gas::state::on%]"
       }
     },
     "opening": {
+      "name": "Opening",
       "state": {
         "off": "[%key:common::state::closed%]",
         "on": "[%key:common::state::open%]"
       }
     },
     "plug": {
+      "name": "Plug",
       "state": {
         "off": "Unplugged",
         "on": "Plugged in"
       }
     },
     "presence": {
+      "name": "Presence",
       "state": {
         "off": "[%key:component::device_tracker::entity_component::_::state::not_home%]",
         "on": "[%key:component::device_tracker::entity_component::_::state::home%]"
       }
     },
     "problem": {
+      "name": "Problem",
       "state": {
         "off": "OK",
         "on": "Problem"
       }
     },
     "running": {
+      "name": "Running",
       "state": {
         "off": "Not running",
         "on": "Running"
       }
     },
     "safety": {
+      "name": "Safety",
       "state": {
         "off": "Safe",
         "on": "Unsafe"
       }
     },
     "smoke": {
+      "name": "Smoke",
       "state": {
         "off": "[key:component::binary_sensor::entity_component::gas::state::off%]",
         "on": "[key:component::binary_sensor::entity_component::gas::state::on%]"
       }
     },
     "sound": {
+      "name": "Sound",
       "state": {
         "off": "[key:component::binary_sensor::entity_component::gas::state::off%]",
         "on": "[key:component::binary_sensor::entity_component::gas::state::on%]"
       }
     },
     "update": {
+      "name": "Update",
       "state": {
         "off": "Up-to-date",
         "on": "Update available"
       }
     },
     "vibration": {
+      "name": "Vibration",
       "state": {
         "off": "[key:component::binary_sensor::entity_component::gas::state::off%]",
         "on": "[key:component::binary_sensor::entity_component::gas::state::on%]"
       }
     },
     "window": {
+      "name": "Window",
       "state": {
         "off": "[%key:common::state::closed%]",
         "on": "[%key:common::state::open%]"
diff --git a/homeassistant/components/button/strings.json b/homeassistant/components/button/strings.json
index ca774c57d77..4fd88853893 100644
--- a/homeassistant/components/button/strings.json
+++ b/homeassistant/components/button/strings.json
@@ -7,5 +7,16 @@
     "action_type": {
       "press": "Press {entity_name} button"
     }
+  },
+  "entity_component": {
+    "_": {
+      "name": "[%key:component::button::title%]"
+    },
+    "restart": {
+      "name": "Restart"
+    },
+    "update": {
+      "name": "Update"
+    }
   }
 }
diff --git a/homeassistant/components/calendar/strings.json b/homeassistant/components/calendar/strings.json
index 73c54bbba6a..2663408cfdb 100644
--- a/homeassistant/components/calendar/strings.json
+++ b/homeassistant/components/calendar/strings.json
@@ -2,6 +2,7 @@
   "title": "Calendar",
   "entity_component": {
     "_": {
+      "name": "[%key:component::calendar::title%]",
       "state": {
         "off": "[%key:common::state::off%]",
         "on": "[%key:common::state::on%]"
diff --git a/homeassistant/components/camera/strings.json b/homeassistant/components/camera/strings.json
index 5bde2ed2517..06ddaeeb092 100644
--- a/homeassistant/components/camera/strings.json
+++ b/homeassistant/components/camera/strings.json
@@ -2,6 +2,7 @@
   "title": "Camera",
   "entity_component": {
     "_": {
+      "name": "[%key:component::camera::title%]",
       "state": {
         "recording": "Recording",
         "streaming": "Streaming",
diff --git a/homeassistant/components/climate/strings.json b/homeassistant/components/climate/strings.json
index 16cf9a130bb..5e3fe15d566 100644
--- a/homeassistant/components/climate/strings.json
+++ b/homeassistant/components/climate/strings.json
@@ -17,6 +17,7 @@
   },
   "entity_component": {
     "_": {
+      "name": "Thermostat",
       "state": {
         "off": "[%key:common::state::off%]",
         "heat": "Heat",
diff --git a/homeassistant/components/configurator/strings.json b/homeassistant/components/configurator/strings.json
index c48f1d83858..0574e4bfced 100644
--- a/homeassistant/components/configurator/strings.json
+++ b/homeassistant/components/configurator/strings.json
@@ -2,6 +2,7 @@
   "title": "Configurator",
   "entity_component": {
     "_": {
+      "name": "[%key:component::configurator::title%]",
       "state": {
         "configure": "Configure",
         "configured": "Configured"
diff --git a/homeassistant/components/cover/strings.json b/homeassistant/components/cover/strings.json
index dd728b41136..2f61bd95083 100644
--- a/homeassistant/components/cover/strings.json
+++ b/homeassistant/components/cover/strings.json
@@ -29,6 +29,7 @@
   },
   "entity_component": {
     "_": {
+      "name": "[%key:component::cover::title%]",
       "state": {
         "open": "[%key:common::state::open%]",
         "opening": "Opening",
@@ -44,6 +45,36 @@
           "name": "Tilt position"
         }
       }
+    },
+    "awning": {
+      "name": "Awning"
+    },
+    "blind": {
+      "name": "Blind"
+    },
+    "curtain": {
+      "name": "Curtain"
+    },
+    "damper": {
+      "name": "Damper"
+    },
+    "door": {
+      "name": "Door"
+    },
+    "garage": {
+      "name": "Garage"
+    },
+    "gate": {
+      "name": "Gate"
+    },
+    "shade": {
+      "name": "Shade"
+    },
+    "shutter": {
+      "name": "Shutter"
+    },
+    "window": {
+      "name": "Window"
     }
   }
 }
diff --git a/homeassistant/components/device_tracker/strings.json b/homeassistant/components/device_tracker/strings.json
index e9232a72bb8..c15b9723c97 100644
--- a/homeassistant/components/device_tracker/strings.json
+++ b/homeassistant/components/device_tracker/strings.json
@@ -12,6 +12,7 @@
   },
   "entity_component": {
     "_": {
+      "name": "[%key:component::device_tracker::title%]",
       "state": {
         "home": "[%key:common::state::home%]",
         "not_home": "[%key:common::state::not_home%]"
diff --git a/homeassistant/components/fan/strings.json b/homeassistant/components/fan/strings.json
index 670d11b76ba..9aae5cf1642 100644
--- a/homeassistant/components/fan/strings.json
+++ b/homeassistant/components/fan/strings.json
@@ -18,6 +18,7 @@
   },
   "entity_component": {
     "_": {
+      "name": "[%key:component::fan::title%]",
       "state": {
         "off": "[%key:common::state::off%]",
         "on": "[%key:common::state::on%]"
diff --git a/homeassistant/components/group/strings.json b/homeassistant/components/group/strings.json
index 17f63167dbe..e78fe982d5d 100644
--- a/homeassistant/components/group/strings.json
+++ b/homeassistant/components/group/strings.json
@@ -157,6 +157,7 @@
   },
   "entity_component": {
     "_": {
+      "name": "[%key:component::group::title%]",
       "state": {
         "off": "[%key:common::state::off%]",
         "on": "[%key:common::state::on%]",
diff --git a/homeassistant/components/humidifier/strings.json b/homeassistant/components/humidifier/strings.json
index e536def1677..0fca7c0a0a2 100644
--- a/homeassistant/components/humidifier/strings.json
+++ b/homeassistant/components/humidifier/strings.json
@@ -22,10 +22,17 @@
   },
   "entity_component": {
     "_": {
+      "name": "[%key:component::humidifier::title%]",
       "state": {
         "off": "[%key:common::state::off%]",
         "on": "[%key:common::state::on%]"
       }
+    },
+    "dehumidifier": {
+      "name": "Dehumidifier"
+    },
+    "humidifier": {
+      "name": "[%key:component::humidifier::entity_component::_::name%]"
     }
   }
 }
diff --git a/homeassistant/components/input_boolean/strings.json b/homeassistant/components/input_boolean/strings.json
index 509799b5ed3..8294d728753 100644
--- a/homeassistant/components/input_boolean/strings.json
+++ b/homeassistant/components/input_boolean/strings.json
@@ -2,6 +2,7 @@
   "title": "Input boolean",
   "entity_component": {
     "_": {
+      "name": "[%key:component::input_boolean::title%]",
       "state": {
         "off": "[%key:common::state::off%]",
         "on": "[%key:common::state::on%]"
diff --git a/homeassistant/components/light/strings.json b/homeassistant/components/light/strings.json
index 38f843ab1dc..ef3fa74bd98 100644
--- a/homeassistant/components/light/strings.json
+++ b/homeassistant/components/light/strings.json
@@ -21,6 +21,7 @@
   },
   "entity_component": {
     "_": {
+      "name": "[%key:component::light::title%]",
       "state": {
         "off": "[%key:common::state::off%]",
         "on": "[%key:common::state::on%]"
diff --git a/homeassistant/components/lock/strings.json b/homeassistant/components/lock/strings.json
index e6c9884457a..497dec1a404 100644
--- a/homeassistant/components/lock/strings.json
+++ b/homeassistant/components/lock/strings.json
@@ -17,6 +17,7 @@
   },
   "entity_component": {
     "_": {
+      "name": "[%key:component::lock::title%]",
       "state": {
         "jammed": "Jammed",
         "locked": "[%key:common::state::locked%]",
diff --git a/homeassistant/components/media_player/strings.json b/homeassistant/components/media_player/strings.json
index 2c8f3d3d2bd..8627a31307f 100644
--- a/homeassistant/components/media_player/strings.json
+++ b/homeassistant/components/media_player/strings.json
@@ -21,6 +21,7 @@
   },
   "entity_component": {
     "_": {
+      "name": "[%key:component::media_player::title%]",
       "state": {
         "off": "[%key:common::state::off%]",
         "on": "[%key:common::state::on%]",
@@ -30,6 +31,15 @@
         "standby": "[%key:common::state::standby%]",
         "buffering": "Buffering"
       }
+    },
+    "tv": {
+      "name": "TV"
+    },
+    "speaker": {
+      "name": "Speaker"
+    },
+    "receiver": {
+      "name": "Receiver"
     }
   }
 }
diff --git a/homeassistant/components/number/strings.json b/homeassistant/components/number/strings.json
index 77ba7e7a913..d265b84c740 100644
--- a/homeassistant/components/number/strings.json
+++ b/homeassistant/components/number/strings.json
@@ -4,5 +4,136 @@
     "action_type": {
       "set_value": "Set value for {entity_name}"
     }
+  },
+  "entity_component": {
+    "_": {
+      "name": "[%key:component::number::title%]"
+    },
+    "apparent_power": {
+      "name": "[%key:component::sensor::entity_component::apparent_power::name%]"
+    },
+    "aqi": {
+      "name": "[%key:component::sensor::entity_component::aqi::name%]"
+    },
+    "atmospheric_pressure": {
+      "name": "[%key:component::sensor::entity_component::atmospheric_pressure::name%]"
+    },
+    "battery": {
+      "name": "[%key:component::sensor::entity_component::battery::name%]"
+    },
+    "carbon_dioxide": {
+      "name": "[%key:component::sensor::entity_component::carbon_dioxide::name%]"
+    },
+    "carbon_monoxide": {
+      "name": "[%key:component::sensor::entity_component::carbon_monoxide::name%]"
+    },
+    "current": {
+      "name": "[%key:component::sensor::entity_component::current::name%]"
+    },
+    "data_rate": {
+      "name": "[%key:component::sensor::entity_component::data_rate::name%]"
+    },
+    "distance": {
+      "name": "[%key:component::sensor::entity_component::distance::name%]"
+    },
+    "energy": {
+      "name": "[%key:component::sensor::entity_component::energy::name%]"
+    },
+    "energy_storage": {
+      "name": "[%key:component::sensor::entity_component::energy_storage::name%]"
+    },
+    "frequency": {
+      "name": "[%key:component::sensor::entity_component::frequency::name%]"
+    },
+    "gas": {
+      "name": "[%key:component::sensor::entity_component::gas::name%]"
+    },
+    "humidity": {
+      "name": "[%key:component::sensor::entity_component::humidity::name%]"
+    },
+    "illuminance": {
+      "name": "[%key:component::sensor::entity_component::illuminance::name%]"
+    },
+    "irradiance": {
+      "name": "[%key:component::sensor::entity_component::irradiance::name%]"
+    },
+    "moisture": {
+      "name": "[%key:component::sensor::entity_component::moisture::name%]"
+    },
+    "nitrogen_dioxide": {
+      "name": "[%key:component::sensor::entity_component::nitrogen_dioxide::name%]"
+    },
+    "nitrogen_monoxide": {
+      "name": "[%key:component::sensor::entity_component::nitrogen_monoxide::name%]"
+    },
+    "nitrous_oxide": {
+      "name": "[%key:component::sensor::entity_component::nitrous_oxide::name%]"
+    },
+    "ozone": {
+      "name": "[%key:component::sensor::entity_component::ozone::name%]"
+    },
+    "pm1": {
+      "name": "[%key:component::sensor::entity_component::pm1::name%]"
+    },
+    "pm10": {
+      "name": "[%key:component::sensor::entity_component::pm10::name%]"
+    },
+    "pm25": {
+      "name": "[%key:component::sensor::entity_component::pm25::name%]"
+    },
+    "power_factor": {
+      "name": "[%key:component::sensor::entity_component::power_factor::name%]"
+    },
+    "power": {
+      "name": "[%key:component::sensor::entity_component::power::name%]"
+    },
+    "precipitation": {
+      "name": "[%key:component::sensor::entity_component::precipitation::name%]"
+    },
+    "precipitation_intensity": {
+      "name": "[%key:component::sensor::entity_component::precipitation_intensity::name%]"
+    },
+    "pressure": {
+      "name": "[%key:component::sensor::entity_component::pressure::name%]"
+    },
+    "reactive_power": {
+      "name": "[%key:component::sensor::entity_component::reactive_power::name%]"
+    },
+    "signal_strength": {
+      "name": "[%key:component::sensor::entity_component::signal_strength::name%]"
+    },
+    "sound_pressure": {
+      "name": "[%key:component::sensor::entity_component::sound_pressure::name%]"
+    },
+    "speed": {
+      "name": "[%key:component::sensor::entity_component::speed::name%]"
+    },
+    "sulphur_dioxide": {
+      "name": "[%key:component::sensor::entity_component::sulphur_dioxide::name%]"
+    },
+    "temperature": {
+      "name": "[%key:component::sensor::entity_component::temperature::name%]"
+    },
+    "volatile_organic_compounds": {
+      "name": "[%key:component::sensor::entity_component::volatile_organic_compounds::name%]"
+    },
+    "voltage": {
+      "name": "[%key:component::sensor::entity_component::voltage::name%]"
+    },
+    "volume": {
+      "name": "[%key:component::sensor::entity_component::volume::name%]"
+    },
+    "volume_storage": {
+      "name": "[%key:component::sensor::entity_component::volume_storage::name%]"
+    },
+    "water": {
+      "name": "[%key:component::sensor::entity_component::water::name%]"
+    },
+    "weight": {
+      "name": "[%key:component::sensor::entity_component::weight::name%]"
+    },
+    "wind_speed": {
+      "name": "[%key:component::sensor::entity_component::wind_speed::name%]"
+    }
   }
 }
diff --git a/homeassistant/components/person/strings.json b/homeassistant/components/person/strings.json
index 7bba0198a14..8ee8c3a56a2 100644
--- a/homeassistant/components/person/strings.json
+++ b/homeassistant/components/person/strings.json
@@ -2,6 +2,7 @@
   "title": "Person",
   "entity_component": {
     "_": {
+      "name": "[%key:component::person::title%]",
       "state": {
         "home": "[%key:common::state::home%]",
         "not_home": "[%key:common::state::not_home%]"
diff --git a/homeassistant/components/plant/strings.json b/homeassistant/components/plant/strings.json
index 5ece766c71a..853e5daee1f 100644
--- a/homeassistant/components/plant/strings.json
+++ b/homeassistant/components/plant/strings.json
@@ -2,6 +2,7 @@
   "title": "Plant Monitor",
   "entity_component": {
     "_": {
+      "name": "[%key:component::plant::title%]",
       "state": {
         "ok": "[%key:component::binary_sensor::entity_component::problem::state::off%]",
         "problem": "[%key:component::binary_sensor::entity_component::problem::state::on%]"
diff --git a/homeassistant/components/remote/strings.json b/homeassistant/components/remote/strings.json
index a558cc76fe0..f0d2787b658 100644
--- a/homeassistant/components/remote/strings.json
+++ b/homeassistant/components/remote/strings.json
@@ -18,6 +18,7 @@
   },
   "entity_component": {
     "_": {
+      "name": "[%key:component::remote::title%]",
       "state": {
         "off": "[%key:common::state::off%]",
         "on": "[%key:common::state::on%]"
diff --git a/homeassistant/components/schedule/strings.json b/homeassistant/components/schedule/strings.json
index ecc673805c2..f8da366887a 100644
--- a/homeassistant/components/schedule/strings.json
+++ b/homeassistant/components/schedule/strings.json
@@ -2,6 +2,7 @@
   "title": "Schedule",
   "entity_component": {
     "_": {
+      "name": "[%key:component::schedule::title%]",
       "state": {
         "off": "[%key:common::state::off%]",
         "on": "[%key:common::state::on%]"
diff --git a/homeassistant/components/script/strings.json b/homeassistant/components/script/strings.json
index a4ea0860067..c78e4265cbd 100644
--- a/homeassistant/components/script/strings.json
+++ b/homeassistant/components/script/strings.json
@@ -2,6 +2,7 @@
   "title": "Script",
   "entity_component": {
     "_": {
+      "name": "[%key:component::script::title%]",
       "state": {
         "off": "[%key:common::state::off%]",
         "on": "[%key:common::state::on%]"
diff --git a/homeassistant/components/sensor/strings.json b/homeassistant/components/sensor/strings.json
index 4b764c609c0..a579be67205 100644
--- a/homeassistant/components/sensor/strings.json
+++ b/homeassistant/components/sensor/strings.json
@@ -96,10 +96,149 @@
   },
   "entity_component": {
     "_": {
+      "name": "[%key:component::sensor::title%]",
       "state": {
         "off": "[%key:common::state::off%]",
         "on": "[%key:common::state::on%]"
       }
+    },
+    "date": {
+      "name": "Date"
+    },
+    "duration": {
+      "name": "Duration"
+    },
+    "apparent_power": {
+      "name": "Apparent power"
+    },
+    "aqi": {
+      "name": "Air quality index"
+    },
+    "atmospheric_pressure": {
+      "name": "Atmospheric pressure"
+    },
+    "battery": {
+      "name": "Battery"
+    },
+    "carbon_monoxide": {
+      "name": "Carbon monoxide"
+    },
+    "carbon_dioxide": {
+      "name": "Carbon dioxide"
+    },
+    "current": {
+      "name": "Current"
+    },
+    "data_rate": {
+      "name": "Data rate"
+    },
+    "data_size": {
+      "name": "Data size"
+    },
+    "distance": {
+      "name": "Distance"
+    },
+    "energy": {
+      "name": "Energy"
+    },
+    "energy_storage": {
+      "name": "Stored energy"
+    },
+    "frequency": {
+      "name": "Frequency"
+    },
+    "gas": {
+      "name": "Gas"
+    },
+    "humidity": {
+      "name": "Humidity"
+    },
+    "illuminance": {
+      "name": "Illuminance"
+    },
+    "irradiance": {
+      "name": "Irradiance"
+    },
+    "moisture": {
+      "name": "Moisture"
+    },
+    "monetary": {
+      "name": "Balance"
+    },
+    "nitrogen_dioxide": {
+      "name": "Nitrogen dioxide"
+    },
+    "nitrogen_monoxide": {
+      "name": "Nitrogen monoxide"
+    },
+    "nitrous_oxide": {
+      "name": "Nitrous oxide"
+    },
+    "ozone": {
+      "name": "Ozone"
+    },
+    "pm1": {
+      "name": "Particulate matter 0.1 μm"
+    },
+    "pm10": {
+      "name": "Particulate matter 10 μm"
+    },
+    "pm25": {
+      "name": "Particulate matter 2.5 μm"
+    },
+    "power_factor": {
+      "name": "Power factor"
+    },
+    "power": {
+      "name": "Power"
+    },
+    "precipitation": {
+      "name": "Precipitation"
+    },
+    "precipitation_intensity": {
+      "name": "Precipitation intensity"
+    },
+    "pressure": {
+      "name": "Pressure"
+    },
+    "reactive_power": {
+      "name": "Reactive power"
+    },
+    "signal_strength": {
+      "name": "Signal strength"
+    },
+    "sound_pressure": {
+      "name": "Sound pressure"
+    },
+    "speed": {
+      "name": "Speed"
+    },
+    "sulphur_dioxide": {
+      "name": "Sulphur dioxide"
+    },
+    "temperature": {
+      "name": "Temperature"
+    },
+    "volatile_organic_compounds": {
+      "name": "VOCs"
+    },
+    "voltage": {
+      "name": "Voltage"
+    },
+    "volume": {
+      "name": "Volume"
+    },
+    "volume_storage": {
+      "name": "Stored volume"
+    },
+    "water": {
+      "name": "Water"
+    },
+    "weight": {
+      "name": "Weight"
+    },
+    "wind_speed": {
+      "name": "Wind speed"
     }
   }
 }
diff --git a/homeassistant/components/sun/strings.json b/homeassistant/components/sun/strings.json
index d8a75224f62..9a49a061c1f 100644
--- a/homeassistant/components/sun/strings.json
+++ b/homeassistant/components/sun/strings.json
@@ -12,6 +12,7 @@
   },
   "entity_component": {
     "_": {
+      "name": "[%key:component::sun::title%]",
       "state": {
         "above_horizon": "Above horizon",
         "below_horizon": "Below horizon"
diff --git a/homeassistant/components/switch/strings.json b/homeassistant/components/switch/strings.json
index ba7c5c6848f..a7934ba4209 100644
--- a/homeassistant/components/switch/strings.json
+++ b/homeassistant/components/switch/strings.json
@@ -18,10 +18,17 @@
   },
   "entity_component": {
     "_": {
+      "name": "[%key:component::switch::title%]",
       "state": {
         "off": "[%key:common::state::off%]",
         "on": "[%key:common::state::on%]"
       }
+    },
+    "switch": {
+      "name": "[%key:component::switch::entity_component::_::name%]"
+    },
+    "outlet": {
+      "name": "Outlet"
     }
   }
 }
diff --git a/homeassistant/components/timer/strings.json b/homeassistant/components/timer/strings.json
index 914ee738354..b6dd2418ada 100644
--- a/homeassistant/components/timer/strings.json
+++ b/homeassistant/components/timer/strings.json
@@ -1,6 +1,7 @@
 {
   "entity_component": {
     "_": {
+      "name": "Timer",
       "state": {
         "active": "[%key:common::state::active%]",
         "idle": "[%key:common::state::idle%]",
diff --git a/homeassistant/components/update/strings.json b/homeassistant/components/update/strings.json
index c26d3968ae1..776c2c59a3a 100644
--- a/homeassistant/components/update/strings.json
+++ b/homeassistant/components/update/strings.json
@@ -6,5 +6,13 @@
       "turned_on": "{entity_name} got an update available",
       "turned_off": "{entity_name} became up-to-date"
     }
+  },
+  "entity_component": {
+    "_": {
+      "name": "[%key:component::update::title%]"
+    },
+    "firmware": {
+      "name": "firmware"
+    }
   }
 }
diff --git a/homeassistant/components/vacuum/strings.json b/homeassistant/components/vacuum/strings.json
index eb84b910b45..a27a60bba4f 100644
--- a/homeassistant/components/vacuum/strings.json
+++ b/homeassistant/components/vacuum/strings.json
@@ -16,6 +16,7 @@
   },
   "entity_component": {
     "_": {
+      "name": "[%key:component::vacuum::title%]",
       "state": {
         "cleaning": "Cleaning",
         "docked": "Docked",
diff --git a/homeassistant/components/water_heater/strings.json b/homeassistant/components/water_heater/strings.json
index 9e3eec86041..6344b5a847a 100644
--- a/homeassistant/components/water_heater/strings.json
+++ b/homeassistant/components/water_heater/strings.json
@@ -7,6 +7,7 @@
   },
   "entity_component": {
     "_": {
+      "name": "Water heater",
       "state": {
         "off": "[%key:common::state::off%]",
         "eco": "Eco",
diff --git a/homeassistant/components/weather/strings.json b/homeassistant/components/weather/strings.json
index b3af53a91c4..0f88f1ae7e2 100644
--- a/homeassistant/components/weather/strings.json
+++ b/homeassistant/components/weather/strings.json
@@ -1,6 +1,7 @@
 {
   "entity_component": {
     "_": {
+      "name": "Weather",
       "state": {
         "clear-night": "Clear, night",
         "cloudy": "Cloudy",
diff --git a/script/hassfest/translations.py b/script/hassfest/translations.py
index eb51d12c374..bf2697644da 100644
--- a/script/hassfest/translations.py
+++ b/script/hassfest/translations.py
@@ -266,6 +266,7 @@ def gen_strings_schema(config: Config, integration: Integration) -> vol.Schema:
             },
             vol.Optional("entity_component"): cv.schema_with_slug_keys(
                 {
+                    vol.Optional("name"): str,
                     vol.Optional("state"): cv.schema_with_slug_keys(
                         cv.string_with_no_html,
                         slug_validator=translation_key_validator,
diff --git a/tests/helpers/test_translation.py b/tests/helpers/test_translation.py
index 197053ba2b8..6f5b4253218 100644
--- a/tests/helpers/test_translation.py
+++ b/tests/helpers/test_translation.py
@@ -383,22 +383,25 @@ async def test_caching(hass: HomeAssistant) -> None:
 
         for key in load1:
             assert key.startswith(
-                "component.sensor.entity_component._.state."
-            ) or key.startswith("component.light.entity_component._.state.")
+                (
+                    "component.sensor.entity_component.",
+                    "component.light.entity_component.",
+                )
+            )
 
     load_sensor_only = await translation.async_get_translations(
         hass, "en", "entity_component", integrations={"sensor"}
     )
     assert load_sensor_only
     for key in load_sensor_only:
-        assert key.startswith("component.sensor.entity_component._.state.")
+        assert key.startswith("component.sensor.entity_component.")
 
     load_light_only = await translation.async_get_translations(
         hass, "en", "entity_component", integrations={"light"}
     )
     assert load_light_only
     for key in load_light_only:
-        assert key.startswith("component.light.entity_component._.state.")
+        assert key.startswith("component.light.entity_component.")
 
     hass.config.components.add("media_player")