Index: suite_leahi/shared/scripts/names.py
===================================================================
diff -u -rc2bd9c5111de498925aff408a70f9701d92bc74d -r7c8e3dedfd331c48c595f17878469c42dee2557f
--- suite_leahi/shared/scripts/names.py	(.../names.py)	(revision c2bd9c5111de498925aff408a70f9701d92bc74d)
+++ suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 7c8e3dedfd331c48c595f17878469c42dee2557f)
@@ -226,22 +226,27 @@
 
 
 #Rinseback
-o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack = {"container": o_Gui_MainView, "objectName": "_EndTreatmentRinsebackStack", "type": "EndTreatmentRinsebackStack"}
-o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "objectName": "_EndTreatmentRinseback", "type": "EndTreatmentRinseback"}
-o_EndTreatmentRinseback_arterialRangeBar_TreatmentPressureComponent = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_arterialRangeBar", "type": "TreatmentPressureComponent", "unnamed": 1}
-o_EndTreatmentRinseback_venousRangeBar_TreatmentPressureComponent = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_venousRangeBar", "type": "TreatmentPressureComponent", "unnamed": 1}
-o_EndTreatmentRinseback_tmpRangeBar_TreatmentPressureComponent = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_tmpRangeBar", "type": "TreatmentPressureComponent", "unnamed": 1}
-o_EndTreatmentRinseback_deliveredVolumeText_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_deliveredVolumeText", "type": "Text"}
-o_EndTreatmentRinseback_flowRateValue_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_flowRateValue", "type": "Text"}
-o_EndTreatmentRinseback_endButton_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_endButton", "type": "TouchRect"}
-o_EndTreatmentRinseback_pauseResumeButton_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_pauseResumeButton", "type": "TouchRect"}
-o_notification_bar   = {"container": o_Overlay,                                                                                                                       "objectName": "NotificationBar",                                                       "type": "NotificationBarSmall"                                                              }
-o_EndTreatmentRinseback_NotificationBar_NotificationBarSmall = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "NotificationBar", "type": "NotificationBarSmall"}
-o_EndTreatmentRinseback_row_Row = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_row", "type": "Row", "unnamed": 1}
-o_EndTreatmentRinseback = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback,  "type": "Text", "unnamed": 1}
-o_EndTreatmentRinseback_targetVolumeProgress_ProgressCircle = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_targetVolumeProgress", "type": "ProgressCircle", "visible": True}
-o_EndTreatmentRinseback_timeout_TimeText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_timeout", "type": "TimeText", "visible": True}
+o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack                     = {"container": o_Gui_MainView,                                                                                                                  "objectName": "_EndTreatmentRinsebackStack",                                       "type": "EndTreatmentRinsebackStack"                                                        }
+o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback    = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack,                                                                         "objectName": "_EndTreatmentRinseback",                                            "type": "EndTreatmentRinseback"                                                             }
+o_EndTreatmentRinseback_arterialRangeBar_TreatmentPressureComponent         = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_arterialRangeBar",                                                                                                                "type": "TreatmentPressureComponent",                                "unnamed": 1           }
+o_EndTreatmentRinseback_venousRangeBar_TreatmentPressureComponent           = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_venousRangeBar",                                                                                                                  "type": "TreatmentPressureComponent",                                "unnamed": 1           }
+o_EndTreatmentRinseback_tmpRangeBar_TreatmentPressureComponent              = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_tmpRangeBar",                                                                                                                     "type": "TreatmentPressureComponent",                                "unnamed": 1           }
+o_EndTreatmentRinseback_deliveredVolumeText_Text                            = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback,                                                       "objectName": "_deliveredVolumeText",                                               "type": "Text"                                                                              }
+o_EndTreatmentRinseback_flowRateValue_Text                                  = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback,                                                       "objectName": "_flowRateValue",                                                     "type": "Text"                                                                              }
+o_EndTreatmentRinseback_endButton_TouchRect                                 = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback,                                                       "objectName": "_endButton",                                                         "type": "TouchRect"                                                                         }
+o_EndTreatmentRinseback_pauseResumeButton_TouchRect                         = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback,                                                       "objectName": "_pauseResumeButton",                                                 "type": "TouchRect"                                                                         }
+# o_notification_bar   = {"container": o_Overlay,                                                                                                                       "objectName": "NotificationBar",                                                       "type": "NotificationBarSmall"                                                              }
+o_EndTreatmentRinseback_NotificationBar_NotificationBarSmall                = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback,                                                       "objectName": "NotificationBar",                                                    "type": "NotificationBarSmall"                                                              }
+# o_EndTreatmentRinseback_row_Row = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_row", "type": "Row", "unnamed": 1}
+o_EndTreatmentRinseback                                                     = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback,                                                                                                                                           "type": "Text",                                                     "unnamed": 1            }
+o_EndTreatmentRinseback_targetVolumeProgress_ProgressCircle                 = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback,                                                       "objectName": "_targetVolumeProgress",                                              "type": "ProgressCircle"                                                                    }
+o_EndTreatmentRinseback_timeout_TimeText                                    = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback,                                                       "objectName": "_timeout",                                                           "type": "TimeText"                                                                          }
+o_EndTreatmentRinseback_decrementFlowRateButton_ArrowButton                 = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback,                                                       "objectName": "_decrementFlowRateButton",                                           "type": "ArrowButton"                                                                       }
+o_EndTreatmentRinseback_incrementFlowRateButton_ArrowButton                 = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback,                                                       "objectName": "_incrementFlowRateButton",                                           "type": "ArrowButton"                                                                       }
+o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack,                                                           "objectName": "_EndTreatmentRinsebackComplete",                                     "type": "EndTreatmentRinsebackComplete"                                                     }
+o_EndTreatmentRinsebackComplete_instructionView_InstructionView             = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "id": "_instructionView",                                                                                                 "type": "InstructionView",                                          "unnamed": 1            }
 
 
 
 
+