diff --git a/ground/openpilotgcs/src/plugins/config/calibration/thermal/boardsetuptransition.h b/ground/openpilotgcs/src/plugins/config/calibration/thermal/boardsetuptransition.h
index f5ecbc74c..cbbf89d22 100644
--- a/ground/openpilotgcs/src/plugins/config/calibration/thermal/boardsetuptransition.h
+++ b/ground/openpilotgcs/src/plugins/config/calibration/thermal/boardsetuptransition.h
@@ -33,6 +33,7 @@
 #include <QEventTransition>
 
 #include "thermalcalibrationhelper.h"
+namespace OpenPilot {
 
 class BoardSetupTransition : public QSignalTransition {
     Q_OBJECT
@@ -78,6 +79,6 @@ public slots:
 private:
     ThermalCalibrationHelper *m_helper;
 };
-
+}
 
 #endif // BOARDSETUPTRANSITION_H
diff --git a/ground/openpilotgcs/src/plugins/config/calibration/thermal/dataacquisitiontransition.h b/ground/openpilotgcs/src/plugins/config/calibration/thermal/dataacquisitiontransition.h
index ed14035cd..0223f2bf8 100644
--- a/ground/openpilotgcs/src/plugins/config/calibration/thermal/dataacquisitiontransition.h
+++ b/ground/openpilotgcs/src/plugins/config/calibration/thermal/dataacquisitiontransition.h
@@ -33,6 +33,7 @@
 #include <QEventTransition>
 
 #include "thermalcalibrationhelper.h"
+namespace OpenPilot {
 
 class DataAcquisitionTransition : public QSignalTransition {
     Q_OBJECT
@@ -66,5 +67,6 @@ public slots:
 private:
     ThermalCalibrationHelper *m_helper;
 };
+}
 
 #endif // DATAACQUISITIONTRANSITION_H
diff --git a/ground/openpilotgcs/src/plugins/config/calibration/thermal/settingshandlingtransitions.h b/ground/openpilotgcs/src/plugins/config/calibration/thermal/settingshandlingtransitions.h
index 8f1fa6f96..519af0637 100644
--- a/ground/openpilotgcs/src/plugins/config/calibration/thermal/settingshandlingtransitions.h
+++ b/ground/openpilotgcs/src/plugins/config/calibration/thermal/settingshandlingtransitions.h
@@ -32,6 +32,7 @@
 #include <QEventTransition>
 
 #include "thermalcalibrationhelper.h"
+namespace OpenPilot {
 
 class BoardStatusSaveTransition : public QSignalTransition {
     Q_OBJECT
@@ -115,6 +116,6 @@ public slots:
 private:
     ThermalCalibrationHelper *m_helper;
 };
-
+}
 
 #endif // SETTINGSHANDLINGTRANSITIONS_H
diff --git a/ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibrationhelper.cpp b/ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibrationhelper.cpp
index 84790f729..c5065dd6e 100644
--- a/ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibrationhelper.cpp
+++ b/ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibrationhelper.cpp
@@ -27,6 +27,7 @@
  */
 #include "thermalcalibrationhelper.h"
 
+namespace OpenPilot {
 ThermalCalibrationHelper::ThermalCalibrationHelper(QObject *parent) :
     QObject(parent)
 {
@@ -357,3 +358,4 @@ UAVObjectManager *ThermalCalibrationHelper::getObjectManager()
     Q_ASSERT(objMngr);
     return objMngr;
 }
+}
diff --git a/ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibrationhelper.h b/ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibrationhelper.h
index ad4d921c3..88b65e597 100644
--- a/ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibrationhelper.h
+++ b/ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibrationhelper.h
@@ -49,6 +49,7 @@
 #include <accelgyrosettings.h>
 #include <revocalibration.h>
 #include <revosettings.h>
+namespace OpenPilot {
 
 typedef struct {
     // this is not needed for revo, but should for CC/CC3D
@@ -168,5 +169,5 @@ private:
     void setMetadataForCalibration(UAVDataObject *uavo);
     UAVObjectManager *getObjectManager();
 };
-
+}
 #endif // THERMALCALIBRATIONHELPER_H
diff --git a/ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibrationmodel.cpp b/ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibrationmodel.cpp
index aebcb52a8..cf4b8f081 100644
--- a/ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibrationmodel.cpp
+++ b/ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibrationmodel.cpp
@@ -35,6 +35,7 @@
 #define NEXT_EVENT     "next"
 #define PREVIOUS_EVENT "previous"
 #define ABORT_EVENT    "abort"
+namespace OpenPilot {
 
 ThermalCalibrationModel::ThermalCalibrationModel(QObject *parent) :
     WizardModel(parent)
@@ -102,3 +103,4 @@ void ThermalCalibrationModel::setTransitions()
     m_finalizeState->addTransition(this, SIGNAL(next()), m_readyState);
     // Ready
 }
+}
diff --git a/ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibrationmodel.h b/ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibrationmodel.h
index 7c7135c5f..ea0c0622a 100644
--- a/ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibrationmodel.h
+++ b/ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibrationmodel.h
@@ -37,6 +37,7 @@
 #include <QStateMachine>
 #include "../wizardstate.h"
 #include "../wizardmodel.h"
+namespace OpenPilot {
 
 class ThermalCalibrationModel : public WizardModel {
     Q_PROPERTY(bool startEnable READ startEnabled NOTIFY startEnabledChanged)
@@ -192,6 +193,6 @@ public slots:
         emit abort();
     }
 };
-
+}
 
 #endif // THERMALCALIBRATIONMODEL_H
diff --git a/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp b/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
index ad5ec9a02..8aca21268 100644
--- a/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
@@ -222,7 +222,7 @@ ConfigRevoWidget::ConfigRevoWidget(QWidget *parent) :
     autoLoadWidgets();
 
     // connect the thermalCalibration model to UI
-    m_thermalCalibrationModel = new ThermalCalibrationModel(this);
+    m_thermalCalibrationModel = new OpenPilot::ThermalCalibrationModel(this);
 
     connect(m_ui->ThermalBiasStart, SIGNAL(clicked()), m_thermalCalibrationModel, SLOT(btnStart()));
     connect(m_ui->ThermalBiasEnd, SIGNAL(clicked()), m_thermalCalibrationModel, SLOT(btnEnd()));
diff --git a/ground/openpilotgcs/src/plugins/config/configrevowidget.h b/ground/openpilotgcs/src/plugins/config/configrevowidget.h
index 12d120d03..aa24d584f 100644
--- a/ground/openpilotgcs/src/plugins/config/configrevowidget.h
+++ b/ground/openpilotgcs/src/plugins/config/configrevowidget.h
@@ -57,7 +57,7 @@ private:
     // ! Computes the scale and bias of the mag based on collected data
     void computeScaleBias();
 
-    ThermalCalibrationModel *m_thermalCalibrationModel;
+    OpenPilot::ThermalCalibrationModel *m_thermalCalibrationModel;
     Ui_RevoSensorsWidget *m_ui;
     QGraphicsSvgItem *paperplane;
     QGraphicsSvgItem *sensorsBargraph;