a bunch of esphome improvements

esphome/common/network_common.yaml

@@ -44,7 +44,7 @@ wifi:
     subnet: ${static_ip_subnet}
     dns1: ${static_ip_dns1}
   ap: # Details for fallback hotspot in case wifi connection fails https://esphome.io/components/wifi.html#access-point-mode
-    ssid: ${devicename} AP
+    ssid: ${device_name} AP
     password: ${fallback_ap_password}
     ap_timeout: 10min # Time until it brings up fallback AP. default is 1min
   # Allow rapid re-connection to previously connect WiFi SSID, skipping scan of all SSID
@@ -61,6 +61,7 @@ captive_portal: # extra fallback mechanism for when connecting if the configured
 ota:
   - platform: esphome
     password: ${local_ota_pass}
+    version: 2
 
 #############################################
 # Safe Mode