Index: sources/storage/TreatmentLog.h
===================================================================
diff -u -rdc8969f6c7bbdb46d2de22622e58e457ceb37df4 -r1eedad37ea1cad5c9aa41ac082614d082f525a7f
--- sources/storage/TreatmentLog.h	(.../TreatmentLog.h)	(revision dc8969f6c7bbdb46d2de22622e58e457ceb37df4)
+++ sources/storage/TreatmentLog.h	(.../TreatmentLog.h)	(revision 1eedad37ea1cad5c9aa41ac082614d082f525a7f)
@@ -70,6 +70,7 @@
     QString _unitTextHeparinConcentration   = tr("IU/mL"    );
     QString _unitTextDispensingRate         = tr("mL/hr"    );
     QString _unitTextBloodPressure          = tr("mmHg"     );
+    QString _unitTextWatertSample           = tr("mg/L"     );
 
     struct TxInfo {
         void    clear() {
@@ -117,10 +118,9 @@
         eDialysateTemperature               ,
         eDialyzerType                       ,
         eHeparinType                        ,
-        eHeparinConcentration               ,
         eHeparinBolusVolume                 ,
         eHeparinDispenseRate                ,
-        eHeparinStop                        ,
+        eHeparinDeliveryDuration            ,
         eHeparinDeliveredVolume             ,
         eTreatmentStartDateTime             ,
         eTreatmentEndDateTime               ,
@@ -132,7 +132,7 @@
         eOriginUFRate                       ,
         eTargetUFRate                       ,
         eActualUFRate                       ,
-        eSalineBolusVolume                  ,
+        eFluidBolusVolume                   ,
         eTreatmentLogIndexCount             ,
     };
 
@@ -152,10 +152,9 @@
         tr("Dialysate Temperature"          ), // eDialysateTemperature
         tr("Dialyzer Type"                  ), // eDialyzerType
         tr("Heparin Type"                   ), // eHeparinType
-        tr("Heparin Concentration"          ), // eHeparinConcentration
         tr("Heparin Bolus Volume"           ), // eHeparinBolusVolume
         tr("Heparin Dispense Rate"          ), // eHeparinDispenseRate
-        tr("Heparin Stop"                   ), // eHeparinStop
+        tr("Heparin Delivery Duration"      ), // eHeparinDeliveryDuration
         tr("Heparin Delivered Volume"       ), // eHeparinDeliveredVolume
         tr("Treatment Start DateTime"       ), // eTreatmentStartDateTime
         tr("Treatment End DateTime"         ), // eTreatmentEndDateTime
@@ -167,7 +166,7 @@
         tr("Prescribed UF Rate"             ), // eOriginUFRate
         tr("Target UF Rate"                 ), // eTargetUFRate
         tr("Actual UF Rate"                 ), // eActualUFRate
-        tr("Saline Bolus Volume"            ), // eSalineBolusVolume
+        tr("Fluid Bolus Volume"             ), // eFluidBolusVolume
     };
 
     const QStringList _units {
@@ -185,23 +184,22 @@
         _unitTextConcentration              , // eSodiumConcentration
         _unitTextTemperature                , // eDialysateTemperature
         ""                                  , // eDialyzerType
-        ""                                  , // eHeparinType
-        _unitTextHeparinConcentration       , // eHeparinConcentration
+        _unitTextHeparinConcentration       , // eHeparinType
         _unitTextFluid                      , // eHeparinBolusVolume
         _unitTextDispensingRate             , // eHeparinDispenseRate
-        _unitTextDurationMin                , // eHeparinStop
+        _unitTextDurationMin                , // eHeparinDeliveryDuration
         _unitTextFluid                      , // eHeparinDeliveredVolume
         ""                                  , // eTreatmentStartDateTime
         ""                                  , // eTreatmentEndDateTime
-        ""                                  , // eWaterSampleTestResult
+        _unitTextWatertSample               , // eWaterSampleTestResult
         _unitTextVolume                     , // eDialysateVolumeUsed
         _unitTextVolume                     , // eOriginUFVolume
         _unitTextVolume                     , // eTargetUFVolume
         _unitTextVolume                     , // eActualUFVolume
         _unitTextFlowRate                   , // eOriginUFRate
         _unitTextFlowRate                   , // eTargetUFRate
         _unitTextFlowRate                   , // eActualUFRate
-        _unitTextFluid                      , // eSalineBolusVolume
+        _unitTextFluid                      , // eFluidBolusVolume
     };
 
     QString string(quint8 vIndex , const QStringList &vStringList) const {