Index: sources/view/VView.h
===================================================================
diff -u -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 -rc253d3ca9ef234e04747565e500faf88b07fc04e
--- sources/view/VView.h	(.../VView.h)	(revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205)
+++ sources/view/VView.h	(.../VView.h)	(revision c253d3ca9ef234e04747565e500faf88b07fc04e)
@@ -149,15 +149,14 @@
     /* Data - States */                                                   \
     REGISTER_TYPE( VTDOpMode                                            ) \
     REGISTER_TYPE( VPreTreatmentStates                                  ) \
-    REGISTER_TYPE( VTDTreatmentStates                                   ) \
+    REGISTER_TYPE( VHDTreatmentStates                                   ) \
     REGISTER_TYPE( VPostTreatmentStates                                 ) \
     /* In-Treatment - Data */                                             \
     REGISTER_TYPE( VTreatmentBloodFlow                                  ) \
     REGISTER_TYPE( VTreatmentDialysateFlow                              ) \
     REGISTER_TYPE( VTreatmentUltrafiltration                            ) \
     REGISTER_TYPE( VTreatmentPressureOcclusion                          ) \
     REGISTER_TYPE( VTreatmentTime                                       ) \
-    REGISTER_TYPE( VTreatmentParametersSetPoint                         ) \
     REGISTER_TYPE( VTreatmentRanges                                     ) \
     REGISTER_TYPE( VTreatmentSaline                                     ) \
     REGISTER_TYPE( VTreatmentHeparin                                    ) \
@@ -173,6 +172,7 @@
     REGISTER_TYPE( VHDAirBubble                                         ) \
     REGISTER_TYPE( VTDAirTrap                                           ) \
     REGISTER_TYPE( VTDVoltage                                           ) \
+    REGISTER_TYPE( VTDBloodPump                                         ) \
     REGISTER_TYPE( VTDValves                                            ) \
     REGISTER_TYPE( VTDBattery                                           ) \
     REGISTER_TYPE( VTDSwitches                                          ) \
@@ -189,8 +189,8 @@
     REGISTER_TYPE( VDGTemperatures                                      ) \
     REGISTER_TYPE( VDGValvesStates                                      ) \
     REGISTER_TYPE( VDGAccelerometer                                     ) \
-    REGISTER_TYPE( VDDConductivity                                      ) \
-    REGISTER_TYPE( VDDGenDialysate                                      ) \
+    REGISTER_TYPE( VDGConductivity                                      ) \
+    REGISTER_TYPE( VDDLevel                                             ) \
     /* Pre-Treatment */                                                   \
     REGISTER_TYPE( VPreTreatmentAdjustmentInitTreatment                 ) \
     REGISTER_TYPE( VDGFilterFlush                                       ) \