diff --git a/CHANGELOG.md b/CHANGELOG.md
index e501ffb..2095a35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,10 +5,26 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [3.2.1] - 2024-10-01
+
+## [4.0.0] - 2024-10-04
+
+### Changed
+
+- esp-idf is used as ESP32 framework instead of arduino (breaking change)
+  - This framework is recommended for ESP32 chips by ESPHome. Be aware that this is a breaking change. To apply this configuration update on an existing board, an one-time serial flash will be needed
+- Removed "ssid" and "password" from the wifi section. These will be stored by the captive portal component
+- Renamed "Power Air Conditioner Zone 1" to "Room Temperature Control", "Power Floor Heating Zone 1" to "Water Flow Temperature Control Zone 1" and "Power Air Conditioner Zone 2" to "Water Flow Temperature Control Zone 2"
+- Removed "${entity_prefix} from all entries. Got a tip from user "Septillion" on https://tweakers.net that this is not needed (anymore?) in ESPHome (breaking change (potential))
+  - If needed, ESPHome will add the "friendly name" to an entity, which is "Heatpump Controller" in the current configuration.
 
 ### Fixed
 
+- "Active State" now also takes into account when the temperature is controlled by the water flow temperature and not only the room thermostat
+
+## [3.2.1] - 2024-10-01
+
+### Changed
+
 - 'Electricity Consumption' and 'Power Output' configured as device class 'energy'
 
 ## [3.2.0] - 2024-08-05
diff --git a/heatpump.yaml b/heatpump.yaml
index 7b71a3d..7bcf802 100644
--- a/heatpump.yaml
+++ b/heatpump.yaml
@@ -1,7 +1,6 @@
 substitutions:
   devicename: heatpump
   description: Heatpump Controller
-  entity_prefix: Heatpump
 
 globals:
   - id: unmasked_value_water_temperature_t1s
@@ -76,7 +75,7 @@ select:
   # Register: 1
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Operational Mode"
+    name: "Operational Mode"
     id: "${devicename}_operational_mode"
     icon: "mdi:fan"
     address: 0x1
@@ -89,7 +88,7 @@ select:
   # Register: 269, default: 0
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Power Input Limitation Type"
+    name: "Power Input Limitation Type"
     id: "${devicename}_power_input_limitation_type"
     address: 0x10d
     value_type: U_WORD
@@ -107,7 +106,7 @@ select:
   # Register: 272 (bits 0-3), default: 1
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Zone 1 End Heating Mode Emission Type"
+    name: "Zone 1 End Heating Mode Emission Type"
     id: "${devicename}_zone_1_end_heating_mode_emission_type"
     address: 0x110
     value_type: U_WORD
@@ -159,7 +158,7 @@ select:
   # Register: 272 (bits 4-7), default: 2
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Zone 2 End Heating Mode Emission Type"
+    name: "Zone 2 End Heating Mode Emission Type"
     id: "${devicename}_zone_2_end_heating_mode_emission_type"
     address: 0x110
     value_type: U_WORD
@@ -210,7 +209,7 @@ select:
   # Register: 272 (bits 8-11), default: 0
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Zone 1 End Cooling Mode Emission Type"
+    name: "Zone 1 End Cooling Mode Emission Type"
     id: "${devicename}_zone_1_end_cooling_mode_emission_type"
     address: 0x110
     value_type: U_WORD
@@ -261,7 +260,7 @@ select:
   # Register: 272 (bits 12-15), default: 0
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Zone 2 End Cooling Mode Emission Type"
+    name: "Zone 2 End Cooling Mode Emission Type"
     id: "${devicename}_zone_2_end_cooling_mode_emission_type"
     address: 0x110
     value_type: U_WORD
@@ -312,13 +311,13 @@ select:
 
 sensor:
   - platform: uptime
-    name: "${entity_prefix} Uptime"
+    name: "Uptime"
   # Register: 1 -> Is present in this config as a 'select'
   # Register: 2 -> Is present in this config as a 'number'
   # Register: 3
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Air Temperature Ts"
+    name: "Air Temperature Ts"
     id: "${devicename}_air_temperature_ts"
     register_type: holding
     address: 0x3
@@ -329,7 +328,7 @@ sensor:
   # Register: 4
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} DHW Tank Temperature T5s"
+    name: "DHW Tank Temperature T5s"
     id: "${devicename}_dhw_tank_temperature_t5s"
     register_type: holding
     address: 0x4
@@ -339,7 +338,7 @@ sensor:
   # Register: 7
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Forced Water Tank Heating"
+    name: "Forced Water Tank Heating"
     id: "${devicename}_forced_water_tank_heating"
     register_type: holding
     address: 0x7
@@ -347,7 +346,7 @@ sensor:
   # Register: 8
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Forced Tank Backup Heater"
+    name: "Forced Tank Backup Heater"
     id: "${devicename}_forced_tbh"
     register_type: holding
     address: 0x8
@@ -355,7 +354,7 @@ sensor:
   # Register: 9
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Forced Hydraulic Module Rear Electric Heater 1"
+    name: "Forced Hydraulic Module Rear Electric Heater 1"
     id: "${devicename}_forced_hydraulic_module_rear_electric_heater_1"
     register_type: holding
     address: 0x9
@@ -363,7 +362,7 @@ sensor:
   # Register: 10
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} t_SG_MAX"
+    name: "t_SG_MAX"
     id: "${devicename}_t_sg_max"
     register_type: holding
     address: 0xa
@@ -373,7 +372,7 @@ sensor:
   # Register: 100
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Compressor Operating Frequency"
+    name: "Compressor Operating Frequency"
     id: "${devicename}_compressor_operating_frequency"
     register_type: holding
     address: 0x64
@@ -382,7 +381,7 @@ sensor:
   # Register: 101
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Operating Mode"
+    name: "Operating Mode"
     id: "${devicename}_operating_mode"
     register_type: holding
     address: 0x65
@@ -390,7 +389,7 @@ sensor:
   # Register: 102
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Fan Speed"
+    name: "Fan Speed"
     id: "${devicename}_fan_speed"
     register_type: holding
     address: 0x66
@@ -400,7 +399,7 @@ sensor:
   # Register: 103
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} PMV Openness"
+    name: "PMV Openness"
     id: "${devicename}_pmv_openness"
     register_type: holding
     address: 0x67
@@ -409,7 +408,7 @@ sensor:
   # Register: 104
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Water Inlet Temperature"
+    name: "Water Inlet Temperature"
     id: "${devicename}_water_inlet_temperature"
     register_type: holding
     address: 0x68
@@ -418,7 +417,7 @@ sensor:
   # Register: 105
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Water Outlet Temperature"
+    name: "Water Outlet Temperature"
     id: "${devicename}_water_outlet_temperature"
     register_type: holding
     address: 0x69
@@ -427,7 +426,7 @@ sensor:
   # Register: 106
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Condensor Temperature T3"
+    name: "Condensor Temperature T3"
     id: "${devicename}_condensor_temperature_t3"
     register_type: holding
     address: 0x6a
@@ -436,7 +435,7 @@ sensor:
   # Register: 107
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Outdoor Ambient Temperature"
+    name: "Outdoor Ambient Temperature"
     id: "${devicename}_outdoor_ambient_temperature"
     register_type: holding
     address: 0x6B
@@ -445,7 +444,7 @@ sensor:
   # Register: 108
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Discharge Temperature"
+    name: "Discharge Temperature"
     id: "${devicename}_discharge_temperature"
     register_type: holding
     address: 0x6c
@@ -454,7 +453,7 @@ sensor:
   # Register: 109
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Return Air Temperature"
+    name: "Return Air Temperature"
     id: "${devicename}_return_air_temperature"
     register_type: holding
     address: 0x6d
@@ -463,7 +462,7 @@ sensor:
   # Register: 110
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Total Water Outlet Temperature T1"
+    name: "Total Water Outlet Temperature T1"
     id: "${devicename}_total_water_outlet_temperature_t1"
     register_type: holding
     address: 0x6e
@@ -472,7 +471,7 @@ sensor:
   # Register: 111
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} System Total Water Outlet Temperature T1B"
+    name: "System Total Water Outlet Temperature T1B"
     id: "${devicename}_system_total_water_outlet_temperature_t1b"
     register_type: holding
     address: 0x6f
@@ -481,7 +480,7 @@ sensor:
   # Register: 112
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Refrigerant Liquid Side Temperature T2"
+    name: "Refrigerant Liquid Side Temperature T2"
     id: "${devicename}_refrigerant_liquid_side_temperature_t2"
     register_type: holding
     address: 0x70
@@ -490,7 +489,7 @@ sensor:
   # Register: 113
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Refrigerant Gas Side Temperature T2B"
+    name: "Refrigerant Gas Side Temperature T2B"
     id: "${devicename}_refrigerant_gas_side_temperature_t2b"
     register_type: holding
     address: 0x71
@@ -499,7 +498,7 @@ sensor:
   # Register: 114
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Room Temperature Ta"
+    name: "Room Temperature Ta"
     id: "${devicename}_room_temperature_ta"
     register_type: holding
     address: 0x72
@@ -508,7 +507,7 @@ sensor:
   # Register: 115
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Water Tank Temperature T5"
+    name: "Water Tank Temperature T5"
     id: "${devicename}_water_tank_temperature_t5"
     register_type: holding
     address: 0x73
