diff --git a/gl-inet/gl-s10.yaml b/gl-inet/gl-s10.yaml
index 5bcd45b..06d9a6f 100644
--- a/gl-inet/gl-s10.yaml
+++ b/gl-inet/gl-s10.yaml
@@ -1,6 +1,6 @@
 # Instructions on opening and wiring for flashing on https://blakadder.com/gl-s10
 esphome:
-  name: gl-s10-bt-proxy
+  name: gl-s10
   friendly_name: Bluetooth Proxy
   min_version: 2024.6.0
   name_add_mac_suffix: true
diff --git a/lilygo/lilygo-t-eth-poe.yaml b/lilygo/lilygo-t-eth-poe.yaml
index 73b4500..8118db1 100644
--- a/lilygo/lilygo-t-eth-poe.yaml
+++ b/lilygo/lilygo-t-eth-poe.yaml
@@ -1,5 +1,5 @@
 esphome:
-  name: lilygo-ttgo-poe-bt-proxy
+  name: lilygo-t-eth-poe
   friendly_name: Bluetooth Proxy
   min_version: 2024.6.0
   name_add_mac_suffix: true
diff --git a/m5stack/m5stack-atom-lite.yaml b/m5stack/m5stack-atom-lite.yaml
index 034d17f..1468740 100644
--- a/m5stack/m5stack-atom-lite.yaml
+++ b/m5stack/m5stack-atom-lite.yaml
@@ -1,5 +1,5 @@
 esphome:
-  name: atom-lite-bt-proxy
+  name: m5stack-atom-lite
   friendly_name: Bluetooth Proxy
   min_version: 2024.6.0
   name_add_mac_suffix: true
diff --git a/m5stack/m5stack-atom-s3.yaml b/m5stack/m5stack-atom-s3.yaml
index 4ff1c21..0367fa6 100644
--- a/m5stack/m5stack-atom-s3.yaml
+++ b/m5stack/m5stack-atom-s3.yaml
@@ -1,5 +1,5 @@
 esphome:
-  name: atom-s3-bt-proxy
+  name: m5stack-atom-s3
   friendly_name: Bluetooth Proxy
   min_version: 2024.6.0
   name_add_mac_suffix: true
diff --git a/olimex/olimex-esp32-poe-iso.yaml b/olimex/olimex-esp32-poe-iso.yaml
index 2a86bf3..3c524dc 100644
--- a/olimex/olimex-esp32-poe-iso.yaml
+++ b/olimex/olimex-esp32-poe-iso.yaml
@@ -1,5 +1,5 @@
 esphome:
-  name: olimex-bluetooth-proxy
+  name: olimex-esp32-poe-iso
   friendly_name: Bluetooth Proxy
   min_version: 2024.6.0
   name_add_mac_suffix: true
diff --git a/wt32/wt32-eth01.yaml b/wt32/wt32-eth01.yaml
index a633214..5b42a27 100644
--- a/wt32/wt32-eth01.yaml
+++ b/wt32/wt32-eth01.yaml
@@ -1,5 +1,5 @@
 esphome:
-  name: wt32-eth01-bt-proxy
+  name: wt32-eth01
   friendly_name: Bluetooth Proxy
   min_version: 2024.6.0
   name_add_mac_suffix: true