Index: DDDefs.h
===================================================================
diff -u -rcccd9c9d23a6be09d331ab3aae8b7415757b682d -ree8231a5f396953cee5e8e4bbfd84566ab298993
--- DDDefs.h	(.../DDDefs.h)	(revision cccd9c9d23a6be09d331ab3aae8b7415757b682d)
+++ DDDefs.h	(.../DDDefs.h)	(revision ee8231a5f396953cee5e8e4bbfd84566ab298993)
@@ -511,56 +511,55 @@
 /// Enumeration of DryBicart fill exec states.
 enum Dry_Bicart_Fill_Exec_States
 {
-    DRY_BICART_FILL_IDLE_STATE = 0,                         ///< Initial state of dry bicart fill
-    DRY_BICART_FILL_WATER_STATE,                            ///< Dry bicart fill water start state
-    DRY_BICART_VENT_STATE,                                  ///< Dry bicart vent end state
-    DRY_BICART_FILL_DURATION_CHECK_STATE,                   ///< Dry bicart fill duration check state
-    DRY_BICART_FILL_COMPLETE_STATE,                         ///< Dry bicart fill complete state
-    NUM_OF_DRY_BICART_FILL_EXEC_STATES                      ///< Number of dry bicart fill states
+    DRY_BICARBONATE_FILL_CARTRIDGE_STATE_IDLE = 0,          ///< Initial idle state prior to fill operations
+    DRY_BICARBONATE_FILL_CARTRIDGE_STATE_FILL_WATER,        ///< Active water fill state
+    DRY_BICARBONATE_FILL_CARTRIDGE_STATE_VENT,              ///< Venting state after the fill process
+    DRY_BICARBONATE_FILL_CARTRIDGE_STATE_DURATION_CHECK,    ///< Fill duration check state
+    NUM_OF_DRY_BICARBONATE_FILL_CARTRIDGE_EXEC_STATES       ///< Number of dry bicart fill states
 };
 typedef enum Dry_Bicart_Fill_Exec_States DRY_BICART_FILL_EXEC_STATE_T;  ///< Type for dry bicart fill exec state enumeration
 
 /// Enumeration of Bicarb chamber fill exec states.
-enum Bicarb_Chamber_F_Fill_Exec_States
+enum Bicarb_Chamber_F_Supply_Exec_States
 {
-    BICARB_CHAMBER_SUPPLY_IDLE_STATE = 0,                   ///< Initial state of Chamber F supply
-    BICARB_CHAMBER_SUPPLY_STATE,                            ///< Bicarb Chamber supply complete state
-    BICARB_CARTRIDGE_FILL_WATER_STATE,                      ///< Dry bicart fill water end state while dialysate delivery
-    BICARB_SUPPLY_VENT_STATE,                               ///< Bicarb Chamber supply vent cartridge and Chamber F end state
-    NUM_OF_BICARB_CHAMBER_FILL_EXEC_STATES                  ///< Number of Bicarb chamber fill state
+    BICARBONATE_CHAMBER_SUPPLY_STATE_IDLE = 0,              ///< Initial state of Chamber F supply
+    BICARBONATE_CHAMBER_SUPPLY_STATE_ACTIVE,                ///< Bicarb active supply/delivery state
+    BICARBONATE_CHAMBER_SUPPLY_STATE_CARTRIDGE_FILL_WATER,  ///< Water fill state for bicart during delivery
+    BICARBONATE_CHAMBER_SUPPLY_STATE_OCEAN_SPRAY_DECAY,     ///< Ocean spray decay settling state prior to venting
+    BICARBONATE_CHAMBER_SUPPLY_STATE_CARTRIDGE_VENT,        ///< Cartridge and chamber F venting completion state
+    NUM_OF_BICARBONATE_CHAMBER_SUPPLY_EXEC_STATES           ///< Number of Bicarb chamber supply state
 };