@@ -518,7 +517,7 @@ sensor:
   # Register: 116
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Outdoor Unit High Pressure"
+    name: "Outdoor Unit High Pressure"
     id: "${devicename}_outdoor_unit_high_pressure"
     register_type: holding
     address: 0x74
@@ -527,7 +526,7 @@ sensor:
   # Register: 117
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix}  Outdoor Unit Low Pressure"
+    name: " Outdoor Unit Low Pressure"
     id: "${devicename}_outdoor_unit_low_pressure"
     register_type: holding
     address: 0x75
@@ -536,7 +535,7 @@ sensor:
   # Register: 118
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Outdoor Unit Current"
+    name: "Outdoor Unit Current"
     id: "${devicename}_outdoor_unit_current"
     register_type: holding
     address: 0x76
@@ -545,7 +544,7 @@ sensor:
   # Register: 119
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Outdoor Unit Voltage"
+    name: "Outdoor Unit Voltage"
     id: "${devicename}_outdoor_unit_voltage"
     register_type: holding
     address: 0x77
@@ -555,7 +554,7 @@ sensor:
   # Midea: Tbt1
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Hydraulic Module Current 1"
+    name: "Hydraulic Module Current 1"
     id: "${devicename}_hydraulic_module_current_1"
     register_type: holding
     address: 0x78
@@ -564,7 +563,7 @@ sensor:
   # Midea: Tbt2
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Hydraulic Module Current 2"
+    name: "Hydraulic Module Current 2"
     id: "${devicename}_hydraulic_module_current_2"
     register_type: holding
     address: 0x79
@@ -572,7 +571,7 @@ sensor:
   # Register: 122
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Compressor Operation Time"
+    name: "Compressor Operation Time"
     id: "${devicename}_compressor_operation_time"
     register_type: holding
     address: 0x7a
@@ -581,7 +580,7 @@ sensor:
   # Register: 123
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Unit Capacity"
+    name: "Unit Capacity"
     id: "${devicename}_unit_capacity"
     register_type: holding
     address: 0x7b
@@ -589,7 +588,7 @@ sensor:
   # Register: 124
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Current Fault"
+    name: "Current Fault"
     id: "${devicename}_current_fault"
     register_type: holding
     entity_category: diagnostic
@@ -598,7 +597,7 @@ sensor:
   # Register: 125
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Fault 1"
+    name: "Fault 1"
     id: "${devicename}_fault_1"
     register_type: holding
     entity_category: diagnostic
@@ -607,7 +606,7 @@ sensor:
   # Register: 126
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Fault 2"
+    name: "Fault 2"
     id: "${devicename}_fault_2"
     register_type: holding
     entity_category: diagnostic
@@ -616,7 +615,7 @@ sensor:
   # Register: 127
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Fault 3"
+    name: "Fault 3"
     id: "${devicename}_fault_3"
     register_type: holding
     entity_category: diagnostic
@@ -625,7 +624,7 @@ sensor:
   # Register: 130
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Software Version"
+    name: "Software Version"
     id: "${devicename}_software_version"
     register_type: holding
     address: 0x82
@@ -633,7 +632,7 @@ sensor:
   # Register: 131
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Wired Controller Version Number"
+    name: "Wired Controller Version Number"
     id: "${devicename}_wired_controller_version_number"
     register_type: holding
     address: 0x83
@@ -641,7 +640,7 @@ sensor:
   # Register: 132
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Compressor Target Frequency"
+    name: "Compressor Target Frequency"
     id: "${devicename}_compressor_target_frequency"
     register_type: holding
     address: 0x84
@@ -650,7 +649,7 @@ sensor:
   # Register: 133
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} DC Bus Current"
+    name: "DC Bus Current"
     id: "${devicename}_dc_bus_current"
     register_type: holding
     address: 0x85
@@ -659,7 +658,7 @@ sensor:
   # Register: 134
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} DC Bus Voltage"
+    name: "DC Bus Voltage"
     id: "${devicename}_dc_bus_voltage"
     register_type: holding
     address: 0x86
@@ -670,7 +669,7 @@ sensor:
   # Register: 135
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} TF module temperature"
+    name: "TF module temperature"
     id: "${devicename}_tf_module_temperature"
     register_type: holding
     address: 0x87
@@ -679,7 +678,7 @@ sensor:
   # Register: 136
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Climate Curve T1S Calculated Value 1"
+    name: "Climate Curve T1S Calculated Value 1"
     id: "${devicename}_climate_curve_t1s_calculated_value_1"
     register_type: holding
     address: 0x88
@@ -688,7 +687,7 @@ sensor:
   # Register: 137
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Climate Curve T1S Calculated Value 2"
+    name: "Climate Curve T1S Calculated Value 2"
     id: "${devicename}_climate_curve_t1s_calculated_value_2"
     register_type: holding
     address: 0x89
@@ -697,7 +696,7 @@ sensor:
   # Register: 138
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Water Flow"
+    name: "Water Flow"
     id: "${devicename}_water_flow"
     register_type: holding
     address: 0x8a
@@ -709,7 +708,7 @@ sensor:
   # Register: 139
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Limit Scheme Of Outdoor Unit Current"
+    name: "Limit Scheme Of Outdoor Unit Current"
     id: "${devicename}_limit_scheme_of_outdoor_unit_current"
     register_type: holding
     address: 0x8b
@@ -717,7 +716,7 @@ sensor:
   # Register: 140
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Ability Of Hydraulic Module"
+    name: "Ability Of Hydraulic Module"
     id: "${devicename}_ability_of_hydraulic_module"
     register_type: holding
     address: 0x8c
@@ -729,7 +728,7 @@ sensor:
   # Register: 141
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Tsolar"
+    name: "Tsolar"
     id: "${devicename}_tsolar"
     register_type: holding
     address: 0x8d
@@ -738,7 +737,7 @@ sensor:
   # U_DWORD combines this register with the next one
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Electricity Consumption"
+    name: "Electricity Consumption"
     id: "${devicename}_electricity_consumption"
     register_type: holding
     unit_of_measurement: "kWh"
@@ -750,7 +749,7 @@ sensor:
   # U_DWORD combines this register with the next one
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Power Output"
+    name: "Power Output"
     id: "${devicename}_power_output"
     register_type: holding
     unit_of_measurement: "kWh"
@@ -764,7 +763,7 @@ sensor:
   # Register: 200 (High byte)
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Home Appliance Type"
+    name: "Home Appliance Type"
     id: "${devicename}_home_appliance_type"
     register_type: holding
     address: 0xc8
@@ -773,7 +772,7 @@ sensor:
   # Register: 200 (Low byte, first 4 bits)
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Home Appliance Sub Type"
+    name: "Home Appliance Sub Type"
     id: "${devicename}_home_appliance_sub_type"
     register_type: holding
     address: 0xc8
@@ -782,7 +781,7 @@ sensor:
   # Register: 200 (Low byte, second 4 bits)
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Home Appliance Product Code"
+    name: "Home Appliance Product Code"
     id: "${devicename}_home_appliance_product_code"
     register_type: holding
     address: 0xc8
@@ -791,7 +790,7 @@ sensor:
   # Register: 201 (Low), default: 25, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Temperature Upper Limit Of T1S Cooling Zone 1"
+    name: "Temperature Upper Limit Of T1S Cooling Zone 1"
     id: "${devicename}_temperature_upper_limit_of_t1s_cooling_zone_1"
     register_type: holding
     address: 0xc9
@@ -801,7 +800,7 @@ sensor:
   # Register: 201 (High), default: 25, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Temperature Upper Limit Of T1S Cooling Zone 2"
+    name: "Temperature Upper Limit Of T1S Cooling Zone 2"
     id: "${devicename}_temperature_upper_limit_of_t1s_cooling_zone_2"
     register_type: holding
     address: 0xc9
@@ -811,7 +810,7 @@ sensor:
   # Register: 202 (Low), default: 5, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Temperature Lower Limit Of T1S Cooling Zone 1"
+    name: "Temperature Lower Limit Of T1S Cooling Zone 1"
     id: "${devicename}_temperature_lower_limit_of_t1s_cooling_zone_1"
     register_type: holding
     address: 0xca
@@ -821,7 +820,7 @@ sensor:
   # Register: 202 (High), default: 5, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Temperature Lower Limit Of T1S Cooling Zone 2"
+    name: "Temperature Lower Limit Of T1S Cooling Zone 2"
     id: "${devicename}_temperature_lower_limit_of_t1s_cooling_zone_2"
     register_type: holding
     address: 0xca
@@ -831,7 +830,7 @@ sensor:
   # Register: 203 (Low), default: 55, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Temperature Upper Limit Of T1S Heating Zone 1"
+    name: "Temperature Upper Limit Of T1S Heating Zone 1"
     id: "${devicename}_temperature_upper_limit_of_t1s_heating_zone_1"
     register_type: holding
     address: 0xcb
@@ -841,7 +840,7 @@ sensor:
   # Register: 203 (High), default: 55, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Temperature Upper Limit Of T1S Heating Zone 2"
+    name: "Temperature Upper Limit Of T1S Heating Zone 2"
     id: "${devicename}_temperature_upper_limit_of_t1s_heating_zone_2"
     register_type: holding
     address: 0xcb
@@ -851,7 +850,7 @@ sensor:
   # Register: 204 (Low), default: 25, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Temperature Lower Limit Of T1S Heating Zone 1"
