Index: firmware/App/Controllers/Thermistors.c
===================================================================
diff -u -rd00ad426d849083922332f832e88e7137a1cad60 -r62a4d7b976107f7ac4d5013ce06f38f4a0bf65bd
--- firmware/App/Controllers/Thermistors.c	(.../Thermistors.c)	(revision d00ad426d849083922332f832e88e7137a1cad60)
+++ firmware/App/Controllers/Thermistors.c	(.../Thermistors.c)	(revision 62a4d7b976107f7ac4d5013ce06f38f4a0bf65bd)
@@ -1,5 +1,5 @@
 
-#include <math.h>
+#include <math.h> // For temperature calculations
 
 #include "Thermistors.h"
 #include "FPGA.h"
@@ -67,7 +67,7 @@
 static const F32 onBoardThermistorVoltageConvCoeff = ONBOARD_THERMISTOR_SOURCE_VOLTAGE /
                                                      TWELVE_BIT_RESOLUTION;                         ///< On board thermistor ADC to voltage conversion coefficient
 static const F32 onBoardThermistorBetaValueInv =  1 / ONBOARD_THERMISTOR_BETA_VALUE;                ///< On board thermistor beta value inverse
-static const F32 onBoardThermistorRefTempInv = 1 / ONBOARD_THERMISTOR_REFERENCE_TEMPERATURE;        ///< On board thermistor reference temONBOARD_THERMISTOR_REFERENCE_TEMPERATUREperature inverse
+static const F32 onBoardThermistorRefTempInv = 1 / ONBOARD_THERMISTOR_REFERENCE_TEMPERATURE;        ///< On board thermistor reference inverse
 
 // ********** private function prototypes **********
 
@@ -223,8 +223,8 @@
         // Get all the raw readings in ADC
         thermistorsStatus[ THERMISTOR_ONBOARD_NTC ].rawADCRead    = getIntADCReading( INT_ADC_BOARD_THERMISTOR );
         thermistorsStatus[ TEMPSENSOR_FPGA_SENSOR ].rawADCRead    = getFPGABoardTemp();
-        thermistorsStatus[ TEMPSENSOR_LOAD_CELL_A1 ].rawADCRead   = getFPGALoadCellsA1B1Temp();
-        thermistorsStatus[ TEMPSENSOR_LOAD_CELL_A2 ].rawADCRead   = getFPGALoadCellsA2B2Temp();
+        thermistorsStatus[ TEMPSENSOR_LOAD_CELL_A1_B1 ].rawADCRead   = getFPGALoadCellsA1B1Temp();
+        thermistorsStatus[ TEMPSENSOR_LOAD_CELL_A2_B2 ].rawADCRead   = getFPGALoadCellsA2B2Temp();
         thermistorsStatus[ TEMPSENSOR_INTERNAL_THDO_RTD ].rawADCRead       = getFPGATHDoInternalTemp();
         thermistorsStatus[ TEMPSENSOR_INTERNAL_TDI_RTD ].rawADCRead        = getFPGATDiInternalTemp();
         thermistorsStatus[ TEMPSENSOR_INTERNAL_CONDUCTIVITY ].rawADCRead   = getFPGAConductivitySnsrInternalTemp();
@@ -294,8 +294,8 @@
         // Get all the raw readings in ADC
         thermistorsStatus[ THERMISTOR_ONBOARD_NTC ].rawADCRead           = getIntADCReading( INT_ADC_BOARD_THERMISTOR );
         thermistorsStatus[ TEMPSENSOR_FPGA_SENSOR ].rawADCRead           = getFPGABoardTemp();
-        thermistorsStatus[ TEMPSENSOR_LOAD_CELL_A1 ].rawADCRead          = getFPGALoadCellsA1B1Temp();
-        thermistorsStatus[ TEMPSENSOR_LOAD_CELL_A2 ].rawADCRead          = getFPGALoadCellsA2B2Temp();
+        thermistorsStatus[ TEMPSENSOR_LOAD_CELL_A1_B1 ].rawADCRead       = getFPGALoadCellsA1B1Temp();
+        thermistorsStatus[ TEMPSENSOR_LOAD_CELL_A2_B2 ].rawADCRead       = getFPGALoadCellsA2B2Temp();
         thermistorsStatus[ TEMPSENSOR_INTERNAL_THDO_RTD ].rawADCRead     = getFPGATHDoInternalTemp();
         thermistorsStatus[ TEMPSENSOR_INTERNAL_TDI_RTD ].rawADCRead      = getFPGATDiInternalTemp();
         thermistorsStatus[ TEMPSENSOR_INTERNAL_CONDUCTIVITY ].rawADCRead = getFPGAConductivitySnsrInternalTemp();
@@ -387,8 +387,8 @@
                 break;
 
             // All these sensors have the same conversion procedure
-            case TEMPSENSOR_LOAD_CELL_A1:
-            case TEMPSENSOR_LOAD_CELL_A2:
+            case TEMPSENSOR_LOAD_CELL_A1_B1:
+            case TEMPSENSOR_LOAD_CELL_A2_B2:
             case TEMPSENSOR_INTERNAL_THDO_RTD:
             case TEMPSENSOR_INTERNAL_TDI_RTD:
             case TEMPSENSOR_INTERNAL_CONDUCTIVITY:
@@ -477,8 +477,8 @@
         // Get all the sensors/thermistors temperature values for publication
         sensorsData.onboardThermistor        = getThermistorTemperatureValue( THERMISTOR_ONBOARD_NTC );
         sensorsData.fpgaBoardTempSensor      = getThermistorTemperatureValue( TEMPSENSOR_FPGA_SENSOR );
-        sensorsData.loadCellA1TempSensor     = getThermistorTemperatureValue( TEMPSENSOR_LOAD_CELL_A1 );
-        sensorsData.loadCellA2TempSensor     = getThermistorTemperatureValue( TEMPSENSOR_LOAD_CELL_A2 );
+        sensorsData.loadCellA1TempSensor     = getThermistorTemperatureValue( TEMPSENSOR_LOAD_CELL_A1_B1 );
+        sensorsData.loadCellA2TempSensor     = getThermistorTemperatureValue( TEMPSENSOR_LOAD_CELL_A2_B2 );
         sensorsData.rtdInternalTempSensor    = getThermistorTemperatureValue( TEMPSENSOR_INTERNAL_THDO_RTD );
         sensorsData.rtdTDiInternalTempSensor = getThermistorTemperatureValue( TEMPSENSOR_INTERNAL_TDI_RTD );
         sensorsData.conductivityTempSensor   = getThermistorTemperatureValue( TEMPSENSOR_INTERNAL_CONDUCTIVITY );