Index: sources/view/VView.h
===================================================================
diff -u -r59a1b4dceeb629ed08a434775d819ce108fe894b -r16aaf5ab7e1c58199754a132d624a470295d3440
--- sources/view/VView.h	(.../VView.h)	(revision 59a1b4dceeb629ed08a434775d819ce108fe894b)
+++ sources/view/VView.h	(.../VView.h)	(revision 16aaf5ab7e1c58199754a132d624a470295d3440)
@@ -139,13 +139,14 @@
     REGISTER_TYPE( VDateTime                                            ) \
     REGISTER_TYPE( VAdjustmentAlarmVolume                               ) \
     REGISTER_TYPE( VBluetooth                                           ) \
-    REGISTER_TYPE( VDuetRoWaterDG                                       ) \
+    REGISTER_TYPE( VRoWaterMode                                         ) \
     REGISTER_TYPE( VCloudSync                                           ) \
     REGISTER_TYPE( VHDUsageInfo                                         ) \
     REGISTER_TYPE( VAdjustmentInstitutionalRecord                       ) \
     REGISTER_TYPE( VInstitutionalRecord                                 ) \
     REGISTER_TYPE( VAdjustmentAdvancedInstitutionalRecord               ) \
     REGISTER_TYPE( VAdvancedInstitutionalRecord                         ) \
+    REGISTER_TYPE( VCalibrationSettings                                 ) \
     /* Alarm         */                                                   \
     REGISTER_TYPE( VAlarmStatus                                         ) \
     REGISTER_TYPE( VAlarmActiveList                                     ) \
@@ -167,14 +168,15 @@
     REGISTER_TYPE( VTreatmentRanges                                     ) \
     REGISTER_TYPE( VTreatmentSaline                                     ) \
     REGISTER_TYPE( VTreatmentHeparin                                    ) \
+    REGISTER_TYPE( VTreatmentDryBicartDisconnect                        ) \
     /* End-Treatment */                                                   \
     REGISTER_TYPE( VTreatmentRinseback                                  ) \
     REGISTER_TYPE( VTreatmentRecirculate                                ) \
     REGISTER_TYPE( VTreatmentBloodPrime                                 ) \
     REGISTER_TYPE( VTreatmentStop                                       ) \
     /* Device - Data */                                                   \
     REGISTER_TYPE( VHDAccelerometer                                     ) \
-    REGISTER_TYPE( VHDSyringePump                                       ) \
+    REGISTER_TYPE( VTDSyringePump                                       ) \
     REGISTER_TYPE( VHDBloodLeak                                         ) \
     REGISTER_TYPE( VTDAirBubble                                         ) \
     REGISTER_TYPE( VTDAirPump                                           ) \
@@ -248,8 +250,14 @@
     REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFConfirm                ) \
     REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFDurationEdit           ) \
     REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFVolumeEdit             ) \
+    REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFState                  ) \
     REGISTER_TYPE( VTreatmentAdjustmentSetPoints                        ) \
     REGISTER_TYPE( VTreatmentAdjustmentVitalsAlarmLimits                ) \
+    REGISTER_TYPE( VTreatmentHDF                                        ) \
+    REGISTER_TYPE( VTreatmentAdjustmentAutoSub                          ) \
+    REGISTER_TYPE( VTreatmentAdjustmentHDFState                         ) \
+    REGISTER_TYPE( VTreatmentAdjustmentHDF                              ) \
+    REGISTER_TYPE( VTreatmentAdjustmentDryBicartDisconnect              ) \
     REGISTER_TYPE( VTreatmentCreate                                     ) \
     REGISTER_TYPE( VTreatmentIsolatedUF                                 ) \
     REGISTER_TYPE( VTreatmentTrends                                     ) \