diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/CSSABundleWorklow.bpmn b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/CSSABundleWorklow.bpmn
index 0562d699..c41cc175 100644
--- a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/CSSABundleWorklow.bpmn
+++ b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/CSSABundleWorklow.bpmn
@@ -1359,7 +1359,7 @@ execution.setVariable('userIdForSharing',userIdForSharing);
 var listOwnerEmailAddress = [];
 listOwnerEmailAddress.push(clientEmail);
 execution.setVariable('EmailType','CSSA');
-execution.setVariable('name','');
+execution.setVariable('name','User');
 execution.setVariable("emailTo", Java.to(listOwnerEmailAddress, "java.lang.Object[]"));
 execution.setVariable('formName','Contaminated Sites Services Application Form');</bpmn:script>
     </bpmn:scriptTask>
@@ -1565,6 +1565,10 @@ task.execution.setVariable('userRole','CSSA Team');</camunda:script>
       <bpmndi:BPMNShape id="Lane_0t984kw_di" bpmnElement="Lane_0t984kw" isHorizontal="true">
         <dc:Bounds x="185" y="80" width="3168" height="570" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Flow_0n61nyr_di" bpmnElement="Flow_0n61nyr">
+        <di:waypoint x="2890" y="4670" />
+        <di:waypoint x="3192" y="4670" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_17tf2x2_di" bpmnElement="Flow_17tf2x2">
         <di:waypoint x="2735" y="3450" />
         <di:waypoint x="3110" y="3450" />
@@ -1968,10 +1972,6 @@ task.execution.setVariable('userRole','CSSA Team');</camunda:script>
           <dc:Bounds x="1197" y="1746" width="46" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0n61nyr_di" bpmnElement="Flow_0n61nyr">
-        <di:waypoint x="2890" y="4670" />
-        <di:waypoint x="3192" y="4670" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="Gateway_1lfy3cm_di" bpmnElement="Gateway_1lfy3cm" isMarkerVisible="true">
         <dc:Bounds x="1230" y="1975" width="50" height="50" />
       </bpmndi:BPMNShape>
@@ -2026,19 +2026,6 @@ task.execution.setVariable('userRole','CSSA Team');</camunda:script>
           <dc:Bounds x="2763" y="3423" width="63" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1ftmftp" bpmnElement="Activity_0kxdigs">
-        <dc:Bounds x="2790" y="4630" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_0a1sgdr_di" bpmnElement="Gateway_0pty1fn">
-        <dc:Bounds x="2545" y="3065" width="50" height="50" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1baonum" bpmnElement="Gateway_0o9l3lp" isMarkerVisible="true">
-        <dc:Bounds x="2545" y="3155" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="2578" y="3133" width="63" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0lezdpf_di" bpmnElement="Activity_07ttn7q" isExpanded="true">
         <dc:Bounds x="415" y="2750" width="730" height="960" />
         <bpmndi:BPMNLabel />
@@ -2655,6 +2642,19 @@ task.execution.setVariable('userRole','CSSA Team');</camunda:script>
       <bpmndi:BPMNShape id="Gateway_0zpn1pz_di" bpmnElement="Gateway_1l4bqor">
         <dc:Bounds x="2685" y="3425" width="50" height="50" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_1ftmftp" bpmnElement="Activity_0kxdigs">
+        <dc:Bounds x="2790" y="4630" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_0a1sgdr_di" bpmnElement="Gateway_0pty1fn">
+        <dc:Bounds x="2545" y="3065" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_1baonum" bpmnElement="Gateway_0o9l3lp" isMarkerVisible="true">
+        <dc:Bounds x="2545" y="3155" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2578" y="3133" width="63" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>
diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/DERABundleWorkflow.bpmn b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/DERABundleWorkflow.bpmn
index 18e542f9..4f68aa08 100644
--- a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/DERABundleWorkflow.bpmn
+++ b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/DERABundleWorkflow.bpmn
@@ -245,7 +245,7 @@ system.out.println ("siteRiskClassification "+siteRiskClassification );
 execution.setVariable('siteRiskClassification',siteRiskClassification);
 execution.setVariable('formName','Detailed Ecological Risk Assessment Checklist');
 execution.setVariable('EmailType','DERA');
-execution.setVariable('name',execution.getVariable('deraPropertyOwnerName'));
+execution.setVariable('name','User');
 var emailsToArray = [];
 emailsToArray.push(clientEmail)
 execution.setVariable("emailTo", Java.to(emailsToArray, "java.lang.Object[]"));</bpmn:script>
diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/NIRBundleWorkflow.bpmn b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/NIRBundleWorkflow.bpmn
index 29d804ad..872f67fe 100644
--- a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/NIRBundleWorkflow.bpmn
+++ b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/NIRBundleWorkflow.bpmn
@@ -64,7 +64,7 @@ system.out.println ("siteRiskClassification "+siteRiskClassification );
 execution.setVariable('siteRiskClassification',siteRiskClassification);
 var name=execution.getVariable('nirName');
 system.out.println ("name "+execution.getVariable('nirName'));
-execution.setVariable('name',name);  
+execution.setVariable('name','User');  
 execution.setVariable('formName','Notification of Independent Remediation');    </bpmn:script>
     </bpmn:scriptTask>
     <bpmn:receiveTask id="Task_05ulff4" name="Application Resubmitted" messageRef="Message_1ngb2eg">
@@ -745,6 +745,17 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment'));
         <dc:Bounds x="201" y="1050" width="1330" height="1940" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Flow_1wavf5u_di" bpmnElement="Flow_1wavf5u">
+        <di:waypoint x="850" y="975" />
+        <di:waypoint x="850" y="1020" />
+        <di:waypoint x="450" y="1020" />
+        <di:waypoint x="450" y="470" />
+        <di:waypoint x="411" y="470" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0rqhohs_di" bpmnElement="Flow_0rqhohs">
+        <di:waypoint x="875" y="950" />
+        <di:waypoint x="940" y="950" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1rvfhly_di" bpmnElement="Flow_1rvfhly">
         <di:waypoint x="386" y="600" />
         <di:waypoint x="1050" y="600" />
@@ -842,17 +853,6 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment'));
           <dc:Bounds x="614" y="502" width="44" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0rqhohs_di" bpmnElement="Flow_0rqhohs">
-        <di:waypoint x="875" y="950" />
-        <di:waypoint x="940" y="950" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1wavf5u_di" bpmnElement="Flow_1wavf5u">
-        <di:waypoint x="850" y="975" />
-        <di:waypoint x="850" y="1020" />
-        <di:waypoint x="450" y="1020" />
-        <di:waypoint x="450" y="470" />
-        <di:waypoint x="411" y="470" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="BPMNShape_1aljg9k" bpmnElement="Activity_1gjzpac">
         <dc:Bounds x="570" y="2830" width="100" height="80" />
         <bpmndi:BPMNLabel />
@@ -881,13 +881,6 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment'));
         <dc:Bounds x="651" y="910" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1wcobls" bpmnElement="Activity_0g23guk">
-        <dc:Bounds x="940" y="910" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_1w01edb_di" bpmnElement="Gateway_1w01edb" isMarkerVisible="true">
-        <dc:Bounds x="825" y="925" width="50" height="50" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1d2xehj_di" bpmnElement="Activity_0truthe" isExpanded="true">
         <dc:Bounds x="231" y="1090" width="1200" height="1670" />
         <bpmndi:BPMNLabel />
@@ -1207,6 +1200,13 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment'));
       <bpmndi:BPMNShape id="Gateway_0g8qbmu_di" bpmnElement="Gateway_1awj7az">
         <dc:Bounds x="336" y="575" width="50" height="50" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_1wcobls" bpmnElement="Activity_0g23guk">
+        <dc:Bounds x="940" y="910" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_1w01edb_di" bpmnElement="Gateway_1w01edb" isMarkerVisible="true">
+        <dc:Bounds x="825" y="925" width="50" height="50" />
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>
diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/NOMBundleWorkflow.bpmn b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/NOMBundleWorkflow.bpmn
index a900461e..1b988872 100644
--- a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/NOMBundleWorkflow.bpmn
+++ b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/NOMBundleWorkflow.bpmn
@@ -45,7 +45,7 @@ execution.setVariable('clientEmail',clientEmail);
 var riskclassification = execution.getVariable('riskclassification');
 system.out.println ("formUrl "+execution.getVariable('formUrl'));
 execution.setVariable('emailTo',clientEmail);
-execution.setVariable('name','Test');
+execution.setVariable('name','User');
 system.out.println ("emailTo "+execution.getVariable('emailTo'));
 system.out.println ("name "+execution.getVariable('name'));
 
@@ -799,6 +799,17 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment'));
         <dc:Bounds x="201" y="830" width="1198" height="1940" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Flow_0gzrwfr_di" bpmnElement="Flow_0gzrwfr">
+        <di:waypoint x="850" y="795" />
+        <di:waypoint x="850" y="820" />
+        <di:waypoint x="240" y="820" />
+        <di:waypoint x="240" y="410" />
+        <di:waypoint x="311" y="410" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1l3pe3s_di" bpmnElement="Flow_1l3pe3s">
+        <di:waypoint x="875" y="770" />
+        <di:waypoint x="1001" y="770" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_077ihmr_di" bpmnElement="Flow_077ihmr">
         <di:waypoint x="751" y="770" />
         <di:waypoint x="825" y="770" />
@@ -910,17 +921,6 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment'));
         <di:waypoint x="259" y="145" />
         <di:waypoint x="311" y="145" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1l3pe3s_di" bpmnElement="Flow_1l3pe3s">
-        <di:waypoint x="875" y="770" />
-        <di:waypoint x="1001" y="770" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0gzrwfr_di" bpmnElement="Flow_0gzrwfr">
-        <di:waypoint x="850" y="795" />
-        <di:waypoint x="850" y="820" />
-        <di:waypoint x="240" y="820" />
-        <di:waypoint x="240" y="410" />
-        <di:waypoint x="311" y="410" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="BPMNShape_0s7tget" bpmnElement="Event_02fettt">
         <dc:Bounds x="223" y="127" width="36" height="36" />
         <bpmndi:BPMNLabel>
@@ -948,13 +948,6 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment'));
       <bpmndi:BPMNShape id="Event_01t23k0_di" bpmnElement="Event_01t23k0">
         <dc:Bounds x="852" y="2632" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_16j8qg5" bpmnElement="Activity_0hieobd">
-        <dc:Bounds x="1001" y="730" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_06j5m9d_di" bpmnElement="Gateway_06j5m9d" isMarkerVisible="true">
-        <dc:Bounds x="825" y="745" width="50" height="50" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1d2xehj_di" bpmnElement="Activity_0truthe" isExpanded="true">
         <dc:Bounds x="231" y="870" width="978" height="1670" />
         <bpmndi:BPMNLabel />
@@ -1284,6 +1277,13 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment'));
           <dc:Bounds x="1211" y="708" width="20" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_16j8qg5" bpmnElement="Activity_0hieobd">
+        <dc:Bounds x="1001" y="730" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_06j5m9d_di" bpmnElement="Gateway_06j5m9d" isMarkerVisible="true">
+        <dc:Bounds x="825" y="745" width="50" height="50" />
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>
diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/SDS/SDSWorkflow.bpmn b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/SDS/SDSWorkflow.bpmn
index 6fa6fc77..59d4a749 100644
--- a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/SDS/SDSWorkflow.bpmn
+++ b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/SDS/SDSWorkflow.bpmn
@@ -69,7 +69,7 @@ execution.setVariable('name',contactPersonName);
 system.out.println ("contactPersonName"+execution.getVariable('Section1C-FirstName'));
 
 
-execution.setVariable('name','');  
+execution.setVariable('name','User');  
 execution.setVariable('formName','Site Disclosure Statements');  </bpmn:script>
     </bpmn:scriptTask>
     <bpmn:startEvent id="Event_02fettt" name="Submit Form">