diff --git a/node-red/projects/NerdFlows b/node-red/projects/NerdFlows
index 2cab20d..4829aff 160000
--- a/node-red/projects/NerdFlows
+++ b/node-red/projects/NerdFlows
@@ -1 +1 @@
-Subproject commit 2cab20da7295b7b83fa5961df6e046448f22a11a
+Subproject commit 4829aff12e6fda0c6d7c9d2fbfdbce31c01c4b70
diff --git a/packages/powercalc.yaml b/packages/powercalc.yaml
index 6c20622..9ed386c 100644
--- a/packages/powercalc.yaml
+++ b/packages/powercalc.yaml
@@ -11,8 +11,8 @@ sensor:
     energy_sensor_naming: "{} Energy Sensor"
     mode: lut
   - platform: powercalc
-    entity_id: light.living_room_christmas_tree
-    power_sensor_id: sensor.living_room_christmas_tree_power
+    entity_id: fan.kallen_bedroom_fan
+    power_sensor_id: sensor.kallen_bedroom_fan_power
   - platform: powercalc
     entity_id: fan.master_bedroom_fan_socket_1
     power_sensor_id: sensor.master_bedroom_fan_power
diff --git a/sensors/house_stats.yaml b/sensors/house_stats.yaml
index d37322b..15ebec6 100644
--- a/sensors/house_stats.yaml
+++ b/sensors/house_stats.yaml
@@ -130,7 +130,7 @@
       value_template: >-
         {% set fans = [
           states.fan.basement_fan,
-          states.fan.kallen_fan_socket_1,
+          states.fan.kallen_bedroom_fan,
           states.fan.master_bedroom_fan_socket_1,
           states.fan.emma_air_conditioner
         ] %}
diff --git a/templates/speech/nightly_briefing.yaml b/templates/speech/nightly_briefing.yaml
index 8f312cd..1cbb9dd 100644
--- a/templates/speech/nightly_briefing.yaml
+++ b/templates/speech/nightly_briefing.yaml
@@ -395,7 +395,7 @@
           "The master bedroom fan will remain inactive tonight. "
         {% endif %}
         {% if is_state('input_boolean.kallen_overnight','off') %}
-          {% if is_state('fan.kallen_fan_socket_1','on') %}
+          {% if is_state('fan.kallen_bedroom_fan','on') %}
             "Collin's fan is already running. "
           {% elif is_state('input_boolean.white_noise_kallen_bedroom','on') %}
             "Collin's white noise generator is already running. "