diff --git a/mission/power/P60DockHandler.cpp b/mission/power/P60DockHandler.cpp
index d643aef1..77fd9aaf 100644
--- a/mission/power/P60DockHandler.cpp
+++ b/mission/power/P60DockHandler.cpp
@@ -66,7 +66,7 @@ void P60DockHandler::parseHkTableReply(const uint8_t *packet) {
   }
   coreHk.battMode = newBattMode;
 
-  auxHk.heaterOn = *(packet + 0x57);
+  auxHk.heaterForBp4PackOn = *(packet + 0x57);
   auxHk.converter5VStatus = *(packet + 0x58);
 
   for (uint8_t idx = 0; idx < hk::CHNLS_LEN; idx++) {
@@ -111,6 +111,8 @@ void P60DockHandler::parseHkTableReply(const uint8_t *packet) {
   }
   coreHk.setValidity(true, true);
   auxHk.setValidity(true, true);
+  // No BP4 pack, no this is always invalid.
+  auxHk.heaterForBp4PackOn.setValid(false);
 }
 
 ReturnValue_t P60DockHandler::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
diff --git a/mission/power/gsDefs.h b/mission/power/gsDefs.h
index d42cabd2..bbe9911f 100644
--- a/mission/power/gsDefs.h
+++ b/mission/power/gsDefs.h
@@ -260,7 +260,8 @@ class HkTableDataset : public StaticLocalDataSet<32> {
   lp_var_t<uint16_t> resetcause = lp_var_t<uint16_t>(sid.objectId, pool::P60DOCK_RESETCAUSE, this);
 
   /** Battery heater control only possible on BP4 packs */
-  lp_var_t<uint8_t> heaterOn = lp_var_t<uint8_t>(sid.objectId, pool::P60DOCK_HEATER_ON, this);
+  lp_var_t<uint8_t> heaterForBp4PackOn =
+      lp_var_t<uint8_t>(sid.objectId, pool::P60DOCK_HEATER_ON, this);
   lp_var_t<uint8_t> converter5VStatus =
       lp_var_t<uint8_t>(sid.objectId, pool::P60DOCK_CONV_5V_ENABLE_STATUS, this);
 
diff --git a/tmtc b/tmtc
index 0c1bfc6f..280c7243 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 0c1bfc6fd32e66fe0da13bebc4eeb3030ead13a9
+Subproject commit 280c72439effa1b4290dc500dade2c62a9d6e3f7