diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c22cb43..c2e0ff71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,10 @@ will consitute of a breaking change warranting a new major release:
   PUS packets to the approrpiate persisten TM stores and then demultiplex the TM to all registered
   TM destinations are before.
 
+## Fixed
+
+- Fix for heater names: HPA heater (index 7) is now the Syrlinks heater.
+
 # [v1.36.0] 2023-03-08
 
 eive-tmtc: v2.17.2
diff --git a/common/config/eive/objects.h b/common/config/eive/objects.h
index d5a59791..f689caf9 100644
--- a/common/config/eive/objects.h
+++ b/common/config/eive/objects.h
@@ -140,7 +140,7 @@ enum commonObjects : uint32_t {
   HEATER_4_CAMERA = 0x60000004,
   HEATER_5_STR = 0x60000005,
   HEATER_6_DRO = 0x60000006,
-  HEATER_7_HPA = 0x60000007,
+  HEATER_7_SYRLINKS = 0x60000007,
 
   // 0x73 ('s') for assemblies and system/subsystem components
   ACS_BOARD_ASS = 0x73000001,
diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp
index c7048cbc..77364a4c 100644
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@@ -288,7 +288,7 @@ void ObjectFactory::createGenericHeaterComponents(GpioIF& gpioIF, PowerSwitchIF&
       {new HealthDevice(objects::HEATER_4_CAMERA, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_4},
       {new HealthDevice(objects::HEATER_5_STR, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_5},
       {new HealthDevice(objects::HEATER_6_DRO, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_6},
-      {new HealthDevice(objects::HEATER_7_HPA, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_7},
+      {new HealthDevice(objects::HEATER_7_SYRLINKS, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_7},
   }});
   heaterHandler = new HeaterHandler(objects::HEATER_HANDLER, &gpioIF, helper, &pwrSwitcher,
                                     pcdu::Switches::PDU2_CH3_TCS_BOARD_HEATER_IN_8V);
diff --git a/tmtc b/tmtc
index ffd2eb11..b0f51072 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit ffd2eb11f8ed9095ca545acbdec45b41fe874f17
+Subproject commit b0f51072b20e4835a3e2143d8b3fb40d14240bfb