diff --git a/node-red/projects/NerdFlows b/node-red/projects/NerdFlows
index 4829aff..177c33e 160000
--- a/node-red/projects/NerdFlows
+++ b/node-red/projects/NerdFlows
@@ -1 +1 @@
-Subproject commit 4829aff12e6fda0c6d7c9d2fbfdbce31c01c4b70
+Subproject commit 177c33e5cbb84408e0950efa3cb54d046dcd4cd7
diff --git a/packages/powercalc.yaml b/packages/powercalc.yaml
index 9ed386c..c0b85a7 100644
--- a/packages/powercalc.yaml
+++ b/packages/powercalc.yaml
@@ -14,7 +14,7 @@ sensor:
     entity_id: fan.kallen_bedroom_fan
     power_sensor_id: sensor.kallen_bedroom_fan_power
   - platform: powercalc
-    entity_id: fan.master_bedroom_fan_socket_1
+    entity_id: fan.master_bedroom_fan
     power_sensor_id: sensor.master_bedroom_fan_power
   - platform: powercalc
     entity_id: fan.basement_fan
diff --git a/sensors/house_stats.yaml b/sensors/house_stats.yaml
index 15ebec6..9d7133d 100644
--- a/sensors/house_stats.yaml
+++ b/sensors/house_stats.yaml
@@ -131,7 +131,7 @@
         {% set fans = [
           states.fan.basement_fan,
           states.fan.kallen_bedroom_fan,
-          states.fan.master_bedroom_fan_socket_1,
+          states.fan.master_bedroom_fan,
           states.fan.emma_air_conditioner
         ] %}
         {{ fans | selectattr('state','eq','on') | list | count }}
diff --git a/templates/speech/nightly_briefing.yaml b/templates/speech/nightly_briefing.yaml
index 1cbb9dd..19b05d4 100644
--- a/templates/speech/nightly_briefing.yaml
+++ b/templates/speech/nightly_briefing.yaml
@@ -387,7 +387,7 @@
             "The master bedroom air conditioner will remain inactive tonight. "
           {% endif %}
         {% endif %}
-        {% if is_state('fan.master_bedroom_fan_socket_1','on') %}
+        {% if is_state('fan.master_bedroom_fan','on') %}
           "The master bedroom fan is already running. "
         {% elif is_state('input_select.scheduled_climate_mode_master_bedroom_fan','Fan') %}
           "The master bedroom fan will activate at {{ (state_attr('input_datetime.master_bedroom_fan','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. "