diff --git a/src/strategies/badges/lights-badge.ts b/src/strategies/badges/lights-badge.ts
index 15a377a..bd412c9 100644
--- a/src/strategies/badges/lights-badge.ts
+++ b/src/strategies/badges/lights-badge.ts
@@ -8,7 +8,7 @@ export class LightsBadgeStrategy {
     return {
       type: 'entity',
       entity: lightEntity.uniqueIdentifier,
-      name: 'Lights',
+      name: lightEntity.name,
       icon: 'mdi:lightbulb-group',
       show_name: true,
       state_content: ['state'],
diff --git a/src/strategies/badges/security-badge.ts b/src/strategies/badges/security-badge.ts
index db6edf3..7587a0e 100644
--- a/src/strategies/badges/security-badge.ts
+++ b/src/strategies/badges/security-badge.ts
@@ -5,7 +5,7 @@ export class SecurityBadgeStrategy {
     return {
       type: 'entity',
       entity: securityEntity.uniqueIdentifier,
-      name: 'Security',
+      name: securityEntity.name,
       icon: 'mdi:lock',
       show_name: true,
       state_content: ['state'],
diff --git a/src/strategies/badges/speakers-tvs-badge.ts b/src/strategies/badges/speakers-tvs-badge.ts
index 066b394..5db9f92 100644
--- a/src/strategies/badges/speakers-tvs-badge.ts
+++ b/src/strategies/badges/speakers-tvs-badge.ts
@@ -8,7 +8,7 @@ export class SpeakersTvsBadgeStrategy {
     return {
       type: 'entity',
       entity: mediaPlayerEntity.uniqueIdentifier,
-      name: 'Speakers & TVs',
+      name: mediaPlayerEntity.name,
       icon: 'mdi:television-speaker',
       show_name: true,
       visibility: [