+    name: "Temperature Lower Limit Of T1S Heating Zone 1"
     id: "${devicename}_temperature_lower_limit_of_t1s_heating_zone_1"
     register_type: holding
     address: 0xcc
@@ -861,7 +860,7 @@ sensor:
   # Register: 204 (High), default: 25, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Temperature Lower Limit Of T1S Heating Zone 2"
+    name: "Temperature Lower Limit Of T1S Heating Zone 2"
     id: "${devicename}_temperature_lower_limit_of_t1s_heating_zone_2"
     register_type: holding
     address: 0xcc
@@ -871,7 +870,7 @@ sensor:
   # Register: 205
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Temperature Upper Limit Of TS Setting"
+    name: "Temperature Upper Limit Of TS Setting"
     id: "${devicename}_temperature_upper_limit_of_ts_setting"
     register_type: holding
     address: 0xcd
@@ -882,7 +881,7 @@ sensor:
   # Register: 206
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Temperature Lower Limit Of TS Setting"
+    name: "Temperature Lower Limit Of TS Setting"
     id: "${devicename}_temperature_lower_limit_of_ts_setting"
     register_type: holding
     address: 0xce
@@ -893,7 +892,7 @@ sensor:
   # Register: 207
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Temperature Upper Limit Of water Heating"
+    name: "Temperature Upper Limit Of water Heating"
     id: "${devicename}_temperature_upper_limit_of_water_heating"
     register_type: holding
     address: 0xcf
@@ -902,7 +901,7 @@ sensor:
   # Register: 208
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Temperature Lower Limit Of Water Heating"
+    name: "Temperature Lower Limit Of Water Heating"
     id: "${devicename}_temperature_lower_limit_of_water_heating"
     register_type: holding
     address: 0xd0
@@ -951,7 +950,7 @@ sensor:
   # Register: 253
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Comfort Parameter Reserved 3"
+    name: "Comfort Parameter Reserved 3"
     id: "${devicename}_comfort_parameter_3"
     register_type: holding
     address: 0xfd
@@ -959,7 +958,7 @@ sensor:
   # Register: 254
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Comfort Parameter Reserved 4"
+    name: "Comfort Parameter Reserved 4"
     id: "${devicename}_comfort_parameter_4"
     register_type: holding
     address: 0xfe
@@ -985,7 +984,7 @@ sensor:
 
   # Template sensor to get the T1S value for DHW (T1S=T5+dT1S5).
   - platform: template
-    name: "${entity_prefix} T1S DHW"
+    name: "T1S DHW"
     id: "${devicename}_t1s_dhw"
     lambda: |-
       int dt1s5 = id(${devicename}_dt1s5).state;
@@ -1002,7 +1001,7 @@ binary_sensor:
   # Bit: 4
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Power Reserved BIT 4"
+    name: "Power Reserved BIT 4"
     id: "${devicename}_power_reserved_bit_4"
     register_type: holding
     address: 0x0
@@ -1010,7 +1009,7 @@ binary_sensor:
   # Bit: 5
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Power Reserved BIT 5"
+    name: "Power Reserved BIT 5"
     id: "${devicename}_power_reserved_bit_5"
     register_type: holding
     address: 0x0
@@ -1018,7 +1017,7 @@ binary_sensor:
   # Bit: 6
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Power Reserved BIT 6"
+    name: "Power Reserved BIT 6"
     id: "${devicename}_power_reserved_bit_6"
     register_type: holding
     address: 0x0
@@ -1026,7 +1025,7 @@ binary_sensor:
   # Bit: 7
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Power Reserved BIT 7"
+    name: "Power Reserved BIT 7"
     id: "${devicename}_power_reserved_bit_7"
     register_type: holding
     address: 0x0
@@ -1034,7 +1033,7 @@ binary_sensor:
   # Bit: 8
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Power Reserved BIT 8"
+    name: "Power Reserved BIT 8"
     id: "${devicename}_power_reserved_bit_8"
     register_type: holding
     address: 0x0
@@ -1042,7 +1041,7 @@ binary_sensor:
   # Bit: 9
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Power Reserved BIT 9"
+    name: "Power Reserved BIT 9"
     id: "${devicename}_power_reserved_bit_9"
     register_type: holding
     address: 0x0
@@ -1050,7 +1049,7 @@ binary_sensor:
   # Bit: 10
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Power Reserved BIT 10"
+    name: "Power Reserved BIT 10"
     id: "${devicename}_power_reserved_bit_10"
     register_type: holding
     address: 0x0
@@ -1058,7 +1057,7 @@ binary_sensor:
   # Bit: 11
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Power Reserved BIT 11"
+    name: "Power Reserved BIT 11"
     id: "${devicename}_power_reserved_bit_11"
     register_type: holding
     address: 0x0
@@ -1066,7 +1065,7 @@ binary_sensor:
   # Bit: 12
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Power Reserved BIT 12"
+    name: "Power Reserved BIT 12"
     id: "${devicename}_power_reserved_bit_12"
     register_type: holding
     address: 0x0
@@ -1074,7 +1073,7 @@ binary_sensor:
   # Bit: 13
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Power Reserved BIT 13"
+    name: "Power Reserved BIT 13"
     id: "${devicename}_power_reserved_bit_13"
     register_type: holding
     address: 0x0
@@ -1082,7 +1081,7 @@ binary_sensor:
   # Bit: 14
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Power Reserved BIT 14"
+    name: "Power Reserved BIT 14"
     id: "${devicename}_power_reserved_bit_14"
     register_type: holding
     address: 0x0
@@ -1090,7 +1089,7 @@ binary_sensor:
   # Bit: 15
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Power Reserved BIT 15"
+    name: "Power Reserved BIT 15"
     id: "${devicename}_power_reserved_bit_15"
     register_type: holding
     address: 0x0
@@ -1100,7 +1099,7 @@ binary_sensor:
   # Bit: 0
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Function Setting Reserved BIT 0"
+    name: "Function Setting Reserved BIT 0"
     id: "${devicename}_function_setting_reserved_bit_0"
     register_type: holding
     address: 0x5
@@ -1108,7 +1107,7 @@ binary_sensor:
   # Bit: 1
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Function Setting Reserved BIT 1"
+    name: "Function Setting Reserved BIT 1"
     id: "${devicename}_function_setting_reserved_bit_1"
     register_type: holding
     address: 0x5
@@ -1116,7 +1115,7 @@ binary_sensor:
   # Bit: 2
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Function Setting Reserved BIT 2"
+    name: "Function Setting Reserved BIT 2"
     id: "${devicename}_function_setting_reserved_bit_2"
     register_type: holding
     address: 0x5
@@ -1124,7 +1123,7 @@ binary_sensor:
   # Bit: 3
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Function Setting Reserved BIT 3"
+    name: "Function Setting Reserved BIT 3"
     id: "${devicename}_function_setting_reserved_bit_3"
     register_type: holding
     address: 0x5
@@ -1132,7 +1131,7 @@ binary_sensor:
   # Bit: 4
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Function Setting Disinfect"
+    name: "Function Setting Disinfect"
     id: "${devicename}_function_setting_disinfect"
     register_type: holding
     address: 0x5
@@ -1140,7 +1139,7 @@ binary_sensor:
   # Bit: 5
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Function Setting Holiday Away"
+    name: "Function Setting Holiday Away"
     id: "${devicename}_function_setting_holiday_away"
     register_type: holding
     address: 0x5
@@ -1148,7 +1147,7 @@ binary_sensor:
   # Bit: 6
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Function Setting Silent Mode"
+    name: "Function Setting Silent Mode"
     id: "${devicename}_function_setting_silent_mode"
     register_type: holding
     address: 0x5
@@ -1156,7 +1155,7 @@ binary_sensor:
   # Bit: 7
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Function Setting Silent Mode Level"
+    name: "Function Setting Silent Mode Level"
     id: "${devicename}_function_setting_silent_mode_level"
     register_type: holding
     address: 0x5
@@ -1164,7 +1163,7 @@ binary_sensor:
   # Bit: 8
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Function Setting Holiday Home"
+    name: "Function Setting Holiday Home"
     id: "${devicename}_function_setting_holiday_home"
     register_type: holding
     address: 0x5
@@ -1172,7 +1171,7 @@ binary_sensor:
   # Bit: 9
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Function Setting Reserved BIT 9"
+    name: "Function Setting Reserved BIT 9"
     id: "${devicename}_function_setting_reserved_bit_9"
     register_type: holding
     address: 0x5
@@ -1180,7 +1179,7 @@ binary_sensor:
   # Bit: 10
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Function Setting ECO Mode"
+    name: "Function Setting ECO Mode"
     id: "${devicename}_function_setting_eco_mode"
     register_type: holding
     address: 0x5
@@ -1188,7 +1187,7 @@ binary_sensor:
   # Bit: 11
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Function Setting DHW Pumps Running Constant Temperature Water Recycling"
+    name: "Function Setting DHW Pumps Running Constant Temperature Water Recycling"
     id: "${devicename}_function_setting_dhw_pumps_running_constant_temperature_water_recycling"
     register_type: holding
     address: 0x5
@@ -1198,7 +1197,7 @@ binary_sensor:
   # Bit: 14
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Function Setting Reserved BIT 14"
+    name: "Function Setting Reserved BIT 14"
     id: "${devicename}_function_setting_reserved_bit_14"
     register_type: holding
     address: 0x5
