Index: firmware/App/Monitors/Level.c
===================================================================
diff -u -r72d735179cbbb0e3e8be9c38392eee055f7b2697 -r3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546
--- firmware/App/Monitors/Level.c	(.../Level.c)	(revision 72d735179cbbb0e3e8be9c38392eee055f7b2697)
+++ firmware/App/Monitors/Level.c	(.../Level.c)	(revision 3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546)
@@ -107,17 +107,17 @@
         switch ( i )
         {
             // Process the status of the Level
-            case FLOATER_LEVEL:
-                if ( FPGA_LEVEL_LOW == getFPGAFloater1Status() )
+            case D6_LEVL:
+                if ( FPGA_LEVEL_LOW == getFPGAD6LevelStatus() )
                 {
                     //currentLevelStatus = LEVEL_STATE_LOW ;
                     currentLevelStatus = LEVEL_STATE_HIGH ;
                 }
-                else if ( FPGA_LEVEL_MEDIUM == getFPGAFloater1Status() )
+                else if ( FPGA_LEVEL_MEDIUM == getFPGAD6LevelStatus() )
                 {
                     currentLevelStatus = LEVEL_STATE_MEDIUM ;
                 }
-                else if ( FPGA_LEVEL_HIGH == getFPGAFloater1Status() )
+                else if ( FPGA_LEVEL_HIGH == getFPGAD6LevelStatus() )
                 {
                     //currentLevelStatus = LEVEL_STATE_HIGH ;
                     currentLevelStatus = LEVEL_STATE_LOW ;
@@ -129,12 +129,12 @@
                 }
                 break;
 
-            case BICARB_LEVEL:
-                currentLevelStatus = ( processLevelCount( getFPGALevelSensor1() ) == 0 ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH );
+            case D63_LEVL:
+                currentLevelStatus = ( processLevelCount( getFPGAD63LevelSensor() ) == 0 ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH );
                 break;
 
-            case SPENT_DIALYSATE_LEVEL:
-                currentLevelStatus = ( processLevelCount( getFPGALevelSensor2() ) == 0 ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH );
+            case D46_LEVL:
+                currentLevelStatus = ( processLevelCount( getFPGAD46LevelSensor() ) == 0 ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH );
                 break;
 
 #ifndef _VECTORCAST_
@@ -157,16 +157,16 @@
             {
                 switch ( i )
                 {
-                    case FLOATER_LEVEL:
-                        SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_FLOATER_LEVEL_CHANGE, (U32)status[ i ].data, (U32)currentLevelStatus );
+                    case D6_LEVL:
+                        SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_D6_LEVL_CHANGE, (U32)status[ i ].data, (U32)currentLevelStatus );
                         break;
 
-                    case BICARB_LEVEL:
-                        SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_BICARB_LEVEL_CHANGE, (U32)status[ i ].data, (U32)currentLevelStatus );
+                    case D63_LEVL:
+                        SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_D63_LEVL_CHANGE, (U32)status[ i ].data, (U32)currentLevelStatus );
                         break;
 
-                    case SPENT_DIALYSATE_LEVEL:
-                        SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_SPENT_DIALYSATE_LEVEL_CHANGE, (U32)status[ i ].data, (U32)currentLevelStatus );
+                    case D46_LEVL:
+                        SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_D46_LEVL_CHANGE, (U32)status[ i ].data, (U32)currentLevelStatus );
                         break;
 
 #ifndef _VECTORCAST_
@@ -266,9 +266,9 @@
     {
         LEVEL_DATA_T data;
 
-        data.floaterLevel           = (U32)getLevelStatus( FLOATER_LEVEL );
-        data.bicarbLevel            = (U32)getLevelStatus( BICARB_LEVEL );
-        data.spentDialysateLevel    = (U32)getLevelStatus( SPENT_DIALYSATE_LEVEL );
+        data.d6Level    = (U32)getLevelStatus( D6_LEVL );
+        data.d63Level   = (U32)getLevelStatus( D63_LEVL );
+        data.d46Level   = (U32)getLevelStatus( D46_LEVL );
         //data.spentDialysateLevel    = (U32)getFPGAFloater1Status();
 
         levelsDataPublicationCounter = 0;