diff --git a/waku-messages/message/waku-message.bpmn b/waku-messages/message/waku-message.bpmn
index be1ffe8d..cca865d4 100644
--- a/waku-messages/message/waku-message.bpmn
+++ b/waku-messages/message/waku-message.bpmn
@@ -7,7 +7,7 @@
     <bpmn:sequenceFlow id="Flow_1elf0y3" sourceRef="StartEvent_1" targetRef="Activity_0xuhps4" />
     <bpmn:businessRuleTask id="Activity_0xuhps4" name="Get Waku Message Body">
       <bpmn:extensionElements>
-        <spiffworkflow:calledDecisionId>Waku_Message_Body</spiffworkflow:calledDecisionId>
+        <spiffworkflow:calledDecisionId>Waku_Messages_Message_Body</spiffworkflow:calledDecisionId>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1elf0y3</bpmn:incoming>
       <bpmn:outgoing>Flow_1m360zk</bpmn:outgoing>
@@ -15,7 +15,7 @@
     <bpmn:sequenceFlow id="Flow_1m360zk" sourceRef="Activity_0xuhps4" targetRef="Activity_1pstq0l" />
     <bpmn:businessRuleTask id="Activity_1pstq0l" name="Get Waku Message Variables">
       <bpmn:extensionElements>
-        <spiffworkflow:calledDecisionId>Waku_Message_Variables</spiffworkflow:calledDecisionId>
+        <spiffworkflow:calledDecisionId>Waku_Messages_Message_Variables</spiffworkflow:calledDecisionId>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1m360zk</bpmn:incoming>
       <bpmn:outgoing>Flow_09kuo6x</bpmn:outgoing>
@@ -23,7 +23,7 @@
     <bpmn:sequenceFlow id="Flow_09kuo6x" sourceRef="Activity_1pstq0l" targetRef="Activity_02abidw" />
     <bpmn:businessRuleTask id="Activity_02abidw" name="Get Waku Message Footer">
       <bpmn:extensionElements>
-        <spiffworkflow:calledDecisionId>Waku_Message_Footer</spiffworkflow:calledDecisionId>
+        <spiffworkflow:calledDecisionId>Waku_Messages_Message_Footer</spiffworkflow:calledDecisionId>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_09kuo6x</bpmn:incoming>
       <bpmn:outgoing>Flow_0nq5ggj</bpmn:outgoing>