@@ -1206,7 +1205,7 @@ binary_sensor:
   # Bit: 15
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Function Setting Reserved BIT 15"
+    name: "Function Setting Reserved BIT 15"
     id: "${devicename}_function_setting_reserved_bit_15"
     register_type: holding
     address: 0x5
@@ -1216,7 +1215,7 @@ binary_sensor:
   # Bit: 0
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Status BIT 1 Reserved BIT 0"
+    name: "Status BIT 1 Reserved BIT 0"
     id: "${devicename}_status_bit_1_reserved_bit_0"
     register_type: holding
     address: 0x80
@@ -1224,7 +1223,7 @@ binary_sensor:
   # Bit: 1
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Status BIT 1 Defrosting"
+    name: "Status BIT 1 Defrosting"
     id: "${devicename}_status_bit_1_defrosting"
     register_type: holding
     address: 0x80
@@ -1232,7 +1231,7 @@ binary_sensor:
   # Bit: 2
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Status BIT 1 Anti Freezing"
+    name: "Status BIT 1 Anti Freezing"
     id: "${devicename}_status_bit_1_anti_freezing"
     register_type: holding
     address: 0x80
@@ -1240,7 +1239,7 @@ binary_sensor:
   # Bit: 3
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Status BIT 1 Oil Return"
+    name: "Status BIT 1 Oil Return"
     id: "${devicename}_status_bit_1_oil_return"
     register_type: holding
     address: 0x80
@@ -1248,7 +1247,7 @@ binary_sensor:
   # Bit: 4
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Status BIT 1 Remote On/Off"
+    name: "Status BIT 1 Remote On/Off"
     id: "${devicename}_status_bit_1_remote_on_off"
     register_type: holding
     address: 0x80
@@ -1256,7 +1255,7 @@ binary_sensor:
   # Bit: 5
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Status BIT 1 Outdoor Unit Test Mode Mark"
+    name: "Status BIT 1 Outdoor Unit Test Mode Mark"
     id: "${devicename}_status_bit_1_outdoor_unit_test_mode_mark"
     register_type: holding
     address: 0x80
@@ -1264,7 +1263,7 @@ binary_sensor:
   # Bit: 6
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Status BIT 1 Heating Mode Set By Room Thermostat"
+    name: "Status BIT 1 Heating Mode Set By Room Thermostat"
     id: "${devicename}_status_bit_1_heating_mode_set_by_room_thermostat"
     register_type: holding
     address: 0x80
@@ -1272,7 +1271,7 @@ binary_sensor:
   # Bit: 7
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Status BIT 1 Cooling Mode Set By Room Thermostat"
+    name: "Status BIT 1 Cooling Mode Set By Room Thermostat"
     id: "${devicename}_status_bit_1_cooling_mode_set_by_room_thermostat"
     register_type: holding
     address: 0x80
@@ -1280,7 +1279,7 @@ binary_sensor:
   # Bit: 8
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Status BIT 1 Solar Energy Signal Input"
+    name: "Status BIT 1 Solar Energy Signal Input"
     id: "${devicename}_status_bit_1_solar_energy_signal_input"
     register_type: holding
     address: 0x80
@@ -1288,7 +1287,7 @@ binary_sensor:
   # Bit: 9
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Status BIT 1 Anti Freezing Operation For Water Tank"
+    name: "Status BIT 1 Anti Freezing Operation For Water Tank"
     id: "${devicename}_status_bit_1_anti_freezing_operation_for_water_tank"
     register_type: holding
     address: 0x80
@@ -1296,7 +1295,7 @@ binary_sensor:
   # Bit: 10
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Status BIT 1 SG"
+    name: "Status BIT 1 SG"
     id: "${devicename}_status_bit_1_sg"
     register_type: holding
     address: 0x80
@@ -1304,14 +1303,14 @@ binary_sensor:
   # Bit: 11
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Status BIT 1 EUV"
+    name: "Status BIT 1 EUV"
     id: "${devicename}_status_bit_1_euv"
     register_type: holding
     address: 0x80
     bitmask: 0x800
   # Bit: 12
   - platform: modbus_controller
-    name: "${entity_prefix} Status BIT 1 Reserved BIT 12"
+    name: "Status BIT 1 Reserved BIT 12"
     modbus_controller_id: "${devicename}"
     id: "${devicename}_status_bit_1_reserved_bit_12"
     register_type: holding
@@ -1320,7 +1319,7 @@ binary_sensor:
   # Bit: 13
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Status BIT 1 Request Serial Number Code"
+    name: "Status BIT 1 Request Serial Number Code"
     id: "${devicename}_status_bit_1_request_serial_number_code"
     register_type: holding
     address: 0x80
@@ -1328,7 +1327,7 @@ binary_sensor:
   # Bit: 14
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Status BIT 1 Request Software Version"
+    name: "Status BIT 1 Request Software Version"
     id: "${devicename}_status_bit_1_request_software_version"
     register_type: holding
     address: 0x80
@@ -1336,7 +1335,7 @@ binary_sensor:
   # Bit: 15
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Status BIT 1 Request Operation Parameter"
+    name: "Status BIT 1 Request Operation Parameter"
     id: "${devicename}_status_bit_1_request_operation_parameter"
     register_type: holding
     address: 0x80
@@ -1346,7 +1345,7 @@ binary_sensor:
   # Bit: 0
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Load Output Electric Heater IBH 1"
+    name: "Load Output Electric Heater IBH 1"
     id: "${devicename}_load_output_electric_heater_ibh1"
     register_type: holding
     address: 0x81
@@ -1354,7 +1353,7 @@ binary_sensor:
   # Bit: 1
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Load Output Electric Heater IBH 2"
+    name: "Load Output Electric Heater IBH 2"
     id: "${devicename}_load_output_reserved"
     register_type: holding
     address: 0x81
@@ -1362,7 +1361,7 @@ binary_sensor:
   # Bit: 2
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Load Output Electric Heater TBH"
+    name: "Load Output Electric Heater TBH"
     id: "${devicename}_load_output_electric_heater_tbh"
     register_type: holding
     address: 0x81
@@ -1370,7 +1369,7 @@ binary_sensor:
   # Bit: 3
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Load Output Water Pump PUMP_I"
+    name: "Load Output Water Pump PUMP_I"
     id: "${devicename}_load_output_water_pump_pump_i"
     register_type: holding
     address: 0x81
@@ -1378,7 +1377,7 @@ binary_sensor:
   # Bit: 4
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Load Output SV 1"
+    name: "Load Output SV 1"
     id: "${devicename}_load_output_sv1"
     register_type: holding
     address: 0x81
@@ -1386,7 +1385,7 @@ binary_sensor:
   # Bit: 5
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Load Output Reserved BIT 5"
+    name: "Load Output Reserved BIT 5"
     id: "${devicename}_load_output_reserved_bit_5"
     register_type: holding
     address: 0x81
@@ -1394,7 +1393,7 @@ binary_sensor:
   # Bit: 6
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Load Output External Water Pump P_o"
+    name: "Load Output External Water Pump P_o"
     id: "${devicename}_load_output_external_water_pump_p_o"
     register_type: holding
     address: 0x81
@@ -1402,7 +1401,7 @@ binary_sensor:
   # Bit: 7
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Load Output Water Return Water P_d"
+    name: "Load Output Water Return Water P_d"
     id: "${devicename}_load_output_water_return_water_p_d"
     register_type: holding
     address: 0x81
@@ -1410,7 +1409,7 @@ binary_sensor:
   # Bit: 8
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Load Output Mixed Water Pump P_c"
+    name: "Load Output Mixed Water Pump P_c"
     id: "${devicename}_load_output_mixed_water_pump_p_c"
     register_type: holding
     address: 0x81
@@ -1418,7 +1417,7 @@ binary_sensor:
   # Bit: 9
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Load Output SV 2"
+    name: "Load Output SV 2"
     id: "${devicename}_load_output_sv2"
     register_type: holding
     address: 0x81
@@ -1426,7 +1425,7 @@ binary_sensor:
   # Bit: 10
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Load Output HEAT 4"
+    name: "Load Output HEAT 4"
     id: "${devicename}_load_output_heat4"
     register_type: holding
     address: 0x81
@@ -1434,7 +1433,7 @@ binary_sensor:
   # Bit: 11
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Load Output Solar Water Pump"
+    name: "Load Output Solar Water Pump"
     id: "${devicename}_load_output_solar_water_pump"
     register_type: holding
     address: 0x81
@@ -1442,7 +1441,7 @@ binary_sensor:
   # Bit: 12
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Load Output ALARM"
+    name: "Load Output ALARM"
     id: "${devicename}_load_output_alarm"
     register_type: holding
     entity_category: diagnostic
@@ -1451,7 +1450,7 @@ binary_sensor:
   # Bit: 13
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Load Output RUN"
+    name: "Load Output RUN"
     id: "${devicename}_load_output_run"
     register_type: holding
     address: 0x81
@@ -1459,7 +1458,7 @@ binary_sensor:
   # Bit: 14
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Load Output Auxiliary Heat Source"
+    name: "Load Output Auxiliary Heat Source"
     id: "${devicename}_load_output_auxiliary_heat_source"
     register_type: holding
     address: 0x81
