Index: firmware/App/Monitors/Level.c
===================================================================
diff -u -rceb6a93ac8a92b2676397fe45235758109bee490 -r901d84db197c6d828e4bc58c557ec5ebbd1c557b
--- firmware/App/Monitors/Level.c	(.../Level.c)	(revision ceb6a93ac8a92b2676397fe45235758109bee490)
+++ firmware/App/Monitors/Level.c	(.../Level.c)	(revision 901d84db197c6d828e4bc58c557ec5ebbd1c557b)
@@ -28,6 +28,7 @@
  */
 
 // ********** private definitions **********
+#define LEVEL_SENSOR_VALUE_LOW              0U                                                      ///< Level sensor digital low value (0 = low, non-zero = high).
 #define FPGA_B1_HW_LEVEL_LOW                5                                                       ///< Floater low level status for Beta 1.0
 #define FPGA_B1_HW_LEVEL_MEDIUM             4                                                       ///< Floater medium level status for Beta 1.0
 #define FPGA_B1_HW_LEVEL_HIGH               6                                                       ///< Floater high level status for Beta 1.0
@@ -69,7 +70,7 @@
 
 static void publishLevelsData( void );
 static BOOL processLevelCount( U16 count );
-static LEVEL_STATE_T readFloaterLevelstatus( LEVEL_T levelId );
+static LEVEL_STATE_T readFloaterLevelStatus( LEVEL_T levelId );
 static LEVEL_STATE_T getLevelState( U32 levelStatus );
 static LEVEL_STATE_T getLevelStateBeta19( U32 levelStatus );
 static LEVEL_STATE_T getLevelStateBeta10( U32 levelStatus );
@@ -129,44 +130,44 @@
         {
             // Process the status of the Level
             case D6_LEVL:
-                currentLevelStatus = readFloaterLevelstatus( D6_LEVL );
+                currentLevelStatus = readFloaterLevelStatus( D6_LEVL );
                 break;
 
             case D63_LEVL:
                 if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
                 {
-                    currentLevelStatus = ( 0U == getFPGAD63LevelSensor() ) ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH;
+                    currentLevelStatus = ( LEVEL_SENSOR_VALUE_LOW == getFPGAD63LevelSensor() ) ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH;
                 }
                 else
                 {
-                    currentLevelStatus = ( processLevelCount( getFPGAD63LevelSensor() ) == 0 ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH );
+                    currentLevelStatus = ( processLevelCount( getFPGAD63LevelSensor() ) == LEVEL_SENSOR_VALUE_LOW ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH );
                 }
                 break;
 
             case D98_LEVL:
                 if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
                 {
-                    currentLevelStatus = ( 0U == getFPGAD98LevelSensor() ) ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH;
+                    currentLevelStatus = ( LEVEL_SENSOR_VALUE_LOW == getFPGAD98LevelSensor() ) ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH;
                 }
                 else
                 {
-                    currentLevelStatus = ( processLevelCount( getFPGAD98LevelSensor() ) == 0 ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH );
+                    currentLevelStatus = ( processLevelCount( getFPGAD98LevelSensor() ) == LEVEL_SENSOR_VALUE_LOW ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH );
                 }
                 break;
 
             case D46_LEVL:
                 if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
                 {
-                    currentLevelStatus = ( 0U == getFPGAD46LevelSensor() ) ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH;
+                    currentLevelStatus = ( LEVEL_SENSOR_VALUE_LOW == getFPGAD46LevelSensor() ) ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH;
                 }
                 else
                 {
-                    currentLevelStatus = ( processLevelCount( getFPGAD46LevelSensor() ) == 0 ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH );
+                    currentLevelStatus = ( processLevelCount( getFPGAD46LevelSensor() ) == LEVEL_SENSOR_VALUE_LOW ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH );
                 }
                 break;
 
             case P25_LEVL:
-                currentLevelStatus = readFloaterLevelstatus( P25_LEVL );
+                currentLevelStatus = readFloaterLevelStatus( P25_LEVL );
                 break;
 
 #ifndef _VECTORCAST_
@@ -393,13 +394,13 @@
 
 /*********************************************************************//**
  * @brief
- * The getFloaterLevelstatus function gets the floater level reported by FPGA
+ * The getFloaterLevelStatus function gets the floater level reported by FPGA
  * @details \b Alarm: ALARM_ID_DD_SOFTWARE_FAULT if the current state is invalid.
  * @details \b Inputs: FPGA level sensor data
  * @details \b Outputs: level
  * @return level status
  *************************************************************************/
-static LEVEL_STATE_T readFloaterLevelstatus( LEVEL_T levelId )
+static LEVEL_STATE_T readFloaterLevelStatus( LEVEL_T levelId )
 {
     LEVEL_STATE_T currentLevelStatus = LEVEL_STATE_HIGH;
     U32 levelStatus = 0;