Index: shared/scripts/names.py
===================================================================
diff -u -re8535a7e3c30daad306221dd3d0c822f6994d503 -r9cb75f8b54e08f5f0ca42befd3c35ae5aea84c68
--- shared/scripts/names.py	(.../names.py)	(revision e8535a7e3c30daad306221dd3d0c822f6994d503)
+++ shared/scripts/names.py	(.../names.py)	(revision 9cb75f8b54e08f5f0ca42befd3c35ae5aea84c68)
@@ -1110,5 +1110,21 @@
 o_SettingsBase_settingsRootSSHAccess_SSHDSwitch_Switch = {"checkable": True, "container": o_SettingsBase_SettingsRootSSHAccess, "id": "_settingsRootSSHAccess_SSHDSwitch", "type": "Switch", "unnamed": 1, "visible": True}
 o_SettingsBase_settingsRootSSHAccess_RootSwitch_Switch = {"checkable": True, "container": o_SettingsBase_SettingsRootSSHAccess, "id": "_settingsRootSSHAccess_RootSwitch", "type": "Switch", "unnamed": 1, "visible": True}
 o_SettingsBase_Enable_Root_SSH_Text = {"container": o_SettingsBase_SettingsRootSSHAccess, "text": "Enable Root SSH", "type": "Text", "unnamed": 1, "visible": True}
-o_treatmentHome_Saline_Rejection_Text = {"container": o_treatmentHome, "text": "", "type": "Text", "unnamed": 1, "visible": True}
 
+# Services -> Service screen
+o_userConfirmation_SettingsFactoryReset = {"container": o_Gui_MainView, "objectName": "UserConfirmation", "type": "SettingsFactoryReset", "visible": True}
+o_userConfirmation_Factory_Reset_Text = {"container": o_userConfirmation_SettingsFactoryReset, "text": "Factory Reset", "type": "Text", "unnamed": 1, "visible": True}
+o_service_confirmation_are_you_sure_TitleText = {"container": o_Overlay, "text": "Are you sure?", "type": "TitleText", "unnamed": 1, "visible": True}
+o_confirmTouch_TouchRect = {"container": o_Overlay, "id": "_confirmTouch", "type": "TouchRect", "unnamed": 1, "visible": True}
+o_services_factory_reset_back_button = {"container": o_userConfirmation_SettingsFactoryReset, "objectName": "_backButton", "type": "BackButton", "visible": True}
+o_services_factory_reset_confirm_button = {"container": o_userConfirmation_SettingsFactoryReset, "objectName": "_confirmButton", "type": "ConfirmButton", "visible": True}
+o_service_subscreen_titleText = {"container": o_Overlay, "text": "Factory Reset", "type": "TitleText", "unnamed": 1, "visible": True}
+
+# Services -> Decommission screen
+o_serviec_decommission_parent = {"container": o_Gui_MainView, "objectName": "UserConfirmation", "type": "SettingsDecommission", "visible": True}
+o_service_decommission_confirm_button = {"container": o_serviec_decommission_parent, "objectName": "_confirmButton", "type": "ConfirmButton", "visible": True}
+o_service_decommission_back_button = {"container": o_serviec_decommission_parent, "objectName": "_backButton", "type": "BackButton", "visible": True}
+userConfirmation_Decommissioning_Text = {"container": o_serviec_decommission_parent, "text": "Decommissioning", "type": "Text", "unnamed": 1, "visible": True}
+o_SettingsHome_touchItem_TouchRect_2 = {"container": o_SettingsHome_SettingsHome_settings, "id": "_touchItem", "occurrence": 8, "type": "TouchRect", "unnamed": 1, "visible": True}
+o_SettingsBase_rectAnim_Rectangle = {"container": o_SettingsBase_SettingsExportLogs, "id": "_rectAnim", "type": "Rectangle", "unnamed": 1, "visible": True}
+