diff --git a/EmployeeSelfServiceAgent/WorkdayDA/EmployeeScenarios/EmployeeUpdateResidentialAddress/msdyn_AddResidentialAddress_Template.xml b/EmployeeSelfServiceAgent/WorkdayDA/EmployeeScenarios/EmployeeUpdateResidentialAddress/msdyn_HRWorkdayHCMEmployeeAddResidentialAddress.xml
similarity index 100%
rename from EmployeeSelfServiceAgent/WorkdayDA/EmployeeScenarios/EmployeeUpdateResidentialAddress/msdyn_AddResidentialAddress_Template.xml
rename to EmployeeSelfServiceAgent/WorkdayDA/EmployeeScenarios/EmployeeUpdateResidentialAddress/msdyn_HRWorkdayHCMEmployeeAddResidentialAddress.xml
diff --git a/EmployeeSelfServiceAgent/WorkdayDA/EmployeeScenarios/EmployeeUpdateResidentialAddress/msdyn_GetResidentialAddress_Template.xml b/EmployeeSelfServiceAgent/WorkdayDA/EmployeeScenarios/EmployeeUpdateResidentialAddress/msdyn_HRWorkdayHCMEmployeeGetResidentialAddress.xml
similarity index 100%
rename from EmployeeSelfServiceAgent/WorkdayDA/EmployeeScenarios/EmployeeUpdateResidentialAddress/msdyn_GetResidentialAddress_Template.xml
rename to EmployeeSelfServiceAgent/WorkdayDA/EmployeeScenarios/EmployeeUpdateResidentialAddress/msdyn_HRWorkdayHCMEmployeeGetResidentialAddress.xml
diff --git a/EmployeeSelfServiceAgent/WorkdayDA/EmployeeScenarios/EmployeeUpdateResidentialAddress/msdyn_UpdateResidentialAddress_Template.xml b/EmployeeSelfServiceAgent/WorkdayDA/EmployeeScenarios/EmployeeUpdateResidentialAddress/msdyn_HRWorkdayHCMEmployeeUpdateResidentialAddress.xml
similarity index 100%
rename from EmployeeSelfServiceAgent/WorkdayDA/EmployeeScenarios/EmployeeUpdateResidentialAddress/msdyn_UpdateResidentialAddress_Template.xml
rename to EmployeeSelfServiceAgent/WorkdayDA/EmployeeScenarios/EmployeeUpdateResidentialAddress/msdyn_HRWorkdayHCMEmployeeUpdateResidentialAddress.xml
diff --git a/EmployeeSelfServiceAgent/WorkdayDA/EmployeeScenarios/WorkdayManageEmergencyContact/topic.yaml b/EmployeeSelfServiceAgent/WorkdayDA/EmployeeScenarios/WorkdayManageEmergencyContact/topic.yaml
index c5965b6d..0e39e720 100644
--- a/EmployeeSelfServiceAgent/WorkdayDA/EmployeeScenarios/WorkdayManageEmergencyContact/topic.yaml
+++ b/EmployeeSelfServiceAgent/WorkdayDA/EmployeeScenarios/WorkdayManageEmergencyContact/topic.yaml
@@ -257,9 +257,9 @@ beginDialog:
                         type:
                           kind: Record
                           properties:
-                      "@Primary": String
-                      "@Priority": String
-                      Emergency_Contact_ID: String
+                            "@Primary": String
+                            "@Priority": String
+                            Emergency_Contact_ID: String
 
                       Emergency_Contact_Reference:
                         type: