Index: shared/scripts/names.py
===================================================================
diff -u -r59636301fab15c81ae50b7ea7546b79e494189f8 -r92a813d62f26a3e5ddf77b3b58b5c965fadeffb5
--- shared/scripts/names.py	(.../names.py)	(revision 59636301fab15c81ae50b7ea7546b79e494189f8)
+++ shared/scripts/names.py	(.../names.py)	(revision 92a813d62f26a3e5ddf77b3b58b5c965fadeffb5)
@@ -12,7 +12,9 @@
 # author  Behrouz NematiPour
 #
 
-o_QQuickView = {"type": "QQuickView", "unnamed": 1, "visible": True}
+# Top Parents
+o_QQuickView = {                           "type": "QQuickView"}
+o_Overlay    = {"container": o_QQuickView, "type": "Overlay"   }
 
 # Home Screen
 o_treatmentHome                 = {"container": o_QQuickView   , "id": "_treatmentHome"      , "type": "TreatmentHome", "unnamed": 1, "visible": True}
@@ -35,7 +37,6 @@
 o_settingsHome_background = {"container": o_settingsHome, "id": "_backgroundRect", "type": "Rectangle" , "unnamed": 1, "visible": True}
 
 # Modal Dialog
-o_Overlay               = {"container": o_QQuickView  ,                          "type": "Overlay"  , "unnamed": 1, "visible": True}
 o_modalDialog           = {"container": o_Overlay     , "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True}
 
 # Power off
@@ -100,42 +101,41 @@
 o_treatmentStart_START_BOLUS_100_mL_Text = {"container": o_treatmentStart_TreatmentStart, "text": "START BOLUS (100 mL)", "type": "Text", "unnamed": 1, "visible": True}
 
 
-# Ultrafilration Adjustment
-o_Ultrafilration_Adjustment_StartScreen = {"container": o_Overlay,"objectName": "TreatmentAdjustmentUltrafiltrationStart", "type": "TreatmentAdjustmentBase", "id": "_treatmentAdjustmentUltrafiltrationStart"}
-o_Ultrafilration_Adjustment_PauseButton = {"container": o_Overlay, "type": "TouchRect", "id": "_pauseButton", "unnamed": 1, "visible": True}
-note_Ultrafiltration_needs_to_be_paused_to_edit_the_volume_Text = {"container": o_Overlay, "text": "Note: Ultrafiltration needs to be paused to edit the volume.", "type": "Text", "unnamed": 1, "visible": True}
-notificationBar_NotificationBar = {"container": o_Overlay, "objectName": "NotificationBar", "type": "NotificationBar", "visible": True}
+# Reviewed Objects
 
-o_pauseNotificationBar_NotificationBar = {"container": o_Overlay, "id":"_pausedNotification", "objectName": "NotificationBar", "type": "NotificationBar", "visible": True}
-o_pauseButton_TouchRect     = {"container": o_Overlay, "id": "_pauseButton" , "type": "TouchRect"   , "unnamed": 1, "visible": True}
-o_editButton_TouchRect      = {"container": o_Overlay, "id": "_editButton"  , "type": "TouchRect"   , "unnamed": 1, "visible": True}
-o_resumeButton_TouchRect    = {"container": o_Overlay, "id": "_resumeButton", "type": "TouchRect"   , "unnamed": 1, "visible": True}
-o_nextButton_TouchRect      = {"container": o_Overlay, "id": "_nextButton"  , "type": "TouchRect"   , "unnamed": 1, "visible": True}
-o_backButton_BackButton     = {"container": o_Overlay, "id": "_backButton"  , "type": "BackButton"  , "unnamed": 1, "visible": True}
-o_closeButton               = {"container": o_Overlay, "source": "qrc:/images/iClose", "type": "Image", "unnamed": 1, "visible": True}
+# Global Objects
+o_backButton  = {"container": o_Overlay, "id": "_backButton" , "type": "BackButton"  }
+o_closeButton = {"container": o_Overlay, "id": "_closeButton", "type": "CloseButton" }
 
-o_textVolume_Text = {"container": o_Overlay, "id": "_textVolume", "type": "Text", "unnamed": 1, "visible": True}
+# Treatment Adjustment Ultrafiltration
+## Start Screen
+o_treatmentAdjustmentUltrafiltrationStart_Screen          = {"container": o_Overlay, "objectName": "TreatmentAdjustmentUltrafiltrationStart"         , "type": "ContentItem"     }
+o_treatmentAdjustmentUltrafiltrationStart_VolumeProgress  = {"container": o_treatmentAdjustmentUltrafiltrationStart_Screen, "id": "_progressbarex"   , "type": "ProgressBarEx"   }
+o_treatmentAdjustmentUltrafiltrationStart_PauseButton     = {"container": o_treatmentAdjustmentUltrafiltrationStart_Screen, "id": "_pauseButton"     , "type": "TouchRect"       }
+o_treatmentAdjustmentUltrafiltrationStart_InformationText = {"container": o_treatmentAdjustmentUltrafiltrationStart_Screen, "id": "_informationText" , "type": "Text"            }
+o_treatmentAdjustmentUltrafiltrationStart_NotificationBar = {"container": o_treatmentAdjustmentUltrafiltrationStart_Screen, "id": "_notification"    , "type": "NotificationBar" }
 
-o_volumeSlider_Slider = {"container": o_Overlay, "id": "_volumeSlider", "type": "Slider", "unnamed": 1, "visible": True}
 
-o_treatmentStart_NotificationBar_NotificationBar = {"container": o_treatmentStart_TreatmentStart, "objectName": "NotificationBar", "type": "NotificationBar", "visible": True}
-o_treatmentStart_0_000_Text = {"container": o_treatmentStart_TreatmentStart, "occurrence": 2, "text": "0.000", "type": "Text", "unnamed": 1, "visible": True}
-increase_UF_Rate_Text = {"container": o_Overlay, "text": "Increase UF Rate", "type": "Text", "unnamed": 1, "visible": True}
-increase_Treatment_Duration_Text = {"container": o_Overlay, "text": "Increase Treatment Duration", "type": "Text", "unnamed": 1, "visible": True}
-o_image_Image_2 = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iClock+", "type": "Image", "unnamed": 1, "visible": True}
-o_image_Image = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iWave+", "type": "Image", "unnamed": 1, "visible": True}
-treatmentAdjustmentUltrafiltrationConfirm_TitleText_Text = {"container": o_Overlay, "objectName": "TreatmentAdjustmentUltrafiltrationConfirm_TitleText", "type": "Text", "visible": True}
+## Paused Screen
+o_treatmentAdjustmentUltrafiltrationPaused_Screen          = {"container": o_Overlay, "objectName": "TreatmentAdjustmentUltrafiltrationPaused"           , "type": "ContentItem"     }
+o_treatmentAdjustmentUltrafiltrationPaused_EditButton      = {"container": o_treatmentAdjustmentUltrafiltrationPaused_Screen, "id": "_editButton"        , "type": "TouchRect"       }
+o_treatmentAdjustmentUltrafiltrationPaused_ResumeButton    = {"container": o_treatmentAdjustmentUltrafiltrationPaused_Screen, "id": "_resumeButton"      , "type": "TouchRect"       }
+o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar = {"container": o_treatmentAdjustmentUltrafiltrationPaused_Screen, "id": "_notification"      , "type": "NotificationBar" }
+o_treatmentAdjustmentUltrafiltrationPaused_PausedText      = {"container": o_treatmentAdjustmentUltrafiltrationPaused_Screen, "id": "_pausedNotification", "type": "NotificationBar" }
 
-# Treatment Adjustment Ultrafiltration
-## Start Screen
-o_treatmentAdjustmentUltrafiltrationStart_Screen          = {"container": o_Overlay, "objectName": "TreatmentAdjustmentUltrafiltrationStart"          , "type": "ContentItem"  }
-o_treatmentAdjustmentUltrafiltrationStart_VolumeProgress  = {"container": o_treatmentAdjustmentUltrafiltrationStart_Screen, "id" : "_progressbarex"   , "type": "ProgressBarEx"}
-o_treatmentAdjustmentUltrafiltrationStart_PauseButton     = {"container": o_treatmentAdjustmentUltrafiltrationStart_Screen, "id" : "_pauseButton"     , "type": "TouchRect"    }
-o_treatmentAdjustmentUltrafiltrationStart_InformationText = {"container": o_treatmentAdjustmentUltrafiltrationStart_Screen, "id" : "_informationText" , "type": "Text"         }
+## Edit Screen
+o_treatmentAdjustmentUltrafiltrationEdit_Screen          = {"container": o_Overlay, "objectName": "TreatmentAdjustmentUltrafiltrationEdit"           , "type": "ContentItem"     }
+o_treatmentAdjustmentUltrafiltrationEdit_NextButton      = {"container": o_treatmentAdjustmentUltrafiltrationEdit_Screen, "id": "_nextButton"        , "type": "TouchRect"       }
+o_treatmentAdjustmentUltrafiltrationEdit_NotificationBar = {"container": o_treatmentAdjustmentUltrafiltrationEdit_Screen, "id": "_notification"      , "type": "NotificationBar" }
+o_treatmentAdjustmentUltrafiltrationEdit_PausedText      = {"container": o_treatmentAdjustmentUltrafiltrationEdit_Screen, "id": "_pausedNotification", "type": "NotificationBar" }
+o_treatmentAdjustmentUltrafiltrationEdit_VolumeSlider    = {"container": o_treatmentAdjustmentUltrafiltrationEdit_Screen, "id": "_volumeSlider"      , "type": "Slider"          }
 
 ## Confirm Screen
 o_treatmentAdjustmentUltrafiltrationConfirm_Screen                   = {"container": o_Overlay, "objectName": "TreatmentAdjustmentUltrafiltrationConfirm"                 , "type": "ContentItem"          }
-o_treatmentAdjustmentUltrafiltrationConfirm_Title                    = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id" : "_titleText"              , "type": "Text"                 }
+o_treatmentAdjustmentUltrafiltrationConfirm_Title                    = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_titleText"               , "type": "Text"                 }
+o_treatmentAdjustmentUltrafiltrationConfirm_ConfirmButton            = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_confirmButton"           , "type": "TouchRect"            }
+o_treatmentAdjustmentUltrafiltrationConfirm_NotificationBar          = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_notification"            , "type": "NotificationBar"      }
+o_treatmentAdjustmentUltrafiltrationConfirm_PausedText               = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_pausedNotification"      , "type": "NotificationBar"      }
 o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate     = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_rateAdjustmentButton"    , "type": "UltrafiltrationButton"}
 o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_durationAdjustmentButton", "type": "UltrafiltrationButton"}
 ### Rate Option
@@ -152,3 +152,4 @@
 
 
 
+