diff --git a/examples/advanced/ac-energolux-bern.yaml b/examples/advanced/ac-energolux-bern.yaml
deleted file mode 100644
index d850cb3..0000000
--- a/examples/advanced/ac-energolux-bern.yaml
+++ /dev/null
@@ -1,148 +0,0 @@
-external_components:
-  - source:
-      type: git
-      url: https://github.com/Brokly/esphome_aux_ac_component
-      #type: local
-      #path: my_components     
-    components: [ aux_ac ]
-    refresh: 0s
-
-esphome:
-  name: $devicename
-  platform: ESP8266
-  board: esp12e
-
-#esp32:
-#  board: nodemcu-32s
-#  framework:
-#    type: arduino
-    
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_pass
-  manual_ip:
-    static_ip: ${wifi_ip}
-    gateway: !secret gateway 
-    subnet: !secret subnet
-    dns1: !secret dns1
-    dns2: !secret dns2
-  ap:
-    ssid:  ${upper_devicename} Hotspot
-    password: !secret ap_wifi_pass
-
-captive_portal:
-
-debug:
-
-logger:
-  level: DEBUG
-  baud_rate: 0
-
-api:
-    password: !secret api_pass
-
-ota:
-    password: !secret ota_pass
-
-web_server:
-  port: 80
-  auth:
-    username: !secret web_user
-    password: !secret web_pass
-
-uart:
-  id: ac_uart_bus
-  #tx_pin: GPIO16
-  #rx_pin: GPIO17
-  tx_pin: GPIO1
-  rx_pin: GPIO3
-  baud_rate: 4800
-  data_bits: 8
-  parity: EVEN
-  stop_bits: 1
-
-climate:
-  - platform: aux_ac
-    name: ${upper_devicename}
-    id: aux_id
-    uart_id: ac_uart_bus
-    period: 7s
-    show_action: true
-    display_inverted: false
-    store_settings: true
-    indoor_temperature:
-      name: ${upper_devicename} Indoor Temperature
-      id: ${low_devicename}_indoor_temp
-      internal: false
-    outdoor_temperature:
-      name: ${upper_devicename} Outdoor Temperature
-      id: ${low_devicename}_outdoor_temp
-      internal: false
-    outbound_temperature:
-      name: ${upper_devicename} Colant Outbound Temperature
-      id: ${low_devicename}_outbound_temp
-      internal: false
-    inbound_temperature:
-      name: ${upper_devicename} Colant Inbound Temperature
-      id: ${low_devicename}_inbound_temp
-      internal: false
-    strange_temperature:
-      name: ${upper_devicename} Strange Temperature
-      id: ${low_devicename}_strange_temp
-      internal: false
-    display_state:
-      name: $upper_devicename Display State
-      id: ${low_devicename}_display_state
-      internal: false
-    defrost_state:
-      name: $upper_devicename Defrost State
-      id: ${low_devicename}_defrost_state
-      internal: false
-    invertor_power:
-      name: $upper_devicename Invertor Power
-      id: ${low_devicename}_invertor_power
-      internal: false
-    visual:
-      min_temperature: 16
-      max_temperature: 32
-      temperature_step: 1
-    supported_modes:
-      - HEAT_COOL
-      - COOL
-      - HEAT
-      - DRY
-      - FAN_ONLY
-    custom_fan_modes:
-      - MUTE
-      - TURBO
-    supported_presets:
-      - SLEEP
-    custom_presets:
-      - CLEAN
-      - HEALTH
-      - ANTIFUNGUS
-    supported_swing_modes:
-      - VERTICAL
-      - HORIZONTAL
-      - BOTH
-
-sensor:
-  - platform: wifi_signal
-    name: ${upper_devicename} WiFi Signal
-    update_interval: 30s
-    unit_of_measurement: "dBa"
-    accuracy_decimals: 0
-    
-switch:
-  - platform: template
-    name: $upper_devicename Display
-    lambda: |-
-      if (id(${low_devicename}_display_state).state) {
-        return true;
-      } else {
-        return false;
-      }
-    turn_on_action:
-      - aux_ac.display_on: aux_id
-    turn_off_action:
-      - aux_ac.display_off: aux_id
diff --git a/examples/advanced/ac_common.yaml b/examples/advanced/ac_common.yaml
index 911ef52..e012151 100644
--- a/examples/advanced/ac_common.yaml
+++ b/examples/advanced/ac_common.yaml
@@ -1,123 +1,122 @@
 # DON'T COMPILE THIS FILE
 # This file contains common settings for all air conditioners of your house
 external_components:
