diff --git a/esphome/device_packages/shelly-plug-series.yaml b/esphome/device_packages/shelly-plug-series.yaml
index 02988d2..cabca04 100644
--- a/esphome/device_packages/shelly-plug-series.yaml
+++ b/esphome/device_packages/shelly-plug-series.yaml
@@ -6,7 +6,7 @@ binary_sensor:
     pin:
       number: GPIO13
       inverted: True
-    name: "${devicename}_button"
+    name: "${friendly_devicename} Button"
     on_press:
       - switch.toggle: relay
 
@@ -35,7 +35,7 @@ sensor:
   # NTC Temperature
   - platform: ntc
     sensor: temp_resistance_reading
-    name: ${devicename} temperature
+    name: ${friendly_devicename} Temperature
     unit_of_measurement: "°C"
     accuracy_decimals: 1
     icon: "mdi:thermometer"
@@ -72,16 +72,16 @@ sensor:
     current_resistor: ${current_res}
     voltage_divider: ${voltage_div}
     current:
-      name: "${channel_1} current"
+      name: "${channel_1} Current"
       unit_of_measurement: "A"
       accuracy_decimals: 3
       icon: mdi:flash-outline
     voltage:
-      name: "${channel_1} voltage"
+      name: "${channel_1} Voltage"
       unit_of_measurement: "V"
       icon: mdi:flash-outline
     power:
-      name: "${channel_1} power"
+      name: "${channel_1} Power"
       id: power
       unit_of_measurement: "W"
       filters:
@@ -102,7 +102,7 @@ sensor:
     update_interval: 10s
 
   - platform: total_daily_energy
-    name: "${channel_1} daily energy"
+    name: "${channel_1} Daily Energy"
     power_id: power
     filters:
       # Multiplication factor from W to kW is 0.001
diff --git a/esphome/esphome-base.yaml b/esphome/esphome-base.yaml
index 8678778..bcd16f2 100644
--- a/esphome/esphome-base.yaml
+++ b/esphome/esphome-base.yaml
@@ -4,7 +4,7 @@ esphome:
 wifi:
   ssid: ${ssid} 
   password: ${wifipass}
-  fast_connect: on
+  fast_connect: off
   domain: .phiax.nl
   min_auth_mode: WPA2
   ap: