diff --git a/Climate/bosch_bth-ra_control.yaml b/Climate/bosch_bth-ra_control.yaml
index c263e99..cd72369 100644
--- a/Climate/bosch_bth-ra_control.yaml
+++ b/Climate/bosch_bth-ra_control.yaml
@@ -306,21 +306,21 @@ triggers:
     from: "off"
     to: "on"
     for: !input window_delay_open
-    id: FENSTER_OPEN
+    id: WINDOW_OPENED
   - platform: state
     entity_id:
       - !input window_sensor
     from: "on"
     to: "off"
     for: !input window_delay_close
-    id: FENSTER_CLOSED
+    id: WINDOW_CLOSED
   - platform: time_pattern
     # Periodische Überprüfung alle 5 Minuten (Temperatursynchronisation, Override-Check)
     minutes: "/5"
     id: PERIODIC_CHECK
   - platform: state
     entity_id: !input temperature_sensor
-    id: TEMP_CHANGED
+    id: SENSOR_TEMPERATURE_CHANGED
   - platform: state
     entity_id: !input alarm_control_panel
     to: "armed_away"
@@ -329,22 +329,22 @@ triggers:
     entity_id: !input alarm_control_panel
     from: "armed_away"
     to: "disarmed"
-    id: ALARM_DISARMED_AWAY
+    id: ALARM_DISARMED
   - platform: state
     entity_id: !input heating_period_switch
     to: "on"
-    id: HEATING_PERIOD_ON
+    id: HEATING_PERIOD_STARTED
   - platform: state
     entity_id: !input heating_period_switch
     to: "off"
-    id: HEATING_PERIOD_OFF
+    id: HEATING_PERIOD_ENDED
   - platform: state
     entity_id: !input radiator_schedules
     attribute: temp
-    id: SCHEDULE_TEMP_CHANGED
+    id: SCHEDULE_TEMPERATURE_CHANGED
   - platform: state
     entity_id: !input active_scheduler_selector
-    id: SCHEDULER_CHANGED
+    id: SCHEDULE_SELECTOR_CHANGED
 
 # Hinweis zur Wartbarkeit: climate.set_temperature wird an 4 Stellen verwendet:
 # 1. Heizperiode aktiviert - Setzt Temperatur beim Einschalten der Heizung
@@ -358,14 +358,14 @@ actions:
     - conditions:
       - condition: trigger
         id:
-          - HEATING_PERIOD_ON
-          - HEATING_PERIOD_OFF
+          - HEATING_PERIOD_STARTED
+          - HEATING_PERIOD_ENDED
       sequence:
         - choose:
           - conditions:
             - condition: trigger
               id:
-                - HEATING_PERIOD_ON
+                - HEATING_PERIOD_STARTED
             sequence:
               - service: climate.set_hvac_mode
                 target:
@@ -394,7 +394,7 @@ actions:
           - conditions:
             - condition: trigger
               id:
-                - HEATING_PERIOD_OFF
+                - HEATING_PERIOD_ENDED
             sequence:
               - service: switch.turn_off
                 target:
@@ -417,7 +417,7 @@ actions:
           - conditions:
             - condition: trigger
               id:
-                - FENSTER_OPEN
+                - WINDOW_OPENED
             - condition: template
               value_template: >
                 {{ is_state(window_detection_entity, 'off') }}
@@ -429,7 +429,7 @@ actions:
           - conditions:
             - condition: trigger
               id:
-                - FENSTER_CLOSED
+                - WINDOW_CLOSED
             - condition: template
               value_template: >
                 {{ is_state(window_detection_entity, 'on') }}
@@ -454,7 +454,7 @@ actions:
           - conditions:
             - condition: trigger
               id:
-                - TEMP_CHANGED
+                - SENSOR_TEMPERATURE_CHANGED
             - condition: template
               value_template: >
                 {{ temperature_sensor is defined and states(temperature_sensor) | is_number }}
@@ -516,12 +516,12 @@ actions:
             - condition: trigger
               id:
                 - ALARM_ARMED_AWAY
-                - ALARM_DISARMED_AWAY
-                - SCHEDULE_TEMP_CHANGED
-                - SCHEDULER_CHANGED
+                - ALARM_DISARMED
+                - SCHEDULE_TEMPERATURE_CHANGED
+                - SCHEDULE_SELECTOR_CHANGED
             - condition: template
               value_template: >
-                {% if trigger.id == 'SCHEDULE_TEMP_CHANGED' %}
+                {% if trigger.id == 'SCHEDULE_TEMPERATURE_CHANGED' %}
                   {% set selected_friendly_name = states(active_scheduler_selector) %}
                   {{ state_attr(trigger.entity_id, 'friendly_name') == selected_friendly_name }}
                 {% else %}