-    - source: github://GrKoR/esphome_aux_ac_component
-      components: [ aux_ac ]
-      refresh: 0s
-  
-  esphome:
-    name: $devicename
-    platform: ESP8266
-    board: esp12e
-  
-  wifi:
-    ssid: !secret wifi_ssid
-    password: !secret wifi_pass
-    manual_ip:
-      static_ip: ${wifi_ip}
-      gateway: !secret wifi_gateway
-      subnet: !secret wifi_subnet
-    ap:
-      ssid: ${upper_devicename} Hotspot
-      password: !secret wifi_ap_pass
-    use_address: ${wifi_ota_ip}
-  
-  captive_portal:
-  debug:
-  
-  logger:
-      level: DEBUG
-      baud_rate: 0
-      # set hardware_uart to UART1 and comment out baud_rate above in case of boot crashes
-      # it is suitable if you need hardware loggin
-      # hardware_uart: UART1
-  
-  api:
-    password: !secret api_pass
-  
-  ota:
-    password: !secret ota_pass
-  
-  web_server:
-    port: 80
-    auth:
-      username: !secret web_server_user
-      password: !secret web_server_password
-  
-  # UART0 configuration for AUX air conditioner communication
-  uart:
-    id: ac_uart_bus
-    tx_pin: GPIO1
-    rx_pin: GPIO3
-    baud_rate: 4800
-    data_bits: 8
-    parity: EVEN
-    stop_bits: 1
-  
-  
-  
-  climate:
-    - platform: aux_ac
-      name: ${upper_devicename}
-      id: aux_id
-      uart_id: ac_uart_bus
-      period: 7s
-      show_action: true
-      display_inverted: true
-      indoor_temperature:
-        name: ${upper_devicename} Indoor Temperature
-        id: ${devicename}_indoor_temp
-        internal: false
-      display_state:
-        name: $upper_devicename Display State
-        id: ${devicename}_display_state
-        internal: false
-      visual:
-        min_temperature: 16
-        max_temperature: 32
-        temperature_step: 0.5
-      supported_modes:
-        - HEAT_COOL
-        - COOL
-        - HEAT
-        - DRY
-        - FAN_ONLY
-      custom_fan_modes:
-        - MUTE
-        - TURBO
-      supported_presets:
-        - SLEEP
-      custom_presets:
-        - CLEAN
-        - FEEL
-        - HEALTH
-        - ANTIFUNGUS
-      supported_swing_modes:
-        - VERTICAL
-        - HORIZONTAL
-        - BOTH
-  
-  
-  sensor:
-    # just wifi signal strength for debug purpose only
-    - platform: wifi_signal
-      name: ${upper_devicename} WiFi Signal
-      update_interval: 30s
-      unit_of_measurement: "dBa"
-      accuracy_decimals: 0
-  
-  
-  switch:
-    - platform: template
-      name: $upper_devicename Display
-      lambda: |-
-        if (id(${devicename}_display_state).state) {
-          return true;
-        } else {
-          return false;
-        }
-      turn_on_action:
-        - aux_ac.display_on: aux_id
-      turn_off_action:
-        - aux_ac.display_off: aux_id
-  
\ No newline at end of file
+  - source: github://GrKoR/esphome_aux_ac_component
+    components: [ aux_ac ]
+    refresh: 0s
+
+esphome:
+  name: $devicename
+  platform: ESP8266
+  board: esp12e
+
+wifi:
+  ssid: !secret wifi_ssid
+  password: !secret wifi_pass
+  manual_ip:
+    static_ip: ${wifi_ip}
+    gateway: !secret wifi_gateway
+    subnet: !secret wifi_subnet
+  ap:
+    ssid: ${upper_devicename} Hotspot
+    password: !secret wifi_ap_pass
+  use_address: ${wifi_ota_ip}
+
+captive_portal:
+debug:
+
+logger:
+    level: DEBUG
+    baud_rate: 0
+    # set hardware_uart to UART1 and comment out baud_rate above in case of boot crashes
+    # it is suitable if you need hardware loggin
+    # hardware_uart: UART1
+
+api:
+  password: !secret api_pass
+
+ota:
+  password: !secret ota_pass
+
+web_server:
+  port: 80
+  auth:
+    username: !secret web_server_user
+    password: !secret web_server_password
+
+# UART0 configuration for AUX air conditioner communication
+uart:
+  id: ac_uart_bus
+  tx_pin: GPIO1
+  rx_pin: GPIO3
+  baud_rate: 4800
+  data_bits: 8
+  parity: EVEN
+  stop_bits: 1
+
+
+
+climate:
+  - platform: aux_ac
+    name: ${upper_devicename}
+    id: aux_id
+    uart_id: ac_uart_bus
+    period: 7s
+    show_action: true
+    display_inverted: true
+    indoor_temperature:
+      name: ${upper_devicename} Indoor Temperature
+      id: ${devicename}_indoor_temp
+      internal: false
+    display_state:
+      name: $upper_devicename Display State
+      id: ${devicename}_display_state
+      internal: false
+    visual:
+      min_temperature: 16
+      max_temperature: 32
+      temperature_step: 0.5
+    supported_modes:
+      - HEAT_COOL
+      - COOL
+      - HEAT
+      - DRY
+      - FAN_ONLY
+    custom_fan_modes:
+      - MUTE
+      - TURBO
+    supported_presets:
+      - SLEEP
+    custom_presets:
+      - CLEAN
+      - FEEL
+      - HEALTH
+      - ANTIFUNGUS
+    supported_swing_modes:
+      - VERTICAL
+      - HORIZONTAL
+      - BOTH
+
+
+sensor:
+  # just wifi signal strength for debug purpose only
+  - platform: wifi_signal
+    name: ${upper_devicename} WiFi Signal
+    update_interval: 30s
+    unit_of_measurement: "dBa"
+    accuracy_decimals: 0
+
+
+switch:
+  - platform: template
+    name: $upper_devicename Display
+    lambda: |-
+      if (id(${devicename}_display_state).state) {
+        return true;
+      } else {
+        return false;
+      }
+    turn_on_action:
+      - aux_ac.display_on: aux_id
+    turn_off_action:
+      - aux_ac.display_off: aux_id
diff --git a/examples/advanced/ac-kitchen-bern.yaml b/examples/advanced/ac_kitchen.yaml
similarity index 86%
rename from examples/advanced/ac-kitchen-bern.yaml
rename to examples/advanced/ac_kitchen.yaml
index 867ead3..91ead20 100644
--- a/examples/advanced/ac-kitchen-bern.yaml
+++ b/examples/advanced/ac_kitchen.yaml
@@ -6,8 +6,7 @@
 #===================================================================================
 
 substitutions:
