diff --git a/custom_components/tahoma/climate_devices/atlantic_electrical_heater.py b/custom_components/tahoma/climate_devices/atlantic_electrical_heater.py
index b48c83018..07136ebe5 100644
--- a/custom_components/tahoma/climate_devices/atlantic_electrical_heater.py
+++ b/custom_components/tahoma/climate_devices/atlantic_electrical_heater.py
@@ -14,7 +14,7 @@
 )
 from homeassistant.const import TEMP_CELSIUS
 
-from ..tahoma_device import TahomaEntity
+from ..tahoma_entity import TahomaEntity
 
 COMMAND_SET_HEATING_LEVEL = "setHeatingLevel"
 
diff --git a/custom_components/tahoma/climate_devices/atlantic_pass_apcdhw.py b/custom_components/tahoma/climate_devices/atlantic_pass_apcdhw.py
index 2cab03684..580fd749d 100644
--- a/custom_components/tahoma/climate_devices/atlantic_pass_apcdhw.py
+++ b/custom_components/tahoma/climate_devices/atlantic_pass_apcdhw.py
@@ -15,7 +15,7 @@
 )
 from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS
 
-from ..tahoma_device import TahomaEntity
+from ..tahoma_entity import TahomaEntity
 
 BOOST_ON_STATE = "on"
 BOOST_OFF_STATE = "off"
diff --git a/custom_components/tahoma/climate_devices/dimmer_exterior_heating.py b/custom_components/tahoma/climate_devices/dimmer_exterior_heating.py
index 37c058cfa..e07c0e485 100644
--- a/custom_components/tahoma/climate_devices/dimmer_exterior_heating.py
+++ b/custom_components/tahoma/climate_devices/dimmer_exterior_heating.py
@@ -11,7 +11,7 @@
 from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS
 
 from ..coordinator import TahomaDataUpdateCoordinator
-from ..tahoma_device import TahomaEntity
+from ..tahoma_entity import TahomaEntity
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/custom_components/tahoma/climate_devices/somfy_thermostat.py b/custom_components/tahoma/climate_devices/somfy_thermostat.py
index 04d2261da..220d4cf40 100644
--- a/custom_components/tahoma/climate_devices/somfy_thermostat.py
+++ b/custom_components/tahoma/climate_devices/somfy_thermostat.py
@@ -24,7 +24,7 @@
 from homeassistant.helpers.event import async_track_state_change
 
 from ..coordinator import TahomaDataUpdateCoordinator
-from ..tahoma_device import TahomaEntity
+from ..tahoma_entity import TahomaEntity
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/custom_components/tahoma/climate_devices/stateless_exterior_heating.py b/custom_components/tahoma/climate_devices/stateless_exterior_heating.py
index 147b0b0c5..5d821a239 100644
--- a/custom_components/tahoma/climate_devices/stateless_exterior_heating.py
+++ b/custom_components/tahoma/climate_devices/stateless_exterior_heating.py
@@ -10,7 +10,7 @@
 )
 from homeassistant.const import TEMP_CELSIUS
 
-from ..tahoma_device import TahomaEntity
+from ..tahoma_entity import TahomaEntity
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/custom_components/tahoma/light.py b/custom_components/tahoma/light.py
index 16c89b77f..dbd874283 100644
--- a/custom_components/tahoma/light.py
+++ b/custom_components/tahoma/light.py
@@ -16,6 +16,7 @@
 import homeassistant.util.color as color_util
 
 from .const import COMMAND_OFF, COMMAND_ON, CORE_ON_OFF_STATE, DOMAIN
+from .coordinator import TahomaDataUpdateCoordinator
 from .tahoma_entity import TahomaEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -57,9 +58,9 @@ async def async_setup_entry(hass, entry, async_add_entities):
 class TahomaLight(TahomaEntity, LightEntity):
     """Representation of a TaHoma Light."""
 
-    def __init__(self, tahoma_device, controller):
+    def __init__(self, device_url: str, coordinator: TahomaDataUpdateCoordinator):
         """Initialize a device."""
-        super().__init__(tahoma_device, controller)
+        super().__init__(device_url, coordinator)
         self._effect = None
 
     @property
diff --git a/custom_components/tahoma/water_heater_devices/domestic_hot_water_production.py b/custom_components/tahoma/water_heater_devices/domestic_hot_water_production.py
index 8c873d37c..324cda130 100644
--- a/custom_components/tahoma/water_heater_devices/domestic_hot_water_production.py
+++ b/custom_components/tahoma/water_heater_devices/domestic_hot_water_production.py
@@ -8,7 +8,7 @@
 )
 from homeassistant.const import ATTR_TEMPERATURE, STATE_OFF, STATE_ON, TEMP_CELSIUS
 
-from ..tahoma_device import TahomaEntity
+from ..tahoma_entity import TahomaEntity
 
 CORE_MAXIMAL_TEMPERATURE_MANUAL_MODE_STATE = "core:MaximalTemperatureManualModeState"
 CORE_MINIMAL_TEMPERATURE_MANUAL_MODE_STATE = "core:MinimalTemperatureManualModeState"