diff --git a/homeassistant/components/knx/binary_sensor.py b/homeassistant/components/knx/binary_sensor.py
index ad978dde30e..96438df96d7 100644
--- a/homeassistant/components/knx/binary_sensor.py
+++ b/homeassistant/components/knx/binary_sensor.py
@@ -24,7 +24,7 @@ from homeassistant.helpers.typing import ConfigType
 
 from . import KNXModule
 from .const import ATTR_COUNTER, ATTR_SOURCE, KNX_MODULE_KEY
-from .knx_entity import KnxYamlEntity
+from .entity import KnxYamlEntity
 from .schema import BinarySensorSchema
 
 
diff --git a/homeassistant/components/knx/button.py b/homeassistant/components/knx/button.py
index 9a5700917f9..5a2add5dcd7 100644
--- a/homeassistant/components/knx/button.py
+++ b/homeassistant/components/knx/button.py
@@ -13,7 +13,7 @@ from homeassistant.helpers.typing import ConfigType
 
 from . import KNXModule
 from .const import CONF_PAYLOAD_LENGTH, KNX_ADDRESS, KNX_MODULE_KEY
-from .knx_entity import KnxYamlEntity
+from .entity import KnxYamlEntity
 
 
 async def async_setup_entry(
diff --git a/homeassistant/components/knx/climate.py b/homeassistant/components/knx/climate.py
index 05f6a80d2d4..2eb3b913195 100644
--- a/homeassistant/components/knx/climate.py
+++ b/homeassistant/components/knx/climate.py
@@ -32,7 +32,7 @@ from homeassistant.helpers.typing import ConfigType
 
 from . import KNXModule
 from .const import CONTROLLER_MODES, CURRENT_HVAC_ACTIONS, KNX_MODULE_KEY
-from .knx_entity import KnxYamlEntity
+from .entity import KnxYamlEntity
 from .schema import ClimateSchema
 
 ATTR_COMMAND_VALUE = "command_value"
diff --git a/homeassistant/components/knx/cover.py b/homeassistant/components/knx/cover.py
index c4b445ff87f..2d38426a687 100644
--- a/homeassistant/components/knx/cover.py
+++ b/homeassistant/components/knx/cover.py
@@ -27,7 +27,7 @@ from homeassistant.helpers.typing import ConfigType
 
 from . import KNXModule
 from .const import KNX_MODULE_KEY
-from .knx_entity import KnxYamlEntity
+from .entity import KnxYamlEntity
 from .schema import CoverSchema
 
 
diff --git a/homeassistant/components/knx/date.py b/homeassistant/components/knx/date.py
index d551d4e5b27..8f65ac8a952 100644
--- a/homeassistant/components/knx/date.py
+++ b/homeassistant/components/knx/date.py
@@ -30,7 +30,7 @@ from .const import (
     KNX_ADDRESS,
     KNX_MODULE_KEY,
 )
-from .knx_entity import KnxYamlEntity
+from .entity import KnxYamlEntity
 
 
 async def async_setup_entry(
diff --git a/homeassistant/components/knx/datetime.py b/homeassistant/components/knx/datetime.py
index 0f98a7be217..caeaed6da93 100644
--- a/homeassistant/components/knx/datetime.py
+++ b/homeassistant/components/knx/datetime.py
@@ -31,7 +31,7 @@ from .const import (
     KNX_ADDRESS,
     KNX_MODULE_KEY,
 )
-from .knx_entity import KnxYamlEntity
+from .entity import KnxYamlEntity
 
 
 async def async_setup_entry(
diff --git a/homeassistant/components/knx/knx_entity.py b/homeassistant/components/knx/entity.py
similarity index 100%
rename from homeassistant/components/knx/knx_entity.py
rename to homeassistant/components/knx/entity.py
diff --git a/homeassistant/components/knx/fan.py b/homeassistant/components/knx/fan.py
index 6a026be2edf..ce17517b970 100644
--- a/homeassistant/components/knx/fan.py
+++ b/homeassistant/components/knx/fan.py
@@ -21,7 +21,7 @@ from homeassistant.util.scaling import int_states_in_range
 
 from . import KNXModule
 from .const import KNX_ADDRESS, KNX_MODULE_KEY
-from .knx_entity import KnxYamlEntity
+from .entity import KnxYamlEntity
 from .schema import FanSchema
 
 DEFAULT_PERCENTAGE: Final = 50
diff --git a/homeassistant/components/knx/light.py b/homeassistant/components/knx/light.py
index a9116f5c282..a73f568b2a9 100644
--- a/homeassistant/components/knx/light.py
+++ b/homeassistant/components/knx/light.py
@@ -30,7 +30,7 @@ import homeassistant.util.color as color_util
 
 from . import KNXModule
 from .const import CONF_SYNC_STATE, DOMAIN, KNX_ADDRESS, KNX_MODULE_KEY, ColorTempModes
-from .knx_entity import KnxUiEntity, KnxUiEntityPlatformController, KnxYamlEntity
+from .entity import KnxUiEntity, KnxUiEntityPlatformController, KnxYamlEntity
 from .schema import LightSchema
 from .storage.const import (
     CONF_COLOR_TEMP_MAX,
diff --git a/homeassistant/components/knx/notify.py b/homeassistant/components/knx/notify.py
index ec17cf941f5..46abbaa1454 100644
--- a/homeassistant/components/knx/notify.py
+++ b/homeassistant/components/knx/notify.py
@@ -20,7 +20,7 @@ from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import KNXModule
 from .const import DOMAIN, KNX_ADDRESS, KNX_MODULE_KEY
-from .knx_entity import KnxYamlEntity
+from .entity import KnxYamlEntity
 
 
 async def async_get_service(
diff --git a/homeassistant/components/knx/number.py b/homeassistant/components/knx/number.py
index 1a6c33239c9..27e4ff743ab 100644
--- a/homeassistant/components/knx/number.py
+++ b/homeassistant/components/knx/number.py
@@ -24,7 +24,7 @@ from homeassistant.helpers.typing import ConfigType
 
 from . import KNXModule
 from .const import CONF_RESPOND_TO_READ, CONF_STATE_ADDRESS, KNX_ADDRESS, KNX_MODULE_KEY
-from .knx_entity import KnxYamlEntity
+from .entity import KnxYamlEntity
 from .schema import NumberSchema
 
 
diff --git a/homeassistant/components/knx/scene.py b/homeassistant/components/knx/scene.py
index 0a0e68239ef..dfd226d72b1 100644
--- a/homeassistant/components/knx/scene.py
+++ b/homeassistant/components/knx/scene.py
@@ -15,7 +15,7 @@ from homeassistant.helpers.typing import ConfigType
 
 from . import KNXModule
 from .const import KNX_ADDRESS, KNX_MODULE_KEY
-from .knx_entity import KnxYamlEntity
+from .entity import KnxYamlEntity
 from .schema import SceneSchema
 
 
diff --git a/homeassistant/components/knx/select.py b/homeassistant/components/knx/select.py
index 272db48f14e..b499e3c601d 100644
--- a/homeassistant/components/knx/select.py
+++ b/homeassistant/components/knx/select.py
@@ -29,7 +29,7 @@ from .const import (
     KNX_ADDRESS,
     KNX_MODULE_KEY,
 )
-from .knx_entity import KnxYamlEntity
+from .entity import KnxYamlEntity
 from .schema import SelectSchema
 
 
diff --git a/homeassistant/components/knx/sensor.py b/homeassistant/components/knx/sensor.py
index 03b3f3f70c3..ed265db4ac7 100644
--- a/homeassistant/components/knx/sensor.py
+++ b/homeassistant/components/knx/sensor.py
@@ -35,7 +35,7 @@ from homeassistant.util.enum import try_parse_enum
 
 from . import KNXModule
 from .const import ATTR_SOURCE, KNX_MODULE_KEY
-from .knx_entity import KnxYamlEntity
+from .entity import KnxYamlEntity
 from .schema import SensorSchema
 
 SCAN_INTERVAL = timedelta(seconds=10)
diff --git a/homeassistant/components/knx/switch.py b/homeassistant/components/knx/switch.py
index 9146a98dda4..9390cbfea43 100644
--- a/homeassistant/components/knx/switch.py
+++ b/homeassistant/components/knx/switch.py
@@ -35,7 +35,7 @@ from .const import (
     KNX_ADDRESS,
     KNX_MODULE_KEY,
 )
-from .knx_entity import KnxUiEntity, KnxUiEntityPlatformController, KnxYamlEntity
+from .entity import KnxUiEntity, KnxUiEntityPlatformController, KnxYamlEntity
 from .schema import SwitchSchema
 from .storage.const import (
     CONF_DEVICE_INFO,
diff --git a/homeassistant/components/knx/text.py b/homeassistant/components/knx/text.py
index 1fdfc21bf2b..2256afadbd9 100644
--- a/homeassistant/components/knx/text.py
+++ b/homeassistant/components/knx/text.py
@@ -24,7 +24,7 @@ from homeassistant.helpers.typing import ConfigType
 
 from . import KNXModule
 from .const import CONF_RESPOND_TO_READ, CONF_STATE_ADDRESS, KNX_ADDRESS, KNX_MODULE_KEY
-from .knx_entity import KnxYamlEntity
+from .entity import KnxYamlEntity
 
 
 async def async_setup_entry(
diff --git a/homeassistant/components/knx/time.py b/homeassistant/components/knx/time.py
index 8e57b4a4fb5..1e82c324502 100644
--- a/homeassistant/components/knx/time.py
+++ b/homeassistant/components/knx/time.py
@@ -30,7 +30,7 @@ from .const import (
     KNX_ADDRESS,
     KNX_MODULE_KEY,
 )
-from .knx_entity import KnxYamlEntity
+from .entity import KnxYamlEntity
 
 
 async def async_setup_entry(
diff --git a/homeassistant/components/knx/weather.py b/homeassistant/components/knx/weather.py
index 3cf8f163330..a1e5c0efe48 100644
--- a/homeassistant/components/knx/weather.py
+++ b/homeassistant/components/knx/weather.py
@@ -21,7 +21,7 @@ from homeassistant.helpers.typing import ConfigType
 
 from . import KNXModule
 from .const import KNX_MODULE_KEY
-from .knx_entity import KnxYamlEntity
+from .entity import KnxYamlEntity
 from .schema import WeatherSchema