-  devicename: kitchen-ac
-  low_devicename: kitchen_ac
+  devicename: kitchen_ac
   upper_devicename: Kitchen AC
   
   # use different wifi_ip and wifi_ota_ip in case of esp ip-address change
@@ -15,4 +14,4 @@ substitutions:
   wifi_ip: !secret wifi_ip_kitchen
   wifi_ota_ip: !secret wifi_ota_ip_kitchen
 
-<<: !include ac-energolux-bern.yaml
+<<: !include ac_common.yaml
\ No newline at end of file
diff --git a/examples/advanced/ac-livingroom-bern.yaml b/examples/advanced/ac_livingroom.yaml
similarity index 85%
rename from examples/advanced/ac-livingroom-bern.yaml
rename to examples/advanced/ac_livingroom.yaml
index f874727..08f985b 100644
--- a/examples/advanced/ac-livingroom-bern.yaml
+++ b/examples/advanced/ac_livingroom.yaml
@@ -6,8 +6,7 @@
 #===================================================================================
 
 substitutions:
-  devicename: livingroom-ac
-  low_devicename: livingroom_ac
+  devicename: livingroom_ac
   upper_devicename: Livingroom AC
   
   # use different wifi_ip and wifi_ota_ip in case of esp ip-address change
@@ -15,4 +14,4 @@ substitutions:
   wifi_ip: !secret wifi_ip_livingroom
   wifi_ota_ip: !secret wifi_ota_ip_livingroom
 
-<<: !include ac-energolux-bern.yaml
+<<: !include ac_common.yaml
\ No newline at end of file