Index: sources/model/hd/alarm/MAlarmStatusData.cpp
===================================================================
diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -rc0c63c4b149dafea2b02e4cd31f223e392ff7818
--- sources/model/hd/alarm/MAlarmStatusData.cpp	(.../MAlarmStatusData.cpp)	(revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16)
+++ sources/model/hd/alarm/MAlarmStatusData.cpp	(.../MAlarmStatusData.cpp)	(revision c0c63c4b149dafea2b02e4cd31f223e392ff7818)
@@ -161,8 +161,8 @@
     case GuiAlarmID::ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT                    : { result = QObject::tr("FPGA reports failure reading arterial pressure sensor"                                                                ); break; }
     case GuiAlarmID::ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT                      : { result = QObject::tr("FPGA reports failure reading venous pressure sensor"                                                                  ); break; }
     case GuiAlarmID::ALARM_ID_UV_REACTOR_NOT_HEALTHY                            : { result = QObject::tr("UV reactor not healthy (either inlet or outlet)"                                                                      ); break; }
-    case GuiAlarmID::ALARM_ID_POST_ACID_CONDUCTIVITY_OUT_OF_RANGE               : { result = QObject::tr("Post-acid concentrate conductivity out of range"                                                                      ); break; }
-    case GuiAlarmID::ALARM_ID_POST_BICARB_CONDUCTIVITY_OUT_OF_RANGE             : { result = QObject::tr("Post-bicarb concentrate conductivity out of range"                                                                    ); break; }
+    case GuiAlarmID::ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE                    : { result = QObject::tr("Post-acid concentrate conductivity out of range"                                                                      ); break; }
+    case GuiAlarmID::ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE                  : { result = QObject::tr("Post-bicarb concentrate conductivity out of range"                                                                    ); break; }
     case GuiAlarmID::ALARM_ID_RO_PUMP_FLOW_RATE_OUT_OF_RANGE                    : { result = QObject::tr("RO pump flow rate out of range"                                                                                       ); break; }
     case GuiAlarmID::ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE           : { result = QObject::tr("DG thermistors/sensors temperature out of range"                                                                      ); break; }
     case GuiAlarmID::ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE                           : { result = QObject::tr("DG fan RPM out of range"                                                                                              ); break; }
@@ -174,9 +174,9 @@
     case GuiAlarmID::ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE                       : { result = QObject::tr("DG drain pump RPM out of range"                                                                                       ); break; }
     case GuiAlarmID::ALARM_ID_DG_HEATERS_NEGATIVE_COLD_JUNCTION_TEMPERATURE     : { result = QObject::tr("DG heaters cold junction temperature out of range"                                                                    ); break; }
     case GuiAlarmID::ALARM_ID_DG_HEATERS_FAULT                                  : { result = QObject::tr("DG heaters fault"                                                                                                     ); break; }
-    case GuiAlarmID::ALARM_ID_END_OF_DIALYSIS_TREATMENT_WARNING                 : { result = QObject::tr("HD end of treatment warning"                                                                                          ); break; }
-    case GuiAlarmID::ALARM_ID_END_OF_DIALYSIS_TREATMENT_ALARM                   : { result = QObject::tr("HD end of treatment alarm (user not acting to end treatment)"                                                         ); break; }
-    case GuiAlarmID::ALARM_ID_END_OF_DIALYSIS_TREATMENT_ALARM_HIGH              : { result = QObject::tr("HD end of treatment alarm (high priority - user still not acting to end treatment)"                                   ); break; }
+    case GuiAlarmID::ALARM_ID_END_OF_TREATMENT_WARNING                          : { result = QObject::tr("HD end of treatment warning"                                                                                          ); break; }
+    case GuiAlarmID::ALARM_ID_END_OF_TREATMENT_ALARM                            : { result = QObject::tr("HD end of treatment alarm (user not acting to end treatment)"                                                         ); break; }
+    case GuiAlarmID::ALARM_ID_END_OF_TREATMENT_HIGH                             : { result = QObject::tr("HD end of treatment alarm (high priority - user still not acting to end treatment)"                                   ); break; }
 
     default:
         result = QObject::tr("ALARM_ID_UNDEFINED [%1]").arg(int(vAlarmID));