diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp
index aefce4ca..ce66ccc1 100644
--- a/mission/controller/ThermalController.cpp
+++ b/mission/controller/ThermalController.cpp
@@ -1759,7 +1759,7 @@ void ThermalController::heaterTransitionControl(const HeaterSwitchStates& curren
     if (heaterStates[i].switchTransition) {
       if (currentHeaterStates[i] == heaterStates[i].target) {
         // Required for max heater period control
-        if (currentHeaterStates[i] == heater::SwitchState::ON) {
+        if (currentHeaterStates[i] == HeaterHandler::SwitchState::ON) {
           heaterStates[i].heaterOnPeriod.setTimeout(MAX_HEATER_ON_DURATIONS_MS[i]);
           heaterStates[i].heaterOnPeriod.resetTimer();
         } else {
@@ -1786,7 +1786,7 @@ void ThermalController::heaterMaxDurationControl(const HeaterSwitchStates& curre
         heaterStates[i].heaterOnPeriod.hasTimedOut()) {
       heaterStates[i].switchTransition = false;
       heaterStates[i].heaterSwitchControlCycles = 0;
-      heaterHandler.switchHeater(static_cast<heater::Switch>(i), heater::SwitchState::OFF);
+      heaterHandler.switchHeater(static_cast<heater::Switch>(i), HeaterHandler::SwitchState::OFF);
       triggerEvent(tcsCtrl::TCS_HEATER_MAX_BURN_TIME_REACHED, static_cast<uint32_t>(i),
                    MAX_HEATER_ON_DURATIONS_MS[i]);
       // The heater might still be one for some thermal components, so cross-check