diff --git a/config/lovelace/decluttering_templates/cards/bedroom_humidity_card.yaml b/config/lovelace/decluttering_templates/cards/bedroom_humidity_card.yaml
index 93b334d..ae280c6 100644
--- a/config/lovelace/decluttering_templates/cards/bedroom_humidity_card.yaml
+++ b/config/lovelace/decluttering_templates/cards/bedroom_humidity_card.yaml
@@ -10,13 +10,11 @@ bedroom_humidity_card:
           average: true
           extrema: true
         entities:
-          - entity: sensor.bedroom_weather_humidity
-            name: Humidity
+          - sensor.bedroom_weather_humidity
 
       - type: horizontal-stack
         cards:
           - type: "custom:mini-graph-card"
-            name: Temperature
             font_size: 75
             icon: "mdi:thermometer"
             line_color: green
@@ -25,7 +23,6 @@ bedroom_humidity_card:
               - sensor.bedroom_weather_temperature
 
           - type: "custom:mini-graph-card"
-            name: Pressure
             entities:
               - sensor.bedroom_weather_pressure
             font_size: 75
diff --git a/config/lovelace/decluttering_templates/cards/bedroom_temperature_card.yaml b/config/lovelace/decluttering_templates/cards/bedroom_temperature_card.yaml
index de23e0a..3633a36 100644
--- a/config/lovelace/decluttering_templates/cards/bedroom_temperature_card.yaml
+++ b/config/lovelace/decluttering_templates/cards/bedroom_temperature_card.yaml
@@ -10,8 +10,7 @@ bedroom_temperature_card:
           average: true
           extrema: true
         entities:
-          - entity: sensor.bedroom_weather_temperature
-            name: Temperature
+          - sensor.bedroom_weather_temperature
 
       - type: horizontal-stack
         cards:
@@ -25,7 +24,6 @@ bedroom_temperature_card:
               - sensor.bedroom_weather_humidity
 
           - type: "custom:mini-graph-card"
-            name: Pressure
             entities:
               - sensor.bedroom_weather_pressure
             font_size: 75
diff --git a/config/lovelace/home_dashboard/main_dashboard.yaml b/config/lovelace/home_dashboard/main_dashboard.yaml
index 5b9d6fa..5298017 100644
--- a/config/lovelace/home_dashboard/main_dashboard.yaml
+++ b/config/lovelace/home_dashboard/main_dashboard.yaml
@@ -185,7 +185,6 @@
                 template:
                   - small
                   - progress
-                name: Temperature
                 entity: sensor.bedroom_weather_temperature
                 variables:
                   degrees: 200
@@ -193,7 +192,6 @@
                 template:
                   - small
                   - progress
-                name: Humidity
                 entity: sensor.bedroom_weather_humidity
                 variables:
                   min_value: 25
diff --git a/config/lovelace/home_dashboard/master_bedroom_dashboard.yaml b/config/lovelace/home_dashboard/master_bedroom_dashboard.yaml
index 33ae575..e62058f 100644
--- a/config/lovelace/home_dashboard/master_bedroom_dashboard.yaml
+++ b/config/lovelace/home_dashboard/master_bedroom_dashboard.yaml
@@ -112,13 +112,11 @@
                 template:
                   - small
                   - progress
-                name: Temperature
                 entity: sensor.bedroom_weather_temperature
               - type: custom:button-card
                 template:
                   - small
                   - progress
-                name: Humidity
                 entity: sensor.bedroom_weather_humidity
                 variables:
                   min_value: 25
diff --git a/config/packages/modules/climate/weather.yaml b/config/packages/modules/climate/weather.yaml
index c33e42f..cda3101 100644
--- a/config/packages/modules/climate/weather.yaml
+++ b/config/packages/modules/climate/weather.yaml
@@ -57,10 +57,10 @@ homeassistant:
       friendly_name: Bedroom weather battery
 
     sensor.bedroom_weather_temperature:
-      friendly_name: Bedroom temperature
+      friendly_name: Temperature
 
     sensor.bedroom_weather_pressure:
-      friendly_name: Bedroom pressure
+      friendly_name: Pressure
 
     sensor.bedroom_weather_humidity:
-      friendly_name: Bedroom humidity
+      friendly_name: Humidity