Index: dialin/hd/alarms.py
===================================================================
diff -u -r88b4967ce6b9ac816ac21b26326450de4b540887 -r1cafeb686c9382de454060c487a02265cb6468fc
--- dialin/hd/alarms.py	(.../alarms.py)	(revision 88b4967ce6b9ac816ac21b26326450de4b540887)
+++ dialin/hd/alarms.py	(.../alarms.py)	(revision 1cafeb686c9382de454060c487a02265cb6468fc)
@@ -114,18 +114,8 @@
 
         @return: (str) the current alarms state in text form.
         """
-        result = ""
-        if self.alarms_state == self.HD_ALARM_STATE_NONE:
-            result = "None"
-        elif self.alarms_state == self.HD_ALARM_STATE_LOW:
-            result = "Low"
-        elif self.alarms_state == self.HD_ALARM_STATE_MEDIUM:
-            result = "Medium"
-        elif self.alarms_state == self.HD_ALARM_STATE_HIGH:
-            result = "High"
+        return self.alarms_state
 
-        return result
-
     def get_alarm_states(self):
         """
         Gets all states for all alarms
Index: dialin/hd/pretreatment.py
===================================================================
diff -u -r3a70bfb451b74106348c064c34f19934aadd9119 -r1cafeb686c9382de454060c487a02265cb6468fc
--- dialin/hd/pretreatment.py	(.../pretreatment.py)	(revision 3a70bfb451b74106348c064c34f19934aadd9119)
+++ dialin/hd/pretreatment.py	(.../pretreatment.py)	(revision 1cafeb686c9382de454060c487a02265cb6468fc)
@@ -238,38 +238,30 @@
         self.pre_treatment_patient_connection_state = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
 
-        self.pre_treatment_submode = 'Unknown SubMode'
         if PreTreatmentSubModes.has_value(pt_submode):
-            self.pre_treatment_submode = PreTreatmentSubModes(pt_submode).name
+            self.pre_treatment_submode = PreTreatmentSubModes(pt_submode).value
 
-        self.pre_treatment_sample_water_state = 'Unknown State'
         if PreTreatmentSampleWaterStates.has_value(pt_sw_state):
-            self.pre_treatment_sample_water_state = PreTreatmentSampleWaterStates(pt_sw_state).name
+            self.pre_treatment_sample_water_state = PreTreatmentSampleWaterStates(pt_sw_state).value
 
-        self.pre_treatment_consumable_self_test_state = 'Unknown State'
         if PreTreatmentConsumableSelfTestStates.has_value(pt_consumable_st_state):
             self.pre_treatment_consumable_self_test_state = PreTreatmentConsumableSelfTestStates(
-                pt_consumable_st_state).name
+                pt_consumable_st_state).value
 
-        self.pre_treatment_no_cart_self_test_state = 'Unknown State'
         if PreTreatmentNoCartSelfTestStates.has_value(pt_no_cart_st_state):
-            self.pre_treatment_no_cart_self_test_state = PreTreatmentNoCartSelfTestStates(pt_no_cart_st_state).name
+            self.pre_treatment_no_cart_self_test_state = PreTreatmentNoCartSelfTestStates(pt_no_cart_st_state).value
 
-        self.pre_treatment_dry_self_test_state = 'Unknown State'
         if PreTreatmentDrySelfTestStates.has_value(pt_dry_st_state):
-            self.pre_treatment_dry_self_test_state = PreTreatmentDrySelfTestStates(pt_dry_st_state).name
+            self.pre_treatment_dry_self_test_state = PreTreatmentDrySelfTestStates(pt_dry_st_state).value
 
-        self.pre_treatment_dry_self_test_state = 'Unknown State'
         if PreTreatmentDrySelfTestStates.has_value(pt_dry_st_state):
-            self.pre_treatment_dry_self_test_state = PreTreatmentDrySelfTestStates(pt_dry_st_state).name
+            self.pre_treatment_dry_self_test_state = PreTreatmentDrySelfTestStates(pt_dry_st_state).value
 
-        self.pre_treatment_prime_state = 'Unknown State'
         if PreTreatmentPrimeStates.has_value(pt_prime_state):
-            self.pre_treatment_prime_state = PreTreatmentPrimeStates(pt_prime_state).name
+            self.pre_treatment_prime_state = PreTreatmentPrimeStates(pt_prime_state).value
 
-        self.pre_treatment_recirc_state = 'Unknown State'
         if PreTreatmentRecircStates.has_value(pt_recirc_state):
-            self.pre_treatment_recirc_state = PreTreatmentRecircStates(pt_recirc_state).name
+            self.pre_treatment_recirc_state = PreTreatmentRecircStates(pt_recirc_state).value
 
     @publish([
         "no_cart_self_test_timeout",