@@ -1467,7 +1466,7 @@ binary_sensor:
   # Bit: 15
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Load Output DEFROST"
+    name: "Load Output DEFROST"
     id: "${devicename}_load_output_defrost"
     register_type: holding
     address: 0x81
@@ -1478,7 +1477,7 @@ binary_sensor:
   # Bit: 0
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Slave Unit Online Status: Reserved BIT 0"
+    name: "Slave Unit Online Status: Reserved BIT 0"
     id: "${devicename}_slave_unit_online_status_reserved_bit_0"
     register_type: holding
     address: 0x8e
@@ -1486,7 +1485,7 @@ binary_sensor:
   # Bit: 1
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Slave Unit 1 Online Status"
+    name: "Slave Unit 1 Online Status"
     id: "${devicename}_slave_unit_1_online_status"
     register_type: holding
     address: 0x8e
@@ -1494,7 +1493,7 @@ binary_sensor:
   # Bit: 2
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Slave Unit 2 Online Status"
+    name: "Slave Unit 2 Online Status"
     id: "${devicename}_slave_unit_2_online_status"
     register_type: holding
     address: 0x8e
@@ -1502,7 +1501,7 @@ binary_sensor:
   # Bit: 3
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Slave Unit 3 Online Status"
+    name: "Slave Unit 3 Online Status"
     id: "${devicename}_slave_unit_3_online_status"
     register_type: holding
     address: 0x8e
@@ -1510,7 +1509,7 @@ binary_sensor:
   # Bit: 4
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Slave Unit 4 Online Status"
+    name: "Slave Unit 4 Online Status"
     id: "${devicename}_slave_unit_4_online_status"
     register_type: holding
     address: 0x8e
@@ -1518,7 +1517,7 @@ binary_sensor:
   # Bit: 5
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Slave Unit 5 Online Status"
+    name: "Slave Unit 5 Online Status"
     id: "${devicename}_slave_unit_5_online_status"
     register_type: holding
     address: 0x8e
@@ -1526,7 +1525,7 @@ binary_sensor:
   # Bit: 6
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Slave Unit 6 Online Status"
+    name: "Slave Unit 6 Online Status"
     id: "${devicename}_slave_unit_6_online_status"
     register_type: holding
     address: 0x8e
@@ -1534,7 +1533,7 @@ binary_sensor:
   # Bit: 7
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Slave Unit 7 Online Status"
+    name: "Slave Unit 7 Online Status"
     id: "${devicename}_slave_unit_7_online_status"
     register_type: holding
     address: 0x8e
@@ -1542,7 +1541,7 @@ binary_sensor:
   # Bit: 8
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Slave Unit 8 Online Status"
+    name: "Slave Unit 8 Online Status"
     id: "${devicename}_slave_unit_8_online_status"
     register_type: holding
     address: 0x8e
@@ -1550,7 +1549,7 @@ binary_sensor:
   # Bit: 9
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Slave Unit 9 Online Status"
+    name: "Slave Unit 9 Online Status"
     id: "${devicename}_slave_unit_9_online_status"
     register_type: holding
     address: 0x8e
@@ -1558,7 +1557,7 @@ binary_sensor:
   # Bit: 10
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Slave Unit 10 Online Status"
+    name: "Slave Unit 10 Online Status"
     id: "${devicename}_slave_unit_10_online_status"
     register_type: holding
     address: 0x8e
@@ -1566,7 +1565,7 @@ binary_sensor:
   # Bit: 11
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Slave Unit 11 Online Status"
+    name: "Slave Unit 11 Online Status"
     id: "${devicename}_slave_unit_11_online_status"
     register_type: holding
     address: 0x8e
@@ -1574,7 +1573,7 @@ binary_sensor:
   # Bit: 12
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Slave Unit 12 Online Status"
+    name: "Slave Unit 12 Online Status"
     id: "${devicename}_slave_unit_12_online_status"
     register_type: holding
     address: 0x8e
@@ -1582,7 +1581,7 @@ binary_sensor:
   # Bit: 13
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Slave Unit 13 Online Status"
+    name: "Slave Unit 13 Online Status"
     id: "${devicename}_slave_unit_13_online_status"
     register_type: holding
     address: 0x8e
@@ -1590,7 +1589,7 @@ binary_sensor:
   # Bit: 14
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Slave Unit 14 Online Status"
+    name: "Slave Unit 14 Online Status"
     id: "${devicename}_slave_unit_14_online_status"
     register_type: holding
     address: 0x8e
@@ -1598,7 +1597,7 @@ binary_sensor:
   # Bit: 15
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Slave Unit 15 Online Status"
+    name: "Slave Unit 15 Online Status"
     id: "${devicename}_slave_unit_15_online_status"
     register_type: holding
     address: 0x8e
@@ -1608,7 +1607,7 @@ binary_sensor:
   # Bit: 0
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 1 Heating And Cooling First Or Water First"
+    name: "Parameter Setting 1 Heating And Cooling First Or Water First"
     id: "${devicename}_parameter_setting_1_heating_and_cooling_first_or_water_first"
     register_type: holding
     address: 0xd2
@@ -1616,7 +1615,7 @@ binary_sensor:
   # Bit: 1, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 1 Dual Room Thermostat Supported"
+    name: "Parameter Setting 1 Dual Room Thermostat Supported"
     id: "${devicename}_parameter_setting_1_dual_room_thermostat_supported"
     register_type: holding
     address: 0xd2
@@ -1624,7 +1623,7 @@ binary_sensor:
   # Bit: 2, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 1 Room Thermostat"
+    name: "Parameter Setting 1 Room Thermostat"
     id: "${devicename}_parameter_setting_1_room_thermostat"
     register_type: holding
     address: 0xd2
@@ -1632,7 +1631,7 @@ binary_sensor:
   # Bit: 3, default: true, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 1 Supports Room Thermostat"
+    name: "Parameter Setting 1 Supports Room Thermostat"
     id: "${devicename}_parameter_setting_1_supports_room_thermostat"
     register_type: holding
     address: 0xd2
@@ -1640,7 +1639,7 @@ binary_sensor:
   # Bit: 4, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 1 Supports Room Temperature Sensor Ta"
+    name: "Parameter Setting 1 Supports Room Temperature Sensor Ta"
     id: "${devicename}_parameter_setting_1_supports_room_temperature_sensor_ta"
     register_type: holding
     address: 0xd2
@@ -1649,7 +1648,7 @@ binary_sensor:
   # Midea: PUMPI silent mode, 1; valid, 0: invalid
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 1 Supports T1 Sensor"
+    name: "Parameter Setting 1 Supports T1 Sensor"
     id: "${devicename}_parameter_setting_1_supports_t1_sensor"
     register_type: holding
     address: 0xd2
@@ -1657,7 +1656,7 @@ binary_sensor:
   # Bit: 6, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 1 T1S Heating High Low Temperature Settings"
+    name: "Parameter Setting 1 T1S Heating High Low Temperature Settings"
     id: "${devicename}_parameter_setting_1_t1s_heating_high_low_temperature_settings"
     register_type: holding
     address: 0xd2
@@ -1665,7 +1664,7 @@ binary_sensor:
   # Bit: 7, default: true, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 1 Enable Heating"
+    name: "Parameter Setting 1 Enable Heating"
     id: "${devicename}_parameter_setting_1_enable_heating"
     register_type: holding
     address: 0xd2
@@ -1673,7 +1672,7 @@ binary_sensor:
   # Bit: 8, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 1 T1s Cooling High Low Temperature Settings"
+    name: "Parameter Setting 1 T1s Cooling High Low Temperature Settings"
     id: "${devicename}_parameter_setting_1_t1s_cooling_high_low_temperature_settings"
     register_type: holding
     address: 0xd2
@@ -1681,7 +1680,7 @@ binary_sensor:
   # Bit: 9, default: true, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 1 Enable Cooling"
+    name: "Parameter Setting 1 Enable Cooling"
     id: "${devicename}_parameter_setting_1_enable_cooling"
     register_type: holding
     address: 0xd2
@@ -1689,7 +1688,7 @@ binary_sensor:
   # Bit: 10, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 1 DHW Pump Supports Pipe Disinfect"
+    name: "Parameter Setting 1 DHW Pump Supports Pipe Disinfect"
     id: "${devicename}_parameter_setting_1_dhw_pump_supports_pipe_disinfect"
     register_type: holding
     address: 0xd2
@@ -1697,7 +1696,7 @@ binary_sensor:
   # Bit: 11, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 1 Reserved BIT 11"
+    name: "Parameter Setting 1 Reserved BIT 11"
     id: "${devicename}_parameter_setting_1_reserved_bit_11"
     register_type: holding
     address: 0xd2
@@ -1705,7 +1704,7 @@ binary_sensor:
   # Bit: 12, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 1 DHW Pump Supported"
+    name: "Parameter Setting 1 DHW Pump Supported"
     id: "${devicename}_parameter_setting_1_dhw_pump_supported"
     register_type: holding
     address: 0xd2
@@ -1713,7 +1712,7 @@ binary_sensor:
   # Bit: 13, default: true, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 1 Supports Disinfection"
+    name: "Parameter Setting 1 Supports Disinfection"
     id: "${devicename}_parameter_setting_1_supports_disinfection"
     register_type: holding
     address: 0xd2
@@ -1721,7 +1720,7 @@ binary_sensor:
   # Bit: 14, default: true, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 1 Supports Water Tank Electric Heater TBH"
