Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rb37e7ab88f133b7ba7f9b604e4e164b2855b239e -ra859411f7144e5a3f0a778ac11d63c1fb1b45af8
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision b37e7ab88f133b7ba7f9b604e4e164b2855b239e)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision a859411f7144e5a3f0a778ac11d63c1fb1b45af8)
@@ -403,7 +403,7 @@
 #ifdef __TEENSY_CONDUCTIVITY_DRIVER__
         F32 measuredTempAtDialyzer      = getTeensyConductivityTemperatureValue( D27_COND );
 #else
-        F32 measuredTempAtDialyzer      = getConductivityTemperatureValue( D27_COND );
+        F32 measuredTempAtDialyzer      = getConductivityTemperature( D27_COND );
 #endif
         F32 calcTargetTemp              = getHeaterTargetTemperature( D5_HEAT );
         F32 dialysateFlowrate           = getTDDialysateFlowrate();
Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -rfd63d4e5294ee1c3585359936e9b9afd06c08314 -ra859411f7144e5a3f0a778ac11d63c1fb1b45af8
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision fd63d4e5294ee1c3585359936e9b9afd06c08314)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision a859411f7144e5a3f0a778ac11d63c1fb1b45af8)
@@ -419,27 +419,27 @@
                     break;
                 case HW_REV_LOWER_WORD:
                     memcpy( conductivitySensorRevisions[ sensor ].hwRev, &conductivitySensorStatus[ sensor ].calData, sizeof( U32 ) );
-                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ SW_REV_LOWER_WORD ] = TRUE;
+                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ HW_REV_LOWER_WORD ] = TRUE;
                     break;
                 case HW_REV_MID_WORD:
                     memcpy( ( conductivitySensorRevisions[ sensor ].hwRev + LOWER_WORD_SIZE ), &conductivitySensorStatus[ sensor ].calData, sizeof( U32 ) );
-                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ SW_REV_MID_WORD ] = TRUE;
+                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ HW_REV_MID_WORD ] = TRUE;
                     break;
                 case HW_REV_UPPER_WORD:
                     memcpy( ( conductivitySensorRevisions[ sensor ].hwRev + ( LOWER_WORD_SIZE + MID_WORD_SIZE ) ), &conductivitySensorStatus[ sensor ].calData, sizeof( U32 ) );
-                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ SW_REV_UPPER_WORD ] = TRUE;
+                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ HW_REV_UPPER_WORD ] = TRUE;
                     break;
                 case HW_SERIAL_LOWER_WORD:
                     memcpy( conductivitySensorRevisions[ sensor ].hwSerial, &conductivitySensorStatus[ sensor ].calData, sizeof( U32 ) );
-                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ SW_REV_LOWER_WORD ] = TRUE;
+                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ HW_SERIAL_LOWER_WORD ] = TRUE;
                     break;
                 case HW_SERIAL_MID_WORD:
                     memcpy( ( conductivitySensorRevisions[ sensor ].hwSerial + LOWER_WORD_SIZE ), &conductivitySensorStatus[ sensor ].calData, sizeof( U32 ) );
-                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ SW_REV_MID_WORD ] = TRUE;
+                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ HW_SERIAL_MID_WORD ] = TRUE;
                     break;
                 case HW_SERIAL_UPPER_WORD:
                     memcpy( ( conductivitySensorRevisions[ sensor ].hwRev + ( LOWER_WORD_SIZE + MID_WORD_SIZE ) ), &conductivitySensorStatus[ sensor ].calData, sizeof( U32 ) );
-                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ SW_REV_UPPER_WORD ] = TRUE;
+                    conductivitySensorStatus[ sensor ].hasCalSlotBeenRead[ HW_SERIAL_UPPER_WORD ] = TRUE;
                     break;
             }
             // check if we have finished reading all values.
