diff --git a/homeassistant/components/alarm_control_panel/abode.py b/homeassistant/components/alarm_control_panel/abode.py
index 75eb9fd824d..c57666d4fe6 100644
--- a/homeassistant/components/alarm_control_panel/abode.py
+++ b/homeassistant/components/alarm_control_panel/abode.py
@@ -20,7 +20,7 @@ _LOGGER = logging.getLogger(__name__)
 ICON = 'mdi:security'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up an alarm control panel for an Abode device."""
     data = hass.data[ABODE_DOMAIN]
 
@@ -28,7 +28,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     data.devices.extend(alarm_devices)
 
-    add_devices(alarm_devices)
+    add_entities(alarm_devices)
 
 
 class AbodeAlarm(AbodeDevice, AlarmControlPanel):
diff --git a/homeassistant/components/alarm_control_panel/alarmdecoder.py b/homeassistant/components/alarm_control_panel/alarmdecoder.py
index 626022e362a..5606209d1e6 100644
--- a/homeassistant/components/alarm_control_panel/alarmdecoder.py
+++ b/homeassistant/components/alarm_control_panel/alarmdecoder.py
@@ -26,10 +26,10 @@ ALARM_TOGGLE_CHIME_SCHEMA = vol.Schema({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up for AlarmDecoder alarm panels."""
     device = AlarmDecoderAlarmPanel()
-    add_devices([device])
+    add_entities([device])
 
     def alarm_toggle_chime_handler(service):
         """Register toggle chime handler."""
diff --git a/homeassistant/components/alarm_control_panel/alarmdotcom.py b/homeassistant/components/alarm_control_panel/alarmdotcom.py
index 736334c956a..98766deb3b6 100644
--- a/homeassistant/components/alarm_control_panel/alarmdotcom.py
+++ b/homeassistant/components/alarm_control_panel/alarmdotcom.py
@@ -33,7 +33,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up a Alarm.com control panel."""
     name = config.get(CONF_NAME)
     code = config.get(CONF_CODE)
@@ -42,7 +43,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
 
     alarmdotcom = AlarmDotCom(hass, name, code, username, password)
     yield from alarmdotcom.async_login()
-    async_add_devices([alarmdotcom])
+    async_add_entities([alarmdotcom])
 
 
 class AlarmDotCom(alarm.AlarmControlPanel):
diff --git a/homeassistant/components/alarm_control_panel/arlo.py b/homeassistant/components/alarm_control_panel/arlo.py
index 0f8913f85a0..8842c710a05 100644
--- a/homeassistant/components/alarm_control_panel/arlo.py
+++ b/homeassistant/components/alarm_control_panel/arlo.py
@@ -38,7 +38,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Arlo Alarm Control Panels."""
     arlo = hass.data[DATA_ARLO]
 
@@ -51,7 +51,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for base_station in arlo.base_stations:
         base_stations.append(ArloBaseStation(base_station, home_mode_name,
                                              away_mode_name))
-    add_devices(base_stations, True)
+    add_entities(base_stations, True)
 
 
 class ArloBaseStation(AlarmControlPanel):
diff --git a/homeassistant/components/alarm_control_panel/canary.py b/homeassistant/components/alarm_control_panel/canary.py
index 3cd44dcc84c..b22a76fdb3b 100644
--- a/homeassistant/components/alarm_control_panel/canary.py
+++ b/homeassistant/components/alarm_control_panel/canary.py
@@ -16,7 +16,7 @@ DEPENDENCIES = ['canary']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Canary alarms."""
     data = hass.data[DATA_CANARY]
     devices = []
@@ -24,7 +24,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for location in data.locations:
         devices.append(CanaryAlarm(data, location.location_id))
 
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class CanaryAlarm(AlarmControlPanel):
diff --git a/homeassistant/components/alarm_control_panel/concord232.py b/homeassistant/components/alarm_control_panel/concord232.py
index 9a65fdaff06..e3c2b4a7ec7 100644
--- a/homeassistant/components/alarm_control_panel/concord232.py
+++ b/homeassistant/components/alarm_control_panel/concord232.py
@@ -35,7 +35,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Concord232 alarm control panel platform."""
     name = config.get(CONF_NAME)
     host = config.get(CONF_HOST)
@@ -44,7 +44,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     url = 'http://{}:{}'.format(host, port)
 
     try:
-        add_devices([Concord232Alarm(hass, url, name)])
+        add_entities([Concord232Alarm(hass, url, name)])
     except requests.exceptions.ConnectionError as ex:
         _LOGGER.error("Unable to connect to Concord232: %s", str(ex))
         return
diff --git a/homeassistant/components/alarm_control_panel/demo.py b/homeassistant/components/alarm_control_panel/demo.py
index d2366e5836c..a3fbe49477e 100644
--- a/homeassistant/components/alarm_control_panel/demo.py
+++ b/homeassistant/components/alarm_control_panel/demo.py
@@ -13,9 +13,9 @@ from homeassistant.const import (
     CONF_PENDING_TIME, CONF_TRIGGER_TIME)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Demo alarm control panel platform."""
-    add_devices([
+    add_entities([
         manual.ManualAlarm(hass, 'Alarm', '1234', None, False, {
             STATE_ALARM_ARMED_AWAY: {
                 CONF_DELAY_TIME: datetime.timedelta(seconds=0),
diff --git a/homeassistant/components/alarm_control_panel/egardia.py b/homeassistant/components/alarm_control_panel/egardia.py
index f0db378ec15..4e278c10e07 100644
--- a/homeassistant/components/alarm_control_panel/egardia.py
+++ b/homeassistant/components/alarm_control_panel/egardia.py
@@ -34,7 +34,7 @@ STATES = {
 }
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Egardia platform."""
     if discovery_info is None:
         return
@@ -45,7 +45,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         discovery_info.get(CONF_REPORT_SERVER_CODES),
         discovery_info[CONF_REPORT_SERVER_PORT])
     # add egardia alarm device
-    add_devices([device], True)
+    add_entities([device], True)
 
 
 class EgardiaAlarm(alarm.AlarmControlPanel):
diff --git a/homeassistant/components/alarm_control_panel/envisalink.py b/homeassistant/components/alarm_control_panel/envisalink.py
index 25224484c79..df91884b32c 100644
--- a/homeassistant/components/alarm_control_panel/envisalink.py
+++ b/homeassistant/components/alarm_control_panel/envisalink.py
@@ -33,7 +33,8 @@ ALARM_KEYPRESS_SCHEMA = vol.Schema({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Perform the setup for Envisalink alarm panels."""
     configured_partitions = discovery_info['partitions']
     code = discovery_info[CONF_CODE]
@@ -53,7 +54,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         )
         devices.append(device)
 
-    async_add_devices(devices)
+    async_add_entities(devices)
 
     @callback
     def alarm_keypress_handler(service):
diff --git a/homeassistant/components/alarm_control_panel/homematicip_cloud.py b/homeassistant/components/alarm_control_panel/homematicip_cloud.py
index 9f5b52a31f4..8c483121650 100644
--- a/homeassistant/components/alarm_control_panel/homematicip_cloud.py
+++ b/homeassistant/components/alarm_control_panel/homematicip_cloud.py
@@ -24,12 +24,12 @@ HMIP_ZONE_HOME = 'INTERNAL'
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the HomematicIP Cloud alarm control devices."""
     pass
 
 
-async def async_setup_entry(hass, config_entry, async_add_devices):
+async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the HomematicIP alarm control panel from a config entry."""
     from homematicip.aio.group import AsyncSecurityZoneGroup
 
@@ -40,7 +40,7 @@ async def async_setup_entry(hass, config_entry, async_add_devices):
             devices.append(HomematicipSecurityZone(home, group))
 
     if devices:
-        async_add_devices(devices)
+        async_add_entities(devices)
 
 
 class HomematicipSecurityZone(HomematicipGenericDevice, AlarmControlPanel):
diff --git a/homeassistant/components/alarm_control_panel/ialarm.py b/homeassistant/components/alarm_control_panel/ialarm.py
index 2dc7e11d21e..3f41ee57902 100644
--- a/homeassistant/components/alarm_control_panel/ialarm.py
+++ b/homeassistant/components/alarm_control_panel/ialarm.py
@@ -40,7 +40,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up an iAlarm control panel."""
     name = config.get(CONF_NAME)
     username = config.get(CONF_USERNAME)
@@ -49,7 +49,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     url = 'http://{}'.format(host)
     ialarm = IAlarmPanel(name, username, password, url)
-    add_devices([ialarm], True)
+    add_entities([ialarm], True)
 
 
 class IAlarmPanel(alarm.AlarmControlPanel):
diff --git a/homeassistant/components/alarm_control_panel/ifttt.py b/homeassistant/components/alarm_control_panel/ifttt.py
index 9941f70a2e4..49c5dc488c0 100644
--- a/homeassistant/components/alarm_control_panel/ifttt.py
+++ b/homeassistant/components/alarm_control_panel/ifttt.py
@@ -59,7 +59,7 @@ PUSH_ALARM_STATE_SERVICE_SCHEMA = vol.Schema({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a control panel managed through IFTTT."""
     if DATA_IFTTT_ALARM not in hass.data:
         hass.data[DATA_IFTTT_ALARM] = []
@@ -75,7 +75,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     alarmpanel = IFTTTAlarmPanel(name, code, event_away, event_home,
                                  event_night, event_disarm, optimistic)
     hass.data[DATA_IFTTT_ALARM].append(alarmpanel)
-    add_devices([alarmpanel])
+    add_entities([alarmpanel])
 
     async def push_state_update(service):
         """Set the service state as device state attribute."""
diff --git a/homeassistant/components/alarm_control_panel/manual.py b/homeassistant/components/alarm_control_panel/manual.py
index b2b7c45d410..41f7d6988a8 100644
--- a/homeassistant/components/alarm_control_panel/manual.py
+++ b/homeassistant/components/alarm_control_panel/manual.py
@@ -103,9 +103,9 @@ PLATFORM_SCHEMA = vol.Schema(vol.All({
 }, _state_validator))
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the manual alarm platform."""
-    add_devices([ManualAlarm(
+    add_entities([ManualAlarm(
         hass,
         config[CONF_NAME],
         config.get(CONF_CODE),
diff --git a/homeassistant/components/alarm_control_panel/manual_mqtt.py b/homeassistant/components/alarm_control_panel/manual_mqtt.py
index 942d0dc159a..7bf9443424c 100644
--- a/homeassistant/components/alarm_control_panel/manual_mqtt.py
+++ b/homeassistant/components/alarm_control_panel/manual_mqtt.py
@@ -123,9 +123,9 @@ PLATFORM_SCHEMA = vol.Schema(vol.All(mqtt.MQTT_BASE_PLATFORM_SCHEMA.extend({
 }), _state_validator))
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the manual MQTT alarm platform."""
-    add_devices([ManualMQTTAlarm(
+    add_entities([ManualMQTTAlarm(
         hass,
         config[CONF_NAME],
         config.get(CONF_CODE),
diff --git a/homeassistant/components/alarm_control_panel/mqtt.py b/homeassistant/components/alarm_control_panel/mqtt.py
index 54b85ffbe23..e5ad54c4147 100644
--- a/homeassistant/components/alarm_control_panel/mqtt.py
+++ b/homeassistant/components/alarm_control_panel/mqtt.py
@@ -47,12 +47,13 @@ PLATFORM_SCHEMA = mqtt.MQTT_BASE_PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the MQTT Alarm Control Panel platform."""
     if discovery_info is not None:
         config = PLATFORM_SCHEMA(discovery_info)
 
-    async_add_devices([MqttAlarm(
+    async_add_entities([MqttAlarm(
         config.get(CONF_NAME),
         config.get(CONF_STATE_TOPIC),
         config.get(CONF_COMMAND_TOPIC),
diff --git a/homeassistant/components/alarm_control_panel/nx584.py b/homeassistant/components/alarm_control_panel/nx584.py
index ca6f1a44a6f..67ec73bceba 100644
--- a/homeassistant/components/alarm_control_panel/nx584.py
+++ b/homeassistant/components/alarm_control_panel/nx584.py
@@ -31,7 +31,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the NX584 platform."""
     name = config.get(CONF_NAME)
     host = config.get(CONF_HOST)
@@ -40,7 +40,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     url = 'http://{}:{}'.format(host, port)
 
     try:
-        add_devices([NX584Alarm(hass, url, name)])
+        add_entities([NX584Alarm(hass, url, name)])
     except requests.exceptions.ConnectionError as ex:
         _LOGGER.error("Unable to connect to NX584: %s", str(ex))
         return False
diff --git a/homeassistant/components/alarm_control_panel/satel_integra.py b/homeassistant/components/alarm_control_panel/satel_integra.py
index 4ac3a93fff4..86603763396 100644
--- a/homeassistant/components/alarm_control_panel/satel_integra.py
+++ b/homeassistant/components/alarm_control_panel/satel_integra.py
@@ -19,14 +19,15 @@ DEPENDENCIES = ['satel_integra']
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up for Satel Integra alarm panels."""
     if not discovery_info:
         return
 
     device = SatelIntegraAlarmPanel(
         "Alarm Panel", discovery_info.get(CONF_ARM_HOME_MODE))
-    async_add_devices([device])
+    async_add_entities([device])
 
 
 class SatelIntegraAlarmPanel(alarm.AlarmControlPanel):
diff --git a/homeassistant/components/alarm_control_panel/simplisafe.py b/homeassistant/components/alarm_control_panel/simplisafe.py
index 47b274875fc..2c3b25330d9 100644
--- a/homeassistant/components/alarm_control_panel/simplisafe.py
+++ b/homeassistant/components/alarm_control_panel/simplisafe.py
@@ -34,7 +34,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the SimpliSafe platform."""
     from simplipy.api import SimpliSafeApiInterface, SimpliSafeAPIException
     name = config.get(CONF_NAME)
@@ -53,7 +53,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for system in simplisafe.get_systems():
         systems.append(SimpliSafeAlarm(system, name, code))
 
-    add_devices(systems)
+    add_entities(systems)
 
 
 class SimpliSafeAlarm(AlarmControlPanel):
diff --git a/homeassistant/components/alarm_control_panel/spc.py b/homeassistant/components/alarm_control_panel/spc.py
index 5d5b2284bab..2aa157a5cad 100644
--- a/homeassistant/components/alarm_control_panel/spc.py
+++ b/homeassistant/components/alarm_control_panel/spc.py
@@ -29,7 +29,8 @@ def _get_alarm_state(spc_mode):
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the SPC alarm control panel platform."""
     if (discovery_info is None or
             discovery_info[ATTR_DISCOVER_AREAS] is None):
@@ -39,7 +40,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     devices = [SpcAlarm(api, area)
                for area in discovery_info[ATTR_DISCOVER_AREAS]]
 
-    async_add_devices(devices)
+    async_add_entities(devices)
 
 
 class SpcAlarm(alarm.AlarmControlPanel):
diff --git a/homeassistant/components/alarm_control_panel/totalconnect.py b/homeassistant/components/alarm_control_panel/totalconnect.py
index 674eac97f8c..f594a798dce 100644
--- a/homeassistant/components/alarm_control_panel/totalconnect.py
+++ b/homeassistant/components/alarm_control_panel/totalconnect.py
@@ -31,14 +31,14 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a TotalConnect control panel."""
     name = config.get(CONF_NAME)
     username = config.get(CONF_USERNAME)
     password = config.get(CONF_PASSWORD)
 
     total_connect = TotalConnect(name, username, password)
-    add_devices([total_connect], True)
+    add_entities([total_connect], True)
 
 
 class TotalConnect(alarm.AlarmControlPanel):
diff --git a/homeassistant/components/alarm_control_panel/verisure.py b/homeassistant/components/alarm_control_panel/verisure.py
index 59bfe15fa9b..f5a631df390 100644
--- a/homeassistant/components/alarm_control_panel/verisure.py
+++ b/homeassistant/components/alarm_control_panel/verisure.py
@@ -17,13 +17,13 @@ from homeassistant.const import (
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Verisure platform."""
     alarms = []
     if int(hub.config.get(CONF_ALARM, 1)):
         hub.update_overview()
         alarms.append(VerisureAlarm())
-    add_devices(alarms)
+    add_entities(alarms)
 
 
 def set_arm_state(state, code=None):
diff --git a/homeassistant/components/alarm_control_panel/wink.py b/homeassistant/components/alarm_control_panel/wink.py
index 771d157efe0..d75fad30c96 100644
--- a/homeassistant/components/alarm_control_panel/wink.py
+++ b/homeassistant/components/alarm_control_panel/wink.py
@@ -20,7 +20,7 @@ DEPENDENCIES = ['wink']
 STATE_ALARM_PRIVACY = 'Private'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Wink platform."""
     import pywink
 
@@ -32,7 +32,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         except AttributeError:
             _id = camera.object_id() + camera.name()
             if _id not in hass.data[DOMAIN]['unique_ids']:
-                add_devices([WinkCameraDevice(camera, hass)])
+                add_entities([WinkCameraDevice(camera, hass)])
 
 
 class WinkCameraDevice(WinkDevice, alarm.AlarmControlPanel):
diff --git a/homeassistant/components/binary_sensor/abode.py b/homeassistant/components/binary_sensor/abode.py
index 8ad40158958..a821abf445b 100644
--- a/homeassistant/components/binary_sensor/abode.py
+++ b/homeassistant/components/binary_sensor/abode.py
@@ -16,7 +16,7 @@ DEPENDENCIES = ['abode']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a sensor for an Abode device."""
     import abodepy.helpers.constants as CONST
     import abodepy.helpers.timeline as TIMELINE
@@ -44,7 +44,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     data.devices.extend(devices)
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class AbodeBinarySensor(AbodeDevice, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/ads.py b/homeassistant/components/binary_sensor/ads.py
index b7f0ebcc9d3..d46ff5ec2ee 100644
--- a/homeassistant/components/binary_sensor/ads.py
+++ b/homeassistant/components/binary_sensor/ads.py
@@ -27,7 +27,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Binary Sensor platform for ADS."""
     ads_hub = hass.data.get(DATA_ADS)
 
@@ -36,7 +36,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     device_class = config.get(CONF_DEVICE_CLASS)
 
     ads_sensor = AdsBinarySensor(ads_hub, name, ads_var, device_class)
-    add_devices([ads_sensor])
+    add_entities([ads_sensor])
 
 
 class AdsBinarySensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/alarmdecoder.py b/homeassistant/components/binary_sensor/alarmdecoder.py
index fcc77d474e1..82bcc50259f 100644
--- a/homeassistant/components/binary_sensor/alarmdecoder.py
+++ b/homeassistant/components/binary_sensor/alarmdecoder.py
@@ -28,7 +28,7 @@ ATTR_RF_LOOP4 = 'rf_loop4'
 ATTR_RF_LOOP1 = 'rf_loop1'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the AlarmDecoder binary sensor devices."""
     configured_zones = discovery_info[CONF_ZONES]
 
@@ -44,7 +44,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             zone_num, zone_name, zone_type, zone_rfid, relay_addr, relay_chan)
         devices.append(device)
 
-    add_devices(devices)
+    add_entities(devices)
 
     return True
 
diff --git a/homeassistant/components/binary_sensor/android_ip_webcam.py b/homeassistant/components/binary_sensor/android_ip_webcam.py
index b1940f432ae..58de81c30e7 100644
--- a/homeassistant/components/binary_sensor/android_ip_webcam.py
+++ b/homeassistant/components/binary_sensor/android_ip_webcam.py
@@ -14,7 +14,8 @@ DEPENDENCIES = ['android_ip_webcam']
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the IP Webcam binary sensors."""
     if discovery_info is None:
         return
@@ -23,7 +24,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     name = discovery_info[CONF_NAME]
     ipcam = hass.data[DATA_IP_WEBCAM][host]
 
-    async_add_devices(
+    async_add_entities(
         [IPWebcamBinarySensor(name, host, ipcam, 'motion_active')], True)
 
 
diff --git a/homeassistant/components/binary_sensor/apcupsd.py b/homeassistant/components/binary_sensor/apcupsd.py
index 412656a3b56..f876b8cc34b 100644
--- a/homeassistant/components/binary_sensor/apcupsd.py
+++ b/homeassistant/components/binary_sensor/apcupsd.py
@@ -20,9 +20,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up an APCUPSd Online Status binary sensor."""
-    add_devices([OnlineStatus(config, apcupsd.DATA)], True)
+    add_entities([OnlineStatus(config, apcupsd.DATA)], True)
 
 
 class OnlineStatus(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/arest.py b/homeassistant/components/binary_sensor/arest.py
index 0366f753ba6..b70620df3e2 100644
--- a/homeassistant/components/binary_sensor/arest.py
+++ b/homeassistant/components/binary_sensor/arest.py
@@ -29,7 +29,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the aREST binary sensor."""
     resource = config.get(CONF_RESOURCE)
     pin = config.get(CONF_PIN)
@@ -47,7 +47,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     arest = ArestData(resource, pin)
 
-    add_devices([ArestBinarySensor(
+    add_entities([ArestBinarySensor(
         arest, resource, config.get(CONF_NAME, response[CONF_NAME]),
         device_class, pin)], True)
 
diff --git a/homeassistant/components/binary_sensor/august.py b/homeassistant/components/binary_sensor/august.py
index 8df50a1bfb6..7f5da390906 100644
--- a/homeassistant/components/binary_sensor/august.py
+++ b/homeassistant/components/binary_sensor/august.py
@@ -53,7 +53,7 @@ SENSOR_TYPES = {
 }
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the August binary sensors."""
     data = hass.data[DATA_AUGUST]
     devices = []
@@ -62,7 +62,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         for sensor_type in SENSOR_TYPES:
             devices.append(AugustBinarySensor(data, sensor_type, doorbell))
 
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class AugustBinarySensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/aurora.py b/homeassistant/components/binary_sensor/aurora.py
index 0c33877854f..04b402722b2 100644
--- a/homeassistant/components/binary_sensor/aurora.py
+++ b/homeassistant/components/binary_sensor/aurora.py
@@ -39,7 +39,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the aurora sensor."""
     if None in (hass.config.latitude, hass.config.longitude):
         _LOGGER.error("Lat. or long. not set in Home Assistant config")
@@ -57,7 +57,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             "Connection to aurora forecast service failed: %s", error)
         return False
 
-    add_devices([AuroraSensor(aurora_data, name)], True)
+    add_entities([AuroraSensor(aurora_data, name)], True)
 
 
 class AuroraSensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/axis.py b/homeassistant/components/binary_sensor/axis.py
index 84137d95b06..b66a766ca4a 100644
--- a/homeassistant/components/binary_sensor/axis.py
+++ b/homeassistant/components/binary_sensor/axis.py
@@ -18,9 +18,9 @@ DEPENDENCIES = ['axis']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Axis binary devices."""
-    add_devices([AxisBinarySensor(hass, discovery_info)], True)
+    add_entities([AxisBinarySensor(hass, discovery_info)], True)
 
 
 class AxisBinarySensor(AxisDeviceEvent, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/bayesian.py b/homeassistant/components/binary_sensor/bayesian.py
index 75906e8ac5d..88669d67d80 100644
--- a/homeassistant/components/binary_sensor/bayesian.py
+++ b/homeassistant/components/binary_sensor/bayesian.py
@@ -75,7 +75,8 @@ def update_probability(prior, prob_true, prob_false):
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Bayesian Binary sensor."""
     name = config.get(CONF_NAME)
     observations = config.get(CONF_OBSERVATIONS)
@@ -83,7 +84,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     probability_threshold = config.get(CONF_PROBABILITY_THRESHOLD)
     device_class = config.get(CONF_DEVICE_CLASS)
 
-    async_add_devices([
+    async_add_entities([
         BayesianBinarySensor(
             name, prior, observations, probability_threshold, device_class)
     ], True)
diff --git a/homeassistant/components/binary_sensor/bbb_gpio.py b/homeassistant/components/binary_sensor/bbb_gpio.py
index 690d1651db9..8968b680369 100644
--- a/homeassistant/components/binary_sensor/bbb_gpio.py
+++ b/homeassistant/components/binary_sensor/bbb_gpio.py
@@ -41,7 +41,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Beaglebone Black GPIO devices."""
     pins = config.get(CONF_PINS)
 
@@ -49,7 +49,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     for pin, params in pins.items():
         binary_sensors.append(BBBGPIOBinarySensor(pin, params))
-    add_devices(binary_sensors)
+    add_entities(binary_sensors)
 
 
 class BBBGPIOBinarySensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/blink.py b/homeassistant/components/binary_sensor/blink.py
index 4d8617b3811..6ade20b72b9 100644
--- a/homeassistant/components/binary_sensor/blink.py
+++ b/homeassistant/components/binary_sensor/blink.py
@@ -10,7 +10,7 @@ from homeassistant.components.binary_sensor import BinarySensorDevice
 DEPENDENCIES = ['blink']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the blink binary sensors."""
     if discovery_info is None:
         return
@@ -20,7 +20,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for name in data.cameras:
         devs.append(BlinkCameraMotionSensor(name, data))
     devs.append(BlinkSystemSensor(data))
-    add_devices(devs, True)
+    add_entities(devs, True)
 
 
 class BlinkCameraMotionSensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/bloomsky.py b/homeassistant/components/binary_sensor/bloomsky.py
index 3080cc65532..ecffb3accf3 100644
--- a/homeassistant/components/binary_sensor/bloomsky.py
+++ b/homeassistant/components/binary_sensor/bloomsky.py
@@ -28,7 +28,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the available BloomSky weather binary sensors."""
     bloomsky = hass.components.bloomsky
     # Default needed in case of discovery
@@ -36,7 +36,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     for device in bloomsky.BLOOMSKY.devices.values():
         for variable in sensors:
-            add_devices(
+            add_entities(
                 [BloomSkySensor(bloomsky.BLOOMSKY, device, variable)], True)
 
 
diff --git a/homeassistant/components/binary_sensor/bmw_connected_drive.py b/homeassistant/components/binary_sensor/bmw_connected_drive.py
index d19deec4884..36229828d63 100644
--- a/homeassistant/components/binary_sensor/bmw_connected_drive.py
+++ b/homeassistant/components/binary_sensor/bmw_connected_drive.py
@@ -31,7 +31,7 @@ SENSOR_TYPES_ELEC = {
 SENSOR_TYPES_ELEC.update(SENSOR_TYPES)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the BMW sensors."""
     accounts = hass.data[BMW_DOMAIN]
     _LOGGER.debug('Found BMW accounts: %s',
@@ -51,7 +51,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                     device = BMWConnectedDriveSensor(account, vehicle, key,
                                                      value[0], value[1])
                     devices.append(device)
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class BMWConnectedDriveSensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/command_line.py b/homeassistant/components/binary_sensor/command_line.py
index c2045c2df5e..a3f1595787d 100644
--- a/homeassistant/components/binary_sensor/command_line.py
+++ b/homeassistant/components/binary_sensor/command_line.py
@@ -40,7 +40,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Command line Binary Sensor."""
     name = config.get(CONF_NAME)
     command = config.get(CONF_COMMAND)
@@ -53,7 +53,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         value_template.hass = hass
     data = CommandSensorData(hass, command, command_timeout)
 
-    add_devices([CommandBinarySensor(
+    add_entities([CommandBinarySensor(
         hass, data, name, device_class, payload_on, payload_off,
         value_template)], True)
 
diff --git a/homeassistant/components/binary_sensor/concord232.py b/homeassistant/components/binary_sensor/concord232.py
index f2acef47e82..26f35d60305 100644
--- a/homeassistant/components/binary_sensor/concord232.py
+++ b/homeassistant/components/binary_sensor/concord232.py
@@ -42,7 +42,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Concord232 binary sensor platform."""
     from concord232 import client as concord232_client
 
@@ -79,7 +79,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                 )
             )
 
-        add_devices(sensors, True)
+        add_entities(sensors, True)
 
 
 def get_opening_type(zone):
diff --git a/homeassistant/components/binary_sensor/deconz.py b/homeassistant/components/binary_sensor/deconz.py
index 0a370d754ee..d3d27c05333 100644
--- a/homeassistant/components/binary_sensor/deconz.py
+++ b/homeassistant/components/binary_sensor/deconz.py
@@ -15,13 +15,13 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 DEPENDENCIES = ['deconz']
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Old way of setting up deCONZ binary sensors."""
     pass
 
 
-async def async_setup_entry(hass, config_entry, async_add_devices):
+async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the deCONZ binary sensor."""
     @callback
     def async_add_sensor(sensors):
@@ -33,7 +33,7 @@ async def async_setup_entry(hass, config_entry, async_add_devices):
             if sensor.type in DECONZ_BINARY_SENSOR and \
                not (not allow_clip_sensor and sensor.type.startswith('CLIP')):
                 entities.append(DeconzBinarySensor(sensor))
-        async_add_devices(entities, True)
+        async_add_entities(entities, True)
 
     hass.data[DATA_DECONZ_UNSUB].append(
         async_dispatcher_connect(hass, 'deconz_new_sensor', async_add_sensor))
diff --git a/homeassistant/components/binary_sensor/demo.py b/homeassistant/components/binary_sensor/demo.py
index 10077c60ed1..d656b79e8ed 100644
--- a/homeassistant/components/binary_sensor/demo.py
+++ b/homeassistant/components/binary_sensor/demo.py
@@ -7,9 +7,9 @@ https://home-assistant.io/components/demo/
 from homeassistant.components.binary_sensor import BinarySensorDevice
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Demo binary sensor platform."""
-    add_devices([
+    add_entities([
         DemoBinarySensor('Basement Floor Wet', False, 'moisture'),
         DemoBinarySensor('Movement Backyard', True, 'motion'),
     ])
diff --git a/homeassistant/components/binary_sensor/digital_ocean.py b/homeassistant/components/binary_sensor/digital_ocean.py
index 1eb86d4eb82..0f604c525e0 100644
--- a/homeassistant/components/binary_sensor/digital_ocean.py
+++ b/homeassistant/components/binary_sensor/digital_ocean.py
@@ -28,7 +28,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Digital Ocean droplet sensor."""
     digital = hass.data.get(DATA_DIGITAL_OCEAN)
     if not digital:
@@ -44,7 +44,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             return False
         dev.append(DigitalOceanBinarySensor(digital, droplet_id))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class DigitalOceanBinarySensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/ecobee.py b/homeassistant/components/binary_sensor/ecobee.py
index 15efa21b226..37f25476bd0 100644
--- a/homeassistant/components/binary_sensor/ecobee.py
+++ b/homeassistant/components/binary_sensor/ecobee.py
@@ -12,7 +12,7 @@ DEPENDENCIES = ['ecobee']
 ECOBEE_CONFIG_FILE = 'ecobee.conf'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Ecobee sensors."""
     if discovery_info is None:
         return
@@ -26,7 +26,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
                 dev.append(EcobeeBinarySensor(sensor['name'], index))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class EcobeeBinarySensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/egardia.py b/homeassistant/components/binary_sensor/egardia.py
index 7d443dfafdf..0db2cac667f 100644
--- a/homeassistant/components/binary_sensor/egardia.py
+++ b/homeassistant/components/binary_sensor/egardia.py
@@ -19,7 +19,8 @@ EGARDIA_TYPE_TO_DEVICE_CLASS = {'IR Sensor': 'motion',
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Initialize the platform."""
     if (discovery_info is None or
             discovery_info[ATTR_DISCOVER_DEVICES] is None):
@@ -27,7 +28,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
 
     disc_info = discovery_info[ATTR_DISCOVER_DEVICES]
     # multiple devices here!
-    async_add_devices(
+    async_add_entities(
         (
             EgardiaBinarySensor(
                 sensor_id=disc_info[sensor]['id'],
diff --git a/homeassistant/components/binary_sensor/eight_sleep.py b/homeassistant/components/binary_sensor/eight_sleep.py
index 40ca491e1f3..34d3a7a13ca 100644
--- a/homeassistant/components/binary_sensor/eight_sleep.py
+++ b/homeassistant/components/binary_sensor/eight_sleep.py
@@ -15,7 +15,7 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['eight_sleep']
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the eight sleep binary sensor."""
     if discovery_info is None:
@@ -30,7 +30,7 @@ async def async_setup_platform(hass, config, async_add_devices,
     for sensor in sensors:
         all_sensors.append(EightHeatSensor(name, eight, sensor))
 
-    async_add_devices(all_sensors, True)
+    async_add_entities(all_sensors, True)
 
 
 class EightHeatSensor(EightSleepHeatEntity, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/enocean.py b/homeassistant/components/binary_sensor/enocean.py
index d2ecd5e17e1..c883897c2ea 100644
--- a/homeassistant/components/binary_sensor/enocean.py
+++ b/homeassistant/components/binary_sensor/enocean.py
@@ -27,13 +27,13 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Binary Sensor platform for EnOcean."""
     dev_id = config.get(CONF_ID)
     devname = config.get(CONF_NAME)
     device_class = config.get(CONF_DEVICE_CLASS)
 
-    add_devices([EnOceanBinarySensor(dev_id, devname, device_class)])
+    add_entities([EnOceanBinarySensor(dev_id, devname, device_class)])
 
 
 class EnOceanBinarySensor(enocean.EnOceanDevice, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/envisalink.py b/homeassistant/components/binary_sensor/envisalink.py
index f358f814dc5..2568879bcc6 100644
--- a/homeassistant/components/binary_sensor/envisalink.py
+++ b/homeassistant/components/binary_sensor/envisalink.py
@@ -23,7 +23,8 @@ DEPENDENCIES = ['envisalink']
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Envisalink binary sensor devices."""
     configured_zones = discovery_info['zones']
 
@@ -40,7 +41,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         )
         devices.append(device)
 
-    async_add_devices(devices)
+    async_add_entities(devices)
 
 
 class EnvisalinkBinarySensor(EnvisalinkDevice, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/ffmpeg_motion.py b/homeassistant/components/binary_sensor/ffmpeg_motion.py
index 75a9fa1d046..365bcafbd69 100644
--- a/homeassistant/components/binary_sensor/ffmpeg_motion.py
+++ b/homeassistant/components/binary_sensor/ffmpeg_motion.py
@@ -47,7 +47,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the FFmpeg binary motion sensor."""
     manager = hass.data[DATA_FFMPEG]
 
@@ -55,7 +56,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         return
 
     entity = FFmpegMotion(hass, manager, config)
-    async_add_devices([entity])
+    async_add_entities([entity])
 
 
 class FFmpegBinarySensor(FFmpegBase, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/ffmpeg_noise.py b/homeassistant/components/binary_sensor/ffmpeg_noise.py
index db7647d9b2c..73c84ac336d 100644
--- a/homeassistant/components/binary_sensor/ffmpeg_noise.py
+++ b/homeassistant/components/binary_sensor/ffmpeg_noise.py
@@ -44,7 +44,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the FFmpeg noise binary sensor."""
     manager = hass.data[DATA_FFMPEG]
 
@@ -52,7 +53,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         return
 
     entity = FFmpegNoise(hass, manager, config)
-    async_add_devices([entity])
+    async_add_entities([entity])
 
 
 class FFmpegNoise(FFmpegBinarySensor):
diff --git a/homeassistant/components/binary_sensor/gc100.py b/homeassistant/components/binary_sensor/gc100.py
index 515d7e7123d..27466f64cfb 100644
--- a/homeassistant/components/binary_sensor/gc100.py
+++ b/homeassistant/components/binary_sensor/gc100.py
@@ -23,7 +23,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the GC100 devices."""
     binary_sensors = []
     ports = config.get(CONF_PORTS)
@@ -31,7 +31,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         for port_addr, port_name in port.items():
             binary_sensors.append(GC100BinarySensor(
                 port_name, port_addr, hass.data[DATA_GC100]))
-    add_devices(binary_sensors, True)
+    add_entities(binary_sensors, True)
 
 
 class GC100BinarySensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/hive.py b/homeassistant/components/binary_sensor/hive.py
index 46dd1b193e8..68f32641872 100644
--- a/homeassistant/components/binary_sensor/hive.py
+++ b/homeassistant/components/binary_sensor/hive.py
@@ -13,13 +13,13 @@ DEVICETYPE_DEVICE_CLASS = {'motionsensor': 'motion',
                            'contactsensor': 'opening'}
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Hive sensor devices."""
     if discovery_info is None:
         return
     session = hass.data.get(DATA_HIVE)
 
-    add_devices([HiveBinarySensorEntity(session, discovery_info)])
+    add_entities([HiveBinarySensorEntity(session, discovery_info)])
 
 
 class HiveBinarySensorEntity(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/homematic.py b/homeassistant/components/binary_sensor/homematic.py
index a0ec359e048..9cfe4bbd6a7 100644
--- a/homeassistant/components/binary_sensor/homematic.py
+++ b/homeassistant/components/binary_sensor/homematic.py
@@ -30,7 +30,7 @@ SENSOR_TYPES_CLASS = {
 }
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the HomeMatic binary sensor platform."""
     if discovery_info is None:
         return
@@ -40,7 +40,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         new_device = HMBinarySensor(conf)
         devices.append(new_device)
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class HMBinarySensor(HMDevice, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/homematicip_cloud.py b/homeassistant/components/binary_sensor/homematicip_cloud.py
index 72dc2c8b462..dd22a835504 100644
--- a/homeassistant/components/binary_sensor/homematicip_cloud.py
+++ b/homeassistant/components/binary_sensor/homematicip_cloud.py
@@ -19,12 +19,12 @@ STATE_SMOKE_OFF = 'IDLE_OFF'
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the HomematicIP Cloud binary sensor devices."""
     pass
 
 
-async def async_setup_entry(hass, config_entry, async_add_devices):
+async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the HomematicIP Cloud binary sensor from a config entry."""
     from homematicip.aio.device import (
         AsyncShutterContact, AsyncMotionDetectorIndoor, AsyncSmokeDetector)
@@ -40,7 +40,7 @@ async def async_setup_entry(hass, config_entry, async_add_devices):
             devices.append(HomematicipSmokeDetector(home, device))
 
     if devices:
-        async_add_devices(devices)
+        async_add_entities(devices)
 
 
 class HomematicipShutterContact(HomematicipGenericDevice, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/hydrawise.py b/homeassistant/components/binary_sensor/hydrawise.py
index a3e0ebd782d..38b660c506f 100644
--- a/homeassistant/components/binary_sensor/hydrawise.py
+++ b/homeassistant/components/binary_sensor/hydrawise.py
@@ -26,7 +26,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a sensor for a Hydrawise device."""
     hydrawise = hass.data[DATA_HYDRAWISE].data
 
@@ -45,7 +45,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                     hydrawise.controller_status.get('running', False)
                 sensors.append(HydrawiseBinarySensor(zone_data, sensor_type))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class HydrawiseBinarySensor(HydrawiseEntity, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/ihc.py b/homeassistant/components/binary_sensor/ihc.py
index 25435d373fd..20937af6bfc 100644
--- a/homeassistant/components/binary_sensor/ihc.py
+++ b/homeassistant/components/binary_sensor/ihc.py
@@ -30,7 +30,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the IHC binary sensor platform."""
     ihc_controller = hass.data[IHC_DATA][IHC_CONTROLLER]
     info = hass.data[IHC_DATA][IHC_INFO]
@@ -56,7 +56,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                                      sensor_type, inverting)
             devices.append(sensor)
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class IHCBinarySensor(IHCDevice, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/insteon.py b/homeassistant/components/binary_sensor/insteon.py
index 789ad894a41..533ff2d76c0 100644
--- a/homeassistant/components/binary_sensor/insteon.py
+++ b/homeassistant/components/binary_sensor/insteon.py
@@ -23,7 +23,8 @@ SENSOR_TYPES = {'openClosedSensor': 'opening',
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the INSTEON device class for the hass platform."""
     insteon_modem = hass.data['insteon'].get('modem')
 
@@ -37,7 +38,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
 
         new_entity = InsteonBinarySensor(device, state_key)
 
-        async_add_devices([new_entity])
+        async_add_entities([new_entity])
 
 
 class InsteonBinarySensor(InsteonEntity, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/iss.py b/homeassistant/components/binary_sensor/iss.py
index d0654317248..b986c51ddaa 100644
--- a/homeassistant/components/binary_sensor/iss.py
+++ b/homeassistant/components/binary_sensor/iss.py
@@ -35,7 +35,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the ISS sensor."""
     if None in (hass.config.latitude, hass.config.longitude):
         _LOGGER.error("Latitude or longitude not set in Home Assistant config")
@@ -51,7 +51,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     name = config.get(CONF_NAME)
     show_on_map = config.get(CONF_SHOW_ON_MAP)
 
-    add_devices([IssBinarySensor(iss_data, name, show_on_map)], True)
+    add_entities([IssBinarySensor(iss_data, name, show_on_map)], True)
 
 
 class IssBinarySensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/isy994.py b/homeassistant/components/binary_sensor/isy994.py
index b6d582b7793..36dacb06738 100644
--- a/homeassistant/components/binary_sensor/isy994.py
+++ b/homeassistant/components/binary_sensor/isy994.py
@@ -29,7 +29,7 @@ ISY_DEVICE_TYPES = {
 
 
 def setup_platform(hass, config: ConfigType,
-                   add_devices: Callable[[list], None], discovery_info=None):
+                   add_entities: Callable[[list], None], discovery_info=None):
     """Set up the ISY994 binary sensor platform."""
     devices = []
     devices_by_nid = {}
@@ -75,7 +75,7 @@ def setup_platform(hass, config: ConfigType,
     for name, status, _ in hass.data[ISY994_PROGRAMS][DOMAIN]:
         devices.append(ISYBinarySensorProgram(name, status))
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 def _detect_device_type(node) -> str:
diff --git a/homeassistant/components/binary_sensor/knx.py b/homeassistant/components/binary_sensor/knx.py
index 76142dc0af2..a7d1d597f67 100644
--- a/homeassistant/components/binary_sensor/knx.py
+++ b/homeassistant/components/binary_sensor/knx.py
@@ -54,27 +54,27 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up binary sensor(s) for KNX platform."""
     if discovery_info is not None:
-        async_add_devices_discovery(hass, discovery_info, async_add_devices)
+        async_add_entities_discovery(hass, discovery_info, async_add_entities)
     else:
-        async_add_devices_config(hass, config, async_add_devices)
+        async_add_entities_config(hass, config, async_add_entities)
 
 
 @callback
-def async_add_devices_discovery(hass, discovery_info, async_add_devices):
+def async_add_entities_discovery(hass, discovery_info, async_add_entities):
     """Set up binary sensors for KNX platform configured via xknx.yaml."""
     entities = []
     for device_name in discovery_info[ATTR_DISCOVER_DEVICES]:
         device = hass.data[DATA_KNX].xknx.devices[device_name]
         entities.append(KNXBinarySensor(hass, device))
-    async_add_devices(entities)
+    async_add_entities(entities)
 
 
 @callback
-def async_add_devices_config(hass, config, async_add_devices):
+def async_add_entities_config(hass, config, async_add_entities):
     """Set up binary senor for KNX platform configured within platform."""
     name = config.get(CONF_NAME)
     import xknx
@@ -97,7 +97,7 @@ def async_add_devices_config(hass, config, async_add_devices):
             entity.automations.append(KNXAutomation(
                 hass=hass, device=binary_sensor, hook=hook,
                 action=action, counter=counter))
-    async_add_devices([entity])
+    async_add_entities([entity])
 
 
 class KNXBinarySensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/konnected.py b/homeassistant/components/binary_sensor/konnected.py
index 9a16ca5e1ab..e91d3f6136a 100644
--- a/homeassistant/components/binary_sensor/konnected.py
+++ b/homeassistant/components/binary_sensor/konnected.py
@@ -20,7 +20,7 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['konnected']
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up binary sensors attached to a Konnected device."""
     if discovery_info is None:
@@ -31,7 +31,7 @@ async def async_setup_platform(hass, config, async_add_devices,
     sensors = [KonnectedBinarySensor(device_id, pin_num, pin_data)
                for pin_num, pin_data in
                data[CONF_DEVICES][device_id][CONF_BINARY_SENSORS].items()]
-    async_add_devices(sensors)
+    async_add_entities(sensors)
 
 
 class KonnectedBinarySensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/linode.py b/homeassistant/components/binary_sensor/linode.py
index d4fc60696cd..24abc3dd8be 100644
--- a/homeassistant/components/binary_sensor/linode.py
+++ b/homeassistant/components/binary_sensor/linode.py
@@ -27,7 +27,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Linode droplet sensor."""
     linode = hass.data.get(DATA_LINODE)
     nodes = config.get(CONF_NODES)
@@ -40,7 +40,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             return
         dev.append(LinodeBinarySensor(linode, node_id))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class LinodeBinarySensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/maxcube.py b/homeassistant/components/binary_sensor/maxcube.py
index c131de5420a..6bb9278d8d5 100644
--- a/homeassistant/components/binary_sensor/maxcube.py
+++ b/homeassistant/components/binary_sensor/maxcube.py
@@ -13,7 +13,7 @@ from homeassistant.const import STATE_UNKNOWN
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Iterate through all MAX! Devices and add window shutters."""
     devices = []
     for handler in hass.data[DATA_KEY].values():
@@ -28,7 +28,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                     MaxCubeShutter(handler, name, device.rf_address))
 
     if devices:
-        add_devices(devices)
+        add_entities(devices)
 
 
 class MaxCubeShutter(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/modbus.py b/homeassistant/components/binary_sensor/modbus.py
index 1a45235f15a..f9f2597593e 100644
--- a/homeassistant/components/binary_sensor/modbus.py
+++ b/homeassistant/components/binary_sensor/modbus.py
@@ -28,7 +28,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Modbus binary sensors."""
     sensors = []
     for coil in config.get(CONF_COILS):
@@ -36,7 +36,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             coil.get(CONF_NAME),
             coil.get(CONF_SLAVE),
             coil.get(CONF_COIL)))
-    add_devices(sensors)
+    add_entities(sensors)
 
 
 class ModbusCoilSensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/mqtt.py b/homeassistant/components/binary_sensor/mqtt.py
index cb943ac3f18..37a26a27214 100644
--- a/homeassistant/components/binary_sensor/mqtt.py
+++ b/homeassistant/components/binary_sensor/mqtt.py
@@ -45,7 +45,8 @@ PLATFORM_SCHEMA = mqtt.MQTT_RO_PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the MQTT binary sensor."""
     if discovery_info is not None:
         config = PLATFORM_SCHEMA(discovery_info)
@@ -54,7 +55,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     if value_template is not None:
         value_template.hass = hass
 
-    async_add_devices([MqttBinarySensor(
+    async_add_entities([MqttBinarySensor(
         config.get(CONF_NAME),
         config.get(CONF_STATE_TOPIC),
         config.get(CONF_AVAILABILITY_TOPIC),
diff --git a/homeassistant/components/binary_sensor/mychevy.py b/homeassistant/components/binary_sensor/mychevy.py
index 905e60c34d9..d1438379da1 100644
--- a/homeassistant/components/binary_sensor/mychevy.py
+++ b/homeassistant/components/binary_sensor/mychevy.py
@@ -23,7 +23,8 @@ SENSORS = [
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the MyChevy sensors."""
     if discovery_info is None:
         return
@@ -34,7 +35,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         for car in hub.cars:
             sensors.append(EVBinarySensor(hub, sconfig, car.vid))
 
-    async_add_devices(sensors)
+    async_add_entities(sensors)
 
 
 class EVBinarySensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/mysensors.py b/homeassistant/components/binary_sensor/mysensors.py
index abb19129d52..f0b7832cf25 100644
--- a/homeassistant/components/binary_sensor/mysensors.py
+++ b/homeassistant/components/binary_sensor/mysensors.py
@@ -22,11 +22,11 @@ SENSORS = {
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the mysensors platform for binary sensors."""
     mysensors.setup_mysensors_platform(
         hass, DOMAIN, discovery_info, MySensorsBinarySensor,
-        async_add_devices=async_add_devices)
+        async_add_entities=async_add_entities)
 
 
 class MySensorsBinarySensor(
diff --git a/homeassistant/components/binary_sensor/mystrom.py b/homeassistant/components/binary_sensor/mystrom.py
index 5c1d9a576a6..23f40ce0a7f 100644
--- a/homeassistant/components/binary_sensor/mystrom.py
+++ b/homeassistant/components/binary_sensor/mystrom.py
@@ -17,9 +17,10 @@ DEPENDENCIES = ['http']
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up myStrom Binary Sensor."""
-    hass.http.register_view(MyStromView(async_add_devices))
+    hass.http.register_view(MyStromView(async_add_entities))
 
     return True
 
@@ -31,10 +32,10 @@ class MyStromView(HomeAssistantView):
     name = 'api:mystrom'
     supported_actions = ['single', 'double', 'long', 'touch']
 
-    def __init__(self, add_devices):
+    def __init__(self, add_entities):
         """Initialize the myStrom URL endpoint."""
         self.buttons = {}
-        self.add_devices = add_devices
+        self.add_entities = add_entities
 
     @asyncio.coroutine
     def get(self, request):
@@ -62,7 +63,7 @@ class MyStromView(HomeAssistantView):
                          button_id, button_action)
             self.buttons[entity_id] = MyStromBinarySensor(
                 '{}_{}'.format(button_id, button_action))
-            hass.async_add_job(self.add_devices, [self.buttons[entity_id]])
+            self.add_entities([self.buttons[entity_id]])
         else:
             new_state = True if self.buttons[entity_id].state == 'off' \
                 else False
diff --git a/homeassistant/components/binary_sensor/nest.py b/homeassistant/components/binary_sensor/nest.py
index 03bc484983b..c952e7c8987 100644
--- a/homeassistant/components/binary_sensor/nest.py
+++ b/homeassistant/components/binary_sensor/nest.py
@@ -54,14 +54,14 @@ _VALID_BINARY_SENSOR_TYPES = {**BINARY_TYPES, **CLIMATE_BINARY_TYPES,
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Nest binary sensors.
 
     No longer used.
     """
 
 
-async def async_setup_entry(hass, entry, async_add_devices):
+async def async_setup_entry(hass, entry, async_add_entities):
     """Set up a Nest binary sensor based on a config entry."""
     nest = hass.data[DATA_NEST]
 
@@ -112,7 +112,7 @@ async def async_setup_entry(hass, entry, async_add_devices):
 
         return sensors
 
-    async_add_devices(await hass.async_add_job(get_binary_sensors), True)
+    async_add_entities(await hass.async_add_job(get_binary_sensors), True)
 
 
 class NestBinarySensor(NestSensorDevice, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/netatmo.py b/homeassistant/components/binary_sensor/netatmo.py
index 73a373a15ff..2cafacf401c 100644
--- a/homeassistant/components/binary_sensor/netatmo.py
+++ b/homeassistant/components/binary_sensor/netatmo.py
@@ -57,7 +57,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the access to Netatmo binary sensor."""
     netatmo = hass.components.netatmo
     home = config.get(CONF_HOME)
@@ -89,7 +89,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                    camera_name not in config[CONF_CAMERAS]:
                     continue
             for variable in welcome_sensors:
-                add_devices([NetatmoBinarySensor(
+                add_entities([NetatmoBinarySensor(
                     data, camera_name, module_name, home, timeout,
                     camera_type, variable)], True)
         if camera_type == 'NOC':
@@ -98,14 +98,14 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                    camera_name not in config[CONF_CAMERAS]:
                     continue
             for variable in presence_sensors:
-                add_devices([NetatmoBinarySensor(
+                add_entities([NetatmoBinarySensor(
                     data, camera_name, module_name, home, timeout,
                     camera_type, variable)], True)
 
         for module_name in data.get_module_names(camera_name):
             for variable in tag_sensors:
                 camera_type = None
-                add_devices([NetatmoBinarySensor(
+                add_entities([NetatmoBinarySensor(
                     data, camera_name, module_name, home, timeout,
                     camera_type, variable)], True)
 
diff --git a/homeassistant/components/binary_sensor/nx584.py b/homeassistant/components/binary_sensor/nx584.py
index 4dff263f79a..2929acc2709 100644
--- a/homeassistant/components/binary_sensor/nx584.py
+++ b/homeassistant/components/binary_sensor/nx584.py
@@ -40,7 +40,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the NX584 binary sensor platform."""
     from nx584 import client as nx584_client
 
@@ -68,7 +68,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         for zone in zones
         if zone['number'] not in exclude}
     if zone_sensors:
-        add_devices(zone_sensors.values())
+        add_entities(zone_sensors.values())
         watcher = NX584Watcher(client, zone_sensors)
         watcher.start()
     else:
diff --git a/homeassistant/components/binary_sensor/octoprint.py b/homeassistant/components/binary_sensor/octoprint.py
index 1a1967b9014..3dd1ee2be8c 100644
--- a/homeassistant/components/binary_sensor/octoprint.py
+++ b/homeassistant/components/binary_sensor/octoprint.py
@@ -33,7 +33,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the available OctoPrint binary sensors."""
     octoprint_api = hass.data[DOMAIN]["api"]
     name = config.get(CONF_NAME)
@@ -47,7 +47,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             name, SENSOR_TYPES[octo_type][3], SENSOR_TYPES[octo_type][0],
             SENSOR_TYPES[octo_type][1], 'flags')
         devices.append(new_sensor)
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class OctoPrintBinarySensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/openuv.py b/homeassistant/components/binary_sensor/openuv.py
index 3a2732d3be0..0b299529a46 100644
--- a/homeassistant/components/binary_sensor/openuv.py
+++ b/homeassistant/components/binary_sensor/openuv.py
@@ -25,7 +25,7 @@ ATTR_PROTECTION_WINDOW_ENDING_UV = 'end_uv'
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the OpenUV binary sensor platform."""
     if discovery_info is None:
         return
@@ -38,7 +38,7 @@ async def async_setup_platform(
         binary_sensors.append(
             OpenUvBinarySensor(openuv, sensor_type, name, icon))
 
-    async_add_devices(binary_sensors, True)
+    async_add_entities(binary_sensors, True)
 
 
 class OpenUvBinarySensor(OpenUvEntity, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/pilight.py b/homeassistant/components/binary_sensor/pilight.py
index 69dc3b83485..abffffe8651 100644
--- a/homeassistant/components/binary_sensor/pilight.py
+++ b/homeassistant/components/binary_sensor/pilight.py
@@ -44,11 +44,11 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Pilight Binary Sensor."""
     disarm = config.get(CONF_DISARM_AFTER_TRIGGER)
     if disarm:
-        add_devices([PilightTriggerSensor(
+        add_entities([PilightTriggerSensor(
             hass=hass,
             name=config.get(CONF_NAME),
             variable=config.get(CONF_VARIABLE),
@@ -58,7 +58,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             rst_dly_sec=config.get(CONF_RESET_DELAY_SEC),
         )])
     else:
-        add_devices([PilightBinarySensor(
+        add_entities([PilightBinarySensor(
             hass=hass,
             name=config.get(CONF_NAME),
             variable=config.get(CONF_VARIABLE),
diff --git a/homeassistant/components/binary_sensor/ping.py b/homeassistant/components/binary_sensor/ping.py
index bb597f208e6..4c597dd63e1 100644
--- a/homeassistant/components/binary_sensor/ping.py
+++ b/homeassistant/components/binary_sensor/ping.py
@@ -48,13 +48,13 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Ping Binary sensor."""
     name = config.get(CONF_NAME)
     host = config.get(CONF_HOST)
     count = config.get(CONF_PING_COUNT)
 
-    add_devices([PingBinarySensor(name, PingData(host, count))], True)
+    add_entities([PingBinarySensor(name, PingData(host, count))], True)
 
 
 class PingBinarySensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/qwikswitch.py b/homeassistant/components/binary_sensor/qwikswitch.py
index 067021b0c7a..2fe14773d3a 100644
--- a/homeassistant/components/binary_sensor/qwikswitch.py
+++ b/homeassistant/components/binary_sensor/qwikswitch.py
@@ -15,7 +15,7 @@ DEPENDENCIES = [QWIKSWITCH]
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup_platform(hass, _, add_devices, discovery_info=None):
+async def async_setup_platform(hass, _, add_entities, discovery_info=None):
     """Add binary sensor from the main Qwikswitch component."""
     if discovery_info is None:
         return
@@ -24,7 +24,7 @@ async def async_setup_platform(hass, _, add_devices, discovery_info=None):
     _LOGGER.debug("Setup qwikswitch.binary_sensor %s, %s",
                   qsusb, discovery_info)
     devs = [QSBinarySensor(sensor) for sensor in discovery_info[QWIKSWITCH]]
-    add_devices(devs)
+    add_entities(devs)
 
 
 class QSBinarySensor(QSEntity, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/rachio.py b/homeassistant/components/binary_sensor/rachio.py
index 59bf8a21064..798b6a754d1 100644
--- a/homeassistant/components/binary_sensor/rachio.py
+++ b/homeassistant/components/binary_sensor/rachio.py
@@ -24,13 +24,13 @@ DEPENDENCIES = ['rachio']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Rachio binary sensors."""
     devices = []
     for controller in hass.data[DOMAIN_RACHIO].controllers:
         devices.append(RachioControllerOnlineBinarySensor(hass, controller))
 
-    add_devices(devices)
+    add_entities(devices)
     _LOGGER.info("%d Rachio binary sensor(s) added", len(devices))
 
 
diff --git a/homeassistant/components/binary_sensor/raincloud.py b/homeassistant/components/binary_sensor/raincloud.py
index 3cbd179154f..810c7d201cb 100644
--- a/homeassistant/components/binary_sensor/raincloud.py
+++ b/homeassistant/components/binary_sensor/raincloud.py
@@ -25,7 +25,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a sensor for a raincloud device."""
     raincloud = hass.data[DATA_RAINCLOUD].data
 
@@ -43,7 +43,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             for zone in raincloud.controller.faucet.zones:
                 sensors.append(RainCloudBinarySensor(zone, sensor_type))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
     return True
 
 
diff --git a/homeassistant/components/binary_sensor/rainmachine.py b/homeassistant/components/binary_sensor/rainmachine.py
index b2f44696fbd..12c9b3e98f0 100644
--- a/homeassistant/components/binary_sensor/rainmachine.py
+++ b/homeassistant/components/binary_sensor/rainmachine.py
@@ -21,7 +21,7 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the RainMachine Switch platform."""
     if discovery_info is None:
         return
@@ -34,7 +34,7 @@ async def async_setup_platform(
         binary_sensors.append(
             RainMachineBinarySensor(rainmachine, sensor_type, name, icon))
 
-    async_add_devices(binary_sensors, True)
+    async_add_entities(binary_sensors, True)
 
 
 class RainMachineBinarySensor(RainMachineEntity, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/random.py b/homeassistant/components/binary_sensor/random.py
index ab6c1e5d479..9bdc57c6e46 100644
--- a/homeassistant/components/binary_sensor/random.py
+++ b/homeassistant/components/binary_sensor/random.py
@@ -24,12 +24,12 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the Random binary sensor."""
     name = config.get(CONF_NAME)
     device_class = config.get(CONF_DEVICE_CLASS)
 
-    async_add_devices([RandomSensor(name, device_class)], True)
+    async_add_entities([RandomSensor(name, device_class)], True)
 
 
 class RandomSensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/raspihats.py b/homeassistant/components/binary_sensor/raspihats.py
index 9ab56a5a20d..feef5396d88 100644
--- a/homeassistant/components/binary_sensor/raspihats.py
+++ b/homeassistant/components/binary_sensor/raspihats.py
@@ -42,7 +42,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the raspihats binary_sensor devices."""
     I2CHatBinarySensor.I2C_HATS_MANAGER = hass.data[I2C_HATS_MANAGER]
     binary_sensors = []
@@ -65,7 +65,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         except I2CHatsException as ex:
             _LOGGER.error("Failed to register %s I2CHat@%s %s",
                           board, hex(address), str(ex))
-    add_devices(binary_sensors)
+    add_entities(binary_sensors)
 
 
 class I2CHatBinarySensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/rest.py b/homeassistant/components/binary_sensor/rest.py
index e9cb40f6747..412aeb46a3a 100644
--- a/homeassistant/components/binary_sensor/rest.py
+++ b/homeassistant/components/binary_sensor/rest.py
@@ -41,7 +41,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the REST binary sensor."""
     name = config.get(CONF_NAME)
     resource = config.get(CONF_RESOURCE)
@@ -71,7 +71,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("Unable to fetch REST data from %s", resource)
         return False
 
-    add_devices([RestBinarySensor(
+    add_entities([RestBinarySensor(
         hass, rest, name, device_class, value_template)], True)
 
 
diff --git a/homeassistant/components/binary_sensor/rfxtrx.py b/homeassistant/components/binary_sensor/rfxtrx.py
index 6ac604a4f1e..1e88c72e19d 100644
--- a/homeassistant/components/binary_sensor/rfxtrx.py
+++ b/homeassistant/components/binary_sensor/rfxtrx.py
@@ -42,7 +42,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 }, extra=vol.ALLOW_EXTRA)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Binary Sensor platform to RFXtrx."""
     import RFXtrx as rfxtrxmod
     sensors = []
@@ -71,7 +71,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         sensors.append(device)
         rfxtrx.RFX_DEVICES[device_id] = device
 
-    add_devices(sensors)
+    add_entities(sensors)
 
     def binary_sensor_update(event):
         """Call for control updates from the RFXtrx gateway."""
@@ -101,7 +101,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             sensor = RfxtrxBinarySensor(event, pkt_id)
             sensor.hass = hass
             rfxtrx.RFX_DEVICES[device_id] = sensor
-            add_devices([sensor])
+            add_entities([sensor])
             _LOGGER.info(
                 "Added binary sensor %s (Device ID: %s Class: %s Sub: %s)",
                 pkt_id, slugify(event.device.id_string.lower()),
diff --git a/homeassistant/components/binary_sensor/ring.py b/homeassistant/components/binary_sensor/ring.py
index 4f2ea408e7f..102e22cbe2d 100644
--- a/homeassistant/components/binary_sensor/ring.py
+++ b/homeassistant/components/binary_sensor/ring.py
@@ -39,7 +39,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a sensor for a Ring device."""
     ring = hass.data[DATA_RING]
 
@@ -56,7 +56,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                 sensors.append(RingBinarySensor(hass,
                                                 device,
                                                 sensor_type))
-    add_devices(sensors, True)
+    add_entities(sensors, True)
     return True
 
 
diff --git a/homeassistant/components/binary_sensor/rpi_gpio.py b/homeassistant/components/binary_sensor/rpi_gpio.py
index 31a518dc1dc..2fe4e0766ed 100644
--- a/homeassistant/components/binary_sensor/rpi_gpio.py
+++ b/homeassistant/components/binary_sensor/rpi_gpio.py
@@ -39,7 +39,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Raspberry PI GPIO devices."""
     pull_mode = config.get(CONF_PULL_MODE)
     bouncetime = config.get(CONF_BOUNCETIME)
@@ -50,7 +50,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for port_num, port_name in ports.items():
         binary_sensors.append(RPiGPIOBinarySensor(
             port_name, port_num, pull_mode, bouncetime, invert_logic))
-    add_devices(binary_sensors, True)
+    add_entities(binary_sensors, True)
 
 
 class RPiGPIOBinarySensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/rpi_pfio.py b/homeassistant/components/binary_sensor/rpi_pfio.py
index a1126bdd2f9..61d1f8ac285 100644
--- a/homeassistant/components/binary_sensor/rpi_pfio.py
+++ b/homeassistant/components/binary_sensor/rpi_pfio.py
@@ -39,7 +39,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the PiFace Digital Input devices."""
     binary_sensors = []
     ports = config.get(CONF_PORTS)
@@ -50,7 +50,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
         binary_sensors.append(RPiPFIOBinarySensor(
             hass, port, name, settle_time, invert_logic))
-    add_devices(binary_sensors, True)
+    add_entities(binary_sensors, True)
 
     rpi_pfio.activate_listener(hass)
 
diff --git a/homeassistant/components/binary_sensor/satel_integra.py b/homeassistant/components/binary_sensor/satel_integra.py
index f373809f7c0..3500f0a0576 100644
--- a/homeassistant/components/binary_sensor/satel_integra.py
+++ b/homeassistant/components/binary_sensor/satel_integra.py
@@ -21,7 +21,8 @@ _LOGGER = logging.getLogger(__name__)
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Satel Integra binary sensor devices."""
     if not discovery_info:
         return
@@ -36,7 +37,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         device = SatelIntegraBinarySensor(zone_num, zone_name, zone_type)
         devices.append(device)
 
-    async_add_devices(devices)
+    async_add_entities(devices)
 
 
 class SatelIntegraBinarySensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/skybell.py b/homeassistant/components/binary_sensor/skybell.py
index 44cad11e3f0..7d8b3a84a2a 100644
--- a/homeassistant/components/binary_sensor/skybell.py
+++ b/homeassistant/components/binary_sensor/skybell.py
@@ -37,7 +37,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the platform for a Skybell device."""
     skybell = hass.data.get(SKYBELL_DOMAIN)
 
@@ -46,7 +46,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         for device in skybell.get_devices():
             sensors.append(SkybellBinarySensor(device, sensor_type))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class SkybellBinarySensor(SkybellDevice, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/sleepiq.py b/homeassistant/components/binary_sensor/sleepiq.py
index 3a6c27db386..808eda4967d 100644
--- a/homeassistant/components/binary_sensor/sleepiq.py
+++ b/homeassistant/components/binary_sensor/sleepiq.py
@@ -10,7 +10,7 @@ from homeassistant.components.binary_sensor import BinarySensorDevice
 DEPENDENCIES = ['sleepiq']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the SleepIQ sensors."""
     if discovery_info is None:
         return
@@ -22,7 +22,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for bed_id, _ in data.beds.items():
         for side in sleepiq.SIDES:
             dev.append(IsInBedBinarySensor(data, bed_id, side))
-    add_devices(dev)
+    add_entities(dev)
 
 
 class IsInBedBinarySensor(sleepiq.SleepIQSensor, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/spc.py b/homeassistant/components/binary_sensor/spc.py
index 95723f93870..9afd4fe4015 100644
--- a/homeassistant/components/binary_sensor/spc.py
+++ b/homeassistant/components/binary_sensor/spc.py
@@ -45,13 +45,14 @@ def _create_sensor(hass, zone):
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the SPC binary sensor."""
     if (discovery_info is None or
             discovery_info[ATTR_DISCOVER_DEVICES] is None):
         return
 
-    async_add_devices(
+    async_add_entities(
         _create_sensor(hass, zone)
         for zone in discovery_info[ATTR_DISCOVER_DEVICES]
         if _get_device_class(zone['type']))
diff --git a/homeassistant/components/binary_sensor/tahoma.py b/homeassistant/components/binary_sensor/tahoma.py
index efcfb629f39..7af5a730c43 100644
--- a/homeassistant/components/binary_sensor/tahoma.py
+++ b/homeassistant/components/binary_sensor/tahoma.py
@@ -21,14 +21,14 @@ _LOGGER = logging.getLogger(__name__)
 SCAN_INTERVAL = timedelta(seconds=120)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Tahoma controller devices."""
     _LOGGER.debug("Setup Tahoma Binary sensor platform")
     controller = hass.data[TAHOMA_DOMAIN]['controller']
     devices = []
     for device in hass.data[TAHOMA_DOMAIN]['devices']['smoke']:
         devices.append(TahomaBinarySensor(device, controller))
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class TahomaBinarySensor(TahomaDevice, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/tapsaff.py b/homeassistant/components/binary_sensor/tapsaff.py
index 5b8e133b5f4..1978a127c17 100644
--- a/homeassistant/components/binary_sensor/tapsaff.py
+++ b/homeassistant/components/binary_sensor/tapsaff.py
@@ -30,14 +30,14 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Taps Aff binary sensor."""
     name = config.get(CONF_NAME)
     location = config.get(CONF_LOCATION)
 
     taps_aff_data = TapsAffData(location)
 
-    add_devices([TapsAffSensor(taps_aff_data, name)], True)
+    add_entities([TapsAffSensor(taps_aff_data, name)], True)
 
 
 class TapsAffSensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/tcp.py b/homeassistant/components/binary_sensor/tcp.py
index cfaa8057798..764b6829c91 100644
--- a/homeassistant/components/binary_sensor/tcp.py
+++ b/homeassistant/components/binary_sensor/tcp.py
@@ -15,9 +15,9 @@ _LOGGER = logging.getLogger(__name__)
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({})
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the TCP binary sensor."""
-    add_devices([TcpBinarySensor(hass, config)])
+    add_entities([TcpBinarySensor(hass, config)])
 
 
 class TcpBinarySensor(BinarySensorDevice, TcpSensor):
diff --git a/homeassistant/components/binary_sensor/tellduslive.py b/homeassistant/components/binary_sensor/tellduslive.py
index 6746d532780..c412ec37e51 100644
--- a/homeassistant/components/binary_sensor/tellduslive.py
+++ b/homeassistant/components/binary_sensor/tellduslive.py
@@ -15,11 +15,11 @@ from homeassistant.components.binary_sensor import BinarySensorDevice
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Tellstick sensors."""
     if discovery_info is None:
         return
-    add_devices(
+    add_entities(
         TelldusLiveSensor(hass, binary_sensor)
         for binary_sensor in discovery_info
     )
diff --git a/homeassistant/components/binary_sensor/template.py b/homeassistant/components/binary_sensor/template.py
index 68ffbf77af2..c5bfa593022 100644
--- a/homeassistant/components/binary_sensor/template.py
+++ b/homeassistant/components/binary_sensor/template.py
@@ -47,7 +47,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up template binary sensors."""
     sensors = []
 
@@ -82,7 +83,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         _LOGGER.error("No sensors added")
         return False
 
-    async_add_devices(sensors)
+    async_add_entities(sensors)
     return True
 
 
diff --git a/homeassistant/components/binary_sensor/tesla.py b/homeassistant/components/binary_sensor/tesla.py
index 3d494a28ea8..f7613d74dfb 100644
--- a/homeassistant/components/binary_sensor/tesla.py
+++ b/homeassistant/components/binary_sensor/tesla.py
@@ -15,13 +15,13 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['tesla']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Tesla binary sensor."""
     devices = [
         TeslaBinarySensor(
             device, hass.data[TESLA_DOMAIN]['controller'], 'connectivity')
         for device in hass.data[TESLA_DOMAIN]['devices']['binary_sensor']]
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class TeslaBinarySensor(TeslaDevice, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/threshold.py b/homeassistant/components/binary_sensor/threshold.py
index 39681c894b3..fd7ead08822 100644
--- a/homeassistant/components/binary_sensor/threshold.py
+++ b/homeassistant/components/binary_sensor/threshold.py
@@ -55,7 +55,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Threshold sensor."""
     entity_id = config.get(CONF_ENTITY_ID)
     name = config.get(CONF_NAME)
@@ -64,7 +65,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     hysteresis = config.get(CONF_HYSTERESIS)
     device_class = config.get(CONF_DEVICE_CLASS)
 
-    async_add_devices([ThresholdSensor(
+    async_add_entities([ThresholdSensor(
         hass, entity_id, name, lower, upper, hysteresis, device_class)], True)
 
 
diff --git a/homeassistant/components/binary_sensor/trend.py b/homeassistant/components/binary_sensor/trend.py
index 7165a0dbdf3..ae6fd5562bf 100644
--- a/homeassistant/components/binary_sensor/trend.py
+++ b/homeassistant/components/binary_sensor/trend.py
@@ -57,7 +57,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the trend sensors."""
     sensors = []
 
@@ -80,7 +80,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     if not sensors:
         _LOGGER.error("No sensors added")
         return False
-    add_devices(sensors)
+    add_entities(sensors)
     return True
 
 
diff --git a/homeassistant/components/binary_sensor/upcloud.py b/homeassistant/components/binary_sensor/upcloud.py
index 868a2e8ddd0..c7b8a284dc9 100644
--- a/homeassistant/components/binary_sensor/upcloud.py
+++ b/homeassistant/components/binary_sensor/upcloud.py
@@ -23,7 +23,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the UpCloud server binary sensor."""
     upcloud = hass.data[DATA_UPCLOUD]
 
@@ -31,7 +31,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     devices = [UpCloudBinarySensor(upcloud, uuid) for uuid in servers]
 
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class UpCloudBinarySensor(UpCloudServerEntity, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/uptimerobot.py b/homeassistant/components/binary_sensor/uptimerobot.py
index 9e72d188c99..dbb83e53e9f 100644
--- a/homeassistant/components/binary_sensor/uptimerobot.py
+++ b/homeassistant/components/binary_sensor/uptimerobot.py
@@ -26,7 +26,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Uptime Robot binary_sensors."""
     from pyuptimerobot import UptimeRobot
 
@@ -44,7 +44,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             api_key, up_robot, monitor['id'], monitor['friendly_name'],
             monitor['url']))
 
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class UptimeRobotBinarySensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/velbus.py b/homeassistant/components/binary_sensor/velbus.py
index 8438be0d784..b123b958560 100644
--- a/homeassistant/components/binary_sensor/velbus.py
+++ b/homeassistant/components/binary_sensor/velbus.py
@@ -15,7 +15,7 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['velbus']
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up Velbus binary sensors."""
     if discovery_info is None:
@@ -25,7 +25,7 @@ async def async_setup_platform(hass, config, async_add_devices,
         module = hass.data[VELBUS_DOMAIN].get_module(sensor[0])
         channel = sensor[1]
         sensors.append(VelbusBinarySensor(module, channel))
-    async_add_devices(sensors)
+    async_add_entities(sensors)
 
 
 class VelbusBinarySensor(VelbusEntity, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/vera.py b/homeassistant/components/binary_sensor/vera.py
index 310e2289cbc..bb1e7331de8 100644
--- a/homeassistant/components/binary_sensor/vera.py
+++ b/homeassistant/components/binary_sensor/vera.py
@@ -16,9 +16,9 @@ DEPENDENCIES = ['vera']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Perform the setup for Vera controller devices."""
-    add_devices(
+    add_entities(
         [VeraBinarySensor(device, hass.data[VERA_CONTROLLER])
          for device in hass.data[VERA_DEVICES]['binary_sensor']], True)
 
diff --git a/homeassistant/components/binary_sensor/verisure.py b/homeassistant/components/binary_sensor/verisure.py
index 7068d51f6a3..e040da959ea 100644
--- a/homeassistant/components/binary_sensor/verisure.py
+++ b/homeassistant/components/binary_sensor/verisure.py
@@ -13,7 +13,7 @@ from homeassistant.components.verisure import HUB as hub
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Verisure binary sensors."""
     sensors = []
     hub.update_overview()
@@ -23,7 +23,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             VerisureDoorWindowSensor(device_label)
             for device_label in hub.get(
                 "$.doorWindow.doorWindowDevice[*].deviceLabel")])
-    add_devices(sensors)
+    add_entities(sensors)
 
 
 class VerisureDoorWindowSensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/volvooncall.py b/homeassistant/components/binary_sensor/volvooncall.py
index 402feefa99f..e70d3098874 100644
--- a/homeassistant/components/binary_sensor/volvooncall.py
+++ b/homeassistant/components/binary_sensor/volvooncall.py
@@ -12,11 +12,11 @@ from homeassistant.components.binary_sensor import BinarySensorDevice
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Volvo sensors."""
     if discovery_info is None:
         return
-    add_devices([VolvoSensor(hass, *discovery_info)])
+    add_entities([VolvoSensor(hass, *discovery_info)])
 
 
 class VolvoSensor(VolvoEntity, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/vultr.py b/homeassistant/components/binary_sensor/vultr.py
index eecd3f87c40..149a6c28290 100644
--- a/homeassistant/components/binary_sensor/vultr.py
+++ b/homeassistant/components/binary_sensor/vultr.py
@@ -30,7 +30,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Vultr subscription (server) binary sensor."""
     vultr = hass.data[DATA_VULTR]
 
@@ -41,7 +41,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("Subscription %s not found", subscription)
         return
 
-    add_devices([VultrBinarySensor(vultr, subscription, name)], True)
+    add_entities([VultrBinarySensor(vultr, subscription, name)], True)
 
 
 class VultrBinarySensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/wemo.py b/homeassistant/components/binary_sensor/wemo.py
index bde6accf421..1071aae50dd 100644
--- a/homeassistant/components/binary_sensor/wemo.py
+++ b/homeassistant/components/binary_sensor/wemo.py
@@ -15,7 +15,7 @@ DEPENDENCIES = ['wemo']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+def setup_platform(hass, config, add_entities_callback, discovery_info=None):
     """Register discovered WeMo binary sensors."""
     from pywemo import discovery
 
@@ -31,7 +31,7 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
             raise PlatformNotReady
 
         if device:
-            add_devices_callback([WemoBinarySensor(hass, device)])
+            add_entities_callback([WemoBinarySensor(hass, device)])
 
 
 class WemoBinarySensor(BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/wink.py b/homeassistant/components/binary_sensor/wink.py
index 575507cd047..1976e49f446 100644
--- a/homeassistant/components/binary_sensor/wink.py
+++ b/homeassistant/components/binary_sensor/wink.py
@@ -31,7 +31,7 @@ SENSOR_TYPES = {
 }
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Wink binary sensor platform."""
     import pywink
 
@@ -39,49 +39,49 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _id = sensor.object_id() + sensor.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
             if sensor.capability() in SENSOR_TYPES:
-                add_devices([WinkBinarySensorDevice(sensor, hass)])
+                add_entities([WinkBinarySensorDevice(sensor, hass)])
 
     for key in pywink.get_keys():
         _id = key.object_id() + key.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkBinarySensorDevice(key, hass)])
+            add_entities([WinkBinarySensorDevice(key, hass)])
 
     for sensor in pywink.get_smoke_and_co_detectors():
         _id = sensor.object_id() + sensor.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkSmokeDetector(sensor, hass)])
+            add_entities([WinkSmokeDetector(sensor, hass)])
 
     for hub in pywink.get_hubs():
         _id = hub.object_id() + hub.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkHub(hub, hass)])
+            add_entities([WinkHub(hub, hass)])
 
     for remote in pywink.get_remotes():
         _id = remote.object_id() + remote.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkRemote(remote, hass)])
+            add_entities([WinkRemote(remote, hass)])
 
     for button in pywink.get_buttons():
         _id = button.object_id() + button.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkButton(button, hass)])
+            add_entities([WinkButton(button, hass)])
 
     for gang in pywink.get_gangs():
         _id = gang.object_id() + gang.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkGang(gang, hass)])
+            add_entities([WinkGang(gang, hass)])
 
     for door_bell_sensor in pywink.get_door_bells():
         _id = door_bell_sensor.object_id() + door_bell_sensor.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkBinarySensorDevice(door_bell_sensor, hass)])
+            add_entities([WinkBinarySensorDevice(door_bell_sensor, hass)])
 
     for camera_sensor in pywink.get_cameras():
         _id = camera_sensor.object_id() + camera_sensor.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
             try:
                 if camera_sensor.capability() in SENSOR_TYPES:
-                    add_devices([WinkBinarySensorDevice(camera_sensor, hass)])
+                    add_entities([WinkBinarySensorDevice(camera_sensor, hass)])
             except AttributeError:
                 _LOGGER.info("Device isn't a sensor, skipping")
 
diff --git a/homeassistant/components/binary_sensor/wirelesstag.py b/homeassistant/components/binary_sensor/wirelesstag.py
index bfc2d44fc6e..4bec3a824c3 100644
--- a/homeassistant/components/binary_sensor/wirelesstag.py
+++ b/homeassistant/components/binary_sensor/wirelesstag.py
@@ -107,7 +107,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the platform for a WirelessTags."""
     platform = hass.data.get(WIRELESSTAG_DOMAIN)
 
@@ -120,7 +120,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                 sensors.append(WirelessTagBinarySensor(platform, tag,
                                                        sensor_type))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
     hass.add_job(platform.install_push_notifications, sensors)
 
 
diff --git a/homeassistant/components/binary_sensor/workday.py b/homeassistant/components/binary_sensor/workday.py
index 4a9809e9974..3fb2d7f7f86 100644
--- a/homeassistant/components/binary_sensor/workday.py
+++ b/homeassistant/components/binary_sensor/workday.py
@@ -58,7 +58,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Workday sensor."""
     import holidays
 
@@ -92,7 +92,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for date, name in sorted(obj_holidays.items()):
         _LOGGER.debug("%s %s", date, name)
 
-    add_devices([IsWorkdaySensor(
+    add_entities([IsWorkdaySensor(
         obj_holidays, workdays, excludes, days_offset, sensor_name)], True)
 
 
diff --git a/homeassistant/components/binary_sensor/xiaomi_aqara.py b/homeassistant/components/binary_sensor/xiaomi_aqara.py
index c1641c5f1ec..c42090e3b7a 100644
--- a/homeassistant/components/binary_sensor/xiaomi_aqara.py
+++ b/homeassistant/components/binary_sensor/xiaomi_aqara.py
@@ -19,7 +19,7 @@ DENSITY = 'density'
 ATTR_DENSITY = 'Density'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Perform the setup for Xiaomi devices."""
     devices = []
     for (_, gateway) in hass.data[PY_XIAOMI_GATEWAY].gateways.items():
@@ -65,7 +65,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                                             'dual_channel', hass, gateway))
             elif model in ['cube', 'sensor_cube', 'sensor_cube.aqgl01']:
                 devices.append(XiaomiCube(device, hass, gateway))
-    add_devices(devices)
+    add_entities(devices)
 
 
 class XiaomiBinarySensor(XiaomiDevice, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/zha.py b/homeassistant/components/binary_sensor/zha.py
index 224d694e0f5..cabbbd704a0 100644
--- a/homeassistant/components/binary_sensor/zha.py
+++ b/homeassistant/components/binary_sensor/zha.py
@@ -24,7 +24,7 @@ CLASS_MAPPING = {
 }
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the Zigbee Home Automation binary sensors."""
     discovery_info = zha.get_discovery_info(hass, discovery_info)
@@ -34,14 +34,14 @@ async def async_setup_platform(hass, config, async_add_devices,
     from zigpy.zcl.clusters.general import OnOff
     from zigpy.zcl.clusters.security import IasZone
     if IasZone.cluster_id in discovery_info['in_clusters']:
-        await _async_setup_iaszone(hass, config, async_add_devices,
+        await _async_setup_iaszone(hass, config, async_add_entities,
                                    discovery_info)
     elif OnOff.cluster_id in discovery_info['out_clusters']:
-        await _async_setup_remote(hass, config, async_add_devices,
+        await _async_setup_remote(hass, config, async_add_entities,
                                   discovery_info)
 
 
-async def _async_setup_iaszone(hass, config, async_add_devices,
+async def _async_setup_iaszone(hass, config, async_add_entities,
                                discovery_info):
     device_class = None
     from zigpy.zcl.clusters.security import IasZone
@@ -59,10 +59,11 @@ async def _async_setup_iaszone(hass, config, async_add_devices,
         pass
 
     sensor = BinarySensor(device_class, **discovery_info)
-    async_add_devices([sensor], update_before_add=True)
+    async_add_entities([sensor], update_before_add=True)
 
 
-async def _async_setup_remote(hass, config, async_add_devices, discovery_info):
+async def _async_setup_remote(hass, config, async_add_entities,
+                              discovery_info):
 
     async def safe(coro):
         """Run coro, catching ZigBee delivery errors, and ignoring them."""
@@ -85,7 +86,7 @@ async def _async_setup_remote(hass, config, async_add_devices, discovery_info):
             await safe(cluster.configure_reporting(0, 1, 600, 1))
 
     sensor = Switch(**discovery_info)
-    async_add_devices([sensor], update_before_add=True)
+    async_add_entities([sensor], update_before_add=True)
 
 
 class BinarySensor(zha.Entity, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/zigbee.py b/homeassistant/components/binary_sensor/zigbee.py
index 659d82f809b..6b89258209e 100644
--- a/homeassistant/components/binary_sensor/zigbee.py
+++ b/homeassistant/components/binary_sensor/zigbee.py
@@ -22,9 +22,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the ZigBee binary sensor platform."""
-    add_devices(
+    add_entities(
         [ZigBeeBinarySensor(hass, ZigBeeDigitalInConfig(config))], True)
 
 
diff --git a/homeassistant/components/calendar/caldav.py b/homeassistant/components/calendar/caldav.py
index 3db24790aaf..cb8874a817c 100644
--- a/homeassistant/components/calendar/caldav.py
+++ b/homeassistant/components/calendar/caldav.py
@@ -49,7 +49,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=15)
 
 
-def setup_platform(hass, config, add_devices, disc_info=None):
+def setup_platform(hass, config, add_entities, disc_info=None):
     """Set up the WebDav Calendar platform."""
     import caldav
 
@@ -98,7 +98,7 @@ def setup_platform(hass, config, add_devices, disc_info=None):
                 WebDavCalendarEventDevice(hass, device_data, calendar)
             )
 
-    add_devices(calendar_devices)
+    add_entities(calendar_devices)
 
 
 class WebDavCalendarEventDevice(CalendarEventDevice):
diff --git a/homeassistant/components/calendar/demo.py b/homeassistant/components/calendar/demo.py
index 0bf09f6f2c7..bf9d4abeb58 100644
--- a/homeassistant/components/calendar/demo.py
+++ b/homeassistant/components/calendar/demo.py
@@ -11,11 +11,11 @@ from homeassistant.components.calendar import CalendarEventDevice, get_date
 from homeassistant.components.google import CONF_DEVICE_ID, CONF_NAME
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Demo Calendar platform."""
     calendar_data_future = DemoGoogleCalendarDataFuture()
     calendar_data_current = DemoGoogleCalendarDataCurrent()
-    add_devices([
+    add_entities([
         DemoGoogleCalendar(hass, calendar_data_future, {
             CONF_NAME: 'Calendar 1',
             CONF_DEVICE_ID: 'calendar_1',
diff --git a/homeassistant/components/calendar/google.py b/homeassistant/components/calendar/google.py
index 9b14f773c22..041b98dc24b 100644
--- a/homeassistant/components/calendar/google.py
+++ b/homeassistant/components/calendar/google.py
@@ -25,7 +25,7 @@ DEFAULT_GOOGLE_SEARCH_PARAMS = {
 MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=15)
 
 
-def setup_platform(hass, config, add_devices, disc_info=None):
+def setup_platform(hass, config, add_entities, disc_info=None):
     """Set up the calendar platform for event devices."""
     if disc_info is None:
         return
@@ -34,9 +34,9 @@ def setup_platform(hass, config, add_devices, disc_info=None):
         return
 
     calendar_service = GoogleCalendarService(hass.config.path(TOKEN_FILE))
-    add_devices([GoogleCalendarEventDevice(hass, calendar_service,
-                                           disc_info[CONF_CAL_ID], data)
-                 for data in disc_info[CONF_ENTITIES] if data[CONF_TRACK]])
+    add_entities([GoogleCalendarEventDevice(hass, calendar_service,
+                                            disc_info[CONF_CAL_ID], data)
+                  for data in disc_info[CONF_ENTITIES] if data[CONF_TRACK]])
 
 
 class GoogleCalendarEventDevice(CalendarEventDevice):
diff --git a/homeassistant/components/calendar/todoist.py b/homeassistant/components/calendar/todoist.py
index ba1f60027ba..b5eaed4e6c9 100644
--- a/homeassistant/components/calendar/todoist.py
+++ b/homeassistant/components/calendar/todoist.py
@@ -116,7 +116,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=15)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Todoist platform."""
     token = config.get(CONF_TOKEN)
 
@@ -178,7 +178,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             )
         )
 
-    add_devices(project_devices)
+    add_entities(project_devices)
 
     def handle_new_task(call):
         """Call when a user creates a new Todoist Task from HASS."""
diff --git a/homeassistant/components/camera/abode.py b/homeassistant/components/camera/abode.py
index ee739810a61..fbab1620a39 100644
--- a/homeassistant/components/camera/abode.py
+++ b/homeassistant/components/camera/abode.py
@@ -22,7 +22,7 @@ MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=90)
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Abode camera devices."""
     import abodepy.helpers.constants as CONST
     import abodepy.helpers.timeline as TIMELINE
@@ -38,7 +38,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     data.devices.extend(devices)
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class AbodeCamera(AbodeDevice, Camera):
diff --git a/homeassistant/components/camera/amcrest.py b/homeassistant/components/camera/amcrest.py
index 4cb218bc019..9f4b84db2cc 100644
--- a/homeassistant/components/camera/amcrest.py
+++ b/homeassistant/components/camera/amcrest.py
@@ -22,7 +22,8 @@ _LOGGER = logging.getLogger(__name__)
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up an Amcrest IP Camera."""
     if discovery_info is None:
         return
@@ -30,7 +31,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     device_name = discovery_info[CONF_NAME]
     amcrest = hass.data[DATA_AMCREST][device_name]
 
-    async_add_devices([AmcrestCam(hass, amcrest)], True)
+    async_add_entities([AmcrestCam(hass, amcrest)], True)
 
     return True
 
diff --git a/homeassistant/components/camera/arlo.py b/homeassistant/components/camera/arlo.py
index 1a98ade5518..af931c74cfa 100644
--- a/homeassistant/components/camera/arlo.py
+++ b/homeassistant/components/camera/arlo.py
@@ -47,7 +47,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up an Arlo IP Camera."""
     arlo = hass.data[DATA_ARLO]
 
@@ -55,7 +55,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for camera in arlo.cameras:
         cameras.append(ArloCam(hass, camera, config))
 
-    add_devices(cameras)
+    add_entities(cameras)
 
 
 class ArloCam(Camera):
diff --git a/homeassistant/components/camera/august.py b/homeassistant/components/camera/august.py
index d3bc080bfc6..dcce5e13588 100644
--- a/homeassistant/components/camera/august.py
+++ b/homeassistant/components/camera/august.py
@@ -16,7 +16,7 @@ DEPENDENCIES = ['august']
 SCAN_INTERVAL = timedelta(seconds=5)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up August cameras."""
     data = hass.data[DATA_AUGUST]
     devices = []
@@ -24,7 +24,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for doorbell in data.doorbells:
         devices.append(AugustCamera(data, doorbell, DEFAULT_TIMEOUT))
 
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class AugustCamera(Camera):
diff --git a/homeassistant/components/camera/axis.py b/homeassistant/components/camera/axis.py
index 5b39718939a..5630759a7f8 100644
--- a/homeassistant/components/camera/axis.py
+++ b/homeassistant/components/camera/axis.py
@@ -27,7 +27,7 @@ def _get_image_url(host, port, mode):
         return 'http://{}:{}/axis-cgi/jpg/image.cgi'.format(host, port)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Axis camera."""
     camera_config = {
         CONF_NAME: discovery_info[CONF_NAME],
@@ -41,7 +41,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             'single'),
         CONF_AUTHENTICATION: HTTP_DIGEST_AUTHENTICATION,
     }
-    add_devices([AxisCamera(
+    add_entities([AxisCamera(
         hass, camera_config, str(discovery_info[CONF_PORT]))])
 
 
diff --git a/homeassistant/components/camera/blink.py b/homeassistant/components/camera/blink.py
index 8475ca8fd1e..217849138c3 100644
--- a/homeassistant/components/camera/blink.py
+++ b/homeassistant/components/camera/blink.py
@@ -20,7 +20,7 @@ DEPENDENCIES = ['blink']
 MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=90)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a Blink Camera."""
     if discovery_info is None:
         return
@@ -30,7 +30,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for name in data.cameras:
         devs.append(BlinkCamera(hass, config, data, name))
 
-    add_devices(devs)
+    add_entities(devs)
 
 
 class BlinkCamera(Camera):
diff --git a/homeassistant/components/camera/bloomsky.py b/homeassistant/components/camera/bloomsky.py
index 77528992674..01e20e3ccd3 100644
--- a/homeassistant/components/camera/bloomsky.py
+++ b/homeassistant/components/camera/bloomsky.py
@@ -13,11 +13,11 @@ from homeassistant.components.camera import Camera
 DEPENDENCIES = ['bloomsky']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up access to BloomSky cameras."""
     bloomsky = hass.components.bloomsky
     for device in bloomsky.BLOOMSKY.devices.values():
-        add_devices([BloomSkyCamera(bloomsky.BLOOMSKY, device)])
+        add_entities([BloomSkyCamera(bloomsky.BLOOMSKY, device)])
 
 
 class BloomSkyCamera(Camera):
diff --git a/homeassistant/components/camera/canary.py b/homeassistant/components/camera/canary.py
index a230e0f6d4a..9031c27b1a9 100644
--- a/homeassistant/components/camera/canary.py
+++ b/homeassistant/components/camera/canary.py
@@ -30,7 +30,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Canary sensors."""
     data = hass.data[DATA_CANARY]
     devices = []
@@ -42,7 +42,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                     CanaryCamera(hass, data, location, device, DEFAULT_TIMEOUT,
                                  config.get(CONF_FFMPEG_ARGUMENTS)))
 
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class CanaryCamera(Camera):
diff --git a/homeassistant/components/camera/demo.py b/homeassistant/components/camera/demo.py
index 0e77e6e95ad..f950edb5c6c 100644
--- a/homeassistant/components/camera/demo.py
+++ b/homeassistant/components/camera/demo.py
@@ -12,10 +12,10 @@ from homeassistant.components.camera import Camera, SUPPORT_ON_OFF
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the Demo camera platform."""
-    async_add_devices([
+    async_add_entities([
         DemoCamera('Demo camera')
     ])
 
diff --git a/homeassistant/components/camera/doorbird.py b/homeassistant/components/camera/doorbird.py
index 6680258d95d..7af3e7634d0 100644
--- a/homeassistant/components/camera/doorbird.py
+++ b/homeassistant/components/camera/doorbird.py
@@ -28,11 +28,12 @@ _TIMEOUT = 10  # seconds
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the DoorBird camera platform."""
     for doorstation in hass.data[DOORBIRD_DOMAIN]:
         device = doorstation.device
-        async_add_devices([
+        async_add_entities([
             DoorBirdCamera(
                 device.live_image_url,
                 _CAMERA_LIVE.format(doorstation.name),
diff --git a/homeassistant/components/camera/familyhub.py b/homeassistant/components/camera/familyhub.py
index e78d341713b..f3dd8b6d0c9 100644
--- a/homeassistant/components/camera/familyhub.py
+++ b/homeassistant/components/camera/familyhub.py
@@ -27,7 +27,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the Family Hub Camera."""
     from pyfamilyhublocal import FamilyHubCam
     address = config.get(CONF_IP_ADDRESS)
@@ -36,7 +36,7 @@ async def async_setup_platform(
     session = async_get_clientsession(hass)
     family_hub_cam = FamilyHubCam(address, hass.loop, session)
 
-    async_add_devices([FamilyHubCamera(name, family_hub_cam)], True)
+    async_add_entities([FamilyHubCamera(name, family_hub_cam)], True)
 
 
 class FamilyHubCamera(Camera):
diff --git a/homeassistant/components/camera/ffmpeg.py b/homeassistant/components/camera/ffmpeg.py
index 3da0f19fbf0..c458188695a 100644
--- a/homeassistant/components/camera/ffmpeg.py
+++ b/homeassistant/components/camera/ffmpeg.py
@@ -29,12 +29,12 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up a FFmpeg camera."""
     if not hass.data[DATA_FFMPEG].async_run_test(config.get(CONF_INPUT)):
         return
-    async_add_devices([FFmpegCamera(hass, config)])
+    async_add_entities([FFmpegCamera(hass, config)])
 
 
 class FFmpegCamera(Camera):
diff --git a/homeassistant/components/camera/foscam.py b/homeassistant/components/camera/foscam.py
index 4ea733139a9..ceec57f7755 100644
--- a/homeassistant/components/camera/foscam.py
+++ b/homeassistant/components/camera/foscam.py
@@ -33,9 +33,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a Foscam IP Camera."""
-    add_devices([FoscamCam(config)])
+    add_entities([FoscamCam(config)])
 
 
 class FoscamCam(Camera):
diff --git a/homeassistant/components/camera/generic.py b/homeassistant/components/camera/generic.py
index d1b5c7214fc..b707c913435 100644
--- a/homeassistant/components/camera/generic.py
+++ b/homeassistant/components/camera/generic.py
@@ -47,9 +47,10 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up a generic IP Camera."""
-    async_add_devices([GenericCamera(hass, config)])
+    async_add_entities([GenericCamera(hass, config)])
 
 
 class GenericCamera(Camera):
diff --git a/homeassistant/components/camera/local_file.py b/homeassistant/components/camera/local_file.py
index 95eade48568..d306509b762 100644
--- a/homeassistant/components/camera/local_file.py
+++ b/homeassistant/components/camera/local_file.py
@@ -31,7 +31,7 @@ CAMERA_SERVICE_UPDATE_FILE_PATH = CAMERA_SERVICE_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Camera that works with local files."""
     file_path = config[CONF_FILE_PATH]
     camera = LocalFile(config[CONF_NAME], file_path)
@@ -48,7 +48,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         update_file_path_service,
         schema=CAMERA_SERVICE_UPDATE_FILE_PATH)
 
-    add_devices([camera])
+    add_entities([camera])
 
 
 class LocalFile(Camera):
diff --git a/homeassistant/components/camera/mjpeg.py b/homeassistant/components/camera/mjpeg.py
index 757a1b5fc09..ed7d58658ed 100644
--- a/homeassistant/components/camera/mjpeg.py
+++ b/homeassistant/components/camera/mjpeg.py
@@ -42,11 +42,12 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up a MJPEG IP Camera."""
     if discovery_info:
         config = PLATFORM_SCHEMA(discovery_info)
-    async_add_devices([MjpegCamera(hass, config)])
+    async_add_entities([MjpegCamera(hass, config)])
 
 
 def extract_image_from_mjpeg(stream):
diff --git a/homeassistant/components/camera/mqtt.py b/homeassistant/components/camera/mqtt.py
index dc991644b8e..cf5c969c650 100644
--- a/homeassistant/components/camera/mqtt.py
+++ b/homeassistant/components/camera/mqtt.py
@@ -30,12 +30,13 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the MQTT Camera."""
     if discovery_info is not None:
         config = PLATFORM_SCHEMA(discovery_info)
 
-    async_add_devices([MqttCamera(
+    async_add_entities([MqttCamera(
         config.get(CONF_NAME),
         config.get(CONF_TOPIC)
     )])
diff --git a/homeassistant/components/camera/neato.py b/homeassistant/components/camera/neato.py
index 3a8a137c1fe..b080dbbae10 100644
--- a/homeassistant/components/camera/neato.py
+++ b/homeassistant/components/camera/neato.py
@@ -18,14 +18,14 @@ DEPENDENCIES = ['neato']
 SCAN_INTERVAL = timedelta(minutes=10)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Neato Camera."""
     dev = []
     for robot in hass.data[NEATO_ROBOTS]:
         if 'maps' in robot.traits:
             dev.append(NeatoCleaningMap(hass, robot))
     _LOGGER.debug("Adding robots for cleaning maps %s", dev)
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class NeatoCleaningMap(Camera):
diff --git a/homeassistant/components/camera/nest.py b/homeassistant/components/camera/nest.py
index 3f09bc9ee1c..175dbcd2267 100644
--- a/homeassistant/components/camera/nest.py
+++ b/homeassistant/components/camera/nest.py
@@ -23,20 +23,20 @@ NEST_BRAND = 'Nest'
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({})
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a Nest Cam.
 
     No longer in use.
     """
 
 
-async def async_setup_entry(hass, entry, async_add_devices):
+async def async_setup_entry(hass, entry, async_add_entities):
     """Set up a Nest sensor based on a config entry."""
     camera_devices = \
         await hass.async_add_job(hass.data[nest.DATA_NEST].cameras)
     cameras = [NestCamera(structure, device)
                for structure, device in camera_devices]
-    async_add_devices(cameras, True)
+    async_add_entities(cameras, True)
 
 
 class NestCamera(Camera):
diff --git a/homeassistant/components/camera/netatmo.py b/homeassistant/components/camera/netatmo.py
index 1c7dc4c7ce0..93ad2cd055b 100644
--- a/homeassistant/components/camera/netatmo.py
+++ b/homeassistant/components/camera/netatmo.py
@@ -29,7 +29,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up access to Netatmo cameras."""
     netatmo = hass.components.netatmo
     home = config.get(CONF_HOME)
@@ -43,8 +43,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                 if config[CONF_CAMERAS] != [] and \
                    camera_name not in config[CONF_CAMERAS]:
                     continue
-            add_devices([NetatmoCamera(data, camera_name, home,
-                                       camera_type, verify_ssl)])
+            add_entities([NetatmoCamera(data, camera_name, home,
+                                        camera_type, verify_ssl)])
     except pyatmo.NoDevice:
         return None
 
diff --git a/homeassistant/components/camera/onvif.py b/homeassistant/components/camera/onvif.py
index 251c44c146e..9cf21dca9f9 100644
--- a/homeassistant/components/camera/onvif.py
+++ b/homeassistant/components/camera/onvif.py
@@ -71,7 +71,7 @@ SERVICE_PTZ_SCHEMA = vol.Schema({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a ONVIF camera."""
     if not hass.data[DATA_FFMPEG].async_run_test(config.get(CONF_HOST)):
         return
@@ -94,7 +94,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     hass.services.async_register(DOMAIN, SERVICE_PTZ, handle_ptz,
                                  schema=SERVICE_PTZ_SCHEMA)
-    add_devices([ONVIFHassCamera(hass, config)])
+    add_entities([ONVIFHassCamera(hass, config)])
 
 
 class ONVIFHassCamera(Camera):
diff --git a/homeassistant/components/camera/proxy.py b/homeassistant/components/camera/proxy.py
index a695848d1fa..a19efcfb1af 100644
--- a/homeassistant/components/camera/proxy.py
+++ b/homeassistant/components/camera/proxy.py
@@ -48,9 +48,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the Proxy camera platform."""
-    async_add_devices([ProxyCamera(hass, config)])
+    async_add_entities([ProxyCamera(hass, config)])
 
 
 def _resize_image(image, opts):
diff --git a/homeassistant/components/camera/push.py b/homeassistant/components/camera/push.py
index d75f59fb038..305e29d62d3 100644
--- a/homeassistant/components/camera/push.py
+++ b/homeassistant/components/camera/push.py
@@ -42,7 +42,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the Push Camera platform."""
     if PUSH_CAMERA_DATA not in hass.data:
@@ -55,7 +55,7 @@ async def async_setup_platform(hass, config, async_add_devices,
     hass.http.register_view(CameraPushReceiver(hass,
                                                config[CONF_IMAGE_FIELD]))
 
-    async_add_devices(cameras)
+    async_add_entities(cameras)
 
 
 class CameraPushReceiver(HomeAssistantView):
diff --git a/homeassistant/components/camera/ring.py b/homeassistant/components/camera/ring.py
index 96956d24eec..f629b501819 100644
--- a/homeassistant/components/camera/ring.py
+++ b/homeassistant/components/camera/ring.py
@@ -40,7 +40,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up a Ring Door Bell and StickUp Camera."""
     ring = hass.data[DATA_RING]
 
@@ -73,7 +74,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
             title=NOTIFICATION_TITLE,
             notification_id=NOTIFICATION_ID)
 
-    async_add_devices(cams, True)
+    async_add_entities(cams, True)
     return True
 
 
diff --git a/homeassistant/components/camera/rpi_camera.py b/homeassistant/components/camera/rpi_camera.py
index 91edf7d1053..ba6f5e93304 100644
--- a/homeassistant/components/camera/rpi_camera.py
+++ b/homeassistant/components/camera/rpi_camera.py
@@ -62,7 +62,7 @@ def kill_raspistill(*args):
                      stderr=subprocess.STDOUT)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Raspberry Camera."""
     if shutil.which("raspistill") is None:
         _LOGGER.error("'raspistill' was not found")
@@ -106,7 +106,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("'%s' is not a whitelisted directory", file_path)
         return False
 
-    add_devices([RaspberryCamera(setup_config)])
+    add_entities([RaspberryCamera(setup_config)])
 
 
 class RaspberryCamera(Camera):
diff --git a/homeassistant/components/camera/skybell.py b/homeassistant/components/camera/skybell.py
index be3504dab78..9a7d7a06944 100644
--- a/homeassistant/components/camera/skybell.py
+++ b/homeassistant/components/camera/skybell.py
@@ -20,7 +20,7 @@ _LOGGER = logging.getLogger(__name__)
 SCAN_INTERVAL = timedelta(seconds=90)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the platform for a Skybell device."""
     skybell = hass.data.get(SKYBELL_DOMAIN)
 
@@ -28,7 +28,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for device in skybell.get_devices():
         sensors.append(SkybellCamera(device))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class SkybellCamera(SkybellDevice, Camera):
diff --git a/homeassistant/components/camera/synology.py b/homeassistant/components/camera/synology.py
index 8bbb3e8c632..3e587fff234 100644
--- a/homeassistant/components/camera/synology.py
+++ b/homeassistant/components/camera/synology.py
@@ -39,7 +39,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up a Synology IP Camera."""
     verify_ssl = config.get(CONF_VERIFY_SSL)
     timeout = config.get(CONF_TIMEOUT)
@@ -66,7 +67,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
             device = SynologyCamera(surveillance, camera.camera_id, verify_ssl)
             devices.append(device)
 
-    async_add_devices(devices)
+    async_add_entities(devices)
 
 
 class SynologyCamera(Camera):
diff --git a/homeassistant/components/camera/usps.py b/homeassistant/components/camera/usps.py
index 6c76d0d66d8..d23359d8c57 100644
--- a/homeassistant/components/camera/usps.py
+++ b/homeassistant/components/camera/usps.py
@@ -17,13 +17,13 @@ DEPENDENCIES = ['usps']
 SCAN_INTERVAL = timedelta(seconds=10)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up USPS mail camera."""
     if discovery_info is None:
         return
 
     usps = hass.data[DATA_USPS]
-    add_devices([USPSCamera(usps)])
+    add_entities([USPSCamera(usps)])
 
 
 class USPSCamera(Camera):
diff --git a/homeassistant/components/camera/uvc.py b/homeassistant/components/camera/uvc.py
index b5306c31c84..0e65ac77c1f 100644
--- a/homeassistant/components/camera/uvc.py
+++ b/homeassistant/components/camera/uvc.py
@@ -34,7 +34,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Discover cameras on a Unifi NVR."""
     addr = config[CONF_NVR]
     key = config[CONF_KEY]
@@ -63,11 +63,11 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("Unable to connect to NVR: %s", str(ex))
         raise PlatformNotReady
 
-    add_devices([UnifiVideoCamera(nvrconn,
-                                  camera[identifier],
-                                  camera['name'],
-                                  password)
-                 for camera in cameras])
+    add_entities([UnifiVideoCamera(nvrconn,
+                                   camera[identifier],
+                                   camera['name'],
+                                   password)
+                  for camera in cameras])
     return True
 
 
diff --git a/homeassistant/components/camera/verisure.py b/homeassistant/components/camera/verisure.py
index 554f877d0bd..01e4e82f3bc 100644
--- a/homeassistant/components/camera/verisure.py
+++ b/homeassistant/components/camera/verisure.py
@@ -16,7 +16,7 @@ from homeassistant.components.verisure import CONF_SMARTCAM
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Verisure Camera."""
     if not int(hub.config.get(CONF_SMARTCAM, 1)):
         return False
@@ -30,7 +30,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         VerisureSmartcam(hass, device_label, directory_path)
         for device_label in hub.get(
             "$.customerImageCameras[*].deviceLabel")])
-    add_devices(smartcams)
+    add_entities(smartcams)
 
 
 class VerisureSmartcam(Camera):
diff --git a/homeassistant/components/camera/xeoma.py b/homeassistant/components/camera/xeoma.py
index 2a4d1526818..c268c3533e0 100644
--- a/homeassistant/components/camera/xeoma.py
+++ b/homeassistant/components/camera/xeoma.py
@@ -40,7 +40,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Discover and setup Xeoma Cameras."""
     from pyxeoma.xeoma import Xeoma, XeomaError
@@ -78,7 +78,7 @@ async def async_setup_platform(hass, config, async_add_devices,
                     camera[CONF_HIDE] = cam[CONF_HIDE]
 
         cameras = list(filter(lambda c: not c[CONF_HIDE], discovered_cameras))
-        async_add_devices(
+        async_add_entities(
             [XeomaCamera(xeoma, camera[CONF_IMAGE_NAME], camera[CONF_NAME],
                          camera[CONF_VIEWER_USERNAME],
                          camera[CONF_VIEWER_PASSWORD]) for camera in cameras])
diff --git a/homeassistant/components/camera/xiaomi.py b/homeassistant/components/camera/xiaomi.py
index e80f4b7532a..da36299a209 100644
--- a/homeassistant/components/camera/xiaomi.py
+++ b/homeassistant/components/camera/xiaomi.py
@@ -45,11 +45,11 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 async def async_setup_platform(hass,
                                config,
-                               async_add_devices,
+                               async_add_entities,
                                discovery_info=None):
     """Set up a Xiaomi Camera."""
     _LOGGER.debug('Received configuration for model %s', config[CONF_MODEL])
-    async_add_devices([XiaomiCamera(hass, config)])
+    async_add_entities([XiaomiCamera(hass, config)])
 
 
 class XiaomiCamera(Camera):
diff --git a/homeassistant/components/camera/yi.py b/homeassistant/components/camera/yi.py
index 4efc2c7d8ba..eb26c1cc887 100644
--- a/homeassistant/components/camera/yi.py
+++ b/homeassistant/components/camera/yi.py
@@ -41,9 +41,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up a Yi Camera."""
-    async_add_devices([YiCamera(hass, config)], True)
+    async_add_entities([YiCamera(hass, config)], True)
 
 
 class YiCamera(Camera):
diff --git a/homeassistant/components/camera/zoneminder.py b/homeassistant/components/camera/zoneminder.py
index be59a1c1f50..e48caa42a34 100644
--- a/homeassistant/components/camera/zoneminder.py
+++ b/homeassistant/components/camera/zoneminder.py
@@ -49,7 +49,8 @@ def _get_image_url(hass, monitor, mode):
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the ZoneMinder cameras."""
     cameras = []
     monitors = zoneminder.get_state('api/monitors.json')
@@ -77,7 +78,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         _LOGGER.warning("No active cameras found")
         return
 
-    async_add_devices(cameras)
+    async_add_entities(cameras)
 
 
 class ZoneMinderCamera(MjpegCamera):
diff --git a/homeassistant/components/climate/daikin.py b/homeassistant/components/climate/daikin.py
index 50501025f0c..6743bf034dc 100644
--- a/homeassistant/components/climate/daikin.py
+++ b/homeassistant/components/climate/daikin.py
@@ -50,7 +50,7 @@ HA_ATTR_TO_DAIKIN = {
 }
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Daikin HVAC platform."""
     if discovery_info is not None:
         host = discovery_info.get('ip')
@@ -62,7 +62,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.debug("Added Daikin AC on %s", host)
 
     api = daikin_api_setup(hass, host, name)
-    add_devices([DaikinClimate(api)], True)
+    add_entities([DaikinClimate(api)], True)
 
 
 class DaikinClimate(ClimateDevice):
diff --git a/homeassistant/components/climate/demo.py b/homeassistant/components/climate/demo.py
index 44491b8cd21..bc0b9bd52ee 100644
--- a/homeassistant/components/climate/demo.py
+++ b/homeassistant/components/climate/demo.py
@@ -17,9 +17,9 @@ from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT, ATTR_TEMPERATURE
 SUPPORT_FLAGS = SUPPORT_TARGET_HUMIDITY_LOW | SUPPORT_TARGET_HUMIDITY_HIGH
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Demo climate devices."""
-    add_devices([
+    add_entities([
         DemoClimate('HeatPump', 68, TEMP_FAHRENHEIT, None, None, 77,
                     None, None, None, None, 'heat', None, None,
                     None, True),
diff --git a/homeassistant/components/climate/ecobee.py b/homeassistant/components/climate/ecobee.py
index 71878827153..46fc5c29752 100644
--- a/homeassistant/components/climate/ecobee.py
+++ b/homeassistant/components/climate/ecobee.py
@@ -53,7 +53,7 @@ SUPPORT_FLAGS = (SUPPORT_TARGET_TEMPERATURE | SUPPORT_AWAY_MODE |
                  SUPPORT_TARGET_TEMPERATURE_LOW | SUPPORT_FAN_MODE)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Ecobee Thermostat Platform."""
     if discovery_info is None:
         return
@@ -64,7 +64,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         hold_temp)
     devices = [Thermostat(data, index, hold_temp)
                for index in range(len(data.ecobee.thermostats))]
-    add_devices(devices)
+    add_entities(devices)
 
     def fan_min_on_time_set_service(service):
         """Set the minimum fan on time on the target thermostats."""
diff --git a/homeassistant/components/climate/econet.py b/homeassistant/components/climate/econet.py
index 0591178391a..9350b8f853d 100644
--- a/homeassistant/components/climate/econet.py
+++ b/homeassistant/components/climate/econet.py
@@ -66,7 +66,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the EcoNet water heaters."""
     from pyeconet.api import PyEcoNet
 
@@ -80,7 +80,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     water_heaters = econet.get_water_heaters()
     hass_water_heaters = [
         EcoNetWaterHeater(water_heater) for water_heater in water_heaters]
-    add_devices(hass_water_heaters)
+    add_entities(hass_water_heaters)
     hass.data[ECONET_DATA]['water_heaters'].extend(hass_water_heaters)
 
     def service_handle(service):
diff --git a/homeassistant/components/climate/ephember.py b/homeassistant/components/climate/ephember.py
index f8fb3d3d522..cd410cf3be4 100644
--- a/homeassistant/components/climate/ephember.py
+++ b/homeassistant/components/climate/ephember.py
@@ -39,7 +39,7 @@ EPH_TO_HA_STATE = {
 HA_STATE_TO_EPH = {value: key for key, value in EPH_TO_HA_STATE.items()}
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the ephember thermostat."""
     from pyephember.pyephember import EphEmber
 
@@ -50,7 +50,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         ember = EphEmber(username, password)
         zones = ember.get_zones()
         for zone in zones:
-            add_devices([EphEmberThermostat(ember, zone)])
+            add_entities([EphEmberThermostat(ember, zone)])
     except RuntimeError:
         _LOGGER.error("Cannot connect to EphEmber")
         return
diff --git a/homeassistant/components/climate/eq3btsmart.py b/homeassistant/components/climate/eq3btsmart.py
index 10fd879e386..904d8222e88 100644
--- a/homeassistant/components/climate/eq3btsmart.py
+++ b/homeassistant/components/climate/eq3btsmart.py
@@ -42,7 +42,7 @@ SUPPORT_FLAGS = (SUPPORT_TARGET_TEMPERATURE | SUPPORT_OPERATION_MODE |
                  SUPPORT_AWAY_MODE)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the eQ-3 BLE thermostats."""
     devices = []
 
@@ -50,7 +50,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         mac = device_cfg[CONF_MAC]
         devices.append(EQ3BTSmartThermostat(mac, name))
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 # pylint: disable=import-error
diff --git a/homeassistant/components/climate/flexit.py b/homeassistant/components/climate/flexit.py
index 6c340e4a5f0..de74d2facb5 100644
--- a/homeassistant/components/climate/flexit.py
+++ b/homeassistant/components/climate/flexit.py
@@ -36,11 +36,11 @@ _LOGGER = logging.getLogger(__name__)
 SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE | SUPPORT_FAN_MODE
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Flexit Platform."""
     modbus_slave = config.get(CONF_SLAVE, None)
     name = config.get(CONF_NAME, None)
-    add_devices([Flexit(modbus_slave, name)], True)
+    add_entities([Flexit(modbus_slave, name)], True)
 
 
 class Flexit(ClimateDevice):
diff --git a/homeassistant/components/climate/fritzbox.py b/homeassistant/components/climate/fritzbox.py
index fa3ca31c770..3eedb89a3b7 100644
--- a/homeassistant/components/climate/fritzbox.py
+++ b/homeassistant/components/climate/fritzbox.py
@@ -35,7 +35,7 @@ ON_REPORT_SET_TEMPERATURE = 30.0
 OFF_REPORT_SET_TEMPERATURE = 0.0
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Fritzbox smarthome thermostat platform."""
     devices = []
     fritz_list = hass.data[FRITZBOX_DOMAIN]
@@ -46,7 +46,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             if device.has_thermostat:
                 devices.append(FritzboxThermostat(device, fritz))
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class FritzboxThermostat(ClimateDevice):
diff --git a/homeassistant/components/climate/generic_thermostat.py b/homeassistant/components/climate/generic_thermostat.py
index 9e5ff3bbf20..fec18329878 100644
--- a/homeassistant/components/climate/generic_thermostat.py
+++ b/homeassistant/components/climate/generic_thermostat.py
@@ -68,7 +68,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the generic thermostat platform."""
     name = config.get(CONF_NAME)
     heater_entity_id = config.get(CONF_HEATER)
@@ -84,7 +85,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     initial_operation_mode = config.get(CONF_INITIAL_OPERATION_MODE)
     away_temp = config.get(CONF_AWAY_TEMP)
 
-    async_add_devices([GenericThermostat(
+    async_add_entities([GenericThermostat(
         hass, name, heater_entity_id, sensor_entity_id, min_temp, max_temp,
         target_temp, ac_mode, min_cycle_duration, cold_tolerance,
         hot_tolerance, keep_alive, initial_operation_mode, away_temp)])
diff --git a/homeassistant/components/climate/heatmiser.py b/homeassistant/components/climate/heatmiser.py
index 116545afc15..a03d1567e01 100644
--- a/homeassistant/components/climate/heatmiser.py
+++ b/homeassistant/components/climate/heatmiser.py
@@ -34,7 +34,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the heatmiser thermostat."""
     from heatmiserV3 import heatmiser, connection
 
@@ -46,7 +46,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     serport.open()
 
     for tstat in tstats.values():
-        add_devices([
+        add_entities([
             HeatmiserV3Thermostat(
                 heatmiser, tstat.get(CONF_ID), tstat.get(CONF_NAME), serport)
             ])
diff --git a/homeassistant/components/climate/hive.py b/homeassistant/components/climate/hive.py
index eb3aecae3a1..37289d45c45 100644
--- a/homeassistant/components/climate/hive.py
+++ b/homeassistant/components/climate/hive.py
@@ -21,13 +21,13 @@ SUPPORT_FLAGS = (SUPPORT_TARGET_TEMPERATURE |
                  SUPPORT_AUX_HEAT)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Hive climate devices."""
     if discovery_info is None:
         return
     session = hass.data.get(DATA_HIVE)
 
-    add_devices([HiveClimateEntity(session, discovery_info)])
+    add_entities([HiveClimateEntity(session, discovery_info)])
 
 
 class HiveClimateEntity(ClimateDevice):
diff --git a/homeassistant/components/climate/homekit_controller.py b/homeassistant/components/climate/homekit_controller.py
index f9178c2e0d5..f720fb60277 100644
--- a/homeassistant/components/climate/homekit_controller.py
+++ b/homeassistant/components/climate/homekit_controller.py
@@ -28,11 +28,11 @@ MODE_HOMEKIT_TO_HASS = {
 MODE_HASS_TO_HOMEKIT = {v: k for k, v in MODE_HOMEKIT_TO_HASS.items()}
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Homekit climate."""
     if discovery_info is not None:
         accessory = hass.data[KNOWN_ACCESSORIES][discovery_info['serial']]
-        add_devices([HomeKitClimateDevice(accessory, discovery_info)], True)
+        add_entities([HomeKitClimateDevice(accessory, discovery_info)], True)
 
 
 class HomeKitClimateDevice(HomeKitEntity, ClimateDevice):
diff --git a/homeassistant/components/climate/homematic.py b/homeassistant/components/climate/homematic.py
index dd773bcd993..5b741a87b45 100644
--- a/homeassistant/components/climate/homematic.py
+++ b/homeassistant/components/climate/homematic.py
@@ -46,7 +46,7 @@ HM_IP_CONTROL_MODE = 'SET_POINT_MODE'
 SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE | SUPPORT_OPERATION_MODE
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Homematic thermostat platform."""
     if discovery_info is None:
         return
@@ -56,7 +56,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         new_device = HMThermostat(conf)
         devices.append(new_device)
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class HMThermostat(HMDevice, ClimateDevice):
diff --git a/homeassistant/components/climate/homematicip_cloud.py b/homeassistant/components/climate/homematicip_cloud.py
index 6b47096df1b..966cd95ade1 100644
--- a/homeassistant/components/climate/homematicip_cloud.py
+++ b/homeassistant/components/climate/homematicip_cloud.py
@@ -27,12 +27,12 @@ HMIP_STATE_TO_HA = {value: key for key, value in HA_STATE_TO_HMIP.items()}
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the HomematicIP Cloud climate devices."""
     pass
 
 
-async def async_setup_entry(hass, config_entry, async_add_devices):
+async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the HomematicIP climate from a config entry."""
     from homematicip.group import HeatingGroup
 
@@ -43,7 +43,7 @@ async def async_setup_entry(hass, config_entry, async_add_devices):
             devices.append(HomematicipHeatingGroup(home, device))
 
     if devices:
-        async_add_devices(devices)
+        async_add_entities(devices)
 
 
 class HomematicipHeatingGroup(HomematicipGenericDevice, ClimateDevice):
diff --git a/homeassistant/components/climate/honeywell.py b/homeassistant/components/climate/honeywell.py
index 04d705d6b49..6d54695fa7a 100644
--- a/homeassistant/components/climate/honeywell.py
+++ b/homeassistant/components/climate/honeywell.py
@@ -51,19 +51,19 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Honeywell thermostat."""
     username = config.get(CONF_USERNAME)
     password = config.get(CONF_PASSWORD)
     region = config.get(CONF_REGION)
 
     if region == 'us':
-        return _setup_us(username, password, config, add_devices)
+        return _setup_us(username, password, config, add_entities)
 
-    return _setup_round(username, password, config, add_devices)
+    return _setup_round(username, password, config, add_entities)
 
 
-def _setup_round(username, password, config, add_devices):
+def _setup_round(username, password, config, add_entities):
     """Set up the rounding function."""
     from evohomeclient import EvohomeClient
 
@@ -73,7 +73,7 @@ def _setup_round(username, password, config, add_devices):
     try:
         zones = evo_api.temperatures(force_refresh=True)
         for i, zone in enumerate(zones):
-            add_devices(
+            add_entities(
                 [RoundThermostat(evo_api, zone['id'], i == 0, away_temp)],
                 True
             )
@@ -85,7 +85,7 @@ def _setup_round(username, password, config, add_devices):
 
 
 # config will be used later
-def _setup_us(username, password, config, add_devices):
+def _setup_us(username, password, config, add_entities):
     """Set up the user."""
     import somecomfort
 
@@ -103,12 +103,12 @@ def _setup_us(username, password, config, add_devices):
     cool_away_temp = config.get(CONF_COOL_AWAY_TEMPERATURE)
     heat_away_temp = config.get(CONF_HEAT_AWAY_TEMPERATURE)
 
-    add_devices([HoneywellUSThermostat(client, device, cool_away_temp,
-                                       heat_away_temp, username, password)
-                 for location in client.locations_by_id.values()
-                 for device in location.devices_by_id.values()
-                 if ((not loc_id or location.locationid == loc_id) and
-                     (not dev_id or device.deviceid == dev_id))])
+    add_entities([HoneywellUSThermostat(client, device, cool_away_temp,
+                                        heat_away_temp, username, password)
+                  for location in client.locations_by_id.values()
+                  for device in location.devices_by_id.values()
+                  if ((not loc_id or location.locationid == loc_id) and
+                      (not dev_id or device.deviceid == dev_id))])
     return True
 
 
diff --git a/homeassistant/components/climate/knx.py b/homeassistant/components/climate/knx.py
index a9d26288433..ed197f57ab3 100644
--- a/homeassistant/components/climate/knx.py
+++ b/homeassistant/components/climate/knx.py
@@ -60,27 +60,27 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up climate(s) for KNX platform."""
     if discovery_info is not None:
-        async_add_devices_discovery(hass, discovery_info, async_add_devices)
+        async_add_entities_discovery(hass, discovery_info, async_add_entities)
     else:
-        async_add_devices_config(hass, config, async_add_devices)
+        async_add_entities_config(hass, config, async_add_entities)
 
 
 @callback
-def async_add_devices_discovery(hass, discovery_info, async_add_devices):
+def async_add_entities_discovery(hass, discovery_info, async_add_entities):
     """Set up climates for KNX platform configured within platform."""
     entities = []
     for device_name in discovery_info[ATTR_DISCOVER_DEVICES]:
         device = hass.data[DATA_KNX].xknx.devices[device_name]
         entities.append(KNXClimate(hass, device))
-    async_add_devices(entities)
+    async_add_entities(entities)
 
 
 @callback
-def async_add_devices_config(hass, config, async_add_devices):
+def async_add_entities_config(hass, config, async_add_entities):
     """Set up climate for KNX platform configured within platform."""
     import xknx
 
@@ -110,7 +110,7 @@ def async_add_devices_config(hass, config, async_add_devices):
         group_address_operation_mode_comfort=config.get(
             CONF_OPERATION_MODE_COMFORT_ADDRESS))
     hass.data[DATA_KNX].xknx.devices.add(climate)
-    async_add_devices([KNXClimate(hass, climate)])
+    async_add_entities([KNXClimate(hass, climate)])
 
 
 class KNXClimate(ClimateDevice):
diff --git a/homeassistant/components/climate/maxcube.py b/homeassistant/components/climate/maxcube.py
index 204d5a3649c..328cdabde62 100644
--- a/homeassistant/components/climate/maxcube.py
+++ b/homeassistant/components/climate/maxcube.py
@@ -22,7 +22,7 @@ STATE_VACATION = 'vacation'
 SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE | SUPPORT_OPERATION_MODE
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Iterate through all MAX! Devices and add thermostats."""
     devices = []
     for handler in hass.data[DATA_KEY].values():
@@ -36,7 +36,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                     MaxCubeClimate(handler, name, device.rf_address))
 
     if devices:
-        add_devices(devices)
+        add_entities(devices)
 
 
 class MaxCubeClimate(ClimateDevice):
diff --git a/homeassistant/components/climate/melissa.py b/homeassistant/components/climate/melissa.py
index a4a8c76a39f..c8e67c14835 100644
--- a/homeassistant/components/climate/melissa.py
+++ b/homeassistant/components/climate/melissa.py
@@ -34,7 +34,7 @@ FAN_MODES = [
 ]
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Iterate through and add all Melissa devices."""
     api = hass.data[DATA_MELISSA]
     devices = api.fetch_devices().values()
@@ -46,7 +46,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             all_devices.append(MelissaClimate(
                 api, device['serial_number'], device))
 
-    add_devices(all_devices)
+    add_entities(all_devices)
 
 
 class MelissaClimate(ClimateDevice):
diff --git a/homeassistant/components/climate/modbus.py b/homeassistant/components/climate/modbus.py
index e567340efc9..1c5c03e4502 100644
--- a/homeassistant/components/climate/modbus.py
+++ b/homeassistant/components/climate/modbus.py
@@ -50,7 +50,7 @@ _LOGGER = logging.getLogger(__name__)
 SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Modbus Thermostat Platform."""
     name = config.get(CONF_NAME)
     modbus_slave = config.get(CONF_SLAVE)
@@ -60,9 +60,9 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     count = config.get(CONF_COUNT)
     precision = config.get(CONF_PRECISION)
 
-    add_devices([ModbusThermostat(name, modbus_slave,
-                                  target_temp_register, current_temp_register,
-                                  data_type, count, precision)], True)
+    add_entities([ModbusThermostat(name, modbus_slave,
+                                   target_temp_register, current_temp_register,
+                                   data_type, count, precision)], True)
 
 
 class ModbusThermostat(ClimateDevice):
diff --git a/homeassistant/components/climate/mqtt.py b/homeassistant/components/climate/mqtt.py
index 1426ff31af9..9e227e002b5 100644
--- a/homeassistant/components/climate/mqtt.py
+++ b/homeassistant/components/climate/mqtt.py
@@ -127,7 +127,8 @@ PLATFORM_SCHEMA = SCHEMA_BASE.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the MQTT climate devices."""
     if discovery_info is not None:
         config = PLATFORM_SCHEMA(discovery_info)
@@ -152,7 +153,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         value_templates[key] = config.get(key)
         value_templates[key].hass = hass
 
-    async_add_devices([
+    async_add_entities([
         MqttClimate(
             hass,
             config.get(CONF_NAME),
diff --git a/homeassistant/components/climate/mysensors.py b/homeassistant/components/climate/mysensors.py
index a2043c2434b..66c634d8cd9 100644
--- a/homeassistant/components/climate/mysensors.py
+++ b/homeassistant/components/climate/mysensors.py
@@ -31,11 +31,11 @@ OPERATION_LIST = [STATE_OFF, STATE_AUTO, STATE_COOL, STATE_HEAT]
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the mysensors climate."""
     mysensors.setup_mysensors_platform(
         hass, DOMAIN, discovery_info, MySensorsHVAC,
-        async_add_devices=async_add_devices)
+        async_add_entities=async_add_entities)
 
 
 class MySensorsHVAC(mysensors.device.MySensorsEntity, ClimateDevice):
diff --git a/homeassistant/components/climate/nest.py b/homeassistant/components/climate/nest.py
index 04c598cbddb..81c5fb3c2aa 100644
--- a/homeassistant/components/climate/nest.py
+++ b/homeassistant/components/climate/nest.py
@@ -31,14 +31,14 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 NEST_MODE_HEAT_COOL = 'heat-cool'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Nest thermostat.
 
     No longer in use.
     """
 
 
-async def async_setup_entry(hass, entry, async_add_devices):
+async def async_setup_entry(hass, entry, async_add_entities):
     """Set up the Nest climate device based on a config entry."""
     temp_unit = hass.config.units.temperature_unit
 
@@ -47,7 +47,7 @@ async def async_setup_entry(hass, entry, async_add_devices):
     all_devices = [NestThermostat(structure, device, temp_unit)
                    for structure, device in thermostats]
 
-    async_add_devices(all_devices, True)
+    async_add_entities(all_devices, True)
 
 
 class NestThermostat(ClimateDevice):
diff --git a/homeassistant/components/climate/netatmo.py b/homeassistant/components/climate/netatmo.py
index b4bed367878..8849ada5ccc 100644
--- a/homeassistant/components/climate/netatmo.py
+++ b/homeassistant/components/climate/netatmo.py
@@ -39,7 +39,7 @@ SUPPORT_FLAGS = (SUPPORT_TARGET_TEMPERATURE | SUPPORT_OPERATION_MODE |
                  SUPPORT_AWAY_MODE)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the NetAtmo Thermostat."""
     netatmo = hass.components.netatmo
     device = config.get(CONF_RELAY)
@@ -52,7 +52,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                 if config[CONF_THERMOSTAT] != [] and \
                    module_name not in config[CONF_THERMOSTAT]:
                     continue
-            add_devices([NetatmoThermostat(data, module_name)], True)
+            add_entities([NetatmoThermostat(data, module_name)], True)
     except pyatmo.NoDevice:
         return None
 
diff --git a/homeassistant/components/climate/nuheat.py b/homeassistant/components/climate/nuheat.py
index 39c66ff94f2..d0bfe5add58 100644
--- a/homeassistant/components/climate/nuheat.py
+++ b/homeassistant/components/climate/nuheat.py
@@ -56,7 +56,7 @@ SUPPORT_FLAGS = (SUPPORT_TARGET_TEMPERATURE | SUPPORT_HOLD_MODE |
                  SUPPORT_OPERATION_MODE)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the NuHeat thermostat(s)."""
     if discovery_info is None:
         return
@@ -67,7 +67,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         NuHeatThermostat(api, serial_number, temperature_unit)
         for serial_number in serial_numbers
     ]
-    add_devices(thermostats, True)
+    add_entities(thermostats, True)
 
     def resume_program_set_service(service):
         """Resume the program on the target thermostats."""
diff --git a/homeassistant/components/climate/oem.py b/homeassistant/components/climate/oem.py
index 59f8db03318..e006242331c 100644
--- a/homeassistant/components/climate/oem.py
+++ b/homeassistant/components/climate/oem.py
@@ -38,7 +38,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE | SUPPORT_AWAY_MODE
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the oemthermostat platform."""
     from oemthermostat import Thermostat
 
@@ -55,7 +55,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     except (ValueError, AssertionError, requests.RequestException):
         return False
 
-    add_devices((ThermostatDevice(hass, therm, name, away_temp), ), True)
+    add_entities((ThermostatDevice(hass, therm, name, away_temp), ), True)
 
 
 class ThermostatDevice(ClimateDevice):
diff --git a/homeassistant/components/climate/proliphix.py b/homeassistant/components/climate/proliphix.py
index 9338c219fe5..76160a28c6e 100644
--- a/homeassistant/components/climate/proliphix.py
+++ b/homeassistant/components/climate/proliphix.py
@@ -24,7 +24,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Proliphix thermostats."""
     username = config.get(CONF_USERNAME)
     password = config.get(CONF_PASSWORD)
@@ -34,7 +34,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     pdp = proliphix.PDP(host, username, password)
 
-    add_devices([ProliphixThermostat(pdp)])
+    add_entities([ProliphixThermostat(pdp)])
 
 
 class ProliphixThermostat(ClimateDevice):
diff --git a/homeassistant/components/climate/radiotherm.py b/homeassistant/components/climate/radiotherm.py
index d158eb52a9d..3d1d8e6a53e 100644
--- a/homeassistant/components/climate/radiotherm.py
+++ b/homeassistant/components/climate/radiotherm.py
@@ -83,7 +83,7 @@ SUPPORT_FLAGS = (SUPPORT_TARGET_TEMPERATURE | SUPPORT_OPERATION_MODE |
                  SUPPORT_FAN_MODE | SUPPORT_AWAY_MODE)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Radio Thermostat."""
     import radiotherm
 
@@ -112,7 +112,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             _LOGGER.exception("Unable to connect to Radio Thermostat: %s",
                               host)
 
-    add_devices(tstats, True)
+    add_entities(tstats, True)
 
 
 class RadioThermostat(ClimateDevice):
diff --git a/homeassistant/components/climate/sensibo.py b/homeassistant/components/climate/sensibo.py
index a2c4ea0ba99..ef33ee8495e 100644
--- a/homeassistant/components/climate/sensibo.py
+++ b/homeassistant/components/climate/sensibo.py
@@ -59,7 +59,8 @@ FIELD_TO_FLAG = {
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up Sensibo devices."""
     import pysensibo
 
@@ -79,7 +80,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         raise PlatformNotReady
 
     if devices:
-        async_add_devices(devices)
+        async_add_entities(devices)
 
         @asyncio.coroutine
         def async_assume_state(service):
diff --git a/homeassistant/components/climate/spider.py b/homeassistant/components/climate/spider.py
index a6916b22a25..a9d966bd499 100644
--- a/homeassistant/components/climate/spider.py
+++ b/homeassistant/components/climate/spider.py
@@ -31,14 +31,14 @@ SPIDER_STATE_TO_HA = {value: key for key, value in HA_STATE_TO_SPIDER.items()}
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Spider thermostat."""
     if discovery_info is None:
         return
 
     devices = [SpiderThermostat(hass.data[SPIDER_DOMAIN]['controller'], device)
                for device in hass.data[SPIDER_DOMAIN]['thermostats']]
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class SpiderThermostat(ClimateDevice):
diff --git a/homeassistant/components/climate/tado.py b/homeassistant/components/climate/tado.py
index b3734e020e0..1e52c163624 100644
--- a/homeassistant/components/climate/tado.py
+++ b/homeassistant/components/climate/tado.py
@@ -48,7 +48,7 @@ OPERATION_LIST = {
 SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE | SUPPORT_OPERATION_MODE
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Tado climate platform."""
     tado = hass.data[DATA_TADO]
 
@@ -67,7 +67,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         climate_devices.append(device)
 
     if climate_devices:
-        add_devices(climate_devices, True)
+        add_entities(climate_devices, True)
 
 
 def create_climate_device(tado, hass, zone, name, zone_id):
diff --git a/homeassistant/components/climate/tesla.py b/homeassistant/components/climate/tesla.py
index 225c13d975d..ef5f2227c11 100644
--- a/homeassistant/components/climate/tesla.py
+++ b/homeassistant/components/climate/tesla.py
@@ -23,11 +23,11 @@ OPERATION_LIST = [STATE_ON, STATE_OFF]
 SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE | SUPPORT_OPERATION_MODE
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Tesla climate platform."""
     devices = [TeslaThermostat(device, hass.data[TESLA_DOMAIN]['controller'])
                for device in hass.data[TESLA_DOMAIN]['devices']['climate']]
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class TeslaThermostat(TeslaDevice, ClimateDevice):
diff --git a/homeassistant/components/climate/toon.py b/homeassistant/components/climate/toon.py
index 330801fc231..e759e922ee1 100644
--- a/homeassistant/components/climate/toon.py
+++ b/homeassistant/components/climate/toon.py
@@ -16,9 +16,9 @@ from homeassistant.const import TEMP_CELSIUS
 SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE | SUPPORT_OPERATION_MODE
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Toon climate device."""
-    add_devices([ThermostatDevice(hass)], True)
+    add_entities([ThermostatDevice(hass)], True)
 
 
 class ThermostatDevice(ClimateDevice):
diff --git a/homeassistant/components/climate/touchline.py b/homeassistant/components/climate/touchline.py
index f9c5676629b..641f6e9a1d8 100644
--- a/homeassistant/components/climate/touchline.py
+++ b/homeassistant/components/climate/touchline.py
@@ -24,7 +24,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Touchline devices."""
     from pytouchline import PyTouchline
     host = config[CONF_HOST]
@@ -33,7 +33,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     devices = []
     for device_id in range(0, number_of_devices):
         devices.append(Touchline(PyTouchline(device_id)))
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class Touchline(ClimateDevice):
diff --git a/homeassistant/components/climate/tuya.py b/homeassistant/components/climate/tuya.py
index 19267d693a0..2da46fee15d 100644
--- a/homeassistant/components/climate/tuya.py
+++ b/homeassistant/components/climate/tuya.py
@@ -37,7 +37,7 @@ TUYA_STATE_TO_HA = {value: key for key, value in HA_STATE_TO_TUYA.items()}
 FAN_MODES = {SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH}
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Tuya Climate devices."""
     if discovery_info is None:
         return
@@ -49,7 +49,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         if device is None:
             continue
         devices.append(TuyaClimateDevice(device))
-    add_devices(devices)
+    add_entities(devices)
 
 
 class TuyaClimateDevice(TuyaDevice, ClimateDevice):
diff --git a/homeassistant/components/climate/venstar.py b/homeassistant/components/climate/venstar.py
index 4bacf64cf9e..16c0b206154 100644
--- a/homeassistant/components/climate/venstar.py
+++ b/homeassistant/components/climate/venstar.py
@@ -50,7 +50,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Venstar thermostat."""
     import venstarcolortouch
 
@@ -69,7 +69,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         addr=host, timeout=timeout, user=username, password=password,
         proto=proto)
 
-    add_devices([VenstarThermostat(client, humidifier)], True)
+    add_entities([VenstarThermostat(client, humidifier)], True)
 
 
 class VenstarThermostat(ClimateDevice):
diff --git a/homeassistant/components/climate/vera.py b/homeassistant/components/climate/vera.py
index 0f89b15e5a1..e97bd6cd8ad 100644
--- a/homeassistant/components/climate/vera.py
+++ b/homeassistant/components/climate/vera.py
@@ -29,9 +29,9 @@ SUPPORT_FLAGS = (SUPPORT_TARGET_TEMPERATURE | SUPPORT_OPERATION_MODE |
                  SUPPORT_FAN_MODE)
 
 
-def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+def setup_platform(hass, config, add_entities_callback, discovery_info=None):
     """Set up of Vera thermostats."""
-    add_devices_callback(
+    add_entities_callback(
         [VeraThermostat(device, hass.data[VERA_CONTROLLER]) for
          device in hass.data[VERA_DEVICES]['climate']], True)
 
diff --git a/homeassistant/components/climate/wink.py b/homeassistant/components/climate/wink.py
index 15e555db8b9..d8e6843bec8 100644
--- a/homeassistant/components/climate/wink.py
+++ b/homeassistant/components/climate/wink.py
@@ -67,21 +67,21 @@ SUPPORT_FLAGS_HEATER = (SUPPORT_TARGET_TEMPERATURE | SUPPORT_OPERATION_MODE |
                         SUPPORT_AWAY_MODE)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Wink climate devices."""
     import pywink
     for climate in pywink.get_thermostats():
         _id = climate.object_id() + climate.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkThermostat(climate, hass)])
+            add_entities([WinkThermostat(climate, hass)])
     for climate in pywink.get_air_conditioners():
         _id = climate.object_id() + climate.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkAC(climate, hass)])
+            add_entities([WinkAC(climate, hass)])
     for water_heater in pywink.get_water_heaters():
         _id = water_heater.object_id() + water_heater.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkWaterHeater(water_heater, hass)])
+            add_entities([WinkWaterHeater(water_heater, hass)])
 
 
 class WinkThermostat(WinkDevice, ClimateDevice):
diff --git a/homeassistant/components/climate/zhong_hong.py b/homeassistant/components/climate/zhong_hong.py
index 2b66af35224..46d590a9412 100644
--- a/homeassistant/components/climate/zhong_hong.py
+++ b/homeassistant/components/climate/zhong_hong.py
@@ -36,7 +36,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the ZhongHong HVAC platform."""
     from zhong_hong_hvac.hub import ZhongHongGateway
     host = config.get(CONF_HOST)
@@ -69,7 +69,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     async_dispatcher_connect(hass, SIGNAL_DEVICE_ADDED, startup)
 
     # add devices after SIGNAL_DEVICE_SETTED_UP event is listend
-    add_devices(devices)
+    add_entities(devices)
 
     def stop_listen(event):
         """Stop ZhongHongHub socket."""
diff --git a/homeassistant/components/cover/abode.py b/homeassistant/components/cover/abode.py
index 6eb0369aa3f..3ba3fb118f3 100644
--- a/homeassistant/components/cover/abode.py
+++ b/homeassistant/components/cover/abode.py
@@ -15,7 +15,7 @@ DEPENDENCIES = ['abode']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Abode cover devices."""
     import abodepy.helpers.constants as CONST
 
@@ -30,7 +30,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     data.devices.extend(devices)
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class AbodeCover(AbodeDevice, CoverDevice):
diff --git a/homeassistant/components/cover/aladdin_connect.py b/homeassistant/components/cover/aladdin_connect.py
index ef1f94d1bcd..4627ba77781 100644
--- a/homeassistant/components/cover/aladdin_connect.py
+++ b/homeassistant/components/cover/aladdin_connect.py
@@ -36,7 +36,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Aladdin Connect platform."""
     from aladdin_connect import AladdinConnectClient
 
@@ -47,7 +47,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     try:
         if not acc.login():
             raise ValueError("Username or Password is incorrect")
-        add_devices(AladdinDevice(acc, door) for door in acc.get_doors())
+        add_entities(AladdinDevice(acc, door) for door in acc.get_doors())
     except (TypeError, KeyError, NameError, ValueError) as ex:
         _LOGGER.error("%s", ex)
         hass.components.persistent_notification.create(
diff --git a/homeassistant/components/cover/brunt.py b/homeassistant/components/cover/brunt.py
index bd27ea30637..746f3840a01 100644
--- a/homeassistant/components/cover/brunt.py
+++ b/homeassistant/components/cover/brunt.py
@@ -39,7 +39,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the brunt platform."""
     # pylint: disable=no-name-in-module
     from brunt import BruntAPI
@@ -52,7 +52,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         if not things:
             _LOGGER.error("No things present in account.")
         else:
-            add_devices([BruntDevice(
+            add_entities([BruntDevice(
                 bapi, thing['NAME'],
                 thing['thingUri']) for thing in things], True)
     except (TypeError, KeyError, NameError, ValueError) as ex:
diff --git a/homeassistant/components/cover/command_line.py b/homeassistant/components/cover/command_line.py
index 6d43b1d2166..bebf78b1db6 100644
--- a/homeassistant/components/cover/command_line.py
+++ b/homeassistant/components/cover/command_line.py
@@ -31,7 +31,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up cover controlled by shell commands."""
     devices = config.get(CONF_COVERS, {})
     covers = []
@@ -57,7 +57,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("No covers added")
         return False
 
-    add_devices(covers)
+    add_entities(covers)
 
 
 class CommandCover(CoverDevice):
diff --git a/homeassistant/components/cover/demo.py b/homeassistant/components/cover/demo.py
index b81ac4e45e1..21add0a6c62 100644
--- a/homeassistant/components/cover/demo.py
+++ b/homeassistant/components/cover/demo.py
@@ -10,9 +10,9 @@ from homeassistant.components.cover import (
 from homeassistant.helpers.event import track_utc_time_change
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Demo covers."""
-    add_devices([
+    add_entities([
         DemoCover(hass, 'Kitchen Window'),
         DemoCover(hass, 'Hall Window', 10),
         DemoCover(hass, 'Living Room Window', 70, 50),
diff --git a/homeassistant/components/cover/garadget.py b/homeassistant/components/cover/garadget.py
index 70f69568109..7a04aa4c71a 100644
--- a/homeassistant/components/cover/garadget.py
+++ b/homeassistant/components/cover/garadget.py
@@ -51,7 +51,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Garadget covers."""
     covers = []
     devices = config.get(CONF_COVERS)
@@ -67,7 +67,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
         covers.append(GaradgetCover(hass, args))
 
-    add_devices(covers)
+    add_entities(covers)
 
 
 class GaradgetCover(CoverDevice):
diff --git a/homeassistant/components/cover/gogogate2.py b/homeassistant/components/cover/gogogate2.py
index 2b91591e71b..accc4f9ec98 100644
--- a/homeassistant/components/cover/gogogate2.py
+++ b/homeassistant/components/cover/gogogate2.py
@@ -32,7 +32,7 @@ COVER_SCHEMA = vol.Schema({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Gogogate2 component."""
     from pygogogate2 import Gogogate2API as pygogogate2
 
@@ -49,7 +49,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             raise ValueError(
                 "Username or Password is incorrect or no devices found")
 
-        add_devices(MyGogogate2Device(
+        add_entities(MyGogogate2Device(
             mygogogate2, door, name) for door in devices)
 
     except (TypeError, KeyError, NameError, ValueError) as ex:
diff --git a/homeassistant/components/cover/group.py b/homeassistant/components/cover/group.py
index c1ea33a9cc7..0424c900747 100644
--- a/homeassistant/components/cover/group.py
+++ b/homeassistant/components/cover/group.py
@@ -39,10 +39,10 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the Group Cover platform."""
-    async_add_devices(
+    async_add_entities(
         [CoverGroup(config[CONF_NAME], config[CONF_ENTITIES])])
 
 
diff --git a/homeassistant/components/cover/homematic.py b/homeassistant/components/cover/homematic.py
index 9975b426558..93574321203 100644
--- a/homeassistant/components/cover/homematic.py
+++ b/homeassistant/components/cover/homematic.py
@@ -16,7 +16,7 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['homematic']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the platform."""
     if discovery_info is None:
         return
@@ -26,7 +26,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         new_device = HMCover(conf)
         devices.append(new_device)
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class HMCover(HMDevice, CoverDevice):
diff --git a/homeassistant/components/cover/isy994.py b/homeassistant/components/cover/isy994.py
index 0ccfe267989..428c1f326e4 100644
--- a/homeassistant/components/cover/isy994.py
+++ b/homeassistant/components/cover/isy994.py
@@ -26,7 +26,7 @@ VALUE_TO_STATE = {
 
 
 def setup_platform(hass, config: ConfigType,
-                   add_devices: Callable[[list], None], discovery_info=None):
+                   add_entities: Callable[[list], None], discovery_info=None):
     """Set up the ISY994 cover platform."""
     devices = []
     for node in hass.data[ISY994_NODES][DOMAIN]:
@@ -35,7 +35,7 @@ def setup_platform(hass, config: ConfigType,
     for name, status, actions in hass.data[ISY994_PROGRAMS][DOMAIN]:
         devices.append(ISYCoverProgram(name, status, actions))
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class ISYCoverDevice(ISYDevice, CoverDevice):
diff --git a/homeassistant/components/cover/knx.py b/homeassistant/components/cover/knx.py
index 59195d73a2f..74ac80a476d 100644
--- a/homeassistant/components/cover/knx.py
+++ b/homeassistant/components/cover/knx.py
@@ -49,27 +49,27 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up cover(s) for KNX platform."""
     if discovery_info is not None:
-        async_add_devices_discovery(hass, discovery_info, async_add_devices)
+        async_add_entities_discovery(hass, discovery_info, async_add_entities)
     else:
-        async_add_devices_config(hass, config, async_add_devices)
+        async_add_entities_config(hass, config, async_add_entities)
 
 
 @callback
-def async_add_devices_discovery(hass, discovery_info, async_add_devices):
+def async_add_entities_discovery(hass, discovery_info, async_add_entities):
     """Set up covers for KNX platform configured via xknx.yaml."""
     entities = []
     for device_name in discovery_info[ATTR_DISCOVER_DEVICES]:
         device = hass.data[DATA_KNX].xknx.devices[device_name]
         entities.append(KNXCover(hass, device))
-    async_add_devices(entities)
+    async_add_entities(entities)
 
 
 @callback
-def async_add_devices_config(hass, config, async_add_devices):
+def async_add_entities_config(hass, config, async_add_entities):
     """Set up cover for KNX platform configured within platform."""
     import xknx
     cover = xknx.devices.Cover(
@@ -88,7 +88,7 @@ def async_add_devices_config(hass, config, async_add_devices):
         invert_angle=config.get(CONF_INVERT_ANGLE))
 
     hass.data[DATA_KNX].xknx.devices.add(cover)
-    async_add_devices([KNXCover(hass, cover)])
+    async_add_entities([KNXCover(hass, cover)])
 
 
 class KNXCover(CoverDevice):
diff --git a/homeassistant/components/cover/lutron.py b/homeassistant/components/cover/lutron.py
index 599bdb1ceba..7ea7abf882d 100644
--- a/homeassistant/components/cover/lutron.py
+++ b/homeassistant/components/cover/lutron.py
@@ -17,14 +17,14 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['lutron']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Lutron shades."""
     devs = []
     for (area_name, device) in hass.data[LUTRON_DEVICES]['cover']:
         dev = LutronCover(area_name, device, hass.data[LUTRON_CONTROLLER])
         devs.append(dev)
 
-    add_devices(devs, True)
+    add_entities(devs, True)
     return True
 
 
diff --git a/homeassistant/components/cover/lutron_caseta.py b/homeassistant/components/cover/lutron_caseta.py
index 87821b802ba..37b7c1be42c 100644
--- a/homeassistant/components/cover/lutron_caseta.py
+++ b/homeassistant/components/cover/lutron_caseta.py
@@ -17,7 +17,7 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['lutron_caseta']
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the Lutron Caseta shades as a cover device."""
     devs = []
@@ -27,7 +27,7 @@ async def async_setup_platform(hass, config, async_add_devices,
         dev = LutronCasetaCover(cover_device, bridge)
         devs.append(dev)
 
-    async_add_devices(devs, True)
+    async_add_entities(devs, True)
 
 
 class LutronCasetaCover(LutronCasetaDevice, CoverDevice):
diff --git a/homeassistant/components/cover/mqtt.py b/homeassistant/components/cover/mqtt.py
index e1775e2f968..977353cb318 100644
--- a/homeassistant/components/cover/mqtt.py
+++ b/homeassistant/components/cover/mqtt.py
@@ -92,7 +92,7 @@ PLATFORM_SCHEMA = mqtt.MQTT_BASE_PLATFORM_SCHEMA.extend({
 }).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the MQTT Cover."""
     if discovery_info is not None:
@@ -105,7 +105,7 @@ async def async_setup_platform(hass, config, async_add_devices,
     if set_position_template is not None:
         set_position_template.hass = hass
 
-    async_add_devices([MqttCover(
+    async_add_entities([MqttCover(
         config.get(CONF_NAME),
         config.get(CONF_STATE_TOPIC),
         config.get(CONF_COMMAND_TOPIC),
diff --git a/homeassistant/components/cover/myq.py b/homeassistant/components/cover/myq.py
index a4682172fee..bedc041fccc 100644
--- a/homeassistant/components/cover/myq.py
+++ b/homeassistant/components/cover/myq.py
@@ -29,7 +29,7 @@ COVER_SCHEMA = vol.Schema({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the MyQ component."""
     from pymyq import MyQAPI as pymyq
 
@@ -45,7 +45,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         if not myq.is_login_valid():
             raise ValueError("Username or Password is incorrect")
 
-        add_devices(MyQDevice(myq, door) for door in myq.get_garage_doors())
+        add_entities(MyQDevice(myq, door) for door in myq.get_garage_doors())
         return True
 
     except (TypeError, KeyError, NameError, ValueError) as ex:
diff --git a/homeassistant/components/cover/mysensors.py b/homeassistant/components/cover/mysensors.py
index c815cf44df2..60ff7aeef1d 100644
--- a/homeassistant/components/cover/mysensors.py
+++ b/homeassistant/components/cover/mysensors.py
@@ -10,11 +10,11 @@ from homeassistant.const import STATE_OFF, STATE_ON
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the mysensors platform for covers."""
     mysensors.setup_mysensors_platform(
         hass, DOMAIN, discovery_info, MySensorsCover,
-        async_add_devices=async_add_devices)
+        async_add_entities=async_add_entities)
 
 
 class MySensorsCover(mysensors.device.MySensorsEntity, CoverDevice):
diff --git a/homeassistant/components/cover/opengarage.py b/homeassistant/components/cover/opengarage.py
index fe6c7763cc7..19a87c5bf7c 100644
--- a/homeassistant/components/cover/opengarage.py
+++ b/homeassistant/components/cover/opengarage.py
@@ -50,7 +50,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the OpenGarage covers."""
     covers = []
     devices = config.get(CONF_COVERS)
@@ -66,7 +66,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
         covers.append(OpenGarageCover(hass, args))
 
-    add_devices(covers, True)
+    add_entities(covers, True)
 
 
 class OpenGarageCover(CoverDevice):
diff --git a/homeassistant/components/cover/rflink.py b/homeassistant/components/cover/rflink.py
index 3357bf2d204..e50fa488b92 100644
--- a/homeassistant/components/cover/rflink.py
+++ b/homeassistant/components/cover/rflink.py
@@ -78,10 +78,10 @@ def devices_from_config(domain_config, hass=None):
     return devices
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the Rflink cover platform."""
-    async_add_devices(devices_from_config(config, hass))
+    async_add_entities(devices_from_config(config, hass))
 
 
 class RflinkCover(RflinkCommand, CoverDevice):
diff --git a/homeassistant/components/cover/rfxtrx.py b/homeassistant/components/cover/rfxtrx.py
index 5079a3b60c2..d486b601977 100644
--- a/homeassistant/components/cover/rfxtrx.py
+++ b/homeassistant/components/cover/rfxtrx.py
@@ -29,12 +29,12 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the RFXtrx cover."""
     import RFXtrx as rfxtrxmod
 
     covers = rfxtrx.get_devices_from_config(config, RfxtrxCover)
-    add_devices(covers)
+    add_entities(covers)
 
     def cover_update(event):
         """Handle cover updates from the RFXtrx gateway."""
@@ -45,7 +45,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
         new_device = rfxtrx.get_new_device(event, config, RfxtrxCover)
         if new_device:
-            add_devices([new_device])
+            add_entities([new_device])
 
         rfxtrx.apply_received_command(event)
 
diff --git a/homeassistant/components/cover/rpi_gpio.py b/homeassistant/components/cover/rpi_gpio.py
index 2f6951cfc0d..828f5e8e0fe 100644
--- a/homeassistant/components/cover/rpi_gpio.py
+++ b/homeassistant/components/cover/rpi_gpio.py
@@ -54,7 +54,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the RPi cover platform."""
     relay_time = config.get(CONF_RELAY_TIME)
     state_pull_mode = config.get(CONF_STATE_PULL_MODE)
@@ -67,7 +67,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         covers.append(RPiGPIOCover(
             cover[CONF_NAME], cover[CONF_RELAY_PIN], cover[CONF_STATE_PIN],
             state_pull_mode, relay_time, invert_state, invert_relay))
-    add_devices(covers)
+    add_entities(covers)
 
 
 class RPiGPIOCover(CoverDevice):
diff --git a/homeassistant/components/cover/ryobi_gdo.py b/homeassistant/components/cover/ryobi_gdo.py
index a11d70dd3ad..fec91f843fd 100644
--- a/homeassistant/components/cover/ryobi_gdo.py
+++ b/homeassistant/components/cover/ryobi_gdo.py
@@ -29,7 +29,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 SUPPORTED_FEATURES = (SUPPORT_OPEN | SUPPORT_CLOSE)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Ryobi covers."""
     from py_ryobi_gdo import RyobiGDO as ryobi_door
     covers = []
@@ -52,7 +52,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         covers.append(RyobiCover(hass, my_door))
     if covers:
         _LOGGER.debug("Adding covers")
-        add_devices(covers, True)
+        add_entities(covers, True)
 
 
 class RyobiCover(CoverDevice):
diff --git a/homeassistant/components/cover/scsgate.py b/homeassistant/components/cover/scsgate.py
index 04bf0ef1d32..a6f09c7237d 100644
--- a/homeassistant/components/cover/scsgate.py
+++ b/homeassistant/components/cover/scsgate.py
@@ -22,7 +22,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the SCSGate cover."""
     devices = config.get(CONF_DEVICES)
     covers = []
@@ -42,7 +42,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             scsgate.SCSGATE.add_device(cover)
             covers.append(cover)
 
-    add_devices(covers)
+    add_entities(covers)
 
 
 class SCSGateCover(CoverDevice):
diff --git a/homeassistant/components/cover/tahoma.py b/homeassistant/components/cover/tahoma.py
index b38a863ebe0..baf32073c44 100644
--- a/homeassistant/components/cover/tahoma.py
+++ b/homeassistant/components/cover/tahoma.py
@@ -24,13 +24,13 @@ ATTR_LOCK_LEVEL = 'lock_level'
 ATTR_LOCK_ORIG = 'lock_originator'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Tahoma covers."""
     controller = hass.data[TAHOMA_DOMAIN]['controller']
     devices = []
     for device in hass.data[TAHOMA_DOMAIN]['devices']['cover']:
         devices.append(TahomaCover(device, controller))
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class TahomaCover(TahomaDevice, CoverDevice):
diff --git a/homeassistant/components/cover/tellduslive.py b/homeassistant/components/cover/tellduslive.py
index b4bde037a12..fc352aa8482 100644
--- a/homeassistant/components/cover/tellduslive.py
+++ b/homeassistant/components/cover/tellduslive.py
@@ -14,12 +14,12 @@ from homeassistant.components.tellduslive import TelldusLiveEntity
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Telldus Live covers."""
     if discovery_info is None:
         return
 
-    add_devices(TelldusLiveCover(hass, cover) for cover in discovery_info)
+    add_entities(TelldusLiveCover(hass, cover) for cover in discovery_info)
 
 
 class TelldusLiveCover(TelldusLiveEntity, CoverDevice):
diff --git a/homeassistant/components/cover/tellstick.py b/homeassistant/components/cover/tellstick.py
index 56a5a24b409..88608ac42e9 100644
--- a/homeassistant/components/cover/tellstick.py
+++ b/homeassistant/components/cover/tellstick.py
@@ -12,7 +12,7 @@ from homeassistant.components.tellstick import (
     DATA_TELLSTICK, TellstickDevice)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Tellstick covers."""
     if (discovery_info is None or
             discovery_info[ATTR_DISCOVER_DEVICES] is None):
@@ -21,10 +21,10 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     signal_repetitions = discovery_info.get(
         ATTR_DISCOVER_CONFIG, DEFAULT_SIGNAL_REPETITIONS)
 
-    add_devices([TellstickCover(hass.data[DATA_TELLSTICK][tellcore_id],
-                                signal_repetitions)
-                 for tellcore_id in discovery_info[ATTR_DISCOVER_DEVICES]],
-                True)
+    add_entities([TellstickCover(hass.data[DATA_TELLSTICK][tellcore_id],
+                                 signal_repetitions)
+                  for tellcore_id in discovery_info[ATTR_DISCOVER_DEVICES]],
+                 True)
 
 
 class TellstickCover(TellstickDevice, CoverDevice):
diff --git a/homeassistant/components/cover/template.py b/homeassistant/components/cover/template.py
index d9d0d61c77a..e02cdc32319 100644
--- a/homeassistant/components/cover/template.py
+++ b/homeassistant/components/cover/template.py
@@ -71,7 +71,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the Template cover."""
     covers = []
@@ -141,7 +141,7 @@ async def async_setup_platform(hass, config, async_add_devices,
         _LOGGER.error("No covers added")
         return False
 
-    async_add_devices(covers)
+    async_add_entities(covers)
     return True
 
 
diff --git a/homeassistant/components/cover/tuya.py b/homeassistant/components/cover/tuya.py
index 7b5fefee58a..6ab8581602f 100644
--- a/homeassistant/components/cover/tuya.py
+++ b/homeassistant/components/cover/tuya.py
@@ -11,7 +11,7 @@ from homeassistant.components.tuya import DATA_TUYA, TuyaDevice
 DEPENDENCIES = ['tuya']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Tuya cover devices."""
     if discovery_info is None:
         return
@@ -23,7 +23,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         if device is None:
             continue
         devices.append(TuyaCover(device))
-    add_devices(devices)
+    add_entities(devices)
 
 
 class TuyaCover(TuyaDevice, CoverDevice):
diff --git a/homeassistant/components/cover/velbus.py b/homeassistant/components/cover/velbus.py
index fd060e7a7e1..a8501778884 100644
--- a/homeassistant/components/cover/velbus.py
+++ b/homeassistant/components/cover/velbus.py
@@ -32,7 +32,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 DEPENDENCIES = ['velbus']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up cover controlled by Velbus."""
     devices = config.get(CONF_COVERS, {})
     covers = []
@@ -53,7 +53,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("No covers added")
         return False
 
-    add_devices(covers)
+    add_entities(covers)
 
 
 class VelbusCover(CoverDevice):
diff --git a/homeassistant/components/cover/vera.py b/homeassistant/components/cover/vera.py
index 9b2e8f3aad0..279e4a4307d 100644
--- a/homeassistant/components/cover/vera.py
+++ b/homeassistant/components/cover/vera.py
@@ -16,9 +16,9 @@ DEPENDENCIES = ['vera']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Vera covers."""
-    add_devices(
+    add_entities(
         [VeraCover(device, hass.data[VERA_CONTROLLER]) for
          device in hass.data[VERA_DEVICES]['cover']], True)
 
diff --git a/homeassistant/components/cover/wink.py b/homeassistant/components/cover/wink.py
index 2206de05041..857283b9b6c 100644
--- a/homeassistant/components/cover/wink.py
+++ b/homeassistant/components/cover/wink.py
@@ -11,22 +11,22 @@ from homeassistant.components.wink import WinkDevice, DOMAIN
 DEPENDENCIES = ['wink']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Wink cover platform."""
     import pywink
 
     for shade in pywink.get_shades():
         _id = shade.object_id() + shade.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkCoverDevice(shade, hass)])
+            add_entities([WinkCoverDevice(shade, hass)])
     for shade in pywink.get_shade_groups():
         _id = shade.object_id() + shade.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkCoverDevice(shade, hass)])
+            add_entities([WinkCoverDevice(shade, hass)])
     for door in pywink.get_garage_doors():
         _id = door.object_id() + door.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkCoverDevice(door, hass)])
+            add_entities([WinkCoverDevice(door, hass)])
 
 
 class WinkCoverDevice(WinkDevice, CoverDevice):
diff --git a/homeassistant/components/cover/xiaomi_aqara.py b/homeassistant/components/cover/xiaomi_aqara.py
index 14321149148..3ed0a70b1e0 100644
--- a/homeassistant/components/cover/xiaomi_aqara.py
+++ b/homeassistant/components/cover/xiaomi_aqara.py
@@ -10,7 +10,7 @@ _LOGGER = logging.getLogger(__name__)
 ATTR_CURTAIN_LEVEL = 'curtain_level'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Perform the setup for Xiaomi devices."""
     devices = []
     for (_, gateway) in hass.data[PY_XIAOMI_GATEWAY].gateways.items():
@@ -21,7 +21,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                                                   {'status': 'status',
                                                    'pos': 'curtain_level'},
                                                   gateway))
-    add_devices(devices)
+    add_entities(devices)
 
 
 class XiaomiGenericCover(XiaomiDevice, CoverDevice):
diff --git a/homeassistant/components/fan/comfoconnect.py b/homeassistant/components/fan/comfoconnect.py
index fd3265b8230..a1f13da6c09 100644
--- a/homeassistant/components/fan/comfoconnect.py
+++ b/homeassistant/components/fan/comfoconnect.py
@@ -26,11 +26,11 @@ SPEED_MAPPING = {
 }
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the ComfoConnect fan platform."""
     ccb = hass.data[DOMAIN]
 
-    add_devices([ComfoConnectFan(hass, name=ccb.name, ccb=ccb)], True)
+    add_entities([ComfoConnectFan(hass, name=ccb.name, ccb=ccb)], True)
 
 
 class ComfoConnectFan(FanEntity):
diff --git a/homeassistant/components/fan/demo.py b/homeassistant/components/fan/demo.py
index c03c492c834..840196c8bf0 100644
--- a/homeassistant/components/fan/demo.py
+++ b/homeassistant/components/fan/demo.py
@@ -13,9 +13,9 @@ FULL_SUPPORT = SUPPORT_SET_SPEED | SUPPORT_OSCILLATE | SUPPORT_DIRECTION
 LIMITED_SUPPORT = SUPPORT_SET_SPEED
 
 
-def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+def setup_platform(hass, config, add_entities_callback, discovery_info=None):
     """Set up the demo fan platform."""
-    add_devices_callback([
+    add_entities_callback([
         DemoFan(hass, "Living Room Fan", FULL_SUPPORT),
         DemoFan(hass, "Ceiling Fan", LIMITED_SUPPORT),
     ])
diff --git a/homeassistant/components/fan/dyson.py b/homeassistant/components/fan/dyson.py
index 3eb4646e6dc..9f505c87b3d 100644
--- a/homeassistant/components/fan/dyson.py
+++ b/homeassistant/components/fan/dyson.py
@@ -32,7 +32,7 @@ DYSON_SET_NIGHT_MODE_SCHEMA = vol.Schema({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Dyson fan components."""
     from libpurecoollink.dyson_pure_cool_link import DysonPureCoolLink
 
@@ -46,7 +46,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         dyson_entity = DysonPureCoolLinkDevice(hass, device)
         hass.data[DYSON_FAN_DEVICES].append(dyson_entity)
 
-    add_devices(hass.data[DYSON_FAN_DEVICES])
+    add_entities(hass.data[DYSON_FAN_DEVICES])
 
     def service_handle(service):
         """Handle the Dyson services."""
diff --git a/homeassistant/components/fan/insteon.py b/homeassistant/components/fan/insteon.py
index 62fa48935ec..f938ae7aec1 100644
--- a/homeassistant/components/fan/insteon.py
+++ b/homeassistant/components/fan/insteon.py
@@ -29,7 +29,8 @@ _LOGGER = logging.getLogger(__name__)
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the INSTEON device class for the hass platform."""
     insteon_modem = hass.data['insteon'].get('modem')
 
@@ -42,7 +43,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
 
     new_entity = InsteonFan(device, state_key)
 
-    async_add_devices([new_entity])
+    async_add_entities([new_entity])
 
 
 class InsteonFan(InsteonEntity, FanEntity):
diff --git a/homeassistant/components/fan/isy994.py b/homeassistant/components/fan/isy994.py
index 97a5f9c3bd6..314200ba1c4 100644
--- a/homeassistant/components/fan/isy994.py
+++ b/homeassistant/components/fan/isy994.py
@@ -31,7 +31,7 @@ for key in VALUE_TO_STATE:
 
 
 def setup_platform(hass, config: ConfigType,
-                   add_devices: Callable[[list], None], discovery_info=None):
+                   add_entities: Callable[[list], None], discovery_info=None):
     """Set up the ISY994 fan platform."""
     devices = []
 
@@ -41,7 +41,7 @@ def setup_platform(hass, config: ConfigType,
     for name, status, actions in hass.data[ISY994_PROGRAMS][DOMAIN]:
         devices.append(ISYFanProgram(name, status, actions))
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class ISYFanDevice(ISYDevice, FanEntity):
diff --git a/homeassistant/components/fan/mqtt.py b/homeassistant/components/fan/mqtt.py
index 5faa735801d..db3cfab3608 100644
--- a/homeassistant/components/fan/mqtt.py
+++ b/homeassistant/components/fan/mqtt.py
@@ -78,12 +78,12 @@ PLATFORM_SCHEMA = mqtt.MQTT_RW_PLATFORM_SCHEMA.extend({
 
 
 async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
-                               async_add_devices, discovery_info=None):
+                               async_add_entities, discovery_info=None):
     """Set up the MQTT fan platform."""
     if discovery_info is not None:
         config = PLATFORM_SCHEMA(discovery_info)
 
-    async_add_devices([MqttFan(
+    async_add_entities([MqttFan(
         config.get(CONF_NAME),
         {
             key: config.get(key) for key in (
diff --git a/homeassistant/components/fan/template.py b/homeassistant/components/fan/template.py
index 74fb73dae1d..ff25afb792a 100644
--- a/homeassistant/components/fan/template.py
+++ b/homeassistant/components/fan/template.py
@@ -67,7 +67,7 @@ PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None
+        hass, config, async_add_entities, discovery_info=None
 ):
     """Set up the Template Fans."""
     fans = []
@@ -123,7 +123,7 @@ async def async_setup_platform(
             )
         )
 
-    async_add_devices(fans)
+    async_add_entities(fans)
 
 
 class TemplateFan(FanEntity):
diff --git a/homeassistant/components/fan/tuya.py b/homeassistant/components/fan/tuya.py
index f19a9e5a5f7..9cb7cdc3f2c 100644
--- a/homeassistant/components/fan/tuya.py
+++ b/homeassistant/components/fan/tuya.py
@@ -13,7 +13,7 @@ from homeassistant.const import STATE_OFF
 DEPENDENCIES = ['tuya']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Tuya fan platform."""
     if discovery_info is None:
         return
@@ -25,7 +25,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         if device is None:
             continue
         devices.append(TuyaFanDevice(device))
-    add_devices(devices)
+    add_entities(devices)
 
 
 class TuyaFanDevice(TuyaDevice, FanEntity):
diff --git a/homeassistant/components/fan/wink.py b/homeassistant/components/fan/wink.py
index 4eebacbbbf2..480801c48c0 100644
--- a/homeassistant/components/fan/wink.py
+++ b/homeassistant/components/fan/wink.py
@@ -21,13 +21,13 @@ SPEED_LOWEST = 'lowest'
 SUPPORTED_FEATURES = SUPPORT_DIRECTION + SUPPORT_SET_SPEED
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Wink platform."""
     import pywink
 
     for fan in pywink.get_fans():
         if fan.object_id() + fan.name() not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkFanDevice(fan, hass)])
+            add_entities([WinkFanDevice(fan, hass)])
 
 
 class WinkFanDevice(WinkDevice, FanEntity):
diff --git a/homeassistant/components/fan/xiaomi_miio.py b/homeassistant/components/fan/xiaomi_miio.py
index ee8f49f897a..a66e833b4b2 100644
--- a/homeassistant/components/fan/xiaomi_miio.py
+++ b/homeassistant/components/fan/xiaomi_miio.py
@@ -314,7 +314,7 @@ SERVICE_TO_METHOD = {
 }
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the miio fan device from config."""
     from miio import Device, DeviceException
@@ -358,7 +358,7 @@ async def async_setup_platform(hass, config, async_add_devices,
         return False
 
     hass.data[DATA_KEY][host] = device
-    async_add_devices([device], update_before_add=True)
+    async_add_entities([device], update_before_add=True)
 
     async def async_service_handler(service):
         """Map services to methods on XiaomiAirPurifier."""
diff --git a/homeassistant/components/fan/zha.py b/homeassistant/components/fan/zha.py
index 983bc3a79d7..2612c065393 100644
--- a/homeassistant/components/fan/zha.py
+++ b/homeassistant/components/fan/zha.py
@@ -39,13 +39,14 @@ SPEED_TO_VALUE = {speed: i for i, speed in enumerate(SPEED_LIST)}
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Zigbee Home Automation fans."""
     discovery_info = zha.get_discovery_info(hass, discovery_info)
     if discovery_info is None:
         return
 
-    async_add_devices([ZhaFan(**discovery_info)], update_before_add=True)
+    async_add_entities([ZhaFan(**discovery_info)], update_before_add=True)
 
 
 class ZhaFan(zha.Entity, FanEntity):
diff --git a/homeassistant/components/image_processing/demo.py b/homeassistant/components/image_processing/demo.py
index e225113b5b1..42ba7b4c05f 100644
--- a/homeassistant/components/image_processing/demo.py
+++ b/homeassistant/components/image_processing/demo.py
@@ -12,9 +12,9 @@ from homeassistant.components.image_processing.openalpr_local import (
     ImageProcessingAlprEntity)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the demo image processing platform."""
-    add_devices([
+    add_entities([
         DemoImageProcessingAlpr('camera.demo_camera', "Demo Alpr"),
         DemoImageProcessingFace(
             'camera.demo_camera', "Demo Face")
diff --git a/homeassistant/components/image_processing/dlib_face_detect.py b/homeassistant/components/image_processing/dlib_face_detect.py
index d4a20da253c..d3b4e14f4de 100644
--- a/homeassistant/components/image_processing/dlib_face_detect.py
+++ b/homeassistant/components/image_processing/dlib_face_detect.py
@@ -20,7 +20,7 @@ _LOGGER = logging.getLogger(__name__)
 ATTR_LOCATION = 'location'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Dlib Face detection platform."""
     entities = []
     for camera in config[CONF_SOURCE]:
@@ -28,7 +28,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             camera[CONF_ENTITY_ID], camera.get(CONF_NAME)
         ))
 
-    add_devices(entities)
+    add_entities(entities)
 
 
 class DlibFaceDetectEntity(ImageProcessingFaceEntity):
diff --git a/homeassistant/components/image_processing/dlib_face_identify.py b/homeassistant/components/image_processing/dlib_face_identify.py
index bf34eb4c2da..d8c3f5f621f 100644
--- a/homeassistant/components/image_processing/dlib_face_identify.py
+++ b/homeassistant/components/image_processing/dlib_face_identify.py
@@ -27,7 +27,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Dlib Face detection platform."""
     entities = []
     for camera in config[CONF_SOURCE]:
@@ -35,7 +35,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             camera[CONF_ENTITY_ID], config[CONF_FACES], camera.get(CONF_NAME)
         ))
 
-    add_devices(entities)
+    add_entities(entities)
 
 
 class DlibFaceIdentifyEntity(ImageProcessingFaceEntity):
diff --git a/homeassistant/components/image_processing/facebox.py b/homeassistant/components/image_processing/facebox.py
index e5ce0b825d0..2fbd1c5c81c 100644
--- a/homeassistant/components/image_processing/facebox.py
+++ b/homeassistant/components/image_processing/facebox.py
@@ -152,7 +152,7 @@ def valid_file_path(file_path):
         return False
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the classifier."""
     if DATA_FACEBOX not in hass.data:
         hass.data[DATA_FACEBOX] = []
@@ -173,7 +173,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             camera[CONF_ENTITY_ID], camera.get(CONF_NAME))
         entities.append(facebox)
         hass.data[DATA_FACEBOX].append(facebox)
-    add_devices(entities)
+    add_entities(entities)
 
     def service_handle(service):
         """Handle for services."""
diff --git a/homeassistant/components/image_processing/microsoft_face_detect.py b/homeassistant/components/image_processing/microsoft_face_detect.py
index 0b57dba8bca..7e10d05c5b6 100644
--- a/homeassistant/components/image_processing/microsoft_face_detect.py
+++ b/homeassistant/components/image_processing/microsoft_face_detect.py
@@ -46,7 +46,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Microsoft Face detection platform."""
     api = hass.data[DATA_MICROSOFT_FACE]
     attributes = config[CONF_ATTRIBUTES]
@@ -57,7 +58,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
             camera[CONF_ENTITY_ID], api, attributes, camera.get(CONF_NAME)
         ))
 
-    async_add_devices(entities)
+    async_add_entities(entities)
 
 
 class MicrosoftFaceDetectEntity(ImageProcessingFaceEntity):
diff --git a/homeassistant/components/image_processing/microsoft_face_identify.py b/homeassistant/components/image_processing/microsoft_face_identify.py
index 9479a804a44..fae11a3dfa9 100644
--- a/homeassistant/components/image_processing/microsoft_face_identify.py
+++ b/homeassistant/components/image_processing/microsoft_face_identify.py
@@ -30,7 +30,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Microsoft Face identify platform."""
     api = hass.data[DATA_MICROSOFT_FACE]
     face_group = config[CONF_GROUP]
@@ -43,7 +44,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
             camera.get(CONF_NAME)
         ))
 
-    async_add_devices(entities)
+    async_add_entities(entities)
 
 
 class MicrosoftFaceIdentifyEntity(ImageProcessingFaceEntity):
diff --git a/homeassistant/components/image_processing/openalpr_cloud.py b/homeassistant/components/image_processing/openalpr_cloud.py
index dbf36dcd86e..3daaeb6fa01 100644
--- a/homeassistant/components/image_processing/openalpr_cloud.py
+++ b/homeassistant/components/image_processing/openalpr_cloud.py
@@ -49,7 +49,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the OpenALPR cloud API platform."""
     confidence = config[CONF_CONFIDENCE]
     params = {
@@ -65,7 +66,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
             camera[CONF_ENTITY_ID], params, confidence, camera.get(CONF_NAME)
         ))
 
-    async_add_devices(entities)
+    async_add_entities(entities)
 
 
 class OpenAlprCloudEntity(ImageProcessingAlprEntity):
diff --git a/homeassistant/components/image_processing/openalpr_local.py b/homeassistant/components/image_processing/openalpr_local.py
index 227e3269628..901533d1da4 100644
--- a/homeassistant/components/image_processing/openalpr_local.py
+++ b/homeassistant/components/image_processing/openalpr_local.py
@@ -56,7 +56,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the OpenALPR local platform."""
     command = [config[CONF_ALPR_BIN], '-c', config[CONF_REGION], '-']
     confidence = config[CONF_CONFIDENCE]
@@ -67,7 +68,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
             camera[CONF_ENTITY_ID], command, confidence, camera.get(CONF_NAME)
         ))
 
-    async_add_devices(entities)
+    async_add_entities(entities)
 
 
 class ImageProcessingAlprEntity(ImageProcessingEntity):
diff --git a/homeassistant/components/image_processing/opencv.py b/homeassistant/components/image_processing/opencv.py
index e21ddbe2597..1e5d38b638e 100644
--- a/homeassistant/components/image_processing/opencv.py
+++ b/homeassistant/components/image_processing/opencv.py
@@ -80,7 +80,7 @@ def _get_default_classifier(dest_path):
                 fil.write(chunk)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the OpenCV image processing platform."""
     try:
         # Verify that the OpenCV python package is pre-installed
@@ -105,7 +105,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             hass, camera[CONF_ENTITY_ID], camera.get(CONF_NAME),
             config[CONF_CLASSIFIER]))
 
-    add_devices(entities)
+    add_entities(entities)
 
 
 class OpenCVImageProcessor(ImageProcessingEntity):
diff --git a/homeassistant/components/image_processing/seven_segments.py b/homeassistant/components/image_processing/seven_segments.py
index b49739bcec3..fb6f41b4a49 100644
--- a/homeassistant/components/image_processing/seven_segments.py
+++ b/homeassistant/components/image_processing/seven_segments.py
@@ -45,7 +45,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Seven segments OCR platform."""
     entities = []
     for camera in config[CONF_SOURCE]:
@@ -53,7 +54,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
             hass, camera[CONF_ENTITY_ID], config, camera.get(CONF_NAME)
         ))
 
-    async_add_devices(entities)
+    async_add_entities(entities)
 
 
 class ImageProcessingSsocr(ImageProcessingEntity):
diff --git a/homeassistant/components/light/abode.py b/homeassistant/components/light/abode.py
index 431f5d12ff0..69314b63a4b 100644
--- a/homeassistant/components/light/abode.py
+++ b/homeassistant/components/light/abode.py
@@ -18,7 +18,7 @@ DEPENDENCIES = ['abode']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Abode light devices."""
     import abodepy.helpers.constants as CONST
 
@@ -37,7 +37,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     data.devices.extend(devices)
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class AbodeLight(AbodeDevice, Light):
diff --git a/homeassistant/components/light/ads.py b/homeassistant/components/light/ads.py
index 41709a4692b..65569f6b2d5 100644
--- a/homeassistant/components/light/ads.py
+++ b/homeassistant/components/light/ads.py
@@ -26,7 +26,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the light platform for ADS."""
     ads_hub = hass.data.get(DATA_ADS)
 
@@ -34,8 +34,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     ads_var_brightness = config.get(CONF_ADS_VAR_BRIGHTNESS)
     name = config.get(CONF_NAME)
 
-    add_devices([AdsLight(ads_hub, ads_var_enable, ads_var_brightness,
-                          name)], True)
+    add_entities([AdsLight(ads_hub, ads_var_enable, ads_var_brightness,
+                           name)], True)
 
 
 class AdsLight(Light):
diff --git a/homeassistant/components/light/avion.py b/homeassistant/components/light/avion.py
index be608ea4776..d6e6776ea41 100644
--- a/homeassistant/components/light/avion.py
+++ b/homeassistant/components/light/avion.py
@@ -35,7 +35,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up an Avion switch."""
     # pylint: disable=no-member
     import avion
@@ -62,7 +62,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         device['address'] = address
         lights.append(AvionLight(device))
 
-    add_devices(lights)
+    add_entities(lights)
 
 
 class AvionLight(Light):
diff --git a/homeassistant/components/light/blinksticklight.py b/homeassistant/components/light/blinksticklight.py
index bca587074b0..e145005a5a7 100644
--- a/homeassistant/components/light/blinksticklight.py
+++ b/homeassistant/components/light/blinksticklight.py
@@ -31,7 +31,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Blinkstick device specified by serial number."""
     from blinkstick import blinkstick
 
@@ -40,7 +40,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     stick = blinkstick.find_by_serial(serial)
 
-    add_devices([BlinkStickLight(stick, name)], True)
+    add_entities([BlinkStickLight(stick, name)], True)
 
 
 class BlinkStickLight(Light):
diff --git a/homeassistant/components/light/blinkt.py b/homeassistant/components/light/blinkt.py
index 7035320945a..d8f819492a5 100644
--- a/homeassistant/components/light/blinkt.py
+++ b/homeassistant/components/light/blinkt.py
@@ -28,7 +28,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Blinkt Light platform."""
     # pylint: disable=no-member
     import blinkt
@@ -38,7 +38,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     name = config.get(CONF_NAME)
 
-    add_devices([
+    add_entities([
         BlinktLight(blinkt, name, index) for index in range(blinkt.NUM_PIXELS)
     ])
 
diff --git a/homeassistant/components/light/deconz.py b/homeassistant/components/light/deconz.py
index 8aacac323b8..6dce6b7fdb8 100644
--- a/homeassistant/components/light/deconz.py
+++ b/homeassistant/components/light/deconz.py
@@ -19,13 +19,13 @@ import homeassistant.util.color as color_util
 DEPENDENCIES = ['deconz']
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Old way of setting up deCONZ lights and group."""
     pass
 
 
-async def async_setup_entry(hass, config_entry, async_add_devices):
+async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the deCONZ lights and groups from a config entry."""
     @callback
     def async_add_light(lights):
@@ -34,7 +34,7 @@ async def async_setup_entry(hass, config_entry, async_add_devices):
         for light in lights:
             if light.type not in SWITCH_TYPES:
                 entities.append(DeconzLight(light))
-        async_add_devices(entities, True)
+        async_add_entities(entities, True)
 
     hass.data[DATA_DECONZ_UNSUB].append(
         async_dispatcher_connect(hass, 'deconz_new_light', async_add_light))
@@ -47,7 +47,7 @@ async def async_setup_entry(hass, config_entry, async_add_devices):
         for group in groups:
             if group.lights and allow_group:
                 entities.append(DeconzLight(group))
-        async_add_devices(entities, True)
+        async_add_entities(entities, True)
 
     hass.data[DATA_DECONZ_UNSUB].append(
         async_dispatcher_connect(hass, 'deconz_new_group', async_add_group))
diff --git a/homeassistant/components/light/decora.py b/homeassistant/components/light/decora.py
index 85d9180c59b..5de8e03aea5 100644
--- a/homeassistant/components/light/decora.py
+++ b/homeassistant/components/light/decora.py
@@ -56,7 +56,7 @@ def retry(method):
     return wrapper_retry
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up an Decora switch."""
     lights = []
     for address, device_config in config[CONF_DEVICES].items():
@@ -67,7 +67,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         light = DecoraLight(device)
         lights.append(light)
 
-    add_devices(lights)
+    add_entities(lights)
 
 
 class DecoraLight(Light):
diff --git a/homeassistant/components/light/decora_wifi.py b/homeassistant/components/light/decora_wifi.py
index 17003d51610..da7ccfb2db2 100644
--- a/homeassistant/components/light/decora_wifi.py
+++ b/homeassistant/components/light/decora_wifi.py
@@ -34,7 +34,7 @@ NOTIFICATION_ID = 'leviton_notification'
 NOTIFICATION_TITLE = 'myLeviton Decora Setup'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Decora WiFi platform."""
     # pylint: disable=import-error, no-name-in-module
     from decora_wifi import DecoraWiFiSession
@@ -65,7 +65,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                 for switch in residence.get_iot_switches():
                     all_switches.append(switch)
 
-        add_devices(DecoraWifiLight(sw) for sw in all_switches)
+        add_entities(DecoraWifiLight(sw) for sw in all_switches)
     except ValueError:
         _LOGGER.error('Failed to communicate with myLeviton Service.')
 
diff --git a/homeassistant/components/light/demo.py b/homeassistant/components/light/demo.py
index ba27cbd3ac5..980d8491744 100644
--- a/homeassistant/components/light/demo.py
+++ b/homeassistant/components/light/demo.py
@@ -24,9 +24,9 @@ SUPPORT_DEMO = (SUPPORT_BRIGHTNESS | SUPPORT_COLOR_TEMP | SUPPORT_EFFECT |
                 SUPPORT_COLOR | SUPPORT_WHITE_VALUE)
 
 
-def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+def setup_platform(hass, config, add_entities_callback, discovery_info=None):
     """Set up the demo light platform."""
-    add_devices_callback([
+    add_entities_callback([
         DemoLight(1, "Bed Light", False, True, effect_list=LIGHT_EFFECT_LIST,
                   effect=LIGHT_EFFECT_LIST[0]),
         DemoLight(2, "Ceiling Lights", True, True,
diff --git a/homeassistant/components/light/enocean.py b/homeassistant/components/light/enocean.py
index beb9094b1cb..ebe2c409796 100644
--- a/homeassistant/components/light/enocean.py
+++ b/homeassistant/components/light/enocean.py
@@ -32,13 +32,13 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the EnOcean light platform."""
     sender_id = config.get(CONF_SENDER_ID)
     devname = config.get(CONF_NAME)
     dev_id = config.get(CONF_ID)
 
-    add_devices([EnOceanLight(sender_id, devname, dev_id)])
+    add_entities([EnOceanLight(sender_id, devname, dev_id)])
 
 
 class EnOceanLight(enocean.EnOceanDevice, Light):
diff --git a/homeassistant/components/light/eufy.py b/homeassistant/components/light/eufy.py
index 2e7370cb336..7a44a58cd81 100644
--- a/homeassistant/components/light/eufy.py
+++ b/homeassistant/components/light/eufy.py
@@ -24,11 +24,11 @@ EUFY_MAX_KELVIN = 6500
 EUFY_MIN_KELVIN = 2700
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Eufy bulbs."""
     if discovery_info is None:
         return
-    add_devices([EufyLight(discovery_info)], True)
+    add_entities([EufyLight(discovery_info)], True)
 
 
 class EufyLight(Light):
diff --git a/homeassistant/components/light/flux_led.py b/homeassistant/components/light/flux_led.py
index 2b53fb65054..f389d34cd5d 100644
--- a/homeassistant/components/light/flux_led.py
+++ b/homeassistant/components/light/flux_led.py
@@ -99,7 +99,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Flux lights."""
     import flux_led
     lights = []
@@ -116,7 +116,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         light_ips.append(ipaddr)
 
     if not config.get(CONF_AUTOMATIC_ADD, False):
-        add_devices(lights, True)
+        add_entities(lights, True)
         return
 
     # Find the bulbs on the LAN
@@ -132,7 +132,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         light = FluxLight(device)
         lights.append(light)
 
-    add_devices(lights, True)
+    add_entities(lights, True)
 
 
 class FluxLight(Light):
diff --git a/homeassistant/components/light/futurenow.py b/homeassistant/components/light/futurenow.py
index 1777376881e..8b0a809b667 100644
--- a/homeassistant/components/light/futurenow.py
+++ b/homeassistant/components/light/futurenow.py
@@ -38,7 +38,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the light platform for each FutureNow unit."""
     lights = []
     for channel, device_config in config[CONF_DEVICES].items():
@@ -51,7 +51,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         device['port'] = config[CONF_PORT]
         lights.append(FutureNowLight(device))
 
-    add_devices(lights, True)
+    add_entities(lights, True)
 
 
 def to_futurenow_level(level):
diff --git a/homeassistant/components/light/greenwave.py b/homeassistant/components/light/greenwave.py
index 52a70532005..0c484a0e3f4 100644
--- a/homeassistant/components/light/greenwave.py
+++ b/homeassistant/components/light/greenwave.py
@@ -30,7 +30,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=1)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Greenwave Reality Platform."""
     import greenwavereality as greenwave
     import os
@@ -51,8 +51,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     else:
         token = None
     bulbs = greenwave.grab_bulbs(host, token)
-    add_devices(GreenwaveLight(device, host, token, GatewayData(host, token))
-                for device in bulbs.values())
+    add_entities(GreenwaveLight(device, host, token, GatewayData(host, token))
+                 for device in bulbs.values())
 
 
 class GreenwaveLight(Light):
diff --git a/homeassistant/components/light/group.py b/homeassistant/components/light/group.py
index c8b7e98160b..bf54d3ecf29 100644
--- a/homeassistant/components/light/group.py
+++ b/homeassistant/components/light/group.py
@@ -41,10 +41,11 @@ SUPPORT_GROUP_LIGHT = (SUPPORT_BRIGHTNESS | SUPPORT_COLOR_TEMP | SUPPORT_EFFECT
 
 
 async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
-                               async_add_devices, discovery_info=None) -> None:
+                               async_add_entities,
+                               discovery_info=None) -> None:
     """Initialize light.group platform."""
-    async_add_devices([LightGroup(config.get(CONF_NAME),
-                                  config[CONF_ENTITIES])])
+    async_add_entities([LightGroup(config.get(CONF_NAME),
+                                   config[CONF_ENTITIES])])
 
 
 class LightGroup(light.Light):
diff --git a/homeassistant/components/light/hive.py b/homeassistant/components/light/hive.py
index 1fd9e8aaaca..eada16bbab9 100644
--- a/homeassistant/components/light/hive.py
+++ b/homeassistant/components/light/hive.py
@@ -15,13 +15,13 @@ import homeassistant.util.color as color_util
 DEPENDENCIES = ['hive']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Hive light devices."""
     if discovery_info is None:
         return
     session = hass.data.get(DATA_HIVE)
 
-    add_devices([HiveDeviceLight(session, discovery_info)])
+    add_entities([HiveDeviceLight(session, discovery_info)])
 
 
 class HiveDeviceLight(Light):
diff --git a/homeassistant/components/light/homekit_controller.py b/homeassistant/components/light/homekit_controller.py
index 8d77cb05236..dd24e3cfb2e 100644
--- a/homeassistant/components/light/homekit_controller.py
+++ b/homeassistant/components/light/homekit_controller.py
@@ -17,11 +17,11 @@ DEPENDENCIES = ['homekit_controller']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Homekit lighting."""
     if discovery_info is not None:
         accessory = hass.data[KNOWN_ACCESSORIES][discovery_info['serial']]
-        add_devices([HomeKitLight(accessory, discovery_info)], True)
+        add_entities([HomeKitLight(accessory, discovery_info)], True)
 
 
 class HomeKitLight(HomeKitEntity, Light):
diff --git a/homeassistant/components/light/homematic.py b/homeassistant/components/light/homematic.py
index 2d7c855c538..9a7baa713a3 100644
--- a/homeassistant/components/light/homematic.py
+++ b/homeassistant/components/light/homematic.py
@@ -18,7 +18,7 @@ DEPENDENCIES = ['homematic']
 SUPPORT_HOMEMATIC = SUPPORT_BRIGHTNESS
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Homematic light platform."""
     if discovery_info is None:
         return
@@ -28,7 +28,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         new_device = HMLight(conf)
         devices.append(new_device)
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class HMLight(HMDevice, Light):
diff --git a/homeassistant/components/light/homematicip_cloud.py b/homeassistant/components/light/homematicip_cloud.py
index f958879386d..764ead62169 100644
--- a/homeassistant/components/light/homematicip_cloud.py
+++ b/homeassistant/components/light/homematicip_cloud.py
@@ -22,12 +22,12 @@ ATTR_PROFILE_MODE = 'profile_mode'
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Old way of setting up HomematicIP Cloud lights."""
     pass
 
 
-async def async_setup_entry(hass, config_entry, async_add_devices):
+async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the HomematicIP Cloud lights from a config entry."""
     from homematicip.aio.device import AsyncBrandSwitchMeasuring, AsyncDimmer
 
@@ -40,7 +40,7 @@ async def async_setup_entry(hass, config_entry, async_add_devices):
             devices.append(HomematicipDimmer(home, device))
 
     if devices:
-        async_add_devices(devices)
+        async_add_entities(devices)
 
 
 class HomematicipLight(HomematicipGenericDevice, Light):
diff --git a/homeassistant/components/light/hue.py b/homeassistant/components/light/hue.py
index 0da59b6f100..2a51423a7a8 100644
--- a/homeassistant/components/light/hue.py
+++ b/homeassistant/components/light/hue.py
@@ -47,7 +47,7 @@ ATTR_IS_HUE_GROUP = 'is_hue_group'
 GROUP_MIN_API_VERSION = (1, 13, 0)
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Old way of setting up Hue lights.
 
@@ -57,7 +57,7 @@ async def async_setup_platform(hass, config, async_add_devices,
     pass
 
 
-async def async_setup_entry(hass, config_entry, async_add_devices):
+async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the Hue lights from a config entry."""
     bridge = hass.data[hue.DOMAIN][config_entry.data['host']]
     cur_lights = {}
@@ -137,13 +137,13 @@ async def async_setup_entry(hass, config_entry, async_add_devices):
         """
         tasks = []
         tasks.append(async_update_items(
-            hass, bridge, async_add_devices, request_update,
+            hass, bridge, async_add_entities, request_update,
             False, cur_lights, light_progress
         ))
 
         if allow_groups:
             tasks.append(async_update_items(
-                hass, bridge, async_add_devices, request_update,
+                hass, bridge, async_add_entities, request_update,
                 True, cur_groups, group_progress
             ))
 
@@ -152,7 +152,7 @@ async def async_setup_entry(hass, config_entry, async_add_devices):
     await update_bridge()
 
 
-async def async_update_items(hass, bridge, async_add_devices,
+async def async_update_items(hass, bridge, async_add_entities,
                              request_bridge_update, is_group, current,
                              progress_waiting):
     """Update either groups or lights from the bridge."""
@@ -195,7 +195,7 @@ async def async_update_items(hass, bridge, async_add_devices,
             current[item_id].async_schedule_update_ha_state()
 
     if new_lights:
-        async_add_devices(new_lights)
+        async_add_entities(new_lights)
 
 
 class HueLight(Light):
diff --git a/homeassistant/components/light/hyperion.py b/homeassistant/components/light/hyperion.py
index cbac8cf4e20..16be7d45825 100644
--- a/homeassistant/components/light/hyperion.py
+++ b/homeassistant/components/light/hyperion.py
@@ -59,7 +59,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a Hyperion server remote."""
     host = config.get(CONF_HOST)
     port = config.get(CONF_PORT)
@@ -72,7 +72,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                       default_color, hdmi_priority, effect_list)
 
     if device.setup():
-        add_devices([device])
+        add_entities([device])
         return True
     return False
 
diff --git a/homeassistant/components/light/iglo.py b/homeassistant/components/light/iglo.py
index f40dc2ce84e..9dca5f8e5f5 100644
--- a/homeassistant/components/light/iglo.py
+++ b/homeassistant/components/light/iglo.py
@@ -31,12 +31,12 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the iGlo lights."""
     host = config.get(CONF_HOST)
     name = config.get(CONF_NAME)
     port = config.get(CONF_PORT)
-    add_devices([IGloLamp(name, host, port)], True)
+    add_entities([IGloLamp(name, host, port)], True)
 
 
 class IGloLamp(Light):
diff --git a/homeassistant/components/light/ihc.py b/homeassistant/components/light/ihc.py
index 480cfa7ad94..da90a53c848 100644
--- a/homeassistant/components/light/ihc.py
+++ b/homeassistant/components/light/ihc.py
@@ -28,7 +28,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the IHC lights platform."""
     ihc_controller = hass.data[IHC_DATA][IHC_CONTROLLER]
     info = hass.data[IHC_DATA][IHC_INFO]
@@ -50,7 +50,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             device = IhcLight(ihc_controller, name, ihc_id, info, dimmable)
             devices.append(device)
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class IhcLight(IHCDevice, Light):
diff --git a/homeassistant/components/light/insteon.py b/homeassistant/components/light/insteon.py
index 88a9ab01de5..82f455c821e 100644
--- a/homeassistant/components/light/insteon.py
+++ b/homeassistant/components/light/insteon.py
@@ -19,7 +19,8 @@ MAX_BRIGHTNESS = 255
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Insteon component."""
     insteon_modem = hass.data['insteon'].get('modem')
 
@@ -32,7 +33,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
 
     new_entity = InsteonDimmerDevice(device, state_key)
 
-    async_add_devices([new_entity])
+    async_add_entities([new_entity])
 
 
 class InsteonDimmerDevice(InsteonEntity, Light):
diff --git a/homeassistant/components/light/isy994.py b/homeassistant/components/light/isy994.py
index ce358d0a974..06507eaeca6 100644
--- a/homeassistant/components/light/isy994.py
+++ b/homeassistant/components/light/isy994.py
@@ -16,13 +16,13 @@ _LOGGER = logging.getLogger(__name__)
 
 
 def setup_platform(hass, config: ConfigType,
-                   add_devices: Callable[[list], None], discovery_info=None):
+                   add_entities: Callable[[list], None], discovery_info=None):
     """Set up the ISY994 light platform."""
     devices = []
     for node in hass.data[ISY994_NODES][DOMAIN]:
         devices.append(ISYLightDevice(node))
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class ISYLightDevice(ISYDevice, Light):
diff --git a/homeassistant/components/light/knx.py b/homeassistant/components/light/knx.py
index ee8389fbb71..23929db8626 100644
--- a/homeassistant/components/light/knx.py
+++ b/homeassistant/components/light/knx.py
@@ -37,27 +37,27 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up lights for KNX platform."""
     if discovery_info is not None:
-        async_add_devices_discovery(hass, discovery_info, async_add_devices)
+        async_add_entities_discovery(hass, discovery_info, async_add_entities)
     else:
-        async_add_devices_config(hass, config, async_add_devices)
+        async_add_entities_config(hass, config, async_add_entities)
 
 
 @callback
-def async_add_devices_discovery(hass, discovery_info, async_add_devices):
+def async_add_entities_discovery(hass, discovery_info, async_add_entities):
     """Set up lights for KNX platform configured via xknx.yaml."""
     entities = []
     for device_name in discovery_info[ATTR_DISCOVER_DEVICES]:
         device = hass.data[DATA_KNX].xknx.devices[device_name]
         entities.append(KNXLight(hass, device))
-    async_add_devices(entities)
+    async_add_entities(entities)
 
 
 @callback
-def async_add_devices_config(hass, config, async_add_devices):
+def async_add_entities_config(hass, config, async_add_entities):
     """Set up light for KNX platform configured within platform."""
     import xknx
     light = xknx.devices.Light(
@@ -71,7 +71,7 @@ def async_add_devices_config(hass, config, async_add_devices):
         group_address_color=config.get(CONF_COLOR_ADDRESS),
         group_address_color_state=config.get(CONF_COLOR_STATE_ADDRESS))
     hass.data[DATA_KNX].xknx.devices.add(light)
-    async_add_devices([KNXLight(hass, light)])
+    async_add_entities([KNXLight(hass, light)])
 
 
 class KNXLight(Light):
diff --git a/homeassistant/components/light/lifx.py b/homeassistant/components/light/lifx.py
index 8547d7a985d..cf5d6fef704 100644
--- a/homeassistant/components/light/lifx.py
+++ b/homeassistant/components/light/lifx.py
@@ -136,7 +136,7 @@ def aiolifx_effects():
 
 async def async_setup_platform(hass,
                                config,
-                               async_add_devices,
+                               async_add_entities,
                                discovery_info=None):
     """Set up the LIFX platform."""
     if sys.platform == 'win32':
@@ -145,7 +145,7 @@ async def async_setup_platform(hass,
 
     server_addr = config.get(CONF_SERVER)
 
-    lifx_manager = LIFXManager(hass, async_add_devices)
+    lifx_manager = LIFXManager(hass, async_add_entities)
     lifx_discovery = aiolifx().LifxDiscovery(
         hass.loop,
         lifx_manager,
@@ -207,11 +207,11 @@ def merge_hsbk(base, change):
 class LIFXManager:
     """Representation of all known LIFX entities."""
 
-    def __init__(self, hass, async_add_devices):
+    def __init__(self, hass, async_add_entities):
         """Initialize the light."""
         self.entities = {}
         self.hass = hass
-        self.async_add_devices = async_add_devices
+        self.async_add_entities = async_add_entities
         self.effects_conductor = aiolifx_effects().Conductor(loop=hass.loop)
 
         self.register_set_state()
@@ -335,7 +335,7 @@ class LIFXManager:
 
                 _LOGGER.debug("%s register READY", entity.who)
                 self.entities[device.mac_addr] = entity
-                self.async_add_devices([entity], True)
+                self.async_add_entities([entity], True)
 
     @callback
     def unregister(self, device):
diff --git a/homeassistant/components/light/lifx_legacy.py b/homeassistant/components/light/lifx_legacy.py
index 3ad75a1cea4..6c5f68937f8 100644
--- a/homeassistant/components/light/lifx_legacy.py
+++ b/homeassistant/components/light/lifx_legacy.py
@@ -45,12 +45,12 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the LIFX platform."""
     server_addr = config.get(CONF_SERVER)
     broadcast_addr = config.get(CONF_BROADCAST)
 
-    lifx_library = LIFX(add_devices, server_addr, broadcast_addr)
+    lifx_library = LIFX(add_entities, server_addr, broadcast_addr)
 
     # Register our poll service
     track_time_change(hass, lifx_library.poll, second=[10, 40])
@@ -61,14 +61,14 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 class LIFX:
     """Representation of a LIFX light."""
 
-    def __init__(self, add_devices_callback, server_addr=None,
+    def __init__(self, add_entities_callback, server_addr=None,
                  broadcast_addr=None):
         """Initialize the light."""
         import liffylights
 
         self._devices = []
 
-        self._add_devices_callback = add_devices_callback
+        self._add_entities_callback = add_entities_callback
 
         self._liffylights = liffylights.LiffyLights(
             self.on_device, self.on_power, self.on_color, server_addr,
@@ -93,7 +93,7 @@ class LIFX:
             bulb = LIFXLight(
                 self._liffylights, ipaddr, name, power, hue, sat, bri, kel)
             self._devices.append(bulb)
-            self._add_devices_callback([bulb])
+            self._add_entities_callback([bulb])
         else:
             _LOGGER.debug("update bulb %s %s %d %d %d %d %d",
                           ipaddr, name, power, hue, sat, bri, kel)
diff --git a/homeassistant/components/light/limitlessled.py b/homeassistant/components/light/limitlessled.py
index ded58248d8e..9400932802a 100644
--- a/homeassistant/components/light/limitlessled.py
+++ b/homeassistant/components/light/limitlessled.py
@@ -104,7 +104,7 @@ def rewrite_legacy(config):
     return {'bridges': new_bridges}
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the LimitlessLED lights."""
     from limitlessled.bridge import Bridge
 
@@ -126,7 +126,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             lights.append(LimitlessLEDGroup(group, {
                 'fade': group_conf[CONF_FADE]
             }))
-    add_devices(lights)
+    add_entities(lights)
 
 
 def state(new_state):
diff --git a/homeassistant/components/light/litejet.py b/homeassistant/components/light/litejet.py
index b8491b6f0f5..8662afc668e 100644
--- a/homeassistant/components/light/litejet.py
+++ b/homeassistant/components/light/litejet.py
@@ -17,7 +17,7 @@ DEPENDENCIES = ['litejet']
 ATTR_NUMBER = 'number'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up lights for the LiteJet platform."""
     litejet_ = hass.data['litejet_system']
 
@@ -26,7 +26,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         name = litejet_.get_load_name(i)
         if not litejet.is_ignored(hass, name):
             devices.append(LiteJetLight(hass, litejet_, i, name))
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class LiteJetLight(Light):
diff --git a/homeassistant/components/light/lutron.py b/homeassistant/components/light/lutron.py
index 24744110c6f..6c4047e2314 100644
--- a/homeassistant/components/light/lutron.py
+++ b/homeassistant/components/light/lutron.py
@@ -16,14 +16,14 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['lutron']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Lutron lights."""
     devs = []
     for (area_name, device) in hass.data[LUTRON_DEVICES]['light']:
         dev = LutronLight(area_name, device, hass.data[LUTRON_CONTROLLER])
         devs.append(dev)
 
-    add_devices(devs, True)
+    add_entities(devs, True)
     return True
 
 
diff --git a/homeassistant/components/light/lutron_caseta.py b/homeassistant/components/light/lutron_caseta.py
index 29186b8fcd2..f345748683b 100644
--- a/homeassistant/components/light/lutron_caseta.py
+++ b/homeassistant/components/light/lutron_caseta.py
@@ -20,7 +20,8 @@ DEPENDENCIES = ['lutron_caseta']
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Lutron Caseta lights."""
     devs = []
     bridge = hass.data[LUTRON_CASETA_SMARTBRIDGE]
@@ -29,7 +30,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         dev = LutronCasetaLight(light_device, bridge)
         devs.append(dev)
 
-    async_add_devices(devs, True)
+    async_add_entities(devs, True)
 
 
 class LutronCasetaLight(LutronCasetaDevice, Light):
diff --git a/homeassistant/components/light/lw12wifi.py b/homeassistant/components/light/lw12wifi.py
index 46bebe8086f..71716b4130d 100644
--- a/homeassistant/components/light/lw12wifi.py
+++ b/homeassistant/components/light/lw12wifi.py
@@ -36,7 +36,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up LW-12 WiFi LED Controller platform."""
     import lw12
 
@@ -46,7 +46,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     port = config.get(CONF_PORT)
     # Add devices
     lw12_light = lw12.LW12Controller(host, port)
-    add_devices([LW12WiFi(name, lw12_light)])
+    add_entities([LW12WiFi(name, lw12_light)])
 
 
 class LW12WiFi(Light):
diff --git a/homeassistant/components/light/mochad.py b/homeassistant/components/light/mochad.py
index 4aeb2c2c79b..2e68c369ba6 100644
--- a/homeassistant/components/light/mochad.py
+++ b/homeassistant/components/light/mochad.py
@@ -34,10 +34,10 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up X10 dimmers over a mochad controller."""
     devs = config.get(CONF_DEVICES)
-    add_devices([MochadLight(
+    add_entities([MochadLight(
         hass, mochad.CONTROLLER.ctrl, dev) for dev in devs])
     return True
 
diff --git a/homeassistant/components/light/mqtt.py b/homeassistant/components/light/mqtt.py
index 09fa094c1b2..225f0f510ad 100644
--- a/homeassistant/components/light/mqtt.py
+++ b/homeassistant/components/light/mqtt.py
@@ -100,7 +100,7 @@ PLATFORM_SCHEMA = mqtt.MQTT_RW_PLATFORM_SCHEMA.extend({
 }).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up a MQTT Light."""
     if discovery_info is not None:
@@ -109,7 +109,7 @@ async def async_setup_platform(hass, config, async_add_devices,
     config.setdefault(
         CONF_STATE_VALUE_TEMPLATE, config.get(CONF_VALUE_TEMPLATE))
 
-    async_add_devices([MqttLight(
+    async_add_entities([MqttLight(
         config.get(CONF_NAME),
         config.get(CONF_EFFECT_LIST),
         {
diff --git a/homeassistant/components/light/mqtt_json.py b/homeassistant/components/light/mqtt_json.py
index d17c7dd73bf..239c924ed2b 100644
--- a/homeassistant/components/light/mqtt_json.py
+++ b/homeassistant/components/light/mqtt_json.py
@@ -81,11 +81,11 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
-                               async_add_devices, discovery_info=None):
+                               async_add_entities, discovery_info=None):
     """Set up a MQTT JSON Light."""
     if discovery_info is not None:
         config = PLATFORM_SCHEMA(discovery_info)
-    async_add_devices([MqttJson(
+    async_add_entities([MqttJson(
         config.get(CONF_NAME),
         config.get(CONF_EFFECT_LIST),
         {
diff --git a/homeassistant/components/light/mqtt_template.py b/homeassistant/components/light/mqtt_template.py
index ffa73aca915..72cfd6b678c 100644
--- a/homeassistant/components/light/mqtt_template.py
+++ b/homeassistant/components/light/mqtt_template.py
@@ -66,13 +66,13 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 }).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up a MQTT Template light."""
     if discovery_info is not None:
         config = PLATFORM_SCHEMA(discovery_info)
 
-    async_add_devices([MqttTemplate(
+    async_add_entities([MqttTemplate(
         hass,
         config.get(CONF_NAME),
         config.get(CONF_EFFECT_LIST),
diff --git a/homeassistant/components/light/mysensors.py b/homeassistant/components/light/mysensors.py
index 4139abd40fa..23d602c5d40 100644
--- a/homeassistant/components/light/mysensors.py
+++ b/homeassistant/components/light/mysensors.py
@@ -16,7 +16,7 @@ SUPPORT_MYSENSORS_RGBW = SUPPORT_COLOR | SUPPORT_WHITE_VALUE
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the mysensors platform for lights."""
     device_class_map = {
         'S_DIMMER': MySensorsLightDimmer,
@@ -25,7 +25,7 @@ async def async_setup_platform(
     }
     mysensors.setup_mysensors_platform(
         hass, DOMAIN, discovery_info, device_class_map,
-        async_add_devices=async_add_devices)
+        async_add_entities=async_add_entities)
 
 
 class MySensorsLight(mysensors.device.MySensorsEntity, Light):
diff --git a/homeassistant/components/light/mystrom.py b/homeassistant/components/light/mystrom.py
index 5d4cdcc17d4..8060bef0fa8 100644
--- a/homeassistant/components/light/mystrom.py
+++ b/homeassistant/components/light/mystrom.py
@@ -41,7 +41,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the myStrom Light platform."""
     from pymystrom.bulb import MyStromBulb
     from pymystrom.exceptions import MyStromConnectionError
@@ -58,7 +58,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     except MyStromConnectionError:
         _LOGGER.warning("No route to device: %s", host)
 
-    add_devices([MyStromLight(bulb, name)], True)
+    add_entities([MyStromLight(bulb, name)], True)
 
 
 class MyStromLight(Light):
diff --git a/homeassistant/components/light/nanoleaf_aurora.py b/homeassistant/components/light/nanoleaf_aurora.py
index 6a0d3c36e9f..6d9c1a50f79 100644
--- a/homeassistant/components/light/nanoleaf_aurora.py
+++ b/homeassistant/components/light/nanoleaf_aurora.py
@@ -41,7 +41,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Nanoleaf Aurora device."""
     import nanoleaf
     import nanoleaf.setup
@@ -83,7 +83,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         return
 
     hass.data[DATA_NANOLEAF_AURORA][host] = aurora_light
-    add_devices([AuroraLight(aurora_light, name)], True)
+    add_entities([AuroraLight(aurora_light, name)], True)
 
 
 class AuroraLight(Light):
diff --git a/homeassistant/components/light/osramlightify.py b/homeassistant/components/light/osramlightify.py
index 939d0fe6988..244a233c517 100644
--- a/homeassistant/components/light/osramlightify.py
+++ b/homeassistant/components/light/osramlightify.py
@@ -49,7 +49,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Osram Lightify lights."""
     import lightify
 
@@ -65,10 +65,10 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.exception(msg)
         return
 
-    setup_bridge(bridge, add_devices, add_nodes, add_groups)
+    setup_bridge(bridge, add_entities, add_nodes, add_groups)
 
 
-def setup_bridge(bridge, add_devices, add_nodes, add_groups):
+def setup_bridge(bridge, add_entities, add_nodes, add_groups):
     """Set up the Lightify bridge."""
     lights = {}
 
@@ -106,7 +106,7 @@ def setup_bridge(bridge, add_devices, add_nodes, add_groups):
                     lights[group_name].group = group
 
         if new_lights:
-            add_devices(new_lights)
+            add_entities(new_lights)
 
     update_lights()
 
diff --git a/homeassistant/components/light/piglow.py b/homeassistant/components/light/piglow.py
index 755cf9dca66..56c72e01fdf 100644
--- a/homeassistant/components/light/piglow.py
+++ b/homeassistant/components/light/piglow.py
@@ -29,7 +29,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Piglow Light platform."""
     import piglow
 
@@ -39,7 +39,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     name = config.get(CONF_NAME)
 
-    add_devices([PiglowLight(piglow, name)])
+    add_entities([PiglowLight(piglow, name)])
 
 
 class PiglowLight(Light):
diff --git a/homeassistant/components/light/qwikswitch.py b/homeassistant/components/light/qwikswitch.py
index 9d6e8f9169a..fa986ff09f2 100644
--- a/homeassistant/components/light/qwikswitch.py
+++ b/homeassistant/components/light/qwikswitch.py
@@ -11,14 +11,14 @@ from homeassistant.components.light import SUPPORT_BRIGHTNESS, Light
 DEPENDENCIES = [QWIKSWITCH]
 
 
-async def async_setup_platform(hass, _, add_devices, discovery_info=None):
+async def async_setup_platform(hass, _, add_entities, discovery_info=None):
     """Add lights from the main Qwikswitch component."""
     if discovery_info is None:
         return
 
     qsusb = hass.data[QWIKSWITCH]
     devs = [QSLight(qsid, qsusb) for qsid in discovery_info[QWIKSWITCH]]
-    add_devices(devs)
+    add_entities(devs)
 
 
 class QSLight(QSToggleEntity, Light):
diff --git a/homeassistant/components/light/rflink.py b/homeassistant/components/light/rflink.py
index a05822ed8d1..b410fdceff7 100644
--- a/homeassistant/components/light/rflink.py
+++ b/homeassistant/components/light/rflink.py
@@ -156,9 +156,10 @@ def devices_from_config(domain_config, hass=None):
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Rflink light platform."""
-    async_add_devices(devices_from_config(config, hass))
+    async_add_entities(devices_from_config(config, hass))
 
     @asyncio.coroutine
     def add_new_device(event):
@@ -170,7 +171,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
 
         device_config = config[CONF_DEVICE_DEFAULTS]
         device = entity_class(device_id, hass, **device_config)
-        async_add_devices([device])
+        async_add_entities([device])
 
         # Register entity to listen to incoming Rflink events
         hass.data[DATA_ENTITY_LOOKUP][
diff --git a/homeassistant/components/light/rfxtrx.py b/homeassistant/components/light/rfxtrx.py
index 293783ee3ab..10288773486 100644
--- a/homeassistant/components/light/rfxtrx.py
+++ b/homeassistant/components/light/rfxtrx.py
@@ -36,12 +36,12 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 SUPPORT_RFXTRX = SUPPORT_BRIGHTNESS
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the RFXtrx platform."""
     import RFXtrx as rfxtrxmod
 
     lights = rfxtrx.get_devices_from_config(config, RfxtrxLight)
-    add_devices(lights)
+    add_entities(lights)
 
     def light_update(event):
         """Handle light updates from the RFXtrx gateway."""
@@ -51,7 +51,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
         new_device = rfxtrx.get_new_device(event, config, RfxtrxLight)
         if new_device:
-            add_devices([new_device])
+            add_entities([new_device])
 
         rfxtrx.apply_received_command(event)
 
diff --git a/homeassistant/components/light/rpi_gpio_pwm.py b/homeassistant/components/light/rpi_gpio_pwm.py
index 9385c4bfb80..5a0e0546b1f 100644
--- a/homeassistant/components/light/rpi_gpio_pwm.py
+++ b/homeassistant/components/light/rpi_gpio_pwm.py
@@ -54,7 +54,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the PWM LED lights."""
     from pwmled.led import SimpleLed
     from pwmled.led.rgb import RgbLed
@@ -92,7 +92,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             return
         leds.append(led)
 
-    add_devices(leds)
+    add_entities(leds)
 
 
 class PwmSimpleLed(Light):
diff --git a/homeassistant/components/light/scsgate.py b/homeassistant/components/light/scsgate.py
index 3d567afe09e..4a18bc99672 100644
--- a/homeassistant/components/light/scsgate.py
+++ b/homeassistant/components/light/scsgate.py
@@ -23,7 +23,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the SCSGate switches."""
     devices = config.get(CONF_DEVICES)
     lights = []
@@ -42,7 +42,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             light = SCSGateLight(name=name, scs_id=scs_id, logger=logger)
             lights.append(light)
 
-    add_devices(lights)
+    add_entities(lights)
     scsgate.SCSGATE.add_devices_to_register(lights)
 
 
diff --git a/homeassistant/components/light/sensehat.py b/homeassistant/components/light/sensehat.py
index 6ab2592cedf..86153fffef8 100644
--- a/homeassistant/components/light/sensehat.py
+++ b/homeassistant/components/light/sensehat.py
@@ -28,14 +28,14 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Sense Hat Light platform."""
     from sense_hat import SenseHat
     sensehat = SenseHat()
 
     name = config.get(CONF_NAME)
 
-    add_devices([SenseHatLight(sensehat, name)])
+    add_entities([SenseHatLight(sensehat, name)])
 
 
 class SenseHatLight(Light):
diff --git a/homeassistant/components/light/sisyphus.py b/homeassistant/components/light/sisyphus.py
index ded78716317..75cc86a0154 100644
--- a/homeassistant/components/light/sisyphus.py
+++ b/homeassistant/components/light/sisyphus.py
@@ -17,10 +17,10 @@ DEPENDENCIES = ['sisyphus']
 SUPPORTED_FEATURES = SUPPORT_BRIGHTNESS
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a single Sisyphus table."""
     name = discovery_info[CONF_NAME]
-    add_devices(
+    add_entities(
         [SisyphusLight(name, hass.data[DATA_SISYPHUS][name])],
         update_before_add=True)
 
diff --git a/homeassistant/components/light/skybell.py b/homeassistant/components/light/skybell.py
index d32183f1468..ecb240f2ef3 100644
--- a/homeassistant/components/light/skybell.py
+++ b/homeassistant/components/light/skybell.py
@@ -19,7 +19,7 @@ DEPENDENCIES = ['skybell']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the platform for a Skybell device."""
     skybell = hass.data.get(SKYBELL_DOMAIN)
 
@@ -27,7 +27,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for device in skybell.get_devices():
         sensors.append(SkybellLight(device))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 def _to_skybell_level(level):
diff --git a/homeassistant/components/light/tellduslive.py b/homeassistant/components/light/tellduslive.py
index 3908d43f62d..6f39fb3b318 100644
--- a/homeassistant/components/light/tellduslive.py
+++ b/homeassistant/components/light/tellduslive.py
@@ -15,11 +15,11 @@ from homeassistant.components.tellduslive import TelldusLiveEntity
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Tellstick Net lights."""
     if discovery_info is None:
         return
-    add_devices(TelldusLiveLight(hass, light) for light in discovery_info)
+    add_entities(TelldusLiveLight(hass, light) for light in discovery_info)
 
 
 class TelldusLiveLight(TelldusLiveEntity, Light):
diff --git a/homeassistant/components/light/tellstick.py b/homeassistant/components/light/tellstick.py
index 44e5e40b3b7..cf9dd545e99 100644
--- a/homeassistant/components/light/tellstick.py
+++ b/homeassistant/components/light/tellstick.py
@@ -15,7 +15,7 @@ from homeassistant.components.tellstick import (
 SUPPORT_TELLSTICK = SUPPORT_BRIGHTNESS
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Tellstick lights."""
     if (discovery_info is None or
             discovery_info[ATTR_DISCOVER_DEVICES] is None):
@@ -24,10 +24,10 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     signal_repetitions = discovery_info.get(
         ATTR_DISCOVER_CONFIG, DEFAULT_SIGNAL_REPETITIONS)
 
-    add_devices([TellstickLight(hass.data[DATA_TELLSTICK][tellcore_id],
-                                signal_repetitions)
-                 for tellcore_id in discovery_info[ATTR_DISCOVER_DEVICES]],
-                True)
+    add_entities([TellstickLight(hass.data[DATA_TELLSTICK][tellcore_id],
+                                 signal_repetitions)
+                  for tellcore_id in discovery_info[ATTR_DISCOVER_DEVICES]],
+                 True)
 
 
 class TellstickLight(TellstickDevice, Light):
diff --git a/homeassistant/components/light/template.py b/homeassistant/components/light/template.py
index ad77b734fbb..9be6eb99acc 100644
--- a/homeassistant/components/light/template.py
+++ b/homeassistant/components/light/template.py
@@ -50,7 +50,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Template Lights."""
     lights = []
 
@@ -103,7 +104,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         _LOGGER.error("No lights added")
         return False
 
-    async_add_devices(lights)
+    async_add_entities(lights)
     return True
 
 
diff --git a/homeassistant/components/light/tikteck.py b/homeassistant/components/light/tikteck.py
index c21da57ea96..64b4069d98e 100644
--- a/homeassistant/components/light/tikteck.py
+++ b/homeassistant/components/light/tikteck.py
@@ -31,7 +31,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Tikteck platform."""
     lights = []
     for address, device_config in config[CONF_DEVICES].items():
@@ -43,7 +43,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         if light.is_valid:
             lights.append(light)
 
-    add_devices(lights)
+    add_entities(lights)
 
 
 class TikteckLight(Light):
diff --git a/homeassistant/components/light/tplink.py b/homeassistant/components/light/tplink.py
index 9374c1418f0..a1e46c07d7d 100644
--- a/homeassistant/components/light/tplink.py
+++ b/homeassistant/components/light/tplink.py
@@ -35,12 +35,12 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Initialise pyLB100 SmartBulb."""
     from pyHS100 import SmartBulb
     host = config.get(CONF_HOST)
     name = config.get(CONF_NAME)
-    add_devices([TPLinkSmartBulb(SmartBulb(host), name)], True)
+    add_entities([TPLinkSmartBulb(SmartBulb(host), name)], True)
 
 
 def brightness_to_percentage(byt):
diff --git a/homeassistant/components/light/tradfri.py b/homeassistant/components/light/tradfri.py
index c30745239ea..0d12d095bb6 100644
--- a/homeassistant/components/light/tradfri.py
+++ b/homeassistant/components/light/tradfri.py
@@ -32,7 +32,7 @@ SUPPORTED_GROUP_FEATURES = SUPPORT_BRIGHTNESS | SUPPORT_TRANSITION
 
 
 async def async_setup_platform(hass, config,
-                               async_add_devices, discovery_info=None):
+                               async_add_entities, discovery_info=None):
     """Set up the IKEA Tradfri Light platform."""
     if discovery_info is None:
         return
@@ -46,7 +46,7 @@ async def async_setup_platform(hass, config,
     devices = await api(devices_commands)
     lights = [dev for dev in devices if dev.has_light_control]
     if lights:
-        async_add_devices(
+        async_add_entities(
             TradfriLight(light, api, gateway_id) for light in lights)
 
     allow_tradfri_groups = hass.data[KEY_TRADFRI_GROUPS][gateway_id]
@@ -55,7 +55,7 @@ async def async_setup_platform(hass, config,
         groups_commands = await api(groups_command)
         groups = await api(groups_commands)
         if groups:
-            async_add_devices(
+            async_add_entities(
                 TradfriGroup(group, api, gateway_id) for group in groups)
 
 
diff --git a/homeassistant/components/light/tuya.py b/homeassistant/components/light/tuya.py
index d7691cea011..0dc2cacc1e0 100644
--- a/homeassistant/components/light/tuya.py
+++ b/homeassistant/components/light/tuya.py
@@ -14,7 +14,7 @@ from homeassistant.util import color as colorutil
 DEPENDENCIES = ['tuya']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Tuya light platform."""
     if discovery_info is None:
         return
@@ -26,7 +26,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         if device is None:
             continue
         devices.append(TuyaLight(device))
-    add_devices(devices)
+    add_entities(devices)
 
 
 class TuyaLight(TuyaDevice, Light):
diff --git a/homeassistant/components/light/vera.py b/homeassistant/components/light/vera.py
index e62ffaecdff..702236ac748 100644
--- a/homeassistant/components/light/vera.py
+++ b/homeassistant/components/light/vera.py
@@ -18,9 +18,9 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['vera']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Vera lights."""
-    add_devices(
+    add_entities(
         [VeraLight(device, hass.data[VERA_CONTROLLER]) for
          device in hass.data[VERA_DEVICES]['light']], True)
 
diff --git a/homeassistant/components/light/wemo.py b/homeassistant/components/light/wemo.py
index f07865473d1..72279fbe1a4 100644
--- a/homeassistant/components/light/wemo.py
+++ b/homeassistant/components/light/wemo.py
@@ -27,7 +27,7 @@ SUPPORT_WEMO = (SUPPORT_BRIGHTNESS | SUPPORT_COLOR_TEMP | SUPPORT_COLOR |
                 SUPPORT_TRANSITION)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up discovered WeMo switches."""
     from pywemo import discovery
 
@@ -43,12 +43,12 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             raise PlatformNotReady
 
         if device.model_name == 'Dimmer':
-            add_devices([WemoDimmer(device)])
+            add_entities([WemoDimmer(device)])
         else:
-            setup_bridge(device, add_devices)
+            setup_bridge(device, add_entities)
 
 
-def setup_bridge(bridge, add_devices):
+def setup_bridge(bridge, add_entities):
     """Set up a WeMo link."""
     lights = {}
 
@@ -65,7 +65,7 @@ def setup_bridge(bridge, add_devices):
                 new_lights.append(lights[light_id])
 
         if new_lights:
-            add_devices(new_lights)
+            add_entities(new_lights)
 
     update_lights()
 
diff --git a/homeassistant/components/light/wink.py b/homeassistant/components/light/wink.py
index a2cc4fd7aeb..ee8c2aca8b5 100644
--- a/homeassistant/components/light/wink.py
+++ b/homeassistant/components/light/wink.py
@@ -17,18 +17,18 @@ from homeassistant.util.color import \
 DEPENDENCIES = ['wink']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Wink lights."""
     import pywink
 
     for light in pywink.get_light_bulbs():
         _id = light.object_id() + light.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkLight(light, hass)])
+            add_entities([WinkLight(light, hass)])
     for light in pywink.get_light_groups():
         _id = light.object_id() + light.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkLight(light, hass)])
+            add_entities([WinkLight(light, hass)])
 
 
 class WinkLight(WinkDevice, Light):
diff --git a/homeassistant/components/light/x10.py b/homeassistant/components/light/x10.py
index e782e664801..ef2211a4469 100644
--- a/homeassistant/components/light/x10.py
+++ b/homeassistant/components/light/x10.py
@@ -39,7 +39,7 @@ def get_unit_status(code):
     return int(output.decode('utf-8')[0])
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the x10 Light platform."""
     try:
         x10_command('info')
@@ -47,7 +47,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error(err.output)
         return False
 
-    add_devices(X10Light(light) for light in config[CONF_DEVICES])
+    add_entities(X10Light(light) for light in config[CONF_DEVICES])
 
 
 class X10Light(Light):
diff --git a/homeassistant/components/light/xiaomi_aqara.py b/homeassistant/components/light/xiaomi_aqara.py
index 75c85a4bfcf..8ad0f2522d2 100644
--- a/homeassistant/components/light/xiaomi_aqara.py
+++ b/homeassistant/components/light/xiaomi_aqara.py
@@ -12,7 +12,7 @@ import homeassistant.util.color as color_util
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Perform the setup for Xiaomi devices."""
     devices = []
     for (_, gateway) in hass.data[PY_XIAOMI_GATEWAY].gateways.items():
@@ -21,7 +21,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             if model in ['gateway', 'gateway.v3']:
                 devices.append(XiaomiGatewayLight(device, 'Gateway Light',
                                                   gateway))
-    add_devices(devices)
+    add_entities(devices)
 
 
 class XiaomiGatewayLight(XiaomiDevice, Light):
diff --git a/homeassistant/components/light/xiaomi_miio.py b/homeassistant/components/light/xiaomi_miio.py
index 2171d084bf0..51c36fc2dd0 100644
--- a/homeassistant/components/light/xiaomi_miio.py
+++ b/homeassistant/components/light/xiaomi_miio.py
@@ -100,7 +100,7 @@ SERVICE_TO_METHOD = {
 }
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the light from config."""
     from miio import Device, DeviceException
@@ -164,7 +164,7 @@ async def async_setup_platform(hass, config, async_add_devices,
             'and provide the following data: %s', model)
         return False
 
-    async_add_devices(devices, update_before_add=True)
+    async_add_entities(devices, update_before_add=True)
 
     async def async_service_handler(service):
         """Map services to methods on Xiaomi Philips Lights."""
diff --git a/homeassistant/components/light/yeelight.py b/homeassistant/components/light/yeelight.py
index 791de291b48..a08ebe459b4 100644
--- a/homeassistant/components/light/yeelight.py
+++ b/homeassistant/components/light/yeelight.py
@@ -120,7 +120,7 @@ def _cmd(func):
     return _wrap
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Yeelight bulbs."""
     from yeelight.enums import PowerMode
 
@@ -150,7 +150,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             lights.append(light)
             hass.data[DATA_KEY][host] = light
 
-    add_devices(lights, True)
+    add_entities(lights, True)
 
     def service_handler(service):
         """Dispatch service calls to target entities."""
diff --git a/homeassistant/components/light/yeelightsunflower.py b/homeassistant/components/light/yeelightsunflower.py
index 96cce67b1bb..2250a85c55c 100644
--- a/homeassistant/components/light/yeelightsunflower.py
+++ b/homeassistant/components/light/yeelightsunflower.py
@@ -26,7 +26,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Yeelight Sunflower Light platform."""
     import yeelightsunflower
 
@@ -37,7 +37,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("Could not connect to Yeelight Sunflower hub")
         return False
 
-    add_devices(SunflowerBulb(light) for light in hub.get_lights())
+    add_entities(SunflowerBulb(light) for light in hub.get_lights())
 
 
 class SunflowerBulb(Light):
diff --git a/homeassistant/components/light/zengge.py b/homeassistant/components/light/zengge.py
index 35d2bf2388c..b283b8611dc 100644
--- a/homeassistant/components/light/zengge.py
+++ b/homeassistant/components/light/zengge.py
@@ -30,7 +30,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Zengge platform."""
     lights = []
     for address, device_config in config[CONF_DEVICES].items():
@@ -41,7 +41,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         if light.is_valid:
             lights.append(light)
 
-    add_devices(lights, True)
+    add_entities(lights, True)
 
 
 class ZenggeLight(Light):
diff --git a/homeassistant/components/light/zha.py b/homeassistant/components/light/zha.py
index bd01a513e0b..dc5c4977944 100644
--- a/homeassistant/components/light/zha.py
+++ b/homeassistant/components/light/zha.py
@@ -20,7 +20,7 @@ CAPABILITIES_COLOR_TEMP = 0x10
 UNSUPPORTED_ATTRIBUTE = 0x86
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the Zigbee Home Automation lights."""
     discovery_info = zha.get_discovery_info(hass, discovery_info)
@@ -42,7 +42,7 @@ async def async_setup_platform(hass, config, async_add_devices,
             if result.get('color_temperature') is not UNSUPPORTED_ATTRIBUTE:
                 discovery_info['color_capabilities'] |= CAPABILITIES_COLOR_TEMP
 
-    async_add_devices([Light(**discovery_info)], update_before_add=True)
+    async_add_entities([Light(**discovery_info)], update_before_add=True)
 
 
 class Light(zha.Entity, light.Light):
diff --git a/homeassistant/components/light/zigbee.py b/homeassistant/components/light/zigbee.py
index f4406abf7bd..42dc95d1163 100644
--- a/homeassistant/components/light/zigbee.py
+++ b/homeassistant/components/light/zigbee.py
@@ -22,9 +22,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Create and add an entity based on the configuration."""
-    add_devices([ZigBeeLight(hass, ZigBeeDigitalOutConfig(config))])
+    add_entities([ZigBeeLight(hass, ZigBeeDigitalOutConfig(config))])
 
 
 class ZigBeeLight(ZigBeeDigitalOut, Light):
diff --git a/homeassistant/components/lock/abode.py b/homeassistant/components/lock/abode.py
index 2d342326636..a8777ccb503 100644
--- a/homeassistant/components/lock/abode.py
+++ b/homeassistant/components/lock/abode.py
@@ -15,7 +15,7 @@ DEPENDENCIES = ['abode']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Abode lock devices."""
     import abodepy.helpers.constants as CONST
 
@@ -30,7 +30,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     data.devices.extend(devices)
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class AbodeLock(AbodeDevice, LockDevice):
diff --git a/homeassistant/components/lock/august.py b/homeassistant/components/lock/august.py
index 9ca63cb493b..7aec3c78690 100644
--- a/homeassistant/components/lock/august.py
+++ b/homeassistant/components/lock/august.py
@@ -15,7 +15,7 @@ DEPENDENCIES = ['august']
 SCAN_INTERVAL = timedelta(seconds=5)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up August locks."""
     data = hass.data[DATA_AUGUST]
     devices = []
@@ -23,7 +23,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for lock in data.locks:
         devices.append(AugustLock(data, lock))
 
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class AugustLock(LockDevice):
diff --git a/homeassistant/components/lock/bmw_connected_drive.py b/homeassistant/components/lock/bmw_connected_drive.py
index e48fd1af3c3..c84df54cfba 100644
--- a/homeassistant/components/lock/bmw_connected_drive.py
+++ b/homeassistant/components/lock/bmw_connected_drive.py
@@ -16,7 +16,7 @@ DEPENDENCIES = ['bmw_connected_drive']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the BMW Connected Drive lock."""
     accounts = hass.data[BMW_DOMAIN]
     _LOGGER.debug('Found BMW accounts: %s',
@@ -27,7 +27,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             for vehicle in account.account.vehicles:
                 device = BMWLock(account, vehicle, 'lock', 'BMW lock')
                 devices.append(device)
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class BMWLock(LockDevice):
diff --git a/homeassistant/components/lock/demo.py b/homeassistant/components/lock/demo.py
index 8da53a9ef11..a0cc45991c8 100644
--- a/homeassistant/components/lock/demo.py
+++ b/homeassistant/components/lock/demo.py
@@ -8,9 +8,9 @@ from homeassistant.components.lock import LockDevice, SUPPORT_OPEN
 from homeassistant.const import (STATE_LOCKED, STATE_UNLOCKED)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Demo lock platform."""
-    add_devices([
+    add_entities([
         DemoLock('Front Door', STATE_LOCKED),
         DemoLock('Kitchen Door', STATE_UNLOCKED),
         DemoLock('Openable Lock', STATE_LOCKED, True)
diff --git a/homeassistant/components/lock/homematic.py b/homeassistant/components/lock/homematic.py
index 7c4195d7c8b..9d9f2a28b4f 100644
--- a/homeassistant/components/lock/homematic.py
+++ b/homeassistant/components/lock/homematic.py
@@ -15,7 +15,7 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['homematic']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Homematic lock platform."""
     if discovery_info is None:
         return
@@ -24,7 +24,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for conf in discovery_info[ATTR_DISCOVER_DEVICES]:
         devices.append(HMLock(conf))
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class HMLock(HMDevice, LockDevice):
diff --git a/homeassistant/components/lock/isy994.py b/homeassistant/components/lock/isy994.py
index 9bcf5a86d08..9481e619a61 100644
--- a/homeassistant/components/lock/isy994.py
+++ b/homeassistant/components/lock/isy994.py
@@ -22,7 +22,7 @@ VALUE_TO_STATE = {
 
 
 def setup_platform(hass, config: ConfigType,
-                   add_devices: Callable[[list], None], discovery_info=None):
+                   add_entities: Callable[[list], None], discovery_info=None):
     """Set up the ISY994 lock platform."""
     devices = []
     for node in hass.data[ISY994_NODES][DOMAIN]:
@@ -31,7 +31,7 @@ def setup_platform(hass, config: ConfigType,
     for name, status, actions in hass.data[ISY994_PROGRAMS][DOMAIN]:
         devices.append(ISYLockProgram(name, status, actions))
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class ISYLockDevice(ISYDevice, LockDevice):
diff --git a/homeassistant/components/lock/kiwi.py b/homeassistant/components/lock/kiwi.py
index 78ea45525f2..5d217796767 100644
--- a/homeassistant/components/lock/kiwi.py
+++ b/homeassistant/components/lock/kiwi.py
@@ -32,7 +32,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the KIWI lock platform."""
     from kiwiki import KiwiClient, KiwiException
     try:
@@ -45,7 +45,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         # No locks found; abort setup routine.
         _LOGGER.info("No KIWI locks found in your account.")
         return
-    add_devices([KiwiLock(lock, kiwi) for lock in available_locks], True)
+    add_entities([KiwiLock(lock, kiwi) for lock in available_locks], True)
 
 
 class KiwiLock(LockDevice):
diff --git a/homeassistant/components/lock/lockitron.py b/homeassistant/components/lock/lockitron.py
index 6bf445ba477..b190a5cd2cd 100644
--- a/homeassistant/components/lock/lockitron.py
+++ b/homeassistant/components/lock/lockitron.py
@@ -26,15 +26,15 @@ API_STATE_URL = BASE_URL + '/v2/locks/{}?access_token={}'
 API_ACTION_URL = BASE_URL + '/v2/locks/{}?access_token={}&state={}'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Lockitron platform."""
     access_token = config.get(CONF_ACCESS_TOKEN)
     device_id = config.get(CONF_ID)
     response = requests.get(
         API_STATE_URL.format(device_id, access_token), timeout=5)
     if response.status_code == 200:
-        add_devices([Lockitron(response.json()['state'], access_token,
-                               device_id)])
+        add_entities([Lockitron(response.json()['state'], access_token,
+                                device_id)])
     else:
         _LOGGER.error(
             "Error retrieving lock status during init: %s", response.text)
diff --git a/homeassistant/components/lock/mqtt.py b/homeassistant/components/lock/mqtt.py
index 45029e679a5..103864a6bfd 100644
--- a/homeassistant/components/lock/mqtt.py
+++ b/homeassistant/components/lock/mqtt.py
@@ -42,7 +42,8 @@ PLATFORM_SCHEMA = mqtt.MQTT_RW_PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the MQTT lock."""
     if discovery_info is not None:
         config = PLATFORM_SCHEMA(discovery_info)
@@ -51,7 +52,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     if value_template is not None:
         value_template.hass = hass
 
-    async_add_devices([MqttLock(
+    async_add_entities([MqttLock(
         config.get(CONF_NAME),
         config.get(CONF_STATE_TOPIC),
         config.get(CONF_COMMAND_TOPIC),
diff --git a/homeassistant/components/lock/nello.py b/homeassistant/components/lock/nello.py
index f67243415c5..4fd9faafcbe 100644
--- a/homeassistant/components/lock/nello.py
+++ b/homeassistant/components/lock/nello.py
@@ -27,11 +27,11 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Nello lock platform."""
     from pynello import Nello
     nello = Nello(config.get(CONF_USERNAME), config.get(CONF_PASSWORD))
-    add_devices([NelloLock(lock) for lock in nello.locations], True)
+    add_entities([NelloLock(lock) for lock in nello.locations], True)
 
 
 class NelloLock(LockDevice):
diff --git a/homeassistant/components/lock/nuki.py b/homeassistant/components/lock/nuki.py
index 536c8f2abeb..6cf58dda04c 100644
--- a/homeassistant/components/lock/nuki.py
+++ b/homeassistant/components/lock/nuki.py
@@ -50,11 +50,11 @@ UNLATCH_SERVICE_SCHEMA = vol.Schema({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Nuki lock platform."""
     from pynuki import NukiBridge
     bridge = NukiBridge(config.get(CONF_HOST), config.get(CONF_TOKEN))
-    add_devices([NukiLock(lock) for lock in bridge.locks])
+    add_entities([NukiLock(lock) for lock in bridge.locks])
 
     def service_handler(service):
         """Service handler for nuki services."""
diff --git a/homeassistant/components/lock/sesame.py b/homeassistant/components/lock/sesame.py
index 8d9c05e3f26..44a6cfb265c 100644
--- a/homeassistant/components/lock/sesame.py
+++ b/homeassistant/components/lock/sesame.py
@@ -26,16 +26,16 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 def setup_platform(
         hass, config: ConfigType,
-        add_devices: Callable[[list], None], discovery_info=None):
+        add_entities: Callable[[list], None], discovery_info=None):
     """Set up the Sesame platform."""
     import pysesame
 
     email = config.get(CONF_EMAIL)
     password = config.get(CONF_PASSWORD)
 
-    add_devices([SesameDevice(sesame) for sesame in
-                 pysesame.get_sesames(email, password)],
-                update_before_add=True)
+    add_entities([SesameDevice(sesame) for sesame in
+                  pysesame.get_sesames(email, password)],
+                 update_before_add=True)
 
 
 class SesameDevice(LockDevice):
diff --git a/homeassistant/components/lock/tesla.py b/homeassistant/components/lock/tesla.py
index 4d24ed20003..2ffb996aec3 100644
--- a/homeassistant/components/lock/tesla.py
+++ b/homeassistant/components/lock/tesla.py
@@ -16,11 +16,11 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['tesla']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Tesla lock platform."""
     devices = [TeslaLock(device, hass.data[TESLA_DOMAIN]['controller'])
                for device in hass.data[TESLA_DOMAIN]['devices']['lock']]
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class TeslaLock(TeslaDevice, LockDevice):
diff --git a/homeassistant/components/lock/vera.py b/homeassistant/components/lock/vera.py
index e6e277cdee1..21287b6328e 100644
--- a/homeassistant/components/lock/vera.py
+++ b/homeassistant/components/lock/vera.py
@@ -16,9 +16,9 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['vera']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Find and return Vera locks."""
-    add_devices(
+    add_entities(
         [VeraLock(device, hass.data[VERA_CONTROLLER]) for
          device in hass.data[VERA_DEVICES]['lock']], True)
 
diff --git a/homeassistant/components/lock/verisure.py b/homeassistant/components/lock/verisure.py
index 4af19f52611..877c8a1ddf6 100644
--- a/homeassistant/components/lock/verisure.py
+++ b/homeassistant/components/lock/verisure.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Verisure platform."""
     locks = []
     if int(hub.config.get(CONF_LOCKS, 1)):
@@ -26,7 +26,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             for device_label in hub.get(
                 "$.doorLockStatusList[*].deviceLabel")])
 
-    add_devices(locks)
+    add_entities(locks)
 
 
 class VerisureDoorlock(LockDevice):
diff --git a/homeassistant/components/lock/volvooncall.py b/homeassistant/components/lock/volvooncall.py
index b6e7383b138..58fa83cef30 100644
--- a/homeassistant/components/lock/volvooncall.py
+++ b/homeassistant/components/lock/volvooncall.py
@@ -12,12 +12,12 @@ from homeassistant.components.volvooncall import VolvoEntity
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Volvo On Call lock."""
     if discovery_info is None:
         return
 
-    add_devices([VolvoLock(hass, *discovery_info)])
+    add_entities([VolvoLock(hass, *discovery_info)])
 
 
 class VolvoLock(VolvoEntity, LockDevice):
diff --git a/homeassistant/components/lock/wink.py b/homeassistant/components/lock/wink.py
index 1c42e427a00..03de8fc5919 100644
--- a/homeassistant/components/lock/wink.py
+++ b/homeassistant/components/lock/wink.py
@@ -66,14 +66,14 @@ ADD_KEY_SCHEMA = vol.Schema({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Wink platform."""
     import pywink
 
     for lock in pywink.get_locks():
         _id = lock.object_id() + lock.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkLockDevice(lock, hass)])
+            add_entities([WinkLockDevice(lock, hass)])
 
     def service_handle(service):
         """Handle for services."""
diff --git a/homeassistant/components/lock/xiaomi_aqara.py b/homeassistant/components/lock/xiaomi_aqara.py
index 9b084a2bc55..15415a73284 100644
--- a/homeassistant/components/lock/xiaomi_aqara.py
+++ b/homeassistant/components/lock/xiaomi_aqara.py
@@ -24,7 +24,7 @@ ATTR_VERIFIED_WRONG_TIMES = 'verified_wrong_times'
 UNLOCK_MAINTAIN_TIME = 5
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Perform the setup for Xiaomi devices."""
     devices = []
@@ -34,7 +34,7 @@ async def async_setup_platform(hass, config, async_add_devices,
             model = device['model']
             if model == 'lock.aq1':
                 devices.append(XiaomiAqaraLock(device, 'Lock', gateway))
-    async_add_devices(devices)
+    async_add_entities(devices)
 
 
 class XiaomiAqaraLock(LockDevice, XiaomiDevice):
diff --git a/homeassistant/components/lock/zwave.py b/homeassistant/components/lock/zwave.py
index b7bc9f15e19..5ee88f053b5 100644
--- a/homeassistant/components/lock/zwave.py
+++ b/homeassistant/components/lock/zwave.py
@@ -120,10 +120,11 @@ CLEAR_USERCODE_SCHEMA = vol.Schema({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Z-Wave Lock platform."""
     yield from zwave.async_setup_platform(
-        hass, config, async_add_devices, discovery_info)
+        hass, config, async_add_entities, discovery_info)
 
     network = hass.data[zwave.const.DATA_NETWORK]
 
diff --git a/homeassistant/components/mailbox/asterisk_mbox.py b/homeassistant/components/mailbox/asterisk_mbox.py
index 2e807058edf..47d59234d7d 100644
--- a/homeassistant/components/mailbox/asterisk_mbox.py
+++ b/homeassistant/components/mailbox/asterisk_mbox.py
@@ -21,7 +21,7 @@ SIGNAL_MESSAGE_REQUEST = 'asterisk_mbox.message_request'
 
 
 @asyncio.coroutine
-def async_get_handler(hass, config, async_add_devices, discovery_info=None):
+def async_get_handler(hass, config, async_add_entities, discovery_info=None):
     """Set up the Asterix VM platform."""
     return AsteriskMailbox(hass, DOMAIN)
 
diff --git a/homeassistant/components/media_player/anthemav.py b/homeassistant/components/media_player/anthemav.py
index a74629917b3..359ee0a9254 100644
--- a/homeassistant/components/media_player/anthemav.py
+++ b/homeassistant/components/media_player/anthemav.py
@@ -36,7 +36,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up our socket to the AVR."""
     import anthemav
 
@@ -63,7 +64,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     _LOGGER.debug("dump_rawdata: %s", avr.protocol.dump_rawdata)
 
     hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, device.avr.close)
-    async_add_devices([device])
+    async_add_entities([device])
 
 
 class AnthemAVR(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/apple_tv.py b/homeassistant/components/media_player/apple_tv.py
index d4a7ad19807..360ccd0f522 100644
--- a/homeassistant/components/media_player/apple_tv.py
+++ b/homeassistant/components/media_player/apple_tv.py
@@ -31,7 +31,8 @@ SUPPORT_APPLE_TV = SUPPORT_TURN_ON | SUPPORT_TURN_OFF | SUPPORT_PLAY_MEDIA | \
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Apple TV platform."""
     if not discovery_info:
         return
@@ -56,7 +57,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     if entity not in hass.data[DATA_ENTITIES]:
         hass.data[DATA_ENTITIES].append(entity)
 
-    async_add_devices([entity])
+    async_add_entities([entity])
 
 
 class AppleTvDevice(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/aquostv.py b/homeassistant/components/media_player/aquostv.py
index 93daf5b2f89..6e8cc727121 100644
--- a/homeassistant/components/media_player/aquostv.py
+++ b/homeassistant/components/media_player/aquostv.py
@@ -59,7 +59,7 @@ SOURCES = {0: 'TV / Antenna',
            8: 'PC_IN'}
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Sharp Aquos TV platform."""
     import sharp_aquos_rc
 
@@ -77,13 +77,13 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
         host = vals[0]
         remote = sharp_aquos_rc.TV(host, port, username, password, timeout=20)
-        add_devices([SharpAquosTVDevice(name, remote, power_on_enabled)])
+        add_entities([SharpAquosTVDevice(name, remote, power_on_enabled)])
         return True
 
     host = config.get(CONF_HOST)
     remote = sharp_aquos_rc.TV(host, port, username, password, 15, 1)
 
-    add_devices([SharpAquosTVDevice(name, remote, power_on_enabled)])
+    add_entities([SharpAquosTVDevice(name, remote, power_on_enabled)])
     return True
 
 
diff --git a/homeassistant/components/media_player/blackbird.py b/homeassistant/components/media_player/blackbird.py
index 3d8e1fde687..7869093138c 100644
--- a/homeassistant/components/media_player/blackbird.py
+++ b/homeassistant/components/media_player/blackbird.py
@@ -61,7 +61,7 @@ PLATFORM_SCHEMA = vol.All(
     }))
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Monoprice Blackbird 4k 8x8 HDBaseT Matrix platform."""
     if DATA_BLACKBIRD not in hass.data:
         hass.data[DATA_BLACKBIRD] = {}
@@ -100,7 +100,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         hass.data[DATA_BLACKBIRD][unique_id] = device
         devices.append(device)
 
-    add_devices(devices, True)
+    add_entities(devices, True)
 
     def service_handle(service):
         """Handle for services."""
diff --git a/homeassistant/components/media_player/bluesound.py b/homeassistant/components/media_player/bluesound.py
index 5631ec06cf1..1fe939b34ef 100644
--- a/homeassistant/components/media_player/bluesound.py
+++ b/homeassistant/components/media_player/bluesound.py
@@ -88,7 +88,7 @@ SERVICE_TO_METHOD = {
 }
 
 
-def _add_player(hass, async_add_devices, host, port=None, name=None):
+def _add_player(hass, async_add_entities, host, port=None, name=None):
     """Add Bluesound players."""
     if host in [x.host for x in hass.data[DATA_BLUESOUND]]:
         return
@@ -111,7 +111,7 @@ def _add_player(hass, async_add_devices, host, port=None, name=None):
     @callback
     def _add_player_cb():
         """Add player after first sync fetch."""
-        async_add_devices([player])
+        async_add_entities([player])
         _LOGGER.info("Added device with name: %s", player.name)
 
         if hass.is_running:
@@ -132,13 +132,13 @@ def _add_player(hass, async_add_devices, host, port=None, name=None):
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the Bluesound platforms."""
     if DATA_BLUESOUND not in hass.data:
         hass.data[DATA_BLUESOUND] = []
 
     if discovery_info:
-        _add_player(hass, async_add_devices, discovery_info.get(CONF_HOST),
+        _add_player(hass, async_add_entities, discovery_info.get(CONF_HOST),
                     discovery_info.get(CONF_PORT, None))
         return
 
@@ -146,7 +146,7 @@ async def async_setup_platform(
     if hosts:
         for host in hosts:
             _add_player(
-                hass, async_add_devices, host.get(CONF_HOST),
+                hass, async_add_entities, host.get(CONF_HOST),
                 host.get(CONF_PORT), host.get(CONF_NAME))
 
     async def async_service_handler(service):
diff --git a/homeassistant/components/media_player/braviatv.py b/homeassistant/components/media_player/braviatv.py
index 07a379db45c..9f4496582ad 100644
--- a/homeassistant/components/media_player/braviatv.py
+++ b/homeassistant/components/media_player/braviatv.py
@@ -58,7 +58,7 @@ def _get_mac_address(ip_address):
     return None
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Sony Bravia TV platform."""
     host = config.get(CONF_HOST)
 
@@ -74,19 +74,19 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             pin = host_config['pin']
             mac = host_config['mac']
             name = config.get(CONF_NAME)
-            add_devices([BraviaTVDevice(host, mac, name, pin)])
+            add_entities([BraviaTVDevice(host, mac, name, pin)])
             return
 
-    setup_bravia(config, pin, hass, add_devices)
+    setup_bravia(config, pin, hass, add_entities)
 
 
-def setup_bravia(config, pin, hass, add_devices):
+def setup_bravia(config, pin, hass, add_entities):
     """Set up a Sony Bravia TV based on host parameter."""
     host = config.get(CONF_HOST)
     name = config.get(CONF_NAME)
 
     if pin is None:
-        request_configuration(config, hass, add_devices)
+        request_configuration(config, hass, add_entities)
         return
 
     mac = _get_mac_address(host)
@@ -104,10 +104,10 @@ def setup_bravia(config, pin, hass, add_devices):
         hass.config.path(BRAVIA_CONFIG_FILE),
         {host: {'pin': pin, 'host': host, 'mac': mac}})
 
-    add_devices([BraviaTVDevice(host, mac, name, pin)])
+    add_entities([BraviaTVDevice(host, mac, name, pin)])
 
 
-def request_configuration(config, hass, add_devices):
+def request_configuration(config, hass, add_entities):
     """Request configuration steps from the user."""
     host = config.get(CONF_HOST)
     name = config.get(CONF_NAME)
@@ -128,9 +128,9 @@ def request_configuration(config, hass, add_devices):
         braviarc = braviarc.BraviaRC(host)
         braviarc.connect(pin, CLIENTID_PREFIX, NICKNAME)
         if braviarc.is_connected():
-            setup_bravia(config, pin, hass, add_devices)
+            setup_bravia(config, pin, hass, add_entities)
         else:
-            request_configuration(config, hass, add_devices)
+            request_configuration(config, hass, add_entities)
 
     _CONFIGURING[host] = configurator.request_config(
         name, bravia_configuration_callback,
diff --git a/homeassistant/components/media_player/cast.py b/homeassistant/components/media_player/cast.py
index 2c66d458095..ae9589c7886 100644
--- a/homeassistant/components/media_player/cast.py
+++ b/homeassistant/components/media_player/cast.py
@@ -186,7 +186,7 @@ def _async_create_cast_device(hass: HomeAssistantType,
 
 
 async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
-                               async_add_devices, discovery_info=None):
+                               async_add_entities, discovery_info=None):
     """Set up thet Cast platform.
 
     Deprecated.
@@ -195,22 +195,22 @@ async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
         'Setting configuration for Cast via platform is deprecated. '
         'Configure via Cast component instead.')
     await _async_setup_platform(
-        hass, config, async_add_devices, discovery_info)
+        hass, config, async_add_entities, discovery_info)
 
 
-async def async_setup_entry(hass, config_entry, async_add_devices):
+async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up Cast from a config entry."""
     config = hass.data[CAST_DOMAIN].get('media_player', {})
     if not isinstance(config, list):
         config = [config]
 
     await asyncio.wait([
-        _async_setup_platform(hass, cfg, async_add_devices, None)
+        _async_setup_platform(hass, cfg, async_add_entities, None)
         for cfg in config])
 
 
 async def _async_setup_platform(hass: HomeAssistantType, config: ConfigType,
-                                async_add_devices, discovery_info):
+                                async_add_entities, discovery_info):
     """Set up the cast platform."""
     import pychromecast
 
@@ -236,7 +236,7 @@ async def _async_setup_platform(hass: HomeAssistantType, config: ConfigType,
 
         cast_device = _async_create_cast_device(hass, discover)
         if cast_device is not None:
-            async_add_devices([cast_device])
+            async_add_entities([cast_device])
 
     async_dispatcher_connect(hass, SIGNAL_CAST_DISCOVERED,
                              async_cast_discovered)
diff --git a/homeassistant/components/media_player/channels.py b/homeassistant/components/media_player/channels.py
index 71ef5412d9e..fcfa16b33ac 100644
--- a/homeassistant/components/media_player/channels.py
+++ b/homeassistant/components/media_player/channels.py
@@ -55,7 +55,7 @@ CHANNELS_SEEK_BY_SCHEMA = CHANNELS_SCHEMA.extend({
 REQUIREMENTS = ['pychannels==1.0.0']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Channels platform."""
     device = ChannelsPlayer(
         config.get('name'),
@@ -66,7 +66,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     if DATA_CHANNELS not in hass.data:
         hass.data[DATA_CHANNELS] = []
 
-    add_devices([device], True)
+    add_entities([device], True)
     hass.data[DATA_CHANNELS].append(device)
 
     def service_handler(service):
diff --git a/homeassistant/components/media_player/clementine.py b/homeassistant/components/media_player/clementine.py
index 1ee18576ab8..fab2bef73f0 100644
--- a/homeassistant/components/media_player/clementine.py
+++ b/homeassistant/components/media_player/clementine.py
@@ -43,7 +43,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Clementine platform."""
     from clementineremote import ClementineRemote
     host = config.get(CONF_HOST)
@@ -52,7 +52,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     client = ClementineRemote(host, port, token, reconnect=True)
 
-    add_devices([ClementineDevice(client, config[CONF_NAME])])
+    add_entities([ClementineDevice(client, config[CONF_NAME])])
 
 
 class ClementineDevice(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/cmus.py b/homeassistant/components/media_player/cmus.py
index 978a1088aa6..6f579fd9791 100644
--- a/homeassistant/components/media_player/cmus.py
+++ b/homeassistant/components/media_player/cmus.py
@@ -38,7 +38,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discover_info=None):
+def setup_platform(hass, config, add_entities, discover_info=None):
     """Set up the CMUS platform."""
     from pycmus import exceptions
 
@@ -52,7 +52,7 @@ def setup_platform(hass, config, add_devices, discover_info=None):
     except exceptions.InvalidPassword:
         _LOGGER.error("The provided password was rejected by cmus")
         return False
-    add_devices([cmus_remote], True)
+    add_entities([cmus_remote], True)
 
 
 class CmusDevice(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/demo.py b/homeassistant/components/media_player/demo.py
index 9edf69cd9c6..06f2a3f1155 100644
--- a/homeassistant/components/media_player/demo.py
+++ b/homeassistant/components/media_player/demo.py
@@ -14,9 +14,9 @@ from homeassistant.const import STATE_OFF, STATE_PAUSED, STATE_PLAYING
 import homeassistant.util.dt as dt_util
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the media player demo platform."""
-    add_devices([
+    add_entities([
         DemoYoutubePlayer(
             'Living Room', 'eyU3bRy2x44',
             '♥♥ The Best Fireplace Video (3 hours)', 300),
diff --git a/homeassistant/components/media_player/denon.py b/homeassistant/components/media_player/denon.py
index d85bd51e7fb..320211e700f 100644
--- a/homeassistant/components/media_player/denon.py
+++ b/homeassistant/components/media_player/denon.py
@@ -49,12 +49,12 @@ MEDIA_MODES = {'Tuner': 'TUNER', 'Media server': 'SERVER',
 #  'Favorites': 'FVP'}
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Denon platform."""
     denon = DenonDevice(config.get(CONF_NAME), config.get(CONF_HOST))
 
     if denon.update():
-        add_devices([denon])
+        add_entities([denon])
 
 
 class DenonDevice(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/denonavr.py b/homeassistant/components/media_player/denonavr.py
index 604fb91451e..14839590bee 100644
--- a/homeassistant/components/media_player/denonavr.py
+++ b/homeassistant/components/media_player/denonavr.py
@@ -61,7 +61,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 NewHost = namedtuple('NewHost', ['host', 'name'])
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Denon platform."""
     import denonavr
 
@@ -124,7 +124,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     # Add all freshly discovered receivers
     if receivers:
-        add_devices(receivers)
+        add_entities(receivers)
 
 
 class DenonDevice(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/directv.py b/homeassistant/components/media_player/directv.py
index 89547892550..e03474cdb38 100644
--- a/homeassistant/components/media_player/directv.py
+++ b/homeassistant/components/media_player/directv.py
@@ -36,7 +36,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the DirecTV platform."""
     known_devices = hass.data.get(DATA_DIRECTV)
     if not known_devices:
@@ -75,7 +75,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         dtvs.append(DirecTvDevice(*host))
         known_devices.append(host[-1])
 
-    add_devices(dtvs)
+    add_entities(dtvs)
     hass.data[DATA_DIRECTV] = known_devices
 
     return True
diff --git a/homeassistant/components/media_player/dlna_dmr.py b/homeassistant/components/media_player/dlna_dmr.py
index 7a0049df867..6c970ec197e 100644
--- a/homeassistant/components/media_player/dlna_dmr.py
+++ b/homeassistant/components/media_player/dlna_dmr.py
@@ -118,7 +118,7 @@ async def async_start_event_handler(hass, server_host, server_port, requester):
 
 async def async_setup_platform(hass: HomeAssistant,
                                config,
-                               async_add_devices,
+                               async_add_entities,
                                discovery_info=None):
     """Set up DLNA DMR platform."""
     if config.get(CONF_URL) is not None:
@@ -165,7 +165,7 @@ async def async_setup_platform(hass: HomeAssistant,
     # create our own device
     device = DlnaDmrDevice(dlna_device, name)
     _LOGGER.debug("Adding device: %s", device)
-    async_add_devices([device], True)
+    async_add_entities([device], True)
 
 
 class DlnaDmrDevice(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/dunehd.py b/homeassistant/components/media_player/dunehd.py
index ed20ac25cf9..f582ceefe5f 100644
--- a/homeassistant/components/media_player/dunehd.py
+++ b/homeassistant/components/media_player/dunehd.py
@@ -32,7 +32,7 @@ DUNEHD_PLAYER_SUPPORT = \
     SUPPORT_PLAY
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the DuneHD media player platform."""
     from pdunehd import DuneHDPlayer
 
@@ -40,7 +40,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     host = config.get(CONF_HOST)
     name = config.get(CONF_NAME)
 
-    add_devices([DuneHDPlayerEntity(DuneHDPlayer(host), name, sources)], True)
+    add_entities([DuneHDPlayerEntity(DuneHDPlayer(host), name, sources)], True)
 
 
 class DuneHDPlayerEntity(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/emby.py b/homeassistant/components/media_player/emby.py
index 8dd4ebcb120..b64aad38b3e 100644
--- a/homeassistant/components/media_player/emby.py
+++ b/homeassistant/components/media_player/emby.py
@@ -51,7 +51,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Emby platform."""
     from pyemby import EmbyServer
 
@@ -94,7 +95,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
 
         if new_devices:
             _LOGGER.debug("Adding new devices: %s", new_devices)
-            async_add_devices(new_devices, update_before_add=True)
+            async_add_entities(new_devices, update_before_add=True)
 
     @callback
     def device_removal_callback(data):
diff --git a/homeassistant/components/media_player/epson.py b/homeassistant/components/media_player/epson.py
index b22234a4094..23bbf685004 100644
--- a/homeassistant/components/media_player/epson.py
+++ b/homeassistant/components/media_player/epson.py
@@ -40,7 +40,7 @@ SUPPORT_EPSON = SUPPORT_TURN_ON | SUPPORT_TURN_OFF | SUPPORT_SELECT_SOURCE |\
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the Epson media player platform."""
     if DATA_EPSON not in hass.data:
@@ -52,7 +52,7 @@ async def async_setup_platform(hass, config, async_add_devices,
                            name, host,
                            config.get(CONF_PORT), config.get(CONF_SSL))
     hass.data[DATA_EPSON].append(epson)
-    async_add_devices([epson], update_before_add=True)
+    async_add_entities([epson], update_before_add=True)
 
     async def async_service_handler(service):
         """Handle for services."""
diff --git a/homeassistant/components/media_player/firetv.py b/homeassistant/components/media_player/firetv.py
index 979aec57c74..0594b603a0c 100644
--- a/homeassistant/components/media_player/firetv.py
+++ b/homeassistant/components/media_player/firetv.py
@@ -45,7 +45,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the FireTV platform."""
     name = config.get(CONF_NAME)
     ssl = config.get(CONF_SSL)
@@ -58,7 +58,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         response = requests.get(
             DEVICE_LIST_URL.format(proto, host, port)).json()
         if device_id in response[CONF_DEVICES].keys():
-            add_devices([FireTVDevice(proto, host, port, device_id, name)])
+            add_entities([FireTVDevice(proto, host, port, device_id, name)])
             _LOGGER.info("Device %s accessible and ready for control",
                          device_id)
         else:
diff --git a/homeassistant/components/media_player/frontier_silicon.py b/homeassistant/components/media_player/frontier_silicon.py
index b59c9a199b8..6dc4e73b1c0 100644
--- a/homeassistant/components/media_player/frontier_silicon.py
+++ b/homeassistant/components/media_player/frontier_silicon.py
@@ -42,12 +42,13 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Frontier Silicon platform."""
     import requests
 
     if discovery_info is not None:
-        async_add_devices(
+        async_add_entities(
             [AFSAPIDevice(discovery_info['ssdp_description'],
                           DEFAULT_PASSWORD)],
             update_before_add=True)
@@ -58,7 +59,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     password = config.get(CONF_PASSWORD)
 
     try:
-        async_add_devices(
+        async_add_entities(
             [AFSAPIDevice(DEVICE_URL.format(host, port), password)],
             update_before_add=True)
         _LOGGER.debug("FSAPI device %s:%s -> %s", host, port, password)
diff --git a/homeassistant/components/media_player/gpmdp.py b/homeassistant/components/media_player/gpmdp.py
index 4a0ec1fa87f..200191ad77a 100644
--- a/homeassistant/components/media_player/gpmdp.py
+++ b/homeassistant/components/media_player/gpmdp.py
@@ -45,7 +45,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def request_configuration(hass, config, url, add_devices_callback):
+def request_configuration(hass, config, url, add_entities_callback):
     """Request configuration steps from the user."""
     configurator = hass.components.configurator
     if 'gpmdp' in _CONFIGURING:
@@ -84,7 +84,7 @@ def request_configuration(hass, config, url, add_devices_callback):
             if code == 'CODE_REQUIRED':
                 continue
             setup_gpmdp(hass, config, code,
-                        add_devices_callback)
+                        add_entities_callback)
             save_json(hass.config.path(GPMDP_CONFIG_FILE), {"CODE": code})
             websocket.send(json.dumps({'namespace': 'connect',
                                        'method': 'connect',
@@ -102,7 +102,7 @@ def request_configuration(hass, config, url, add_devices_callback):
     )
 
 
-def setup_gpmdp(hass, config, code, add_devices):
+def setup_gpmdp(hass, config, code, add_entities):
     """Set up gpmdp."""
     name = config.get(CONF_NAME)
     host = config.get(CONF_HOST)
@@ -110,17 +110,17 @@ def setup_gpmdp(hass, config, code, add_devices):
     url = 'ws://{}:{}'.format(host, port)
 
     if not code:
-        request_configuration(hass, config, url, add_devices)
+        request_configuration(hass, config, url, add_entities)
         return
 
     if 'gpmdp' in _CONFIGURING:
         configurator = hass.components.configurator
         configurator.request_done(_CONFIGURING.pop('gpmdp'))
 
-    add_devices([GPMDP(name, url, code)], True)
+    add_entities([GPMDP(name, url, code)], True)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the GPMDP platform."""
     codeconfig = load_json(hass.config.path(GPMDP_CONFIG_FILE))
     if codeconfig:
@@ -131,7 +131,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         code = None
     else:
         code = None
-    setup_gpmdp(hass, config, code, add_devices)
+    setup_gpmdp(hass, config, code, add_entities)
 
 
 class GPMDP(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/gstreamer.py b/homeassistant/components/media_player/gstreamer.py
index 91cd8d19cc4..e2477f0a4cd 100644
--- a/homeassistant/components/media_player/gstreamer.py
+++ b/homeassistant/components/media_player/gstreamer.py
@@ -34,7 +34,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Gstreamer platform."""
     from gsp import GstreamerPlayer
     name = config.get(CONF_NAME)
@@ -46,7 +46,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         player.quit()
 
     hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, _shutdown)
-    add_devices([GstreamerDevice(player, name)])
+    add_entities([GstreamerDevice(player, name)])
 
 
 class GstreamerDevice(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/hdmi_cec.py b/homeassistant/components/media_player/hdmi_cec.py
index f5b4cbd4854..9198e4dec88 100644
--- a/homeassistant/components/media_player/hdmi_cec.py
+++ b/homeassistant/components/media_player/hdmi_cec.py
@@ -22,13 +22,13 @@ _LOGGER = logging.getLogger(__name__)
 ENTITY_ID_FORMAT = DOMAIN + '.{}'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Find and return HDMI devices as +switches."""
     if ATTR_NEW in discovery_info:
         _LOGGER.info("Setting up HDMI devices %s", discovery_info[ATTR_NEW])
-        add_devices(CecPlayerDevice(hass, hass.data.get(device),
-                                    hass.data.get(device).logical_address) for
-                    device in discovery_info[ATTR_NEW])
+        add_entities(CecPlayerDevice(hass, hass.data.get(device),
+                                     hass.data.get(device).logical_address) for
+                     device in discovery_info[ATTR_NEW])
 
 
 class CecPlayerDevice(CecDevice, MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/horizon.py b/homeassistant/components/media_player/horizon.py
index 9be4143ef2b..4fa97cb5537 100644
--- a/homeassistant/components/media_player/horizon.py
+++ b/homeassistant/components/media_player/horizon.py
@@ -41,7 +41,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Horizon platform."""
     from einder import Client, keys
     from einder.exceptions import AuthenticationError
@@ -62,7 +62,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     _LOGGER.info("Connection to %s at %s established", name, host)
 
-    add_devices([HorizonDevice(client, name, keys)], True)
+    add_entities([HorizonDevice(client, name, keys)], True)
 
 
 class HorizonDevice(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/itunes.py b/homeassistant/components/media_player/itunes.py
index e5f7a2f9432..31df74dbeaf 100644
--- a/homeassistant/components/media_player/itunes.py
+++ b/homeassistant/components/media_player/itunes.py
@@ -157,16 +157,16 @@ class Itunes:
         return self._request('PUT', path, {'level': level})
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the iTunes platform."""
-    add_devices([
+    add_entities([
         ItunesDevice(
             config.get(CONF_NAME),
             config.get(CONF_HOST),
             config.get(CONF_PORT),
             config.get(CONF_SSL),
 
-            add_devices
+            add_entities
         )
     ])
 
@@ -174,13 +174,13 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 class ItunesDevice(MediaPlayerDevice):
     """Representation of an iTunes API instance."""
 
-    def __init__(self, name, host, port, use_ssl, add_devices):
+    def __init__(self, name, host, port, use_ssl, add_entities):
         """Initialize the iTunes device."""
         self._name = name
         self._host = host
         self._port = port
         self._use_ssl = use_ssl
-        self._add_devices = add_devices
+        self._add_entities = add_entities
 
         self.client = Itunes(self._host, self._port, self._use_ssl)
 
@@ -257,7 +257,7 @@ class ItunesDevice(MediaPlayerDevice):
                 new_devices.append(airplay_device)
 
         if new_devices:
-            self._add_devices(new_devices)
+            self._add_entities(new_devices)
 
     @property
     def is_volume_muted(self):
diff --git a/homeassistant/components/media_player/kodi.py b/homeassistant/components/media_player/kodi.py
index 08de2d00835..b36512e7c65 100644
--- a/homeassistant/components/media_player/kodi.py
+++ b/homeassistant/components/media_player/kodi.py
@@ -155,7 +155,8 @@ def _check_deprecated_turn_off(hass, turn_off_action):
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Kodi platform."""
     if DATA_KODI not in hass.data:
         hass.data[DATA_KODI] = dict()
@@ -206,7 +207,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         unique_id=unique_id)
 
     hass.data[DATA_KODI][ip_addr] = entity
-    async_add_devices([entity], update_before_add=True)
+    async_add_entities([entity], update_before_add=True)
 
     @asyncio.coroutine
     def async_service_handler(service):
diff --git a/homeassistant/components/media_player/lg_netcast.py b/homeassistant/components/media_player/lg_netcast.py
index 955ba7ccb32..cbc15af91b6 100644
--- a/homeassistant/components/media_player/lg_netcast.py
+++ b/homeassistant/components/media_player/lg_netcast.py
@@ -42,7 +42,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the LG TV platform."""
     from pylgnetcast import LgNetCastClient
     host = config.get(CONF_HOST)
@@ -51,7 +51,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     client = LgNetCastClient(host, access_token)
 
-    add_devices([LgTVDevice(client, name)], True)
+    add_entities([LgTVDevice(client, name)], True)
 
 
 class LgTVDevice(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/liveboxplaytv.py b/homeassistant/components/media_player/liveboxplaytv.py
index 1b5948c964a..d5b1bcd78fe 100644
--- a/homeassistant/components/media_player/liveboxplaytv.py
+++ b/homeassistant/components/media_player/liveboxplaytv.py
@@ -45,7 +45,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Orange Livebox Play TV platform."""
     host = config.get(CONF_HOST)
     port = config.get(CONF_PORT)
@@ -59,7 +60,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     except IOError:
         _LOGGER.error("Failed to connect to Livebox Play TV at %s:%s. "
                       "Please check your configuration", host, port)
-    async_add_devices(livebox_devices, True)
+    async_add_entities(livebox_devices, True)
 
 
 class LiveboxPlayTvDevice(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/mediaroom.py b/homeassistant/components/media_player/mediaroom.py
index fd7229f79f5..f0b5365cf83 100644
--- a/homeassistant/components/media_player/mediaroom.py
+++ b/homeassistant/components/media_player/mediaroom.py
@@ -49,7 +49,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
 )
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the Mediaroom platform."""
     known_hosts = hass.data.get(DATA_MEDIAROOM)
@@ -57,10 +57,10 @@ async def async_setup_platform(hass, config, async_add_devices,
         known_hosts = hass.data[DATA_MEDIAROOM] = []
     host = config.get(CONF_HOST, None)
     if host:
-        async_add_devices([MediaroomDevice(host=host,
-                                           device_id=None,
-                                           optimistic=config[CONF_OPTIMISTIC],
-                                           timeout=config[CONF_TIMEOUT])])
+        async_add_entities([MediaroomDevice(host=host,
+                                            device_id=None,
+                                            optimistic=config[CONF_OPTIMISTIC],
+                                            timeout=config[CONF_TIMEOUT])])
         hass.data[DATA_MEDIAROOM].append(host)
 
     _LOGGER.debug("Trying to discover Mediaroom STB")
@@ -77,7 +77,7 @@ async def async_setup_platform(hass, config, async_add_devices,
             host=notify.ip_address, device_id=notify.device_uuid,
             optimistic=False
         )
-        async_add_devices([new_stb])
+        async_add_entities([new_stb])
 
     if not config[CONF_OPTIMISTIC]:
         from pymediaroom import install_mediaroom_protocol
diff --git a/homeassistant/components/media_player/monoprice.py b/homeassistant/components/media_player/monoprice.py
index a951356500f..96b8dcbcf26 100644
--- a/homeassistant/components/media_player/monoprice.py
+++ b/homeassistant/components/media_player/monoprice.py
@@ -55,7 +55,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Monoprice 6-zone amplifier platform."""
     port = config.get(CONF_PORT)
 
@@ -76,7 +76,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         hass.data[DATA_MONOPRICE].append(MonopriceZone(
             monoprice, sources, zone_id, extra[CONF_NAME]))
 
-    add_devices(hass.data[DATA_MONOPRICE], True)
+    add_entities(hass.data[DATA_MONOPRICE], True)
 
     def service_handle(service):
         """Handle for services."""
diff --git a/homeassistant/components/media_player/mpchc.py b/homeassistant/components/media_player/mpchc.py
index 773825e0d57..840429ef3d4 100644
--- a/homeassistant/components/media_player/mpchc.py
+++ b/homeassistant/components/media_player/mpchc.py
@@ -35,7 +35,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the MPC-HC platform."""
     name = config.get(CONF_NAME)
     host = config.get(CONF_HOST)
@@ -43,7 +43,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     url = '{}:{}'.format(host, port)
 
-    add_devices([MpcHcDevice(name, url)], True)
+    add_entities([MpcHcDevice(name, url)], True)
 
 
 class MpcHcDevice(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/mpd.py b/homeassistant/components/media_player/mpd.py
index be9dfa77377..8953215f44e 100644
--- a/homeassistant/components/media_player/mpd.py
+++ b/homeassistant/components/media_player/mpd.py
@@ -45,7 +45,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the MPD platform."""
     host = config.get(CONF_HOST)
     port = config.get(CONF_PORT)
@@ -53,7 +53,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     password = config.get(CONF_PASSWORD)
 
     device = MpdDevice(host, port, password, name)
-    add_devices([device], True)
+    add_entities([device], True)
 
 
 class MpdDevice(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/nad.py b/homeassistant/components/media_player/nad.py
index 2f0c49b2583..d30c5815d3f 100644
--- a/homeassistant/components/media_player/nad.py
+++ b/homeassistant/components/media_player/nad.py
@@ -47,10 +47,10 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the NAD platform."""
     from nad_receiver import NADReceiver
-    add_devices([NAD(
+    add_entities([NAD(
         config.get(CONF_NAME),
         NADReceiver(config.get(CONF_SERIAL_PORT)),
         config.get(CONF_MIN_VOLUME),
diff --git a/homeassistant/components/media_player/nadtcp.py b/homeassistant/components/media_player/nadtcp.py
index 06ec3c04cbe..dd3c5e26d7a 100644
--- a/homeassistant/components/media_player/nadtcp.py
+++ b/homeassistant/components/media_player/nadtcp.py
@@ -40,10 +40,10 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the NAD platform."""
     from nad_receiver import NADReceiverTCP
-    add_devices([NADtcp(
+    add_entities([NADtcp(
         NADReceiverTCP(config.get(CONF_HOST)),
         config.get(CONF_NAME),
         config.get(CONF_MIN_VOLUME),
diff --git a/homeassistant/components/media_player/onkyo.py b/homeassistant/components/media_player/onkyo.py
index 92443ca2b42..af9a6ef54ce 100644
--- a/homeassistant/components/media_player/onkyo.py
+++ b/homeassistant/components/media_player/onkyo.py
@@ -80,7 +80,7 @@ def determine_zones(receiver):
     return out
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Onkyo platform."""
     import eiscp
     from eiscp import eISCP
@@ -122,7 +122,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             if receiver.host not in KNOWN_HOSTS:
                 hosts.append(OnkyoDevice(receiver, config.get(CONF_SOURCES)))
                 KNOWN_HOSTS.append(receiver.host)
-    add_devices(hosts, True)
+    add_entities(hosts, True)
 
 
 class OnkyoDevice(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/openhome.py b/homeassistant/components/media_player/openhome.py
index 5d9c7bd14c5..1ffe0ef82df 100644
--- a/homeassistant/components/media_player/openhome.py
+++ b/homeassistant/components/media_player/openhome.py
@@ -25,7 +25,7 @@ _LOGGER = logging.getLogger(__name__)
 DEVICES = []
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Openhome platform."""
     from openhomedevice.Device import Device
 
@@ -43,7 +43,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     device = OpenhomeDevice(hass, device)
 
-    add_devices([device], True)
+    add_entities([device], True)
     DEVICES.append(device)
 
     return True
diff --git a/homeassistant/components/media_player/panasonic_viera.py b/homeassistant/components/media_player/panasonic_viera.py
index 549071fde8e..937a72c80ff 100644
--- a/homeassistant/components/media_player/panasonic_viera.py
+++ b/homeassistant/components/media_player/panasonic_viera.py
@@ -42,7 +42,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Panasonic Viera TV platform."""
     from panasonic_viera import RemoteControl
 
@@ -61,13 +61,13 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         else:
             uuid = None
         remote = RemoteControl(host, port)
-        add_devices([PanasonicVieraTVDevice(mac, name, remote, uuid)])
+        add_entities([PanasonicVieraTVDevice(mac, name, remote, uuid)])
         return True
 
     host = config.get(CONF_HOST)
     remote = RemoteControl(host, port)
 
-    add_devices([PanasonicVieraTVDevice(mac, name, remote)])
+    add_entities([PanasonicVieraTVDevice(mac, name, remote)])
     return True
 
 
diff --git a/homeassistant/components/media_player/pandora.py b/homeassistant/components/media_player/pandora.py
index c4d8b778095..5295bfc40eb 100644
--- a/homeassistant/components/media_player/pandora.py
+++ b/homeassistant/components/media_player/pandora.py
@@ -43,7 +43,7 @@ CURRENT_SONG_PATTERN = re.compile(r'"(.*?)"\s+by\s+"(.*?)"\son\s+"(.*?)"',
 STATION_PATTERN = re.compile(r'Station\s"(.+?)"', re.MULTILINE)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Pandora media player platform."""
     if not _pianobar_exists():
         return False
@@ -55,7 +55,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         pandora.turn_off()
 
     hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, _stop_pianobar)
-    add_devices([pandora])
+    add_entities([pandora])
 
 
 class PandoraMediaPlayer(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/philips_js.py b/homeassistant/components/media_player/philips_js.py
index 06f054a03f7..9c7418d4c80 100644
--- a/homeassistant/components/media_player/philips_js.py
+++ b/homeassistant/components/media_player/philips_js.py
@@ -48,7 +48,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Philips TV platform."""
     import haphilipsjs
 
@@ -60,7 +60,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     tvapi = haphilipsjs.PhilipsTV(host, api_version)
     on_script = Script(hass, turn_on_action) if turn_on_action else None
 
-    add_devices([PhilipsTV(tvapi, name, on_script)])
+    add_entities([PhilipsTV(tvapi, name, on_script)])
 
 
 class PhilipsTV(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/pioneer.py b/homeassistant/components/media_player/pioneer.py
index 25424224c70..71ccf9a460d 100644
--- a/homeassistant/components/media_player/pioneer.py
+++ b/homeassistant/components/media_player/pioneer.py
@@ -39,14 +39,14 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Pioneer platform."""
     pioneer = PioneerDevice(
         config.get(CONF_NAME), config.get(CONF_HOST), config.get(CONF_PORT),
         config.get(CONF_TIMEOUT))
 
     if pioneer.update():
-        add_devices([pioneer])
+        add_entities([pioneer])
 
 
 class PioneerDevice(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/pjlink.py b/homeassistant/components/media_player/pjlink.py
index 5d3122256ea..42884cdce09 100644
--- a/homeassistant/components/media_player/pjlink.py
+++ b/homeassistant/components/media_player/pjlink.py
@@ -37,7 +37,7 @@ SUPPORT_PJLINK = SUPPORT_VOLUME_MUTE | \
     SUPPORT_TURN_ON | SUPPORT_TURN_OFF | SUPPORT_SELECT_SOURCE
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the PJLink platform."""
     host = config.get(CONF_HOST)
     port = config.get(CONF_PORT)
@@ -55,7 +55,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     device = PjLinkDevice(host, port, name, encoding, password)
     hass_data[device_label] = device
-    add_devices([device], True)
+    add_entities([device], True)
 
 
 def format_input_source(input_source_name, input_source_number):
diff --git a/homeassistant/components/media_player/plex.py b/homeassistant/components/media_player/plex.py
index 05947b3d67b..3c916860818 100644
--- a/homeassistant/components/media_player/plex.py
+++ b/homeassistant/components/media_player/plex.py
@@ -59,7 +59,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 PLEX_DATA = "plex"
 
 
-def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+def setup_platform(hass, config, add_entities_callback, discovery_info=None):
     """Set up the Plex platform."""
     if PLEX_DATA not in hass.data:
         hass.data[PLEX_DATA] = {}
@@ -98,12 +98,12 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
 
     setup_plexserver(
         host, token, has_ssl, verify_ssl,
-        hass, config, add_devices_callback
+        hass, config, add_entities_callback
     )
 
 
 def setup_plexserver(
-        host, token, has_ssl, verify_ssl, hass, config, add_devices_callback):
+        host, token, has_ssl, verify_ssl, hass, config, add_entities_callback):
     """Set up a plexserver based on host parameter."""
     import plexapi.server
     import plexapi.exceptions
@@ -124,7 +124,7 @@ def setup_plexserver(
             plexapi.exceptions.NotFound) as error:
         _LOGGER.info(error)
         # No token or wrong token
-        request_configuration(host, hass, config, add_devices_callback)
+        request_configuration(host, hass, config, add_entities_callback)
         return
 
     # If we came here and configuring this host, mark as done
@@ -214,7 +214,7 @@ def setup_plexserver(
             del plex_clients[clients_to_remove.pop()]
 
         if new_plex_clients:
-            add_devices_callback(new_plex_clients)
+            add_entities_callback(new_plex_clients)
 
     @util.Throttle(MIN_TIME_BETWEEN_SCANS, MIN_TIME_BETWEEN_FORCED_SCANS)
     def update_sessions():
@@ -238,7 +238,7 @@ def setup_plexserver(
     update_devices()
 
 
-def request_configuration(host, hass, config, add_devices_callback):
+def request_configuration(host, hass, config, add_entities_callback):
     """Request configuration steps from the user."""
     configurator = hass.components.configurator
     # We got an error if this method is called while we are configuring
@@ -254,7 +254,7 @@ def request_configuration(host, hass, config, add_devices_callback):
             host, data.get('token'),
             cv.boolean(data.get('has_ssl')),
             cv.boolean(data.get('do_not_verify')),
-            hass, config, add_devices_callback
+            hass, config, add_entities_callback
         )
 
     _CONFIGURING[host] = configurator.request_config(
diff --git a/homeassistant/components/media_player/roku.py b/homeassistant/components/media_player/roku.py
index 5f28660f4bd..fa1120db98c 100644
--- a/homeassistant/components/media_player/roku.py
+++ b/homeassistant/components/media_player/roku.py
@@ -35,7 +35,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Roku platform."""
     hosts = []
 
@@ -73,7 +73,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                 title=NOTIFICATION_TITLE,
                 notification_id=NOTIFICATION_ID)
 
-    add_devices(rokus)
+    add_entities(rokus)
 
 
 class RokuDevice(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/russound_rio.py b/homeassistant/components/media_player/russound_rio.py
index e9f8ab5f199..cf946945cf2 100644
--- a/homeassistant/components/media_player/russound_rio.py
+++ b/homeassistant/components/media_player/russound_rio.py
@@ -35,7 +35,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Russound RIO platform."""
     host = config.get(CONF_HOST)
     port = config.get(CONF_PORT)
@@ -65,7 +66,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
 
     hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, on_stop)
 
-    async_add_devices(devices)
+    async_add_entities(devices)
 
 
 class RussoundZoneDevice(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/russound_rnet.py b/homeassistant/components/media_player/russound_rnet.py
index 932872467bd..8aef15e02af 100644
--- a/homeassistant/components/media_player/russound_rnet.py
+++ b/homeassistant/components/media_player/russound_rnet.py
@@ -42,7 +42,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Russound RNET platform."""
     host = config.get(CONF_HOST)
     port = config.get(CONF_PORT)
@@ -63,7 +63,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     if russ.is_connected():
         for zone_id, extra in config[CONF_ZONES].items():
-            add_devices([RussoundRNETDevice(
+            add_entities([RussoundRNETDevice(
                 hass, russ, sources, zone_id, extra)], True)
     else:
         _LOGGER.error('Not connected to %s:%s', host, port)
diff --git a/homeassistant/components/media_player/samsungtv.py b/homeassistant/components/media_player/samsungtv.py
index 55b3fb0ea4f..72c3ab2c621 100644
--- a/homeassistant/components/media_player/samsungtv.py
+++ b/homeassistant/components/media_player/samsungtv.py
@@ -50,7 +50,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Samsung TV platform."""
     known_devices = hass.data.get(KNOWN_DEVICES_KEY)
     if known_devices is None:
@@ -81,7 +81,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     ip_addr = socket.gethostbyname(host)
     if ip_addr not in known_devices:
         known_devices.add(ip_addr)
-        add_devices([SamsungTVDevice(host, port, name, timeout, mac)])
+        add_entities([SamsungTVDevice(host, port, name, timeout, mac)])
         _LOGGER.info("Samsung TV %s:%d added as '%s'", host, port, name)
     else:
         _LOGGER.info("Ignoring duplicate Samsung TV %s:%d", host, port)
diff --git a/homeassistant/components/media_player/sisyphus.py b/homeassistant/components/media_player/sisyphus.py
index 9a94da158a1..36f28769b12 100644
--- a/homeassistant/components/media_player/sisyphus.py
+++ b/homeassistant/components/media_player/sisyphus.py
@@ -39,11 +39,11 @@ SUPPORTED_FEATURES = SUPPORT_VOLUME_MUTE \
 
 
 # pylint: disable=unused-argument
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a media player entity for a Sisyphus table."""
     name = discovery_info[CONF_NAME]
     host = discovery_info[CONF_HOST]
-    add_devices(
+    add_entities(
         [SisyphusPlayer(name, host, hass.data[DATA_SISYPHUS][name])],
         update_before_add=True)
 
diff --git a/homeassistant/components/media_player/snapcast.py b/homeassistant/components/media_player/snapcast.py
index a880d3c920d..84864caeed1 100644
--- a/homeassistant/components/media_player/snapcast.py
+++ b/homeassistant/components/media_player/snapcast.py
@@ -47,7 +47,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Snapcast platform."""
     import snapcast.control
     from snapcast.control.server import CONTROL_PORT
@@ -86,7 +87,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     clients = [SnapcastClientDevice(client, hpid) for client in server.clients]
     devices = groups + clients
     hass.data[DATA_KEY] = devices
-    async_add_devices(devices)
+    async_add_entities(devices)
 
 
 class SnapcastGroupDevice(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/songpal.py b/homeassistant/components/media_player/songpal.py
index 5d0962775f0..c1bfbbe59cd 100644
--- a/homeassistant/components/media_player/songpal.py
+++ b/homeassistant/components/media_player/songpal.py
@@ -47,7 +47,7 @@ SET_SOUND_SCHEMA = vol.Schema({
 
 
 async def async_setup_platform(hass, config,
-                               async_add_devices, discovery_info=None):
+                               async_add_entities, discovery_info=None):
     """Set up the Songpal platform."""
     from songpal import SongpalException
     if PLATFORM not in hass.data:
@@ -72,7 +72,7 @@ async def async_setup_platform(hass, config,
 
     hass.data[PLATFORM][endpoint] = device
 
-    async_add_devices([device], True)
+    async_add_entities([device], True)
 
     async def async_service_handler(service):
         """Service handler."""
diff --git a/homeassistant/components/media_player/sonos.py b/homeassistant/components/media_player/sonos.py
index 96038e7bb2b..c4309519e36 100644
--- a/homeassistant/components/media_player/sonos.py
+++ b/homeassistant/components/media_player/sonos.py
@@ -121,27 +121,27 @@ class SonosData:
         self.topology_lock = threading.Lock()
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Sonos platform.
 
     Deprecated.
     """
     _LOGGER.warning('Loading Sonos via platform config is deprecated.')
-    _setup_platform(hass, config, add_devices, discovery_info)
+    _setup_platform(hass, config, add_entities, discovery_info)
 
 
-async def async_setup_entry(hass, config_entry, async_add_devices):
+async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up Sonos from a config entry."""
-    def add_devices(devices, update_before_add=False):
+    def add_entities(devices, update_before_add=False):
         """Sync version of async add devices."""
-        hass.add_job(async_add_devices, devices, update_before_add)
+        hass.add_job(async_add_entities, devices, update_before_add)
 
     hass.add_job(_setup_platform, hass,
                  hass.data[SONOS_DOMAIN].get('media_player', {}),
-                 add_devices, None)
+                 add_entities, None)
 
 
-def _setup_platform(hass, config, add_devices, discovery_info):
+def _setup_platform(hass, config, add_entities, discovery_info):
     """Set up the Sonos platform."""
     import soco
 
@@ -186,7 +186,7 @@ def _setup_platform(hass, config, add_devices, discovery_info):
             return
 
     hass.data[DATA_SONOS].uids.update(p.uid for p in players)
-    add_devices(SonosDevice(p) for p in players)
+    add_entities(SonosDevice(p) for p in players)
     _LOGGER.debug("Added %s Sonos speakers", len(players))
 
     def service_handle(service):
diff --git a/homeassistant/components/media_player/soundtouch.py b/homeassistant/components/media_player/soundtouch.py
index 703c9a963ee..f2ac45a996f 100644
--- a/homeassistant/components/media_player/soundtouch.py
+++ b/homeassistant/components/media_player/soundtouch.py
@@ -71,7 +71,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Bose Soundtouch platform."""
     if DATA_SOUNDTOUCH not in hass.data:
         hass.data[DATA_SOUNDTOUCH] = []
@@ -92,7 +92,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         }
         soundtouch_device = SoundTouchDevice(None, remote_config)
         hass.data[DATA_SOUNDTOUCH].append(soundtouch_device)
-        add_devices([soundtouch_device])
+        add_entities([soundtouch_device])
     else:
         name = config.get(CONF_NAME)
         remote_config = {
@@ -102,7 +102,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         }
         soundtouch_device = SoundTouchDevice(name, remote_config)
         hass.data[DATA_SOUNDTOUCH].append(soundtouch_device)
-        add_devices([soundtouch_device])
+        add_entities([soundtouch_device])
 
     def service_handle(service):
         """Handle the applying of a service."""
diff --git a/homeassistant/components/media_player/spotify.py b/homeassistant/components/media_player/spotify.py
index 73ec8a175b1..9fc200c67fd 100644
--- a/homeassistant/components/media_player/spotify.py
+++ b/homeassistant/components/media_player/spotify.py
@@ -57,7 +57,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 SCAN_INTERVAL = timedelta(seconds=30)
 
 
-def request_configuration(hass, config, add_devices, oauth):
+def request_configuration(hass, config, add_entities, oauth):
     """Request Spotify authorization."""
     configurator = hass.components.configurator
     hass.data[DOMAIN] = configurator.request_config(
@@ -68,7 +68,7 @@ def request_configuration(hass, config, add_devices, oauth):
         submit_caption=CONFIGURATOR_SUBMIT_CAPTION)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Spotify platform."""
     import spotipy.oauth2
     callback_url = '{}{}'.format(hass.config.api.base_url, AUTH_CALLBACK_PATH)
@@ -81,8 +81,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     if not token_info:
         _LOGGER.info("no token; requesting authorization")
         hass.http.register_view(SpotifyAuthCallbackView(
-            config, add_devices, oauth))
-        request_configuration(hass, config, add_devices, oauth)
+            config, add_entities, oauth))
+        request_configuration(hass, config, add_entities, oauth)
         return
     if hass.data.get(DOMAIN):
         configurator = hass.components.configurator
@@ -90,7 +90,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         del hass.data[DOMAIN]
     player = SpotifyMediaPlayer(oauth, config.get(CONF_NAME, DEFAULT_NAME),
                                 config[CONF_ALIASES])
-    add_devices([player], True)
+    add_entities([player], True)
 
 
 class SpotifyAuthCallbackView(HomeAssistantView):
@@ -100,10 +100,10 @@ class SpotifyAuthCallbackView(HomeAssistantView):
     url = AUTH_CALLBACK_PATH
     name = AUTH_CALLBACK_NAME
 
-    def __init__(self, config, add_devices, oauth):
+    def __init__(self, config, add_entities, oauth):
         """Initialize."""
         self.config = config
-        self.add_devices = add_devices
+        self.add_entities = add_entities
         self.oauth = oauth
 
     @callback
@@ -111,7 +111,8 @@ class SpotifyAuthCallbackView(HomeAssistantView):
         """Receive authorization token."""
         hass = request.app['hass']
         self.oauth.get_access_token(request.query['code'])
-        hass.async_add_job(setup_platform, hass, self.config, self.add_devices)
+        hass.async_add_job(
+            setup_platform, hass, self.config, self.add_entities)
 
 
 class SpotifyMediaPlayer(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/squeezebox.py b/homeassistant/components/media_player/squeezebox.py
index 8eb4c85f6b2..a2732b5f849 100644
--- a/homeassistant/components/media_player/squeezebox.py
+++ b/homeassistant/components/media_player/squeezebox.py
@@ -65,7 +65,8 @@ SERVICE_TO_METHOD = {
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the squeezebox platform."""
     import socket
 
@@ -108,7 +109,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     players = yield from lms.create_players()
 
     hass.data[DATA_SQUEEZEBOX].extend(players)
-    async_add_devices(players)
+    async_add_entities(players)
 
     @asyncio.coroutine
     def async_service_handler(service):
diff --git a/homeassistant/components/media_player/ue_smart_radio.py b/homeassistant/components/media_player/ue_smart_radio.py
index 2684a819417..ae7617ead24 100644
--- a/homeassistant/components/media_player/ue_smart_radio.py
+++ b/homeassistant/components/media_player/ue_smart_radio.py
@@ -53,7 +53,7 @@ def send_request(payload, session):
         return request.json()
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Logitech UE Smart Radio platform."""
     email = config.get(CONF_USERNAME)
     password = config.get(CONF_PASSWORD)
@@ -67,7 +67,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     player_id = player_request["result"]["players_loop"][0]["playerid"]
     player_name = player_request["result"]["players_loop"][0]["name"]
 
-    add_devices([UERadioDevice(session, player_id, player_name)])
+    add_entities([UERadioDevice(session, player_id, player_name)])
 
 
 class UERadioDevice(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/universal.py b/homeassistant/components/media_player/universal.py
index 66d12190320..1572e2df89b 100644
--- a/homeassistant/components/media_player/universal.py
+++ b/homeassistant/components/media_player/universal.py
@@ -62,7 +62,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 }, extra=vol.REMOVE_EXTRA)
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the universal media players."""
     player = UniversalMediaPlayer(
@@ -74,7 +74,7 @@ async def async_setup_platform(hass, config, async_add_devices,
         config.get(CONF_STATE_TEMPLATE)
     )
 
-    async_add_devices([player])
+    async_add_entities([player])
 
 
 class UniversalMediaPlayer(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/vizio.py b/homeassistant/components/media_player/vizio.py
index 40ad0ef209c..673be3074de 100644
--- a/homeassistant/components/media_player/vizio.py
+++ b/homeassistant/components/media_player/vizio.py
@@ -53,7 +53,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the VizioTV media player platform."""
     host = config.get(CONF_HOST)
     token = config.get(CONF_ACCESS_TOKEN)
@@ -71,7 +71,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.warning("InsecureRequestWarning is disabled "
                         "because of Vizio platform configuration")
         urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
-    add_devices([device], True)
+    add_entities([device], True)
 
 
 class VizioDevice(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/vlc.py b/homeassistant/components/media_player/vlc.py
index 45e1a91c510..075a533e372 100644
--- a/homeassistant/components/media_player/vlc.py
+++ b/homeassistant/components/media_player/vlc.py
@@ -34,10 +34,10 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the vlc platform."""
-    add_devices([VlcDevice(config.get(CONF_NAME, DEFAULT_NAME),
-                           config.get(CONF_ARGUMENTS))])
+    add_entities([VlcDevice(config.get(CONF_NAME, DEFAULT_NAME),
+                            config.get(CONF_ARGUMENTS))])
 
 
 class VlcDevice(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/volumio.py b/homeassistant/components/media_player/volumio.py
index c4ddd38fc4f..00f5d25362f 100644
--- a/homeassistant/components/media_player/volumio.py
+++ b/homeassistant/components/media_player/volumio.py
@@ -51,7 +51,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Volumio platform."""
     if DATA_VOLUMIO not in hass.data:
         hass.data[DATA_VOLUMIO] = dict()
@@ -75,7 +76,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     entity = Volumio(name, host, port, hass)
 
     hass.data[DATA_VOLUMIO][ip_addr] = entity
-    async_add_devices([entity])
+    async_add_entities([entity])
 
 
 class Volumio(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/webostv.py b/homeassistant/components/media_player/webostv.py
index 362095daee6..fd6b1c6d96e 100644
--- a/homeassistant/components/media_player/webostv.py
+++ b/homeassistant/components/media_player/webostv.py
@@ -61,7 +61,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the LG WebOS TV platform."""
     if discovery_info is not None:
         host = urlparse(discovery_info[1]).hostname
@@ -84,11 +84,11 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     config = hass.config.path(config.get(CONF_FILENAME))
 
     setup_tv(host, name, customize, config, timeout, hass,
-             add_devices, turn_on_action)
+             add_entities, turn_on_action)
 
 
 def setup_tv(host, name, customize, config, timeout, hass,
-             add_devices, turn_on_action):
+             add_entities, turn_on_action):
     """Set up a LG WebOS TV based on host parameter."""
     from pylgtv import WebOsClient
     from pylgtv import PyLGTVPairException
@@ -113,7 +113,7 @@ def setup_tv(host, name, customize, config, timeout, hass,
             _LOGGER.warning("LG webOS TV %s needs to be paired", host)
             request_configuration(
                 host, name, customize, config, timeout, hass,
-                add_devices, turn_on_action)
+                add_entities, turn_on_action)
             return
 
     # If we came here and configuring this host, mark as done.
@@ -122,13 +122,13 @@ def setup_tv(host, name, customize, config, timeout, hass,
         configurator = hass.components.configurator
         configurator.request_done(request_id)
 
-    add_devices([LgWebOSDevice(host, name, customize, config, timeout,
-                               hass, turn_on_action)], True)
+    add_entities([LgWebOSDevice(host, name, customize, config, timeout,
+                                hass, turn_on_action)], True)
 
 
 def request_configuration(
         host, name, customize, config, timeout, hass,
-        add_devices, turn_on_action):
+        add_entities, turn_on_action):
     """Request configuration steps from the user."""
     configurator = hass.components.configurator
 
@@ -141,7 +141,7 @@ def request_configuration(
     def lgtv_configuration_callback(data):
         """Handle actions when configuration callback is called."""
         setup_tv(host, name, customize, config, timeout, hass,
-                 add_devices, turn_on_action)
+                 add_entities, turn_on_action)
 
     _CONFIGURING[host] = configurator.request_config(
         name, lgtv_configuration_callback,
diff --git a/homeassistant/components/media_player/xiaomi_tv.py b/homeassistant/components/media_player/xiaomi_tv.py
index d44ac138e41..ad66ae855bd 100644
--- a/homeassistant/components/media_player/xiaomi_tv.py
+++ b/homeassistant/components/media_player/xiaomi_tv.py
@@ -29,7 +29,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Xiaomi TV platform."""
     from pymitv import Discover
 
@@ -45,10 +45,10 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             )
         else:
             # Register TV with Home Assistant.
-            add_devices([XiaomiTV(host, name)])
+            add_entities([XiaomiTV(host, name)])
     else:
         # Otherwise, discover TVs on network.
-        add_devices(XiaomiTV(tv, DEFAULT_NAME) for tv in Discover().scan())
+        add_entities(XiaomiTV(tv, DEFAULT_NAME) for tv in Discover().scan())
 
 
 class XiaomiTV(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/yamaha.py b/homeassistant/components/media_player/yamaha.py
index cf363458067..2ffe58b02af 100644
--- a/homeassistant/components/media_player/yamaha.py
+++ b/homeassistant/components/media_player/yamaha.py
@@ -57,7 +57,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Yamaha platform."""
     import rxv
     # Keep track of configured receivers so that we don't end up
@@ -126,7 +126,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         DOMAIN, SERVICE_ENABLE_OUTPUT, service_handler,
         schema=ENABLE_OUTPUT_SCHEMA)
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class YamahaDevice(MediaPlayerDevice):
diff --git a/homeassistant/components/media_player/yamaha_musiccast.py b/homeassistant/components/media_player/yamaha_musiccast.py
index b42a5ae474c..135bf4d0aef 100644
--- a/homeassistant/components/media_player/yamaha_musiccast.py
+++ b/homeassistant/components/media_player/yamaha_musiccast.py
@@ -48,7 +48,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Yamaha MusicCast platform."""
     import socket
     import pymusiccast
@@ -93,7 +93,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             _LOGGER.debug(
                 "receiver: %s / Port: %d / Zone: %s",
                 receiver, port, zone)
-            add_devices(
+            add_entities(
                 [YamahaDevice(receiver, receiver.zones[zone])],
                 True)
     else:
diff --git a/homeassistant/components/media_player/ziggo_mediabox_xl.py b/homeassistant/components/media_player/ziggo_mediabox_xl.py
index 1886cd751ea..376b9e7c426 100644
--- a/homeassistant/components/media_player/ziggo_mediabox_xl.py
+++ b/homeassistant/components/media_player/ziggo_mediabox_xl.py
@@ -34,7 +34,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Ziggo Mediabox XL platform."""
     from ziggo_mediabox_xl import ZiggoMediaboxXL
 
@@ -67,7 +67,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             _LOGGER.error("Can't connect to %s: %s", host, error)
     else:
         _LOGGER.info("Ignoring duplicate Ziggo Mediabox XL %s", host)
-    add_devices(hosts, True)
+    add_entities(hosts, True)
 
 
 class ZiggoMediaboxXLDevice(MediaPlayerDevice):
diff --git a/homeassistant/components/mysensors/__init__.py b/homeassistant/components/mysensors/__init__.py
index 7ca9ea9f9ea..725494cd197 100644
--- a/homeassistant/components/mysensors/__init__.py
+++ b/homeassistant/components/mysensors/__init__.py
@@ -130,7 +130,7 @@ def _get_mysensors_name(gateway, node_id, child_id):
 @callback
 def setup_mysensors_platform(
         hass, domain, discovery_info, device_class, device_args=None,
-        async_add_devices=None):
+        async_add_entities=None):
     """Set up a MySensors platform."""
     # Only act if called via MySensors by discovery event.
     # Otherwise gateway is not set up.
@@ -161,6 +161,6 @@ def setup_mysensors_platform(
         new_devices.append(devices[dev_id])
     if new_devices:
         _LOGGER.info("Adding new devices: %s", new_devices)
-        if async_add_devices is not None:
-            async_add_devices(new_devices, True)
+        if async_add_entities is not None:
+            async_add_entities(new_devices, True)
     return new_devices
diff --git a/homeassistant/components/remote/apple_tv.py b/homeassistant/components/remote/apple_tv.py
index 7d11c931a65..d8eac11372c 100644
--- a/homeassistant/components/remote/apple_tv.py
+++ b/homeassistant/components/remote/apple_tv.py
@@ -16,7 +16,8 @@ DEPENDENCIES = ['apple_tv']
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Apple TV remote platform."""
     if not discovery_info:
         return
@@ -25,7 +26,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     host = discovery_info[CONF_HOST]
     atv = hass.data[DATA_APPLE_TV][host][ATTR_ATV]
     power = hass.data[DATA_APPLE_TV][host][ATTR_POWER]
-    async_add_devices([AppleTVRemote(atv, power, name)])
+    async_add_entities([AppleTVRemote(atv, power, name)])
 
 
 class AppleTVRemote(remote.RemoteDevice):
diff --git a/homeassistant/components/remote/demo.py b/homeassistant/components/remote/demo.py
index d959d74574f..f44061ac8f9 100644
--- a/homeassistant/components/remote/demo.py
+++ b/homeassistant/components/remote/demo.py
@@ -8,9 +8,9 @@ from homeassistant.components.remote import RemoteDevice
 from homeassistant.const import DEVICE_DEFAULT_NAME
 
 
-def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+def setup_platform(hass, config, add_entities_callback, discovery_info=None):
     """Set up the demo remotes."""
-    add_devices_callback([
+    add_entities_callback([
         DemoRemote('Remote One', False, None),
         DemoRemote('Remote Two', True, 'mdi:remote'),
     ])
diff --git a/homeassistant/components/remote/harmony.py b/homeassistant/components/remote/harmony.py
index a63b7325035..5b7d0d1df78 100644
--- a/homeassistant/components/remote/harmony.py
+++ b/homeassistant/components/remote/harmony.py
@@ -44,7 +44,7 @@ HARMONY_SYNC_SCHEMA = vol.Schema({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Harmony platform."""
     host = None
     activity = None
@@ -96,7 +96,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         device = HarmonyRemote(
             name, address, port, activity, harmony_conf_file, delay_secs)
         DEVICES.append(device)
-        add_devices([device])
+        add_entities([device])
         register_services(hass)
     except (ValueError, AttributeError):
         raise PlatformNotReady
diff --git a/homeassistant/components/remote/itach.py b/homeassistant/components/remote/itach.py
index 829a038953c..e7f23dfcd13 100644
--- a/homeassistant/components/remote/itach.py
+++ b/homeassistant/components/remote/itach.py
@@ -44,7 +44,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the ITach connection and devices."""
     import pyitachip2ir
     itachip2ir = pyitachip2ir.ITachIP2IR(
@@ -71,7 +71,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             cmddatas += "{}\n{}\n".format(cmdname, cmddata)
         itachip2ir.addDevice(name, modaddr, connaddr, cmddatas)
         devices.append(ITachIP2IRRemote(itachip2ir, name))
-    add_devices(devices, True)
+    add_entities(devices, True)
     return True
 
 
diff --git a/homeassistant/components/remote/kira.py b/homeassistant/components/remote/kira.py
index dc37eb760f7..24fc54ee78c 100644
--- a/homeassistant/components/remote/kira.py
+++ b/homeassistant/components/remote/kira.py
@@ -18,14 +18,14 @@ _LOGGER = logging.getLogger(__name__)
 CONF_REMOTE = "remote"
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Kira platform."""
     if discovery_info:
         name = discovery_info.get(CONF_NAME)
         device = discovery_info.get(CONF_DEVICE)
 
         kira = hass.data[DOMAIN][CONF_REMOTE][name]
-        add_devices([KiraRemote(device, kira)])
+        add_entities([KiraRemote(device, kira)])
     return True
 
 
diff --git a/homeassistant/components/remote/xiaomi_miio.py b/homeassistant/components/remote/xiaomi_miio.py
index 1cc48f7adb2..7fbcba5a26e 100644
--- a/homeassistant/components/remote/xiaomi_miio.py
+++ b/homeassistant/components/remote/xiaomi_miio.py
@@ -62,7 +62,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Xiaomi IR Remote (Chuangmi IR) platform."""
     from miio import ChuangmiIr, DeviceException
 
@@ -106,7 +107,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
 
     hass.data[DATA_KEY][host] = xiaomi_miio_remote
 
-    async_add_devices([xiaomi_miio_remote])
+    async_add_entities([xiaomi_miio_remote])
 
     @asyncio.coroutine
     def async_service_handler(service):
diff --git a/homeassistant/components/scene/deconz.py b/homeassistant/components/scene/deconz.py
index 3eb73736717..dde78dadc49 100644
--- a/homeassistant/components/scene/deconz.py
+++ b/homeassistant/components/scene/deconz.py
@@ -11,20 +11,20 @@ from homeassistant.components.scene import Scene
 DEPENDENCIES = ['deconz']
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Old way of setting up deCONZ scenes."""
     pass
 
 
-async def async_setup_entry(hass, config_entry, async_add_devices):
+async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up scenes for deCONZ component."""
     scenes = hass.data[DATA_DECONZ].scenes
     entities = []
 
     for scene in scenes.values():
         entities.append(DeconzScene(scene))
-    async_add_devices(entities)
+    async_add_entities(entities)
 
 
 class DeconzScene(Scene):
diff --git a/homeassistant/components/scene/homeassistant.py b/homeassistant/components/scene/homeassistant.py
index 57c56e8b2f6..7e1d670ca69 100644
--- a/homeassistant/components/scene/homeassistant.py
+++ b/homeassistant/components/scene/homeassistant.py
@@ -36,11 +36,12 @@ SCENECONFIG = namedtuple('SceneConfig', [CONF_NAME, STATES])
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up home assistant scene entries."""
     scene_config = config.get(STATES)
 
-    async_add_devices(HomeAssistantScene(
+    async_add_entities(HomeAssistantScene(
         hass, _process_config(scene)) for scene in scene_config)
     return True
 
diff --git a/homeassistant/components/scene/hunterdouglas_powerview.py b/homeassistant/components/scene/hunterdouglas_powerview.py
index 4f5ac5725a3..40534b68635 100644
--- a/homeassistant/components/scene/hunterdouglas_powerview.py
+++ b/homeassistant/components/scene/hunterdouglas_powerview.py
@@ -37,7 +37,8 @@ STATE_ATTRIBUTE_ROOM_NAME = 'roomName'
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up home assistant scene entries."""
     # from aiopvapi.hub import Hub
     from aiopvapi.scenes import Scenes
@@ -60,7 +61,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
                                PvScene(_raw_scene, hub_address, hass.loop,
                                        websession), _rooms)
                 for _raw_scene in _scenes[SCENE_DATA])
-    async_add_devices(pvscenes)
+    async_add_entities(pvscenes)
 
 
 class PowerViewScene(Scene):
diff --git a/homeassistant/components/scene/knx.py b/homeassistant/components/scene/knx.py
index 901e25aea82..cd333ba79b4 100644
--- a/homeassistant/components/scene/knx.py
+++ b/homeassistant/components/scene/knx.py
@@ -26,27 +26,27 @@ PLATFORM_SCHEMA = vol.Schema({
 })
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the scenes for KNX platform."""
     if discovery_info is not None:
-        async_add_devices_discovery(hass, discovery_info, async_add_devices)
+        async_add_entities_discovery(hass, discovery_info, async_add_entities)
     else:
-        async_add_devices_config(hass, config, async_add_devices)
+        async_add_entities_config(hass, config, async_add_entities)
 
 
 @callback
-def async_add_devices_discovery(hass, discovery_info, async_add_devices):
+def async_add_entities_discovery(hass, discovery_info, async_add_entities):
     """Set up scenes for KNX platform configured via xknx.yaml."""
     entities = []
     for device_name in discovery_info[ATTR_DISCOVER_DEVICES]:
         device = hass.data[DATA_KNX].xknx.devices[device_name]
         entities.append(KNXScene(device))
-    async_add_devices(entities)
+    async_add_entities(entities)
 
 
 @callback
-def async_add_devices_config(hass, config, async_add_devices):
+def async_add_entities_config(hass, config, async_add_entities):
     """Set up scene for KNX platform configured within platform."""
     import xknx
     scene = xknx.devices.Scene(
@@ -55,7 +55,7 @@ def async_add_devices_config(hass, config, async_add_devices):
         group_address=config.get(CONF_ADDRESS),
         scene_number=config.get(CONF_SCENE_NUMBER))
     hass.data[DATA_KNX].xknx.devices.add(scene)
-    async_add_devices([KNXScene(scene)])
+    async_add_entities([KNXScene(scene)])
 
 
 class KNXScene(Scene):
diff --git a/homeassistant/components/scene/lifx_cloud.py b/homeassistant/components/scene/lifx_cloud.py
index a9ec1ef679c..3169acb3a31 100644
--- a/homeassistant/components/scene/lifx_cloud.py
+++ b/homeassistant/components/scene/lifx_cloud.py
@@ -30,7 +30,8 @@ PLATFORM_SCHEMA = vol.Schema({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the scenes stored in the LIFX Cloud."""
     token = config.get(CONF_TOKEN)
     timeout = config.get(CONF_TIMEOUT)
@@ -56,7 +57,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         devices = []
         for scene in data:
             devices.append(LifxCloudScene(hass, headers, timeout, scene))
-        async_add_devices(devices)
+        async_add_entities(devices)
         return True
     if status == 401:
         _LOGGER.error("Unauthorized (bad token?) on %s", url)
diff --git a/homeassistant/components/scene/litejet.py b/homeassistant/components/scene/litejet.py
index 87539e2dded..e12643fa651 100644
--- a/homeassistant/components/scene/litejet.py
+++ b/homeassistant/components/scene/litejet.py
@@ -16,7 +16,7 @@ ATTR_NUMBER = 'number'
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up scenes for the LiteJet platform."""
     litejet_ = hass.data['litejet_system']
 
@@ -25,7 +25,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         name = litejet_.get_scene_name(i)
         if not litejet.is_ignored(hass, name):
             devices.append(LiteJetScene(litejet_, i, name))
-    add_devices(devices)
+    add_entities(devices)
 
 
 class LiteJetScene(Scene):
diff --git a/homeassistant/components/scene/lutron_caseta.py b/homeassistant/components/scene/lutron_caseta.py
index 0d9024d194e..0f9173663a9 100644
--- a/homeassistant/components/scene/lutron_caseta.py
+++ b/homeassistant/components/scene/lutron_caseta.py
@@ -16,7 +16,8 @@ DEPENDENCIES = ['lutron_caseta']
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Lutron Caseta lights."""
     devs = []
     bridge = hass.data[LUTRON_CASETA_SMARTBRIDGE]
@@ -25,7 +26,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         dev = LutronCasetaScene(scenes[scene], bridge)
         devs.append(dev)
 
-    async_add_devices(devs, True)
+    async_add_entities(devs, True)
 
 
 class LutronCasetaScene(Scene):
diff --git a/homeassistant/components/scene/tahoma.py b/homeassistant/components/scene/tahoma.py
index 39206623901..5846d97c7f9 100644
--- a/homeassistant/components/scene/tahoma.py
+++ b/homeassistant/components/scene/tahoma.py
@@ -15,13 +15,13 @@ DEPENDENCIES = ['tahoma']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Tahoma scenes."""
     controller = hass.data[TAHOMA_DOMAIN]['controller']
     scenes = []
     for scene in hass.data[TAHOMA_DOMAIN]['scenes']:
         scenes.append(TahomaScene(scene, controller))
-    add_devices(scenes, True)
+    add_entities(scenes, True)
 
 
 class TahomaScene(Scene):
diff --git a/homeassistant/components/scene/tuya.py b/homeassistant/components/scene/tuya.py
index 3990a7da206..2e03e5dba9a 100644
--- a/homeassistant/components/scene/tuya.py
+++ b/homeassistant/components/scene/tuya.py
@@ -12,7 +12,7 @@ DEPENDENCIES = ['tuya']
 ENTITY_ID_FORMAT = DOMAIN + '.{}'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Tuya scenes."""
     if discovery_info is None:
         return
@@ -24,7 +24,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         if device is None:
             continue
         devices.append(TuyaScene(device))
-    add_devices(devices)
+    add_entities(devices)
 
 
 class TuyaScene(TuyaDevice, Scene):
diff --git a/homeassistant/components/scene/velux.py b/homeassistant/components/scene/velux.py
index 63bb23b1086..77ba30158e4 100644
--- a/homeassistant/components/scene/velux.py
+++ b/homeassistant/components/scene/velux.py
@@ -12,13 +12,13 @@ from homeassistant.components.velux import _LOGGER, DATA_VELUX
 DEPENDENCIES = ['velux']
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the scenes for velux platform."""
     entities = []
     for scene in hass.data[DATA_VELUX].pyvlx.scenes:
         entities.append(VeluxScene(scene))
-    async_add_devices(entities)
+    async_add_entities(entities)
 
 
 class VeluxScene(Scene):
diff --git a/homeassistant/components/scene/vera.py b/homeassistant/components/scene/vera.py
index 4f580356fbb..6cae1195f87 100644
--- a/homeassistant/components/scene/vera.py
+++ b/homeassistant/components/scene/vera.py
@@ -16,9 +16,9 @@ DEPENDENCIES = ['vera']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Vera scenes."""
-    add_devices(
+    add_entities(
         [VeraScene(scene, hass.data[VERA_CONTROLLER])
          for scene in hass.data[VERA_SCENES]], True)
 
diff --git a/homeassistant/components/scene/wink.py b/homeassistant/components/scene/wink.py
index 5bd053bdd39..62da668694b 100644
--- a/homeassistant/components/scene/wink.py
+++ b/homeassistant/components/scene/wink.py
@@ -15,14 +15,14 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['wink']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Wink platform."""
     import pywink
 
     for scene in pywink.get_scenes():
         _id = scene.object_id() + scene.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkScene(scene, hass)])
+            add_entities([WinkScene(scene, hass)])
 
 
 class WinkScene(WinkDevice, Scene):
diff --git a/homeassistant/components/sensor/abode.py b/homeassistant/components/sensor/abode.py
index 26247c77454..4695a5f0471 100644
--- a/homeassistant/components/sensor/abode.py
+++ b/homeassistant/components/sensor/abode.py
@@ -22,7 +22,7 @@ SENSOR_TYPES = {
 }
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a sensor for an Abode device."""
     import abodepy.helpers.constants as CONST
 
@@ -38,7 +38,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     data.devices.extend(devices)
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class AbodeSensor(AbodeDevice):
diff --git a/homeassistant/components/sensor/ads.py b/homeassistant/components/sensor/ads.py
index 659ac6d7e5d..5d5cbb379bf 100644
--- a/homeassistant/components/sensor/ads.py
+++ b/homeassistant/components/sensor/ads.py
@@ -32,7 +32,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up an ADS sensor device."""
     ads_hub = hass.data.get(ads.DATA_ADS)
 
@@ -45,7 +45,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     entity = AdsSensor(
         ads_hub, ads_var, ads_type, name, unit_of_measurement, factor)
 
-    add_devices([entity])
+    add_entities([entity])
 
 
 class AdsSensor(Entity):
diff --git a/homeassistant/components/sensor/airvisual.py b/homeassistant/components/sensor/airvisual.py
index 403722c7b6a..dcd89ccb78a 100644
--- a/homeassistant/components/sensor/airvisual.py
+++ b/homeassistant/components/sensor/airvisual.py
@@ -117,7 +117,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Configure the platform and add the sensors."""
     from pyairvisual import Client
 
@@ -161,7 +161,7 @@ async def async_setup_platform(
                 AirVisualSensor(
                     data, kind, name, icon, unit, locale, location_id))
 
-    async_add_devices(sensors, True)
+    async_add_entities(sensors, True)
 
 
 class AirVisualSensor(Entity):
diff --git a/homeassistant/components/sensor/alarmdecoder.py b/homeassistant/components/sensor/alarmdecoder.py
index ce709eee94c..51e166bfce6 100644
--- a/homeassistant/components/sensor/alarmdecoder.py
+++ b/homeassistant/components/sensor/alarmdecoder.py
@@ -15,13 +15,13 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['alarmdecoder']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up for AlarmDecoder sensor devices."""
     _LOGGER.debug("AlarmDecoderSensor: setup_platform")
 
     device = AlarmDecoderSensor(hass)
 
-    add_devices([device])
+    add_entities([device])
 
 
 class AlarmDecoderSensor(Entity):
diff --git a/homeassistant/components/sensor/alpha_vantage.py b/homeassistant/components/sensor/alpha_vantage.py
index a7e6f6d2622..c0b280d2d69 100644
--- a/homeassistant/components/sensor/alpha_vantage.py
+++ b/homeassistant/components/sensor/alpha_vantage.py
@@ -63,7 +63,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Alpha Vantage sensor."""
     from alpha_vantage.timeseries import TimeSeries
     from alpha_vantage.foreignexchange import ForeignExchange
@@ -107,7 +107,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             _LOGGER.debug(str(error))
         dev.append(AlphaVantageForeignExchange(forex, conversion))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
     _LOGGER.debug("Setup completed")
 
 
diff --git a/homeassistant/components/sensor/amcrest.py b/homeassistant/components/sensor/amcrest.py
index 99a4371f6a2..53a8c663f21 100644
--- a/homeassistant/components/sensor/amcrest.py
+++ b/homeassistant/components/sensor/amcrest.py
@@ -20,7 +20,8 @@ SCAN_INTERVAL = timedelta(seconds=10)
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up a sensor for an Amcrest IP Camera."""
     if discovery_info is None:
         return
@@ -34,7 +35,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         amcrest_sensors.append(
             AmcrestSensor(amcrest.name, amcrest.device, sensor_type))
 
-    async_add_devices(amcrest_sensors, True)
+    async_add_entities(amcrest_sensors, True)
     return True
 
 
diff --git a/homeassistant/components/sensor/android_ip_webcam.py b/homeassistant/components/sensor/android_ip_webcam.py
index f25056d5a0f..333bf12ec21 100644
--- a/homeassistant/components/sensor/android_ip_webcam.py
+++ b/homeassistant/components/sensor/android_ip_webcam.py
@@ -15,7 +15,8 @@ DEPENDENCIES = ['android_ip_webcam']
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the IP Webcam Sensor."""
     if discovery_info is None:
         return
@@ -30,7 +31,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     for sensor in sensors:
         all_sensors.append(IPWebcamSensor(name, host, ipcam, sensor))
 
-    async_add_devices(all_sensors, True)
+    async_add_entities(all_sensors, True)
 
 
 class IPWebcamSensor(AndroidIPCamEntity):
diff --git a/homeassistant/components/sensor/api_streams.py b/homeassistant/components/sensor/api_streams.py
index 0d193dee79b..1ecae1e753e 100644
--- a/homeassistant/components/sensor/api_streams.py
+++ b/homeassistant/components/sensor/api_streams.py
@@ -49,7 +49,8 @@ class StreamHandler(logging.Handler):
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the API stream platform."""
     entity = APICount()
     handler = StreamHandler(entity)
@@ -65,7 +66,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
 
     hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, remove_logger)
 
-    async_add_devices([entity])
+    async_add_entities([entity])
 
 
 class APICount(Entity):
diff --git a/homeassistant/components/sensor/arduino.py b/homeassistant/components/sensor/arduino.py
index d4d8ea09d29..f46eebce1b2 100644
--- a/homeassistant/components/sensor/arduino.py
+++ b/homeassistant/components/sensor/arduino.py
@@ -33,7 +33,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Arduino platform."""
     if arduino.BOARD is None:
         _LOGGER.error("A connection has not been made to the Arduino board")
@@ -44,7 +44,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     sensors = []
     for pinnum, pin in pins.items():
         sensors.append(ArduinoSensor(pin.get(CONF_NAME), pinnum, CONF_TYPE))
-    add_devices(sensors)
+    add_entities(sensors)
 
 
 class ArduinoSensor(Entity):
diff --git a/homeassistant/components/sensor/arest.py b/homeassistant/components/sensor/arest.py
index 751f0f11171..3d85a331f6f 100644
--- a/homeassistant/components/sensor/arest.py
+++ b/homeassistant/components/sensor/arest.py
@@ -44,7 +44,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the aREST sensor."""
     resource = config.get(CONF_RESOURCE)
     var_conf = config.get(CONF_MONITORED_VARIABLES)
@@ -102,7 +102,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                 pin=pinnum, unit_of_measurement=pin.get(
                     CONF_UNIT_OF_MEASUREMENT), renderer=renderer))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class ArestSensor(Entity):
diff --git a/homeassistant/components/sensor/arlo.py b/homeassistant/components/sensor/arlo.py
index 6d764b1c916..be940cc4f51 100644
--- a/homeassistant/components/sensor/arlo.py
+++ b/homeassistant/components/sensor/arlo.py
@@ -43,7 +43,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up an Arlo IP sensor."""
     arlo = hass.data.get(DATA_ARLO)
     if not arlo:
@@ -70,7 +70,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                         SENSOR_TYPES[sensor_type][0], base_station.name)
                     sensors.append(ArloSensor(name, base_station, sensor_type))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class ArloSensor(Entity):
diff --git a/homeassistant/components/sensor/arwn.py b/homeassistant/components/sensor/arwn.py
index 6b0d3e569d7..580701490a6 100644
--- a/homeassistant/components/sensor/arwn.py
+++ b/homeassistant/components/sensor/arwn.py
@@ -59,7 +59,8 @@ def _slug(name):
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the ARWN platform."""
     @callback
     def async_sensor_event_received(topic, payload, qos):
@@ -97,7 +98,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
                 store[sensor.name] = sensor
                 _LOGGER.debug("Registering new sensor %(name)s => %(event)s",
                               dict(name=sensor.name, event=event))
-                async_add_devices((sensor,), True)
+                async_add_entities((sensor,), True)
             else:
                 store[sensor.name].set_event(event)
 
diff --git a/homeassistant/components/sensor/bbox.py b/homeassistant/components/sensor/bbox.py
index d24621becc9..c81160dc2ae 100644
--- a/homeassistant/components/sensor/bbox.py
+++ b/homeassistant/components/sensor/bbox.py
@@ -48,7 +48,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Bbox sensor."""
     # Create a data fetcher to support all of the configured sensors. Then make
     # the first call to init the data.
@@ -65,7 +65,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for variable in config[CONF_MONITORED_VARIABLES]:
         sensors.append(BboxSensor(bbox_data, variable, name))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class BboxSensor(Entity):
diff --git a/homeassistant/components/sensor/bh1750.py b/homeassistant/components/sensor/bh1750.py
index 6d34d4ea9f8..6230ae8a74d 100644
--- a/homeassistant/components/sensor/bh1750.py
+++ b/homeassistant/components/sensor/bh1750.py
@@ -67,7 +67,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 # pylint: disable=import-error
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the BH1750 sensor."""
     import smbus
     from i2csense.bh1750 import BH1750
@@ -95,7 +96,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     _LOGGER.info("Setup of BH1750 light sensor at %s in mode %s is complete",
                  i2c_address, operation_mode)
 
-    async_add_devices(dev, True)
+    async_add_entities(dev, True)
 
 
 class BH1750Sensor(Entity):
diff --git a/homeassistant/components/sensor/bitcoin.py b/homeassistant/components/sensor/bitcoin.py
index f51b7dcd5bd..34855d19104 100644
--- a/homeassistant/components/sensor/bitcoin.py
+++ b/homeassistant/components/sensor/bitcoin.py
@@ -58,7 +58,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Bitcoin sensors."""
     from blockchain import exchangerates
 
@@ -73,7 +73,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for variable in config[CONF_DISPLAY_OPTIONS]:
         dev.append(BitcoinSensor(data, variable, currency))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class BitcoinSensor(Entity):
diff --git a/homeassistant/components/sensor/blink.py b/homeassistant/components/sensor/blink.py
index db7ab7c2e9e..97356b6fc61 100644
--- a/homeassistant/components/sensor/blink.py
+++ b/homeassistant/components/sensor/blink.py
@@ -21,7 +21,7 @@ SENSOR_TYPES = {
 }
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a Blink sensor."""
     if discovery_info is None:
         return
@@ -35,7 +35,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         devs.append(BlinkSensor(name, 'notifications', index, data))
         index += 1
 
-    add_devices(devs, True)
+    add_entities(devs, True)
 
 
 class BlinkSensor(Entity):
diff --git a/homeassistant/components/sensor/blockchain.py b/homeassistant/components/sensor/blockchain.py
index 2276f5fc1b7..e51db7edcad 100644
--- a/homeassistant/components/sensor/blockchain.py
+++ b/homeassistant/components/sensor/blockchain.py
@@ -33,7 +33,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Blockchain.info sensors."""
     from pyblockchain import validate_address
 
@@ -45,7 +45,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             _LOGGER.error("Bitcoin address is not valid: %s", address)
             return False
 
-    add_devices([BlockchainSensor(name, addresses)], True)
+    add_entities([BlockchainSensor(name, addresses)], True)
 
 
 class BlockchainSensor(Entity):
diff --git a/homeassistant/components/sensor/bloomsky.py b/homeassistant/components/sensor/bloomsky.py
index d33796d04cc..8926848102c 100644
--- a/homeassistant/components/sensor/bloomsky.py
+++ b/homeassistant/components/sensor/bloomsky.py
@@ -41,7 +41,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the available BloomSky weather sensors."""
     bloomsky = hass.components.bloomsky
     # Default needed in case of discovery
@@ -49,7 +49,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     for device in bloomsky.BLOOMSKY.devices.values():
         for variable in sensors:
-            add_devices(
+            add_entities(
                 [BloomSkySensor(bloomsky.BLOOMSKY, device, variable)], True)
 
 
diff --git a/homeassistant/components/sensor/bme280.py b/homeassistant/components/sensor/bme280.py
index 1685d34c0ec..676800c1069 100644
--- a/homeassistant/components/sensor/bme280.py
+++ b/homeassistant/components/sensor/bme280.py
@@ -82,7 +82,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 # pylint: disable=import-error
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the BME280 sensor."""
     import smbus
     from i2csense.bme280 import BME280
@@ -117,7 +118,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     except KeyError:
         pass
 
-    async_add_devices(dev, True)
+    async_add_entities(dev, True)
 
 
 class BME280Handler:
diff --git a/homeassistant/components/sensor/bme680.py b/homeassistant/components/sensor/bme680.py
index 2dbda26ac32..65d486ada36 100644
--- a/homeassistant/components/sensor/bme680.py
+++ b/homeassistant/components/sensor/bme680.py
@@ -98,7 +98,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the BME680 sensor."""
     SENSOR_TYPES[SENSOR_TEMP][1] = hass.config.units.temperature_unit
     name = config.get(CONF_NAME)
@@ -112,7 +113,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         dev.append(BME680Sensor(
             sensor_handler, variable, SENSOR_TYPES[variable][1], name))
 
-    async_add_devices(dev)
+    async_add_entities(dev)
     return
 
 
diff --git a/homeassistant/components/sensor/bmw_connected_drive.py b/homeassistant/components/sensor/bmw_connected_drive.py
index deafacc288c..ff80100e21d 100644
--- a/homeassistant/components/sensor/bmw_connected_drive.py
+++ b/homeassistant/components/sensor/bmw_connected_drive.py
@@ -27,7 +27,7 @@ ATTR_TO_HA = {
 }
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the BMW sensors."""
     accounts = hass.data[BMW_DOMAIN]
     _LOGGER.debug('Found BMW accounts: %s',
@@ -41,7 +41,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                 devices.append(device)
             device = BMWConnectedDriveSensor(account, vehicle, 'mileage')
             devices.append(device)
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class BMWConnectedDriveSensor(Entity):
diff --git a/homeassistant/components/sensor/bom.py b/homeassistant/components/sensor/bom.py
index eb63e116254..11685c7ff68 100644
--- a/homeassistant/components/sensor/bom.py
+++ b/homeassistant/components/sensor/bom.py
@@ -99,7 +99,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the BOM sensor."""
     station = config.get(CONF_STATION)
     zone_id, wmo_id = config.get(CONF_ZONE_ID), config.get(CONF_WMO_ID)
@@ -127,8 +127,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("Received error from BOM Current: %s", err)
         return
 
-    add_devices([BOMCurrentSensor(bom_data, variable, config.get(CONF_NAME))
-                 for variable in config[CONF_MONITORED_CONDITIONS]])
+    add_entities([BOMCurrentSensor(bom_data, variable, config.get(CONF_NAME))
+                  for variable in config[CONF_MONITORED_CONDITIONS]])
 
 
 class BOMCurrentSensor(Entity):
diff --git a/homeassistant/components/sensor/broadlink.py b/homeassistant/components/sensor/broadlink.py
index 06d7f512c9f..21e5b0ee1d9 100644
--- a/homeassistant/components/sensor/broadlink.py
+++ b/homeassistant/components/sensor/broadlink.py
@@ -47,7 +47,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Broadlink device sensors."""
     host = config.get(CONF_HOST)
     mac = config.get(CONF_MAC).encode().replace(b':', b'')
@@ -59,7 +59,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     dev = []
     for variable in config[CONF_MONITORED_CONDITIONS]:
         dev.append(BroadlinkSensor(name, broadlink_data, variable))
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class BroadlinkSensor(Entity):
diff --git a/homeassistant/components/sensor/buienradar.py b/homeassistant/components/sensor/buienradar.py
index 992c27bbe2e..c7ca0c097ff 100644
--- a/homeassistant/components/sensor/buienradar.py
+++ b/homeassistant/components/sensor/buienradar.py
@@ -141,7 +141,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Create the buienradar sensor."""
     from homeassistant.components.weather.buienradar import DEFAULT_TIMEFRAME
 
@@ -163,7 +164,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     for sensor_type in config[CONF_MONITORED_CONDITIONS]:
         dev.append(BrSensor(sensor_type, config.get(CONF_NAME, 'br'),
                             coordinates))
-    async_add_devices(dev)
+    async_add_entities(dev)
 
     data = BrData(hass, coordinates, timeframe, dev)
     # schedule the first update in 1 minute from now:
diff --git a/homeassistant/components/sensor/canary.py b/homeassistant/components/sensor/canary.py
index 51fe1d4dd7a..015c6b378e0 100644
--- a/homeassistant/components/sensor/canary.py
+++ b/homeassistant/components/sensor/canary.py
@@ -30,7 +30,7 @@ STATE_AIR_QUALITY_ABNORMAL = "abnormal"
 STATE_AIR_QUALITY_VERY_ABNORMAL = "very_abnormal"
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Canary sensors."""
     data = hass.data[DATA_CANARY]
     devices = []
@@ -44,7 +44,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                         devices.append(CanarySensor(data, sensor_type,
                                                     location, device))
 
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class CanarySensor(Entity):
diff --git a/homeassistant/components/sensor/cert_expiry.py b/homeassistant/components/sensor/cert_expiry.py
index 00139a30620..df48ebbf41c 100644
--- a/homeassistant/components/sensor/cert_expiry.py
+++ b/homeassistant/components/sensor/cert_expiry.py
@@ -33,7 +33,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up certificate expiry sensor."""
     def run_setup(event):
         """Wait until Home Assistant is fully initialized before creating.
@@ -44,8 +44,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         server_port = config.get(CONF_PORT)
         sensor_name = config.get(CONF_NAME)
 
-        add_devices([SSLCertificate(sensor_name, server_name, server_port)],
-                    True)
+        add_entities([SSLCertificate(sensor_name, server_name, server_port)],
+                     True)
 
     # To allow checking of the HA certificate we must first be running.
     hass.bus.listen_once(EVENT_HOMEASSISTANT_START, run_setup)
diff --git a/homeassistant/components/sensor/citybikes.py b/homeassistant/components/sensor/citybikes.py
index c9a69923135..8003a77a452 100644
--- a/homeassistant/components/sensor/citybikes.py
+++ b/homeassistant/components/sensor/citybikes.py
@@ -126,7 +126,7 @@ def async_citybikes_request(hass, uri, schema):
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices,
+def async_setup_platform(hass, config, async_add_entities,
                          discovery_info=None):
     """Set up the CityBikes platform."""
     if PLATFORM not in hass.data:
@@ -167,7 +167,7 @@ def async_setup_platform(hass, config, async_add_devices,
                 (station_id, station_uid)):
             devices.append(CityBikesStation(hass, network, station_id, name))
 
-    async_add_devices(devices, True)
+    async_add_entities(devices, True)
 
 
 class CityBikesNetwork:
diff --git a/homeassistant/components/sensor/coinbase.py b/homeassistant/components/sensor/coinbase.py
index 32e1d8f211a..40444dee93c 100644
--- a/homeassistant/components/sensor/coinbase.py
+++ b/homeassistant/components/sensor/coinbase.py
@@ -21,7 +21,7 @@ DEPENDENCIES = ['coinbase']
 ETH_ICON = 'mdi:currency-eth'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Coinbase sensors."""
     if discovery_info is None:
         return
@@ -35,7 +35,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             hass.data[DATA_COINBASE], discovery_info['exchange_currency'],
             discovery_info['native_currency'])
 
-    add_devices([sensor], True)
+    add_entities([sensor], True)
 
 
 class AccountSensor(Entity):
diff --git a/homeassistant/components/sensor/coinmarketcap.py b/homeassistant/components/sensor/coinmarketcap.py
index c4f38b1be02..18d3f0a3d00 100644
--- a/homeassistant/components/sensor/coinmarketcap.py
+++ b/homeassistant/components/sensor/coinmarketcap.py
@@ -56,7 +56,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the CoinMarketCap sensor."""
     currency_id = config.get(CONF_CURRENCY_ID)
     display_currency = config.get(CONF_DISPLAY_CURRENCY).upper()
@@ -71,7 +71,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         currency_id = DEFAULT_CURRENCY_ID
         display_currency = DEFAULT_DISPLAY_CURRENCY
 
-    add_devices([CoinMarketCapSensor(
+    add_entities([CoinMarketCapSensor(
         CoinMarketCapData(
             currency_id, display_currency), display_currency_decimals)], True)
 
diff --git a/homeassistant/components/sensor/comed_hourly_pricing.py b/homeassistant/components/sensor/comed_hourly_pricing.py
index c0c477ade0b..3595bcaa227 100644
--- a/homeassistant/components/sensor/comed_hourly_pricing.py
+++ b/homeassistant/components/sensor/comed_hourly_pricing.py
@@ -50,7 +50,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the ComEd Hourly Pricing sensor."""
     websession = async_get_clientsession(hass)
     dev = []
@@ -60,7 +61,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
             hass.loop, websession, variable[CONF_SENSOR_TYPE],
             variable[CONF_OFFSET], variable.get(CONF_NAME)))
 
-    async_add_devices(dev, True)
+    async_add_entities(dev, True)
 
 
 class ComedHourlyPricingSensor(Entity):
diff --git a/homeassistant/components/sensor/comfoconnect.py b/homeassistant/components/sensor/comfoconnect.py
index ad6b07fb3da..b13c8d8d263 100644
--- a/homeassistant/components/sensor/comfoconnect.py
+++ b/homeassistant/components/sensor/comfoconnect.py
@@ -23,7 +23,7 @@ DEPENDENCIES = ['comfoconnect']
 SENSOR_TYPES = {}
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the ComfoConnect fan platform."""
     from pycomfoconnect import (
         SENSOR_TEMPERATURE_EXTRACT, SENSOR_HUMIDITY_EXTRACT,
@@ -90,7 +90,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             )
         )
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class ComfoConnectSensor(Entity):
diff --git a/homeassistant/components/sensor/command_line.py b/homeassistant/components/sensor/command_line.py
index 846604a9ff5..e1d151410b1 100644
--- a/homeassistant/components/sensor/command_line.py
+++ b/homeassistant/components/sensor/command_line.py
@@ -43,7 +43,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Command Sensor."""
     name = config.get(CONF_NAME)
     command = config.get(CONF_COMMAND)
@@ -55,7 +55,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     json_attributes = config.get(CONF_JSON_ATTRIBUTES)
     data = CommandSensorData(hass, command, command_timeout)
 
-    add_devices([CommandSensor(
+    add_entities([CommandSensor(
         hass, data, name, unit, value_template, json_attributes)], True)
 
 
diff --git a/homeassistant/components/sensor/cpuspeed.py b/homeassistant/components/sensor/cpuspeed.py
index c6a7106663f..e97972dae3b 100644
--- a/homeassistant/components/sensor/cpuspeed.py
+++ b/homeassistant/components/sensor/cpuspeed.py
@@ -30,11 +30,11 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the CPU speed sensor."""
     name = config.get(CONF_NAME)
 
-    add_devices([CpuSpeedSensor(name)], True)
+    add_entities([CpuSpeedSensor(name)], True)
 
 
 class CpuSpeedSensor(Entity):
diff --git a/homeassistant/components/sensor/crimereports.py b/homeassistant/components/sensor/crimereports.py
index adf7e3c0fa9..2f1db42a127 100644
--- a/homeassistant/components/sensor/crimereports.py
+++ b/homeassistant/components/sensor/crimereports.py
@@ -41,7 +41,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Crime Reports platform."""
     latitude = config.get(CONF_LATITUDE, hass.config.latitude)
     longitude = config.get(CONF_LONGITUDE, hass.config.longitude)
@@ -50,7 +50,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     include = config.get(CONF_INCLUDE)
     exclude = config.get(CONF_EXCLUDE)
 
-    add_devices([CrimeReportsSensor(
+    add_entities([CrimeReportsSensor(
         hass, name, latitude, longitude, radius, include, exclude)], True)
 
 
diff --git a/homeassistant/components/sensor/cups.py b/homeassistant/components/sensor/cups.py
index 846b109afca..b002d39352a 100644
--- a/homeassistant/components/sensor/cups.py
+++ b/homeassistant/components/sensor/cups.py
@@ -50,7 +50,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the CUPS sensor."""
     host = config.get(CONF_HOST)
     port = config.get(CONF_PORT)
@@ -71,7 +71,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             _LOGGER.error("Printer is not present: %s", printer)
             continue
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class CupsSensor(Entity):
diff --git a/homeassistant/components/sensor/currencylayer.py b/homeassistant/components/sensor/currencylayer.py
index 4a7face0156..67c9c7bbf19 100644
--- a/homeassistant/components/sensor/currencylayer.py
+++ b/homeassistant/components/sensor/currencylayer.py
@@ -36,7 +36,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Currencylayer sensor."""
     base = config.get(CONF_BASE)
     api_key = config.get(CONF_API_KEY)
@@ -54,7 +54,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         sensors.append(CurrencylayerSensor(rest, base, variable))
     if 'error' in response.json():
         return False
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class CurrencylayerSensor(Entity):
diff --git a/homeassistant/components/sensor/daikin.py b/homeassistant/components/sensor/daikin.py
index 2da5cb5cdf0..3445eb531aa 100644
--- a/homeassistant/components/sensor/daikin.py
+++ b/homeassistant/components/sensor/daikin.py
@@ -31,7 +31,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Daikin sensors."""
     if discovery_info is not None:
         host = discovery_info.get('ip')
@@ -51,7 +51,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for monitored_state in monitored_conditions:
         sensors.append(DaikinClimateSensor(api, monitored_state, units, name))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class DaikinClimateSensor(Entity):
diff --git a/homeassistant/components/sensor/darksky.py b/homeassistant/components/sensor/darksky.py
index b2bb7bb4da2..7ce51454ee5 100644
--- a/homeassistant/components/sensor/darksky.py
+++ b/homeassistant/components/sensor/darksky.py
@@ -170,7 +170,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Dark Sky sensor."""
     latitude = config.get(CONF_LATITUDE, hass.config.latitude)
     longitude = config.get(CONF_LONGITUDE, hass.config.longitude)
@@ -211,7 +211,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                 sensors.append(DarkSkySensor(
                     forecast_data, variable, name, forecast_day))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class DarkSkySensor(Entity):
diff --git a/homeassistant/components/sensor/deconz.py b/homeassistant/components/sensor/deconz.py
index 7c492fd496d..a32f1e5e210 100644
--- a/homeassistant/components/sensor/deconz.py
+++ b/homeassistant/components/sensor/deconz.py
@@ -21,13 +21,13 @@ ATTR_DAYLIGHT = 'daylight'
 ATTR_EVENT_ID = 'event_id'
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Old way of setting up deCONZ sensors."""
     pass
 
 
-async def async_setup_entry(hass, config_entry, async_add_devices):
+async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the deCONZ sensors."""
     @callback
     def async_add_sensor(sensors):
@@ -43,7 +43,7 @@ async def async_setup_entry(hass, config_entry, async_add_devices):
                         entities.append(DeconzBattery(sensor))
                 else:
                     entities.append(DeconzSensor(sensor))
-        async_add_devices(entities, True)
+        async_add_entities(entities, True)
 
     hass.data[DATA_DECONZ_UNSUB].append(
         async_dispatcher_connect(hass, 'deconz_new_sensor', async_add_sensor))
diff --git a/homeassistant/components/sensor/deluge.py b/homeassistant/components/sensor/deluge.py
index b9109f6428c..f56b3ac4b97 100644
--- a/homeassistant/components/sensor/deluge.py
+++ b/homeassistant/components/sensor/deluge.py
@@ -42,7 +42,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Deluge sensors."""
     from deluge_client import DelugeRPCClient
 
@@ -62,7 +62,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for variable in config[CONF_MONITORED_VARIABLES]:
         dev.append(DelugeSensor(variable, deluge_api, name))
 
-    add_devices(dev)
+    add_entities(dev)
 
 
 class DelugeSensor(Entity):
diff --git a/homeassistant/components/sensor/demo.py b/homeassistant/components/sensor/demo.py
index 15cc0ec46ae..7921181b742 100644
--- a/homeassistant/components/sensor/demo.py
+++ b/homeassistant/components/sensor/demo.py
@@ -10,9 +10,9 @@ from homeassistant.const import (
 from homeassistant.helpers.entity import Entity
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Demo sensors."""
-    add_devices([
+    add_entities([
         DemoSensor('Outside Temperature', 15.6, DEVICE_CLASS_TEMPERATURE,
                    TEMP_CELSIUS, 12),
         DemoSensor('Outside Humidity', 54, DEVICE_CLASS_HUMIDITY, '%', None),
diff --git a/homeassistant/components/sensor/deutsche_bahn.py b/homeassistant/components/sensor/deutsche_bahn.py
index 0e6ab164d4f..2cbf9a6d691 100644
--- a/homeassistant/components/sensor/deutsche_bahn.py
+++ b/homeassistant/components/sensor/deutsche_bahn.py
@@ -34,13 +34,13 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Deutsche Bahn Sensor."""
     start = config.get(CONF_START)
     destination = config.get(CONF_DESTINATION)
     only_direct = config.get(CONF_ONLY_DIRECT)
 
-    add_devices([DeutscheBahnSensor(start, destination, only_direct)], True)
+    add_entities([DeutscheBahnSensor(start, destination, only_direct)], True)
 
 
 class DeutscheBahnSensor(Entity):
diff --git a/homeassistant/components/sensor/dht.py b/homeassistant/components/sensor/dht.py
index e3aaf2f8484..0aae10fde64 100644
--- a/homeassistant/components/sensor/dht.py
+++ b/homeassistant/components/sensor/dht.py
@@ -51,7 +51,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the DHT sensor."""
     # pylint: disable=import-error
     import Adafruit_DHT
@@ -83,7 +83,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     except KeyError:
         pass
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class DHTSensor(Entity):
diff --git a/homeassistant/components/sensor/discogs.py b/homeassistant/components/sensor/discogs.py
index 2920dc025d7..6e85c41ac6e 100644
--- a/homeassistant/components/sensor/discogs.py
+++ b/homeassistant/components/sensor/discogs.py
@@ -37,7 +37,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Discogs sensor."""
     import discogs_client
 
@@ -51,7 +52,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         _LOGGER.error("API token is not valid")
         return
 
-    async_add_devices([DiscogsSensor(identity, name)], True)
+    async_add_entities([DiscogsSensor(identity, name)], True)
 
 
 class DiscogsSensor(Entity):
diff --git a/homeassistant/components/sensor/dnsip.py b/homeassistant/components/sensor/dnsip.py
index 7b792d179c5..ac681dc691a 100644
--- a/homeassistant/components/sensor/dnsip.py
+++ b/homeassistant/components/sensor/dnsip.py
@@ -40,7 +40,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the DNS IP sensor."""
     hostname = config.get(CONF_HOSTNAME)
     ipv6 = config.get(CONF_IPV6)
@@ -49,7 +50,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     else:
         resolver = config.get(CONF_RESOLVER)
 
-    async_add_devices([WanIpSensor(
+    async_add_entities([WanIpSensor(
         hass, hostname, resolver, ipv6)], True)
 
 
diff --git a/homeassistant/components/sensor/dovado.py b/homeassistant/components/sensor/dovado.py
index 2a78d4ad864..03c2ad601df 100644
--- a/homeassistant/components/sensor/dovado.py
+++ b/homeassistant/components/sensor/dovado.py
@@ -54,9 +54,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Dovado platform for sensors."""
-    return Dovado().setup(hass, config, add_devices)
+    return Dovado().setup(hass, config, add_entities)
 
 
 class Dovado:
@@ -67,7 +67,7 @@ class Dovado:
         self.state = {}
         self._dovado = None
 
-    def setup(self, hass, config, add_devices):
+    def setup(self, hass, config, add_entities):
         """Set up the connection."""
         import dovado
         self._dovado = dovado.Dovado(
@@ -90,7 +90,7 @@ class Dovado:
 
         for sensor in SENSORS:
             if sensor in config.get(CONF_SENSORS, [sensor]):
-                add_devices([DovadoSensor(self, sensor)])
+                add_entities([DovadoSensor(self, sensor)])
 
         return True
 
diff --git a/homeassistant/components/sensor/dsmr.py b/homeassistant/components/sensor/dsmr.py
index 3a1bf1da39e..13b13114150 100644
--- a/homeassistant/components/sensor/dsmr.py
+++ b/homeassistant/components/sensor/dsmr.py
@@ -49,7 +49,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the DSMR sensor."""
     # Suppress logging
     logging.getLogger('dsmr_parser').setLevel(logging.ERROR)
@@ -160,7 +161,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         DerivativeDSMREntity('Hourly Gas Consumption', gas_obis),
     ]
 
-    async_add_devices(devices)
+    async_add_entities(devices)
 
     def update_entities_telegram(telegram):
         """Update entities with latest telegram and trigger state update."""
diff --git a/homeassistant/components/sensor/dte_energy_bridge.py b/homeassistant/components/sensor/dte_energy_bridge.py
index c1687b6025b..629b21e4944 100644
--- a/homeassistant/components/sensor/dte_energy_bridge.py
+++ b/homeassistant/components/sensor/dte_energy_bridge.py
@@ -31,13 +31,13 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the DTE energy bridge sensor."""
     name = config.get(CONF_NAME)
     ip_address = config.get(CONF_IP_ADDRESS)
     version = config.get(CONF_VERSION, 1)
 
-    add_devices([DteEnergyBridgeSensor(ip_address, name, version)], True)
+    add_entities([DteEnergyBridgeSensor(ip_address, name, version)], True)
 
 
 class DteEnergyBridgeSensor(Entity):
diff --git a/homeassistant/components/sensor/dublin_bus_transport.py b/homeassistant/components/sensor/dublin_bus_transport.py
index a443c78b2b1..0fccf7da5a8 100644
--- a/homeassistant/components/sensor/dublin_bus_transport.py
+++ b/homeassistant/components/sensor/dublin_bus_transport.py
@@ -56,14 +56,14 @@ def due_in_minutes(timestamp):
     return str(int(diff.total_seconds() / 60))
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Dublin public transport sensor."""
     name = config.get(CONF_NAME)
     stop = config.get(CONF_STOP_ID)
     route = config.get(CONF_ROUTE)
 
     data = PublicTransportData(stop, route)
-    add_devices([DublinPublicTransportSensor(data, stop, route, name)], True)
+    add_entities([DublinPublicTransportSensor(data, stop, route, name)], True)
 
 
 class DublinPublicTransportSensor(Entity):
diff --git a/homeassistant/components/sensor/duke_energy.py b/homeassistant/components/sensor/duke_energy.py
index 17f118e3cb4..41d3e5706de 100644
--- a/homeassistant/components/sensor/duke_energy.py
+++ b/homeassistant/components/sensor/duke_energy.py
@@ -27,7 +27,7 @@ LAST_BILL_AVERAGE_USAGE = "last_bills_average_usage"
 LAST_BILL_DAYS_BILLED = "last_bills_days_billed"
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up all Duke Energy meters."""
     from pydukeenergy.api import DukeEnergy, DukeEnergyException
 
@@ -39,7 +39,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("Failed to set up Duke Energy")
         return
 
-    add_devices([DukeEnergyMeter(meter) for meter in duke.get_meters()])
+    add_entities([DukeEnergyMeter(meter) for meter in duke.get_meters()])
 
 
 class DukeEnergyMeter(Entity):
diff --git a/homeassistant/components/sensor/dwd_weather_warnings.py b/homeassistant/components/sensor/dwd_weather_warnings.py
index 4f9664617a3..4b7e07d4f3a 100644
--- a/homeassistant/components/sensor/dwd_weather_warnings.py
+++ b/homeassistant/components/sensor/dwd_weather_warnings.py
@@ -53,7 +53,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the DWD-Weather-Warnings sensor."""
     name = config.get(CONF_NAME)
     region_name = config.get(CONF_REGION_NAME)
@@ -63,7 +63,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     sensors = [DwdWeatherWarningsSensor(api, name, condition)
                for condition in config[CONF_MONITORED_CONDITIONS]]
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class DwdWeatherWarningsSensor(Entity):
diff --git a/homeassistant/components/sensor/dweet.py b/homeassistant/components/sensor/dweet.py
index 065c88d8332..25bcaa18bab 100644
--- a/homeassistant/components/sensor/dweet.py
+++ b/homeassistant/components/sensor/dweet.py
@@ -34,7 +34,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Dweet sensor."""
     import dweepy
 
@@ -57,7 +57,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     dweet = DweetData(device)
 
-    add_devices([DweetSensor(hass, dweet, name, value_template, unit)], True)
+    add_entities([DweetSensor(hass, dweet, name, value_template, unit)], True)
 
 
 class DweetSensor(Entity):
diff --git a/homeassistant/components/sensor/dyson.py b/homeassistant/components/sensor/dyson.py
index 91629a18f68..0619e3f6069 100644
--- a/homeassistant/components/sensor/dyson.py
+++ b/homeassistant/components/sensor/dyson.py
@@ -23,7 +23,7 @@ SENSOR_UNITS = {
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Dyson Sensors."""
     _LOGGER.debug("Creating new Dyson fans")
     devices = []
@@ -37,7 +37,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         devices.append(DysonHumiditySensor(hass, device))
         devices.append(DysonTemperatureSensor(hass, device, unit))
         devices.append(DysonAirQualitySensor(hass, device))
-    add_devices(devices)
+    add_entities(devices)
 
 
 class DysonSensor(Entity):
diff --git a/homeassistant/components/sensor/ebox.py b/homeassistant/components/sensor/ebox.py
index 218968ecee8..24458e444dc 100644
--- a/homeassistant/components/sensor/ebox.py
+++ b/homeassistant/components/sensor/ebox.py
@@ -64,7 +64,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the EBox sensor."""
     username = config.get(CONF_USERNAME)
@@ -86,7 +86,7 @@ async def async_setup_platform(hass, config, async_add_devices,
     for variable in config[CONF_MONITORED_VARIABLES]:
         sensors.append(EBoxSensor(ebox_data, variable, name))
 
-    async_add_devices(sensors, True)
+    async_add_entities(sensors, True)
 
 
 class EBoxSensor(Entity):
diff --git a/homeassistant/components/sensor/ecobee.py b/homeassistant/components/sensor/ecobee.py
index a478f964f5a..ae22401a618 100644
--- a/homeassistant/components/sensor/ecobee.py
+++ b/homeassistant/components/sensor/ecobee.py
@@ -19,7 +19,7 @@ SENSOR_TYPES = {
 }
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Ecobee sensors."""
     if discovery_info is None:
         return
@@ -33,7 +33,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
                 dev.append(EcobeeSensor(sensor['name'], item['type'], index))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class EcobeeSensor(Entity):
diff --git a/homeassistant/components/sensor/eddystone_temperature.py b/homeassistant/components/sensor/eddystone_temperature.py
index 4c209d17d07..9e8dc33314a 100644
--- a/homeassistant/components/sensor/eddystone_temperature.py
+++ b/homeassistant/components/sensor/eddystone_temperature.py
@@ -39,7 +39,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Validate configuration, create devices and start monitoring thread."""
     bt_device_id = config.get("bt_device_id")
 
@@ -70,7 +70,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             _LOGGER.info("Starting scanner for Eddystone beacons")
             mon.start()
 
-        add_devices(devices)
+        add_entities(devices)
         mon.start()
         hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, monitor_stop)
         hass.bus.listen_once(EVENT_HOMEASSISTANT_START, monitor_start)
diff --git a/homeassistant/components/sensor/efergy.py b/homeassistant/components/sensor/efergy.py
index b9fe2941463..54666c74f96 100644
--- a/homeassistant/components/sensor/efergy.py
+++ b/homeassistant/components/sensor/efergy.py
@@ -56,7 +56,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Efergy sensor."""
     app_token = config.get(CONF_APPTOKEN)
     utc_offset = str(config.get(CONF_UTC_OFFSET))
@@ -76,7 +76,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             variable[CONF_SENSOR_TYPE], app_token, utc_offset,
             variable[CONF_PERIOD], variable[CONF_CURRENCY]))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class EfergySensor(Entity):
diff --git a/homeassistant/components/sensor/eight_sleep.py b/homeassistant/components/sensor/eight_sleep.py
index 5899ef267cb..0fc793d31ca 100644
--- a/homeassistant/components/sensor/eight_sleep.py
+++ b/homeassistant/components/sensor/eight_sleep.py
@@ -35,7 +35,7 @@ ATTR_SESSION_START = 'Session Start'
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the eight sleep sensors."""
     if discovery_info is None:
@@ -60,7 +60,7 @@ async def async_setup_platform(hass, config, async_add_devices,
         else:
             all_sensors.append(EightUserSensor(name, eight, sensor, units))
 
-    async_add_devices(all_sensors, True)
+    async_add_entities(all_sensors, True)
 
 
 class EightHeatSensor(EightSleepHeatEntity):
diff --git a/homeassistant/components/sensor/eliqonline.py b/homeassistant/components/sensor/eliqonline.py
index 6405c707536..a2b1a4071c1 100644
--- a/homeassistant/components/sensor/eliqonline.py
+++ b/homeassistant/components/sensor/eliqonline.py
@@ -35,7 +35,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the ELIQ Online sensor."""
     import eliqonline
 
@@ -52,7 +52,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("Could not access the ELIQ Online API: %s", error)
         return False
 
-    add_devices([EliqSensor(api, channel_id, name)], True)
+    add_entities([EliqSensor(api, channel_id, name)], True)
 
 
 class EliqSensor(Entity):
diff --git a/homeassistant/components/sensor/emoncms.py b/homeassistant/components/sensor/emoncms.py
index a62eaba7df8..7546224d4c5 100644
--- a/homeassistant/components/sensor/emoncms.py
+++ b/homeassistant/components/sensor/emoncms.py
@@ -61,7 +61,7 @@ def get_id(sensorid, feedtag, feedname, feedid, feeduserid):
         sensorid, feedtag, feedname, feedid, feeduserid)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Emoncms sensor."""
     apikey = config.get(CONF_API_KEY)
     url = config.get(CONF_URL)
@@ -102,7 +102,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         sensors.append(EmonCmsSensor(hass, data, name, value_template,
                                      unit_of_measurement, str(sensorid),
                                      elem))
-    add_devices(sensors)
+    add_entities(sensors)
 
 
 class EmonCmsSensor(Entity):
diff --git a/homeassistant/components/sensor/enocean.py b/homeassistant/components/sensor/enocean.py
index 6b0207c2488..02e6812d5d5 100644
--- a/homeassistant/components/sensor/enocean.py
+++ b/homeassistant/components/sensor/enocean.py
@@ -25,12 +25,12 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up an EnOcean sensor device."""
     dev_id = config.get(CONF_ID)
     devname = config.get(CONF_NAME)
 
-    add_devices([EnOceanSensor(dev_id, devname)])
+    add_entities([EnOceanSensor(dev_id, devname)])
 
 
 class EnOceanSensor(enocean.EnOceanDevice, Entity):
diff --git a/homeassistant/components/sensor/enphase_envoy.py b/homeassistant/components/sensor/enphase_envoy.py
index 3c132fcf7df..6afe887537c 100644
--- a/homeassistant/components/sensor/enphase_envoy.py
+++ b/homeassistant/components/sensor/enphase_envoy.py
@@ -37,15 +37,15 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
         vol.All(cv.ensure_list, [vol.In(list(SENSORS))])})
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Enphase Envoy sensor."""
     ip_address = config[CONF_IP_ADDRESS]
     monitored_conditions = config[CONF_MONITORED_CONDITIONS]
 
     # Iterate through the list of sensors
     for condition in monitored_conditions:
-        add_devices([Envoy(ip_address, condition, SENSORS[condition][0],
-                           SENSORS[condition][1])], True)
+        add_entities([Envoy(ip_address, condition, SENSORS[condition][0],
+                            SENSORS[condition][1])], True)
 
 
 class Envoy(Entity):
diff --git a/homeassistant/components/sensor/envirophat.py b/homeassistant/components/sensor/envirophat.py
index bf4ee55c446..1c90f5998e8 100644
--- a/homeassistant/components/sensor/envirophat.py
+++ b/homeassistant/components/sensor/envirophat.py
@@ -52,7 +52,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Sense HAT sensor platform."""
     try:
         import envirophat
@@ -66,7 +66,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for variable in config[CONF_DISPLAY_OPTIONS]:
         dev.append(EnvirophatSensor(data, variable))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class EnvirophatSensor(Entity):
diff --git a/homeassistant/components/sensor/envisalink.py b/homeassistant/components/sensor/envisalink.py
index 24cb224570c..91f99e31b48 100644
--- a/homeassistant/components/sensor/envisalink.py
+++ b/homeassistant/components/sensor/envisalink.py
@@ -20,7 +20,8 @@ DEPENDENCIES = ['envisalink']
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Perform the setup for Envisalink sensor devices."""
     configured_partitions = discovery_info['partitions']
 
@@ -35,7 +36,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
             hass.data[DATA_EVL])
         devices.append(device)
 
-    async_add_devices(devices)
+    async_add_entities(devices)
 
 
 class EnvisalinkSensor(EnvisalinkDevice, Entity):
diff --git a/homeassistant/components/sensor/etherscan.py b/homeassistant/components/sensor/etherscan.py
index 360ca4516ce..24cf046cca0 100644
--- a/homeassistant/components/sensor/etherscan.py
+++ b/homeassistant/components/sensor/etherscan.py
@@ -30,7 +30,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Etherscan.io sensors."""
     address = config.get(CONF_ADDRESS)
     name = config.get(CONF_NAME)
@@ -44,7 +44,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     if not name:
         name = "ETH Balance"
 
-    add_devices([EtherscanSensor(name, address, token, token_address)], True)
+    add_entities([EtherscanSensor(name, address, token, token_address)], True)
 
 
 class EtherscanSensor(Entity):
diff --git a/homeassistant/components/sensor/fail2ban.py b/homeassistant/components/sensor/fail2ban.py
index bf868d49201..0f018af819d 100644
--- a/homeassistant/components/sensor/fail2ban.py
+++ b/homeassistant/components/sensor/fail2ban.py
@@ -40,7 +40,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the fail2ban sensor."""
     name = config.get(CONF_NAME)
     jails = config.get(CONF_JAILS)
@@ -52,7 +53,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     for jail in jails:
         device_list.append(BanSensor(name, jail, log_parser))
 
-    async_add_devices(device_list, True)
+    async_add_entities(device_list, True)
 
 
 class BanSensor(Entity):
diff --git a/homeassistant/components/sensor/fastdotcom.py b/homeassistant/components/sensor/fastdotcom.py
index 65474cd4bf6..6624265f60c 100644
--- a/homeassistant/components/sensor/fastdotcom.py
+++ b/homeassistant/components/sensor/fastdotcom.py
@@ -41,11 +41,11 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Fast.com sensor."""
     data = SpeedtestData(hass, config)
     sensor = SpeedtestSensor(data)
-    add_devices([sensor])
+    add_entities([sensor])
 
     def update(call=None):
         """Update service for manual updates."""
diff --git a/homeassistant/components/sensor/fedex.py b/homeassistant/components/sensor/fedex.py
index 991588f07f3..7d5f47b3631 100644
--- a/homeassistant/components/sensor/fedex.py
+++ b/homeassistant/components/sensor/fedex.py
@@ -41,7 +41,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Fedex platform."""
     import fedexdeliverymanager
 
@@ -57,7 +57,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.exception("Could not connect to Fedex Delivery Manager")
         return False
 
-    add_devices([FedexSensor(session, name, update_interval)], True)
+    add_entities([FedexSensor(session, name, update_interval)], True)
 
 
 class FedexSensor(Entity):
diff --git a/homeassistant/components/sensor/fido.py b/homeassistant/components/sensor/fido.py
index 4f724b5b851..4c027b906a2 100644
--- a/homeassistant/components/sensor/fido.py
+++ b/homeassistant/components/sensor/fido.py
@@ -71,7 +71,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Fido sensor."""
     username = config.get(CONF_USERNAME)
     password = config.get(CONF_PASSWORD)
@@ -89,7 +90,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         for variable in config[CONF_MONITORED_VARIABLES]:
             sensors.append(FidoSensor(fido_data, variable, name, number))
 
-    async_add_devices(sensors, True)
+    async_add_entities(sensors, True)
 
 
 class FidoSensor(Entity):
diff --git a/homeassistant/components/sensor/file.py b/homeassistant/components/sensor/file.py
index cbdd4eef227..1839b3566ee 100644
--- a/homeassistant/components/sensor/file.py
+++ b/homeassistant/components/sensor/file.py
@@ -33,7 +33,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the file sensor."""
     file_path = config.get(CONF_FILE_PATH)
     name = config.get(CONF_NAME)
@@ -44,7 +45,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         value_template.hass = hass
 
     if hass.config.is_allowed_path(file_path):
-        async_add_devices(
+        async_add_entities(
             [FileSensor(name, file_path, unit, value_template)], True)
     else:
         _LOGGER.error("'%s' is not a whitelisted directory", file_path)
diff --git a/homeassistant/components/sensor/filesize.py b/homeassistant/components/sensor/filesize.py
index a5a65f9bb5e..4df858fda23 100644
--- a/homeassistant/components/sensor/filesize.py
+++ b/homeassistant/components/sensor/filesize.py
@@ -26,7 +26,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the file size sensor."""
     sensors = []
     for path in config.get(CONF_FILE_PATHS):
@@ -38,7 +38,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             sensors.append(Filesize(path))
 
     if sensors:
-        add_devices(sensors, True)
+        add_entities(sensors, True)
 
 
 class Filesize(Entity):
diff --git a/homeassistant/components/sensor/filter.py b/homeassistant/components/sensor/filter.py
index 15059b08a17..1c6e857b92b 100644
--- a/homeassistant/components/sensor/filter.py
+++ b/homeassistant/components/sensor/filter.py
@@ -114,7 +114,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the template sensors."""
     name = config.get(CONF_NAME)
@@ -124,7 +124,7 @@ async def async_setup_platform(hass, config, async_add_devices,
         entity=entity_id, **_filter)
                for _filter in config[CONF_FILTERS]]
 
-    async_add_devices([SensorFilter(name, entity_id, filters)])
+    async_add_entities([SensorFilter(name, entity_id, filters)])
 
 
 class SensorFilter(Entity):
diff --git a/homeassistant/components/sensor/fints.py b/homeassistant/components/sensor/fints.py
index c573f0f0058..1704c13b5aa 100644
--- a/homeassistant/components/sensor/fints.py
+++ b/homeassistant/components/sensor/fints.py
@@ -50,7 +50,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the sensors.
 
     Login to the bank and get a list of existing accounts. Create a
@@ -98,7 +98,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.debug('Creating holdings %s for bank %s',
                       account.accountnumber, fints_name)
 
-    add_devices(accounts, True)
+    add_entities(accounts, True)
 
 
 class FinTsClient:
diff --git a/homeassistant/components/sensor/fitbit.py b/homeassistant/components/sensor/fitbit.py
index 87bd735a03d..f5b44d577a7 100644
--- a/homeassistant/components/sensor/fitbit.py
+++ b/homeassistant/components/sensor/fitbit.py
@@ -151,7 +151,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def request_app_setup(hass, config, add_devices, config_path,
+def request_app_setup(hass, config, add_entities, config_path,
                       discovery_info=None):
     """Assist user with configuring the Fitbit dev application."""
     configurator = hass.components.configurator
@@ -167,9 +167,9 @@ def request_app_setup(hass, config, add_devices, config_path,
                 configurator.notify_errors(_CONFIGURING['fitbit'],
                                            error_msg)
             else:
-                setup_platform(hass, config, add_devices, discovery_info)
+                setup_platform(hass, config, add_entities, discovery_info)
         else:
-            setup_platform(hass, config, add_devices, discovery_info)
+            setup_platform(hass, config, add_entities, discovery_info)
 
     start_url = "{}{}".format(hass.config.api.base_url,
                               FITBIT_AUTH_CALLBACK_PATH)
@@ -215,19 +215,19 @@ def request_oauth_completion(hass):
     )
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Fitbit sensor."""
     config_path = hass.config.path(FITBIT_CONFIG_FILE)
     if os.path.isfile(config_path):
         config_file = load_json(config_path)
         if config_file == DEFAULT_CONFIG:
             request_app_setup(
-                hass, config, add_devices, config_path, discovery_info=None)
+                hass, config, add_entities, config_path, discovery_info=None)
             return False
     else:
         save_json(config_path, DEFAULT_CONFIG)
         request_app_setup(
-            hass, config, add_devices, config_path, discovery_info=None)
+            hass, config, add_entities, config_path, discovery_info=None)
         return False
 
     if "fitbit" in _CONFIGURING:
@@ -276,7 +276,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                 dev.append(FitbitSensor(
                     authd_client, config_path, resource,
                     hass.config.units.is_metric, clock_format))
-        add_devices(dev, True)
+        add_entities(dev, True)
 
     else:
         oauth = fitbit.api.FitbitOauth2Client(
@@ -293,7 +293,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
         hass.http.register_redirect(FITBIT_AUTH_START, fitbit_auth_start_url)
         hass.http.register_view(FitbitAuthCallbackView(
-            config, add_devices, oauth))
+            config, add_entities, oauth))
 
         request_oauth_completion(hass)
 
@@ -305,10 +305,10 @@ class FitbitAuthCallbackView(HomeAssistantView):
     url = FITBIT_AUTH_CALLBACK_PATH
     name = 'api:fitbit:callback'
 
-    def __init__(self, config, add_devices, oauth):
+    def __init__(self, config, add_entities, oauth):
         """Initialize the OAuth callback view."""
         self.config = config
-        self.add_devices = add_devices
+        self.add_entities = add_entities
         self.oauth = oauth
 
     @callback
@@ -368,7 +368,8 @@ class FitbitAuthCallbackView(HomeAssistantView):
             }
         save_json(hass.config.path(FITBIT_CONFIG_FILE), config_contents)
 
-        hass.async_add_job(setup_platform, hass, self.config, self.add_devices)
+        hass.async_add_job(setup_platform, hass, self.config,
+                           self.add_entities)
 
         return html_response
 
diff --git a/homeassistant/components/sensor/fixer.py b/homeassistant/components/sensor/fixer.py
index 5a6f8da79b2..1bdd9e71272 100644
--- a/homeassistant/components/sensor/fixer.py
+++ b/homeassistant/components/sensor/fixer.py
@@ -38,7 +38,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Fixer.io sensor."""
     from fixerio import Fixerio, exceptions
 
@@ -53,7 +53,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         return
 
     data = ExchangeData(target, api_key)
-    add_devices([ExchangeRateSensor(data, name, target)], True)
+    add_entities([ExchangeRateSensor(data, name, target)], True)
 
 
 class ExchangeRateSensor(Entity):
diff --git a/homeassistant/components/sensor/folder.py b/homeassistant/components/sensor/folder.py
index 2b5f3dd4309..8101bbd059a 100644
--- a/homeassistant/components/sensor/folder.py
+++ b/homeassistant/components/sensor/folder.py
@@ -42,7 +42,7 @@ def get_size(files_list):
     return sum(size_list)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the folder sensor."""
     path = config.get(CONF_FOLDER_PATHS)
 
@@ -50,7 +50,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("folder %s is not valid or allowed", path)
     else:
         folder = Folder(path, config.get(CONF_FILTER))
-        add_devices([folder], True)
+        add_entities([folder], True)
 
 
 class Folder(Entity):
diff --git a/homeassistant/components/sensor/foobot.py b/homeassistant/components/sensor/foobot.py
index d247a90e93a..62139c53c4b 100644
--- a/homeassistant/components/sensor/foobot.py
+++ b/homeassistant/components/sensor/foobot.py
@@ -52,7 +52,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the devices associated with the account."""
     from foobot_async import FoobotClient
@@ -82,7 +82,7 @@ async def async_setup_platform(hass, config, async_add_devices,
     except FoobotClient.ClientError:
         _LOGGER.error('Failed to fetch data from foobot servers.')
         return
-    async_add_devices(dev, True)
+    async_add_entities(dev, True)
 
 
 class FoobotSensor(Entity):
diff --git a/homeassistant/components/sensor/fritzbox_callmonitor.py b/homeassistant/components/sensor/fritzbox_callmonitor.py
index 3da9c512ebd..c60d06da039 100644
--- a/homeassistant/components/sensor/fritzbox_callmonitor.py
+++ b/homeassistant/components/sensor/fritzbox_callmonitor.py
@@ -56,7 +56,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Fritz!Box call monitor sensor platform."""
     name = config.get(CONF_NAME)
     host = config.get(CONF_HOST)
@@ -77,7 +77,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     sensor = FritzBoxCallSensor(name=name, phonebook=phonebook)
 
-    add_devices([sensor])
+    add_entities([sensor])
 
     monitor = FritzBoxCallMonitor(host=host, port=port, sensor=sensor)
     monitor.connect()
diff --git a/homeassistant/components/sensor/fritzbox_netmonitor.py b/homeassistant/components/sensor/fritzbox_netmonitor.py
index b980323abe1..356c1424012 100644
--- a/homeassistant/components/sensor/fritzbox_netmonitor.py
+++ b/homeassistant/components/sensor/fritzbox_netmonitor.py
@@ -48,7 +48,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the FRITZ!Box monitor sensors."""
     # pylint: disable=import-error
     import fritzconnection as fc
@@ -67,7 +67,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         return 1
     _LOGGER.info("Successfully connected to FRITZ!Box")
 
-    add_devices([FritzboxMonitorSensor(name, fstatus)], True)
+    add_entities([FritzboxMonitorSensor(name, fstatus)], True)
 
 
 class FritzboxMonitorSensor(Entity):
diff --git a/homeassistant/components/sensor/gearbest.py b/homeassistant/components/sensor/gearbest.py
index d71419ba79e..5521e9a644c 100644
--- a/homeassistant/components/sensor/gearbest.py
+++ b/homeassistant/components/sensor/gearbest.py
@@ -43,7 +43,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Gearbest sensor."""
     from gearbest_parser import CurrencyConverter
     currency = config.get(CONF_CURRENCY)
@@ -68,7 +68,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                         currency_update,
                         MIN_TIME_BETWEEN_CURRENCY_UPDATES)
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class GearbestSensor(Entity):
diff --git a/homeassistant/components/sensor/geizhals.py b/homeassistant/components/sensor/geizhals.py
index 0458c2022af..2c7325866ac 100644
--- a/homeassistant/components/sensor/geizhals.py
+++ b/homeassistant/components/sensor/geizhals.py
@@ -41,7 +41,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Geizwatch sensor."""
     name = config.get(CONF_NAME)
     description = config.get(CONF_DESCRIPTION)
@@ -49,8 +49,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     domain = config.get(CONF_DOMAIN)
     regex = config.get(CONF_REGEX)
 
-    add_devices([Geizwatch(name, description, product_id, domain, regex)],
-                True)
+    add_entities([Geizwatch(name, description, product_id, domain, regex)],
+                 True)
 
 
 class Geizwatch(Entity):
diff --git a/homeassistant/components/sensor/geo_rss_events.py b/homeassistant/components/sensor/geo_rss_events.py
index b79e6e69adf..1ba0ce2e065 100644
--- a/homeassistant/components/sensor/geo_rss_events.py
+++ b/homeassistant/components/sensor/geo_rss_events.py
@@ -54,7 +54,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the GeoRSS component."""
     home_latitude = hass.config.latitude
     home_longitude = hass.config.longitude
@@ -81,7 +81,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             device = GeoRssServiceSensor(category, data, name,
                                          unit_of_measurement)
             devices.append(device)
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class GeoRssServiceSensor(Entity):
diff --git a/homeassistant/components/sensor/gitter.py b/homeassistant/components/sensor/gitter.py
index 907af07a2db..97cd3f662d5 100644
--- a/homeassistant/components/sensor/gitter.py
+++ b/homeassistant/components/sensor/gitter.py
@@ -33,7 +33,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Gitter sensor."""
     from gitterpy.client import GitterClient
     from gitterpy.errors import GitterTokenError
@@ -49,7 +49,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("Token is not valid")
         return
 
-    add_devices([GitterSensor(gitter, room, name, username)], True)
+    add_entities([GitterSensor(gitter, room, name, username)], True)
 
 
 class GitterSensor(Entity):
diff --git a/homeassistant/components/sensor/glances.py b/homeassistant/components/sensor/glances.py
index c2a6607334d..c2127827ebd 100644
--- a/homeassistant/components/sensor/glances.py
+++ b/homeassistant/components/sensor/glances.py
@@ -63,7 +63,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the Glances sensors."""
     from glances_api import Glances
 
@@ -86,7 +86,7 @@ async def async_setup_platform(
     for resource in var_conf:
         dev.append(GlancesSensor(glances, name, resource))
 
-    async_add_devices(dev, True)
+    async_add_entities(dev, True)
 
 
 class GlancesSensor(Entity):
diff --git a/homeassistant/components/sensor/google_travel_time.py b/homeassistant/components/sensor/google_travel_time.py
index d14a70ecc84..a69b865f30b 100644
--- a/homeassistant/components/sensor/google_travel_time.py
+++ b/homeassistant/components/sensor/google_travel_time.py
@@ -79,7 +79,7 @@ def convert_time_to_utc(timestr):
     return dt_util.as_timestamp(combined)
 
 
-def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+def setup_platform(hass, config, add_entities_callback, discovery_info=None):
     """Set up the Google travel time platform."""
     def run_setup(event):
         """Delay the setup until Home Assistant is fully initialized.
@@ -112,7 +112,7 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
             hass, name, api_key, origin, destination, options)
 
         if sensor.valid_api_connection:
-            add_devices_callback([sensor])
+            add_entities_callback([sensor])
 
     # Wait until start event is sent to load this component.
     hass.bus.listen_once(EVENT_HOMEASSISTANT_START, run_setup)
diff --git a/homeassistant/components/sensor/google_wifi.py b/homeassistant/components/sensor/google_wifi.py
index cc5461ed548..35db8f7c9e8 100644
--- a/homeassistant/components/sensor/google_wifi.py
+++ b/homeassistant/components/sensor/google_wifi.py
@@ -76,7 +76,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Google Wifi sensor."""
     name = config.get(CONF_NAME)
     host = config.get(CONF_HOST)
@@ -87,7 +87,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for condition in conditions:
         dev.append(GoogleWifiSensor(api, name, condition))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class GoogleWifiSensor(Entity):
diff --git a/homeassistant/components/sensor/gpsd.py b/homeassistant/components/sensor/gpsd.py
index f463d0fb8d1..0504cf7a511 100644
--- a/homeassistant/components/sensor/gpsd.py
+++ b/homeassistant/components/sensor/gpsd.py
@@ -36,7 +36,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the GPSD component."""
     name = config.get(CONF_NAME)
     host = config.get(CONF_HOST)
@@ -62,7 +62,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("Not able to connect to GPSD")
         return False
 
-    add_devices([GpsdSensor(hass, name, host, port)])
+    add_entities([GpsdSensor(hass, name, host, port)])
 
 
 class GpsdSensor(Entity):
diff --git a/homeassistant/components/sensor/gtfs.py b/homeassistant/components/sensor/gtfs.py
index 120fe8fdb22..633a50f15c1 100644
--- a/homeassistant/components/sensor/gtfs.py
+++ b/homeassistant/components/sensor/gtfs.py
@@ -151,7 +151,7 @@ def get_next_departure(sched, start_station_id, end_station_id, offset):
     }
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the GTFS sensor."""
     gtfs_dir = hass.config.path(DEFAULT_PATH)
     data = config.get(CONF_DATA)
@@ -179,7 +179,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     if not gtfs.feeds:
         pygtfs.append_feed(gtfs, os.path.join(gtfs_dir, data))
 
-    add_devices([GTFSDepartureSensor(gtfs, name, origin, destination, offset)])
+    add_entities([
+        GTFSDepartureSensor(gtfs, name, origin, destination, offset)])
 
 
 class GTFSDepartureSensor(Entity):
diff --git a/homeassistant/components/sensor/haveibeenpwned.py b/homeassistant/components/sensor/haveibeenpwned.py
index bc79c4d0c1d..9428eaea00e 100644
--- a/homeassistant/components/sensor/haveibeenpwned.py
+++ b/homeassistant/components/sensor/haveibeenpwned.py
@@ -35,7 +35,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the HaveIBeenPwned sensor."""
     emails = config.get(CONF_EMAIL)
     data = HaveIBeenPwnedData(emails)
@@ -44,7 +44,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for email in emails:
         devices.append(HaveIBeenPwnedSensor(data, hass, email))
 
-    add_devices(devices)
+    add_entities(devices)
 
     # To make sure we get initial data for the sensors ignoring the normal
     # throttle of 15 minutes but using an update throttle of 5 seconds
diff --git a/homeassistant/components/sensor/hddtemp.py b/homeassistant/components/sensor/hddtemp.py
index f8afe9c7637..52514a2de39 100644
--- a/homeassistant/components/sensor/hddtemp.py
+++ b/homeassistant/components/sensor/hddtemp.py
@@ -37,7 +37,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the HDDTemp sensor."""
     name = config.get(CONF_NAME)
     host = config.get(CONF_HOST)
@@ -54,7 +54,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for disk in disks:
         dev.append(HddTempSensor(name, disk, hddtemp))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class HddTempSensor(Entity):
diff --git a/homeassistant/components/sensor/history_stats.py b/homeassistant/components/sensor/history_stats.py
index c3d0fe8f1b6..c76d2cefca0 100644
--- a/homeassistant/components/sensor/history_stats.py
+++ b/homeassistant/components/sensor/history_stats.py
@@ -67,7 +67,7 @@ PLATFORM_SCHEMA = vol.All(PLATFORM_SCHEMA.extend({
 
 
 # noinspection PyUnusedLocal
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the History Stats sensor."""
     entity_id = config.get(CONF_ENTITY_ID)
     entity_state = config.get(CONF_STATE)
@@ -81,8 +81,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         if template is not None:
             template.hass = hass
 
-    add_devices([HistoryStatsSensor(hass, entity_id, entity_state, start, end,
-                                    duration, sensor_type, name)])
+    add_entities([HistoryStatsSensor(hass, entity_id, entity_state, start, end,
+                                     duration, sensor_type, name)])
 
     return True
 
diff --git a/homeassistant/components/sensor/hive.py b/homeassistant/components/sensor/hive.py
index 2d609070415..3f900320801 100644
--- a/homeassistant/components/sensor/hive.py
+++ b/homeassistant/components/sensor/hive.py
@@ -16,7 +16,7 @@ DEVICETYPE_ICONS = {'Hub_OnlineStatus': 'mdi:switch',
                     'Hive_OutsideTemperature': 'mdi:thermometer'}
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Hive sensor devices."""
     if discovery_info is None:
         return
@@ -24,7 +24,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     if (discovery_info["HA_DeviceType"] == "Hub_OnlineStatus" or
             discovery_info["HA_DeviceType"] == "Hive_OutsideTemperature"):
-        add_devices([HiveSensorEntity(session, discovery_info)])
+        add_entities([HiveSensorEntity(session, discovery_info)])
 
 
 class HiveSensorEntity(Entity):
diff --git a/homeassistant/components/sensor/homematic.py b/homeassistant/components/sensor/homematic.py
index 0303525abcf..8495286c143 100644
--- a/homeassistant/components/sensor/homematic.py
+++ b/homeassistant/components/sensor/homematic.py
@@ -70,7 +70,7 @@ HM_ICON_HA_CAST = {
 }
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the HomeMatic sensor platform."""
     if discovery_info is None:
         return
@@ -80,7 +80,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         new_device = HMSensor(conf)
         devices.append(new_device)
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class HMSensor(HMDevice):
diff --git a/homeassistant/components/sensor/homematicip_cloud.py b/homeassistant/components/sensor/homematicip_cloud.py
index 7d4944f5f5f..2b8365b8f64 100644
--- a/homeassistant/components/sensor/homematicip_cloud.py
+++ b/homeassistant/components/sensor/homematicip_cloud.py
@@ -25,12 +25,12 @@ ATTR_HUMIDITY = 'humidity'
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the HomematicIP Cloud sensors devices."""
     pass
 
 
-async def async_setup_entry(hass, config_entry, async_add_devices):
+async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the HomematicIP Cloud sensors from a config entry."""
     from homematicip.device import (
         HeatingThermostat, TemperatureHumiditySensorWithoutDisplay,
@@ -49,7 +49,7 @@ async def async_setup_entry(hass, config_entry, async_add_devices):
             devices.append(HomematicipIlluminanceSensor(home, device))
 
     if devices:
-        async_add_devices(devices)
+        async_add_entities(devices)
 
 
 class HomematicipAccesspointStatus(HomematicipGenericDevice):
diff --git a/homeassistant/components/sensor/hp_ilo.py b/homeassistant/components/sensor/hp_ilo.py
index 98ee83f8958..ac2d5ccb109 100644
--- a/homeassistant/components/sensor/hp_ilo.py
+++ b/homeassistant/components/sensor/hp_ilo.py
@@ -59,7 +59,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the HP ILO sensor."""
     hostname = config.get(CONF_HOST)
     port = config.get(CONF_PORT)
@@ -89,7 +89,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                 CONF_UNIT_OF_MEASUREMENT))
         devices.append(new_device)
 
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class HpIloSensor(Entity):
diff --git a/homeassistant/components/sensor/htu21d.py b/homeassistant/components/sensor/htu21d.py
index 870ca0ca160..28ab933ff6c 100644
--- a/homeassistant/components/sensor/htu21d.py
+++ b/homeassistant/components/sensor/htu21d.py
@@ -41,7 +41,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 # pylint: disable=import-error
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the HTU21D sensor."""
     import smbus
     from i2csense.htu21d import HTU21D
@@ -63,7 +64,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     dev = [HTU21DSensor(sensor_handler, name, SENSOR_TEMPERATURE, temp_unit),
            HTU21DSensor(sensor_handler, name, SENSOR_HUMIDITY, '%')]
 
-    async_add_devices(dev)
+    async_add_entities(dev)
 
 
 class HTU21DHandler:
diff --git a/homeassistant/components/sensor/hydrawise.py b/homeassistant/components/sensor/hydrawise.py
index fea2780da07..bff99ddc501 100644
--- a/homeassistant/components/sensor/hydrawise.py
+++ b/homeassistant/components/sensor/hydrawise.py
@@ -24,7 +24,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a sensor for a Hydrawise device."""
     hydrawise = hass.data[DATA_HYDRAWISE].data
 
@@ -33,7 +33,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         for zone in hydrawise.relays:
             sensors.append(HydrawiseSensor(zone, sensor_type))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class HydrawiseSensor(HydrawiseEntity):
diff --git a/homeassistant/components/sensor/hydroquebec.py b/homeassistant/components/sensor/hydroquebec.py
index db75d51fbad..44b96bab1e9 100644
--- a/homeassistant/components/sensor/hydroquebec.py
+++ b/homeassistant/components/sensor/hydroquebec.py
@@ -94,7 +94,8 @@ DAILY_MAP = (('yesterday_total_consumption', 'consoTotalQuot'),
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the HydroQuebec sensor."""
     # Create a data fetcher to support all of the configured sensors. Then make
     # the first call to init the data.
@@ -118,7 +119,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     for variable in config[CONF_MONITORED_VARIABLES]:
         sensors.append(HydroQuebecSensor(hydroquebec_data, variable, name))
 
-    async_add_devices(sensors, True)
+    async_add_entities(sensors, True)
 
 
 class HydroQuebecSensor(Entity):
diff --git a/homeassistant/components/sensor/ihc.py b/homeassistant/components/sensor/ihc.py
index 547e6b52d9a..f5140838a7a 100644
--- a/homeassistant/components/sensor/ihc.py
+++ b/homeassistant/components/sensor/ihc.py
@@ -30,7 +30,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the IHC sensor platform."""
     ihc_controller = hass.data[IHC_DATA][IHC_CONTROLLER]
     info = hass.data[IHC_DATA][IHC_INFO]
@@ -53,7 +53,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             sensor = IHCSensor(ihc_controller, name, ihc_id, info, unit)
             devices.append(sensor)
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class IHCSensor(IHCDevice, Entity):
diff --git a/homeassistant/components/sensor/imap.py b/homeassistant/components/sensor/imap.py
index 647a40295ac..2ea1fd576e6 100644
--- a/homeassistant/components/sensor/imap.py
+++ b/homeassistant/components/sensor/imap.py
@@ -41,7 +41,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 async def async_setup_platform(hass,
                                config,
-                               async_add_devices,
+                               async_add_entities,
                                discovery_info=None):
     """Set up the IMAP platform."""
     sensor = ImapSensor(config.get(CONF_NAME),
@@ -54,7 +54,7 @@ async def async_setup_platform(hass,
         raise PlatformNotReady
 
     hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, sensor.shutdown())
-    async_add_devices([sensor], True)
+    async_add_entities([sensor], True)
 
 
 class ImapSensor(Entity):
diff --git a/homeassistant/components/sensor/imap_email_content.py b/homeassistant/components/sensor/imap_email_content.py
index a1a604df3e4..ed535b69a1d 100644
--- a/homeassistant/components/sensor/imap_email_content.py
+++ b/homeassistant/components/sensor/imap_email_content.py
@@ -39,7 +39,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Email sensor platform."""
     reader = EmailReader(
         config.get(CONF_USERNAME), config.get(CONF_PASSWORD),
@@ -53,7 +53,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         config.get(CONF_SENDERS), value_template)
 
     if sensor.connected:
-        add_devices([sensor], True)
+        add_entities([sensor], True)
     else:
         return False
 
diff --git a/homeassistant/components/sensor/influxdb.py b/homeassistant/components/sensor/influxdb.py
index 8bfbaf49837..87e2bdb5c9c 100644
--- a/homeassistant/components/sensor/influxdb.py
+++ b/homeassistant/components/sensor/influxdb.py
@@ -63,7 +63,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the InfluxDB component."""
     influx_conf = {
         'host': config[CONF_HOST],
@@ -81,7 +81,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         if sensor.connected:
             dev.append(sensor)
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class InfluxSensor(Entity):
diff --git a/homeassistant/components/sensor/insteon.py b/homeassistant/components/sensor/insteon.py
index 59c0fee7617..5b8a6b9a977 100644
--- a/homeassistant/components/sensor/insteon.py
+++ b/homeassistant/components/sensor/insteon.py
@@ -16,7 +16,8 @@ _LOGGER = logging.getLogger(__name__)
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the INSTEON device class for the hass platform."""
     insteon_modem = hass.data['insteon'].get('modem')
 
@@ -29,7 +30,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
 
     new_entity = InsteonSensorDevice(device, state_key)
 
-    async_add_devices([new_entity])
+    async_add_entities([new_entity])
 
 
 class InsteonSensorDevice(InsteonEntity, Entity):
diff --git a/homeassistant/components/sensor/ios.py b/homeassistant/components/sensor/ios.py
index 1fd556b17c0..f775381c4ec 100644
--- a/homeassistant/components/sensor/ios.py
+++ b/homeassistant/components/sensor/ios.py
@@ -19,7 +19,7 @@ DEFAULT_ICON_LEVEL = 'mdi:battery'
 DEFAULT_ICON_STATE = 'mdi:power-plug'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the iOS sensor."""
     if discovery_info is None:
         return
@@ -28,7 +28,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         for sensor_type in ('level', 'state'):
             dev.append(IOSSensor(sensor_type, device_name, device))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class IOSSensor(Entity):
diff --git a/homeassistant/components/sensor/iota.py b/homeassistant/components/sensor/iota.py
index 2e3e58a18f3..961cd119d78 100644
--- a/homeassistant/components/sensor/iota.py
+++ b/homeassistant/components/sensor/iota.py
@@ -24,7 +24,7 @@ DEPENDENCIES = ['iota']
 SCAN_INTERVAL = timedelta(minutes=3)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the IOTA sensor."""
     # Add sensors for wallet balance
     iota_config = discovery_info
@@ -34,7 +34,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     # Add sensor for node information
     sensors.append(IotaNodeSensor(iota_config=iota_config))
 
-    add_devices(sensors)
+    add_entities(sensors)
 
 
 class IotaBalanceSensor(IotaDevice):
diff --git a/homeassistant/components/sensor/iperf3.py b/homeassistant/components/sensor/iperf3.py
index 8e030390f50..0eb6dfaa00c 100644
--- a/homeassistant/components/sensor/iperf3.py
+++ b/homeassistant/components/sensor/iperf3.py
@@ -64,7 +64,7 @@ SERVICE_SCHEMA = vol.Schema({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Iperf3 sensor."""
     if hass.data.get(IPERF3_DATA) is None:
         hass.data[IPERF3_DATA] = {}
@@ -81,7 +81,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                          sensor))
 
     hass.data[IPERF3_DATA]['sensors'].extend(dev)
-    add_devices(dev)
+    add_entities(dev)
 
     def _service_handler(service):
         """Update service for manual updates."""
diff --git a/homeassistant/components/sensor/irish_rail_transport.py b/homeassistant/components/sensor/irish_rail_transport.py
index 38fd910260a..10f4004ae74 100644
--- a/homeassistant/components/sensor/irish_rail_transport.py
+++ b/homeassistant/components/sensor/irish_rail_transport.py
@@ -49,7 +49,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Irish Rail transport sensor."""
     from pyirishrail.pyirishrail import IrishRailRTPI
     station = config.get(CONF_STATION)
@@ -61,7 +61,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     irish_rail = IrishRailRTPI()
     data = IrishRailTransportData(
         irish_rail, station, direction, destination, stops_at)
-    add_devices([IrishRailTransportSensor(
+    add_entities([IrishRailTransportSensor(
         data, station, direction, destination, stops_at, name)], True)
 
 
diff --git a/homeassistant/components/sensor/isy994.py b/homeassistant/components/sensor/isy994.py
index 19dcfc87014..eca7e88a17e 100644
--- a/homeassistant/components/sensor/isy994.py
+++ b/homeassistant/components/sensor/isy994.py
@@ -236,7 +236,7 @@ UOM_TO_STATES = {
 
 
 def setup_platform(hass, config: ConfigType,
-                   add_devices: Callable[[list], None], discovery_info=None):
+                   add_entities: Callable[[list], None], discovery_info=None):
     """Set up the ISY994 sensor platform."""
     devices = []
 
@@ -247,7 +247,7 @@ def setup_platform(hass, config: ConfigType,
     for node in hass.data[ISY994_WEATHER]:
         devices.append(ISYWeatherDevice(node))
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class ISYSensorDevice(ISYDevice):
diff --git a/homeassistant/components/sensor/juicenet.py b/homeassistant/components/sensor/juicenet.py
index 033e2d7acad..b8ef38981e8 100644
--- a/homeassistant/components/sensor/juicenet.py
+++ b/homeassistant/components/sensor/juicenet.py
@@ -25,7 +25,7 @@ SENSOR_TYPES = {
 }
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Juicenet sensor."""
     api = hass.data[DOMAIN]['api']
 
@@ -34,7 +34,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         for variable in SENSOR_TYPES:
             dev.append(JuicenetSensorDevice(device, variable, hass))
 
-    add_devices(dev)
+    add_entities(dev)
 
 
 class JuicenetSensorDevice(JuicenetDevice, Entity):
diff --git a/homeassistant/components/sensor/kira.py b/homeassistant/components/sensor/kira.py
index 19566100f99..ced17281cc8 100644
--- a/homeassistant/components/sensor/kira.py
+++ b/homeassistant/components/sensor/kira.py
@@ -18,14 +18,14 @@ ICON = 'mdi:remote'
 CONF_SENSOR = 'sensor'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a Kira sensor."""
     if discovery_info is not None:
         name = discovery_info.get(CONF_NAME)
         device = discovery_info.get(CONF_DEVICE)
         kira = hass.data[DOMAIN][CONF_SENSOR][name]
 
-        add_devices([KiraReceiver(device, kira)])
+        add_entities([KiraReceiver(device, kira)])
 
 
 class KiraReceiver(Entity):
diff --git a/homeassistant/components/sensor/knx.py b/homeassistant/components/sensor/knx.py
index b4d1f6653c0..b8b55a1cc7c 100644
--- a/homeassistant/components/sensor/knx.py
+++ b/homeassistant/components/sensor/knx.py
@@ -27,27 +27,27 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up sensor(s) for KNX platform."""
     if discovery_info is not None:
-        async_add_devices_discovery(hass, discovery_info, async_add_devices)
+        async_add_entities_discovery(hass, discovery_info, async_add_entities)
     else:
-        async_add_devices_config(hass, config, async_add_devices)
+        async_add_entities_config(hass, config, async_add_entities)
 
 
 @callback
-def async_add_devices_discovery(hass, discovery_info, async_add_devices):
+def async_add_entities_discovery(hass, discovery_info, async_add_entities):
     """Set up sensors for KNX platform configured via xknx.yaml."""
     entities = []
     for device_name in discovery_info[ATTR_DISCOVER_DEVICES]:
         device = hass.data[DATA_KNX].xknx.devices[device_name]
         entities.append(KNXSensor(hass, device))
-    async_add_devices(entities)
+    async_add_entities(entities)
 
 
 @callback
-def async_add_devices_config(hass, config, async_add_devices):
+def async_add_entities_config(hass, config, async_add_entities):
     """Set up sensor for KNX platform configured within platform."""
     import xknx
     sensor = xknx.devices.Sensor(
@@ -56,7 +56,7 @@ def async_add_devices_config(hass, config, async_add_devices):
         group_address=config.get(CONF_ADDRESS),
         value_type=config.get(CONF_TYPE))
     hass.data[DATA_KNX].xknx.devices.add(sensor)
-    async_add_devices([KNXSensor(hass, sensor)])
+    async_add_entities([KNXSensor(hass, sensor)])
 
 
 class KNXSensor(Entity):
diff --git a/homeassistant/components/sensor/kwb.py b/homeassistant/components/sensor/kwb.py
index f307b0f6102..20e5bc7f4ac 100644
--- a/homeassistant/components/sensor/kwb.py
+++ b/homeassistant/components/sensor/kwb.py
@@ -48,7 +48,7 @@ PLATFORM_SCHEMA = vol.Schema(
 )
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the KWB component."""
     host = config.get(CONF_HOST)
     port = config.get(CONF_PORT)
@@ -77,7 +77,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP,
                          lambda event: easyfire.stop_thread())
 
-    add_devices(sensors)
+    add_entities(sensors)
 
 
 class KWBSensor(Entity):
diff --git a/homeassistant/components/sensor/lacrosse.py b/homeassistant/components/sensor/lacrosse.py
index 034f0be49f6..a2dbaa8f324 100644
--- a/homeassistant/components/sensor/lacrosse.py
+++ b/homeassistant/components/sensor/lacrosse.py
@@ -56,7 +56,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the LaCrosse sensors."""
     import pylacrosse
     from serial import SerialException
@@ -103,7 +103,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             )
         )
 
-    add_devices(sensors)
+    add_entities(sensors)
 
 
 class LaCrosseSensor(Entity):
diff --git a/homeassistant/components/sensor/lastfm.py b/homeassistant/components/sensor/lastfm.py
index 45eddee9f7e..338adc7d501 100644
--- a/homeassistant/components/sensor/lastfm.py
+++ b/homeassistant/components/sensor/lastfm.py
@@ -29,12 +29,12 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Last.fm platform."""
     import pylast as lastfm
     network = lastfm.LastFMNetwork(api_key=config.get(CONF_API_KEY))
 
-    add_devices(
+    add_entities(
         [LastfmSensor(
             username, network) for username in config.get(CONF_USERS)], True)
 
diff --git a/homeassistant/components/sensor/linux_battery.py b/homeassistant/components/sensor/linux_battery.py
index e7b8bf600a4..69fc145a4a5 100644
--- a/homeassistant/components/sensor/linux_battery.py
+++ b/homeassistant/components/sensor/linux_battery.py
@@ -54,7 +54,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Linux Battery sensor."""
     name = config.get(CONF_NAME)
     battery_id = config.get(CONF_BATTERY)
@@ -69,7 +69,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("No battery found")
         return False
 
-    add_devices([LinuxBatterySensor(name, battery_id, system)], True)
+    add_entities([LinuxBatterySensor(name, battery_id, system)], True)
 
 
 class LinuxBatterySensor(Entity):
diff --git a/homeassistant/components/sensor/london_air.py b/homeassistant/components/sensor/london_air.py
index bbb5993b064..6c96bb48e97 100644
--- a/homeassistant/components/sensor/london_air.py
+++ b/homeassistant/components/sensor/london_air.py
@@ -60,7 +60,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the London Air sensor."""
     data = APIData()
     data.update()
@@ -68,7 +68,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for name in config.get(CONF_LOCATIONS):
         sensors.append(AirSensor(name, data))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class APIData:
diff --git a/homeassistant/components/sensor/london_underground.py b/homeassistant/components/sensor/london_underground.py
index 4619eda0611..a0617469cba 100644
--- a/homeassistant/components/sensor/london_underground.py
+++ b/homeassistant/components/sensor/london_underground.py
@@ -43,7 +43,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Tube sensor."""
     data = TubeData()
     data.update()
@@ -51,7 +51,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for line in config.get(CONF_LINE):
         sensors.append(LondonTubeSensor(line, data))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class LondonTubeSensor(Entity):
diff --git a/homeassistant/components/sensor/loopenergy.py b/homeassistant/components/sensor/loopenergy.py
index d888a6c634d..0f2362ca33c 100644
--- a/homeassistant/components/sensor/loopenergy.py
+++ b/homeassistant/components/sensor/loopenergy.py
@@ -56,7 +56,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Loop Energy sensors."""
     import pyloopenergy
 
@@ -84,7 +84,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     if gas_config.get(CONF_GAS_SERIAL):
         sensors.append(LoopEnergyGas(controller))
 
-    add_devices(sensors)
+    add_entities(sensors)
 
 
 class LoopEnergyDevice(Entity):
diff --git a/homeassistant/components/sensor/luftdaten.py b/homeassistant/components/sensor/luftdaten.py
index c9bc7205ce6..445ccb7214e 100644
--- a/homeassistant/components/sensor/luftdaten.py
+++ b/homeassistant/components/sensor/luftdaten.py
@@ -59,7 +59,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the Luftdaten sensor."""
     from luftdaten import Luftdaten
 
@@ -84,7 +84,7 @@ async def async_setup_platform(
         devices.append(
             LuftdatenSensor(luftdaten, name, variable, sensor_id, show_on_map))
 
-    async_add_devices(devices)
+    async_add_entities(devices)
 
 
 class LuftdatenSensor(Entity):
diff --git a/homeassistant/components/sensor/lyft.py b/homeassistant/components/sensor/lyft.py
index 57e5f1c6b02..671308871e5 100644
--- a/homeassistant/components/sensor/lyft.py
+++ b/homeassistant/components/sensor/lyft.py
@@ -42,7 +42,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Lyft sensor."""
     from lyft_rides.auth import ClientCredentialGrant
     from lyft_rides.errors import APIError
@@ -74,7 +74,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         if product.get('estimate') is not None:
             dev.append(LyftSensor(
                 'price', timeandpriceest, product_id, product))
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class LyftSensor(Entity):
diff --git a/homeassistant/components/sensor/magicseaweed.py b/homeassistant/components/sensor/magicseaweed.py
index 02c61024e30..59f38553d79 100644
--- a/homeassistant/components/sensor/magicseaweed.py
+++ b/homeassistant/components/sensor/magicseaweed.py
@@ -56,7 +56,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=30)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Magicseaweed sensor."""
     name = config.get(CONF_NAME)
     spot_id = config[CONF_SPOT_ID]
@@ -88,7 +88,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             for hour in hours:
                 sensors.append(MagicSeaweedSensor(
                     forecast_data, variable, name, units, hour))
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class MagicSeaweedSensor(Entity):
diff --git a/homeassistant/components/sensor/melissa.py b/homeassistant/components/sensor/melissa.py
index 634ef4ad810..df4800cbbd0 100644
--- a/homeassistant/components/sensor/melissa.py
+++ b/homeassistant/components/sensor/melissa.py
@@ -15,7 +15,7 @@ DEPENDENCIES = ['melissa']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the melissa sensor platform."""
     sensors = []
     api = hass.data[DATA_MELISSA]
@@ -25,7 +25,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         if device['type'] == 'melissa':
             sensors.append(MelissaTemperatureSensor(device, api))
             sensors.append(MelissaHumiditySensor(device, api))
-    add_devices(sensors)
+    add_entities(sensors)
 
 
 class MelissaSensor(Entity):
diff --git a/homeassistant/components/sensor/metoffice.py b/homeassistant/components/sensor/metoffice.py
index ec3d3f47ba7..8cebecb7124 100644
--- a/homeassistant/components/sensor/metoffice.py
+++ b/homeassistant/components/sensor/metoffice.py
@@ -86,7 +86,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Met Office sensor platform."""
     import datapoint as dp
 
@@ -121,7 +121,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for variable in config[CONF_MONITORED_CONDITIONS]:
         sensors.append(MetOfficeCurrentSensor(site, data, variable, name))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class MetOfficeCurrentSensor(Entity):
diff --git a/homeassistant/components/sensor/mfi.py b/homeassistant/components/sensor/mfi.py
index f575768b505..44e5dbda84f 100644
--- a/homeassistant/components/sensor/mfi.py
+++ b/homeassistant/components/sensor/mfi.py
@@ -49,7 +49,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up mFi sensors."""
     host = config.get(CONF_HOST)
     username = config.get(CONF_USERNAME)
@@ -68,10 +68,10 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("Unable to connect to mFi: %s", str(ex))
         return False
 
-    add_devices(MfiSensor(port, hass)
-                for device in client.get_devices()
-                for port in device.ports.values()
-                if port.model in SENSOR_MODELS)
+    add_entities(MfiSensor(port, hass)
+                 for device in client.get_devices()
+                 for port in device.ports.values()
+                 if port.model in SENSOR_MODELS)
 
 
 class MfiSensor(Entity):
diff --git a/homeassistant/components/sensor/mhz19.py b/homeassistant/components/sensor/mhz19.py
index 60f6598ab21..dd8a0395088 100644
--- a/homeassistant/components/sensor/mhz19.py
+++ b/homeassistant/components/sensor/mhz19.py
@@ -42,7 +42,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the available CO2 sensors."""
     from pmsensor import co2sensor
 
@@ -62,7 +62,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         dev.append(
             MHZ19Sensor(data, variable, SENSOR_TYPES[variable][1], name))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
     return True
 
 
diff --git a/homeassistant/components/sensor/miflora.py b/homeassistant/components/sensor/miflora.py
index 6f50a57b3ab..ced17512089 100644
--- a/homeassistant/components/sensor/miflora.py
+++ b/homeassistant/components/sensor/miflora.py
@@ -58,7 +58,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the MiFlora sensor."""
     from miflora import miflora_poller
     try:
@@ -92,7 +92,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         devs.append(MiFloraSensor(
             poller, parameter, name, unit, force_update, median))
 
-    add_devices(devs)
+    add_entities(devs)
 
 
 class MiFloraSensor(Entity):
diff --git a/homeassistant/components/sensor/min_max.py b/homeassistant/components/sensor/min_max.py
index f3a30724732..7956dd97b5e 100644
--- a/homeassistant/components/sensor/min_max.py
+++ b/homeassistant/components/sensor/min_max.py
@@ -55,14 +55,15 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the min/max/mean sensor."""
     entity_ids = config.get(CONF_ENTITY_IDS)
     name = config.get(CONF_NAME)
     sensor_type = config.get(CONF_TYPE)
     round_digits = config.get(CONF_ROUND_DIGITS)
 
-    async_add_devices(
+    async_add_entities(
         [MinMaxSensor(hass, entity_ids, name, sensor_type, round_digits)],
         True)
     return True
diff --git a/homeassistant/components/sensor/mitemp_bt.py b/homeassistant/components/sensor/mitemp_bt.py
index 249a69578db..2ae5c29b043 100644
--- a/homeassistant/components/sensor/mitemp_bt.py
+++ b/homeassistant/components/sensor/mitemp_bt.py
@@ -56,7 +56,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the MiTempBt sensor."""
     from mitemp_bt import mitemp_bt_poller
     try:
@@ -90,7 +90,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         devs.append(MiTempBtSensor(
             poller, parameter, name, unit, force_update, median))
 
-    add_devices(devs)
+    add_entities(devs)
 
 
 class MiTempBtSensor(Entity):
diff --git a/homeassistant/components/sensor/modbus.py b/homeassistant/components/sensor/modbus.py
index 5f404ccd5f7..833cb0c5a62 100644
--- a/homeassistant/components/sensor/modbus.py
+++ b/homeassistant/components/sensor/modbus.py
@@ -59,7 +59,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Modbus sensors."""
     sensors = []
     data_types = {DATA_TYPE_INT: {1: 'h', 2: 'i', 4: 'q'}}
@@ -108,7 +108,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     if not sensors:
         return False
-    add_devices(sensors)
+    add_entities(sensors)
 
 
 class ModbusRegisterSensor(Entity):
diff --git a/homeassistant/components/sensor/modem_callerid.py b/homeassistant/components/sensor/modem_callerid.py
index 58e8becd6bb..2da7953c12a 100644
--- a/homeassistant/components/sensor/modem_callerid.py
+++ b/homeassistant/components/sensor/modem_callerid.py
@@ -30,7 +30,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up modem caller ID sensor platform."""
     from basicmodem.basicmodem import BasicModem as bm
     name = config.get(CONF_NAME)
@@ -41,7 +41,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error('Unable to initialize modem.')
         return
 
-    add_devices([ModemCalleridSensor(hass, name, port, modem)])
+    add_entities([ModemCalleridSensor(hass, name, port, modem)])
 
 
 class ModemCalleridSensor(Entity):
diff --git a/homeassistant/components/sensor/mold_indicator.py b/homeassistant/components/sensor/mold_indicator.py
index 319185923cd..e5794ab1314 100644
--- a/homeassistant/components/sensor/mold_indicator.py
+++ b/homeassistant/components/sensor/mold_indicator.py
@@ -41,7 +41,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up MoldIndicator sensor."""
     name = config.get(CONF_NAME, DEFAULT_NAME)
     indoor_temp_sensor = config.get(CONF_INDOOR_TEMP)
@@ -49,7 +49,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     indoor_humidity_sensor = config.get(CONF_INDOOR_HUMIDITY)
     calib_factor = config.get(CONF_CALIBRATION_FACTOR)
 
-    add_devices([MoldIndicator(
+    add_entities([MoldIndicator(
         hass, name, indoor_temp_sensor, outdoor_temp_sensor,
         indoor_humidity_sensor, calib_factor)], True)
 
diff --git a/homeassistant/components/sensor/moon.py b/homeassistant/components/sensor/moon.py
index 50f4f72078c..a019d21fd78 100644
--- a/homeassistant/components/sensor/moon.py
+++ b/homeassistant/components/sensor/moon.py
@@ -26,11 +26,11 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the Moon sensor."""
     name = config.get(CONF_NAME)
 
-    async_add_devices([MoonSensor(name)], True)
+    async_add_entities([MoonSensor(name)], True)
 
 
 class MoonSensor(Entity):
diff --git a/homeassistant/components/sensor/mopar.py b/homeassistant/components/sensor/mopar.py
index 81c48555cfc..6b2b3776557 100644
--- a/homeassistant/components/sensor/mopar.py
+++ b/homeassistant/components/sensor/mopar.py
@@ -41,7 +41,7 @@ REMOTE_COMMAND_SCHEMA = vol.Schema({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Mopar platform."""
     import motorparts
     cookie = hass.config.path(COOKIE_FILE)
@@ -66,8 +66,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                            schema=REMOTE_COMMAND_SCHEMA)
 
     data = MoparData(session)
-    add_devices([MoparSensor(data, index)
-                 for index, _ in enumerate(data.vehicles)], True)
+    add_entities([MoparSensor(data, index)
+                  for index, _ in enumerate(data.vehicles)], True)
 
 
 class MoparData:
diff --git a/homeassistant/components/sensor/mqtt.py b/homeassistant/components/sensor/mqtt.py
index 0e29c55d39d..6cf2d55755d 100644
--- a/homeassistant/components/sensor/mqtt.py
+++ b/homeassistant/components/sensor/mqtt.py
@@ -51,7 +51,7 @@ PLATFORM_SCHEMA = mqtt.MQTT_RO_PLATFORM_SCHEMA.extend({
 
 
 async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
-                               async_add_devices, discovery_info=None):
+                               async_add_entities, discovery_info=None):
     """Set up MQTT Sensor."""
     if discovery_info is not None:
         config = PLATFORM_SCHEMA(discovery_info)
@@ -60,7 +60,7 @@ async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
     if value_template is not None:
         value_template.hass = hass
 
-    async_add_devices([MqttSensor(
+    async_add_entities([MqttSensor(
         config.get(CONF_NAME),
         config.get(CONF_STATE_TOPIC),
         config.get(CONF_QOS),
diff --git a/homeassistant/components/sensor/mqtt_room.py b/homeassistant/components/sensor/mqtt_room.py
index 2a61c1143ee..e12e8e033ac 100644
--- a/homeassistant/components/sensor/mqtt_room.py
+++ b/homeassistant/components/sensor/mqtt_room.py
@@ -53,9 +53,10 @@ MQTT_PAYLOAD = vol.Schema(vol.All(json.loads, vol.Schema({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up MQTT room Sensor."""
-    async_add_devices([MQTTRoomSensor(
+    async_add_entities([MQTTRoomSensor(
         config.get(CONF_NAME),
         config.get(CONF_STATE_TOPIC),
         config.get(CONF_DEVICE_ID),
diff --git a/homeassistant/components/sensor/mvglive.py b/homeassistant/components/sensor/mvglive.py
index e066bb5e0b9..a7a4b592664 100644
--- a/homeassistant/components/sensor/mvglive.py
+++ b/homeassistant/components/sensor/mvglive.py
@@ -59,7 +59,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the MVGLive sensor."""
     sensors = []
     for nextdeparture in config.get(CONF_NEXT_DEPARTURE):
@@ -73,7 +73,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                 nextdeparture.get(CONF_TIMEOFFSET),
                 nextdeparture.get(CONF_NUMBER),
                 nextdeparture.get(CONF_NAME)))
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class MVGLiveSensor(Entity):
diff --git a/homeassistant/components/sensor/mychevy.py b/homeassistant/components/sensor/mychevy.py
index ef7c7ba8608..fa3343d7791 100644
--- a/homeassistant/components/sensor/mychevy.py
+++ b/homeassistant/components/sensor/mychevy.py
@@ -31,7 +31,7 @@ SENSORS = [
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the MyChevy sensors."""
     if discovery_info is None:
         return
@@ -42,7 +42,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         for car in hub.cars:
             sensors.append(EVSensor(hub, sconfig, car.vid))
 
-    add_devices(sensors)
+    add_entities(sensors)
 
 
 class MyChevyStatus(Entity):
diff --git a/homeassistant/components/sensor/mysensors.py b/homeassistant/components/sensor/mysensors.py
index 2fbfc0e97a4..160d4b4784b 100644
--- a/homeassistant/components/sensor/mysensors.py
+++ b/homeassistant/components/sensor/mysensors.py
@@ -35,11 +35,11 @@ SENSORS = {
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the MySensors platform for sensors."""
     mysensors.setup_mysensors_platform(
         hass, DOMAIN, discovery_info, MySensorsSensor,
-        async_add_devices=async_add_devices)
+        async_add_entities=async_add_entities)
 
 
 class MySensorsSensor(mysensors.device.MySensorsEntity):
diff --git a/homeassistant/components/sensor/nederlandse_spoorwegen.py b/homeassistant/components/sensor/nederlandse_spoorwegen.py
index 431a44c56e3..81cfada25f6 100644
--- a/homeassistant/components/sensor/nederlandse_spoorwegen.py
+++ b/homeassistant/components/sensor/nederlandse_spoorwegen.py
@@ -48,7 +48,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the departure sensor."""
     import ns_api
     nsapi = ns_api.NSAPI(
@@ -72,7 +72,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                 nsapi, departure.get(CONF_NAME), departure.get(CONF_FROM),
                 departure.get(CONF_TO), departure.get(CONF_VIA)))
     if sensors:
-        add_devices(sensors, True)
+        add_entities(sensors, True)
 
 
 def valid_stations(stations, given_stations):
diff --git a/homeassistant/components/sensor/nest.py b/homeassistant/components/sensor/nest.py
index bb1f3e67d4d..d51b0ab4053 100644
--- a/homeassistant/components/sensor/nest.py
+++ b/homeassistant/components/sensor/nest.py
@@ -55,14 +55,14 @@ _SENSOR_TYPES_DEPRECATED = SENSOR_TYPES_DEPRECATED + DEPRECATED_WEATHER_VARS
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Nest Sensor.
 
     No longer used.
     """
 
 
-async def async_setup_entry(hass, entry, async_add_devices):
+async def async_setup_entry(hass, entry, async_add_entities):
     """Set up a Nest sensor based on a config entry."""
     nest = hass.data[DATA_NEST]
 
@@ -119,7 +119,7 @@ async def async_setup_entry(hass, entry, async_add_devices):
 
         return all_sensors
 
-    async_add_devices(await hass.async_add_job(get_sensors), True)
+    async_add_entities(await hass.async_add_job(get_sensors), True)
 
 
 class NestBasicSensor(NestSensorDevice):
diff --git a/homeassistant/components/sensor/netatmo.py b/homeassistant/components/sensor/netatmo.py
index 3e3f7ce9486..5216913528a 100644
--- a/homeassistant/components/sensor/netatmo.py
+++ b/homeassistant/components/sensor/netatmo.py
@@ -64,7 +64,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the available Netatmo weather sensors."""
     netatmo = hass.components.netatmo
     data = NetAtmoData(netatmo.NETATMO_AUTH, config.get(CONF_STATION, None))
@@ -95,7 +95,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     except pyatmo.NoDevice:
         return None
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class NetAtmoSensor(Entity):
diff --git a/homeassistant/components/sensor/netatmo_public.py b/homeassistant/components/sensor/netatmo_public.py
index 4d2364ffb7c..d1c6e03d1b0 100644
--- a/homeassistant/components/sensor/netatmo_public.py
+++ b/homeassistant/components/sensor/netatmo_public.py
@@ -48,7 +48,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the access to Netatmo binary sensor."""
     netatmo = hass.components.netatmo
 
@@ -62,7 +62,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                                  lon_sw=area_conf.get(CONF_LON_SW),
                                  calculation=area_conf.get(CONF_TYPE))
         sensors.append(NetatmoPublicSensor(area_conf.get(CONF_NAME), data))
-    add_devices(sensors)
+    add_entities(sensors)
 
 
 class NetatmoPublicSensor(Entity):
diff --git a/homeassistant/components/sensor/netdata.py b/homeassistant/components/sensor/netdata.py
index 488b1611399..79fb59b4f7b 100644
--- a/homeassistant/components/sensor/netdata.py
+++ b/homeassistant/components/sensor/netdata.py
@@ -47,7 +47,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the Netdata sensor."""
     from netdata import Netdata
 
@@ -82,7 +82,7 @@ async def async_setup_platform(
         dev.append(NetdataSensor(
             netdata, name, sensor, sensor_name, element, icon, unit))
 
-    async_add_devices(dev, True)
+    async_add_entities(dev, True)
 
 
 class NetdataSensor(Entity):
diff --git a/homeassistant/components/sensor/netgear_lte.py b/homeassistant/components/sensor/netgear_lte.py
index dac1f81ad23..2ecf545aa4e 100644
--- a/homeassistant/components/sensor/netgear_lte.py
+++ b/homeassistant/components/sensor/netgear_lte.py
@@ -27,7 +27,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info):
+        hass, config, async_add_entities, discovery_info):
     """Set up Netgear LTE sensor devices."""
     modem_data = hass.data[DATA_KEY].get_modem_data(config)
 
@@ -38,7 +38,7 @@ async def async_setup_platform(
         elif sensor_type == SENSOR_USAGE:
             sensors.append(UsageSensor(modem_data, sensor_type))
 
-    async_add_devices(sensors, True)
+    async_add_entities(sensors, True)
 
 
 @attr.s
diff --git a/homeassistant/components/sensor/neurio_energy.py b/homeassistant/components/sensor/neurio_energy.py
index fd8b8d2aeec..addb7925bc2 100644
--- a/homeassistant/components/sensor/neurio_energy.py
+++ b/homeassistant/components/sensor/neurio_energy.py
@@ -42,7 +42,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Neurio sensor."""
     api_key = config.get(CONF_API_KEY)
     api_secret = config.get(CONF_API_SECRET)
@@ -64,9 +64,9 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     update_active()
 
     # Active power sensor
-    add_devices([NeurioEnergy(data, ACTIVE_NAME, ACTIVE_TYPE, update_active)])
+    add_entities([NeurioEnergy(data, ACTIVE_NAME, ACTIVE_TYPE, update_active)])
     # Daily power sensor
-    add_devices([NeurioEnergy(data, DAILY_NAME, DAILY_TYPE, update_daily)])
+    add_entities([NeurioEnergy(data, DAILY_NAME, DAILY_TYPE, update_daily)])
 
 
 class NeurioData:
diff --git a/homeassistant/components/sensor/noaa_tides.py b/homeassistant/components/sensor/noaa_tides.py
index 8527abf84aa..6a72fdf8f2a 100644
--- a/homeassistant/components/sensor/noaa_tides.py
+++ b/homeassistant/components/sensor/noaa_tides.py
@@ -38,7 +38,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the NOAA Tides and Currents sensor."""
     station_id = config[CONF_STATION_ID]
     name = config.get(CONF_NAME)
@@ -58,7 +58,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     if noaa_sensor.data is None:
         _LOGGER.error("Unable to setup NOAA Tides Sensor")
         return
-    add_devices([noaa_sensor], True)
+    add_entities([noaa_sensor], True)
 
 
 class NOAATidesAndCurrentsSensor(Entity):
diff --git a/homeassistant/components/sensor/nsw_fuel_station.py b/homeassistant/components/sensor/nsw_fuel_station.py
index 5f677d39888..60ad83a82f2 100644
--- a/homeassistant/components/sensor/nsw_fuel_station.py
+++ b/homeassistant/components/sensor/nsw_fuel_station.py
@@ -42,7 +42,7 @@ NOTIFICATION_ID = 'nsw_fuel_station_notification'
 NOTIFICATION_TITLE = 'NSW Fuel Station Sensor Setup'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the NSW Fuel Station sensor."""
     from nsw_fuel import FuelCheckClient
 
@@ -66,7 +66,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     available_fuel_types = station_data.get_available_fuel_types()
 
-    add_devices([
+    add_entities([
         StationPriceSensor(station_data, fuel_type)
         for fuel_type in fuel_types
         if fuel_type in available_fuel_types
diff --git a/homeassistant/components/sensor/nzbget.py b/homeassistant/components/sensor/nzbget.py
index a6fee5a69e8..2ee8e37a57a 100644
--- a/homeassistant/components/sensor/nzbget.py
+++ b/homeassistant/components/sensor/nzbget.py
@@ -50,7 +50,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the NZBGet sensors."""
     host = config.get(CONF_HOST)
     port = config.get(CONF_PORT)
@@ -78,7 +78,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             client_name=name)
         devices.append(new_sensor)
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class NZBGetSensor(Entity):
diff --git a/homeassistant/components/sensor/octoprint.py b/homeassistant/components/sensor/octoprint.py
index 9e62846e4d3..d42828c9f55 100644
--- a/homeassistant/components/sensor/octoprint.py
+++ b/homeassistant/components/sensor/octoprint.py
@@ -38,7 +38,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the available OctoPrint sensors."""
     octoprint_api = hass.data[DOMAIN]["api"]
     name = config.get(CONF_NAME)
@@ -74,7 +74,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                 name, SENSOR_TYPES[octo_type][3], SENSOR_TYPES[octo_type][0],
                 SENSOR_TYPES[octo_type][1])
             devices.append(new_sensor)
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class OctoPrintSensor(Entity):
diff --git a/homeassistant/components/sensor/ohmconnect.py b/homeassistant/components/sensor/ohmconnect.py
index d323a21a521..be73cbcf042 100644
--- a/homeassistant/components/sensor/ohmconnect.py
+++ b/homeassistant/components/sensor/ohmconnect.py
@@ -31,12 +31,12 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the OhmConnect sensor."""
     name = config.get(CONF_NAME)
     ohmid = config.get(CONF_ID)
 
-    add_devices([OhmconnectSensor(name, ohmid)], True)
+    add_entities([OhmconnectSensor(name, ohmid)], True)
 
 
 class OhmconnectSensor(Entity):
diff --git a/homeassistant/components/sensor/onewire.py b/homeassistant/components/sensor/onewire.py
index 95ad5f1713d..d39ab24230c 100644
--- a/homeassistant/components/sensor/onewire.py
+++ b/homeassistant/components/sensor/onewire.py
@@ -47,7 +47,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the one wire Sensors."""
     base_dir = config.get(CONF_MOUNT_DIR)
     devs = []
@@ -85,7 +85,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                       "Check the mount_dir parameter if it's defined")
         return
 
-    add_devices(devs, True)
+    add_entities(devs, True)
 
 
 class OneWire(Entity):
diff --git a/homeassistant/components/sensor/openevse.py b/homeassistant/components/sensor/openevse.py
index 9086f37f8b2..eabf1739c4f 100644
--- a/homeassistant/components/sensor/openevse.py
+++ b/homeassistant/components/sensor/openevse.py
@@ -36,7 +36,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the OpenEVSE sensor."""
     import openevsewifi
 
@@ -49,7 +49,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for variable in monitored_variables:
         dev.append(OpenEVSESensor(variable, charger))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class OpenEVSESensor(Entity):
diff --git a/homeassistant/components/sensor/openexchangerates.py b/homeassistant/components/sensor/openexchangerates.py
index 5e8231bb124..01c84c63034 100644
--- a/homeassistant/components/sensor/openexchangerates.py
+++ b/homeassistant/components/sensor/openexchangerates.py
@@ -35,7 +35,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Open Exchange Rates sensor."""
     name = config.get(CONF_NAME)
     api_key = config.get(CONF_API_KEY)
@@ -55,7 +55,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         return False
 
     rest.update()
-    add_devices([OpenexchangeratesSensor(rest, name, quote)], True)
+    add_entities([OpenexchangeratesSensor(rest, name, quote)], True)
 
 
 class OpenexchangeratesSensor(Entity):
diff --git a/homeassistant/components/sensor/openhardwaremonitor.py b/homeassistant/components/sensor/openhardwaremonitor.py
index 1b345c752ff..d429cad9d97 100644
--- a/homeassistant/components/sensor/openhardwaremonitor.py
+++ b/homeassistant/components/sensor/openhardwaremonitor.py
@@ -41,10 +41,10 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Open Hardware Monitor platform."""
     data = OpenHardwareMonitorData(config, hass)
-    add_devices(data.devices, True)
+    add_entities(data.devices, True)
 
 
 class OpenHardwareMonitorDevice(Entity):
diff --git a/homeassistant/components/sensor/opensky.py b/homeassistant/components/sensor/opensky.py
index 9178b46c488..5ee11af4e60 100644
--- a/homeassistant/components/sensor/opensky.py
+++ b/homeassistant/components/sensor/opensky.py
@@ -56,11 +56,11 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Open Sky platform."""
     latitude = config.get(CONF_LATITUDE, hass.config.latitude)
     longitude = config.get(CONF_LONGITUDE, hass.config.longitude)
-    add_devices([OpenSkySensor(
+    add_entities([OpenSkySensor(
         hass, config.get(CONF_NAME, DOMAIN), latitude, longitude,
         config.get(CONF_RADIUS), config.get(CONF_ALTITUDE))], True)
 
diff --git a/homeassistant/components/sensor/openuv.py b/homeassistant/components/sensor/openuv.py
index 42ff999bdd5..aaa04590b3f 100644
--- a/homeassistant/components/sensor/openuv.py
+++ b/homeassistant/components/sensor/openuv.py
@@ -39,7 +39,7 @@ UV_LEVEL_LOW = "Low"
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the OpenUV binary sensor platform."""
     if discovery_info is None:
         return
@@ -51,7 +51,7 @@ async def async_setup_platform(
         name, icon, unit = SENSORS[sensor_type]
         sensors.append(OpenUvSensor(openuv, sensor_type, name, icon, unit))
 
-    async_add_devices(sensors, True)
+    async_add_entities(sensors, True)
 
 
 class OpenUvSensor(OpenUvEntity):
diff --git a/homeassistant/components/sensor/openweathermap.py b/homeassistant/components/sensor/openweathermap.py
index ba7fc4f9095..2dbbb581741 100644
--- a/homeassistant/components/sensor/openweathermap.py
+++ b/homeassistant/components/sensor/openweathermap.py
@@ -51,7 +51,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the OpenWeatherMap sensor."""
     from pyowm import OWM
 
@@ -85,7 +85,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         dev.append(OpenWeatherMapSensor(
             name, data, 'forecast', SENSOR_TYPES['temperature'][1]))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class OpenWeatherMapSensor(Entity):
diff --git a/homeassistant/components/sensor/otp.py b/homeassistant/components/sensor/otp.py
index 6ceed11a6b9..2e3a13928e1 100644
--- a/homeassistant/components/sensor/otp.py
+++ b/homeassistant/components/sensor/otp.py
@@ -33,12 +33,13 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the OTP sensor."""
     name = config.get(CONF_NAME)
     token = config.get(CONF_TOKEN)
 
-    async_add_devices([TOTPSensor(name, token)], True)
+    async_add_entities([TOTPSensor(name, token)], True)
     return True
 
 
diff --git a/homeassistant/components/sensor/pi_hole.py b/homeassistant/components/sensor/pi_hole.py
index 363ada725ba..a318618724e 100644
--- a/homeassistant/components/sensor/pi_hole.py
+++ b/homeassistant/components/sensor/pi_hole.py
@@ -71,7 +71,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the Pi-hole sensor."""
     from hole import Hole
 
@@ -94,7 +94,7 @@ async def async_setup_platform(
     sensors = [PiHoleSensor(pi_hole, name, condition)
                for condition in config[CONF_MONITORED_CONDITIONS]]
 
-    async_add_devices(sensors, True)
+    async_add_entities(sensors, True)
 
 
 class PiHoleSensor(Entity):
diff --git a/homeassistant/components/sensor/pilight.py b/homeassistant/components/sensor/pilight.py
index c30f1575049..85843018c01 100644
--- a/homeassistant/components/sensor/pilight.py
+++ b/homeassistant/components/sensor/pilight.py
@@ -30,9 +30,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Pilight Sensor."""
-    add_devices([PilightSensor(
+    add_entities([PilightSensor(
         hass=hass,
         name=config.get(CONF_NAME),
         variable=config.get(CONF_VARIABLE),
diff --git a/homeassistant/components/sensor/plex.py b/homeassistant/components/sensor/plex.py
index 5aa156a0ac6..46766d75010 100644
--- a/homeassistant/components/sensor/plex.py
+++ b/homeassistant/components/sensor/plex.py
@@ -41,7 +41,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Plex sensor."""
     name = config.get(CONF_NAME)
     plex_user = config.get(CONF_USERNAME)
@@ -57,7 +57,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     import plexapi.exceptions
 
     try:
-        add_devices([PlexSensor(
+        add_entities([PlexSensor(
             name, plex_url, plex_user, plex_password, plex_server,
             plex_token)], True)
     except (plexapi.exceptions.BadRequest, plexapi.exceptions.Unauthorized,
diff --git a/homeassistant/components/sensor/pocketcasts.py b/homeassistant/components/sensor/pocketcasts.py
index 85fbf7b5a16..9d5b837bba9 100644
--- a/homeassistant/components/sensor/pocketcasts.py
+++ b/homeassistant/components/sensor/pocketcasts.py
@@ -31,7 +31,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the pocketcasts platform for sensors."""
     import pocketcasts
 
@@ -41,7 +41,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     try:
         api = pocketcasts.Api(username, password)
         _LOGGER.debug("Found %d podcasts", len(api.my_podcasts()))
-        add_devices([PocketCastsSensor(api)], True)
+        add_entities([PocketCastsSensor(api)], True)
     except OSError as err:
         _LOGGER.error("Connection to server failed: %s", err)
         return False
diff --git a/homeassistant/components/sensor/pollen.py b/homeassistant/components/sensor/pollen.py
index 27750c9ac61..6df7047b353 100644
--- a/homeassistant/components/sensor/pollen.py
+++ b/homeassistant/components/sensor/pollen.py
@@ -94,7 +94,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Configure the platform and add the sensors."""
     from pypollencom import Client
 
@@ -113,7 +113,7 @@ async def async_setup_platform(
             PollencomSensor(
                 data, config[CONF_ZIP_CODE], kind, category, name, icon, unit))
 
-    async_add_devices(sensors, True)
+    async_add_entities(sensors, True)
 
 
 def calculate_average_rating(indices):
diff --git a/homeassistant/components/sensor/postnl.py b/homeassistant/components/sensor/postnl.py
index 9b35c1fdc7e..5c70ca035cf 100644
--- a/homeassistant/components/sensor/postnl.py
+++ b/homeassistant/components/sensor/postnl.py
@@ -35,7 +35,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the PostNL sensor platform."""
     from postnl_api import PostNL_API, UnauthorizedException
 
@@ -50,7 +50,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.exception("Can't connect to the PostNL webservice")
         return
 
-    add_devices([PostNLSensor(api, name)], True)
+    add_entities([PostNLSensor(api, name)], True)
 
 
 class PostNLSensor(Entity):
diff --git a/homeassistant/components/sensor/pushbullet.py b/homeassistant/components/sensor/pushbullet.py
index 415174ac273..9b26bdfbbe9 100644
--- a/homeassistant/components/sensor/pushbullet.py
+++ b/homeassistant/components/sensor/pushbullet.py
@@ -37,7 +37,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Pushbullet Sensor platform."""
     from pushbullet import PushBullet
     from pushbullet import InvalidKeyError
@@ -52,7 +52,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     devices = []
     for sensor_type in config[CONF_MONITORED_CONDITIONS]:
         devices.append(PushBulletNotificationSensor(pbprovider, sensor_type))
-    add_devices(devices)
+    add_entities(devices)
 
 
 class PushBulletNotificationSensor(Entity):
diff --git a/homeassistant/components/sensor/pvoutput.py b/homeassistant/components/sensor/pvoutput.py
index d4307d50228..a12093099c4 100644
--- a/homeassistant/components/sensor/pvoutput.py
+++ b/homeassistant/components/sensor/pvoutput.py
@@ -41,7 +41,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the PVOutput sensor."""
     name = config.get(CONF_NAME)
     api_key = config.get(CONF_API_KEY)
@@ -61,7 +61,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("Unable to fetch data from PVOutput")
         return False
 
-    add_devices([PvoutputSensor(rest, name)], True)
+    add_entities([PvoutputSensor(rest, name)], True)
 
 
 class PvoutputSensor(Entity):
diff --git a/homeassistant/components/sensor/pyload.py b/homeassistant/components/sensor/pyload.py
index 4aa121e0895..78a191c16f4 100644
--- a/homeassistant/components/sensor/pyload.py
+++ b/homeassistant/components/sensor/pyload.py
@@ -43,7 +43,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the pyLoad sensors."""
     host = config.get(CONF_HOST)
     port = config.get(CONF_PORT)
@@ -70,7 +70,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             client_name=name)
         devices.append(new_sensor)
 
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class PyLoadSensor(Entity):
diff --git a/homeassistant/components/sensor/qnap.py b/homeassistant/components/sensor/qnap.py
index 8b25eb3de31..22f8d4c37c0 100644
--- a/homeassistant/components/sensor/qnap.py
+++ b/homeassistant/components/sensor/qnap.py
@@ -102,7 +102,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the QNAP NAS sensor."""
     api = QNAPStatsAPI(config)
     api.update()
@@ -151,7 +151,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                     for variable in config[CONF_MONITORED_CONDITIONS]
                     if variable in _VOLUME_MON_COND]
 
-    add_devices(sensors)
+    add_entities(sensors)
 
 
 def round_nicely(number):
diff --git a/homeassistant/components/sensor/qwikswitch.py b/homeassistant/components/sensor/qwikswitch.py
index 1497b4ad5cc..c8d33de4baf 100644
--- a/homeassistant/components/sensor/qwikswitch.py
+++ b/homeassistant/components/sensor/qwikswitch.py
@@ -14,7 +14,7 @@ DEPENDENCIES = [QWIKSWITCH]
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup_platform(hass, _, add_devices, discovery_info=None):
+async def async_setup_platform(hass, _, add_entities, discovery_info=None):
     """Add sensor from the main Qwikswitch component."""
     if discovery_info is None:
         return
@@ -22,7 +22,7 @@ async def async_setup_platform(hass, _, add_devices, discovery_info=None):
     qsusb = hass.data[QWIKSWITCH]
     _LOGGER.debug("Setup qwikswitch.sensor %s, %s", qsusb, discovery_info)
     devs = [QSSensor(sensor) for sensor in discovery_info[QWIKSWITCH]]
-    add_devices(devs)
+    add_entities(devs)
 
 
 class QSSensor(QSEntity):
diff --git a/homeassistant/components/sensor/radarr.py b/homeassistant/components/sensor/radarr.py
index 8adaeb3c71b..67695ae0e32 100644
--- a/homeassistant/components/sensor/radarr.py
+++ b/homeassistant/components/sensor/radarr.py
@@ -66,10 +66,10 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Radarr platform."""
     conditions = config.get(CONF_MONITORED_CONDITIONS)
-    add_devices(
+    add_entities(
         [RadarrSensor(hass, config, sensor) for sensor in conditions], True)
 
 
diff --git a/homeassistant/components/sensor/rainbird.py b/homeassistant/components/sensor/rainbird.py
index 875e9c37bd3..1af2b771014 100644
--- a/homeassistant/components/sensor/rainbird.py
+++ b/homeassistant/components/sensor/rainbird.py
@@ -29,7 +29,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a Rain Bird sensor."""
     controller = hass.data[DATA_RAINBIRD]
 
@@ -38,7 +38,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         sensors.append(
             RainBirdSensor(controller, sensor_type))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class RainBirdSensor(Entity):
diff --git a/homeassistant/components/sensor/raincloud.py b/homeassistant/components/sensor/raincloud.py
index c03aa0a2aec..15a346880f3 100644
--- a/homeassistant/components/sensor/raincloud.py
+++ b/homeassistant/components/sensor/raincloud.py
@@ -25,7 +25,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a sensor for a raincloud device."""
     raincloud = hass.data[DATA_RAINCLOUD].data
 
@@ -40,7 +40,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             for zone in raincloud.controller.faucet.zones:
                 sensors.append(RainCloudSensor(zone, sensor_type))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
     return True
 
 
diff --git a/homeassistant/components/sensor/rainmachine.py b/homeassistant/components/sensor/rainmachine.py
index f747a26df39..20e95f0e98f 100644
--- a/homeassistant/components/sensor/rainmachine.py
+++ b/homeassistant/components/sensor/rainmachine.py
@@ -18,7 +18,7 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the RainMachine Switch platform."""
     if discovery_info is None:
         return
@@ -31,7 +31,7 @@ async def async_setup_platform(
         sensors.append(
             RainMachineSensor(rainmachine, sensor_type, name, icon, unit))
 
-    async_add_devices(sensors, True)
+    async_add_entities(sensors, True)
 
 
 class RainMachineSensor(RainMachineEntity):
diff --git a/homeassistant/components/sensor/random.py b/homeassistant/components/sensor/random.py
index c3ff08a5781..4dec96bec2e 100644
--- a/homeassistant/components/sensor/random.py
+++ b/homeassistant/components/sensor/random.py
@@ -34,14 +34,14 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the Random number sensor."""
     name = config.get(CONF_NAME)
     minimum = config.get(CONF_MINIMUM)
     maximum = config.get(CONF_MAXIMUM)
     unit = config.get(CONF_UNIT_OF_MEASUREMENT)
 
-    async_add_devices([RandomSensor(name, minimum, maximum, unit)], True)
+    async_add_entities([RandomSensor(name, minimum, maximum, unit)], True)
 
 
 class RandomSensor(Entity):
diff --git a/homeassistant/components/sensor/rest.py b/homeassistant/components/sensor/rest.py
index 8db48719a37..53aab3f1ff7 100644
--- a/homeassistant/components/sensor/rest.py
+++ b/homeassistant/components/sensor/rest.py
@@ -49,7 +49,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the RESTful sensor."""
     name = config.get(CONF_NAME)
     resource = config.get(CONF_RESOURCE)
@@ -77,7 +77,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     rest = RestData(method, resource, auth, headers, payload, verify_ssl)
     rest.update()
 
-    add_devices([RestSensor(
+    add_entities([RestSensor(
         hass, rest, name, unit, value_template, json_attrs, force_update
     )], True)
 
diff --git a/homeassistant/components/sensor/rflink.py b/homeassistant/components/sensor/rflink.py
index 80d77033bbb..3952c815dca 100644
--- a/homeassistant/components/sensor/rflink.py
+++ b/homeassistant/components/sensor/rflink.py
@@ -75,9 +75,10 @@ def devices_from_config(domain_config, hass=None):
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Rflink platform."""
-    async_add_devices(devices_from_config(config, hass))
+    async_add_entities(devices_from_config(config, hass))
 
     @asyncio.coroutine
     def add_new_device(event):
@@ -87,7 +88,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         rflinksensor = partial(RflinkSensor, device_id, hass)
         device = rflinksensor(event[EVENT_KEY_SENSOR], event[EVENT_KEY_UNIT])
         # Add device entity
-        async_add_devices([device])
+        async_add_entities([device])
 
         # Register entity to listen to incoming rflink events
         hass.data[DATA_ENTITY_LOOKUP][
diff --git a/homeassistant/components/sensor/rfxtrx.py b/homeassistant/components/sensor/rfxtrx.py
index b410e7e860a..c2eff8d7c5d 100644
--- a/homeassistant/components/sensor/rfxtrx.py
+++ b/homeassistant/components/sensor/rfxtrx.py
@@ -35,7 +35,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 }, extra=vol.ALLOW_EXTRA)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the RFXtrx platform."""
     from RFXtrx import SensorEvent
     sensors = []
@@ -60,7 +60,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             sensors.append(new_sensor)
             sub_sensors[_data_type] = new_sensor
         rfxtrx.RFX_DEVICES[device_id] = sub_sensors
-    add_devices(sensors)
+    add_entities(sensors)
 
     def sensor_update(event):
         """Handle sensor updates from the RFXtrx gateway."""
@@ -104,7 +104,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         sub_sensors = {}
         sub_sensors[new_sensor.data_type] = new_sensor
         rfxtrx.RFX_DEVICES[device_id] = sub_sensors
-        add_devices([new_sensor])
+        add_entities([new_sensor])
 
     if sensor_update not in rfxtrx.RECEIVED_EVT_SUBSCRIBERS:
         rfxtrx.RECEIVED_EVT_SUBSCRIBERS.append(sensor_update)
diff --git a/homeassistant/components/sensor/ring.py b/homeassistant/components/sensor/ring.py
index cae7690103d..31c0360cc23 100644
--- a/homeassistant/components/sensor/ring.py
+++ b/homeassistant/components/sensor/ring.py
@@ -61,7 +61,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a sensor for a Ring device."""
     ring = hass.data[DATA_RING]
 
@@ -79,7 +79,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             if 'stickup_cams' in SENSOR_TYPES[sensor_type][1]:
                 sensors.append(RingSensor(hass, device, sensor_type))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
     return True
 
 
diff --git a/homeassistant/components/sensor/ripple.py b/homeassistant/components/sensor/ripple.py
index d516706fdc0..beb7bf22269 100644
--- a/homeassistant/components/sensor/ripple.py
+++ b/homeassistant/components/sensor/ripple.py
@@ -28,12 +28,12 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Ripple.com sensors."""
     address = config.get(CONF_ADDRESS)
     name = config.get(CONF_NAME)
 
-    add_devices([RippleSensor(name, address)], True)
+    add_entities([RippleSensor(name, address)], True)
 
 
 class RippleSensor(Entity):
diff --git a/homeassistant/components/sensor/sabnzbd.py b/homeassistant/components/sensor/sabnzbd.py
index 185f83c9405..7e94f9026a8 100644
--- a/homeassistant/components/sensor/sabnzbd.py
+++ b/homeassistant/components/sensor/sabnzbd.py
@@ -16,7 +16,7 @@ DEPENDENCIES = ['sabnzbd']
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the SABnzbd sensors."""
     if discovery_info is None:
@@ -25,8 +25,8 @@ async def async_setup_platform(hass, config, async_add_devices,
     sab_api_data = hass.data[DATA_SABNZBD]
     sensors = sab_api_data.sensors
     client_name = sab_api_data.name
-    async_add_devices([SabnzbdSensor(sensor, sab_api_data, client_name)
-                       for sensor in sensors])
+    async_add_entities([SabnzbdSensor(sensor, sab_api_data, client_name)
+                        for sensor in sensors])
 
 
 class SabnzbdSensor(Entity):
diff --git a/homeassistant/components/sensor/scrape.py b/homeassistant/components/sensor/scrape.py
index 0b57528c519..e702c52e06a 100644
--- a/homeassistant/components/sensor/scrape.py
+++ b/homeassistant/components/sensor/scrape.py
@@ -44,7 +44,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Web scrape sensor."""
     name = config.get(CONF_NAME)
     resource = config.get(CONF_RESOURCE)
@@ -74,7 +74,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("Unable to fetch data from %s", resource)
         return False
 
-    add_devices([
+    add_entities([
         ScrapeSensor(rest, name, select, attr, value_template, unit)], True)
 
 
diff --git a/homeassistant/components/sensor/season.py b/homeassistant/components/sensor/season.py
index f06f6a896e7..3b14c3854cd 100644
--- a/homeassistant/components/sensor/season.py
+++ b/homeassistant/components/sensor/season.py
@@ -40,7 +40,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Display the current season."""
     if None in (hass.config.latitude, hass.config.longitude):
         _LOGGER.error("Latitude or longitude not set in Home Assistant config")
@@ -57,7 +57,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         hemisphere = EQUATOR
 
     _LOGGER.debug(_type)
-    add_devices([Season(hass, hemisphere, _type)])
+    add_entities([Season(hass, hemisphere, _type)])
 
     return True
 
diff --git a/homeassistant/components/sensor/sense.py b/homeassistant/components/sensor/sense.py
index 89e0d15bf48..3da022dc3b5 100644
--- a/homeassistant/components/sensor/sense.py
+++ b/homeassistant/components/sensor/sense.py
@@ -64,7 +64,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Sense sensor."""
     from sense_energy import Senseable
 
@@ -96,7 +96,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         devices.append(Sense(data, name, sensor_type,
                              is_production, update_call))
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class Sense(Entity):
diff --git a/homeassistant/components/sensor/sensehat.py b/homeassistant/components/sensor/sensehat.py
index f0e566f718f..15c73d990e1 100644
--- a/homeassistant/components/sensor/sensehat.py
+++ b/homeassistant/components/sensor/sensehat.py
@@ -58,14 +58,14 @@ def get_average(temp_base):
     return temp_avg
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Sense HAT sensor platform."""
     data = SenseHatData(config.get(CONF_IS_HAT_ATTACHED))
     dev = []
     for variable in config[CONF_DISPLAY_OPTIONS]:
         dev.append(SenseHatSensor(data, variable))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class SenseHatSensor(Entity):
diff --git a/homeassistant/components/sensor/serial.py b/homeassistant/components/sensor/serial.py
index 521dbce7df2..39b69e0a8c4 100644
--- a/homeassistant/components/sensor/serial.py
+++ b/homeassistant/components/sensor/serial.py
@@ -36,7 +36,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Serial sensor platform."""
     name = config.get(CONF_NAME)
     port = config.get(CONF_SERIAL_PORT)
@@ -50,7 +51,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
 
     hass.bus.async_listen_once(
         EVENT_HOMEASSISTANT_STOP, sensor.stop_serial_read())
-    async_add_devices([sensor], True)
+    async_add_entities([sensor], True)
 
 
 class SerialSensor(Entity):
diff --git a/homeassistant/components/sensor/serial_pm.py b/homeassistant/components/sensor/serial_pm.py
index d2157066625..46dfc9fae75 100644
--- a/homeassistant/components/sensor/serial_pm.py
+++ b/homeassistant/components/sensor/serial_pm.py
@@ -27,7 +27,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the available PM sensors."""
     from pmsensor import serial_pm as pm
 
@@ -54,7 +54,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             name = 'PM{}'.format(pmname)
         dev.append(ParticulateMatterSensor(coll, name, pmname))
 
-    add_devices(dev)
+    add_entities(dev)
 
 
 class ParticulateMatterSensor(Entity):
diff --git a/homeassistant/components/sensor/shodan.py b/homeassistant/components/sensor/shodan.py
index b94d0cc011c..fd462d6811c 100644
--- a/homeassistant/components/sensor/shodan.py
+++ b/homeassistant/components/sensor/shodan.py
@@ -35,7 +35,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Shodan sensor."""
     import shodan
 
@@ -50,7 +50,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.warning("Unable to connect to Shodan.io: %s", error)
         return False
 
-    add_devices([ShodanSensor(data, name)], True)
+    add_entities([ShodanSensor(data, name)], True)
 
 
 class ShodanSensor(Entity):
diff --git a/homeassistant/components/sensor/sht31.py b/homeassistant/components/sensor/sht31.py
index 04b78c283c7..4b849849771 100644
--- a/homeassistant/components/sensor/sht31.py
+++ b/homeassistant/components/sensor/sht31.py
@@ -46,7 +46,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the sensor platform."""
     from Adafruit_SHT31 import SHT31
 
@@ -72,7 +72,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         name = "{} {}".format(config.get(CONF_NAME), sensor_type.capitalize())
         devs.append(sensor_class(sensor_client, name))
 
-    add_devices(devs)
+    add_entities(devs)
 
 
 class SHTClient:
diff --git a/homeassistant/components/sensor/sigfox.py b/homeassistant/components/sensor/sigfox.py
index 191b3f54f35..5e2a56cadc3 100644
--- a/homeassistant/components/sensor/sigfox.py
+++ b/homeassistant/components/sensor/sigfox.py
@@ -32,7 +32,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the sigfox sensor."""
     api_login = config[CONF_API_LOGIN]
     api_password = config[CONF_API_PASSWORD]
@@ -47,7 +47,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     sensors = []
     for device in devices:
         sensors.append(SigfoxDevice(device, auth, name))
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 def epoch_to_datetime(epoch_time):
diff --git a/homeassistant/components/sensor/simulated.py b/homeassistant/components/sensor/simulated.py
index 419ca7c13fb..8f2c3dd36e0 100644
--- a/homeassistant/components/sensor/simulated.py
+++ b/homeassistant/components/sensor/simulated.py
@@ -54,7 +54,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the simulated sensor."""
     name = config.get(CONF_NAME)
     unit = config.get(CONF_UNIT)
@@ -68,7 +68,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     sensor = SimulatedSensor(name, unit, amp, mean, period, phase, fwhm, seed,
                              relative_to_epoch)
-    add_devices([sensor], True)
+    add_entities([sensor], True)
 
 
 class SimulatedSensor(Entity):
diff --git a/homeassistant/components/sensor/skybeacon.py b/homeassistant/components/sensor/skybeacon.py
index 2731587ed71..441053a7e7e 100644
--- a/homeassistant/components/sensor/skybeacon.py
+++ b/homeassistant/components/sensor/skybeacon.py
@@ -39,15 +39,15 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Skybeacon sensor."""
     name = config.get(CONF_NAME)
     mac = config.get(CONF_MAC)
     _LOGGER.debug("Setting up...")
 
     mon = Monitor(hass, mac, name)
-    add_devices([SkybeaconTemp(name, mon)])
-    add_devices([SkybeaconHumid(name, mon)])
+    add_entities([SkybeaconTemp(name, mon)])
+    add_entities([SkybeaconHumid(name, mon)])
 
     def monitor_stop(_service_or_event):
         """Stop the monitor thread."""
diff --git a/homeassistant/components/sensor/skybell.py b/homeassistant/components/sensor/skybell.py
index dc7295f463a..de8c3a5694d 100644
--- a/homeassistant/components/sensor/skybell.py
+++ b/homeassistant/components/sensor/skybell.py
@@ -35,7 +35,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the platform for a Skybell device."""
     skybell = hass.data.get(SKYBELL_DOMAIN)
 
@@ -44,7 +44,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         for device in skybell.get_devices():
             sensors.append(SkybellSensor(device, sensor_type))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class SkybellSensor(SkybellDevice):
diff --git a/homeassistant/components/sensor/sleepiq.py b/homeassistant/components/sensor/sleepiq.py
index cf35a400e47..2c97d7eb1e1 100644
--- a/homeassistant/components/sensor/sleepiq.py
+++ b/homeassistant/components/sensor/sleepiq.py
@@ -10,7 +10,7 @@ DEPENDENCIES = ['sleepiq']
 ICON = 'mdi:hotel'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the SleepIQ sensors."""
     if discovery_info is None:
         return
@@ -22,7 +22,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for bed_id, _ in data.beds.items():
         for side in sleepiq.SIDES:
             dev.append(SleepNumberSensor(data, bed_id, side))
-    add_devices(dev)
+    add_entities(dev)
 
 
 class SleepNumberSensor(sleepiq.SleepIQSensor):
diff --git a/homeassistant/components/sensor/sma.py b/homeassistant/components/sensor/sma.py
index 2be46da0bdb..945c3873bb6 100644
--- a/homeassistant/components/sensor/sma.py
+++ b/homeassistant/components/sensor/sma.py
@@ -64,7 +64,8 @@ PLATFORM_SCHEMA = vol.All(PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up SMA WebConnect sensor."""
     import pysma
 
@@ -93,7 +94,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     sensor_defs = {name: val for name, val in sensor_defs.items()
                    if name in used_sensors}
 
-    async_add_devices(hass_sensors)
+    async_add_entities(hass_sensors)
 
     # Init the SMA interface
     session = async_get_clientsession(hass)
diff --git a/homeassistant/components/sensor/smappee.py b/homeassistant/components/sensor/smappee.py
index 783c2aad469..65f21815960 100644
--- a/homeassistant/components/sensor/smappee.py
+++ b/homeassistant/components/sensor/smappee.py
@@ -49,7 +49,7 @@ SENSOR_TYPES = {
 SCAN_INTERVAL = timedelta(seconds=30)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Smappee sensor."""
     smappee = hass.data[DATA_SMAPPEE]
 
@@ -80,7 +80,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                         dev.append(SmappeeSensor(smappee, None, sensor,
                                                  SENSOR_TYPES[sensor]))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class SmappeeSensor(Entity):
diff --git a/homeassistant/components/sensor/snmp.py b/homeassistant/components/sensor/snmp.py
index e6119ab80b6..f7d160ecf2f 100644
--- a/homeassistant/components/sensor/snmp.py
+++ b/homeassistant/components/sensor/snmp.py
@@ -53,7 +53,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the SNMP sensor."""
     from pysnmp.hlapi import (
         getCmd, CommunityData, SnmpEngine, UdpTransportTarget, ContextData,
@@ -86,7 +86,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     data = SnmpData(
         host, port, community, baseoid, version, accept_errors,
         default_value)
-    add_devices([SnmpSensor(data, name, unit, value_template)], True)
+    add_entities([SnmpSensor(data, name, unit, value_template)], True)
 
 
 class SnmpSensor(Entity):
diff --git a/homeassistant/components/sensor/sochain.py b/homeassistant/components/sensor/sochain.py
index 572d0f52921..9f8982f871f 100644
--- a/homeassistant/components/sensor/sochain.py
+++ b/homeassistant/components/sensor/sochain.py
@@ -36,7 +36,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the sochain sensors."""
     from pysochain import ChainSo
     address = config.get(CONF_ADDRESS)
@@ -46,7 +47,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     session = async_get_clientsession(hass)
     chainso = ChainSo(network, address, hass.loop, session)
 
-    async_add_devices([SochainSensor(name, network.upper(), chainso)], True)
+    async_add_entities([SochainSensor(name, network.upper(), chainso)], True)
 
 
 class SochainSensor(Entity):
diff --git a/homeassistant/components/sensor/socialblade.py b/homeassistant/components/sensor/socialblade.py
index 1e0084e1404..9a73e9cdd68 100644
--- a/homeassistant/components/sensor/socialblade.py
+++ b/homeassistant/components/sensor/socialblade.py
@@ -35,7 +35,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Social Blade sensor."""
     social_blade = SocialBladeSensor(
         config[CHANNEL_ID], config[CONF_NAME])
@@ -44,7 +44,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     if social_blade.valid_channel_id is False:
         return
 
-    add_devices([social_blade])
+    add_entities([social_blade])
 
 
 class SocialBladeSensor(Entity):
diff --git a/homeassistant/components/sensor/sonarr.py b/homeassistant/components/sensor/sonarr.py
index c2fd6c80663..b0e87992e39 100644
--- a/homeassistant/components/sensor/sonarr.py
+++ b/homeassistant/components/sensor/sonarr.py
@@ -67,10 +67,10 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Sonarr platform."""
     conditions = config.get(CONF_MONITORED_CONDITIONS)
-    add_devices(
+    add_entities(
         [SonarrSensor(hass, config, sensor) for sensor in conditions], True)
 
 
diff --git a/homeassistant/components/sensor/speedtest.py b/homeassistant/components/sensor/speedtest.py
index 8c1ffc03786..8da7374f231 100644
--- a/homeassistant/components/sensor/speedtest.py
+++ b/homeassistant/components/sensor/speedtest.py
@@ -61,7 +61,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Speedtest sensor."""
     data = SpeedtestData(hass, config)
 
@@ -69,7 +69,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for sensor in config[CONF_MONITORED_CONDITIONS]:
         dev.append(SpeedtestSensor(data, sensor))
 
-    add_devices(dev)
+    add_entities(dev)
 
     def update(call=None):
         """Update service for manual updates."""
diff --git a/homeassistant/components/sensor/spotcrime.py b/homeassistant/components/sensor/spotcrime.py
index daa520f2ede..46f5fdc1c85 100644
--- a/homeassistant/components/sensor/spotcrime.py
+++ b/homeassistant/components/sensor/spotcrime.py
@@ -44,7 +44,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Crime Reports platform."""
     latitude = config.get(CONF_LATITUDE, hass.config.latitude)
     longitude = config.get(CONF_LONGITUDE, hass.config.longitude)
@@ -55,7 +55,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     include = config.get(CONF_INCLUDE)
     exclude = config.get(CONF_EXCLUDE)
 
-    add_devices([SpotCrimeSensor(
+    add_entities([SpotCrimeSensor(
         name, latitude, longitude, radius, include,
         exclude, api_key, days)], True)
 
diff --git a/homeassistant/components/sensor/sql.py b/homeassistant/components/sensor/sql.py
index 83f5478867f..a2e9549a117 100644
--- a/homeassistant/components/sensor/sql.py
+++ b/homeassistant/components/sensor/sql.py
@@ -48,7 +48,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the SQL sensor platform."""
     db_url = config.get(CONF_DB_URL, None)
     if not db_url:
@@ -87,7 +87,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             )
         queries.append(sensor)
 
-    add_devices(queries, True)
+    add_entities(queries, True)
 
 
 class SQLSensor(Entity):
diff --git a/homeassistant/components/sensor/startca.py b/homeassistant/components/sensor/startca.py
index 374e14c5ac2..d9a52e4aa23 100644
--- a/homeassistant/components/sensor/startca.py
+++ b/homeassistant/components/sensor/startca.py
@@ -58,7 +58,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the sensor platform."""
     websession = async_get_clientsession(hass)
     apikey = config.get(CONF_API_KEY)
@@ -74,7 +75,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     sensors = []
     for variable in config[CONF_MONITORED_VARIABLES]:
         sensors.append(StartcaSensor(ts_data, variable, name))
-    async_add_devices(sensors, True)
+    async_add_entities(sensors, True)
 
 
 class StartcaSensor(Entity):
diff --git a/homeassistant/components/sensor/statistics.py b/homeassistant/components/sensor/statistics.py
index 35333090910..b1cfd447f0e 100644
--- a/homeassistant/components/sensor/statistics.py
+++ b/homeassistant/components/sensor/statistics.py
@@ -54,14 +54,15 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Statistics sensor."""
     entity_id = config.get(CONF_ENTITY_ID)
     name = config.get(CONF_NAME)
     sampling_size = config.get(CONF_SAMPLING_SIZE)
     max_age = config.get(CONF_MAX_AGE, None)
 
-    async_add_devices(
+    async_add_entities(
         [StatisticsSensor(hass, entity_id, name, sampling_size, max_age)],
         True)
     return True
diff --git a/homeassistant/components/sensor/steam_online.py b/homeassistant/components/sensor/steam_online.py
index 7521b74cd28..861a5958dd3 100644
--- a/homeassistant/components/sensor/steam_online.py
+++ b/homeassistant/components/sensor/steam_online.py
@@ -36,14 +36,14 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Steam platform."""
     import steam as steamod
     steamod.api.key.set(config.get(CONF_API_KEY))
     # Initialize steammods app list before creating sensors
     # to benefit from internal caching of the list.
     steam_app_list = steamod.apps.app_list()
-    add_devices(
+    add_entities(
         [SteamSensor(account,
                      steamod,
                      steam_app_list)
diff --git a/homeassistant/components/sensor/supervisord.py b/homeassistant/components/sensor/supervisord.py
index 5a302462bbf..894881dad86 100644
--- a/homeassistant/components/sensor/supervisord.py
+++ b/homeassistant/components/sensor/supervisord.py
@@ -26,7 +26,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Supervisord platform."""
     url = config.get(CONF_URL)
     try:
@@ -36,7 +36,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("Could not connect to Supervisord")
         return False
 
-    add_devices(
+    add_entities(
         [SupervisorProcessSensor(info, supervisor_server)
          for info in processes], True)
 
diff --git a/homeassistant/components/sensor/swiss_hydrological_data.py b/homeassistant/components/sensor/swiss_hydrological_data.py
index b4536b48c9e..fb55c22b2e8 100644
--- a/homeassistant/components/sensor/swiss_hydrological_data.py
+++ b/homeassistant/components/sensor/swiss_hydrological_data.py
@@ -49,7 +49,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Swiss hydrological sensor."""
     import xmltodict
 
@@ -67,7 +67,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         return False
 
     data = HydrologicalData(station)
-    add_devices([SwissHydrologicalDataSensor(name, data)], True)
+    add_entities([SwissHydrologicalDataSensor(name, data)], True)
 
 
 class SwissHydrologicalDataSensor(Entity):
diff --git a/homeassistant/components/sensor/swiss_public_transport.py b/homeassistant/components/sensor/swiss_public_transport.py
index 72c6aa2e1a3..6f44350c5cf 100644
--- a/homeassistant/components/sensor/swiss_public_transport.py
+++ b/homeassistant/components/sensor/swiss_public_transport.py
@@ -48,7 +48,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the Swiss public transport sensor."""
     from opendata_transport import OpendataTransport, exceptions
 
@@ -67,7 +67,7 @@ async def async_setup_platform(
             "if your station names are valid")
         return
 
-    async_add_devices(
+    async_add_entities(
         [SwissPublicTransportSensor(opendata, start, destination, name)])
 
 
diff --git a/homeassistant/components/sensor/syncthru.py b/homeassistant/components/sensor/syncthru.py
index a24482bda01..45a529012e3 100644
--- a/homeassistant/components/sensor/syncthru.py
+++ b/homeassistant/components/sensor/syncthru.py
@@ -60,7 +60,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the SyncThru component."""
     from pysyncthru import SyncThru, test_syncthru
 
@@ -101,7 +101,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         if 'output_tray_{}'.format(key) in monitored:
             devices.append(SyncThruOutputTraySensor(printer, name, key))
 
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class SyncThruSensor(Entity):
diff --git a/homeassistant/components/sensor/synologydsm.py b/homeassistant/components/sensor/synologydsm.py
index d431805ab19..39a9e75c47b 100644
--- a/homeassistant/components/sensor/synologydsm.py
+++ b/homeassistant/components/sensor/synologydsm.py
@@ -86,7 +86,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Synology NAS Sensor."""
     def run_setup(event):
         """Wait until Home Assistant is fully initialized before creating.
@@ -123,7 +123,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                         for variable in monitored_conditions
                         if variable in _STORAGE_DSK_MON_COND]
 
-        add_devices(sensors, True)
+        add_entities(sensors, True)
 
     # Wait until start event is sent to load this component.
     hass.bus.listen_once(EVENT_HOMEASSISTANT_START, run_setup)
diff --git a/homeassistant/components/sensor/systemmonitor.py b/homeassistant/components/sensor/systemmonitor.py
index b9a04e546d3..aa448ddf56e 100644
--- a/homeassistant/components/sensor/systemmonitor.py
+++ b/homeassistant/components/sensor/systemmonitor.py
@@ -67,7 +67,7 @@ IF_ADDRS = {
 }
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the system monitor sensors."""
     dev = []
     for resource in config[CONF_RESOURCES]:
@@ -76,7 +76,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         dev.append(SystemMonitorSensor(
             resource[CONF_TYPE], resource[CONF_ARG]))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class SystemMonitorSensor(Entity):
diff --git a/homeassistant/components/sensor/sytadin.py b/homeassistant/components/sensor/sytadin.py
index 4aeb0cca32f..18fa73f2341 100644
--- a/homeassistant/components/sensor/sytadin.py
+++ b/homeassistant/components/sensor/sytadin.py
@@ -49,7 +49,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up of the Sytadin Traffic sensor platform."""
     name = config.get(CONF_NAME)
 
@@ -61,7 +61,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         dev.append(SytadinSensor(
             sytadin, name, option, SENSOR_TYPES[option][0],
             SENSOR_TYPES[option][1]))
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class SytadinSensor(Entity):
diff --git a/homeassistant/components/sensor/tado.py b/homeassistant/components/sensor/tado.py
index aa6314b8c5b..46ad6206fff 100644
--- a/homeassistant/components/sensor/tado.py
+++ b/homeassistant/components/sensor/tado.py
@@ -22,7 +22,7 @@ CLIMATE_SENSOR_TYPES = ['temperature', 'humidity', 'power',
 HOT_WATER_SENSOR_TYPES = ['power', 'link', 'tado mode', 'overlay']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the sensor platform."""
     tado = hass.data[DATA_TADO]
 
@@ -49,7 +49,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         me_data['homes'][0]['id'], "tado bridge status"))
 
     if sensor_items:
-        add_devices(sensor_items, True)
+        add_entities(sensor_items, True)
 
 
 def create_zone_sensor(tado, zone, name, zone_id, variable):
diff --git a/homeassistant/components/sensor/tahoma.py b/homeassistant/components/sensor/tahoma.py
index 6c6c296652a..eafc6fdf616 100644
--- a/homeassistant/components/sensor/tahoma.py
+++ b/homeassistant/components/sensor/tahoma.py
@@ -19,13 +19,13 @@ _LOGGER = logging.getLogger(__name__)
 SCAN_INTERVAL = timedelta(seconds=10)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Tahoma controller devices."""
     controller = hass.data[TAHOMA_DOMAIN]['controller']
     devices = []
     for device in hass.data[TAHOMA_DOMAIN]['devices']['sensor']:
         devices.append(TahomaSensor(device, controller))
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class TahomaSensor(TahomaDevice, Entity):
diff --git a/homeassistant/components/sensor/tank_utility.py b/homeassistant/components/sensor/tank_utility.py
index 1f565d44325..c3cc75dac0c 100644
--- a/homeassistant/components/sensor/tank_utility.py
+++ b/homeassistant/components/sensor/tank_utility.py
@@ -47,7 +47,7 @@ SENSOR_ATTRS = [
 ]
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Tank Utility sensor."""
     from tank_utility import auth
     email = config.get(CONF_EMAIL)
@@ -66,7 +66,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for device in devices:
         sensor = TankUtilitySensor(email, password, token, device)
         all_sensors.append(sensor)
-    add_devices(all_sensors, True)
+    add_entities(all_sensors, True)
 
 
 class TankUtilitySensor(Entity):
diff --git a/homeassistant/components/sensor/tcp.py b/homeassistant/components/sensor/tcp.py
index 30ceba776e9..19197c06295 100644
--- a/homeassistant/components/sensor/tcp.py
+++ b/homeassistant/components/sensor/tcp.py
@@ -41,9 +41,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the TCP Sensor."""
-    add_devices([TcpSensor(hass, config)])
+    add_entities([TcpSensor(hass, config)])
 
 
 class TcpSensor(Entity):
diff --git a/homeassistant/components/sensor/ted5000.py b/homeassistant/components/sensor/ted5000.py
index 7298181796a..a6ea7cbd534 100644
--- a/homeassistant/components/sensor/ted5000.py
+++ b/homeassistant/components/sensor/ted5000.py
@@ -32,7 +32,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Ted5000 sensor."""
     host = config.get(CONF_HOST)
     port = config.get(CONF_PORT)
@@ -49,7 +49,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         dev.append(Ted5000Sensor(gateway, name, mtu, 'W'))
         dev.append(Ted5000Sensor(gateway, name, mtu, 'V'))
 
-    add_devices(dev)
+    add_entities(dev)
     return True
 
 
diff --git a/homeassistant/components/sensor/teksavvy.py b/homeassistant/components/sensor/teksavvy.py
index 68a1cfc4fe1..87b89074cfb 100644
--- a/homeassistant/components/sensor/teksavvy.py
+++ b/homeassistant/components/sensor/teksavvy.py
@@ -59,7 +59,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the sensor platform."""
     websession = async_get_clientsession(hass)
     apikey = config.get(CONF_API_KEY)
@@ -75,7 +76,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     sensors = []
     for variable in config[CONF_MONITORED_VARIABLES]:
         sensors.append(TekSavvySensor(ts_data, variable, name))
-    async_add_devices(sensors, True)
+    async_add_entities(sensors, True)
 
 
 class TekSavvySensor(Entity):
diff --git a/homeassistant/components/sensor/tellduslive.py b/homeassistant/components/sensor/tellduslive.py
index 9d5a21b37c4..34908595951 100644
--- a/homeassistant/components/sensor/tellduslive.py
+++ b/homeassistant/components/sensor/tellduslive.py
@@ -44,11 +44,11 @@ SENSOR_TYPES = {
 }
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Tellstick sensors."""
     if discovery_info is None:
         return
-    add_devices(TelldusLiveSensor(hass, sensor) for sensor in discovery_info)
+    add_entities(TelldusLiveSensor(hass, sensor) for sensor in discovery_info)
 
 
 class TelldusLiveSensor(TelldusLiveEntity):
diff --git a/homeassistant/components/sensor/tellstick.py b/homeassistant/components/sensor/tellstick.py
index 2fc67e57162..aac97580f2c 100644
--- a/homeassistant/components/sensor/tellstick.py
+++ b/homeassistant/components/sensor/tellstick.py
@@ -37,7 +37,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Tellstick sensors."""
     from tellcore import telldus
     import tellcore.constants as tellcore_constants
@@ -89,7 +89,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                     sensors.append(TellstickSensor(
                         sensor_name, tellcore_sensor, datatype, sensor_info))
 
-    add_devices(sensors)
+    add_entities(sensors)
 
 
 class TellstickSensor(Entity):
diff --git a/homeassistant/components/sensor/temper.py b/homeassistant/components/sensor/temper.py
index f0a3e15834c..72184df7c8f 100644
--- a/homeassistant/components/sensor/temper.py
+++ b/homeassistant/components/sensor/temper.py
@@ -33,7 +33,7 @@ def get_temper_devices():
     return TemperHandler().get_devices()
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Temper sensors."""
     temp_unit = hass.config.units.temperature_unit
     name = config.get(CONF_NAME)
@@ -47,7 +47,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         if idx != 0:
             name = name + '_' + str(idx)
         TEMPER_SENSORS.append(TemperSensor(dev, temp_unit, name, scaling))
-    add_devices(TEMPER_SENSORS)
+    add_entities(TEMPER_SENSORS)
 
 
 def reset_devices():
diff --git a/homeassistant/components/sensor/template.py b/homeassistant/components/sensor/template.py
index 23c7c13f0ed..f64e8b122ca 100644
--- a/homeassistant/components/sensor/template.py
+++ b/homeassistant/components/sensor/template.py
@@ -42,7 +42,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the template sensors."""
     sensors = []
 
@@ -96,7 +97,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         _LOGGER.error("No sensors added")
         return False
 
-    async_add_devices(sensors)
+    async_add_entities(sensors)
     return True
 
 
diff --git a/homeassistant/components/sensor/tesla.py b/homeassistant/components/sensor/tesla.py
index 3233ebb1780..51b7ea2325d 100644
--- a/homeassistant/components/sensor/tesla.py
+++ b/homeassistant/components/sensor/tesla.py
@@ -21,7 +21,7 @@ DEPENDENCIES = ['tesla']
 SCAN_INTERVAL = timedelta(minutes=5)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Tesla sensor platform."""
     controller = hass.data[TESLA_DOMAIN]['devices']['controller']
     devices = []
@@ -32,7 +32,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             devices.append(TeslaSensor(device, controller, 'outside'))
         else:
             devices.append(TeslaSensor(device, controller))
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class TeslaSensor(TeslaDevice, Entity):
diff --git a/homeassistant/components/sensor/thethingsnetwork.py b/homeassistant/components/sensor/thethingsnetwork.py
index 0f27b656404..02661f2211d 100644
--- a/homeassistant/components/sensor/thethingsnetwork.py
+++ b/homeassistant/components/sensor/thethingsnetwork.py
@@ -39,7 +39,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up The Things Network Data storage sensors."""
     ttn = hass.data.get(DATA_TTN)
     device_id = config.get(CONF_DEVICE_ID)
@@ -58,7 +59,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     for value, unit_of_measurement in values.items():
         devices.append(TtnDataSensor(
             ttn_data_storage, device_id, value, unit_of_measurement))
-    async_add_devices(devices, True)
+    async_add_entities(devices, True)
 
 
 class TtnDataSensor(Entity):
diff --git a/homeassistant/components/sensor/thinkingcleaner.py b/homeassistant/components/sensor/thinkingcleaner.py
index 0b936d8c8c7..17e2f717f5a 100644
--- a/homeassistant/components/sensor/thinkingcleaner.py
+++ b/homeassistant/components/sensor/thinkingcleaner.py
@@ -51,7 +51,7 @@ STATES = {
 }
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the ThinkingCleaner platform."""
     from pythinkingcleaner import Discovery
 
@@ -70,7 +70,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             dev.append(ThinkingCleanerSensor(device, type_name,
                                              update_devices))
 
-    add_devices(dev)
+    add_entities(dev)
 
 
 class ThinkingCleanerSensor(Entity):
diff --git a/homeassistant/components/sensor/tibber.py b/homeassistant/components/sensor/tibber.py
index c75c40dd929..3670a5a59bd 100644
--- a/homeassistant/components/sensor/tibber.py
+++ b/homeassistant/components/sensor/tibber.py
@@ -34,7 +34,7 @@ SCAN_INTERVAL = timedelta(minutes=1)
 MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=5)
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the Tibber sensor."""
     import tibber
@@ -50,7 +50,7 @@ async def async_setup_platform(hass, config, async_add_devices,
     except (asyncio.TimeoutError, aiohttp.ClientError):
         raise PlatformNotReady()
 
-    async_add_devices(dev, True)
+    async_add_entities(dev, True)
 
 
 class TibberSensor(Entity):
diff --git a/homeassistant/components/sensor/time_date.py b/homeassistant/components/sensor/time_date.py
index 0668b5bdbce..e4c719acd0d 100644
--- a/homeassistant/components/sensor/time_date.py
+++ b/homeassistant/components/sensor/time_date.py
@@ -38,7 +38,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Time and Date sensor."""
     if hass.config.time_zone is None:
         _LOGGER.error("Timezone is not set in Home Assistant configuration")
@@ -51,7 +52,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
             hass, device.point_in_time_listener, device.get_next_interval())
         devices.append(device)
 
-    async_add_devices(devices, True)
+    async_add_entities(devices, True)
 
 
 class TimeDateSensor(Entity):
diff --git a/homeassistant/components/sensor/toon.py b/homeassistant/components/sensor/toon.py
index a8875f6904c..fb057603a1a 100644
--- a/homeassistant/components/sensor/toon.py
+++ b/homeassistant/components/sensor/toon.py
@@ -16,7 +16,7 @@ STATE_ATTR_DEVICE_TYPE = 'device_type'
 STATE_ATTR_LAST_CONNECTED_CHANGE = 'last_connected_change'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Toon sensors."""
     _toon_main = hass.data[toon_main.TOON_HANDLE]
 
@@ -58,7 +58,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                 smokedetector.device_uuid, 'alarm-bell', '%')
         )
 
-    add_devices(sensor_items)
+    add_entities(sensor_items)
 
 
 class ToonSensor(Entity):
diff --git a/homeassistant/components/sensor/torque.py b/homeassistant/components/sensor/torque.py
index 4ed1b5907cf..4941633677c 100644
--- a/homeassistant/components/sensor/torque.py
+++ b/homeassistant/components/sensor/torque.py
@@ -46,14 +46,14 @@ def convert_pid(value):
     return int(value, 16)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Torque platform."""
     vehicle = config.get(CONF_NAME)
     email = config.get(CONF_EMAIL)
     sensors = {}
 
     hass.http.register_view(TorqueReceiveDataView(
-        email, vehicle, sensors, add_devices))
+        email, vehicle, sensors, add_entities))
     return True
 
 
@@ -63,12 +63,12 @@ class TorqueReceiveDataView(HomeAssistantView):
     url = API_PATH
     name = 'api:torque'
 
-    def __init__(self, email, vehicle, sensors, add_devices):
+    def __init__(self, email, vehicle, sensors, add_entities):
         """Initialize a Torque view."""
         self.email = email
         self.vehicle = vehicle
         self.sensors = sensors
-        self.add_devices = add_devices
+        self.add_entities = add_entities
 
     @callback
     def get(self, request):
@@ -102,7 +102,7 @@ class TorqueReceiveDataView(HomeAssistantView):
                 self.sensors[pid] = TorqueSensor(
                     ENTITY_NAME_FORMAT.format(self.vehicle, names[pid]),
                     units.get(pid, None))
-                hass.async_add_job(self.add_devices, [self.sensors[pid]])
+                hass.async_add_job(self.add_entities, [self.sensors[pid]])
 
         return "OK!"
 
diff --git a/homeassistant/components/sensor/tradfri.py b/homeassistant/components/sensor/tradfri.py
index df931770cf2..0849169b747 100644
--- a/homeassistant/components/sensor/tradfri.py
+++ b/homeassistant/components/sensor/tradfri.py
@@ -19,7 +19,7 @@ DEPENDENCIES = ['tradfri']
 SCAN_INTERVAL = timedelta(minutes=5)
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the IKEA Tradfri device platform."""
     if discovery_info is None:
@@ -33,7 +33,7 @@ async def async_setup_platform(hass, config, async_add_devices,
     devices_commands = await api(devices_command)
     all_devices = await api(devices_commands)
     devices = [dev for dev in all_devices if not dev.has_light_control]
-    async_add_devices(TradfriDevice(device, api) for device in devices)
+    async_add_entities(TradfriDevice(device, api) for device in devices)
 
 
 class TradfriDevice(Entity):
diff --git a/homeassistant/components/sensor/trafikverket_weatherstation.py b/homeassistant/components/sensor/trafikverket_weatherstation.py
index 77a2b0e7338..a8ce6917dd3 100644
--- a/homeassistant/components/sensor/trafikverket_weatherstation.py
+++ b/homeassistant/components/sensor/trafikverket_weatherstation.py
@@ -36,14 +36,14 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Trafikverket sensor platform."""
     sensor_name = config.get(CONF_NAME)
     sensor_api = config.get(CONF_API_KEY)
     sensor_station = config.get(CONF_STATION)
     sensor_type = config.get(CONF_TYPE)
 
-    add_devices([TrafikverketWeatherStation(
+    add_entities([TrafikverketWeatherStation(
         sensor_name, sensor_api, sensor_station, sensor_type)], True)
 
 
diff --git a/homeassistant/components/sensor/transmission.py b/homeassistant/components/sensor/transmission.py
index 3e74b454913..a669db0e5be 100644
--- a/homeassistant/components/sensor/transmission.py
+++ b/homeassistant/components/sensor/transmission.py
@@ -47,7 +47,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Transmission sensors."""
     import transmissionrpc
     from transmissionrpc.error import TransmissionError
@@ -75,7 +75,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for variable in config[CONF_MONITORED_VARIABLES]:
         dev.append(TransmissionSensor(variable, transmission_api, name))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class TransmissionSensor(Entity):
diff --git a/homeassistant/components/sensor/travisci.py b/homeassistant/components/sensor/travisci.py
index 1ca08e7c0aa..40ae130d150 100644
--- a/homeassistant/components/sensor/travisci.py
+++ b/homeassistant/components/sensor/travisci.py
@@ -54,7 +54,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Travis CI sensor."""
     from travispy import TravisPy
     from travispy.errors import TravisError
@@ -92,7 +92,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             sensors.append(
                 TravisCISensor(travis, repo, user, branch, sensor_type))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
     return True
 
 
diff --git a/homeassistant/components/sensor/twitch.py b/homeassistant/components/sensor/twitch.py
index 250911b49b1..3763aa30fb4 100644
--- a/homeassistant/components/sensor/twitch.py
+++ b/homeassistant/components/sensor/twitch.py
@@ -31,11 +31,11 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Twitch platform."""
     channels = config.get(CONF_CHANNELS, [])
 
-    add_devices([TwitchSensor(channel) for channel in channels], True)
+    add_entities([TwitchSensor(channel) for channel in channels], True)
 
 
 class TwitchSensor(Entity):
diff --git a/homeassistant/components/sensor/uber.py b/homeassistant/components/sensor/uber.py
index cd476a1a226..a97ccaffed0 100644
--- a/homeassistant/components/sensor/uber.py
+++ b/homeassistant/components/sensor/uber.py
@@ -39,7 +39,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Uber sensor."""
     from uber_rides.session import Session
 
@@ -65,7 +65,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             dev.append(UberSensor(
                 'price', timeandpriceest, product_id, product))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class UberSensor(Entity):
diff --git a/homeassistant/components/sensor/uk_transport.py b/homeassistant/components/sensor/uk_transport.py
index 72d34411d5c..a7aba9a566b 100644
--- a/homeassistant/components/sensor/uk_transport.py
+++ b/homeassistant/components/sensor/uk_transport.py
@@ -47,7 +47,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Get the uk_transport sensor."""
     sensors = []
     number_sensors = len(config.get(CONF_QUERIES))
@@ -76,7 +76,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                     calling_at,
                     interval))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class UkTransportSensor(Entity):
diff --git a/homeassistant/components/sensor/upnp.py b/homeassistant/components/sensor/upnp.py
index 07b63553fcb..d021312d15c 100644
--- a/homeassistant/components/sensor/upnp.py
+++ b/homeassistant/components/sensor/upnp.py
@@ -27,7 +27,7 @@ SENSOR_TYPES = {
 }
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the IGD sensors."""
     if discovery_info is None:
@@ -36,7 +36,7 @@ async def async_setup_platform(hass, config, async_add_devices,
     device = hass.data[DATA_UPNP]
     service = device.find_first_service(CIC_SERVICE)
     unit = discovery_info['unit']
-    async_add_devices([
+    async_add_entities([
         IGDSensor(service, t, unit if SENSOR_TYPES[t][1] else '#')
         for t in SENSOR_TYPES], True)
 
diff --git a/homeassistant/components/sensor/ups.py b/homeassistant/components/sensor/ups.py
index a864df384ad..aa6ce930619 100644
--- a/homeassistant/components/sensor/ups.py
+++ b/homeassistant/components/sensor/ups.py
@@ -38,7 +38,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the UPS platform."""
     import upsmychoice
     try:
@@ -50,8 +50,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.exception("Could not connect to UPS My Choice")
         return False
 
-    add_devices([UPSSensor(session, config.get(CONF_NAME),
-                           config.get(CONF_UPDATE_INTERVAL))], True)
+    add_entities([UPSSensor(session, config.get(CONF_NAME),
+                            config.get(CONF_UPDATE_INTERVAL))], True)
 
 
 class UPSSensor(Entity):
diff --git a/homeassistant/components/sensor/uptime.py b/homeassistant/components/sensor/uptime.py
index 7e893899815..197233461fb 100644
--- a/homeassistant/components/sensor/uptime.py
+++ b/homeassistant/components/sensor/uptime.py
@@ -28,12 +28,12 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the uptime sensor platform."""
     name = config.get(CONF_NAME)
     units = config.get(CONF_UNIT_OF_MEASUREMENT)
 
-    async_add_devices([UptimeSensor(name, units)], True)
+    async_add_entities([UptimeSensor(name, units)], True)
 
 
 class UptimeSensor(Entity):
diff --git a/homeassistant/components/sensor/uscis.py b/homeassistant/components/sensor/uscis.py
index f93a788092b..e3a917b0a5a 100644
--- a/homeassistant/components/sensor/uscis.py
+++ b/homeassistant/components/sensor/uscis.py
@@ -28,12 +28,12 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the platform in HASS and Case Information."""
     uscis = UscisSensor(config['case_id'], config[CONF_FRIENDLY_NAME])
     uscis.update()
     if uscis.valid_case_id:
-        add_devices([uscis])
+        add_entities([uscis])
     else:
         _LOGGER.error("Setup USCIS Sensor Fail"
                       " check if your Case ID is Valid")
diff --git a/homeassistant/components/sensor/usps.py b/homeassistant/components/sensor/usps.py
index 6ca18442883..17fa11fe8d3 100644
--- a/homeassistant/components/sensor/usps.py
+++ b/homeassistant/components/sensor/usps.py
@@ -20,13 +20,13 @@ DEPENDENCIES = ['usps']
 STATUS_DELIVERED = 'delivered'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the USPS platform."""
     if discovery_info is None:
         return
 
     usps = hass.data[DATA_USPS]
-    add_devices([USPSPackageSensor(usps), USPSMailSensor(usps)], True)
+    add_entities([USPSPackageSensor(usps), USPSMailSensor(usps)], True)
 
 
 class USPSPackageSensor(Entity):
diff --git a/homeassistant/components/sensor/vasttrafik.py b/homeassistant/components/sensor/vasttrafik.py
index 8cd084e1b71..7ef4170dd5a 100644
--- a/homeassistant/components/sensor/vasttrafik.py
+++ b/homeassistant/components/sensor/vasttrafik.py
@@ -53,7 +53,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the departure sensor."""
     import vasttrafik
     planner = vasttrafik.JournyPlanner(
@@ -65,7 +65,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                 vasttrafik, planner, departure.get(CONF_NAME),
                 departure.get(CONF_FROM), departure.get(CONF_HEADING),
                 departure.get(CONF_LINES), departure.get(CONF_DELAY)))
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class VasttrafikDepartureSensor(Entity):
diff --git a/homeassistant/components/sensor/vera.py b/homeassistant/components/sensor/vera.py
index eaef3dcf7f7..c9b5a36afa3 100644
--- a/homeassistant/components/sensor/vera.py
+++ b/homeassistant/components/sensor/vera.py
@@ -22,9 +22,9 @@ _LOGGER = logging.getLogger(__name__)
 SCAN_INTERVAL = timedelta(seconds=5)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Vera controller devices."""
-    add_devices(
+    add_entities(
         [VeraSensor(device, hass.data[VERA_CONTROLLER])
          for device in hass.data[VERA_DEVICES]['sensor']], True)
 
diff --git a/homeassistant/components/sensor/verisure.py b/homeassistant/components/sensor/verisure.py
index 187a9bd7935..b6ea75ae8cc 100644
--- a/homeassistant/components/sensor/verisure.py
+++ b/homeassistant/components/sensor/verisure.py
@@ -15,7 +15,7 @@ from homeassistant.helpers.entity import Entity
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Verisure platform."""
     sensors = []
     hub.update_overview()
@@ -38,7 +38,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             for device_label in hub.get(
                 "$.eventCounts[?(@.deviceType=='MOUSE1')].deviceLabel")])
 
-    add_devices(sensors)
+    add_entities(sensors)
 
 
 class VerisureThermometer(Entity):
diff --git a/homeassistant/components/sensor/version.py b/homeassistant/components/sensor/version.py
index db61d059783..eba4b1b8350 100644
--- a/homeassistant/components/sensor/version.py
+++ b/homeassistant/components/sensor/version.py
@@ -23,11 +23,11 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the Version sensor platform."""
     name = config.get(CONF_NAME)
 
-    async_add_devices([VersionSensor(name)])
+    async_add_entities([VersionSensor(name)])
 
 
 class VersionSensor(Entity):
diff --git a/homeassistant/components/sensor/viaggiatreno.py b/homeassistant/components/sensor/viaggiatreno.py
index 43ba80d2630..1dd8523eb4b 100644
--- a/homeassistant/components/sensor/viaggiatreno.py
+++ b/homeassistant/components/sensor/viaggiatreno.py
@@ -57,14 +57,15 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the ViaggiaTreno platform."""
     train_id = config.get(CONF_TRAIN_ID)
     station_id = config.get(CONF_STATION_ID)
     name = config.get(CONF_NAME)
     if not name:
         name = DEFAULT_NAME.format(train_id)
-    async_add_devices([ViaggiaTrenoSensor(train_id, station_id, name)])
+    async_add_entities([ViaggiaTrenoSensor(train_id, station_id, name)])
 
 
 @asyncio.coroutine
diff --git a/homeassistant/components/sensor/volvooncall.py b/homeassistant/components/sensor/volvooncall.py
index 78e8a7e76c6..a3f0c55b954 100644
--- a/homeassistant/components/sensor/volvooncall.py
+++ b/homeassistant/components/sensor/volvooncall.py
@@ -14,11 +14,11 @@ from homeassistant.components.volvooncall import (
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Volvo sensors."""
     if discovery_info is None:
         return
-    add_devices([VolvoSensor(hass, *discovery_info)])
+    add_entities([VolvoSensor(hass, *discovery_info)])
 
 
 class VolvoSensor(VolvoEntity):
diff --git a/homeassistant/components/sensor/vultr.py b/homeassistant/components/sensor/vultr.py
index 291639c81d6..a727e5bd2ec 100644
--- a/homeassistant/components/sensor/vultr.py
+++ b/homeassistant/components/sensor/vultr.py
@@ -36,7 +36,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Vultr subscription (server) sensor."""
     vultr = hass.data[DATA_VULTR]
 
@@ -53,7 +53,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for condition in monitored_conditions:
         sensors.append(VultrSensor(vultr, subscription, condition, name))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class VultrSensor(Entity):
diff --git a/homeassistant/components/sensor/waqi.py b/homeassistant/components/sensor/waqi.py
index bf2e263a0bb..9f90f465fb2 100644
--- a/homeassistant/components/sensor/waqi.py
+++ b/homeassistant/components/sensor/waqi.py
@@ -60,7 +60,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the requested World Air Quality Index locations."""
     import waqiasync
 
@@ -86,7 +87,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
             asyncio.TimeoutError):
         _LOGGER.exception('Failed to connect to WAQI servers.')
         raise PlatformNotReady
-    async_add_devices(dev, True)
+    async_add_entities(dev, True)
 
 
 class WaqiSensor(Entity):
diff --git a/homeassistant/components/sensor/waterfurnace.py b/homeassistant/components/sensor/waterfurnace.py
index 76c5d2f648e..806b40551df 100644
--- a/homeassistant/components/sensor/waterfurnace.py
+++ b/homeassistant/components/sensor/waterfurnace.py
@@ -46,7 +46,7 @@ SENSORS = [
 ]
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Waterfurnace sensor."""
     if discovery_info is None:
         return
@@ -56,7 +56,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for sconfig in SENSORS:
         sensors.append(WaterFurnaceSensor(client, sconfig))
 
-    add_devices(sensors)
+    add_entities(sensors)
 
 
 class WaterFurnaceSensor(Entity):
diff --git a/homeassistant/components/sensor/waze_travel_time.py b/homeassistant/components/sensor/waze_travel_time.py
index 023da72299b..8d046b0de0d 100644
--- a/homeassistant/components/sensor/waze_travel_time.py
+++ b/homeassistant/components/sensor/waze_travel_time.py
@@ -55,7 +55,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Waze travel time sensor platform."""
     destination = config.get(CONF_DESTINATION)
     name = config.get(CONF_NAME)
@@ -68,7 +68,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     sensor = WazeTravelTime(name, origin, destination, region,
                             incl_filter, excl_filter, realtime)
 
-    add_devices([sensor])
+    add_entities([sensor])
 
     # Wait until start event is sent to load this component.
     hass.bus.listen_once(EVENT_HOMEASSISTANT_START, sensor.update)
diff --git a/homeassistant/components/sensor/whois.py b/homeassistant/components/sensor/whois.py
index 21b1b99ca13..b589caddc79 100644
--- a/homeassistant/components/sensor/whois.py
+++ b/homeassistant/components/sensor/whois.py
@@ -35,7 +35,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the WHOIS sensor."""
     from pythonwhois import get_whois
     from pythonwhois.shared import WhoisException
@@ -45,7 +45,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     try:
         if 'expiration_date' in get_whois(domain, normalized=True):
-            add_devices([WhoisSensor(name, domain)], True)
+            add_entities([WhoisSensor(name, domain)], True)
         else:
             _LOGGER.error(
                 "WHOIS lookup for %s didn't contain expiration_date",
diff --git a/homeassistant/components/sensor/wink.py b/homeassistant/components/sensor/wink.py
index 75751bbbf8a..8e11b054b24 100644
--- a/homeassistant/components/sensor/wink.py
+++ b/homeassistant/components/sensor/wink.py
@@ -18,7 +18,7 @@ DEPENDENCIES = ['wink']
 SENSOR_TYPES = ['temperature', 'humidity', 'balance', 'proximity']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Wink platform."""
     import pywink
 
@@ -26,24 +26,24 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _id = sensor.object_id() + sensor.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
             if sensor.capability() in SENSOR_TYPES:
-                add_devices([WinkSensorDevice(sensor, hass)])
+                add_entities([WinkSensorDevice(sensor, hass)])
 
     for eggtray in pywink.get_eggtrays():
         _id = eggtray.object_id() + eggtray.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkSensorDevice(eggtray, hass)])
+            add_entities([WinkSensorDevice(eggtray, hass)])
 
     for tank in pywink.get_propane_tanks():
         _id = tank.object_id() + tank.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkSensorDevice(tank, hass)])
+            add_entities([WinkSensorDevice(tank, hass)])
 
     for piggy_bank in pywink.get_piggy_banks():
         _id = piggy_bank.object_id() + piggy_bank.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
             try:
                 if piggy_bank.capability() in SENSOR_TYPES:
-                    add_devices([WinkSensorDevice(piggy_bank, hass)])
+                    add_entities([WinkSensorDevice(piggy_bank, hass)])
             except AttributeError:
                 _LOGGER.info("Device is not a sensor")
 
diff --git a/homeassistant/components/sensor/wirelesstag.py b/homeassistant/components/sensor/wirelesstag.py
index e5166173cb9..a68fb5d0caf 100644
--- a/homeassistant/components/sensor/wirelesstag.py
+++ b/homeassistant/components/sensor/wirelesstag.py
@@ -57,7 +57,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the sensor platform."""
     platform = hass.data.get(WIRELESSTAG_DOMAIN)
     sensors = []
@@ -68,7 +68,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                 sensors.append(WirelessTagSensor(
                     platform, tag, sensor_type, hass.config))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class WirelessTagSensor(WirelessTagBaseSensor):
diff --git a/homeassistant/components/sensor/worldclock.py b/homeassistant/components/sensor/worldclock.py
index 1240480d4a3..6bb5d1fee2e 100644
--- a/homeassistant/components/sensor/worldclock.py
+++ b/homeassistant/components/sensor/worldclock.py
@@ -29,12 +29,12 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the World clock sensor."""
     name = config.get(CONF_NAME)
     time_zone = dt_util.get_time_zone(config.get(CONF_TIME_ZONE))
 
-    async_add_devices([WorldClockSensor(time_zone, name)], True)
+    async_add_entities([WorldClockSensor(time_zone, name)], True)
 
 
 class WorldClockSensor(Entity):
diff --git a/homeassistant/components/sensor/worldtidesinfo.py b/homeassistant/components/sensor/worldtidesinfo.py
index adaa327d39a..fea3e92a140 100644
--- a/homeassistant/components/sensor/worldtidesinfo.py
+++ b/homeassistant/components/sensor/worldtidesinfo.py
@@ -33,7 +33,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the WorldTidesInfo sensor."""
     name = config.get(CONF_NAME)
 
@@ -50,7 +50,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("Location not available")
         return
 
-    add_devices([tides])
+    add_entities([tides])
 
 
 class WorldTidesInfoSensor(Entity):
diff --git a/homeassistant/components/sensor/worxlandroid.py b/homeassistant/components/sensor/worxlandroid.py
index 8963bb135e0..f6593f4b1c5 100644
--- a/homeassistant/components/sensor/worxlandroid.py
+++ b/homeassistant/components/sensor/worxlandroid.py
@@ -51,11 +51,11 @@ ERROR_STATE = [
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices,
+def async_setup_platform(hass, config, async_add_entities,
                          discovery_info=None):
     """Set up the Worx Landroid sensors."""
     for typ in ('battery', 'state'):
-        async_add_devices([WorxLandroidSensor(typ, config)])
+        async_add_entities([WorxLandroidSensor(typ, config)])
 
 
 class WorxLandroidSensor(Entity):
diff --git a/homeassistant/components/sensor/wsdot.py b/homeassistant/components/sensor/wsdot.py
index 0cd5ba44349..84f2e8622c6 100644
--- a/homeassistant/components/sensor/wsdot.py
+++ b/homeassistant/components/sensor/wsdot.py
@@ -45,7 +45,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the WSDOT sensor."""
     sensors = []
     for travel_time in config.get(CONF_TRAVEL_TIMES):
@@ -54,7 +54,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             WashingtonStateTravelTimeSensor(
                 name, config.get(CONF_API_KEY), travel_time.get(CONF_ID)))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class WashingtonStateTransportSensor(Entity):
diff --git a/homeassistant/components/sensor/wunderground.py b/homeassistant/components/sensor/wunderground.py
index 24ae2d0068f..a14d4b94789 100644
--- a/homeassistant/components/sensor/wunderground.py
+++ b/homeassistant/components/sensor/wunderground.py
@@ -632,7 +632,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
-                               async_add_devices, discovery_info=None):
+                               async_add_entities, discovery_info=None):
     """Set up the WUnderground sensor."""
     latitude = config.get(CONF_LATITUDE, hass.config.latitude)
     longitude = config.get(CONF_LONGITUDE, hass.config.longitude)
@@ -656,7 +656,7 @@ async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
     if not rest.data:
         raise PlatformNotReady
 
-    async_add_devices(sensors, True)
+    async_add_entities(sensors, True)
 
 
 class WUndergroundSensor(Entity):
diff --git a/homeassistant/components/sensor/xbox_live.py b/homeassistant/components/sensor/xbox_live.py
index 250c74ee493..3432927dda0 100644
--- a/homeassistant/components/sensor/xbox_live.py
+++ b/homeassistant/components/sensor/xbox_live.py
@@ -27,7 +27,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Xbox platform."""
     from xboxapi import xbox_api
     api = xbox_api.XboxApi(config.get(CONF_API_KEY))
@@ -48,7 +48,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             devices.append(new_device)
 
     if devices:
-        add_devices(devices, True)
+        add_entities(devices, True)
 
 
 class XboxSensor(Entity):
diff --git a/homeassistant/components/sensor/xiaomi_aqara.py b/homeassistant/components/sensor/xiaomi_aqara.py
index 32139b21976..8a3a11db051 100644
--- a/homeassistant/components/sensor/xiaomi_aqara.py
+++ b/homeassistant/components/sensor/xiaomi_aqara.py
@@ -18,7 +18,7 @@ SENSOR_TYPES = {
 }
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Perform the setup for Xiaomi devices."""
     devices = []
     for (_, gateway) in hass.data[PY_XIAOMI_GATEWAY].gateways.items():
@@ -41,7 +41,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             elif device['model'] in ['gateway', 'gateway.v3', 'acpartner.v3']:
                 devices.append(XiaomiSensor(device, 'Illumination',
                                             'illumination', gateway))
-    add_devices(devices)
+    add_entities(devices)
 
 
 class XiaomiSensor(XiaomiDevice):
diff --git a/homeassistant/components/sensor/xiaomi_miio.py b/homeassistant/components/sensor/xiaomi_miio.py
index 6fb89c5109e..15af57bf46b 100644
--- a/homeassistant/components/sensor/xiaomi_miio.py
+++ b/homeassistant/components/sensor/xiaomi_miio.py
@@ -40,7 +40,7 @@ ATTR_MODEL = 'model'
 SUCCESS = ['ok']
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the sensor from config."""
     from miio import AirQualityMonitor, DeviceException
@@ -68,7 +68,7 @@ async def async_setup_platform(hass, config, async_add_devices,
         raise PlatformNotReady
 
     hass.data[DATA_KEY][host] = device
-    async_add_devices([device], update_before_add=True)
+    async_add_entities([device], update_before_add=True)
 
 
 class XiaomiAirQualityMonitor(Entity):
diff --git a/homeassistant/components/sensor/yahoo_finance.py b/homeassistant/components/sensor/yahoo_finance.py
index 82cb7f845dc..4358dba2b25 100644
--- a/homeassistant/components/sensor/yahoo_finance.py
+++ b/homeassistant/components/sensor/yahoo_finance.py
@@ -38,7 +38,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Yahoo Finance sensor."""
     from yahoo_finance import Share
 
@@ -52,7 +52,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         data = YahooFinanceData(symbol)
         dev.append(YahooFinanceSensor(data, symbol))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class YahooFinanceSensor(Entity):
diff --git a/homeassistant/components/sensor/yr.py b/homeassistant/components/sensor/yr.py
index fcddf41af97..16ae98f9141 100644
--- a/homeassistant/components/sensor/yr.py
+++ b/homeassistant/components/sensor/yr.py
@@ -67,7 +67,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Yr.no sensor."""
     elevation = config.get(CONF_ELEVATION, hass.config.elevation or 0)
     forecast = config.get(CONF_FORECAST)
@@ -88,7 +89,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     dev = []
     for sensor_type in config[CONF_MONITORED_CONDITIONS]:
         dev.append(YrSensor(name, sensor_type))
-    async_add_devices(dev)
+    async_add_entities(dev)
 
     weather = YrData(hass, coordinates, forecast, dev)
     async_track_utc_time_change(hass, weather.updating_devices, minute=31)
diff --git a/homeassistant/components/sensor/yweather.py b/homeassistant/components/sensor/yweather.py
index b2279e107da..e84a77b7bb6 100644
--- a/homeassistant/components/sensor/yweather.py
+++ b/homeassistant/components/sensor/yweather.py
@@ -51,7 +51,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Yahoo! weather sensor."""
     from yahooweather import get_woeid, UNIT_C, UNIT_F
 
@@ -88,7 +88,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for variable in config[CONF_MONITORED_CONDITIONS]:
         dev.append(YahooWeatherSensor(yahoo_api, name, forecast, variable))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class YahooWeatherSensor(Entity):
diff --git a/homeassistant/components/sensor/zabbix.py b/homeassistant/components/sensor/zabbix.py
index 21a3030b79b..7a468a9b906 100644
--- a/homeassistant/components/sensor/zabbix.py
+++ b/homeassistant/components/sensor/zabbix.py
@@ -36,7 +36,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Zabbix sensor platform."""
     sensors = []
 
@@ -83,7 +83,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         sensor = ZabbixTriggerCountSensor(zapi)
         sensors.append(sensor)
 
-    add_devices(sensors)
+    add_entities(sensors)
 
 
 class ZabbixTriggerCountSensor(Entity):
diff --git a/homeassistant/components/sensor/zamg.py b/homeassistant/components/sensor/zamg.py
index e8e5fdec4d8..c101e4da920 100644
--- a/homeassistant/components/sensor/zamg.py
+++ b/homeassistant/components/sensor/zamg.py
@@ -71,7 +71,7 @@ PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the ZAMG sensor platform."""
     name = config.get(CONF_NAME)
     latitude = config.get(CONF_LATITUDE, hass.config.latitude)
@@ -91,8 +91,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("Received error from ZAMG: %s", err)
         return False
 
-    add_devices([ZamgSensor(probe, variable, name)
-                 for variable in config[CONF_MONITORED_CONDITIONS]], True)
+    add_entities([ZamgSensor(probe, variable, name)
+                  for variable in config[CONF_MONITORED_CONDITIONS]], True)
 
 
 class ZamgSensor(Entity):
diff --git a/homeassistant/components/sensor/zestimate.py b/homeassistant/components/sensor/zestimate.py
index d8c759f1727..a04df22cf07 100644
--- a/homeassistant/components/sensor/zestimate.py
+++ b/homeassistant/components/sensor/zestimate.py
@@ -49,7 +49,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=30)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Zestimate sensor."""
     name = config.get(CONF_NAME)
     properties = config[CONF_ZPID]
@@ -59,7 +59,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for zpid in properties:
         params['zpid'] = zpid
         sensors.append(ZestimateDataSensor(name, params))
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class ZestimateDataSensor(Entity):
diff --git a/homeassistant/components/sensor/zha.py b/homeassistant/components/sensor/zha.py
index 53e0e8d0329..6202f8cb7ef 100644
--- a/homeassistant/components/sensor/zha.py
+++ b/homeassistant/components/sensor/zha.py
@@ -18,14 +18,15 @@ DEPENDENCIES = ['zha']
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up Zigbee Home Automation sensors."""
     discovery_info = zha.get_discovery_info(hass, discovery_info)
     if discovery_info is None:
         return
 
     sensor = yield from make_sensor(discovery_info)
-    async_add_devices([sensor], update_before_add=True)
+    async_add_entities([sensor], update_before_add=True)
 
 
 @asyncio.coroutine
diff --git a/homeassistant/components/sensor/zigbee.py b/homeassistant/components/sensor/zigbee.py
index 37cc6fabe2e..a0a1b8bb7fd 100644
--- a/homeassistant/components/sensor/zigbee.py
+++ b/homeassistant/components/sensor/zigbee.py
@@ -30,7 +30,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the ZigBee platform.
 
     Uses the 'type' config value to work out which type of ZigBee sensor we're
@@ -44,7 +44,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.exception("Unknown ZigBee sensor type: %s", typ)
         return
 
-    add_devices([sensor_class(hass, config_class(config))], True)
+    add_entities([sensor_class(hass, config_class(config))], True)
 
 
 class ZigBeeTemperatureSensor(Entity):
diff --git a/homeassistant/components/sensor/zoneminder.py b/homeassistant/components/sensor/zoneminder.py
index 60b6a018fc2..80f8529d847 100644
--- a/homeassistant/components/sensor/zoneminder.py
+++ b/homeassistant/components/sensor/zoneminder.py
@@ -39,7 +39,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the ZoneMinder sensor platform."""
     include_archived = config.get(CONF_INCLUDE_ARCHIVED)
 
@@ -58,7 +58,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                                include_archived, sensor)
             )
 
-    add_devices(sensors)
+    add_entities(sensors)
 
 
 class ZMSensorMonitors(Entity):
diff --git a/homeassistant/components/switch/abode.py b/homeassistant/components/switch/abode.py
index 0ce1ddc59f8..e3f993e5413 100644
--- a/homeassistant/components/switch/abode.py
+++ b/homeassistant/components/switch/abode.py
@@ -16,7 +16,7 @@ DEPENDENCIES = ['abode']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Abode switch devices."""
     import abodepy.helpers.constants as CONST
     import abodepy.helpers.timeline as TIMELINE
@@ -43,7 +43,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     data.devices.extend(devices)
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class AbodeSwitch(AbodeDevice, SwitchDevice):
diff --git a/homeassistant/components/switch/acer_projector.py b/homeassistant/components/switch/acer_projector.py
index 527456d6d19..7abb3d1edbc 100644
--- a/homeassistant/components/switch/acer_projector.py
+++ b/homeassistant/components/switch/acer_projector.py
@@ -57,14 +57,14 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Connect with serial port and return Acer Projector."""
     serial_port = config.get(CONF_FILENAME)
     name = config.get(CONF_NAME)
     timeout = config.get(CONF_TIMEOUT)
     write_timeout = config.get(CONF_WRITE_TIMEOUT)
 
-    add_devices([AcerSwitch(serial_port, name, timeout, write_timeout)], True)
+    add_entities([AcerSwitch(serial_port, name, timeout, write_timeout)], True)
 
 
 class AcerSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/ads.py b/homeassistant/components/switch/ads.py
index b58c4d325e7..8c13e9a8960 100644
--- a/homeassistant/components/switch/ads.py
+++ b/homeassistant/components/switch/ads.py
@@ -27,14 +27,14 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up switch platform for ADS."""
     ads_hub = hass.data.get(DATA_ADS)
 
     name = config.get(CONF_NAME)
     ads_var = config.get(CONF_ADS_VAR)
 
-    add_devices([AdsSwitch(ads_hub, name, ads_var)], True)
+    add_entities([AdsSwitch(ads_hub, name, ads_var)], True)
 
 
 class AdsSwitch(ToggleEntity):
diff --git a/homeassistant/components/switch/amcrest.py b/homeassistant/components/switch/amcrest.py
index cfe33562f9f..0805793fe95 100644
--- a/homeassistant/components/switch/amcrest.py
+++ b/homeassistant/components/switch/amcrest.py
@@ -18,7 +18,8 @@ DEPENDENCIES = ['amcrest']
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the IP Amcrest camera switch platform."""
     if discovery_info is None:
         return
@@ -32,7 +33,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     for setting in switches:
         all_switches.append(AmcrestSwitch(setting, camera, name))
 
-    async_add_devices(all_switches, True)
+    async_add_entities(all_switches, True)
 
 
 class AmcrestSwitch(ToggleEntity):
diff --git a/homeassistant/components/switch/android_ip_webcam.py b/homeassistant/components/switch/android_ip_webcam.py
index 8de2ce593af..92e52c21caa 100644
--- a/homeassistant/components/switch/android_ip_webcam.py
+++ b/homeassistant/components/switch/android_ip_webcam.py
@@ -15,7 +15,8 @@ DEPENDENCIES = ['android_ip_webcam']
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the IP Webcam switch platform."""
     if discovery_info is None:
         return
@@ -30,7 +31,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     for setting in switches:
         all_switches.append(IPWebcamSettingsSwitch(name, host, ipcam, setting))
 
-    async_add_devices(all_switches, True)
+    async_add_entities(all_switches, True)
 
 
 class IPWebcamSettingsSwitch(AndroidIPCamEntity, SwitchDevice):
diff --git a/homeassistant/components/switch/anel_pwrctrl.py b/homeassistant/components/switch/anel_pwrctrl.py
index 01d27b8abcd..fadb3cd96ff 100644
--- a/homeassistant/components/switch/anel_pwrctrl.py
+++ b/homeassistant/components/switch/anel_pwrctrl.py
@@ -33,7 +33,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up PwrCtrl devices/switches."""
     host = config.get(CONF_HOST, None)
     username = config.get(CONF_USERNAME)
@@ -60,7 +60,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             for switch in device.switches.values()
         )
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class PwrCtrlSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/arduino.py b/homeassistant/components/switch/arduino.py
index 2bcb04c566e..ee8f0e878a3 100644
--- a/homeassistant/components/switch/arduino.py
+++ b/homeassistant/components/switch/arduino.py
@@ -36,7 +36,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Arduino platform."""
     # Verify that Arduino board is present
     if arduino.BOARD is None:
@@ -48,7 +48,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     switches = []
     for pinnum, pin in pins.items():
         switches.append(ArduinoSwitch(pinnum, pin))
-    add_devices(switches)
+    add_entities(switches)
 
 
 class ArduinoSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/arest.py b/homeassistant/components/switch/arest.py
index fd72d0728a0..ab445db10d8 100644
--- a/homeassistant/components/switch/arest.py
+++ b/homeassistant/components/switch/arest.py
@@ -37,7 +37,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the aREST switches."""
     resource = config.get(CONF_RESOURCE)
 
@@ -64,7 +64,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             resource, config.get(CONF_NAME, response.json()[CONF_NAME]),
             func.get(CONF_NAME), funcname))
 
-    add_devices(dev)
+    add_entities(dev)
 
 
 class ArestSwitchBase(SwitchDevice):
diff --git a/homeassistant/components/switch/bbb_gpio.py b/homeassistant/components/switch/bbb_gpio.py
index 94952ac736b..9e120beb442 100644
--- a/homeassistant/components/switch/bbb_gpio.py
+++ b/homeassistant/components/switch/bbb_gpio.py
@@ -34,14 +34,14 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the BeagleBone Black GPIO devices."""
     pins = config.get(CONF_PINS)
 
     switches = []
     for pin, params in pins.items():
         switches.append(BBBGPIOSwitch(pin, params))
-    add_devices(switches)
+    add_entities(switches)
 
 
 class BBBGPIOSwitch(ToggleEntity):
diff --git a/homeassistant/components/switch/broadlink.py b/homeassistant/components/switch/broadlink.py
index 6b754effaf1..3dd8eafcf1f 100644
--- a/homeassistant/components/switch/broadlink.py
+++ b/homeassistant/components/switch/broadlink.py
@@ -69,7 +69,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Broadlink switches."""
     import broadlink
     devices = config.get(CONF_SWITCHES)
@@ -179,7 +179,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     except socket.timeout:
         _LOGGER.error("Failed to connect to device")
 
-    add_devices(switches)
+    add_entities(switches)
 
 
 class BroadlinkRMSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/command_line.py b/homeassistant/components/switch/command_line.py
index 127c7578940..d25c5708316 100644
--- a/homeassistant/components/switch/command_line.py
+++ b/homeassistant/components/switch/command_line.py
@@ -32,7 +32,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Find and return switches controlled by shell commands."""
     devices = config.get(CONF_SWITCHES, {})
     switches = []
@@ -59,7 +59,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("No switches added")
         return False
 
-    add_devices(switches)
+    add_entities(switches)
 
 
 class CommandSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/deconz.py b/homeassistant/components/switch/deconz.py
index d5fb22e97c4..11f7f42c6c9 100644
--- a/homeassistant/components/switch/deconz.py
+++ b/homeassistant/components/switch/deconz.py
@@ -14,13 +14,13 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 DEPENDENCIES = ['deconz']
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Old way of setting up deCONZ switches."""
     pass
 
 
-async def async_setup_entry(hass, config_entry, async_add_devices):
+async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up switches for deCONZ component.
 
     Switches are based same device class as lights in deCONZ.
@@ -34,7 +34,7 @@ async def async_setup_entry(hass, config_entry, async_add_devices):
                 entities.append(DeconzPowerPlug(light))
             elif light.type in SIRENS:
                 entities.append(DeconzSiren(light))
-        async_add_devices(entities, True)
+        async_add_entities(entities, True)
 
     hass.data[DATA_DECONZ_UNSUB].append(
         async_dispatcher_connect(hass, 'deconz_new_light', async_add_switch))
diff --git a/homeassistant/components/switch/deluge.py b/homeassistant/components/switch/deluge.py
index c71c3865f5d..0ece742aa03 100644
--- a/homeassistant/components/switch/deluge.py
+++ b/homeassistant/components/switch/deluge.py
@@ -32,7 +32,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Deluge switch."""
     from deluge_client import DelugeRPCClient
 
@@ -49,7 +49,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("Connection to Deluge Daemon failed")
         raise PlatformNotReady
 
-    add_devices([DelugeSwitch(deluge_api, name)])
+    add_entities([DelugeSwitch(deluge_api, name)])
 
 
 class DelugeSwitch(ToggleEntity):
diff --git a/homeassistant/components/switch/demo.py b/homeassistant/components/switch/demo.py
index 7e22f962330..0ac2011a6dc 100644
--- a/homeassistant/components/switch/demo.py
+++ b/homeassistant/components/switch/demo.py
@@ -8,9 +8,9 @@ from homeassistant.components.switch import SwitchDevice
 from homeassistant.const import DEVICE_DEFAULT_NAME
 
 
-def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+def setup_platform(hass, config, add_entities_callback, discovery_info=None):
     """Set up the demo switches."""
-    add_devices_callback([
+    add_entities_callback([
         DemoSwitch('Decorative Lights', True, None, True),
         DemoSwitch('AC', False, 'mdi:air-conditioner', False)
     ])
diff --git a/homeassistant/components/switch/digital_ocean.py b/homeassistant/components/switch/digital_ocean.py
index 12a6aabb170..c17df81abba 100644
--- a/homeassistant/components/switch/digital_ocean.py
+++ b/homeassistant/components/switch/digital_ocean.py
@@ -27,7 +27,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Digital Ocean droplet switch."""
     digital = hass.data.get(DATA_DIGITAL_OCEAN)
     if not digital:
@@ -43,7 +43,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             return False
         dev.append(DigitalOceanSwitch(digital, droplet_id))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class DigitalOceanSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/digitalloggers.py b/homeassistant/components/switch/digitalloggers.py
index 29e6771d1d5..7bb2be19899 100644
--- a/homeassistant/components/switch/digitalloggers.py
+++ b/homeassistant/components/switch/digitalloggers.py
@@ -41,7 +41,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Find and return DIN III Relay switch."""
     import dlipower
 
@@ -69,7 +69,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         for outlet in power_switch[0:]
     )
 
-    add_devices(outlets)
+    add_entities(outlets)
 
 
 class DINRelay(SwitchDevice):
diff --git a/homeassistant/components/switch/dlink.py b/homeassistant/components/switch/dlink.py
index 9ce324ef6bb..f4eaefcae20 100644
--- a/homeassistant/components/switch/dlink.py
+++ b/homeassistant/components/switch/dlink.py
@@ -36,7 +36,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a D-Link Smart Plug."""
     from pyW215.pyW215 import SmartPlug
 
@@ -51,7 +51,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                                    username,
                                    use_legacy_protocol))
 
-    add_devices([SmartPlugSwitch(hass, data, name)], True)
+    add_entities([SmartPlugSwitch(hass, data, name)], True)
 
 
 class SmartPlugSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/doorbird.py b/homeassistant/components/switch/doorbird.py
index 92ba3640237..17a4757d4ac 100644
--- a/homeassistant/components/switch/doorbird.py
+++ b/homeassistant/components/switch/doorbird.py
@@ -46,7 +46,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the DoorBird switch platform."""
     switches = []
 
@@ -60,7 +60,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                           SWITCHES[switch]["name"].format(doorstation.name))
             switches.append(DoorBirdSwitch(device, switch, doorstation.name))
 
-    add_devices(switches)
+    add_entities(switches)
 
 
 class DoorBirdSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/edimax.py b/homeassistant/components/switch/edimax.py
index 9cd7c484886..90ad3fff57f 100644
--- a/homeassistant/components/switch/edimax.py
+++ b/homeassistant/components/switch/edimax.py
@@ -29,7 +29,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Find and return Edimax Smart Plugs."""
     from pyedimax.smartplug import SmartPlug
 
@@ -37,7 +37,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     auth = (config.get(CONF_USERNAME), config.get(CONF_PASSWORD))
     name = config.get(CONF_NAME)
 
-    add_devices([SmartPlugSwitch(SmartPlug(host, auth), name)])
+    add_entities([SmartPlugSwitch(SmartPlug(host, auth), name)])
 
 
 class SmartPlugSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/enocean.py b/homeassistant/components/switch/enocean.py
index 986744aeec1..ab979604f50 100644
--- a/homeassistant/components/switch/enocean.py
+++ b/homeassistant/components/switch/enocean.py
@@ -27,13 +27,13 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the EnOcean switch platform."""
     dev_id = config.get(CONF_ID)
     devname = config.get(CONF_NAME)
     channel = config.get(CONF_CHANNEL)
 
-    add_devices([EnOceanSwitch(dev_id, devname, channel)])
+    add_entities([EnOceanSwitch(dev_id, devname, channel)])
 
 
 class EnOceanSwitch(enocean.EnOceanDevice, ToggleEntity):
diff --git a/homeassistant/components/switch/eufy.py b/homeassistant/components/switch/eufy.py
index 7320ea8d557..a226797c0f8 100644
--- a/homeassistant/components/switch/eufy.py
+++ b/homeassistant/components/switch/eufy.py
@@ -13,11 +13,11 @@ DEPENDENCIES = ['eufy']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Eufy switches."""
     if discovery_info is None:
         return
-    add_devices([EufySwitch(discovery_info)], True)
+    add_entities([EufySwitch(discovery_info)], True)
 
 
 class EufySwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/flux.py b/homeassistant/components/switch/flux.py
index 7df8f0e1aa6..15fdee59eaf 100644
--- a/homeassistant/components/switch/flux.py
+++ b/homeassistant/components/switch/flux.py
@@ -95,7 +95,7 @@ def set_lights_rgb(hass, lights, rgb, transition):
                     transition=transition)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Flux switches."""
     name = config.get(CONF_NAME)
     lights = config.get(CONF_LIGHTS)
@@ -113,7 +113,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                       start_colortemp, sunset_colortemp, stop_colortemp,
                       brightness, disable_brightness_adjust, mode, interval,
                       transition)
-    add_devices([flux])
+    add_entities([flux])
 
     def update(call=None):
         """Update lights."""
diff --git a/homeassistant/components/switch/fritzbox.py b/homeassistant/components/switch/fritzbox.py
index 65a1aa6aabc..55fa8a04796 100644
--- a/homeassistant/components/switch/fritzbox.py
+++ b/homeassistant/components/switch/fritzbox.py
@@ -25,7 +25,7 @@ ATTR_TOTAL_CONSUMPTION_UNIT_VALUE = 'kWh'
 ATTR_TEMPERATURE_UNIT = 'temperature_unit'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Fritzbox smarthome switch platform."""
     devices = []
     fritz_list = hass.data[FRITZBOX_DOMAIN]
@@ -36,7 +36,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             if device.has_switch:
                 devices.append(FritzboxSwitch(device, fritz))
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class FritzboxSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/fritzdect.py b/homeassistant/components/switch/fritzdect.py
index 36a53edefc9..a04de7618af 100644
--- a/homeassistant/components/switch/fritzdect.py
+++ b/homeassistant/components/switch/fritzdect.py
@@ -40,7 +40,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Add all switches connected to Fritz Box."""
     from fritzhome.fritz import FritzBox
 
@@ -62,7 +62,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         if actor.has_switch:
             data = FritzDectSwitchData(fritz, actor.actor_id)
             data.is_online = True
-            add_devices([FritzDectSwitch(hass, data, actor.name)], True)
+            add_entities([FritzDectSwitch(hass, data, actor.name)], True)
 
 
 class FritzDectSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/gc100.py b/homeassistant/components/switch/gc100.py
index 34a29483d3c..2a8e7eaa847 100644
--- a/homeassistant/components/switch/gc100.py
+++ b/homeassistant/components/switch/gc100.py
@@ -23,7 +23,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the GC100 devices."""
     switches = []
     ports = config.get(CONF_PORTS)
@@ -31,7 +31,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         for port_addr, port_name in port.items():
             switches.append(GC100Switch(
                 port_name, port_addr, hass.data[DATA_GC100]))
-    add_devices(switches, True)
+    add_entities(switches, True)
 
 
 class GC100Switch(ToggleEntity):
diff --git a/homeassistant/components/switch/hdmi_cec.py b/homeassistant/components/switch/hdmi_cec.py
index e81c09894ab..b2697b4a2c4 100644
--- a/homeassistant/components/switch/hdmi_cec.py
+++ b/homeassistant/components/switch/hdmi_cec.py
@@ -18,13 +18,13 @@ _LOGGER = logging.getLogger(__name__)
 ENTITY_ID_FORMAT = DOMAIN + '.{}'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Find and return HDMI devices as switches."""
     if ATTR_NEW in discovery_info:
         _LOGGER.info("Setting up HDMI devices %s", discovery_info[ATTR_NEW])
-        add_devices(CecSwitchDevice(hass, hass.data.get(device),
-                                    hass.data.get(device).logical_address) for
-                    device in discovery_info[ATTR_NEW])
+        add_entities(CecSwitchDevice(hass, hass.data.get(device),
+                                     hass.data.get(device).logical_address) for
+                     device in discovery_info[ATTR_NEW])
 
 
 class CecSwitchDevice(CecDevice, SwitchDevice):
diff --git a/homeassistant/components/switch/hikvisioncam.py b/homeassistant/components/switch/hikvisioncam.py
index c3e065abc0e..3a3dec26e1d 100644
--- a/homeassistant/components/switch/hikvisioncam.py
+++ b/homeassistant/components/switch/hikvisioncam.py
@@ -34,7 +34,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Hikvision camera."""
     import hikvision.api
     from hikvision.error import HikvisionError, MissingParamError
@@ -56,7 +56,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGING.error("Unable to connect: %s", conn_err)
         return False
 
-    add_devices([HikvisionMotionSwitch(name, hikvision_cam)])
+    add_entities([HikvisionMotionSwitch(name, hikvision_cam)])
 
 
 class HikvisionMotionSwitch(ToggleEntity):
diff --git a/homeassistant/components/switch/hive.py b/homeassistant/components/switch/hive.py
index 49fc9696b5e..1927df28e97 100644
--- a/homeassistant/components/switch/hive.py
+++ b/homeassistant/components/switch/hive.py
@@ -10,13 +10,13 @@ from homeassistant.components.hive import DATA_HIVE
 DEPENDENCIES = ['hive']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Hive switches."""
     if discovery_info is None:
         return
     session = hass.data.get(DATA_HIVE)
 
-    add_devices([HiveDevicePlug(session, discovery_info)])
+    add_entities([HiveDevicePlug(session, discovery_info)])
 
 
 class HiveDevicePlug(SwitchDevice):
diff --git a/homeassistant/components/switch/homekit_controller.py b/homeassistant/components/switch/homekit_controller.py
index 3293c8fe195..a3db6060fcf 100644
--- a/homeassistant/components/switch/homekit_controller.py
+++ b/homeassistant/components/switch/homekit_controller.py
@@ -15,11 +15,11 @@ DEPENDENCIES = ['homekit_controller']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Homekit switch support."""
     if discovery_info is not None:
         accessory = hass.data[KNOWN_ACCESSORIES][discovery_info['serial']]
-        add_devices([HomeKitSwitch(accessory, discovery_info)], True)
+        add_entities([HomeKitSwitch(accessory, discovery_info)], True)
 
 
 class HomeKitSwitch(HomeKitEntity, SwitchDevice):
diff --git a/homeassistant/components/switch/homematic.py b/homeassistant/components/switch/homematic.py
index 2cd4145e87a..b5921819ea4 100644
--- a/homeassistant/components/switch/homematic.py
+++ b/homeassistant/components/switch/homematic.py
@@ -15,7 +15,7 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['homematic']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the HomeMatic switch platform."""
     if discovery_info is None:
         return
@@ -25,7 +25,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         new_device = HMSwitch(conf)
         devices.append(new_device)
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class HMSwitch(HMDevice, SwitchDevice):
diff --git a/homeassistant/components/switch/homematicip_cloud.py b/homeassistant/components/switch/homematicip_cloud.py
index 3211cecabfc..e066c861dfb 100644
--- a/homeassistant/components/switch/homematicip_cloud.py
+++ b/homeassistant/components/switch/homematicip_cloud.py
@@ -21,12 +21,12 @@ ATTR_PROFILE_MODE = 'profile_mode'
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the HomematicIP Cloud switch devices."""
     pass
 
 
-async def async_setup_entry(hass, config_entry, async_add_devices):
+async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the HomematicIP switch from a config entry."""
     from homematicip.device import (
         PlugableSwitch, PlugableSwitchMeasuring, BrandSwitchMeasuring)
@@ -45,7 +45,7 @@ async def async_setup_entry(hass, config_entry, async_add_devices):
             devices.append(HomematicipSwitch(home, device))
 
     if devices:
-        async_add_devices(devices)
+        async_add_entities(devices)
 
 
 class HomematicipSwitch(HomematicipGenericDevice, SwitchDevice):
diff --git a/homeassistant/components/switch/hook.py b/homeassistant/components/switch/hook.py
index 07425840b9a..5a86346aa76 100644
--- a/homeassistant/components/switch/hook.py
+++ b/homeassistant/components/switch/hook.py
@@ -32,7 +32,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up Hook by getting the access token and list of actions."""
     username = config.get(CONF_USERNAME)
     password = config.get(CONF_PASSWORD)
@@ -70,7 +71,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         _LOGGER.error("Failed getting devices: %s", error)
         return False
 
-    async_add_devices(
+    async_add_entities(
         HookSmartHome(
             hass,
             token,
diff --git a/homeassistant/components/switch/hydrawise.py b/homeassistant/components/switch/hydrawise.py
index d0abe5febf5..6b73333431d 100644
--- a/homeassistant/components/switch/hydrawise.py
+++ b/homeassistant/components/switch/hydrawise.py
@@ -28,7 +28,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a sensor for a Hydrawise device."""
     hydrawise = hass.data[DATA_HYDRAWISE].data
 
@@ -43,7 +43,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                                 zone,
                                 sensor_type))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class HydrawiseSwitch(HydrawiseEntity, SwitchDevice):
diff --git a/homeassistant/components/switch/ihc.py b/homeassistant/components/switch/ihc.py
index f744519e430..4ddafa228a7 100644
--- a/homeassistant/components/switch/ihc.py
+++ b/homeassistant/components/switch/ihc.py
@@ -25,7 +25,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the IHC switch platform."""
     ihc_controller = hass.data[IHC_DATA][IHC_CONTROLLER]
     info = hass.data[IHC_DATA][IHC_INFO]
@@ -44,7 +44,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             sensor = IHCSwitch(ihc_controller, name, ihc_id, info)
             devices.append(sensor)
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class IHCSwitch(IHCDevice, SwitchDevice):
diff --git a/homeassistant/components/switch/insteon.py b/homeassistant/components/switch/insteon.py
index 8575b16c69b..744d278d394 100644
--- a/homeassistant/components/switch/insteon.py
+++ b/homeassistant/components/switch/insteon.py
@@ -16,7 +16,8 @@ _LOGGER = logging.getLogger(__name__)
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the INSTEON device class for the hass platform."""
     insteon_modem = hass.data['insteon'].get('modem')
 
@@ -36,7 +37,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         new_entity = InsteonSwitchDevice(device, state_key)
 
     if new_entity is not None:
-        async_add_devices([new_entity])
+        async_add_entities([new_entity])
 
 
 class InsteonSwitchDevice(InsteonEntity, SwitchDevice):
diff --git a/homeassistant/components/switch/isy994.py b/homeassistant/components/switch/isy994.py
index 2a7dee87747..6bb9c07de5b 100644
--- a/homeassistant/components/switch/isy994.py
+++ b/homeassistant/components/switch/isy994.py
@@ -16,7 +16,7 @@ _LOGGER = logging.getLogger(__name__)
 
 
 def setup_platform(hass, config: ConfigType,
-                   add_devices: Callable[[list], None], discovery_info=None):
+                   add_entities: Callable[[list], None], discovery_info=None):
     """Set up the ISY994 switch platform."""
     devices = []
     for node in hass.data[ISY994_NODES][DOMAIN]:
@@ -26,7 +26,7 @@ def setup_platform(hass, config: ConfigType,
     for name, status, actions in hass.data[ISY994_PROGRAMS][DOMAIN]:
         devices.append(ISYSwitchProgram(name, status, actions))
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class ISYSwitchDevice(ISYDevice, SwitchDevice):
diff --git a/homeassistant/components/switch/kankun.py b/homeassistant/components/switch/kankun.py
index c830e2299f6..59966739b91 100644
--- a/homeassistant/components/switch/kankun.py
+++ b/homeassistant/components/switch/kankun.py
@@ -34,7 +34,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+def setup_platform(hass, config, add_entities_callback, discovery_info=None):
     """Set up Kankun Wifi switches."""
     switches = config.get('switches', {})
     devices = []
@@ -50,7 +50,7 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
                 properties.get(CONF_USERNAME, None),
                 properties.get(CONF_PASSWORD)))
 
-    add_devices_callback(devices)
+    add_entities_callback(devices)
 
 
 class KankunSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/knx.py b/homeassistant/components/switch/knx.py
index 4e0b29301fb..af60cee127a 100644
--- a/homeassistant/components/switch/knx.py
+++ b/homeassistant/components/switch/knx.py
@@ -26,27 +26,27 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up switch(es) for KNX platform."""
     if discovery_info is not None:
-        async_add_devices_discovery(hass, discovery_info, async_add_devices)
+        async_add_entities_discovery(hass, discovery_info, async_add_entities)
     else:
-        async_add_devices_config(hass, config, async_add_devices)
+        async_add_entities_config(hass, config, async_add_entities)
 
 
 @callback
-def async_add_devices_discovery(hass, discovery_info, async_add_devices):
+def async_add_entities_discovery(hass, discovery_info, async_add_entities):
     """Set up switches for KNX platform configured via xknx.yaml."""
     entities = []
     for device_name in discovery_info[ATTR_DISCOVER_DEVICES]:
         device = hass.data[DATA_KNX].xknx.devices[device_name]
         entities.append(KNXSwitch(hass, device))
-    async_add_devices(entities)
+    async_add_entities(entities)
 
 
 @callback
-def async_add_devices_config(hass, config, async_add_devices):
+def async_add_entities_config(hass, config, async_add_entities):
     """Set up switch for KNX platform configured within platform."""
     import xknx
     switch = xknx.devices.Switch(
@@ -55,7 +55,7 @@ def async_add_devices_config(hass, config, async_add_devices):
         group_address=config.get(CONF_ADDRESS),
         group_address_state=config.get(CONF_STATE_ADDRESS))
     hass.data[DATA_KNX].xknx.devices.add(switch)
-    async_add_devices([KNXSwitch(hass, switch)])
+    async_add_entities([KNXSwitch(hass, switch)])
 
 
 class KNXSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/konnected.py b/homeassistant/components/switch/konnected.py
index 06d3385f567..c085d0bb0a5 100644
--- a/homeassistant/components/switch/konnected.py
+++ b/homeassistant/components/switch/konnected.py
@@ -19,7 +19,7 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['konnected']
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set switches attached to a Konnected device."""
     if discovery_info is None:
@@ -31,7 +31,7 @@ async def async_setup_platform(hass, config, async_add_devices,
     switches = [
         KonnectedSwitch(device_id, pin_data.get(CONF_PIN), pin_data, client)
         for pin_data in data[CONF_DEVICES][device_id][CONF_SWITCHES]]
-    async_add_devices(switches)
+    async_add_entities(switches)
 
 
 class KonnectedSwitch(ToggleEntity):
diff --git a/homeassistant/components/switch/linode.py b/homeassistant/components/switch/linode.py
index 43f4bdc31b4..47bba280e1c 100644
--- a/homeassistant/components/switch/linode.py
+++ b/homeassistant/components/switch/linode.py
@@ -26,7 +26,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Linode Node switch."""
     linode = hass.data.get(DATA_LINODE)
     nodes = config.get(CONF_NODES)
@@ -39,7 +39,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             return
         dev.append(LinodeSwitch(linode, node_id))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class LinodeSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/litejet.py b/homeassistant/components/switch/litejet.py
index 79ef4a5fd7f..b9755569fd2 100644
--- a/homeassistant/components/switch/litejet.py
+++ b/homeassistant/components/switch/litejet.py
@@ -16,7 +16,7 @@ ATTR_NUMBER = 'number'
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the LiteJet switch platform."""
     litejet_ = hass.data['litejet_system']
 
@@ -25,7 +25,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         name = litejet_.get_switch_name(i)
         if not litejet.is_ignored(hass, name):
             devices.append(LiteJetSwitch(hass, litejet_, i, name))
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class LiteJetSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/lutron_caseta.py b/homeassistant/components/switch/lutron_caseta.py
index f5e7cf2836f..8587c78a5d5 100644
--- a/homeassistant/components/switch/lutron_caseta.py
+++ b/homeassistant/components/switch/lutron_caseta.py
@@ -17,7 +17,8 @@ DEPENDENCIES = ['lutron_caseta']
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up Lutron switch."""
     devs = []
     bridge = hass.data[LUTRON_CASETA_SMARTBRIDGE]
@@ -27,7 +28,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         dev = LutronCasetaLight(switch_device, bridge)
         devs.append(dev)
 
-    async_add_devices(devs, True)
+    async_add_entities(devs, True)
     return True
 
 
diff --git a/homeassistant/components/switch/mfi.py b/homeassistant/components/switch/mfi.py
index 2c547fa210f..521230ccbd5 100644
--- a/homeassistant/components/switch/mfi.py
+++ b/homeassistant/components/switch/mfi.py
@@ -39,7 +39,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up mFi sensors."""
     host = config.get(CONF_HOST)
     username = config.get(CONF_USERNAME)
@@ -58,10 +58,10 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("Unable to connect to mFi: %s", str(ex))
         return False
 
-    add_devices(MfiSwitch(port)
-                for device in client.get_devices()
-                for port in device.ports.values()
-                if port.model in SWITCH_MODELS)
+    add_entities(MfiSwitch(port)
+                 for device in client.get_devices()
+                 for port in device.ports.values()
+                 if port.model in SWITCH_MODELS)
 
 
 class MfiSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/mochad.py b/homeassistant/components/switch/mochad.py
index bb3b9c0ea65..b703d91be34 100644
--- a/homeassistant/components/switch/mochad.py
+++ b/homeassistant/components/switch/mochad.py
@@ -29,10 +29,10 @@ PLATFORM_SCHEMA = vol.Schema({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up X10 switches over a mochad controller."""
     devs = config.get(CONF_DEVICES)
-    add_devices([MochadSwitch(
+    add_entities([MochadSwitch(
         hass, mochad.CONTROLLER.ctrl, dev) for dev in devs])
     return True
 
diff --git a/homeassistant/components/switch/modbus.py b/homeassistant/components/switch/modbus.py
index 94e1d7ea6d6..a8c8358f0cf 100644
--- a/homeassistant/components/switch/modbus.py
+++ b/homeassistant/components/switch/modbus.py
@@ -59,7 +59,7 @@ PLATFORM_SCHEMA = vol.All(
     }))
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Read configuration and create Modbus devices."""
     switches = []
     if CONF_COILS in config:
@@ -81,7 +81,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                 register.get(CONF_REGISTER_TYPE),
                 register.get(CONF_STATE_ON),
                 register.get(CONF_STATE_OFF)))
-    add_devices(switches)
+    add_entities(switches)
 
 
 class ModbusCoilSwitch(ToggleEntity):
diff --git a/homeassistant/components/switch/mqtt.py b/homeassistant/components/switch/mqtt.py
index eb91f8d846a..f6075d5e49f 100644
--- a/homeassistant/components/switch/mqtt.py
+++ b/homeassistant/components/switch/mqtt.py
@@ -46,7 +46,7 @@ PLATFORM_SCHEMA = mqtt.MQTT_RW_PLATFORM_SCHEMA.extend({
 }).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the MQTT switch."""
     if discovery_info is not None:
@@ -56,7 +56,7 @@ async def async_setup_platform(hass, config, async_add_devices,
     if value_template is not None:
         value_template.hass = hass
 
-    async_add_devices([MqttSwitch(
+    async_add_entities([MqttSwitch(
         config.get(CONF_NAME),
         config.get(CONF_ICON),
         config.get(CONF_STATE_TOPIC),
diff --git a/homeassistant/components/switch/mysensors.py b/homeassistant/components/switch/mysensors.py
index 340eed83b56..20e50518df8 100644
--- a/homeassistant/components/switch/mysensors.py
+++ b/homeassistant/components/switch/mysensors.py
@@ -21,7 +21,7 @@ SEND_IR_CODE_SERVICE_SCHEMA = vol.Schema({
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the mysensors platform for switches."""
     device_class_map = {
         'S_DOOR': MySensorsSwitch,
@@ -40,7 +40,7 @@ async def async_setup_platform(
     }
     mysensors.setup_mysensors_platform(
         hass, DOMAIN, discovery_info, device_class_map,
-        async_add_devices=async_add_devices)
+        async_add_entities=async_add_entities)
 
     async def async_send_ir_code_service(service):
         """Set IR code as device state attribute."""
diff --git a/homeassistant/components/switch/mystrom.py b/homeassistant/components/switch/mystrom.py
index 85fc546d00e..a0058cb925c 100644
--- a/homeassistant/components/switch/mystrom.py
+++ b/homeassistant/components/switch/mystrom.py
@@ -24,7 +24,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Find and return myStrom switch."""
     from pymystrom.switch import MyStromPlug, exceptions
 
@@ -37,7 +37,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("No route to device: %s", host)
         return
 
-    add_devices([MyStromSwitch(name, host)])
+    add_entities([MyStromSwitch(name, host)])
 
 
 class MyStromSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/neato.py b/homeassistant/components/switch/neato.py
index 34dad9bb581..d9850c1589a 100644
--- a/homeassistant/components/switch/neato.py
+++ b/homeassistant/components/switch/neato.py
@@ -24,14 +24,14 @@ SWITCH_TYPES = {
 }
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Neato switches."""
     dev = []
     for robot in hass.data[NEATO_ROBOTS]:
         for type_name in SWITCH_TYPES:
             dev.append(NeatoConnectedSwitch(hass, robot, type_name))
     _LOGGER.debug("Adding switches %s", dev)
-    add_devices(dev)
+    add_entities(dev)
 
 
 class NeatoConnectedSwitch(ToggleEntity):
diff --git a/homeassistant/components/switch/netio.py b/homeassistant/components/switch/netio.py
index 365bbaa3679..2ccb4501d73 100644
--- a/homeassistant/components/switch/netio.py
+++ b/homeassistant/components/switch/netio.py
@@ -49,7 +49,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Netio platform."""
     from pynetio import Netio
 
@@ -73,7 +73,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             DEVICES[host].netio, key, config[CONF_OUTLETS][key])
         DEVICES[host].entities.append(switch)
 
-    add_devices(DEVICES[host].entities)
+    add_entities(DEVICES[host].entities)
 
     hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, dispose)
     return True
diff --git a/homeassistant/components/switch/orvibo.py b/homeassistant/components/switch/orvibo.py
index fdb4752f594..9e6686ca3ae 100644
--- a/homeassistant/components/switch/orvibo.py
+++ b/homeassistant/components/switch/orvibo.py
@@ -31,7 +31,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+def setup_platform(hass, config, add_entities_callback, discovery_info=None):
     """Set up S20 switches."""
     from orvibo.s20 import discover, S20, S20Exception
 
@@ -54,7 +54,7 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
         except S20Exception:
             _LOGGER.error("S20 at %s couldn't be initialized", host)
 
-    add_devices_callback(switches)
+    add_entities_callback(switches)
 
 
 class S20Switch(SwitchDevice):
diff --git a/homeassistant/components/switch/pilight.py b/homeassistant/components/switch/pilight.py
index 7ffce13ff6a..8ae8e64c2ff 100644
--- a/homeassistant/components/switch/pilight.py
+++ b/homeassistant/components/switch/pilight.py
@@ -60,7 +60,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Pilight platform."""
     switches = config.get(CONF_SWITCHES)
     devices = []
@@ -77,7 +77,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             )
         )
 
-    add_devices(devices)
+    add_entities(devices)
 
 
 class _ReceiveHandle:
diff --git a/homeassistant/components/switch/pulseaudio_loopback.py b/homeassistant/components/switch/pulseaudio_loopback.py
index 06f2ee5f550..f112608d760 100644
--- a/homeassistant/components/switch/pulseaudio_loopback.py
+++ b/homeassistant/components/switch/pulseaudio_loopback.py
@@ -54,7 +54,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Read in all of our configuration, and initialize the loopback switch."""
     name = config.get(CONF_NAME)
     sink_name = config.get(CONF_SINK_NAME)
@@ -72,7 +72,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         server = PAServer(host, port, buffer_size, tcp_timeout)
         _PULSEAUDIO_SERVERS[server_id] = server
 
-    add_devices([PALoopbackSwitch(hass, name, server, sink_name, source_name)])
+    add_entities([
+        PALoopbackSwitch(hass, name, server, sink_name, source_name)])
 
 
 class PAServer():
diff --git a/homeassistant/components/switch/qwikswitch.py b/homeassistant/components/switch/qwikswitch.py
index 193c2722534..3b8e6d74df2 100644
--- a/homeassistant/components/switch/qwikswitch.py
+++ b/homeassistant/components/switch/qwikswitch.py
@@ -11,14 +11,14 @@ from homeassistant.components.switch import SwitchDevice
 DEPENDENCIES = [QWIKSWITCH]
 
 
-async def async_setup_platform(hass, _, add_devices, discovery_info=None):
+async def async_setup_platform(hass, _, add_entities, discovery_info=None):
     """Add switches from the main Qwikswitch component."""
     if discovery_info is None:
         return
 
     qsusb = hass.data[QWIKSWITCH]
     devs = [QSSwitch(qsid, qsusb) for qsid in discovery_info[QWIKSWITCH]]
-    add_devices(devs)
+    add_entities(devs)
 
 
 class QSSwitch(QSToggleEntity, SwitchDevice):
diff --git a/homeassistant/components/switch/rachio.py b/homeassistant/components/switch/rachio.py
index 5f0ca995c90..956befeeb9f 100644
--- a/homeassistant/components/switch/rachio.py
+++ b/homeassistant/components/switch/rachio.py
@@ -47,7 +47,7 @@ ATTR_ZONE_SUMMARY = 'Summary'
 ATTR_ZONE_NUMBER = 'Zone number'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Rachio switches."""
     manual_run_time = timedelta(minutes=config.get(CONF_MANUAL_RUN_MINS))
     _LOGGER.info("Rachio run time is %s", str(manual_run_time))
@@ -60,7 +60,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         for zone in controller.list_zones():
             devices.append(RachioZone(hass, controller, zone, manual_run_time))
 
-    add_devices(devices)
+    add_entities(devices)
     _LOGGER.info("%d Rachio switch(es) added", len(devices))
 
 
diff --git a/homeassistant/components/switch/rainbird.py b/homeassistant/components/switch/rainbird.py
index 9aa24b9360b..86f25102f70 100644
--- a/homeassistant/components/switch/rainbird.py
+++ b/homeassistant/components/switch/rainbird.py
@@ -33,14 +33,14 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Rain Bird switches over a Rain Bird controller."""
     controller = hass.data[DATA_RAINBIRD]
 
     devices = []
     for dev_id, switch in config.get(CONF_SWITCHES).items():
         devices.append(RainBirdSwitch(controller, switch, dev_id))
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class RainBirdSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/raincloud.py b/homeassistant/components/switch/raincloud.py
index a4bac8fee1c..969169edc64 100644
--- a/homeassistant/components/switch/raincloud.py
+++ b/homeassistant/components/switch/raincloud.py
@@ -28,7 +28,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a sensor for a raincloud device."""
     raincloud = hass.data[DATA_RAINCLOUD].data
     default_watering_timer = config.get(CONF_WATERING_TIME)
@@ -42,7 +42,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                                 zone,
                                 sensor_type))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
     return True
 
 
diff --git a/homeassistant/components/switch/rainmachine.py b/homeassistant/components/switch/rainmachine.py
index b0cdf334cfa..633a3e50a09 100644
--- a/homeassistant/components/switch/rainmachine.py
+++ b/homeassistant/components/switch/rainmachine.py
@@ -100,7 +100,7 @@ VEGETATION_MAP = {
 
 
 async def async_setup_platform(
-        hass, config, async_add_devices, discovery_info=None):
+        hass, config, async_add_entities, discovery_info=None):
     """Set up the RainMachine Switch platform."""
     if discovery_info is None:
         return
@@ -129,7 +129,7 @@ async def async_setup_platform(
         _LOGGER.debug('Adding zone: %s', zone)
         entities.append(RainMachineZone(rainmachine, zone, zone_run_time))
 
-    async_add_devices(entities, True)
+    async_add_entities(entities, True)
 
 
 class RainMachineSwitch(RainMachineEntity, SwitchDevice):
diff --git a/homeassistant/components/switch/raspihats.py b/homeassistant/components/switch/raspihats.py
index 7173ad35daf..c697d7042a6 100644
--- a/homeassistant/components/switch/raspihats.py
+++ b/homeassistant/components/switch/raspihats.py
@@ -39,7 +39,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the raspihats switch devices."""
     I2CHatSwitch.I2C_HATS_MANAGER = hass.data[I2C_HATS_MANAGER]
     switches = []
@@ -62,7 +62,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             _LOGGER.error(
                 "Failed to register %s I2CHat@%s %s", board, hex(address),
                 str(ex))
-    add_devices(switches)
+    add_entities(switches)
 
 
 class I2CHatSwitch(ToggleEntity):
diff --git a/homeassistant/components/switch/rest.py b/homeassistant/components/switch/rest.py
index 914408406a9..0e00bfe7844 100644
--- a/homeassistant/components/switch/rest.py
+++ b/homeassistant/components/switch/rest.py
@@ -48,7 +48,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the RESTful switch."""
     body_off = config.get(CONF_BODY_OFF)
     body_on = config.get(CONF_BODY_ON)
@@ -80,7 +81,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         if req.status >= 400:
             _LOGGER.error("Got non-ok response from resource: %s", req.status)
         else:
-            async_add_devices([switch])
+            async_add_entities([switch])
     except (TypeError, ValueError):
         _LOGGER.error("Missing resource or schema in configuration. "
                       "Add http:// or https:// to your URL")
diff --git a/homeassistant/components/switch/rflink.py b/homeassistant/components/switch/rflink.py
index 366cb397d5b..370436b3184 100644
--- a/homeassistant/components/switch/rflink.py
+++ b/homeassistant/components/switch/rflink.py
@@ -86,9 +86,10 @@ def devices_from_config(domain_config, hass=None):
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Rflink platform."""
-    async_add_devices(devices_from_config(config, hass))
+    async_add_entities(devices_from_config(config, hass))
 
 
 class RflinkSwitch(SwitchableRflinkDevice, SwitchDevice):
diff --git a/homeassistant/components/switch/rfxtrx.py b/homeassistant/components/switch/rfxtrx.py
index 17b5c8e40d5..c0f057da138 100644
--- a/homeassistant/components/switch/rfxtrx.py
+++ b/homeassistant/components/switch/rfxtrx.py
@@ -33,13 +33,13 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+def setup_platform(hass, config, add_entities_callback, discovery_info=None):
     """Set up the RFXtrx platform."""
     import RFXtrx as rfxtrxmod
 
     # Add switch from config file
     switches = rfxtrx.get_devices_from_config(config, RfxtrxSwitch)
-    add_devices_callback(switches)
+    add_entities_callback(switches)
 
     def switch_update(event):
         """Handle sensor updates from the RFXtrx gateway."""
@@ -50,7 +50,7 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
 
         new_device = rfxtrx.get_new_device(event, config, RfxtrxSwitch)
         if new_device:
-            add_devices_callback([new_device])
+            add_entities_callback([new_device])
 
         rfxtrx.apply_received_command(event)
 
diff --git a/homeassistant/components/switch/rpi_gpio.py b/homeassistant/components/switch/rpi_gpio.py
index 300af4be61d..3dec1135ec8 100644
--- a/homeassistant/components/switch/rpi_gpio.py
+++ b/homeassistant/components/switch/rpi_gpio.py
@@ -34,7 +34,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Raspberry PI GPIO devices."""
     invert_logic = config.get(CONF_INVERT_LOGIC)
 
@@ -42,7 +42,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     ports = config.get(CONF_PORTS)
     for port, name in ports.items():
         switches.append(RPiGPIOSwitch(name, port, invert_logic))
-    add_devices(switches)
+    add_entities(switches)
 
 
 class RPiGPIOSwitch(ToggleEntity):
diff --git a/homeassistant/components/switch/rpi_pfio.py b/homeassistant/components/switch/rpi_pfio.py
index dad0c7c59ba..8b0871ca800 100644
--- a/homeassistant/components/switch/rpi_pfio.py
+++ b/homeassistant/components/switch/rpi_pfio.py
@@ -36,7 +36,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the PiFace Digital Output devices."""
     switches = []
     ports = config.get(CONF_PORTS)
@@ -45,7 +45,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         invert_logic = port_entity[ATTR_INVERT_LOGIC]
 
         switches.append(RPiPFIOSwitch(port, name, invert_logic))
-    add_devices(switches)
+    add_entities(switches)
 
 
 class RPiPFIOSwitch(ToggleEntity):
diff --git a/homeassistant/components/switch/rpi_rf.py b/homeassistant/components/switch/rpi_rf.py
index 03f11de21f7..ffadc0d38de 100644
--- a/homeassistant/components/switch/rpi_rf.py
+++ b/homeassistant/components/switch/rpi_rf.py
@@ -45,7 +45,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 # pylint: disable=no-member
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Find and return switches controlled by a generic RF device via GPIO."""
     import rpi_rf
     from threading import RLock
@@ -72,7 +72,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     if devices:
         rfdevice.enable_tx()
 
-    add_devices(devices)
+    add_entities(devices)
 
     hass.bus.listen_once(
         EVENT_HOMEASSISTANT_STOP, lambda event: rfdevice.cleanup())
diff --git a/homeassistant/components/switch/scsgate.py b/homeassistant/components/switch/scsgate.py
index b549f351afc..bb8c067ebd9 100644
--- a/homeassistant/components/switch/scsgate.py
+++ b/homeassistant/components/switch/scsgate.py
@@ -28,17 +28,17 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the SCSGate switches."""
     logger = logging.getLogger(__name__)
 
     _setup_traditional_switches(
-        logger=logger, config=config, add_devices_callback=add_devices)
+        logger=logger, config=config, add_entities_callback=add_entities)
 
     _setup_scenario_switches(logger=logger, config=config, hass=hass)
 
 
-def _setup_traditional_switches(logger, config, add_devices_callback):
+def _setup_traditional_switches(logger, config, add_entities_callback):
     """Add traditional SCSGate switches."""
     traditional = config.get(CONF_TRADITIONAL)
     switches = []
@@ -56,7 +56,7 @@ def _setup_traditional_switches(logger, config, add_devices_callback):
             switch = SCSGateSwitch(name=name, scs_id=scs_id, logger=logger)
             switches.append(switch)
 
-    add_devices_callback(switches)
+    add_entities_callback(switches)
     scsgate.SCSGATE.add_devices_to_register(switches)
 
 
diff --git a/homeassistant/components/switch/skybell.py b/homeassistant/components/switch/skybell.py
index 726a5e7446e..9d791aa3df3 100644
--- a/homeassistant/components/switch/skybell.py
+++ b/homeassistant/components/switch/skybell.py
@@ -34,7 +34,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the platform for a Skybell device."""
     skybell = hass.data.get(SKYBELL_DOMAIN)
 
@@ -43,7 +43,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         for device in skybell.get_devices():
             sensors.append(SkybellSwitch(device, switch_type))
 
-    add_devices(sensors, True)
+    add_entities(sensors, True)
 
 
 class SkybellSwitch(SkybellDevice, SwitchDevice):
diff --git a/homeassistant/components/switch/smappee.py b/homeassistant/components/switch/smappee.py
index fd8f141500b..fc2716b8019 100644
--- a/homeassistant/components/switch/smappee.py
+++ b/homeassistant/components/switch/smappee.py
@@ -16,7 +16,7 @@ _LOGGER = logging.getLogger(__name__)
 ICON = 'mdi:power-plug'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Smappee Comfort Plugs."""
     smappee = hass.data[DATA_SMAPPEE]
 
@@ -37,7 +37,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                                      items.get('value'),
                                      None,
                                      items.get('key')))
-    add_devices(dev)
+    add_entities(dev)
 
 
 class SmappeeSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/snmp.py b/homeassistant/components/switch/snmp.py
index 9c84584e833..f208c24286d 100644
--- a/homeassistant/components/switch/snmp.py
+++ b/homeassistant/components/switch/snmp.py
@@ -52,7 +52,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the SNMP switch."""
     name = config.get(CONF_NAME)
     host = config.get(CONF_HOST)
@@ -66,7 +66,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     payload_on = config.get(CONF_PAYLOAD_ON)
     payload_off = config.get(CONF_PAYLOAD_OFF)
 
-    add_devices(
+    add_entities(
         [SnmpSwitch(name, host, port, community, baseoid, command_oid, version,
                     payload_on, payload_off,
                     command_payload_on, command_payload_off)], True)
diff --git a/homeassistant/components/switch/spider.py b/homeassistant/components/switch/spider.py
index 94b7db8f1e5..f4bf74ad010 100644
--- a/homeassistant/components/switch/spider.py
+++ b/homeassistant/components/switch/spider.py
@@ -15,7 +15,7 @@ DEPENDENCIES = ['spider']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Spider thermostat."""
     if discovery_info is None:
         return
@@ -23,7 +23,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     devices = [SpiderPowerPlug(hass.data[SPIDER_DOMAIN]['controller'], device)
                for device in hass.data[SPIDER_DOMAIN]['power_plugs']]
 
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class SpiderPowerPlug(SwitchDevice):
diff --git a/homeassistant/components/switch/tahoma.py b/homeassistant/components/switch/tahoma.py
index aa3554a494c..2904f06b432 100644
--- a/homeassistant/components/switch/tahoma.py
+++ b/homeassistant/components/switch/tahoma.py
@@ -18,13 +18,13 @@ DEPENDENCIES = ['tahoma']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Tahoma switches."""
     controller = hass.data[TAHOMA_DOMAIN]['controller']
     devices = []
     for switch in hass.data[TAHOMA_DOMAIN]['devices']['switch']:
         devices.append(TahomaSwitch(switch, controller))
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class TahomaSwitch(TahomaDevice, SwitchDevice):
diff --git a/homeassistant/components/switch/tellduslive.py b/homeassistant/components/switch/tellduslive.py
index ac2b569f81c..c1134fc21c1 100644
--- a/homeassistant/components/switch/tellduslive.py
+++ b/homeassistant/components/switch/tellduslive.py
@@ -15,11 +15,11 @@ from homeassistant.helpers.entity import ToggleEntity
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Tellstick switches."""
     if discovery_info is None:
         return
-    add_devices(TelldusLiveSwitch(hass, switch) for switch in discovery_info)
+    add_entities(TelldusLiveSwitch(hass, switch) for switch in discovery_info)
 
 
 class TelldusLiveSwitch(TelldusLiveEntity, ToggleEntity):
diff --git a/homeassistant/components/switch/tellstick.py b/homeassistant/components/switch/tellstick.py
index 5f7930a8a7c..51a04e9f5b3 100644
--- a/homeassistant/components/switch/tellstick.py
+++ b/homeassistant/components/switch/tellstick.py
@@ -10,7 +10,7 @@ from homeassistant.components.tellstick import (
 from homeassistant.helpers.entity import ToggleEntity
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Tellstick switches."""
     if (discovery_info is None or
             discovery_info[ATTR_DISCOVER_DEVICES] is None):
@@ -20,10 +20,10 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     signal_repetitions = discovery_info.get(ATTR_DISCOVER_CONFIG,
                                             DEFAULT_SIGNAL_REPETITIONS)
 
-    add_devices([TellstickSwitch(hass.data[DATA_TELLSTICK][tellcore_id],
-                                 signal_repetitions)
-                 for tellcore_id in discovery_info[ATTR_DISCOVER_DEVICES]],
-                True)
+    add_entities([TellstickSwitch(hass.data[DATA_TELLSTICK][tellcore_id],
+                                  signal_repetitions)
+                  for tellcore_id in discovery_info[ATTR_DISCOVER_DEVICES]],
+                 True)
 
 
 class TellstickSwitch(TellstickDevice, ToggleEntity):
diff --git a/homeassistant/components/switch/telnet.py b/homeassistant/components/switch/telnet.py
index 381f2ec9bec..440279a70a8 100644
--- a/homeassistant/components/switch/telnet.py
+++ b/homeassistant/components/switch/telnet.py
@@ -38,7 +38,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 SCAN_INTERVAL = timedelta(seconds=10)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Find and return switches controlled by telnet commands."""
     devices = config.get(CONF_SWITCHES, {})
     switches = []
@@ -67,7 +67,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("No switches added")
         return
 
-    add_devices(switches)
+    add_entities(switches)
 
 
 class TelnetSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/template.py b/homeassistant/components/switch/template.py
index a6fa8241940..7461aa2a720 100644
--- a/homeassistant/components/switch/template.py
+++ b/homeassistant/components/switch/template.py
@@ -44,7 +44,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Template switch."""
     switches = []
 
@@ -77,7 +78,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
         _LOGGER.error("No switches added")
         return False
 
-    async_add_devices(switches)
+    async_add_entities(switches)
     return True
 
 
diff --git a/homeassistant/components/switch/tesla.py b/homeassistant/components/switch/tesla.py
index 0e1b7e819f7..30972b1014b 100644
--- a/homeassistant/components/switch/tesla.py
+++ b/homeassistant/components/switch/tesla.py
@@ -15,7 +15,7 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['tesla']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Tesla switch platform."""
     controller = hass.data[TESLA_DOMAIN]['devices']['controller']
     devices = []
@@ -24,7 +24,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             devices.append(ChargerSwitch(device, controller))
         elif device.bin_type == 0x9:
             devices.append(RangeSwitch(device, controller))
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class ChargerSwitch(TeslaDevice, SwitchDevice):
diff --git a/homeassistant/components/switch/thinkingcleaner.py b/homeassistant/components/switch/thinkingcleaner.py
index 0753435cfba..89586465b43 100644
--- a/homeassistant/components/switch/thinkingcleaner.py
+++ b/homeassistant/components/switch/thinkingcleaner.py
@@ -29,7 +29,7 @@ SWITCH_TYPES = {
 }
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the ThinkingCleaner platform."""
     from pythinkingcleaner import Discovery
 
@@ -48,7 +48,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             dev.append(ThinkingCleanerSwitch(device, type_name,
                                              update_devices))
 
-    add_devices(dev)
+    add_entities(dev)
 
 
 class ThinkingCleanerSwitch(ToggleEntity):
diff --git a/homeassistant/components/switch/toon.py b/homeassistant/components/switch/toon.py
index 94086d819e2..087ca673e85 100644
--- a/homeassistant/components/switch/toon.py
+++ b/homeassistant/components/switch/toon.py
@@ -12,14 +12,14 @@ import homeassistant.components.toon as toon_main
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the discovered Toon Smart Plugs."""
     _toon_main = hass.data[toon_main.TOON_HANDLE]
     switch_items = []
     for plug in _toon_main.toon.smartplugs:
         switch_items.append(EnecoSmartPlug(hass, plug))
 
-    add_devices(switch_items)
+    add_entities(switch_items)
 
 
 class EnecoSmartPlug(SwitchDevice):
diff --git a/homeassistant/components/switch/tplink.py b/homeassistant/components/switch/tplink.py
index 0cacdfe1539..a68ad2bf37d 100644
--- a/homeassistant/components/switch/tplink.py
+++ b/homeassistant/components/switch/tplink.py
@@ -32,14 +32,14 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the TPLink switch platform."""
     from pyHS100 import SmartPlug
     host = config.get(CONF_HOST)
     name = config.get(CONF_NAME)
     leds_on = config.get(CONF_LEDS)
 
-    add_devices([SmartPlugSwitch(SmartPlug(host), name, leds_on)], True)
+    add_entities([SmartPlugSwitch(SmartPlug(host), name, leds_on)], True)
 
 
 class SmartPlugSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/transmission.py b/homeassistant/components/switch/transmission.py
index ffe285a23f3..10ab0903dcf 100644
--- a/homeassistant/components/switch/transmission.py
+++ b/homeassistant/components/switch/transmission.py
@@ -31,7 +31,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Transmission switch."""
     import transmissionrpc
     from transmissionrpc.error import TransmissionError
@@ -53,7 +53,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         )
         return False
 
-    add_devices([TransmissionSwitch(transmission_api, name)])
+    add_entities([TransmissionSwitch(transmission_api, name)])
 
 
 class TransmissionSwitch(ToggleEntity):
diff --git a/homeassistant/components/switch/tuya.py b/homeassistant/components/switch/tuya.py
index 4f69e76f954..9fc1f92016e 100644
--- a/homeassistant/components/switch/tuya.py
+++ b/homeassistant/components/switch/tuya.py
@@ -10,7 +10,7 @@ from homeassistant.components.tuya import DATA_TUYA, TuyaDevice
 DEPENDENCIES = ['tuya']
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Tuya Switch device."""
     if discovery_info is None:
         return
@@ -22,7 +22,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         if device is None:
             continue
         devices.append(TuyaSwitch(device))
-    add_devices(devices)
+    add_entities(devices)
 
 
 class TuyaSwitch(TuyaDevice, SwitchDevice):
diff --git a/homeassistant/components/switch/upcloud.py b/homeassistant/components/switch/upcloud.py
index 5c3af45bede..f2818e59a9b 100644
--- a/homeassistant/components/switch/upcloud.py
+++ b/homeassistant/components/switch/upcloud.py
@@ -23,7 +23,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the UpCloud server switch."""
     upcloud = hass.data[DATA_UPCLOUD]
 
@@ -31,7 +31,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     devices = [UpCloudSwitch(upcloud, uuid) for uuid in servers]
 
-    add_devices(devices, True)
+    add_entities(devices, True)
 
 
 class UpCloudSwitch(UpCloudServerEntity, SwitchDevice):
diff --git a/homeassistant/components/switch/velbus.py b/homeassistant/components/switch/velbus.py
index 46f6e893c97..300ff43d676 100644
--- a/homeassistant/components/switch/velbus.py
+++ b/homeassistant/components/switch/velbus.py
@@ -15,7 +15,7 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['velbus']
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the Velbus Switch platform."""
     if discovery_info is None:
@@ -25,7 +25,7 @@ async def async_setup_platform(hass, config, async_add_devices,
         module = hass.data[VELBUS_DOMAIN].get_module(switch[0])
         channel = switch[1]
         switches.append(VelbusSwitch(module, channel))
-    async_add_devices(switches)
+    async_add_entities(switches)
 
 
 class VelbusSwitch(VelbusEntity, SwitchDevice):
diff --git a/homeassistant/components/switch/vera.py b/homeassistant/components/switch/vera.py
index 82e2756c230..4742b755944 100644
--- a/homeassistant/components/switch/vera.py
+++ b/homeassistant/components/switch/vera.py
@@ -16,9 +16,9 @@ DEPENDENCIES = ['vera']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Vera switches."""
-    add_devices(
+    add_entities(
         [VeraSwitch(device, hass.data[VERA_CONTROLLER]) for
          device in hass.data[VERA_DEVICES]['switch']], True)
 
diff --git a/homeassistant/components/switch/verisure.py b/homeassistant/components/switch/verisure.py
index 4b126e5d332..11ccd82696e 100644
--- a/homeassistant/components/switch/verisure.py
+++ b/homeassistant/components/switch/verisure.py
@@ -14,7 +14,7 @@ from homeassistant.components.switch import SwitchDevice
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Verisure switch platform."""
     if not int(hub.config.get(CONF_SMARTPLUGS, 1)):
         return False
@@ -24,7 +24,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     switches.extend([
         VerisureSmartplug(device_label)
         for device_label in hub.get('$.smartPlugs[*].deviceLabel')])
-    add_devices(switches)
+    add_entities(switches)
 
 
 class VerisureSmartplug(SwitchDevice):
diff --git a/homeassistant/components/switch/vesync.py b/homeassistant/components/switch/vesync.py
index d8579a508e2..382096ad5e4 100644
--- a/homeassistant/components/switch/vesync.py
+++ b/homeassistant/components/switch/vesync.py
@@ -21,7 +21,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the VeSync switch platform."""
     from pyvesync.vesync import VeSync
 
@@ -51,7 +51,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     else:
         _LOGGER.info("No VeSync devices found")
 
-    add_devices(switches)
+    add_entities(switches)
 
 
 class VeSyncSwitchHA(SwitchDevice):
diff --git a/homeassistant/components/switch/volvooncall.py b/homeassistant/components/switch/volvooncall.py
index c1b18a11795..96091a725a1 100644
--- a/homeassistant/components/switch/volvooncall.py
+++ b/homeassistant/components/switch/volvooncall.py
@@ -14,11 +14,11 @@ from homeassistant.helpers.entity import ToggleEntity
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Tellstick switches."""
     if discovery_info is None:
         return
-    add_devices([VolvoSwitch(hass, *discovery_info)])
+    add_entities([VolvoSwitch(hass, *discovery_info)])
 
 
 class VolvoSwitch(VolvoEntity, ToggleEntity):
diff --git a/homeassistant/components/switch/vultr.py b/homeassistant/components/switch/vultr.py
index fe3d67470d7..874d1979d7d 100644
--- a/homeassistant/components/switch/vultr.py
+++ b/homeassistant/components/switch/vultr.py
@@ -28,7 +28,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Vultr subscription switch."""
     vultr = hass.data[DATA_VULTR]
 
@@ -39,7 +39,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("Subscription %s not found", subscription)
         return False
 
-    add_devices([VultrSwitch(vultr, subscription, name)], True)
+    add_entities([VultrSwitch(vultr, subscription, name)], True)
 
 
 class VultrSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/wake_on_lan.py b/homeassistant/components/switch/wake_on_lan.py
index 80102621f7d..06f86865064 100644
--- a/homeassistant/components/switch/wake_on_lan.py
+++ b/homeassistant/components/switch/wake_on_lan.py
@@ -35,7 +35,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a wake on lan switch."""
     name = config.get(CONF_NAME)
     host = config.get(CONF_HOST)
@@ -43,8 +43,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     broadcast_address = config.get(CONF_BROADCAST_ADDRESS)
     off_action = config.get(CONF_OFF_ACTION)
 
-    add_devices([WOLSwitch(hass, name, host, mac_address,
-                           off_action, broadcast_address)], True)
+    add_entities([WOLSwitch(hass, name, host, mac_address,
+                            off_action, broadcast_address)], True)
 
 
 class WOLSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/wemo.py b/homeassistant/components/switch/wemo.py
index 199156afc21..94b86377b8d 100644
--- a/homeassistant/components/switch/wemo.py
+++ b/homeassistant/components/switch/wemo.py
@@ -35,7 +35,7 @@ WEMO_OFF = 0
 WEMO_STANDBY = 8
 
 
-def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+def setup_platform(hass, config, add_entities_callback, discovery_info=None):
     """Set up discovered WeMo switches."""
     from pywemo import discovery
 
@@ -51,7 +51,7 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
             raise PlatformNotReady
 
         if device:
-            add_devices_callback([WemoSwitch(device)])
+            add_entities_callback([WemoSwitch(device)])
 
 
 class WemoSwitch(SwitchDevice):
diff --git a/homeassistant/components/switch/wink.py b/homeassistant/components/switch/wink.py
index 6a244615065..0df59d6b51c 100644
--- a/homeassistant/components/switch/wink.py
+++ b/homeassistant/components/switch/wink.py
@@ -15,26 +15,26 @@ DEPENDENCIES = ['wink']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Wink platform."""
     import pywink
 
     for switch in pywink.get_switches():
         _id = switch.object_id() + switch.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkToggleDevice(switch, hass)])
+            add_entities([WinkToggleDevice(switch, hass)])
     for switch in pywink.get_powerstrips():
         _id = switch.object_id() + switch.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkToggleDevice(switch, hass)])
+            add_entities([WinkToggleDevice(switch, hass)])
     for sprinkler in pywink.get_sprinklers():
         _id = sprinkler.object_id() + sprinkler.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkToggleDevice(sprinkler, hass)])
+            add_entities([WinkToggleDevice(sprinkler, hass)])
     for switch in pywink.get_binary_switch_groups():
         _id = switch.object_id() + switch.name()
         if _id not in hass.data[DOMAIN]['unique_ids']:
-            add_devices([WinkToggleDevice(switch, hass)])
+            add_entities([WinkToggleDevice(switch, hass)])
 
 
 class WinkToggleDevice(WinkDevice, ToggleEntity):
diff --git a/homeassistant/components/switch/wirelesstag.py b/homeassistant/components/switch/wirelesstag.py
index cce8c349a31..5796216d50f 100644
--- a/homeassistant/components/switch/wirelesstag.py
+++ b/homeassistant/components/switch/wirelesstag.py
@@ -45,7 +45,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up switches for a Wireless Sensor Tags."""
     platform = hass.data.get(WIRELESSTAG_DOMAIN)
 
@@ -56,7 +56,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             if switch_type in WirelessTagSwitch.allowed_switches(tag):
                 switches.append(WirelessTagSwitch(platform, tag, switch_type))
 
-    add_devices(switches, True)
+    add_entities(switches, True)
 
 
 class WirelessTagSwitch(WirelessTagBaseSensor, SwitchDevice):
diff --git a/homeassistant/components/switch/xiaomi_aqara.py b/homeassistant/components/switch/xiaomi_aqara.py
index 4c44d6b2592..a29a3c74a2e 100644
--- a/homeassistant/components/switch/xiaomi_aqara.py
+++ b/homeassistant/components/switch/xiaomi_aqara.py
@@ -19,7 +19,7 @@ POWER_CONSUMED = 'power_consumed'
 IN_USE = 'inuse'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Perform the setup for Xiaomi devices."""
     devices = []
     for (_, gateway) in hass.data[PY_XIAOMI_GATEWAY].gateways.items():
@@ -59,7 +59,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             elif model in ['86plug', 'ctrl_86plug', 'ctrl_86plug.aq1']:
                 devices.append(XiaomiGenericSwitch(device, 'Wall Plug',
                                                    'status', True, gateway))
-    add_devices(devices)
+    add_entities(devices)
 
 
 class XiaomiGenericSwitch(XiaomiDevice, SwitchDevice):
diff --git a/homeassistant/components/switch/xiaomi_miio.py b/homeassistant/components/switch/xiaomi_miio.py
index 56203c0552a..821de5bf647 100644
--- a/homeassistant/components/switch/xiaomi_miio.py
+++ b/homeassistant/components/switch/xiaomi_miio.py
@@ -97,7 +97,7 @@ SERVICE_TO_METHOD = {
 }
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the switch from config."""
     from miio import Device, DeviceException
@@ -158,7 +158,7 @@ async def async_setup_platform(hass, config, async_add_devices,
             'and provide the following data: %s', model)
         return False
 
-    async_add_devices(devices, update_before_add=True)
+    async_add_entities(devices, update_before_add=True)
 
     async def async_service_handler(service):
         """Map services to methods on XiaomiPlugGenericSwitch."""
diff --git a/homeassistant/components/switch/zha.py b/homeassistant/components/switch/zha.py
index 6109dc192f3..9f780b631b6 100644
--- a/homeassistant/components/switch/zha.py
+++ b/homeassistant/components/switch/zha.py
@@ -14,7 +14,7 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['zha']
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the Zigbee Home Automation switches."""
     discovery_info = zha.get_discovery_info(hass, discovery_info)
@@ -27,7 +27,7 @@ async def async_setup_platform(hass, config, async_add_devices,
     await cluster.bind()
     await cluster.configure_reporting(0, 0, 600, 1,)
 
-    async_add_devices([Switch(**discovery_info)], update_before_add=True)
+    async_add_entities([Switch(**discovery_info)], update_before_add=True)
 
 
 class Switch(zha.Entity, SwitchDevice):
diff --git a/homeassistant/components/switch/zigbee.py b/homeassistant/components/switch/zigbee.py
index a0db5685a90..8d54892399a 100644
--- a/homeassistant/components/switch/zigbee.py
+++ b/homeassistant/components/switch/zigbee.py
@@ -24,9 +24,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the ZigBee switch platform."""
-    add_devices([ZigBeeSwitch(hass, ZigBeeDigitalOutConfig(config))])
+    add_entities([ZigBeeSwitch(hass, ZigBeeDigitalOutConfig(config))])
 
 
 class ZigBeeSwitch(ZigBeeDigitalOut, SwitchDevice):
diff --git a/homeassistant/components/switch/zoneminder.py b/homeassistant/components/switch/zoneminder.py
index fa32843eb4b..496e7549aaa 100644
--- a/homeassistant/components/switch/zoneminder.py
+++ b/homeassistant/components/switch/zoneminder.py
@@ -23,7 +23,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the ZoneMinder switch platform."""
     on_state = config.get(CONF_COMMAND_ON)
     off_state = config.get(CONF_COMMAND_OFF)
@@ -41,7 +41,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             )
         )
 
-    add_devices(switches)
+    add_entities(switches)
 
 
 class ZMSwitchMonitors(SwitchDevice):
diff --git a/homeassistant/components/vacuum/demo.py b/homeassistant/components/vacuum/demo.py
index 5d4c6856a4d..12507683f51 100644
--- a/homeassistant/components/vacuum/demo.py
+++ b/homeassistant/components/vacuum/demo.py
@@ -43,9 +43,9 @@ DEMO_VACUUM_NONE = '4_Fourth_floor'
 DEMO_VACUUM_STATE = '5_Fifth_floor'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Demo vacuums."""
-    add_devices([
+    add_entities([
         DemoVacuum(DEMO_VACUUM_COMPLETE, SUPPORT_ALL_SERVICES),
         DemoVacuum(DEMO_VACUUM_MOST, SUPPORT_MOST_SERVICES),
         DemoVacuum(DEMO_VACUUM_BASIC, SUPPORT_BASIC_SERVICES),
diff --git a/homeassistant/components/vacuum/dyson.py b/homeassistant/components/vacuum/dyson.py
index d423a8dacf5..943b97f6360 100644
--- a/homeassistant/components/vacuum/dyson.py
+++ b/homeassistant/components/vacuum/dyson.py
@@ -29,7 +29,7 @@ SUPPORT_DYSON = SUPPORT_TURN_ON | SUPPORT_TURN_OFF | SUPPORT_PAUSE | \
                 SUPPORT_BATTERY | SUPPORT_STOP
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Dyson 360 Eye robot vacuum platform."""
     from libpurecoollink.dyson_360_eye import Dyson360Eye
 
@@ -43,7 +43,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         dyson_entity = Dyson360EyeDevice(device)
         hass.data[DYSON_360_EYE_DEVICES].append(dyson_entity)
 
-    add_devices(hass.data[DYSON_360_EYE_DEVICES])
+    add_entities(hass.data[DYSON_360_EYE_DEVICES])
     return True
 
 
diff --git a/homeassistant/components/vacuum/ecovacs.py b/homeassistant/components/vacuum/ecovacs.py
index e0870a48861..ac01d8e7a20 100644
--- a/homeassistant/components/vacuum/ecovacs.py
+++ b/homeassistant/components/vacuum/ecovacs.py
@@ -27,13 +27,13 @@ ATTR_ERROR = 'error'
 ATTR_COMPONENT_PREFIX = 'component_'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Ecovacs vacuums."""
     vacuums = []
     for device in hass.data[ECOVACS_DEVICES]:
         vacuums.append(EcovacsVacuum(device))
     _LOGGER.debug("Adding Ecovacs Vacuums to Hass: %s", vacuums)
-    add_devices(vacuums, True)
+    add_entities(vacuums, True)
 
 
 class EcovacsVacuum(VacuumDevice):
diff --git a/homeassistant/components/vacuum/mqtt.py b/homeassistant/components/vacuum/mqtt.py
index fd80f4cdbfb..47617277773 100644
--- a/homeassistant/components/vacuum/mqtt.py
+++ b/homeassistant/components/vacuum/mqtt.py
@@ -140,7 +140,8 @@ PLATFORM_SCHEMA = mqtt.MQTT_BASE_PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the vacuum."""
     name = config.get(CONF_NAME)
     supported_feature_strings = config.get(CONF_SUPPORTED_FEATURES)
@@ -192,7 +193,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     payload_available = config.get(mqtt.CONF_PAYLOAD_AVAILABLE)
     payload_not_available = config.get(mqtt.CONF_PAYLOAD_NOT_AVAILABLE)
 
-    async_add_devices([
+    async_add_entities([
         MqttVacuum(
             name, supported_features, qos, retain, command_topic,
             payload_turn_on, payload_turn_off, payload_return_to_base,
diff --git a/homeassistant/components/vacuum/neato.py b/homeassistant/components/vacuum/neato.py
index 82c5187f7b0..dd27b2a33d2 100644
--- a/homeassistant/components/vacuum/neato.py
+++ b/homeassistant/components/vacuum/neato.py
@@ -36,13 +36,13 @@ ATTR_CLEAN_SUSP_COUNT = 'clean_suspension_count'
 ATTR_CLEAN_SUSP_TIME = 'clean_suspension_time'
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Neato vacuum."""
     dev = []
     for robot in hass.data[NEATO_ROBOTS]:
         dev.append(NeatoConnectedVacuum(hass, robot))
     _LOGGER.debug("Adding vacuums %s", dev)
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class NeatoConnectedVacuum(StateVacuumDevice):
diff --git a/homeassistant/components/vacuum/roomba.py b/homeassistant/components/vacuum/roomba.py
index 750c2c0ae0a..487fd573f37 100644
--- a/homeassistant/components/vacuum/roomba.py
+++ b/homeassistant/components/vacuum/roomba.py
@@ -69,7 +69,8 @@ SUPPORT_ROOMBA_CARPET_BOOST = SUPPORT_ROOMBA | SUPPORT_FAN_SPEED
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the iRobot Roomba vacuum cleaner platform."""
     from roomba import Roomba
     if PLATFORM not in hass.data:
@@ -102,7 +103,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     roomba_vac = RoombaVacuum(name, roomba)
     hass.data[PLATFORM][host] = roomba_vac
 
-    async_add_devices([roomba_vac], update_before_add=True)
+    async_add_entities([roomba_vac], update_before_add=True)
 
 
 class RoombaVacuum(VacuumDevice):
diff --git a/homeassistant/components/vacuum/xiaomi_miio.py b/homeassistant/components/vacuum/xiaomi_miio.py
index 5be594e55a2..a6d8fccdee0 100644
--- a/homeassistant/components/vacuum/xiaomi_miio.py
+++ b/homeassistant/components/vacuum/xiaomi_miio.py
@@ -102,7 +102,8 @@ STATE_CODE_TO_STATE = {
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the Xiaomi vacuum cleaner robot platform."""
     from miio import Vacuum
     if DATA_KEY not in hass.data:
@@ -119,7 +120,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     mirobo = MiroboVacuum(name, vacuum)
     hass.data[DATA_KEY][host] = mirobo
 
-    async_add_devices([mirobo], update_before_add=True)
+    async_add_entities([mirobo], update_before_add=True)
 
     @asyncio.coroutine
     def async_service_handler(service):
diff --git a/homeassistant/components/weather/bom.py b/homeassistant/components/weather/bom.py
index ad74bb4fb77..4c517824bca 100644
--- a/homeassistant/components/weather/bom.py
+++ b/homeassistant/components/weather/bom.py
@@ -24,7 +24,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the BOM weather platform."""
     station = config.get(CONF_STATION) or closest_station(
         config.get(CONF_LATITUDE),
@@ -39,7 +39,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     except ValueError as err:
         _LOGGER.error("Received error from BOM_Current: %s", err)
         return False
-    add_devices([BOMWeather(bom_data, config.get(CONF_NAME))], True)
+    add_entities([BOMWeather(bom_data, config.get(CONF_NAME))], True)
 
 
 class BOMWeather(WeatherEntity):
diff --git a/homeassistant/components/weather/buienradar.py b/homeassistant/components/weather/buienradar.py
index 9b9707e87f6..6b92eb97c9e 100644
--- a/homeassistant/components/weather/buienradar.py
+++ b/homeassistant/components/weather/buienradar.py
@@ -56,7 +56,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 
 @asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def async_setup_platform(hass, config, async_add_entities,
+                         discovery_info=None):
     """Set up the buienradar platform."""
     latitude = config.get(CONF_LATITUDE, hass.config.latitude)
     longitude = config.get(CONF_LONGITUDE, hass.config.longitude)
@@ -82,7 +83,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
             for condi in condlst:
                 hass.data[DATA_CONDITION][condi] = cond
 
-    async_add_devices([BrWeather(data, config)])
+    async_add_entities([BrWeather(data, config)])
 
     # schedule the first update in 1 minute from now:
     yield from data.schedule_update(1)
diff --git a/homeassistant/components/weather/darksky.py b/homeassistant/components/weather/darksky.py
index 6dac22bc941..34a6fd3d6f6 100644
--- a/homeassistant/components/weather/darksky.py
+++ b/homeassistant/components/weather/darksky.py
@@ -57,7 +57,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=3)
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Dark Sky weather."""
     latitude = config.get(CONF_LATITUDE, hass.config.latitude)
     longitude = config.get(CONF_LONGITUDE, hass.config.longitude)
@@ -70,7 +70,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     dark_sky = DarkSkyData(
         config.get(CONF_API_KEY), latitude, longitude, units)
 
-    add_devices([DarkSkyWeather(name, dark_sky)], True)
+    add_entities([DarkSkyWeather(name, dark_sky)], True)
 
 
 class DarkSkyWeather(WeatherEntity):
diff --git a/homeassistant/components/weather/demo.py b/homeassistant/components/weather/demo.py
index fffdf03d07d..6bcb8918504 100644
--- a/homeassistant/components/weather/demo.py
+++ b/homeassistant/components/weather/demo.py
@@ -29,9 +29,9 @@ CONDITION_CLASSES = {
 }
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Demo weather."""
-    add_devices([
+    add_entities([
         DemoWeather('South', 'Sunshine', 21.6414, 92, 1099, 0.5, TEMP_CELSIUS,
                     [['rainy', 1, 22, 15], ['rainy', 5, 19, 8],
                      ['cloudy', 0, 15, 9], ['sunny', 0, 12, 6],
diff --git a/homeassistant/components/weather/ecobee.py b/homeassistant/components/weather/ecobee.py
index 59737c578a5..5a191aa7af1 100644
--- a/homeassistant/components/weather/ecobee.py
+++ b/homeassistant/components/weather/ecobee.py
@@ -23,7 +23,7 @@ ATTR_FORECAST_HUMIDITY = 'humidity'
 MISSING_DATA = -5002
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Ecobee weather component."""
     if discovery_info is None:
         return
@@ -34,7 +34,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         if 'weather' in thermostat:
             dev.append(EcobeeWeather(thermostat['name'], index))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class EcobeeWeather(WeatherEntity):
diff --git a/homeassistant/components/weather/ipma.py b/homeassistant/components/weather/ipma.py
index ef4f1b349d7..02d94e47558 100644
--- a/homeassistant/components/weather/ipma.py
+++ b/homeassistant/components/weather/ipma.py
@@ -54,7 +54,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the ipma platform."""
     latitude = config.get(CONF_LATITUDE, hass.config.latitude)
@@ -74,7 +74,7 @@ async def async_setup_platform(hass, config, async_add_devices,
     _LOGGER.debug("Initializing ipma weather: coordinates %s, %s",
                   latitude, longitude)
 
-    async_add_devices([IPMAWeather(station, config)], True)
+    async_add_entities([IPMAWeather(station, config)], True)
 
 
 class IPMAWeather(WeatherEntity):
diff --git a/homeassistant/components/weather/metoffice.py b/homeassistant/components/weather/metoffice.py
index d43d1d3c996..7382319e7a4 100644
--- a/homeassistant/components/weather/metoffice.py
+++ b/homeassistant/components/weather/metoffice.py
@@ -31,7 +31,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Met Office weather platform."""
     import datapoint as dp
 
@@ -63,7 +63,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("Received error from Met Office Datapoint: %s", err)
         return
 
-    add_devices([MetOfficeWeather(site, data, name)], True)
+    add_entities([MetOfficeWeather(site, data, name)], True)
 
 
 class MetOfficeWeather(WeatherEntity):
diff --git a/homeassistant/components/weather/openweathermap.py b/homeassistant/components/weather/openweathermap.py
index 46a0b3ecc14..b300fcbcbec 100644
--- a/homeassistant/components/weather/openweathermap.py
+++ b/homeassistant/components/weather/openweathermap.py
@@ -61,7 +61,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the OpenWeatherMap weather platform."""
     import pyowm
 
@@ -78,7 +78,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     data = WeatherData(owm, latitude, longitude, mode)
 
-    add_devices([OpenWeatherMapWeather(
+    add_entities([OpenWeatherMapWeather(
         name, data, hass.config.units.temperature_unit, mode)], True)
 
 
diff --git a/homeassistant/components/weather/yweather.py b/homeassistant/components/weather/yweather.py
index 3f12195d6bf..505c287a99e 100644
--- a/homeassistant/components/weather/yweather.py
+++ b/homeassistant/components/weather/yweather.py
@@ -55,7 +55,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Yahoo! weather platform."""
     from yahooweather import get_woeid, UNIT_C, UNIT_F
 
@@ -85,7 +85,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             for condi in condlst:
                 hass.data[DATA_CONDITION][condi] = cond
 
-    add_devices([YahooWeatherWeather(yahoo_api, name, unit)], True)
+    add_entities([YahooWeatherWeather(yahoo_api, name, unit)], True)
 
 
 class YahooWeatherWeather(WeatherEntity):
diff --git a/homeassistant/components/weather/zamg.py b/homeassistant/components/weather/zamg.py
index 389b966ee7d..f76b733ef0b 100644
--- a/homeassistant/components/weather/zamg.py
+++ b/homeassistant/components/weather/zamg.py
@@ -31,7 +31,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the ZAMG weather platform."""
     name = config.get(CONF_NAME)
     latitude = config.get(CONF_LATITUDE, hass.config.latitude)
@@ -51,7 +51,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("Received error from ZAMG: %s", err)
         return False
 
-    add_devices([ZamgWeather(probe, name)], True)
+    add_entities([ZamgWeather(probe, name)], True)
 
 
 class ZamgWeather(WeatherEntity):
diff --git a/homeassistant/components/zwave/__init__.py b/homeassistant/components/zwave/__init__.py
index 8cf69e72702..4cb2f6b0f7b 100644
--- a/homeassistant/components/zwave/__init__.py
+++ b/homeassistant/components/zwave/__init__.py
@@ -203,7 +203,7 @@ def get_config_value(node, value_index, tries=5):
     return None
 
 
-async def async_setup_platform(hass, config, async_add_devices,
+async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the Z-Wave platform (generic part)."""
     if discovery_info is None or DATA_NETWORK not in hass.data:
@@ -214,7 +214,7 @@ async def async_setup_platform(hass, config, async_add_devices,
     if device is None:
         return False
 
-    async_add_devices([device])
+    async_add_entities([device])
     return True
 
 
diff --git a/tests/components/alarm_control_panel/test_manual.py b/tests/components/alarm_control_panel/test_manual.py
index 02e528db914..29f630093d9 100644
--- a/tests/components/alarm_control_panel/test_manual.py
+++ b/tests/components/alarm_control_panel/test_manual.py
@@ -32,9 +32,9 @@ class TestAlarmControlPanelManual(unittest.TestCase):
     def test_setup_demo_platform(self):
         """Test setup."""
         mock = MagicMock()
-        add_devices = mock.MagicMock()
-        demo.setup_platform(self.hass, {}, add_devices)
-        self.assertEqual(add_devices.call_count, 1)
+        add_entities = mock.MagicMock()
+        demo.setup_platform(self.hass, {}, add_entities)
+        self.assertEqual(add_entities.call_count, 1)
 
     def test_arm_home_no_pending(self):
         """Test arm home method."""
diff --git a/tests/components/alarm_control_panel/test_spc.py b/tests/components/alarm_control_panel/test_spc.py
index 63b79781404..0a4ba0916ea 100644
--- a/tests/components/alarm_control_panel/test_spc.py
+++ b/tests/components/alarm_control_panel/test_spc.py
@@ -54,7 +54,7 @@ def test_setup_platform(hass):
 
     yield from spc.async_setup_platform(hass=hass,
                                         config={},
-                                        async_add_devices=add_entities,
+                                        async_add_entities=add_entities,
                                         discovery_info=areas)
 
     assert len(added_entities) == 2
diff --git a/tests/components/binary_sensor/test_nx584.py b/tests/components/binary_sensor/test_nx584.py
index 117c32203eb..252996201bb 100644
--- a/tests/components/binary_sensor/test_nx584.py
+++ b/tests/components/binary_sensor/test_nx584.py
@@ -45,17 +45,17 @@ class TestNX584SensorSetup(unittest.TestCase):
     @mock.patch('homeassistant.components.binary_sensor.nx584.NX584ZoneSensor')
     def test_setup_defaults(self, mock_nx, mock_watcher):
         """Test the setup with no configuration."""
-        add_devices = mock.MagicMock()
+        add_entities = mock.MagicMock()
         config = {
             'host': nx584.DEFAULT_HOST,
             'port': nx584.DEFAULT_PORT,
             'exclude_zones': [],
             'zone_types': {},
             }
-        self.assertTrue(nx584.setup_platform(self.hass, config, add_devices))
+        self.assertTrue(nx584.setup_platform(self.hass, config, add_entities))
         mock_nx.assert_has_calls(
              [mock.call(zone, 'opening') for zone in self.fake_zones])
-        self.assertTrue(add_devices.called)
+        self.assertTrue(add_entities.called)
         self.assertEqual(nx584_client.Client.call_count, 1)
         self.assertEqual(
             nx584_client.Client.call_args, mock.call('http://localhost:5007')
@@ -71,13 +71,13 @@ class TestNX584SensorSetup(unittest.TestCase):
             'exclude_zones': [2],
             'zone_types': {3: 'motion'},
             }
-        add_devices = mock.MagicMock()
-        self.assertTrue(nx584.setup_platform(self.hass, config, add_devices))
+        add_entities = mock.MagicMock()
+        self.assertTrue(nx584.setup_platform(self.hass, config, add_entities))
         mock_nx.assert_has_calls([
             mock.call(self.fake_zones[0], 'opening'),
             mock.call(self.fake_zones[2], 'motion'),
             ])
-        self.assertTrue(add_devices.called)
+        self.assertTrue(add_entities.called)
         self.assertEqual(nx584_client.Client.call_count, 1)
         self.assertEqual(
             nx584_client.Client.call_args, mock.call('http://foo:123')
@@ -120,9 +120,9 @@ class TestNX584SensorSetup(unittest.TestCase):
     def test_setup_no_zones(self):
         """Test the setup with no zones."""
         nx584_client.Client.return_value.list_zones.return_value = []
-        add_devices = mock.MagicMock()
-        self.assertTrue(nx584.setup_platform(self.hass, {}, add_devices))
-        self.assertFalse(add_devices.called)
+        add_entities = mock.MagicMock()
+        self.assertTrue(nx584.setup_platform(self.hass, {}, add_entities))
+        self.assertFalse(add_entities.called)
 
 
 class TestNX584ZoneSensor(unittest.TestCase):
diff --git a/tests/components/binary_sensor/test_ring.py b/tests/components/binary_sensor/test_ring.py
index e557050ae48..b7564dff464 100644
--- a/tests/components/binary_sensor/test_ring.py
+++ b/tests/components/binary_sensor/test_ring.py
@@ -16,7 +16,7 @@ class TestRingBinarySensorSetup(unittest.TestCase):
 
     DEVICES = []
 
-    def add_devices(self, devices, action):
+    def add_entities(self, devices, action):
         """Mock add devices."""
         for device in devices:
             self.DEVICES.append(device)
@@ -58,7 +58,7 @@ class TestRingBinarySensorSetup(unittest.TestCase):
         base_ring.setup(self.hass, VALID_CONFIG)
         ring.setup_platform(self.hass,
                             self.config,
-                            self.add_devices,
+                            self.add_entities,
                             None)
 
         for device in self.DEVICES:
diff --git a/tests/components/binary_sensor/test_sleepiq.py b/tests/components/binary_sensor/test_sleepiq.py
index 40e0aa35e03..9cd5dfa7f2e 100644
--- a/tests/components/binary_sensor/test_sleepiq.py
+++ b/tests/components/binary_sensor/test_sleepiq.py
@@ -16,7 +16,7 @@ class TestSleepIQBinarySensorSetup(unittest.TestCase):
 
     DEVICES = []
 
-    def add_devices(self, devices):
+    def add_entities(self, devices):
         """Mock add devices."""
         for device in devices:
             self.DEVICES.append(device)
@@ -45,7 +45,7 @@ class TestSleepIQBinarySensorSetup(unittest.TestCase):
 
         sleepiq.setup_platform(self.hass,
                                self.config,
-                               self.add_devices,
+                               self.add_entities,
                                MagicMock())
         self.assertEqual(2, len(self.DEVICES))
 
diff --git a/tests/components/binary_sensor/test_spc.py b/tests/components/binary_sensor/test_spc.py
index d2299874527..0a91b59e14d 100644
--- a/tests/components/binary_sensor/test_spc.py
+++ b/tests/components/binary_sensor/test_spc.py
@@ -54,7 +54,7 @@ def test_setup_platform(hass):
 
     yield from spc.async_setup_platform(hass=hass,
                                         config={},
-                                        async_add_devices=add_entities,
+                                        async_add_entities=add_entities,
                                         discovery_info=zones)
 
     assert len(added_entities) == 3
diff --git a/tests/components/binary_sensor/test_tcp.py b/tests/components/binary_sensor/test_tcp.py
index 69673f09a46..cb21d7d2c71 100644
--- a/tests/components/binary_sensor/test_tcp.py
+++ b/tests/components/binary_sensor/test_tcp.py
@@ -38,13 +38,13 @@ class TestTCPBinarySensor(unittest.TestCase):
 
     @patch('homeassistant.components.sensor.tcp.TcpSensor.update')
     def test_setup_platform_devices(self, mock_update):
-        """Check the supplied config and call add_devices with sensor."""
-        add_devices = Mock()
-        ret = bin_tcp.setup_platform(None, test_tcp.TEST_CONFIG, add_devices)
+        """Check the supplied config and call add_entities with sensor."""
+        add_entities = Mock()
+        ret = bin_tcp.setup_platform(None, test_tcp.TEST_CONFIG, add_entities)
         assert ret is None
-        assert add_devices.called
+        assert add_entities.called
         assert isinstance(
-            add_devices.call_args[0][0][0], bin_tcp.TcpBinarySensor)
+            add_entities.call_args[0][0][0], bin_tcp.TcpBinarySensor)
 
     @patch('homeassistant.components.sensor.tcp.TcpSensor.update')
     def test_is_on_true(self, mock_update):
diff --git a/tests/components/binary_sensor/test_vultr.py b/tests/components/binary_sensor/test_vultr.py
index a13944aef9f..f356149ddde 100644
--- a/tests/components/binary_sensor/test_vultr.py
+++ b/tests/components/binary_sensor/test_vultr.py
@@ -26,7 +26,7 @@ class TestVultrBinarySensorSetup(unittest.TestCase):
 
     DEVICES = []
 
-    def add_devices(self, devices, action):
+    def add_entities(self, devices, action):
         """Mock add devices."""
         for device in devices:
             self.DEVICES.append(device)
@@ -71,7 +71,7 @@ class TestVultrBinarySensorSetup(unittest.TestCase):
         for config in self.configs:
             vultr.setup_platform(self.hass,
                                  config,
-                                 self.add_devices,
+                                 self.add_entities,
                                  None)
 
         self.assertEqual(len(self.DEVICES), 3)
@@ -147,7 +147,7 @@ class TestVultrBinarySensorSetup(unittest.TestCase):
 
         no_subs_setup = vultr.setup_platform(self.hass,
                                              bad_conf,
-                                             self.add_devices,
+                                             self.add_entities,
                                              None)
 
         self.assertFalse(no_subs_setup)
@@ -159,7 +159,7 @@ class TestVultrBinarySensorSetup(unittest.TestCase):
 
         wrong_subs_setup = vultr.setup_platform(self.hass,
                                                 bad_conf,
-                                                self.add_devices,
+                                                self.add_entities,
                                                 None)
 
         self.assertFalse(wrong_subs_setup)
diff --git a/tests/components/climate/test_honeywell.py b/tests/components/climate/test_honeywell.py
index 69df11715e9..7072090591b 100644
--- a/tests/components/climate/test_honeywell.py
+++ b/tests/components/climate/test_honeywell.py
@@ -56,7 +56,7 @@ class TestHoneywell(unittest.TestCase):
             honeywell.PLATFORM_SCHEMA(bad_region_config)
 
         hass = mock.MagicMock()
-        add_devices = mock.MagicMock()
+        add_entities = mock.MagicMock()
 
         locations = [
             mock.MagicMock(),
@@ -69,7 +69,7 @@ class TestHoneywell(unittest.TestCase):
         locations[0].devices_by_id.values.return_value = devices_1
         locations[1].devices_by_id.values.return_value = devices_2
 
-        result = honeywell.setup_platform(hass, config, add_devices)
+        result = honeywell.setup_platform(hass, config, add_entities)
         self.assertTrue(result)
         self.assertEqual(mock_sc.call_count, 1)
         self.assertEqual(mock_sc.call_args, mock.call('user', 'pass'))
@@ -86,7 +86,7 @@ class TestHoneywell(unittest.TestCase):
     def test_setup_us_failures(self, mock_sc):
         """Test the US setup."""
         hass = mock.MagicMock()
-        add_devices = mock.MagicMock()
+        add_entities = mock.MagicMock()
         config = {
             CONF_USERNAME: 'user',
             CONF_PASSWORD: 'pass',
@@ -94,14 +94,14 @@ class TestHoneywell(unittest.TestCase):
         }
 
         mock_sc.side_effect = somecomfort.AuthError
-        result = honeywell.setup_platform(hass, config, add_devices)
+        result = honeywell.setup_platform(hass, config, add_entities)
         self.assertFalse(result)
-        self.assertFalse(add_devices.called)
+        self.assertFalse(add_entities.called)
 
         mock_sc.side_effect = somecomfort.SomeComfortError
-        result = honeywell.setup_platform(hass, config, add_devices)
+        result = honeywell.setup_platform(hass, config, add_entities)
         self.assertFalse(result)
-        self.assertFalse(add_devices.called)
+        self.assertFalse(add_entities.called)
 
     @mock.patch('somecomfort.SomeComfort')
     @mock.patch('homeassistant.components.climate.'
@@ -136,9 +136,9 @@ class TestHoneywell(unittest.TestCase):
         }
         mock_sc.return_value = mock.MagicMock(locations_by_id=locations)
         hass = mock.MagicMock()
-        add_devices = mock.MagicMock()
+        add_entities = mock.MagicMock()
         self.assertEqual(True,
-                         honeywell.setup_platform(hass, config, add_devices))
+                         honeywell.setup_platform(hass, config, add_entities))
 
         return mock_ht.call_args_list, mock_sc
 
@@ -185,8 +185,8 @@ class TestHoneywell(unittest.TestCase):
         mock_evo.return_value.temperatures.return_value = [
             {'id': 'foo'}, {'id': 'bar'}]
         hass = mock.MagicMock()
-        add_devices = mock.MagicMock()
-        self.assertTrue(honeywell.setup_platform(hass, config, add_devices))
+        add_entities = mock.MagicMock()
+        self.assertTrue(honeywell.setup_platform(hass, config, add_entities))
         self.assertEqual(mock_evo.call_count, 1)
         self.assertEqual(mock_evo.call_args, mock.call('user', 'pass'))
         self.assertEqual(mock_evo.return_value.temperatures.call_count, 1)
@@ -198,7 +198,7 @@ class TestHoneywell(unittest.TestCase):
             mock.call(mock_evo.return_value, 'foo', True, 20.0),
             mock.call(mock_evo.return_value, 'bar', False, 20.0),
         ])
-        self.assertEqual(2, add_devices.call_count)
+        self.assertEqual(2, add_entities.call_count)
 
     @mock.patch('evohomeclient.EvohomeClient')
     @mock.patch('homeassistant.components.climate.honeywell.'
@@ -217,8 +217,8 @@ class TestHoneywell(unittest.TestCase):
             honeywell.DEFAULT_AWAY_TEMPERATURE
 
         hass = mock.MagicMock()
-        add_devices = mock.MagicMock()
-        self.assertTrue(honeywell.setup_platform(hass, config, add_devices))
+        add_entities = mock.MagicMock()
+        self.assertTrue(honeywell.setup_platform(hass, config, add_entities))
         mock_round.assert_has_calls([
             mock.call(mock_evo.return_value, 'foo', True, 16),
             mock.call(mock_evo.return_value, 'bar', False, 16),
@@ -251,9 +251,9 @@ class TestHoneywell(unittest.TestCase):
             honeywell.CONF_REGION: 'eu',
         }
         mock_evo.return_value.temperatures.side_effect = socket.error
-        add_devices = mock.MagicMock()
+        add_entities = mock.MagicMock()
         hass = mock.MagicMock()
-        self.assertFalse(honeywell.setup_platform(hass, config, add_devices))
+        self.assertFalse(honeywell.setup_platform(hass, config, add_entities))
 
 
 class TestHoneywellRound(unittest.TestCase):
diff --git a/tests/components/climate/test_melissa.py b/tests/components/climate/test_melissa.py
index 5022c556b7d..563f74383e5 100644
--- a/tests/components/climate/test_melissa.py
+++ b/tests/components/climate/test_melissa.py
@@ -76,11 +76,11 @@ class TestMelissa(unittest.TestCase):
         self.hass.data[DATA_MELISSA] = self.api
 
         config = {}
-        add_devices = Mock()
+        add_entities = Mock()
         discovery_info = {}
 
-        melissa.setup_platform(self.hass, config, add_devices, discovery_info)
-        add_devices.assert_called_once_with(thermostats)
+        melissa.setup_platform(self.hass, config, add_entities, discovery_info)
+        add_entities.assert_called_once_with(thermostats)
 
     def test_get_name(self):
         """Test name property."""
diff --git a/tests/components/climate/test_nuheat.py b/tests/components/climate/test_nuheat.py
index 6ec63646bec..5b47a5a75af 100644
--- a/tests/components/climate/test_nuheat.py
+++ b/tests/components/climate/test_nuheat.py
@@ -67,11 +67,11 @@ class TestNuHeat(unittest.TestCase):
         self.hass.data[nuheat.NUHEAT_DOMAIN] = (self.api, ["12345"])
 
         config = {}
-        add_devices = Mock()
+        add_entities = Mock()
         discovery_info = {}
 
-        nuheat.setup_platform(self.hass, config, add_devices, discovery_info)
-        add_devices.assert_called_once_with(thermostats, True)
+        nuheat.setup_platform(self.hass, config, add_entities, discovery_info)
+        add_entities.assert_called_once_with(thermostats, True)
 
     @patch("homeassistant.components.climate.nuheat.NuHeatThermostat")
     def test_resume_program_service(self, mocked_thermostat):
diff --git a/tests/components/fan/test_dyson.py b/tests/components/fan/test_dyson.py
index a935210784b..452f8e199eb 100644
--- a/tests/components/fan/test_dyson.py
+++ b/tests/components/fan/test_dyson.py
@@ -78,9 +78,9 @@ class DysonTest(unittest.TestCase):
     def test_setup_component_with_no_devices(self):
         """Test setup component with no devices."""
         self.hass.data[dyson.DYSON_DEVICES] = []
-        add_devices = mock.MagicMock()
-        dyson.setup_platform(self.hass, None, add_devices)
-        add_devices.assert_called_with([])
+        add_entities = mock.MagicMock()
+        dyson.setup_platform(self.hass, None, add_entities)
+        add_entities.assert_called_with([])
 
     def test_setup_component(self):
         """Test setup component with devices."""
diff --git a/tests/components/light/test_group.py b/tests/components/light/test_group.py
index 901535c5465..4619e9fb9bd 100644
--- a/tests/components/light/test_group.py
+++ b/tests/components/light/test_group.py
@@ -346,13 +346,13 @@ async def test_service_calls(hass):
 
 async def test_invalid_service_calls(hass):
     """Test invalid service call arguments get discarded."""
-    add_devices = MagicMock()
+    add_entities = MagicMock()
     await group.async_setup_platform(hass, {
         'entities': ['light.test1', 'light.test2']
-    }, add_devices)
+    }, add_entities)
 
-    assert add_devices.call_count == 1
-    grouped_light = add_devices.call_args[0][0][0]
+    assert add_entities.call_count == 1
+    grouped_light = add_entities.call_args[0][0][0]
     grouped_light.hass = hass
 
     with asynctest.patch.object(hass.services, 'async_call') as mock_call:
diff --git a/tests/components/media_player/test_cast.py b/tests/components/media_player/test_cast.py
index c3e777ea334..8fe285a59cd 100644
--- a/tests/components/media_player/test_cast.py
+++ b/tests/components/media_player/test_cast.py
@@ -51,13 +51,13 @@ async def async_setup_cast(hass, config=None, discovery_info=None):
     """Set up the cast platform."""
     if config is None:
         config = {}
-    add_devices = Mock()
+    add_entities = Mock()
 
-    await cast.async_setup_platform(hass, config, add_devices,
+    await cast.async_setup_platform(hass, config, add_entities,
                                     discovery_info=discovery_info)
     await hass.async_block_till_done()
 
-    return add_devices
+    return add_entities
 
 
 async def async_setup_cast_internal_discovery(hass, config=None,
@@ -67,7 +67,7 @@ async def async_setup_cast_internal_discovery(hass, config=None,
 
     with patch('pychromecast.start_discovery',
                return_value=(listener, None)) as start_discovery:
-        add_devices = await async_setup_cast(hass, config, discovery_info)
+        add_entities = await async_setup_cast(hass, config, discovery_info)
         await hass.async_block_till_done()
         await hass.async_block_till_done()
 
@@ -80,7 +80,7 @@ async def async_setup_cast_internal_discovery(hass, config=None,
         listener.services[service_name] = attr.astuple(info)
         discovery_callback(service_name)
 
-    return discover_chromecast, add_devices
+    return discover_chromecast, add_entities
 
 
 async def async_setup_media_player_cast(hass: HomeAssistantType,
@@ -214,30 +214,30 @@ async def test_normal_chromecast_not_starting_discovery(hass):
     with patch('homeassistant.components.media_player.cast.'
                '_setup_internal_discovery') as setup_discovery:
         # normal (non-group) chromecast shouldn't start discovery.
-        add_devices = await async_setup_cast(hass, {'host': 'host1'})
+        add_entities = await async_setup_cast(hass, {'host': 'host1'})
         await hass.async_block_till_done()
-        assert add_devices.call_count == 1
+        assert add_entities.call_count == 1
         assert setup_discovery.call_count == 0
 
         # Same entity twice
-        add_devices = await async_setup_cast(hass, {'host': 'host1'})
+        add_entities = await async_setup_cast(hass, {'host': 'host1'})
         await hass.async_block_till_done()
-        assert add_devices.call_count == 0
+        assert add_entities.call_count == 0
         assert setup_discovery.call_count == 0
 
         hass.data[cast.ADDED_CAST_DEVICES_KEY] = set()
-        add_devices = await async_setup_cast(
+        add_entities = await async_setup_cast(
             hass, discovery_info={'host': 'host1', 'port': 8009})
         await hass.async_block_till_done()
-        assert add_devices.call_count == 1
+        assert add_entities.call_count == 1
         assert setup_discovery.call_count == 0
 
         # group should start discovery.
         hass.data[cast.ADDED_CAST_DEVICES_KEY] = set()
-        add_devices = await async_setup_cast(
+        add_entities = await async_setup_cast(
             hass, discovery_info={'host': 'host1', 'port': 42})
         await hass.async_block_till_done()
-        assert add_devices.call_count == 0
+        assert add_entities.call_count == 0
         assert setup_discovery.call_count == 1
 
 
diff --git a/tests/components/media_player/test_samsungtv.py b/tests/components/media_player/test_samsungtv.py
index 6dd61157851..2fedfb6a65e 100644
--- a/tests/components/media_player/test_samsungtv.py
+++ b/tests/components/media_player/test_samsungtv.py
@@ -72,9 +72,9 @@ class TestSamsungTv(unittest.TestCase):
         """Testing setup of platform."""
         with mock.patch(
                 'homeassistant.components.media_player.samsungtv.socket'):
-            add_devices = mock.Mock()
+            add_entities = mock.Mock()
             setup_platform(
-                self.hass, WORKING_CONFIG, add_devices)
+                self.hass, WORKING_CONFIG, add_entities)
 
     @MockDependency('samsungctl')
     @MockDependency('wakeonlan')
@@ -82,8 +82,8 @@ class TestSamsungTv(unittest.TestCase):
         """Testing setup of platform with discovery."""
         with mock.patch(
                 'homeassistant.components.media_player.samsungtv.socket'):
-            add_devices = mock.Mock()
-            setup_platform(self.hass, {}, add_devices,
+            add_entities = mock.Mock()
+            setup_platform(self.hass, {}, add_entities,
                            discovery_info=DISCOVERY_INFO)
 
     @MockDependency('samsungctl')
@@ -94,11 +94,11 @@ class TestSamsungTv(unittest.TestCase):
         """Testing setup of platform with no data."""
         with mock.patch(
                 'homeassistant.components.media_player.samsungtv.socket'):
-            add_devices = mock.Mock()
-            setup_platform(self.hass, {}, add_devices,
+            add_entities = mock.Mock()
+            setup_platform(self.hass, {}, add_entities,
                            discovery_info=None)
             mocked_warn.assert_called_once_with("Cannot determine device")
-            add_devices.assert_not_called()
+            add_entities.assert_not_called()
 
     @mock.patch(
         'homeassistant.components.media_player.samsungtv.subprocess.Popen'
diff --git a/tests/components/media_player/test_sonos.py b/tests/components/media_player/test_sonos.py
index cd2ce2b9707..5a845738fa3 100644
--- a/tests/components/media_player/test_sonos.py
+++ b/tests/components/media_player/test_sonos.py
@@ -121,13 +121,13 @@ class SoCoMock():
         return
 
 
-def add_devices_factory(hass):
+def add_entities_factory(hass):
     """Add devices factory."""
-    def add_devices(devices, update_befor_add=False):
+    def add_entities(devices, update_befor_add=False):
         """Fake add device."""
         hass.data[sonos.DATA_SONOS].devices = devices
 
-    return add_devices
+    return add_entities
 
 
 class TestSonosMediaPlayer(unittest.TestCase):
@@ -157,7 +157,7 @@ class TestSonosMediaPlayer(unittest.TestCase):
     @mock.patch('socket.create_connection', side_effect=socket.error())
     def test_ensure_setup_discovery(self, *args):
         """Test a single device using the autodiscovery provided by HASS."""
-        sonos.setup_platform(self.hass, {}, add_devices_factory(self.hass), {
+        sonos.setup_platform(self.hass, {}, add_entities_factory(self.hass), {
             'host': '192.0.2.1'
         })
 
@@ -240,7 +240,7 @@ class TestSonosMediaPlayer(unittest.TestCase):
     @mock.patch('socket.create_connection', side_effect=socket.error())
     def test_ensure_setup_sonos_discovery(self, *args):
         """Test a single device using the autodiscovery provided by Sonos."""
-        sonos.setup_platform(self.hass, {}, add_devices_factory(self.hass))
+        sonos.setup_platform(self.hass, {}, add_entities_factory(self.hass))
         devices = list(self.hass.data[sonos.DATA_SONOS].devices)
         self.assertEqual(len(devices), 1)
         self.assertEqual(devices[0].name, 'Kitchen')
@@ -250,7 +250,7 @@ class TestSonosMediaPlayer(unittest.TestCase):
     @mock.patch.object(SoCoMock, 'set_sleep_timer')
     def test_sonos_set_sleep_timer(self, set_sleep_timerMock, *args):
         """Ensuring soco methods called for sonos_set_sleep_timer service."""
-        sonos.setup_platform(self.hass, {}, add_devices_factory(self.hass), {
+        sonos.setup_platform(self.hass, {}, add_entities_factory(self.hass), {
             'host': '192.0.2.1'
         })
         device = list(self.hass.data[sonos.DATA_SONOS].devices)[-1]
@@ -264,7 +264,7 @@ class TestSonosMediaPlayer(unittest.TestCase):
     @mock.patch.object(SoCoMock, 'set_sleep_timer')
     def test_sonos_clear_sleep_timer(self, set_sleep_timerMock, *args):
         """Ensuring soco methods called for sonos_clear_sleep_timer service."""
-        sonos.setup_platform(self.hass, {}, add_devices_factory(self.hass), {
+        sonos.setup_platform(self.hass, {}, add_entities_factory(self.hass), {
             'host': '192.0.2.1'
         })
         device = list(self.hass.data[sonos.DATA_SONOS].devices)[-1]
@@ -278,7 +278,7 @@ class TestSonosMediaPlayer(unittest.TestCase):
     @mock.patch('socket.create_connection', side_effect=socket.error())
     def test_set_alarm(self, soco_mock, alarm_mock, *args):
         """Ensuring soco methods called for sonos_set_sleep_timer service."""
-        sonos.setup_platform(self.hass, {}, add_devices_factory(self.hass), {
+        sonos.setup_platform(self.hass, {}, add_entities_factory(self.hass), {
             'host': '192.0.2.1'
         })
         device = list(self.hass.data[sonos.DATA_SONOS].devices)[-1]
@@ -308,7 +308,7 @@ class TestSonosMediaPlayer(unittest.TestCase):
     @mock.patch.object(soco.snapshot.Snapshot, 'snapshot')
     def test_sonos_snapshot(self, snapshotMock, *args):
         """Ensuring soco methods called for sonos_snapshot service."""
-        sonos.setup_platform(self.hass, {}, add_devices_factory(self.hass), {
+        sonos.setup_platform(self.hass, {}, add_entities_factory(self.hass), {
             'host': '192.0.2.1'
         })
         device = list(self.hass.data[sonos.DATA_SONOS].devices)[-1]
@@ -326,7 +326,7 @@ class TestSonosMediaPlayer(unittest.TestCase):
         """Ensuring soco methods called for sonos_restor service."""
         from soco.snapshot import Snapshot
 
-        sonos.setup_platform(self.hass, {}, add_devices_factory(self.hass), {
+        sonos.setup_platform(self.hass, {}, add_entities_factory(self.hass), {
             'host': '192.0.2.1'
         })
         device = list(self.hass.data[sonos.DATA_SONOS].devices)[-1]
diff --git a/tests/components/media_player/test_universal.py b/tests/components/media_player/test_universal.py
index 99c16670764..279809a283f 100644
--- a/tests/components/media_player/test_universal.py
+++ b/tests/components/media_player/test_universal.py
@@ -279,7 +279,7 @@ class TestMediaPlayer(unittest.TestCase):
         bad_config = {'platform': 'universal'}
         entities = []
 
-        def add_devices(new_entities):
+        def add_entities(new_entities):
             """Add devices to list."""
             for dev in new_entities:
                 entities.append(dev)
@@ -288,7 +288,7 @@ class TestMediaPlayer(unittest.TestCase):
         try:
             run_coroutine_threadsafe(
                 universal.async_setup_platform(
-                    self.hass, validate_config(bad_config), add_devices),
+                    self.hass, validate_config(bad_config), add_entities),
                 self.hass.loop).result()
         except MultipleInvalid:
             setup_ok = False
@@ -297,7 +297,7 @@ class TestMediaPlayer(unittest.TestCase):
 
         run_coroutine_threadsafe(
             universal.async_setup_platform(
-                self.hass, validate_config(config), add_devices),
+                self.hass, validate_config(config), add_entities),
             self.hass.loop).result()
         self.assertEqual(1, len(entities))
         self.assertEqual('test', entities[0].name)
diff --git a/tests/components/remote/test_kira.py b/tests/components/remote/test_kira.py
index eaa78d44a60..74c8e2854d0 100644
--- a/tests/components/remote/test_kira.py
+++ b/tests/components/remote/test_kira.py
@@ -24,7 +24,7 @@ class TestKiraSensor(unittest.TestCase):
     # pylint: disable=invalid-name
     DEVICES = []
 
-    def add_devices(self, devices):
+    def add_entities(self, devices):
         """Mock add devices."""
         for device in devices:
             self.DEVICES.append(device)
@@ -42,7 +42,7 @@ class TestKiraSensor(unittest.TestCase):
 
     def test_service_call(self):
         """Test Kira's ability to send commands."""
-        kira.setup_platform(self.hass, TEST_CONFIG, self.add_devices,
+        kira.setup_platform(self.hass, TEST_CONFIG, self.add_entities,
                             DISCOVERY_INFO)
         assert len(self.DEVICES) == 1
         remote = self.DEVICES[0]
diff --git a/tests/components/sensor/test_arlo.py b/tests/components/sensor/test_arlo.py
index d31490ab2af..732e47099c4 100644
--- a/tests/components/sensor/test_arlo.py
+++ b/tests/components/sensor/test_arlo.py
@@ -64,14 +64,14 @@ def captured_sensor():
 
 
 class PlatformSetupFixture():
-    """Fixture for testing platform setup call to add_devices()."""
+    """Fixture for testing platform setup call to add_entities()."""
 
     def __init__(self):
         """Instantiate the platform setup fixture."""
         self.sensors = None
         self.update = False
 
-    def add_devices(self, sensors, update):
+    def add_entities(self, sensors, update):
         """Mock method for adding devices."""
         self.sensors = sensors
         self.update = update
@@ -101,7 +101,7 @@ def mock_dispatch():
 
 def test_setup_with_no_data(platform_setup, hass):
     """Test setup_platform with no data."""
-    arlo.setup_platform(hass, None, platform_setup.add_devices)
+    arlo.setup_platform(hass, None, platform_setup.add_entities)
     assert platform_setup.sensors is None
     assert not platform_setup.update
 
@@ -132,7 +132,7 @@ def test_setup_with_valid_data(platform_setup, hass):
         })]
     })
 
-    arlo.setup_platform(hass, config, platform_setup.add_devices)
+    arlo.setup_platform(hass, config, platform_setup.add_entities)
     assert len(platform_setup.sensors) == 8
     assert platform_setup.update
 
diff --git a/tests/components/sensor/test_canary.py b/tests/components/sensor/test_canary.py
index 346929a4685..47a1f330d05 100644
--- a/tests/components/sensor/test_canary.py
+++ b/tests/components/sensor/test_canary.py
@@ -24,7 +24,7 @@ class TestCanarySensorSetup(unittest.TestCase):
 
     DEVICES = []
 
-    def add_devices(self, devices, action):
+    def add_entities(self, devices, action):
         """Mock add devices."""
         for device in devices:
             self.DEVICES.append(device)
@@ -51,7 +51,7 @@ class TestCanarySensorSetup(unittest.TestCase):
             mock_location("Work", True, devices=[online_device_at_work]),
         ]
 
-        canary.setup_platform(self.hass, self.config, self.add_devices, None)
+        canary.setup_platform(self.hass, self.config, self.add_entities, None)
 
         self.assertEqual(6, len(self.DEVICES))
 
diff --git a/tests/components/sensor/test_dyson.py b/tests/components/sensor/test_dyson.py
index cc32872e6f0..5b5be4a587d 100644
--- a/tests/components/sensor/test_dyson.py
+++ b/tests/components/sensor/test_dyson.py
@@ -62,9 +62,9 @@ class DysonTest(unittest.TestCase):
     def test_setup_component_with_no_devices(self):
         """Test setup component with no devices."""
         self.hass.data[dyson.DYSON_DEVICES] = []
-        add_devices = mock.MagicMock()
-        dyson.setup_platform(self.hass, None, add_devices)
-        add_devices.assert_called_with([])
+        add_entities = mock.MagicMock()
+        dyson.setup_platform(self.hass, None, add_entities)
+        add_entities.assert_called_with([])
 
     def test_setup_component(self):
         """Test setup component with devices."""
diff --git a/tests/components/sensor/test_efergy.py b/tests/components/sensor/test_efergy.py
index 9a79ab5b81c..fdcaa415483 100644
--- a/tests/components/sensor/test_efergy.py
+++ b/tests/components/sensor/test_efergy.py
@@ -61,7 +61,7 @@ class TestEfergySensor(unittest.TestCase):
     DEVICES = []
 
     @requests_mock.Mocker()
-    def add_devices(self, devices, mock):
+    def add_entities(self, devices, mock):
         """Mock add devices."""
         mock_responses(mock)
         for device in devices:
diff --git a/tests/components/sensor/test_fido.py b/tests/components/sensor/test_fido.py
index 1eca7be7544..c0bbadc043b 100644
--- a/tests/components/sensor/test_fido.py
+++ b/tests/components/sensor/test_fido.py
@@ -59,8 +59,8 @@ class PyFidoFakeModule():
     FidoClient = FidoClientMockError
 
 
-def fake_async_add_devices(component, update_before_add=False):
-    """Fake async_add_devices function."""
+def fake_async_add_entities(component, update_before_add=False):
+    """Fake async_add_entities function."""
     pass
 
 
@@ -103,7 +103,7 @@ def test_error(hass, caplog):
     sys.modules['pyfido.client'] = PyFidoClientFakeModule()
 
     config = {}
-    fake_async_add_devices = MagicMock()
+    fake_async_add_entities = MagicMock()
     yield from fido.async_setup_platform(hass, config,
-                                         fake_async_add_devices)
-    assert fake_async_add_devices.called is False
+                                         fake_async_add_entities)
+    assert fake_async_add_entities.called is False
diff --git a/tests/components/sensor/test_foobot.py b/tests/components/sensor/test_foobot.py
index 322f2b3f2a8..f9382a04b6b 100644
--- a/tests/components/sensor/test_foobot.py
+++ b/tests/components/sensor/test_foobot.py
@@ -44,18 +44,18 @@ async def test_default_setup(hass, aioclient_mock):
 
 async def test_setup_timeout_error(hass, aioclient_mock):
     """Expected failures caused by a timeout in API response."""
-    fake_async_add_devices = MagicMock()
+    fake_async_add_entities = MagicMock()
 
     aioclient_mock.get(re.compile('api.foobot.io/v2/owner/.*'),
                        exc=asyncio.TimeoutError())
     with pytest.raises(PlatformNotReady):
         await foobot.async_setup_platform(hass, {'sensor': VALID_CONFIG},
-                                          fake_async_add_devices)
+                                          fake_async_add_entities)
 
 
 async def test_setup_permanent_error(hass, aioclient_mock):
     """Expected failures caused by permanent errors in API response."""
-    fake_async_add_devices = MagicMock()
+    fake_async_add_entities = MagicMock()
 
     errors = [400, 401, 403]
     for error in errors:
@@ -63,13 +63,13 @@ async def test_setup_permanent_error(hass, aioclient_mock):
                            status=error)
         result = await foobot.async_setup_platform(hass,
                                                    {'sensor': VALID_CONFIG},
-                                                   fake_async_add_devices)
+                                                   fake_async_add_entities)
         assert result is None
 
 
 async def test_setup_temporary_error(hass, aioclient_mock):
     """Expected failures caused by temporary errors in API response."""
-    fake_async_add_devices = MagicMock()
+    fake_async_add_entities = MagicMock()
 
     errors = [429, 500]
     for error in errors:
@@ -78,4 +78,4 @@ async def test_setup_temporary_error(hass, aioclient_mock):
         with pytest.raises(PlatformNotReady):
             await foobot.async_setup_platform(hass,
                                               {'sensor': VALID_CONFIG},
-                                              fake_async_add_devices)
+                                              fake_async_add_entities)
diff --git a/tests/components/sensor/test_hydroquebec.py b/tests/components/sensor/test_hydroquebec.py
index debd6ef6167..eed5ab4a6a6 100644
--- a/tests/components/sensor/test_hydroquebec.py
+++ b/tests/components/sensor/test_hydroquebec.py
@@ -99,7 +99,7 @@ def test_error(hass, caplog):
     sys.modules['pyhydroquebec.client'] = PyHydroQuebecClientFakeModule()
 
     config = {}
-    fake_async_add_devices = MagicMock()
+    fake_async_add_entities = MagicMock()
     yield from hydroquebec.async_setup_platform(hass, config,
-                                                fake_async_add_devices)
-    assert fake_async_add_devices.called is False
+                                                fake_async_add_entities)
+    assert fake_async_add_entities.called is False
diff --git a/tests/components/sensor/test_kira.py b/tests/components/sensor/test_kira.py
index 093158cb25c..76aba46d514 100644
--- a/tests/components/sensor/test_kira.py
+++ b/tests/components/sensor/test_kira.py
@@ -22,7 +22,7 @@ class TestKiraSensor(unittest.TestCase):
     # pylint: disable=invalid-name
     DEVICES = []
 
-    def add_devices(self, devices):
+    def add_entities(self, devices):
         """Mock add devices."""
         for device in devices:
             self.DEVICES.append(device)
@@ -41,7 +41,7 @@ class TestKiraSensor(unittest.TestCase):
     # pylint: disable=protected-access
     def test_kira_sensor_callback(self):
         """Ensure Kira sensor properly updates its attributes from callback."""
-        kira.setup_platform(self.hass, TEST_CONFIG, self.add_devices,
+        kira.setup_platform(self.hass, TEST_CONFIG, self.add_entities,
                             DISCOVERY_INFO)
         assert len(self.DEVICES) == 1
         sensor = self.DEVICES[0]
diff --git a/tests/components/sensor/test_melissa.py b/tests/components/sensor/test_melissa.py
index 55b3e7f70f4..7ac90221f16 100644
--- a/tests/components/sensor/test_melissa.py
+++ b/tests/components/sensor/test_melissa.py
@@ -42,10 +42,10 @@ class TestMelissa(unittest.TestCase):
         self.hass.data[DATA_MELISSA] = self.api
 
         config = {}
-        add_devices = Mock()
+        add_entities = Mock()
         discovery_info = {}
 
-        melissa.setup_platform(self.hass, config, add_devices, discovery_info)
+        melissa.setup_platform(self.hass, config, add_entities, discovery_info)
 
     def test_name(self):
         """Test name property."""
diff --git a/tests/components/sensor/test_radarr.py b/tests/components/sensor/test_radarr.py
index 0d6aca9d0b7..30195b73a13 100644
--- a/tests/components/sensor/test_radarr.py
+++ b/tests/components/sensor/test_radarr.py
@@ -193,7 +193,7 @@ class TestRadarrSetup(unittest.TestCase):
     # pylint: disable=invalid-name
     DEVICES = []
 
-    def add_devices(self, devices, update):
+    def add_entities(self, devices, update):
         """Mock add devices."""
         for device in devices:
             self.DEVICES.append(device)
@@ -221,7 +221,7 @@ class TestRadarrSetup(unittest.TestCase):
                 'diskspace'
             ]
         }
-        radarr.setup_platform(self.hass, config, self.add_devices, None)
+        radarr.setup_platform(self.hass, config, self.add_entities, None)
         for device in self.DEVICES:
             device.update()
             self.assertEqual('263.10', device.state)
@@ -248,7 +248,7 @@ class TestRadarrSetup(unittest.TestCase):
                 'diskspace'
             ]
         }
-        radarr.setup_platform(self.hass, config, self.add_devices, None)
+        radarr.setup_platform(self.hass, config, self.add_entities, None)
         for device in self.DEVICES:
             device.update()
             self.assertEqual('263.10', device.state)
@@ -275,7 +275,7 @@ class TestRadarrSetup(unittest.TestCase):
                 'commands'
             ]
         }
-        radarr.setup_platform(self.hass, config, self.add_devices, None)
+        radarr.setup_platform(self.hass, config, self.add_entities, None)
         for device in self.DEVICES:
             device.update()
             self.assertEqual(1, device.state)
@@ -302,7 +302,7 @@ class TestRadarrSetup(unittest.TestCase):
                 'movies'
             ]
         }
-        radarr.setup_platform(self.hass, config, self.add_devices, None)
+        radarr.setup_platform(self.hass, config, self.add_entities, None)
         for device in self.DEVICES:
             device.update()
             self.assertEqual(1, device.state)
@@ -329,7 +329,7 @@ class TestRadarrSetup(unittest.TestCase):
                 'upcoming'
             ]
         }
-        radarr.setup_platform(self.hass, config, self.add_devices, None)
+        radarr.setup_platform(self.hass, config, self.add_entities, None)
         for device in self.DEVICES:
             device.update()
             self.assertEqual(1, device.state)
@@ -360,7 +360,7 @@ class TestRadarrSetup(unittest.TestCase):
                 'upcoming'
             ]
         }
-        radarr.setup_platform(self.hass, config, self.add_devices, None)
+        radarr.setup_platform(self.hass, config, self.add_entities, None)
         for device in self.DEVICES:
             device.update()
             self.assertEqual(1, device.state)
@@ -387,7 +387,7 @@ class TestRadarrSetup(unittest.TestCase):
                 'status'
             ]
         }
-        radarr.setup_platform(self.hass, config, self.add_devices, None)
+        radarr.setup_platform(self.hass, config, self.add_entities, None)
         for device in self.DEVICES:
             device.update()
             self.assertEqual('0.2.0.210', device.state)
@@ -413,7 +413,7 @@ class TestRadarrSetup(unittest.TestCase):
             ],
             "ssl": "true"
         }
-        radarr.setup_platform(self.hass, config, self.add_devices, None)
+        radarr.setup_platform(self.hass, config, self.add_entities, None)
         for device in self.DEVICES:
             device.update()
             self.assertEqual(1, device.state)
@@ -441,7 +441,7 @@ class TestRadarrSetup(unittest.TestCase):
                 'upcoming'
             ]
         }
-        radarr.setup_platform(self.hass, config, self.add_devices, None)
+        radarr.setup_platform(self.hass, config, self.add_entities, None)
         for device in self.DEVICES:
             device.update()
             self.assertEqual(None, device.state)
diff --git a/tests/components/sensor/test_ring.py b/tests/components/sensor/test_ring.py
index 4d34018ce52..05685376ef9 100644
--- a/tests/components/sensor/test_ring.py
+++ b/tests/components/sensor/test_ring.py
@@ -16,7 +16,7 @@ class TestRingSensorSetup(unittest.TestCase):
 
     DEVICES = []
 
-    def add_devices(self, devices, action):
+    def add_entities(self, devices, action):
         """Mock add devices."""
         for device in devices:
             self.DEVICES.append(device)
@@ -66,7 +66,7 @@ class TestRingSensorSetup(unittest.TestCase):
         base_ring.setup(self.hass, VALID_CONFIG)
         ring.setup_platform(self.hass,
                             self.config,
-                            self.add_devices,
+                            self.add_entities,
                             None)
 
         for device in self.DEVICES:
diff --git a/tests/components/sensor/test_season.py b/tests/components/sensor/test_season.py
index 4c82399648e..21e18a00c14 100644
--- a/tests/components/sensor/test_season.py
+++ b/tests/components/sensor/test_season.py
@@ -60,7 +60,7 @@ class TestSeason(unittest.TestCase):
     CONFIG_ASTRONOMICAL = {'type': 'astronomical'}
     CONFIG_METEOROLOGICAL = {'type': 'meteorological'}
 
-    def add_devices(self, devices):
+    def add_entities(self, devices):
         """Mock add devices."""
         for device in devices:
             self.DEVICE = device
diff --git a/tests/components/sensor/test_sleepiq.py b/tests/components/sensor/test_sleepiq.py
index a79db86dc79..646f8e5d888 100644
--- a/tests/components/sensor/test_sleepiq.py
+++ b/tests/components/sensor/test_sleepiq.py
@@ -16,7 +16,7 @@ class TestSleepIQSensorSetup(unittest.TestCase):
 
     DEVICES = []
 
-    def add_devices(self, devices):
+    def add_entities(self, devices):
         """Mock add devices."""
         for device in devices:
             self.DEVICES.append(device)
@@ -49,7 +49,7 @@ class TestSleepIQSensorSetup(unittest.TestCase):
 
         sleepiq.setup_platform(self.hass,
                                self.config,
-                               self.add_devices,
+                               self.add_entities,
                                MagicMock())
         self.assertEqual(2, len(self.DEVICES))
 
diff --git a/tests/components/sensor/test_sonarr.py b/tests/components/sensor/test_sonarr.py
index 275bb4a1e8b..e44d3d9a99f 100644
--- a/tests/components/sensor/test_sonarr.py
+++ b/tests/components/sensor/test_sonarr.py
@@ -579,7 +579,7 @@ class TestSonarrSetup(unittest.TestCase):
     # pylint: disable=invalid-name
     DEVICES = []
 
-    def add_devices(self, devices, update):
+    def add_entities(self, devices, update):
         """Mock add devices."""
         for device in devices:
             self.DEVICES.append(device)
@@ -607,7 +607,7 @@ class TestSonarrSetup(unittest.TestCase):
                 'diskspace'
             ]
         }
-        sonarr.setup_platform(self.hass, config, self.add_devices, None)
+        sonarr.setup_platform(self.hass, config, self.add_entities, None)
         for device in self.DEVICES:
             device.update()
             self.assertEqual('263.10', device.state)
@@ -634,7 +634,7 @@ class TestSonarrSetup(unittest.TestCase):
                 'diskspace'
             ]
         }
-        sonarr.setup_platform(self.hass, config, self.add_devices, None)
+        sonarr.setup_platform(self.hass, config, self.add_entities, None)
         for device in self.DEVICES:
             device.update()
             self.assertEqual('263.10', device.state)
@@ -661,7 +661,7 @@ class TestSonarrSetup(unittest.TestCase):
                 'commands'
             ]
         }
-        sonarr.setup_platform(self.hass, config, self.add_devices, None)
+        sonarr.setup_platform(self.hass, config, self.add_entities, None)
         for device in self.DEVICES:
             device.update()
             self.assertEqual(1, device.state)
@@ -688,7 +688,7 @@ class TestSonarrSetup(unittest.TestCase):
                 'queue'
             ]
         }
-        sonarr.setup_platform(self.hass, config, self.add_devices, None)
+        sonarr.setup_platform(self.hass, config, self.add_entities, None)
         for device in self.DEVICES:
             device.update()
             self.assertEqual(1, device.state)
@@ -715,7 +715,7 @@ class TestSonarrSetup(unittest.TestCase):
                 'series'
             ]
         }
-        sonarr.setup_platform(self.hass, config, self.add_devices, None)
+        sonarr.setup_platform(self.hass, config, self.add_entities, None)
         for device in self.DEVICES:
             device.update()
             self.assertEqual(1, device.state)
@@ -742,7 +742,7 @@ class TestSonarrSetup(unittest.TestCase):
                 'wanted'
             ]
         }
-        sonarr.setup_platform(self.hass, config, self.add_devices, None)
+        sonarr.setup_platform(self.hass, config, self.add_entities, None)
         for device in self.DEVICES:
             device.update()
             self.assertEqual(1, device.state)
@@ -769,7 +769,7 @@ class TestSonarrSetup(unittest.TestCase):
                 'upcoming'
             ]
         }
-        sonarr.setup_platform(self.hass, config, self.add_devices, None)
+        sonarr.setup_platform(self.hass, config, self.add_entities, None)
         for device in self.DEVICES:
             device.update()
             self.assertEqual(1, device.state)
@@ -800,7 +800,7 @@ class TestSonarrSetup(unittest.TestCase):
                 'upcoming'
             ]
         }
-        sonarr.setup_platform(self.hass, config, self.add_devices, None)
+        sonarr.setup_platform(self.hass, config, self.add_entities, None)
         for device in self.DEVICES:
             device.update()
             self.assertEqual(1, device.state)
@@ -827,7 +827,7 @@ class TestSonarrSetup(unittest.TestCase):
                 'status'
             ]
         }
-        sonarr.setup_platform(self.hass, config, self.add_devices, None)
+        sonarr.setup_platform(self.hass, config, self.add_entities, None)
         for device in self.DEVICES:
             device.update()
             self.assertEqual('2.0.0.1121', device.state)
@@ -854,7 +854,7 @@ class TestSonarrSetup(unittest.TestCase):
             ],
             "ssl": "true"
         }
-        sonarr.setup_platform(self.hass, config, self.add_devices, None)
+        sonarr.setup_platform(self.hass, config, self.add_entities, None)
         for device in self.DEVICES:
             device.update()
             self.assertEqual(1, device.state)
@@ -882,7 +882,7 @@ class TestSonarrSetup(unittest.TestCase):
                 'upcoming'
             ]
         }
-        sonarr.setup_platform(self.hass, config, self.add_devices, None)
+        sonarr.setup_platform(self.hass, config, self.add_entities, None)
         for device in self.DEVICES:
             device.update()
             self.assertEqual(None, device.state)
diff --git a/tests/components/sensor/test_tcp.py b/tests/components/sensor/test_tcp.py
index cbc097955c8..e89e8db861a 100644
--- a/tests/components/sensor/test_tcp.py
+++ b/tests/components/sensor/test_tcp.py
@@ -48,14 +48,14 @@ class TestTCPSensor(unittest.TestCase):
 
     @patch('homeassistant.components.sensor.tcp.TcpSensor.update')
     def test_setup_platform_valid_config(self, mock_update):
-        """Check a valid configuration and call add_devices with sensor."""
+        """Check a valid configuration and call add_entities with sensor."""
         with assert_setup_component(0, 'sensor'):
             assert setup_component(self.hass, 'sensor', TEST_CONFIG)
 
-        add_devices = Mock()
-        tcp.setup_platform(None, TEST_CONFIG['sensor'], add_devices)
-        assert add_devices.called
-        assert isinstance(add_devices.call_args[0][0][0], tcp.TcpSensor)
+        add_entities = Mock()
+        tcp.setup_platform(None, TEST_CONFIG['sensor'], add_entities)
+        assert add_entities.called
+        assert isinstance(add_entities.call_args[0][0][0], tcp.TcpSensor)
 
     def test_setup_platform_invalid_config(self):
         """Check an invalid configuration."""
diff --git a/tests/components/sensor/test_time_date.py b/tests/components/sensor/test_time_date.py
index 1b3ab68988e..98368e997d5 100644
--- a/tests/components/sensor/test_time_date.py
+++ b/tests/components/sensor/test_time_date.py
@@ -14,7 +14,7 @@ class TestTimeDateSensor(unittest.TestCase):
     # pylint: disable=invalid-name
     DEVICES = []
 
-    def add_devices(self, devices):
+    def add_entities(self, devices):
         """Mock add devices."""
         for device in devices:
             self.DEVICES.append(device)
diff --git a/tests/components/sensor/test_vultr.py b/tests/components/sensor/test_vultr.py
index 6b2e2341c52..ee2dd35dc8f 100644
--- a/tests/components/sensor/test_vultr.py
+++ b/tests/components/sensor/test_vultr.py
@@ -23,7 +23,7 @@ class TestVultrSensorSetup(unittest.TestCase):
 
     DEVICES = []
 
-    def add_devices(self, devices, action):
+    def add_entities(self, devices, action):
         """Mock add devices."""
         for device in devices:
             self.DEVICES.append(device)
@@ -71,7 +71,7 @@ class TestVultrSensorSetup(unittest.TestCase):
 
         for config in self.configs:
             setup = vultr.setup_platform(
-                self.hass, config, self.add_devices, None)
+                self.hass, config, self.add_entities, None)
 
             self.assertIsNone(setup)
 
@@ -160,7 +160,7 @@ class TestVultrSensorSetup(unittest.TestCase):
         }  # No subs at all
 
         no_sub_setup = vultr.setup_platform(
-            self.hass, bad_conf, self.add_devices, None)
+            self.hass, bad_conf, self.add_entities, None)
 
         self.assertIsNone(no_sub_setup)
         self.assertEqual(0, len(self.DEVICES))
diff --git a/tests/components/switch/test_vultr.py b/tests/components/switch/test_vultr.py
index 222a044a523..ce8740e9bff 100644
--- a/tests/components/switch/test_vultr.py
+++ b/tests/components/switch/test_vultr.py
@@ -26,7 +26,7 @@ class TestVultrSwitchSetup(unittest.TestCase):
 
     DEVICES = []
 
-    def add_devices(self, devices, action):
+    def add_entities(self, devices, action):
         """Mock add devices."""
         for device in devices:
             self.DEVICES.append(device)
@@ -71,7 +71,7 @@ class TestVultrSwitchSetup(unittest.TestCase):
         for config in self.configs:
             vultr.setup_platform(self.hass,
                                  config,
-                                 self.add_devices,
+                                 self.add_entities,
                                  None)
 
         self.assertEqual(len(self.DEVICES), 3)
@@ -181,7 +181,7 @@ class TestVultrSwitchSetup(unittest.TestCase):
 
         no_subs_setup = vultr.setup_platform(self.hass,
                                              bad_conf,
-                                             self.add_devices,
+                                             self.add_entities,
                                              None)
 
         self.assertIsNotNone(no_subs_setup)
@@ -193,7 +193,7 @@ class TestVultrSwitchSetup(unittest.TestCase):
 
         wrong_subs_setup = vultr.setup_platform(self.hass,
                                                 bad_conf,
-                                                self.add_devices,
+                                                self.add_entities,
                                                 None)
 
         self.assertIsNotNone(wrong_subs_setup)
diff --git a/tests/components/vacuum/test_dyson.py b/tests/components/vacuum/test_dyson.py
index 5e32fc9daef..e9e6aaa1b35 100644
--- a/tests/components/vacuum/test_dyson.py
+++ b/tests/components/vacuum/test_dyson.py
@@ -77,9 +77,9 @@ class DysonTest(unittest.TestCase):
     def test_setup_component_with_no_devices(self):
         """Test setup component with no devices."""
         self.hass.data[dyson.DYSON_DEVICES] = []
-        add_devices = mock.MagicMock()
-        dyson.setup_platform(self.hass, {}, add_devices)
-        add_devices.assert_called_with([])
+        add_entities = mock.MagicMock()
+        dyson.setup_platform(self.hass, {}, add_entities)
+        add_entities.assert_called_with([])
 
     def test_setup_component(self):
         """Test setup component with devices."""
diff --git a/tests/components/weather/test_yweather.py b/tests/components/weather/test_yweather.py
index c36b4454c93..a808eb4e468 100644
--- a/tests/components/weather/test_yweather.py
+++ b/tests/components/weather/test_yweather.py
@@ -76,7 +76,7 @@ class TestWeather(unittest.TestCase):
 
     DEVICES = []
 
-    def add_devices(self, devices):
+    def add_entities(self, devices):
         """Mock add devices."""
         for device in devices:
             device.update()
diff --git a/tests/components/zwave/test_init.py b/tests/components/zwave/test_init.py
index 39abf6f588f..c9224885bbc 100644
--- a/tests/components/zwave/test_init.py
+++ b/tests/components/zwave/test_init.py
@@ -128,24 +128,24 @@ def test_setup_platform(hass, mock_openzwave):
     mock_device = MagicMock()
     hass.data[DATA_NETWORK] = MagicMock()
     hass.data[zwave.DATA_DEVICES] = {456: mock_device}
-    async_add_devices = MagicMock()
+    async_add_entities = MagicMock()
 
     result = yield from zwave.async_setup_platform(
-        hass, None, async_add_devices, None)
+        hass, None, async_add_entities, None)
     assert not result
-    assert not async_add_devices.called
+    assert not async_add_entities.called
 
     result = yield from zwave.async_setup_platform(
-        hass, None, async_add_devices, {const.DISCOVERY_DEVICE: 123})
+        hass, None, async_add_entities, {const.DISCOVERY_DEVICE: 123})
     assert not result
-    assert not async_add_devices.called
+    assert not async_add_entities.called
 
     result = yield from zwave.async_setup_platform(
-        hass, None, async_add_devices, {const.DISCOVERY_DEVICE: 456})
+        hass, None, async_add_entities, {const.DISCOVERY_DEVICE: 456})
     assert result
-    assert async_add_devices.called
-    assert len(async_add_devices.mock_calls) == 1
-    assert async_add_devices.mock_calls[0][1][0] == [mock_device]
+    assert async_add_entities.called
+    assert len(async_add_entities.mock_calls) == 1
+    assert async_add_entities.mock_calls[0][1][0] == [mock_device]
 
 
 @asyncio.coroutine
diff --git a/tests/helpers/test_discovery.py b/tests/helpers/test_discovery.py
index 8ee8d4596fe..a8d78bde1f4 100644
--- a/tests/helpers/test_discovery.py
+++ b/tests/helpers/test_discovery.py
@@ -123,7 +123,7 @@ class TestHelpersDiscovery:
             component_calls.append(1)
             return True
 
-        def setup_platform(hass, config, add_devices_callback,
+        def setup_platform(hass, config, add_entities_callback,
                            discovery_info=None):
             """Set up mock platform."""
             platform_calls.append('disc' if discovery_info else 'component')
diff --git a/tests/helpers/test_entity_component.py b/tests/helpers/test_entity_component.py
index 1ce12e0b9ad..1a0c248383b 100644
--- a/tests/helpers/test_entity_component.py
+++ b/tests/helpers/test_entity_component.py
@@ -143,9 +143,9 @@ class TestHelpersEntityComponent(unittest.TestCase):
            'async_track_time_interval')
     def test_set_scan_interval_via_config(self, mock_track):
         """Test the setting of the scan interval via configuration."""
-        def platform_setup(hass, config, add_devices, discovery_info=None):
+        def platform_setup(hass, config, add_entities, discovery_info=None):
             """Test the platform setup."""
-            add_devices([MockEntity(should_poll=True)])
+            add_entities([MockEntity(should_poll=True)])
 
         loader.set_component(self.hass, 'test_domain.platform',
                              MockPlatform(platform_setup))
@@ -165,9 +165,9 @@ class TestHelpersEntityComponent(unittest.TestCase):
 
     def test_set_entity_namespace_via_config(self):
         """Test setting an entity namespace."""
-        def platform_setup(hass, config, add_devices, discovery_info=None):
+        def platform_setup(hass, config, add_entities, discovery_info=None):
             """Test the platform setup."""
-            add_devices([
+            add_entities([
                 MockEntity(name='beer'),
                 MockEntity(name=None),
             ])
diff --git a/tests/helpers/test_entity_platform.py b/tests/helpers/test_entity_platform.py
index 07901f7aad4..b51219ddbed 100644
--- a/tests/helpers/test_entity_platform.py
+++ b/tests/helpers/test_entity_platform.py
@@ -142,9 +142,9 @@ class TestHelpersEntityPlatform(unittest.TestCase):
            'async_track_time_interval')
     def test_set_scan_interval_via_platform(self, mock_track):
         """Test the setting of the scan interval via platform."""
-        def platform_setup(hass, config, add_devices, discovery_info=None):
+        def platform_setup(hass, config, add_entities, discovery_info=None):
             """Test the platform setup."""
-            add_devices([MockEntity(should_poll=True)])
+            add_entities([MockEntity(should_poll=True)])
 
         platform = MockPlatform(platform_setup)
         platform.SCAN_INTERVAL = timedelta(seconds=30)
@@ -520,9 +520,9 @@ async def test_setup_entry(hass):
     """Test we can setup an entry."""
     registry = mock_registry(hass)
 
-    async def async_setup_entry(hass, config_entry, async_add_devices):
+    async def async_setup_entry(hass, config_entry, async_add_entities):
         """Mock setup entry method."""
-        async_add_devices([
+        async_add_entities([
             MockEntity(name='test1', unique_id='unique')
         ])
         return True
diff --git a/tests/testing_config/custom_components/image_processing/test.py b/tests/testing_config/custom_components/image_processing/test.py
index b50050ed68e..c8cdc998ea0 100644
--- a/tests/testing_config/custom_components/image_processing/test.py
+++ b/tests/testing_config/custom_components/image_processing/test.py
@@ -3,10 +3,10 @@
 from homeassistant.components.image_processing import ImageProcessingEntity
 
 
-async def async_setup_platform(hass, config, async_add_devices_callback,
+async def async_setup_platform(hass, config, async_add_entities_callback,
                                discovery_info=None):
     """Set up the test image_processing platform."""
-    async_add_devices_callback([
+    async_add_entities_callback([
         TestImageProcessing('camera.demo_camera', "Test")])
 
 
diff --git a/tests/testing_config/custom_components/light/test.py b/tests/testing_config/custom_components/light/test.py
index fbf79f9e770..798051ef90c 100644
--- a/tests/testing_config/custom_components/light/test.py
+++ b/tests/testing_config/custom_components/light/test.py
@@ -21,7 +21,7 @@ def init(empty=False):
     ]
 
 
-async def async_setup_platform(hass, config, async_add_devices_callback,
+async def async_setup_platform(hass, config, async_add_entities_callback,
                                discovery_info=None):
     """Return mock devices."""
-    async_add_devices_callback(DEVICES)
+    async_add_entities_callback(DEVICES)
diff --git a/tests/testing_config/custom_components/switch/test.py b/tests/testing_config/custom_components/switch/test.py
index 79126b7b52a..33d607e011b 100644
--- a/tests/testing_config/custom_components/switch/test.py
+++ b/tests/testing_config/custom_components/switch/test.py
@@ -21,7 +21,7 @@ def init(empty=False):
     ]
 
 
-async def async_setup_platform(hass, config, async_add_devices_callback,
+async def async_setup_platform(hass, config, async_add_entities_callback,
                                discovery_info=None):
     """Find and return test switches."""
-    async_add_devices_callback(DEVICES)
+    async_add_entities_callback(DEVICES)