diff --git a/boiler_01.yaml b/boiler_01.yaml
index 9f0d891..a52b2a3 100644
--- a/boiler_01.yaml
+++ b/boiler_01.yaml
@@ -1,7 +1,7 @@
 sensor:
   - platform: modbus_controller
     modbus_controller_id: ${modbus_controller_id}
-    name: "${Boiler1_name} Temperatur oben"
+    name: "${boiler1_name} Temperatur oben"
     id: ${name}_Boiler_1_Temperatur_oben
     register_type: read
     address: 1630
@@ -12,7 +12,7 @@ sensor:
 
   - platform: modbus_controller
     modbus_controller_id: ${modbus_controller_id}
-    name: "${Boiler1_name} Pumpe Ansteuerung"
+    name: "${boiler1_name} Pumpe Ansteuerung"
     id: ${name}_Boiler_1_Pumpe_Ansteuerung
     register_type: read
     address: 1632
@@ -22,7 +22,7 @@ sensor:
 number:
   - platform: modbus_controller
     modbus_controller_id: ${modbus_controller_id}
-    name: "${Boiler1_name} Gewünschte Boilertemperatur"
+    name: "${boiler1_name} Gewünschte Boilertemperatur"
     id: ${name}_Boiler_1_Gewuenschte_Boilertemperatur
     address: 1631
     unit_of_measurement: "°C"
@@ -33,7 +33,7 @@ number:
 
   - platform: modbus_controller
     modbus_controller_id: ${modbus_controller_id}
-    name: "${Boiler1_name} Nachladen, wenn Boilertemperatur unter"
+    name: "${boiler1_name} Nachladen, wenn Boilertemperatur unter"
     id: ${name}_Boiler_1_Nachladen_wenn_Boilertemperatur_unter
     address: 1632
     unit_of_measurement: "°C"
@@ -44,7 +44,7 @@ number:
 
 binary_sensor:
   - platform: template
-    name: "${Boiler1_name} Pumpe Ansteuerung AN AUS"
+    name: "${boiler1_name} Pumpe Ansteuerung AN AUS"
     id: ${name}_Boiler_1_Pumpe_Ansteuerung_AN_AUS
     lambda: |-
       if (id(${name}_Boiler_1_Pumpe_Ansteuerung).state > 0) {
diff --git a/puffer_01.yaml b/puffer_01.yaml
index 61e3243..82357dd 100644
--- a/puffer_01.yaml
+++ b/puffer_01.yaml
@@ -1,7 +1,7 @@
 sensor:  
   - platform: modbus_controller
     modbus_controller_id: ${modbus_controller_id}
-    name: "${Puffer1_name} Temperatur oben"
+    name: "${puffer1_name} Temperatur oben"
     id: ${name}_Puffer_1_Temperatur_oben
     register_type: read
     address: 2000
@@ -12,7 +12,7 @@ sensor:
 
   - platform: modbus_controller
     modbus_controller_id: ${modbus_controller_id}
-    name: "${Puffer1_name} Temperatur mitte"
+    name: "${puffer1_name} Temperatur mitte"
     id: ${name}_Puffer_1_Temperatur_mitte
     register_type: read
     address: 2001
@@ -23,7 +23,7 @@ sensor:
 
   - platform: modbus_controller
     modbus_controller_id: ${modbus_controller_id}
-    name: "${Puffer1_name} Temperatur unten"
+    name: "${puffer1_name} Temperatur unten"
     id: ${name}_Puffer_1_Temperatur_unten
     register_type: read
     address: 2002
@@ -34,7 +34,7 @@ sensor:
 
   - platform: modbus_controller
     modbus_controller_id: ${modbus_controller_id}
-    name: "${Puffer1_name} Ladezustand"
+    name: "${puffer1_name} Ladezustand"
     id: ${name}_Puffer_1_Ladezustand
     register_type: read
     address: 2006
@@ -43,7 +43,7 @@ sensor:
 
   - platform: modbus_controller
     modbus_controller_id: ${modbus_controller_id}
-    name: "${Puffer1_name} Pufferpumpen Ansteuerung"
+    name: "${puffer1_name} Pufferpumpen Ansteuerung"
     id: ${name}_Puffer_1_Pufferpumpen_Ansteuerung
     register_type: read
     address: 2003
@@ -52,7 +52,7 @@ sensor:
 
 binary_sensor:
   - platform: template
-    name: "${Puffer1_name} Pufferpumpen Ansteuerung AN AUS"
+    name: "${puffer1_name} Pufferpumpen Ansteuerung AN AUS"
     id: ${name}_Puffer_1_Pufferpumpen_Ansteuerung_AN_AUS
     lambda: |-
       if (id(${name}_Puffer_1_Pufferpumpen_Ansteuerung).state > 0) {