Index: shared/scripts/names.py
===================================================================
diff -u -r9304d64222c02f0dc812ff86dc945c8deba46440 -r211e5b6d52df1fb7af4b50ed652afdd373a64231
--- shared/scripts/names.py	(.../names.py)	(revision 9304d64222c02f0dc812ff86dc945c8deba46440)
+++ shared/scripts/names.py	(.../names.py)	(revision 211e5b6d52df1fb7af4b50ed652afdd373a64231)
@@ -252,15 +252,15 @@
 o_managerHome_DGDrainPumpData_DACValue = {"container": o_managerHome, "objectName": "_DGDrainPumpData1", "type": "Text"}
 
 # DGOperationMode 
-o_managerHome_DGOperationModeData_DGOpMode = {"container": o_managerHome, "objectName": "_DGOperationModeData", "type": "Text"}
+o_managerHome_DGOperationModeData_DGOpMode = {"container": o_managerHome, "objectName": "_DGOperationModeData0", "type": "Text"}
 
 # DGReservoirData 
 o_managerHome_DGReservoirData_ActiveReservoir = {"container": o_managerHome, "objectName": "_DGReservoirData0", "type": "Text"}
 o_managerHome_DGReservoirData_FillToVolML     = {"container": o_managerHome, "objectName": "_DGReservoirData1", "type": "Text"}
 o_managerHome_DGReservoirData_DrainToVolML    = {"container": o_managerHome, "objectName": "_DGReservoirData2", "type": "Text"}
 
 # DGValvesStates 
-o_managerHome_DGValvesStatesData_ValvesStates = {"container": o_managerHome, "objectName": "_DGValvesStatesData", "type": "Text"}
+o_managerHome_DGValvesStatesData_ValvesStates = {"container": o_managerHome, "objectName": "_DGValvesStatesData0", "type": "Text"}
 
 # DGHeatersData 
 o_managerHome_DGHeatersData_MainPriMaryDC  = {"container": o_managerHome, "objectName": "_DGHeatersData0", "type": "Text"}
@@ -288,7 +288,7 @@
 o_managerHome_DGTemperaturesData_TrimmerHeaterInternalTemperature = {"container": o_managerHome, "objectName": "_DGTemperaturesData11", "type": "Text"}
 
 # HDOperationModeData 
-o_settingsHome_HDOperationModeData_OpMode = {"container": o_settingsHome, "objectName": "_HDOperationModeData", "type": "Text"}
+o_managerHome_HDOperationModeData_OpMode = {"container": o_managerHome, "objectName": "_HDOperationModeData0", "type": "Text"}
 
 # TreatmentStatesData 
 o_settingsHome_TreatmentStatesData_SubMode     = {"container": o_settingsHome, "objectName": "_TreatmentStatesData0", "type": "Text"}
@@ -306,20 +306,38 @@
 o_treatmentStart_ultrafiltration_notification  = {"container": o_treatmentStart_ultrafiltration_section, "objectName": "NotificationBar"  , "type": "NotificationBarSmall"    }
 
 # PressureOcclusionData 
-o_settingsHome_PressureOcclusionData_ArterialPressure             = {"container": o_settingsHome, "objectName": "_PressureOcclusionData0", "type": "Text"}
-o_settingsHome_PressureOcclusionData_VenousPressure               = {"container": o_settingsHome, "objectName": "_PressureOcclusionData1", "type": "Text"}
-o_settingsHome_PressureOcclusionData_BloodPumpOcclusion           = {"container": o_settingsHome, "objectName": "_PressureOcclusionData2", "type": "Text"}
-o_settingsHome_PressureOcclusionData_DialysateInletPumpOcclusion  = {"container": o_settingsHome, "objectName": "_PressureOcclusionData3", "type": "Text"}
-o_settingsHome_PressureOcclusionData_DialysateOutletPumpOcclusion = {"container": o_settingsHome, "objectName": "_PressureOcclusionData4", "type": "Text"}
+o_managerHome_PressureOcclusionData_ArterialPressure             = {"container": o_managerHome, "objectName": "_PressureOcclusionData0", "type": "Text"}
+o_managerHome_PressureOcclusionData_VenousPressure               = {"container": o_managerHome, "objectName": "_PressureOcclusionData1", "type": "Text"}
+o_managerHome_PressureOcclusionData_BloodPumpOcclusion           = {"container": o_managerHome, "objectName": "_PressureOcclusionData2", "type": "Text"}
+o_managerHome_PressureOcclusionData_DialysateInletPumpOcclusion  = {"container": o_managerHome, "objectName": "_PressureOcclusionData3", "type": "Text"}
+o_managerHome_PressureOcclusionData_DialysateOutletPumpOcclusion = {"container": o_managerHome, "objectName": "_PressureOcclusionData4", "type": "Text"}
 
