diff --git a/configuration.yaml b/configuration.yaml
index 4da65b8..9f8c3dc 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -19,13 +19,13 @@ recorder:
 
 input_boolean:
   zigbee_permit_join:
-    name: Allow devices to join
+    name: Allow new devices to join ZigBee
     initial: off
     icon: mdi:cellphone-wireless
 
 timer:
   zigbee_permit_join:
-    name: Time remaining
+    name: Time remaining to join ZigBee
     duration: 600 # Updated this to the number of seconds you wish
 
 group: !include groups.yaml
diff --git a/lovelace/home.yaml b/lovelace/home.yaml
index 37dd8f7..1c5689f 100644
--- a/lovelace/home.yaml
+++ b/lovelace/home.yaml
@@ -11,7 +11,6 @@ cards:
           - entity: timer.zigbee_permit_join
           - entity: sensor.bridge_state
         show_header_toggle: false
-        title: Zigbee
 
       - type: entities
         entities:
diff --git a/sensors/mqtt.yaml b/sensors/mqtt.yaml
index 5726634..e29573f 100644
--- a/sensors/mqtt.yaml
+++ b/sensors/mqtt.yaml
@@ -1,4 +1,4 @@
 - platform: mqtt
-  name: Bridge state
+  name: ZigBee Bridge state
   state_topic: "zigbee2mqtt/bridge/state"
   icon: mdi:router-wireless