multiple esphome device updates and new devices

esphome/esp-officeelvcontrol.yaml

@@ -44,12 +44,13 @@ substitutions:
 
 ##########################################################################################
 # PACKAGES: Included Common Packages
-# https://esphome.io/components/esphome.html
+# https://esphome.io/components/packages.html
 ##########################################################################################
 packages:
   common_wifi: !include
     file: common/network_common.yaml
     vars:
+      local_device_name: "${device_name}"
       local_static_ip_address: "${static_ip_address}"
       local_ota_pass: "${ota_pass}"
   common_api: !include
@@ -60,6 +61,8 @@ packages:
   #  file: common/webportal_common.yaml
   common_mqtt: !include
     file: common/mqtt_common.yaml
+    vars:
+      local_device_name: "${device_name}"
   common_sntp: !include
     file: common/sntp_common.yaml
   common_general_sensors: !include