Index: sources/view/settings/VAdvancedInstitutionalRecord.h
===================================================================
diff -u -r49271f2bd039c9d15586c7c9b2f57f80c801d819 -r81ce00a3b6eb8014fda6c811e1c80bd8bc8469b6
--- sources/view/settings/VAdvancedInstitutionalRecord.h	(.../VAdvancedInstitutionalRecord.h)	(revision 49271f2bd039c9d15586c7c9b2f57f80c801d819)
+++ sources/view/settings/VAdvancedInstitutionalRecord.h	(.../VAdvancedInstitutionalRecord.h)	(revision 81ce00a3b6eb8014fda6c811e1c80bd8bc8469b6)
@@ -51,53 +51,31 @@
     } Range;
 
     enum {
-        eRole_Title = Qt::UserRole  ,
-        eRole_Units                 ,
-        eRole_Min                   ,
-        eRole_Max                   ,
-        eRole_Step                  ,
-        eRole_Decimal               ,
-        eRole_MinVal                ,
-        eRole_MaxVal                ,
-        eRole_DefVal                ,
-        eRole_RejectionMin          ,
-        eRole_RejectionMax          ,
-        eRole_RejectionDef          ,
+        eRole_Title = Qt::UserRole + 1  ,
+        eRole_Units                     ,
+        eRole_Min                       ,
+        eRole_Max                       ,
+        eRole_Step                      ,
+        eRole_Decimal                   ,
+        eRole_MinVal                    ,
+        eRole_MaxVal                    ,
+        eRole_DefVal                    ,
+        eRole_RejectionMin              ,
+        eRole_RejectionMax              ,
+        eRole_RejectionDef              ,
     } DataRole;
 
     enum {
-        MinRoRejectionRatio             ,
-        DisinfectionFrequency           ,
-        DisinfectionParametersCycleTime ,
-        MaxBloodPumpStopTime            ,
-        InletWaterCondLowThreshold      ,
-        InletWaterCondHighThreshold     ,
-        ChlorineWaterSampleCheck        ,
-        WaterSampleTestResultRequired
+        eMinRoRejectionRatio             ,
+        eDisinfectionFrequency           ,
+        eDisinfectionParametersCycleTime ,
+        eMaxBloodPumpStopTime            ,
+        eInletWaterCondLowThreshold      ,
+        eInletWaterCondHighThreshold     ,
+        eChlorineWaterSampleCheck        ,
+        eWaterSampleTestResultRequired
     } Records;
 
-    const QStringList _titles {
-        tr("Minimum RO Rejection Ratio Alarm"   ),
-        tr("Disinfection Frequency"             ),
-        tr("Disinfection Parameters, Cycle Time"),
-        tr("Maximum Blood Pump Stop Time"       ),
-        tr("Inlet Water Cond. Low Threshold"    ),
-        tr("Inlet Water Cond. High Threshold"   ),
-        tr("Chlorine Water Sample Check"        ),
-        tr("Water Sample Test Result Required"  ),
-    };
-
-    const QStringList _units {
-        tr("% reject"               ),  // Minimum RO Rejection Ratio Alarm
-        tr("days between cycles"    ),  // Disinfection Frequency
-        tr("Time"                   ),  // Disinfection Parameters, Cycle Time
-        tr("min"                    ),  // Maximum Blood Pump Stop Time
-        tr("uS/cm"                  ),  // Inlet Water Cond. Low Threshold
-        tr("uS/cm"                  ),  // Inlet Water Cond. High Threshold
-        tr("min"                    ),  // Chlorine Water Sample Check
-        tr(""                       ),  // Water Sample Test Result Required
-    };
-
     // The property adjustment_Triggered has to be always true
     // and to always trigger the change event to work as a notifier for GUI
     TRIGGER( bool           , adjustment                                    , 0)