-typedef enum Bicarb_Chamber_F_Fill_Exec_States BICARB_CHAMBER_FILL_EXEC_STATE_T;  ///< Type for bicarb chamber fill exec state enumeration
+typedef enum Bicarb_Chamber_F_Supply_Exec_States BICARB_CHAMBER_SUPPLY_EXEC_STATE_T;  ///< Type for bicarb chamber supply exec state enumeration
 
 /// Enumeration of DryBicart drain exec states
 enum Dry_Bicart_Drain_Exec_States
 {
-    BICART_DRAIN_IDLE_STATE = 0,                            ///< Initial state of dry bicart drain
-    BICART_DRAIN_STATE,                                     ///< Dry bicart bicarb drain state
-    BICART_DRAIN_DURATION_CHECK_STATE,                      ///< Dry bicart bicarb drain duration check state
-    NUM_OF_DRY_BICART_DRAIN_EXEC_STATES                     ///< Number of dry bicart drain states
+    DRY_BICARBONATE_DRAIN_CARTRIDGE_STATE_IDLE = 0,                   ///< Initial state of dry bicart drain
+    DRY_BICARBONATE_DRAIN_CARTRIDGE_STATE_DRAIN,                      ///< Dry bicart bicarb drain state
+    DRY_BICARBONATE_DRAIN_CARTRIDGE_STATE_DURATION_CHECK,             ///< Dry bicart bicarb drain duration check state
+    NUM_OF_DRY_BICARBONATE_DRAIN_CARTRIDGE_EXEC_STATES                ///< Number of dry bicart drain states
 };
 typedef enum Dry_Bicart_Drain_Exec_States DRY_BICART_DRAIN_EXEC_STATE_T;    ///< Type for dry bicart fill exec state enumeration
 
 /// Enumeration of drybicart depressurize exec states
 enum Dry_Bicart_Depressurize_Exec_States
 {
-    DRY_BICART_DEPRESSURIZE_IDLE_STATE = 0,                 ///< Initial state of dry bicart depressurise
-    DRY_BICART_DEPRESSURIZE_STATE,                    ///< Dry bicart depressurize vent start state
-    NUM_OF_DRY_BICART_DEPRESSURIZE_EXEC_STATES              ///< Number of dry bicart depressurize states
+    DRY_BICARBONATE_DEPRESSURIZE_CARTRIDGE_STATE_IDLE = 0,                 ///< Initial state of dry bicart depressurise
+    DRY_BICARBONATE_DEPRESSURIZE_CARTRIDGE_STATE_VENT,                     ///< Dry bicart depressurize vent state
+    NUM_OF_DRY_DRY_BICARBONATE_DEPRESSURIZE_CARTRIDGE_EXEC_STATES          ///< Number of dry bicart depressurize states
 };
 typedef enum Dry_Bicart_Depressurize_Exec_States DRY_BICART_DEPRESSURIZE_EXEC_STATE_T;    ///< Type for dry bicart depressurize exec state enumeration
 
-/// Enumeration of transient sequence step states
-enum SequenceStep_States
+enum Dry_Bicart_Drain_Depressurize_Commands
 {
-    SEQUENCE_STEP0_STATE = 0,                               ///< Initial state of transient sequence step state
-    SEQUENCE_STEP1_STATE,                                   ///< Transient sequence step2 state
-    SEQUENCE_STEP2_STATE,                                   ///< Transient sequence step3 state
-    NUM_OF_SEQUENCE_STEP_STATES                             ///< Number of Sequence step states
+    DRY_BICARBONATE_CARTRIDGE_CMD_DRAIN = 0,                ///< Dry bicart dain command
+    DRY_BICARBONATE_CARTRIDGE_CMD_DEPRESSURIZE,             ///< Dry bicart depressurize command
+    DRY_BICARBONATE_CARTRIDGE_CMD_CANCEL,                   ///< Dry bicart canel command
+    DRY_BICARBONATE_CARTRIDGE_CMD_DONE,                     ///< Dry bicart done command
+    NUM_OF_DRY_BICARBONATE_CARTRIDGE_CMDS                   ///< Number of dry bicart commands
 };
-typedef enum SequenceStep_States SEQUENCE_STEP_STATE_T;     ///< Type for Sequence step state enumeration
+typedef enum Dry_Bicart_Drain_Depressurize_Commands DRY_BICART_CMDS_T;    ///< Type for dry bicart depressurize/drain command enumeration
 
-
 /// Enumeration of conductivity sensors.
 enum Conductivity_Sensors
 {