@@ -448,8 +448,8 @@
         // Read all cal values. Check ranges.
         else
         {
-            conductivitySensorStatus[ sensor ].calReadComplete = checkConductivityCoefficientRanges( sensor );
-
+            //conductivitySensorStatus[ sensor ].calReadComplete = checkConductivityCoefficientRanges( sensor );
+            conductivitySensorStatus[ sensor ].calReadComplete = TRUE;
             if ( TRUE == conductivitySensorStatus[ sensor ].calReadComplete )
             {
                 calResult = TRUE;
@@ -791,7 +791,7 @@
  * @param sensorId conductivity sensor id
  * @return conductivity value
  *************************************************************************/
-F32 getConductivityValue( CONDUCTIVITY_SENSORS_T sensor )
+F32 getConductivity( CONDUCTIVITY_SENSORS_T sensor )
 {
     F32 result = 0.0F;
 
@@ -821,7 +821,7 @@
  * @param sensorId conductivity sensor id
  * @return temperature value
  *************************************************************************/
-F32 getConductivityTemperatureValue( CONDUCTIVITY_SENSORS_T sensor )
+F32 getConductivityTemperature( CONDUCTIVITY_SENSORS_T sensor )
 {
     F32 result = 0.0F;
 
Index: firmware/App/Monitors/Temperature.c
===================================================================
diff -u -r46a42611591cb92eef5f20c8d39964d406c5c8cc -ra859411f7144e5a3f0a778ac11d63c1fb1b45af8
--- firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision 46a42611591cb92eef5f20c8d39964d406c5c8cc)
+++ firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision a859411f7144e5a3f0a778ac11d63c1fb1b45af8)
@@ -542,11 +542,11 @@
         data.d44CondTemp    = getTeensyConductivityTemperatureValue( D43_COND );
         data.d75CondTemp    = getConductivityTemperatureValue( D74_COND );
 #else
-        data.d16CondTemp    = getConductivityTemperatureValue( D17_COND );
-        data.d28CondTemp    = getConductivityTemperatureValue( D27_COND );
-        data.d30CondTemp    = getConductivityTemperatureValue( D29_COND );
-        data.d44CondTemp    = getConductivityTemperatureValue( D43_COND );
-        data.d75CondTemp    = getConductivityTemperatureValue( D74_COND );
+        data.d16CondTemp    = getConductivityTemperature( D17_COND );
+        data.d28CondTemp    = getConductivityTemperature( D27_COND );
+        data.d30CondTemp    = getConductivityTemperature( D29_COND );
+        data.d44CondTemp    = getConductivityTemperature( D43_COND );
+        data.d75CondTemp    = getConductivityTemperature( D74_COND );
 #endif
         data.d4AvgTemp      = getD4AverageTemperature();
         data.d50AvgTemp     = getD50AverageTemperature();
Index: firmware/App/Services/FpgaDD.c
===================================================================
diff -u -rfd63d4e5294ee1c3585359936e9b9afd06c08314 -ra859411f7144e5a3f0a778ac11d63c1fb1b45af8
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision fd63d4e5294ee1c3585359936e9b9afd06c08314)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision a859411f7144e5a3f0a778ac11d63c1fb1b45af8)
@@ -655,9 +655,9 @@
  *************************************************************************/
 void initFPGADD( void )
 {
-    // Initialize fpga driver
-    initFPGA( (U08*)&fpgaHeader, (U08*)&fpgaBeta19SensorReadings, (U08*)&fpgaBeta19ActuatorSetPoints,
-              sizeof(FPGA_HEADER_T), sizeof(DD_FPGA_SENSORS_BETA_1_9_T), sizeof(FPGA_ACTUATORS_BETA_1_9_T) );
+    // Initialize fpga driver for beta 2 hardware
+    initFPGA( (U08*)&fpgaHeader, (U08*)&fpgaSensorReadings, (U08*)&fpgaActuatorSetPoints,
+              sizeof(FPGA_HEADER_T), sizeof(DD_FPGA_SENSORS_T), sizeof(FPGA_ACTUATORS_T) );;
 
     // initialize fpga data structures
     memset( &fpgaHeader, 0, sizeof( FPGA_HEADER_T ) );