diff --git a/thermal/ThermalComponentCore.cpp b/thermal/ThermalComponentCore.cpp
index 7b594d0c..ba875053 100644
--- a/thermal/ThermalComponentCore.cpp
+++ b/thermal/ThermalComponentCore.cpp
@@ -1,4 +1,5 @@
 #include "ThermalComponentCore.h"
+#include "tcsDefinitions.h"
 
 ThermalComponentCore::ThermalComponentCore(object_id_t reportingObjectId,
         uint8_t domainId, gp_id_t temperaturePoolId,
@@ -60,7 +61,7 @@ ThermalComponentIF::HeaterRequest ThermalComponentCore::performOperation(
 	//SHOULDDO: Better pass db_float_t* to getTemperature and set it invalid if invalid.
 	temperature = getTemperature();
 	updateMinMaxTemp();
-	if (temperature != INVALID_TEMPERATURE) {
+	if (temperature != thermal::INVALID_TEMPERATURE) {
 		temperature.setValid(PoolVariableIF::VALID);
 		State state = getState(temperature.value, getParameters(),
 				targetState.value);
@@ -119,7 +120,7 @@ ReturnValue_t ThermalComponentCore::setTargetState(int8_t newState) {
 }
 
 void ThermalComponentCore::setOutputInvalid() {
-	temperature = INVALID_TEMPERATURE;
+	temperature = thermal::INVALID_TEMPERATURE;
 	temperature.setValid(PoolVariableIF::INVALID);
 	currentState.setValid(PoolVariableIF::INVALID);
 	heaterRequest = HEATER_DONT_CARE;
@@ -144,13 +145,13 @@ float ThermalComponentCore::getTemperature() {
 
 	if (thermalModule != nullptr) {
 		float temperature = thermalModule->getTemperature();
-		if (temperature != ThermalModuleIF::INVALID_TEMPERATURE) {
+		if (temperature != thermal::INVALID_TEMPERATURE) {
 			return temperature;
 		} else {
-			return INVALID_TEMPERATURE;
+			return thermal::INVALID_TEMPERATURE;
 		}
 	} else {
-		return INVALID_TEMPERATURE;
+		return thermal::INVALID_TEMPERATURE;
 	}
 }
 
@@ -226,7 +227,7 @@ ThermalComponentIF::State ThermalComponentCore::getIgnoredState(int8_t state) {
 }
 
 void ThermalComponentCore::updateMinMaxTemp() {
-	if (temperature == INVALID_TEMPERATURE) {
+	if (temperature == thermal::INVALID_TEMPERATURE) {
 		return;
 	}
 	if (temperature < minTemp) {
diff --git a/thermal/ThermalModule.cpp b/thermal/ThermalModule.cpp
index 457a6743..de347542 100644
--- a/thermal/ThermalModule.cpp
+++ b/thermal/ThermalModule.cpp
@@ -107,7 +107,7 @@ void ThermalModule::calculateTemperature() {
 		moduleTemperature = moduleTemperature.value / numberOfValidSensors;
 		moduleTemperature.setValid(PoolVariableIF::VALID);
 	} else {
-		moduleTemperature = INVALID_TEMPERATURE;
+		moduleTemperature.value = thermal::INVALID_TEMPERATURE;
 		moduleTemperature.setValid(PoolVariableIF::INVALID);
 	}
 }
@@ -219,7 +219,7 @@ void ThermalModule::initialize(PowerSwitchIF* powerSwitch) {
 bool ThermalModule::calculateModuleHeaterRequestAndSetModuleStatus(
 		Strategy strategy) {
 	currentState.setValid(PoolVariableIF::VALID);
-	if (moduleTemperature == INVALID_TEMPERATURE) {
+	if (moduleTemperature == thermal::INVALID_TEMPERATURE) {
 		currentState = UNKNOWN;
 		return false;
 	}
@@ -282,7 +282,7 @@ void ThermalModule::updateTargetTemperatures(ThermalComponentIF* component,
 }
 
 void ThermalModule::setOutputInvalid() {
-	moduleTemperature = INVALID_TEMPERATURE;
+	moduleTemperature = thermal::INVALID_TEMPERATURE;
 	moduleTemperature.setValid(PoolVariableIF::INVALID);
 	currentState.setValid(PoolVariableIF::INVALID);
 	std::list<ComponentData>::iterator iter = components.begin();
diff --git a/thermal/ThermalModuleIF.h b/thermal/ThermalModuleIF.h
index 2d11a6f2..89cf93d6 100644
--- a/thermal/ThermalModuleIF.h
+++ b/thermal/ThermalModuleIF.h
@@ -2,6 +2,7 @@
 #define THERMALMODULEIF_H_
 
 #include "ThermalComponentIF.h"
+
 class AbstractTemperatureSensor;
 
 class ThermalModuleIF{
@@ -18,8 +19,6 @@ public:
 		NON_OPERATIONAL = 0, OPERATIONAL = 1, UNKNOWN = 2
 	};
 
-	static constexpr float INVALID_TEMPERATURE = 999;
-
 	virtual ~ThermalModuleIF() {
 
 	}
diff --git a/thermal/tcsDefinitions.h b/thermal/tcsDefinitions.h
index 37e5b849..3225be5c 100644
--- a/thermal/tcsDefinitions.h
+++ b/thermal/tcsDefinitions.h
@@ -1,8 +1,8 @@
 #ifndef TCSDEFINITIONS_H_
 #define TCSDEFINITIONS_H_
 
-
-static const float INVALID_TEMPERATURE = 999;
-
+namespace thermal {
+static constexpr float INVALID_TEMPERATURE = 999;
+}
 
 #endif /* TCSDEFINITIONS_H_ */