+# BloodFlowData                                                                                                                
+o_managerHome_BloodFlowData_FlowSetPoint     = {"container": o_managerHome, "objectName": "_HDBloodFlowData0" , "type": "Text"}
+o_managerHome_BloodFlowData_MeasuredFlow     = {"container": o_managerHome, "objectName": "_HDBloodFlowData1" , "type": "Text"}
+o_managerHome_BloodFlowData_RotorSpeed       = {"container": o_managerHome, "objectName": "_HDBloodFlowData2" , "type": "Text"}
+o_managerHome_BloodFlowData_MotorSpeed       = {"container": o_managerHome, "objectName": "_HDBloodFlowData3" , "type": "Text"}
+o_managerHome_BloodFlowData_MotorCtlSpeed    = {"container": o_managerHome, "objectName": "_HDBloodFlowData4" , "type": "Text"}
+o_managerHome_BloodFlowData_MotorCtlCurrent  = {"container": o_managerHome, "objectName": "_HDBloodFlowData5" , "type": "Text"}
+o_managerHome_BloodFlowData_PWMDutyCycle     = {"container": o_managerHome, "objectName": "_HDBloodFlowData6" , "type": "Text"}
+
+# InletFlowData
+o_managerHome_InletFlowData_FlowSetPoint     = {"container": o_managerHome, "objectName": "_HDInletFlowData0" , "type": "Text"}
+o_managerHome_InletFlowData_MeasuredFlow     = {"container": o_managerHome, "objectName": "_HDInletFlowData1" , "type": "Text"}
+o_managerHome_InletFlowData_RotorSpeed       = {"container": o_managerHome, "objectName": "_HDInletFlowData2" , "type": "Text"}
+o_managerHome_InletFlowData_MotorSpeed       = {"container": o_managerHome, "objectName": "_HDInletFlowData3" , "type": "Text"}
+o_managerHome_InletFlowData_MotorCtlSpeed    = {"container": o_managerHome, "objectName": "_HDInletFlowData4" , "type": "Text"}
+o_managerHome_InletFlowData_MotorCtlCurrent  = {"container": o_managerHome, "objectName": "_HDInletFlowData5" , "type": "Text"}
+o_managerHome_InletFlowData_PWMDutyCycle     = {"container": o_managerHome, "objectName": "_HDInletFlowData6" , "type": "Text"}
+
 # OutletFlowData 
-o_settingsHome_OutletFlowData_RefUFVol        = {"container": o_settingsHome, "objectName": "_OutletFlowData0", "type": "Text"}
-o_settingsHome_OutletFlowData_MeasUFVol       = {"container": o_settingsHome, "objectName": "_OutletFlowData1", "type": "Text"}
-o_settingsHome_OutletFlowData_RotorSpeed      = {"container": o_settingsHome, "objectName": "_OutletFlowData2", "type": "Text"}
-o_settingsHome_OutletFlowData_MotorSpeed      = {"container": o_settingsHome, "objectName": "_OutletFlowData3", "type": "Text"}
-o_settingsHome_OutletFlowData_MotorCtlSpeed   = {"container": o_settingsHome, "objectName": "_OutletFlowData4", "type": "Text"}
-o_settingsHome_OutletFlowData_MotorCtlCurrent = {"container": o_settingsHome, "objectName": "_OutletFlowData5", "type": "Text"}
-o_settingsHome_OutletFlowData_PWMDtCycle      = {"container": o_settingsHome, "objectName": "_OutletFlowData6", "type": "Text"}
+o_managerHome_OutletFlowData_RefUFVol        = {"container": o_managerHome, "objectName": "_HDOutletFlowData0", "type": "Text"}
+o_managerHome_OutletFlowData_MeasUFVol       = {"container": o_managerHome, "objectName": "_HDOutletFlowData1", "type": "Text"}
+o_managerHome_OutletFlowData_RotorSpeed      = {"container": o_managerHome, "objectName": "_HDOutletFlowData2", "type": "Text"}
+o_managerHome_OutletFlowData_MotorSpeed      = {"container": o_managerHome, "objectName": "_HDOutletFlowData3", "type": "Text"}
+o_managerHome_OutletFlowData_MotorCtlSpeed   = {"container": o_managerHome, "objectName": "_HDOutletFlowData4", "type": "Text"}
+o_managerHome_OutletFlowData_MotorCtlCurrent = {"container": o_managerHome, "objectName": "_HDOutletFlowData5", "type": "Text"}
+o_managerHome_OutletFlowData_PWMDtCycle      = {"container": o_managerHome, "objectName": "_HDOutletFlowData6", "type": "Text"}
 
 # Saline Bolus
 o_treatmentStart_SalineSection      = {"container": o_treatmentStart_TreatmentStart, "id": "_SalineTouchArea" , "type": "TreatmentFluid"  }
@@ -331,7 +349,7 @@
 
 
 # Setting CANBusFaultCountText
-o_settingsHome_canbusFaultCount       = {"container": o_settingsHome, "id": "_canbusFaultCountText", "type": "Text" }
+o_managerHome_canbusFaultCount       = {"container": o_managerHome, "id": "_canbusFaultCountText", "type": "Text" }
 
 # Alarm System
 o_NotificationDialog_Description_Text = {"container": o_Overlay, "objectName": "_NotificationDialog_Description", "type": "Text"}