Index: sources/storage/TreatmentLog.h
===================================================================
diff -u -rc4bd7072571428744e11dd24d5da1d1a3e1d1686 -r7b34653589ba6e4f4705fb4026fcd9319c41c352
--- sources/storage/TreatmentLog.h	(.../TreatmentLog.h)	(revision c4bd7072571428744e11dd24d5da1d1a3e1d1686)
+++ sources/storage/TreatmentLog.h	(.../TreatmentLog.h)	(revision 7b34653589ba6e4f4705fb4026fcd9319c41c352)
@@ -108,77 +108,77 @@
     };
 
     const QStringList _titles {
-        tr("Patient ID"                     ),
-        tr("Device ID"                      ),
-        tr("Blood Flow Rate"                ),
-        tr("Dialysate Flow Rate"            ),
-        tr("Treatment Duration"             ),
-        tr("Actual Treatment Duration"      ),
-        tr("Acid ConcentrateType"           ),
-        tr("Bicarbonate Concentrate Type"   ),
-        tr("Potassium Concentration"        ),
-        tr("Calcium Concentration"          ),
-        tr("Bicarbonate Concentration"      ),
-        tr("Sodium Concentration"           ),
-        tr("Dialysate Temperature"          ),
-        tr("Dialyzer Type"                  ),
-        tr("Heparin Type"                   ),
-        tr("Heparin Concentration"          ),
-        tr("Heparin Bolus Volume"           ),
-        tr("Heparin Dispense Rate"          ),
-        tr("Heparin Stop"                   ),
-        tr("Heparin Delivered Volume"       ),
-        tr("Treatment Start DateTime"       ),
-        tr("Treatment End DateTime"         ),
-        tr("Water Sample Test Result"       ),
-        tr("Dialysate Volume Used"          ),
-        tr("Target UF Volume"               ),
-        tr("Actual UF Volume"               ),
-        tr("Target UF Rate"                 ),
-        tr("Actual UF Rate"                 ),
-        tr("Saline Bolus Volume"            ),
-        tr("Average Blood Flow"             ),
-        tr("Average Dialysate Flow"         ),
-        tr("Average Dialysate Temp"         ),
-        tr("Average Arterial Pressure"      ),
-        tr("Average Venous Pressure"        ),
+        tr("Patient ID"                     ), // ePatientID
+        tr("Device ID"                      ), // eDeviceID
+        tr("Blood Flow Rate"                ), // eBloodFlowRate
+        tr("Dialysate Flow Rate"            ), // eDialysateFlowRate
+        tr("Treatment Duration"             ), // eTreatmentDuration
+        tr("Actual Treatment Duration"      ), // eActualTreatmentDuration
+        tr("Acid ConcentrateType"           ), // eAcidConcentrateType
+        tr("Bicarbonate Concentrate Type"   ), // eBicarbonateConcentrateType
+        tr("Potassium Concentration"        ), // ePotassiumConcentration
+        tr("Calcium Concentration"          ), // eCalciumConcentration
+        tr("Bicarbonate Concentration"      ), // eBicarbonateConcentration
+        tr("Sodium Concentration"           ), // eSodiumConcentration
+        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 Delivered Volume"       ), // eHeparinDeliveredVolume
+        tr("Treatment Start DateTime"       ), // eTreatmentStartDateTime
+        tr("Treatment End DateTime"         ), // eTreatmentEndDateTime
+        tr("Water Sample Test Result"       ), // eWaterSampleTestResult
+        tr("Dialysate Volume Used"          ), // eDialysateVolumeUsed
+        tr("Target UF Volume"               ), // eTargetUFVolume
+        tr("Actual UF Volume"               ), // eActualUFVolume
+        tr("Target UF Rate"                 ), // eTargetUFRate
+        tr("Actual UF Rate"                 ), // eActualUFRate
+        tr("Saline Bolus Volume"            ), // eSalineBolusVolume
+        tr("Average Blood Flow"             ), // eAverageBloodFlow
+        tr("Average Dialysate Flow"         ), // eAverageDialysateFlow
+        tr("Average Dialysate Temp"         ), // eAverageDialysateTemp
+        tr("Average Arterial Pressure"      ), // eAverageArterialPressure
+        tr("Average Venous Pressure"        ), // eAverageVenousPressure
     };
 
     const QStringList _units {
-        ""                                  ,
-        ""                                  ,
-        _unitTextFlowRate                   ,
-        _unitTextFlowRate                   ,
-        _unitTextDurationMin                ,
-        _unitTextDurationMin                ,
-        ""                                  ,
-        ""                                  ,
-        _unitTextConcentration              ,
-        _unitTextConcentration              ,
-        _unitTextConcentration              ,
-        _unitTextConcentration              ,
-        _unitTextTemperature                ,
-        ""                                  ,
-        ""                                  ,
-        _unitTextHeparinConcentration       ,
-        _unitTextFluid                      ,
-        _unitTextDispencingRate             ,
-        _unitTextDurationMin                ,
-        _unitTextFluid                      ,
-        ""                                  ,
-        ""                                  ,
-        ""                                  ,
-        _unitTextVolume                     ,
-        _unitTextVolume                     ,
-        _unitTextVolume                     ,
-        _unitTextFlowRate                   ,
-        _unitTextFlowRate                   ,
-        _unitTextFluid                      ,
-        _unitTextFlowRate                   ,
-        _unitTextFlowRate                   ,
-        _unitTextTemperature                ,
-        _unitTextBloodPressure              ,
-        _unitTextBloodPressure              ,
+        ""                                  , // ePatientID
+        ""                                  , // eDeviceID
+        _unitTextFlowRate                   , // eBloodFlowRate
+        _unitTextFlowRate                   , // eDialysateFlowRate
+        _unitTextDurationMin                , // eTreatmentDuration
+        _unitTextDurationMin                , // eActualTreatmentDuration
+        ""                                  , // eAcidConcentrateType
+        ""                                  , // eBicarbonateConcentrateType
+        _unitTextConcentration              , // ePotassiumConcentration
+        _unitTextConcentration              , // eCalciumConcentration
+        _unitTextConcentration              , // eBicarbonateConcentration
+        _unitTextConcentration              , // eSodiumConcentration
+        _unitTextTemperature                , // eDialysateTemperature
+        ""                                  , // eDialyzerType
+        ""                                  , // eHeparinType
+        _unitTextHeparinConcentration       , // eHeparinConcentration
+        _unitTextFluid                      , // eHeparinBolusVolume
+        _unitTextDispencingRate             , // eHeparinDispenseRate
+        _unitTextDurationMin                , // eHeparinStop
+        _unitTextFluid                      , // eHeparinDeliveredVolume
+        ""                                  , // eTreatmentStartDateTime
+        ""                                  , // eTreatmentEndDateTime
+        ""                                  , // eWaterSampleTestResult
+        _unitTextVolume                     , // eDialysateVolumeUsed
+        _unitTextVolume                     , // eTargetUFVolume
+        _unitTextVolume                     , // eActualUFVolume
+        _unitTextFlowRate                   , // eTargetUFRate
+        _unitTextFlowRate                   , // eActualUFRate
+        _unitTextFluid                      , // eSalineBolusVolume
+        _unitTextFlowRate                   , // eAverageBloodFlow
+        _unitTextFlowRate                   , // eAverageDialysateFlow
+        _unitTextTemperature                , // eAverageDialysateTemp
+        _unitTextBloodPressure              , // eAverageArterialPressure
+        _unitTextBloodPressure              , // eAverageVenousPressure
     };
 
     QString title(quint8 vIndex) const {