diff --git a/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn b/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn
index 9463b3eb..ac2d4455 100644
--- a/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn
+++ b/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn
@@ -328,7 +328,7 @@ isTest = False</spiffworkflow:preScript>
         <bpmn:outgoing>Flow_0h40vf3</bpmn:outgoing>
       </bpmn:startEvent>
       <bpmn:sequenceFlow id="Flow_0h40vf3" sourceRef="Event_0a4hscg" targetRef="Activity_1ong3lc" />
-      <bpmn:callActivity id="Activity_1ong3lc" name="Get Waku Messages: Message Body" calledElement="Get_Waku_Messages_Message_Body">
+      <bpmn:callActivity id="Activity_1ong3lc" name="Get Waku Messages: Message Body" calledElement="Waku_Messages_Message_Body">
         <bpmn:extensionElements>
           <spiffworkflow:preScript>task_id = "waku_invoice_submitted"</spiffworkflow:preScript>
         </bpmn:extensionElements>
@@ -750,9 +750,6 @@ else:
           <dc:Bounds x="1340" y="557" width="60" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_1usbnt0_di" bpmnElement="Event_1usbnt0">
-        <dc:Bounds x="4522" y="582" width="36" height="36" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0z13hw3_di" bpmnElement="SubProcess_Data_validation_rules">
         <dc:Bounds x="1170" y="482" width="100" height="80" />
         <bpmndi:BPMNLabel />
@@ -909,6 +906,9 @@ else:
         <dc:Bounds x="4360" y="560" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_1usbnt0_di" bpmnElement="Event_1usbnt0">
+        <dc:Bounds x="4522" y="582" width="36" height="36" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_1n1umf8_di" bpmnElement="Event_09q0ym0">
         <dc:Bounds x="3052" y="882" width="36" height="36" />
         <bpmndi:BPMNLabel>
@@ -1467,15 +1467,15 @@ else:
         <dc:Bounds x="500" y="140" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0tevtzs_di" bpmnElement="Activity_0iquip7">
-        <dc:Bounds x="170" y="140" width="100" height="80" />
-        <bpmndi:BPMNLabel />
+      <bpmndi:BPMNShape id="Event_0fbz176_di" bpmnElement="Event_0fbz176">
+        <dc:Bounds x="852" y="162" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_0h6o7ep" bpmnElement="waku_payment_pending">
         <dc:Bounds x="680" y="140" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0fbz176_di" bpmnElement="Event_0fbz176">
-        <dc:Bounds x="852" y="162" width="36" height="36" />
+      <bpmndi:BPMNShape id="Activity_0tevtzs_di" bpmnElement="Activity_0iquip7">
+        <dc:Bounds x="170" y="140" width="100" height="80" />
+        <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_1wnjy2u_di" bpmnElement="Flow_1wnjy2u">
         <di:waypoint x="108" y="180" />