+    name: "Parameter Setting 1 Supports Water Tank Electric Heater TBH"
     id: "${devicename}_parameter_setting_1_supports_water_tank_electric_heater_tbh"
     register_type: holding
     address: 0xd2
@@ -1729,7 +1728,7 @@ binary_sensor:
   # Bit: 15, default: true, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 1 Enable Water Heating"
+    name: "Parameter Setting 1 Enable Water Heating"
     id: "${devicename}_parameter_setting_1_enable_water_heating"
     register_type: holding
     address: 0xd2
@@ -1739,7 +1738,7 @@ binary_sensor:
   # Bit: 0, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 2 IBH AHS Installation Position"
+    name: "Parameter Setting 2 IBH AHS Installation Position"
     id: "${devicename}_parameter_setting_2_ibh_ahs_installation_position"
     register_type: holding
     address: 0xd3
@@ -1747,7 +1746,7 @@ binary_sensor:
   # Bit: 1, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 2 Tbt Sensor Enable"
+    name: "Parameter Setting 2 Tbt Sensor Enable"
     id: "${devicename}_parameter_setting_2_tbt_sensor_enable"
     register_type: holding
     address: 0xd3
@@ -1755,7 +1754,7 @@ binary_sensor:
   # Bit: 2, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 2 Ta Sensor Position"
+    name: "Parameter Setting 2 Ta Sensor Position"
     id: "${devicename}_parameter_setting_2_ta_sensor_position"
     register_type: holding
     address: 0xd3
@@ -1763,7 +1762,7 @@ binary_sensor:
   # Bit: 3, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 2 Double Zone Setting Is Valid"
+    name: "Parameter Setting 2 Double Zone Setting Is Valid"
     id: "${devicename}_parameter_setting_2_double_zone_setting_is_valid"
     register_type: holding
     address: 0xd3
@@ -1771,7 +1770,7 @@ binary_sensor:
   # Bit: 4, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 2 Setting The High Low Temperature Of Heating Mode T1S"
+    name: "Parameter Setting 2 Setting The High Low Temperature Of Heating Mode T1S"
     id: "${devicename}_parameter_setting_2_setting_the_high_low_temperature_of_heating_mode_t1s"
     register_type: holding
     address: 0xd3
@@ -1779,7 +1778,7 @@ binary_sensor:
   # Bit: 5, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 2 Setting The High Low Temperature Of Cooling Mode T1S"
+    name: "Parameter Setting 2 Setting The High Low Temperature Of Cooling Mode T1S"
     id: "${devicename}_parameter_setting_2_setting_the_high_low_temperature_of_cooling_mode_t1s"
     register_type: holding
     address: 0xd3
@@ -1788,7 +1787,7 @@ binary_sensor:
   # Midea: T1B sensor enable
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 2 Tw2 Enabled"
+    name: "Parameter Setting 2 Tw2 Enabled"
     id: "${devicename}_parameter_setting_2_tw2_enabled"
     register_type: holding
     address: 0xd3
@@ -1796,7 +1795,7 @@ binary_sensor:
   # Bit: 7, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 2 Smart Grid"
+    name: "Parameter Setting 2 Smart Grid"
     id: "${devicename}_parameter_setting_2_smart_grid"
     register_type: holding
     address: 0xd3
@@ -1804,7 +1803,7 @@ binary_sensor:
   # Bit: 8, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 2 Port Definition"
+    name: "Parameter Setting 2 Port Definition"
     id: "${devicename}_parameter_setting_2_port_definition"
     register_type: holding
     address: 0xd3
@@ -1812,7 +1811,7 @@ binary_sensor:
   # Bit: 9, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 2 Solar Energy Kit Enable"
+    name: "Parameter Setting 2 Solar Energy Kit Enable"
     id: "${devicename}_parameter_setting_2_solar_energy_kit_enable"
     register_type: holding
     address: 0xd3
@@ -1820,7 +1819,7 @@ binary_sensor:
   # Bit: 10, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 2 Solar Energy Input Port"
+    name: "Parameter Setting 2 Solar Energy Input Port"
     id: "${devicename}_parameter_setting_2_solar_energy_input_port"
     register_type: holding
     address: 0xd3
@@ -1828,7 +1827,7 @@ binary_sensor:
   # Bit: 11, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 2 Piping Length Selection"
+    name: "Parameter Setting 2 Piping Length Selection"
     id: "${devicename}_parameter_setting_2_piping_length_selection"
     register_type: holding
     address: 0xd3
@@ -1836,7 +1835,7 @@ binary_sensor:
   # Bit: 12, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 2 Tbt2 Sensor Is Valid"
+    name: "Parameter Setting 2 Tbt2 Sensor Is Valid"
     id: "${devicename}_parameter_setting_2_tbt2_sensor_is_valid"
     register_type: holding
     address: 0xd3
@@ -1844,7 +1843,7 @@ binary_sensor:
   # Bit: 13, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 2 Enable Temperature Collection Kit"
+    name: "Parameter Setting 2 Enable Temperature Collection Kit"
     id: "${devicename}_parameter_setting_2_enable_temperature_collection_kit"
     register_type: holding
     address: 0xd3
@@ -1852,7 +1851,7 @@ binary_sensor:
   # Bit: 14, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 2 M1M2 Is Used For AHS Control"
+    name: "Parameter Setting 2 M1M2 Is Used For AHS Control"
     id: "${devicename}_parameter_setting_2_m1m2_is_used_for_ahs_control"
     register_type: holding
     address: 0xd3
@@ -1860,14 +1859,14 @@ binary_sensor:
   # Bit: 15, default: false, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Parameter Setting 2 Reserved BIT 15"
+    name: "Parameter Setting 2 Reserved BIT 15"
     id: "${devicename}_parameter_setting_2_reserved_bit_15"
     register_type: holding
     address: 0xd3
     bitmask: 0x8000
   # Template binary sensor which shows if the heat pump is running
   - platform: template
-    name: "${entity_prefix} Heat pump running"
+    name: "Heat pump running"
     id: "${devicename}_heat_pump_running"
     lambda: |-
       int fan_speed = id(${devicename}_fan_speed).state;
@@ -1886,42 +1885,54 @@ switch:
   - platform: factory_reset
     name: Restart with Factory Default Settings
   # Register: 0 -> Bit 0
+  # When Room Temperature Control is enabled, the temperature sensor in the remote controller
+  # will be used to define when the heatpump should be turned (powered) on or off
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Power Air Conditioner Zone 1"
-    id: "${devicename}_power_air_conditioner_zone_1"
+    name: "Room Temperature Control"
+    id: "${devicename}_room_temperature_control"
     register_type: holding
     address: 0x0
     bitmask: 0x1
   # Register: 0 -> Bit 1
+  # When Water Flow Temperature Control is enabled for thise zone, the target outlet water temperature
+  # will be used to define when the heatpump should be turned (powered) on or off
+  #
+  # If room thermostat is enabled, controlling this switch will be done by the heatpump. In other words,
+  # the room thermostat will decide when this will be on or off.
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Power Floor Heating Zone 1"
-    id: "${devicename}_power_floor_heating_zone_1"
+    name: "Water Flow Temperature Control Zone 1"
+    id: "${devicename}_water_flow_temperature_control_zone_1"
     register_type: holding
     address: 0x0
     bitmask: 0x2
   # Register: 0 -> Bit 2
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Power DHW T5S"
+    name: "Power DHW T5S"
     id: "${devicename}_power_dhw_t5s"
     register_type: holding
     entity_category: config
     address: 0x0
     bitmask: 0x4
   # Register: 0 -> Bit 3
+  # When Water Flow Temperature Control is enabled for thise zone, the target outlet water temperature
+  # will be used to define when the heatpump should be turned (powered) on or off
+  #
+  # If room thermostat is enabled, controlling this switch will be done by the heatpump. In other words,
+  # the room thermostat will decide when this will be on or off.
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Power Air Conditioner Zone 2"
-    id: "${devicename}_power_air_conditioner_zone_2"
+    name: "Water Flow Temperature Control Zone 2"
+    id: "${devicename}_water_flow_temperature_control_zone_2"
     register_type: holding
     address: 0x0
     bitmask: 0x8
   # Register: 5 -> Bit 12
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Weather Compensation Zone 1"
+    name: "Weather Compensation Zone 1"
     id: "${devicename}_weather_compensation_zone_1"
     register_type: holding
     entity_category: config
@@ -1930,7 +1941,7 @@ switch:
   # Register: 5 -> Bit 13
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Weather Compensation Zone 2"
+    name: "Weather Compensation Zone 2"
     id: "${devicename}_weather_compensation_zone_2"
     register_type: holding
     entity_category: config
@@ -1940,7 +1951,7 @@ switch:
   # Register: 7
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Forced Water Tank Heating On/Off"
+    name: "Forced Water Tank Heating On/Off"
     id: "${devicename}_forced_water_tank_heating_on_off"
     icon: mdi:fire-alert
     address: 0x7
@@ -1966,7 +1977,7 @@ number:
   # Register: 2 (Zone 1, Low)
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Set Water Temperature T1S Zone 1"
+    name: "Set Water Temperature T1S Zone 1"
     id: "${devicename}_set_water_temperature_t1s_zone_1"
     register_type: holding
     address: 0x2
