diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a512dd82..a23defe5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,42 +11,42 @@ jobs:
             fail-fast: false
             matrix:
                 board:
-                    - name: ttgo-lora32-v21
-                      board_type: esp32
-                    - name: heltec-lora32-v2
-                      board_type: esp32
-                    - name: heltec_wifi_lora_32_V3
-                      board_type: esp32s3
-                    - name: heltec_wireless_stick
-                      board_type: esp32s3
-                    - name: heltec_wireless_stick_lite_v3
-                      board_type: esp32s3
-                    - name: heltec_ht-ct62
-                      board_type: esp32c3
+                    - name: Ttgo-lora32-v21
+                      board_type: ttgo-lora32-v21
+                    - name: Heltec-lora32-v2
+                      board_type: heltec-lora32-v2
+                    - name: Heltec_wifi_lora_32_V3
+                      board_type: heltec_wifi_lora_32_V3
+                    - name: Heltec_wireless_stick
+                      board_type: heltec_wireless_stick
+                    - name: Heltec_wireless_stick_lite_v3
+                      board_type: heltec_wireless_stick_lite_v3
+                    - name: Heltec_ht-ct62
+                      board_type: heltec_ht-ct62
                     - name: ESP32_DIY_LoRa
-                      board_type: esp32
+                      board_type: ESP32_DIY_LoRa
                     - name: ESP32_DIY_1W_LoRa
-                      board_type: esp32
-                    - name: ttgo-t-beam-v1_2
-                      board_type: esp32
-                    - name: ttgo-t-beam-v1
-                      board_type: esp32
-                    - name: ttgo-t-beam-v1_SX1268
-                      board_type: esp32
-                    - name: ttgo-t-beam-v1_2_SX1262
-                      board_type: esp32
+                      board_type: ESP32_DIY_1W_LoRa
+                    - name: Ttgo-t-beam-v1_2
+                      board_type: ttgo-t-beam-v1_2
+                    - name: Ttgo-t-beam-v1
+                      board_type: ttgo-t-beam-v1
+                    - name: Ttgo-t-beam-v1_SX1268
+                      board_type: ttgo-t-beam-v1_SX1268
+                    - name: Ttgo-t-beam-v1_2_SX1262
+                      board_type: ttgo-t-beam-v1_2_SX1262
                     - name: ESP32_DIY_LoRa_A7670
-                      board_type: esp32
-                    - name: heltec_wireless_tracker
-                      board_type: esp32s3
+                      board_type: ESP32_DIY_LoRa_A7670
+                    - name: Heltec_wireless_tracker
+                      board_type: heltec_wireless_tracker
                     - name: OE5HWN_MeshCom
-                      board_type: esp32
+                      board_type: OE5HWN_MeshCom
                     - name: WEMOS-LOLIN32-OLED-DIY
-                      board_type: esp32
+                      board_type: WEMOS-LOLIN32-OLED-DIY
                     - name: WEMOS-D1-R32-RA02
-                      board_type: esp32
-                    - name: ttgo-lora32-v21-915
-                      board_type: esp32
+                      board_type: WEMOS-D1-R32-RA02
+                    - name: Ttgo-lora32-v21-915
+                      board_type: ttgo-lora32-v21-915
         steps:
             - uses: actions/checkout@v3
 
diff --git a/.github/workflows/commit.yml b/.github/workflows/commit.yml
index abac9c1d..a0035e8a 100644
--- a/.github/workflows/commit.yml
+++ b/.github/workflows/commit.yml
@@ -12,42 +12,42 @@ jobs:
             fail-fast: false
             matrix:
               board:
-                - name: ttgo-lora32-v21
-                  board_type: esp32
-                - name: heltec-lora32-v2
-                  board_type: esp32
-                - name: heltec_wifi_lora_32_V3
-                  board_type: esp32s3
-                - name: heltec_wireless_stick
-                  board_type: esp32s3
-                - name: heltec_wireless_stick_lite_v3
-                  board_type: esp32s3
-                - name: heltec_ht-ct62
-                  board_type: esp32c3
+                - name: Ttgo-lora32-v21
+                  board_type: ttgo-lora32-v21
+                - name: Heltec-lora32-v2
+                  board_type: heltec-lora32-v2
+                - name: Heltec_wifi_lora_32_V3
+                  board_type: heltec_wifi_lora_32_V3
+                - name: Heltec_wireless_stick
+                  board_type: heltec_wireless_stick
+                - name: Heltec_wireless_stick_lite_v3
+                  board_type: heltec_wireless_stick_lite_v3
+                - name: Heltec_ht-ct62
+                  board_type: heltec_ht-ct62
                 - name: ESP32_DIY_LoRa
-                  board_type: esp32
+                  board_type: ESP32_DIY_LoRa
                 - name: ESP32_DIY_1W_LoRa
-                  board_type: esp32
-                - name: ttgo-t-beam-v1_2
-                  board_type: esp32
-                - name: ttgo-t-beam-v1
-                  board_type: esp32
-                - name: ttgo-t-beam-v1_SX1268
-                  board_type: esp32
-                - name: ttgo-t-beam-v1_2_SX1262
-                  board_type: esp32
+                  board_type: ESP32_DIY_1W_LoRa
+                - name: Ttgo-t-beam-v1_2
+                  board_type: ttgo-t-beam-v1_2
+                - name: Ttgo-t-beam-v1
+                  board_type: ttgo-t-beam-v1
+                - name: Ttgo-t-beam-v1_SX1268
+                  board_type: ttgo-t-beam-v1_SX1268
+                - name: Ttgo-t-beam-v1_2_SX1262
+                  board_type: ttgo-t-beam-v1_2_SX1262
                 - name: ESP32_DIY_LoRa_A7670
-                  board_type: esp32
-                - name: heltec_wireless_tracker
-                  board_type: esp32s3
+                  board_type: ESP32_DIY_LoRa_A7670
+                - name: Heltec_wireless_tracker
+                  board_type: heltec_wireless_tracker
                 - name: OE5HWN_MeshCom
-                  board_type: esp32
+                  board_type: OE5HWN_MeshCom
                 - name: WEMOS-LOLIN32-OLED-DIY
-                  board_type: esp32
+                  board_type: WEMOS-LOLIN32-OLED-DIY
                 - name: WEMOS-D1-R32-RA02
-                  board_type: esp32
-                - name: ttgo-lora32-v21-915
-                  board_type: esp32
+                  board_type: WEMOS-D1-R32-RA02
+                - name: Ttgo-lora32-v21-915
+                  board_type: ttgo-lora32-v21-915
         steps:
             - uses: actions/checkout@v3
 
diff --git a/README.md b/README.md
index c1e22cfc..3107134f 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ ____________________________________________________
 
 - 2024.05.23 Forced Reboot Mode added.
 - 2024.05.22 Experimental backup-Digirepeater-Mode when "only" iGate mode loses WiFi connection added.
-- 2024.05.20 WebConfig update to control wheter Messages and Objects should be Tx to RF.
+- 2024.05.20 WebConfig update to control whether Messages and Objects should be Tx to RF.
 - 2024.05.17 HELTEC Wireless Stick Lite v3 support added.
 - 2024.05.14 BME modules will be autodetected (I2C Address and if it is BME280/BMP280/BME680).
 - 2024.05.13 PacketBuffer for Rx (25 Seg).