Index: dialin/hd/treatment.py
===================================================================
diff -u -r8ed67f837f8222d52ae18936a762c670157c74fa -r39161a1bac7146d23417909b66c313c9a020969f
--- dialin/hd/treatment.py	(.../treatment.py)	(revision 8ed67f837f8222d52ae18936a762c670157c74fa)
+++ dialin/hd/treatment.py	(.../treatment.py)	(revision 39161a1bac7146d23417909b66c313c9a020969f)
@@ -163,52 +163,76 @@
 
     def get_treatment_state(self):
         """
-        Gets the treatment state
+        Gets the current treatment state
 
-        @return: The treatment state
+        @return: The current treatment state ID
         """
         return self.treatment_state
 
-    def get_treatment_uf_state(self):
+    def get_treatment_UF_state(self):
         """
-        Gets the treatment uf state
+        Gets the current treatment ultrafiltration state
 
-        @return: The treatment uf state
+        @return: The current treatment ultrafiltration state ID
         """
         return self.treatment_uf_state
 
-    def get_saline_bolus_state(self):
+    def get_treatment_saline_bolus_state(self):
         """
-        Gets the current saline bolus state
+        Gets the current treatment saline bolus state
 
-        @return: The saline bolus state
+        @return: The current treatment saline bolus state ID
         """
         return self.saline_bolus_state
 
-    def get_heparin_state(self):
+    def get_treatment_heparin_state(self):
         """
-        Gets the current Heparin state
+        Gets the current treatment Heparin state
 
-        @return: The Heparin state
+        @return: The current treatment Heparin state ID
         """
         return self.heparin_state
 
-    def get_rinseback_state(self):
+    def get_treatment_rinseback_state(self):
         """
-        Gets the current rinseback state
+        Gets the current treatment rinseback state
 
-        @return: The rinseback state
+        @return: The current treatment rinseback state ID
         """
         return self.rinseback_state
 
-    def get_treatment_recirc_state(self):
+    def get_treatment_recirculate_state(self):
         """
         Gets the current treatment recirculate state
 
-        @return: The treatment recirculate state
+        @return: The current treatment recirculate state ID
         """
         return self.treatment_recirculate_state
 
+    def get_treatment_blood_prime_state(self):
+        """
+        Gets the current treatment blood prime state
+
+        @return: The current treatment blood prime state ID
+        """
+        return self.blood_prime_state
+
+    def get_treatment_end_state(self):
+        """
+        Gets the current treatment end state
+
+        @return: The current treatment end state ID
+        """
+        return self.treatment_end_state
+
+    def get_treatment_stop_state(self):
+        """
+        Gets the current treatment stop state
+
+        @return: The current treatment stop state ID
+        """
+        return self.treatment_stop_state
+
     def get_saline_bolus_max_volume(self):
         """
         Returns maximum volume (in mL) saline that can be delivered to a patient