@@ -2009,7 +2020,7 @@ number:
   # Register: 2 (Zone 2, High)
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Set Water Temperature T1S Zone 2"
+    name: "Set Water Temperature T1S Zone 2"
     id: "${devicename}_set_water_temperature_t1s_zone_2"
     register_type: holding
     address: 0x2
@@ -2045,7 +2056,7 @@ number:
   # Register: 4
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Set DHW Tank Temperature T5s"
+    name: "Set DHW Tank Temperature T5s"
     id: "${devicename}_set_dhw_tank_temperature_t5s"
     register_type: holding
     address: 0x4
@@ -2059,7 +2070,7 @@ number:
   # Register: 6 (Zone 1, Low)
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Weather Compensation Curve Zone 1"
+    name: "Weather Compensation Curve Zone 1"
     id: "${devicename}_weather_compensation_curve_zone_1"
     register_type: holding
     address: 0x6
@@ -2100,7 +2111,7 @@ number:
   # Register: 6 (Zone 2, High)
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Weather Compensation Curve Zone 2"
+    name: "Weather Compensation Curve Zone 2"
     id: "${devicename}_weather_compensation_curve_zone_2"
     register_type: holding
     address: 0x6
@@ -2134,7 +2145,7 @@ number:
   # Register: 209, default: 5
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} DHW Pump Return Running Time"
+    name: "DHW Pump Return Running Time"
     id: "${devicename}_dhw_pump_return_running_time"
     register_type: holding
     address: 0xd1
@@ -2146,7 +2157,7 @@ number:
   # Register: 212, default: 5
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} dT5_On"
+    name: "dT5_On"
     id: "${devicename}_dt5_on"
     register_type: holding
     address: 0xd4
@@ -2158,7 +2169,7 @@ number:
   # Register: 213, default: 10
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} dT1S5"
+    name: "dT1S5"
     id: "${devicename}_dt1s5"
     register_type: holding
     address: 0xd5
@@ -2170,7 +2181,7 @@ number:
   # Register: 214, default: 5
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} T Interval DHW"
+    name: "T Interval DHW"
     id: "${devicename}_t_interval_dhw"
     register_type: holding
     address: 0xd6
@@ -2182,7 +2193,7 @@ number:
   # Register: 215, default: 43
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} T4 DHW max"
+    name: "T4 DHW max"
     id: "${devicename}_t4_dhw_max"
     register_type: holding
     address: 0xd7
@@ -2194,7 +2205,7 @@ number:
   # Register: 216, default: -10
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} T4 DHW min"
+    name: "T4 DHW min"
     id: "${devicename}_t4dhwmin"
     register_type: holding
     address: 0xd8
@@ -2206,7 +2217,7 @@ number:
   # Register: 217, default: 30
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} t TBH Delay"
+    name: "t TBH Delay"
     id: "${devicename}_t_tbh_delay"
     register_type: holding
     address: 0xd9
@@ -2220,7 +2231,7 @@ number:
   # Also known as dT5S TBH Off (dt5s_tbh_off)
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} dT5 TBH Off"
+    name: "dT5 TBH Off"
     id: "${devicename}_dt5_tbh_off"
     register_type: holding
     address: 0xda
@@ -2232,7 +2243,7 @@ number:
   # Register: 219, default: 5
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} T4 TBH On"
+    name: "T4 TBH On"
     id: "${devicename}_t4_tbh_on"
     register_type: holding
     address: 0xdb
@@ -2244,7 +2255,7 @@ number:
   # Register: 220, default: 65
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Temperature For Disinfection Operation"
+    name: "Temperature For Disinfection Operation"
     id: "${devicename}_t5s_di"
     register_type: holding
     address: 0xdc
@@ -2256,7 +2267,7 @@ number:
   # Register: 221, default: 210
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Maximum Disinfection Duration"
+    name: "Maximum Disinfection Duration"
     id: "${devicename}_t_di_max"
     register_type: holding
     address: 0xdd
@@ -2268,7 +2279,7 @@ number:
   # Register: 222, default: 15
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Disinfection High Temperature Duration"
+    name: "Disinfection High Temperature Duration"
     id: "${devicename}_t_di_hightemp"
     register_type: holding
     address: 0xde
@@ -2280,7 +2291,7 @@ number:
   # Register: 223, default: 5
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Time Interval Of Compressor Startup In Cooling mode"
+    name: "Time Interval Of Compressor Startup In Cooling mode"
     id: "${devicename}_t_interval_c"
     register_type: holding
     address: 0xdf
@@ -2292,7 +2303,7 @@ number:
   # Register: 224, default: 5
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} dT1SC"
+    name: "dT1SC"
     id: "${devicename}_dt1sc"
     register_type: holding
     address: 0xe0
@@ -2304,7 +2315,7 @@ number:
   # Register: 225, default: 2
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} dTSC"
+    name: "dTSC"
     id: "${devicename}_dtsc"
     register_type: holding
     address: 0xe1
@@ -2316,7 +2327,7 @@ number:
   # Register: 226, default: 43
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} T4cmax"
+    name: "T4cmax"
     id: "${devicename}_t4cmax"
     register_type: holding
     address: 0xe2
@@ -2328,7 +2339,7 @@ number:
   # Register: 227, default: 10
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} T4cmin"
+    name: "T4cmin"
     id: "${devicename}_t4cmin"
     register_type: holding
     address: 0xe3
@@ -2340,7 +2351,7 @@ number:
   # Register: 228, default: 5
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Time Interval Of Compressor Startup In Heating mode"
+    name: "Time Interval Of Compressor Startup In Heating mode"
     id: "${devicename}_t_interval_h"
     register_type: holding
     address: 0xe4
@@ -2352,7 +2363,7 @@ number:
   # Register: 229, default: 5
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} dT1SH"
+    name: "dT1SH"
     id: "${devicename}_dt1sh"
     register_type: holding
     address: 0xe5
@@ -2364,7 +2375,7 @@ number:
   # Register: 230, default: 2
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} dTSH"
+    name: "dTSH"
     id: "${devicename}_dtsh"
     register_type: holding
     address: 0xe6
@@ -2376,7 +2387,7 @@ number:
   # Register: 231, default: 25
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} T4hmax"
+    name: "T4hmax"
     id: "${devicename}_t4hmax"
     register_type: holding
     address: 0xe7
@@ -2388,7 +2399,7 @@ number:
   # Register: 232, default: -15
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} T4hmin"
+    name: "T4hmin"
     id: "${devicename}_t4hmin"
     register_type: holding
     address: 0xe8
@@ -2400,7 +2411,7 @@ number:
   # Register: 233, default: -5
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Ambient Temperature For Enabling Hydraulic Module Auxiliary Electric Heating IBH"
+    name: "Ambient Temperature For Enabling Hydraulic Module Auxiliary Electric Heating IBH"
     id: "${devicename}_t4_ibh_on"
     register_type: holding
     address: 0xe9
@@ -2412,7 +2423,7 @@ number:
   # Register: 234, default: 5, TODO: verify min/max value
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Temperature Return Difference For Enabling The Hydraulic Module Auxiliary IBH"
+    name: "Temperature Return Difference For Enabling The Hydraulic Module Auxiliary IBH"
     id: "${devicename}_dt1_ibh_on"
     register_type: holding
     address: 0xea
@@ -2424,7 +2435,7 @@ number:
   # Register: 235, default: 30
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Delay Time Of Enabling The Hydraulic Module Auxiliary Electric Heating IBH"
+    name: "Delay Time Of Enabling The Hydraulic Module Auxiliary Electric Heating IBH"
     id: "${devicename}_t_ibh_delay"
     register_type: holding
     address: 0xeb
@@ -2436,7 +2447,7 @@ number:
   # Register: 237, default: 10, TODO: verify default
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Ambient Temperature Trigger For AHS"
+    name: "Ambient Temperature Trigger For AHS"
     id: "${devicename}_t4_ahs_on"
     register_type: holding
     address: 0xed
@@ -2448,7 +2459,7 @@ number:
   # Register: 238, default: 5, TODO: verify max/max value
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Trigger Temperature Difference Between T1S And Current Heat for AHS"
+    name: "Trigger Temperature Difference Between T1S And Current Heat for AHS"
     id: "${devicename}_dt1_ahs_on"
     register_type: holding
     address: 0xee
@@ -2460,7 +2471,7 @@ number:
   # Register: 240, default: 30
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Delay Time for Enabling AHS"
+    name: "Delay Time for Enabling AHS"
     id: "${devicename}_t_ahs_delay"
     register_type: holding
     address: 0xf0
@@ -2472,7 +2483,7 @@ number:
   # Register: 241, default: 120
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Water Heating Max Duration"
+    name: "Water Heating Max Duration"
     id: "${devicename}_t_dhwhp_max"
     register_type: holding
     address: 0xf1
@@ -2484,7 +2495,7 @@ number:
   # Register: 242, default: 30
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} T DHWHP Restrict"
+    name: "T DHWHP Restrict"
     id: "${devicename}_t_dhwhp_restrict"
     register_type: holding
     address: 0xf2
@@ -2496,7 +2507,7 @@ number:
   # Register: 243, default: 25
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} T4autocmin"
+    name: "T4autocmin"
     id: "${devicename}_t4autocmin"
     register_type: holding
     address: 0xf3
@@ -2508,7 +2519,7 @@ number:
   # Register: 244, default: 17
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} T4autohmax"
+    name: "T4autohmax"
     id: "${devicename}_t4autohmax"
     register_type: holding
     address: 0xf4
@@ -2520,7 +2531,7 @@ number:
   # Register: 245, default: 25
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Heating Or Cooling Temperature When Holiday Mode Is Active"
+    name: "Heating Or Cooling Temperature When Holiday Mode Is Active"
     id: "${devicename}_t1s_h_a_h"
     register_type: holding
     address: 0xf5
@@ -2532,7 +2543,7 @@ number:
   # Register: 246, default: 25
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Domestic Hot Water Temperature When Holiday Mode is Active"
+    name: "Domestic Hot Water Temperature When Holiday Mode is Active"
     id: "${devicename}_t5s_h_a_dhw"
     register_type: holding
     address: 0xf6
@@ -2544,7 +2555,7 @@ number:
   # Register: 247, default: 10
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} PER START Ratio"
+    name: "PER START Ratio"
     id: "${devicename}_per_start_ratio"
     register_type: holding
     address: 0xf7
@@ -2556,7 +2567,7 @@ number:
   # Register: 248, default: 5
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} TIME ADJUST"
+    name: "TIME ADJUST"
     id: "${devicename}_time_adjust"
     register_type: holding
     address: 0xf8
@@ -2567,7 +2578,7 @@ number:
   # Register: 249, default: 15
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} DTbt2"
+    name: "DTbt2"
     id: "${devicename}_dtbt2"
     register_type: holding
     address: 0xf9
@@ -2578,7 +2589,7 @@ number:
   # Register: 250, default: 0
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} IBH1 Power"
+    name: "IBH1 Power"
     id: "${devicename}_ibh1_power"
     register_type: holding
     address: 0xfa
@@ -2591,7 +2602,7 @@ number:
   # Register: 251, default: 0
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} IBH2 Power"
+    name: "IBH2 Power"
     id: "${devicename}_ibh2_power"
     register_type: holding
     address: 0xfb
@@ -2604,7 +2615,7 @@ number:
   # Register: 252, default: 0
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} TBH Power"
+    name: "TBH Power"
     id: "${devicename}_tbh_power"
     register_type: holding
     address: 0xfc
@@ -2617,7 +2628,7 @@ number:
   # Register: 255, default: 8
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Temperature Rise Day Number"
+    name: "Temperature Rise Day Number"
     id: "${devicename}_t_dryup"
     register_type: holding
     address: 0xff
@@ -2628,7 +2639,7 @@ number:
   # Register: 256, default: 5
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Drying Day Number"
+    name: "Drying Day Number"
     id: "${devicename}_t_highpeak"
     register_type: holding
     address: 0x100
@@ -2639,7 +2650,7 @@ number:
   # Register: 257, default: 5
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Temperature Drop Day Number"
+    name: "Temperature Drop Day Number"
     id: "${devicename}_t_dryd"
     register_type: holding
     address: 0x101
@@ -2650,7 +2661,7 @@ number:
   # Register: 258, default: 45
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Highest Drying Temperature"
+    name: "Highest Drying Temperature"
     id: "${devicename}_t_drypeak"
     register_type: holding
     address: 0x102
@@ -2662,7 +2673,7 @@ number:
   # Register: 259, default: 72
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Running Time Of Floor Heating For The First Time"
+    name: "Running Time Of Floor Heating For The First Time"
     id: "${devicename}_t_firstfh"
     register_type: holding
     address: 0x103
@@ -2674,7 +2685,7 @@ number:
   # Register: 260, default: 25
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} T1S Of Floor Heating For The First Time"
+    name: "T1S Of Floor Heating For The First Time"
     id: "${devicename}_t1s_firstfh"
     register_type: holding
     address: 0x104
@@ -2686,7 +2697,7 @@ number:
   # Register: 261, default: 10
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} T1SetC1"
+    name: "T1SetC1"
     id: "${devicename}_t1setc1"
     register_type: holding
     address: 0x105
@@ -2698,7 +2709,7 @@ number:
   # Register: 262, default: 16
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} T1SetC2"
+    name: "T1SetC2"
     id: "${devicename}_t1setc2"
     register_type: holding
     address: 0x106
@@ -2710,7 +2721,7 @@ number:
   # Register: 263, default: 35
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} T4C1"
+    name: "T4C1"
     id: "${devicename}_t4c1"
     register_type: holding
     address: 0x107
@@ -2722,7 +2733,7 @@ number:
   # Register: 264, default: 25
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} T4C2"
+    name: "T4C2"
     id: "${devicename}_t4c2"
     register_type: holding
     address: 0x108
@@ -2734,7 +2745,7 @@ number:
   # Register: 265, default: 35
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} T1SetH1"
+    name: "T1SetH1"
     id: "${devicename}_t1seth1"
     register_type: holding
     address: 0x109
@@ -2746,7 +2757,7 @@ number:
   # Register: 266, default: 28
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} T1SetH2"
+    name: "T1SetH2"
     id: "${devicename}_t1seth2"
     register_type: holding
     address: 0x10a
@@ -2758,7 +2769,7 @@ number:
   # Register: 267, default: -5
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} T4H1"
+    name: "T4H1"
     id: "${devicename}_t4h1"
     register_type: holding
     address: 0x10b
@@ -2770,7 +2781,7 @@ number:
   # Register: 268, default: 7
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} T4H2"
+    name: "T4H2"
     id: "${devicename}_t4h2"
     register_type: holding
     address: 0x10c
@@ -2782,7 +2793,7 @@ number:
   # Register: 270 (Low, heating), default: 0.5
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} t_T4 FRESH_H"
+    name: "t_T4 FRESH_H"
     id: "${devicename}_t_t4_fresh_h"
     register_type: holding
     address: 0x10e
@@ -2831,7 +2842,7 @@ number:
   # Register: 270 (High, cooling), default: 0.5
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} t_T4 FRESH_C"
+    name: "t_T4 FRESH_C"
     id: "${devicename}_t_t4_fresh_c"
     register_type: holding
     address: 0x10e
@@ -2875,7 +2886,7 @@ number:
   # In modbus register this is called T_PUMPI_DELAY, in the menu this is called t_DELAY_PUMP
   - platform: modbus_controller
     modbus_controller_id: "${devicename}"
-    name: "${entity_prefix} Built-in Circulating Pump Delay"
+    name: "Built-in Circulating Pump Delay"
     id: "${devicename}_t_delay_pump"
     register_type: holding
     address: 0x10f
@@ -2893,7 +2904,7 @@ text_sensor:
     hide_timestamp: true
   # Active State
   - platform: template
-    name: "${entity_prefix} Active State"
+    name: "Active State"
     id: "${devicename}_active_state"
     lambda: |-
       if (id(${devicename}_load_output_run).state) {
@@ -2903,11 +2914,11 @@ text_sensor:
         } else if (id(${devicename}_load_output_sv1).state) {
           return {"DHW"};
         } else if (id(${devicename}_status_bit_1_heating_mode_set_by_room_thermostat).state 
-          || id(${devicename}_power_floor_heating_zone_1).state) {
+          || id(${devicename}_water_flow_temperature_control_zone_1).state) {
           return {"Heating"};
         } else if (id(${devicename}_status_bit_1_cooling_mode_set_by_room_thermostat).state
-          || id(${devicename}_power_air_conditioner_zone_1).state
-          || id(${devicename}_power_air_conditioner_zone_2).state) {
+          || id(${devicename}_room_temperature_control).state
+          || id(${devicename}_water_flow_temperature_control_zone_2).state) {
           return {"Cooling"};
         } else {
           return {"Unknown"};
@@ -2918,7 +2929,7 @@ text_sensor:
       }
   # Current fault mapped to error code
   - platform: template
-    name: "${entity_prefix} Current Fault Error Code"
+    name: "Current Fault Error Code"
     id: "${devicename}_current_fault_error_code"
     lambda: |-
       int current_fault = id(${devicename}_current_fault).state;
@@ -2987,7 +2998,7 @@ text_sensor:
         - 143 -> L9
   # Current fault mapped to error code description
   - platform: template
-    name: "${entity_prefix} Current Fault Error Code Description"
+    name: "Current Fault Error Code Description"
     id: "${devicename}_current_fault_error_code_description"
     lambda: |-
       int current_fault = id(${devicename}_current_fault).state;
@@ -3056,7 +3067,7 @@ text_sensor:
         - 143 -> Speed difference > 15Hz protection between the real and the setting speed
   # Fault 1 mapped to error code
   - platform: template
-    name: "${entity_prefix} Fault 1 Error Code"
+    name: "Fault 1 Error Code"
     id: "${devicename}_fault_1_error_code"
     lambda: |-
       int fault_one = id(${devicename}_fault_1).state;
@@ -3123,7 +3134,7 @@ text_sensor:
         - 143 -> L9
   # Fault 2 mapped to error code
   - platform: template
-    name: "${entity_prefix} Fault 2 Error Code"
+    name: "Fault 2 Error Code"
     id: "${devicename}_fault_2_error_code"
     lambda: |-
       int fault_two = id(${devicename}_fault_2).state;
@@ -3190,7 +3201,7 @@ text_sensor:
         - 143 -> L9
   # Fault 3 mapped to error code
   - platform: template
-    name: "${entity_prefix} Fault 3 Error Code"
+    name: "Fault 3 Error Code"
     id: "${devicename}_fault_3_error_code"
     lambda: |-
       int fault_three = id(${devicename}_fault_3).state;