diff --git a/category_number_one/message-receiver-one/message_receiver_one.bpmn b/category_number_one/message-receiver-one/message_receiver_one.bpmn
index b4ddeb2c..0ed6e745 100644
--- a/category_number_one/message-receiver-one/message_receiver_one.bpmn
+++ b/category_number_one/message-receiver-one/message_receiver_one.bpmn
@@ -15,7 +15,7 @@
       <bpmn:formalExpression>topica_one</bpmn:formalExpression>
     </bpmn:correlationPropertyRetrievalExpression>
     <bpmn:correlationPropertyRetrievalExpression messageRef="message_response_one">
-      <bpmn:formalExpression>payload_var_one.topica</bpmn:formalExpression>
+      <bpmn:formalExpression>topica_one</bpmn:formalExpression>
     </bpmn:correlationPropertyRetrievalExpression>
   </bpmn:correlationProperty>
   <bpmn:correlationProperty id="mcp_topicb_one" name="MCP TopicB_one">
@@ -23,16 +23,16 @@
       <bpmn:formalExpression>topicb_one</bpmn:formalExpression>
     </bpmn:correlationPropertyRetrievalExpression>
     <bpmn:correlationPropertyRetrievalExpression messageRef="message_response_one">
-      <bpmn:formalExpression>payload_var_one.topicb</bpmn:formalExpression>
+      <bpmn:formalExpression>topicb_one</bpmn:formalExpression>
     </bpmn:correlationPropertyRetrievalExpression>
   </bpmn:correlationProperty>
   <bpmn:message id="message_send_one" name="Message Send One">
     <bpmn:extensionElements>
-      <spiffworkflow:messagePayload>{
+      <spiffworkflow:messagePayload>{ "payload_var_one": {
 "topica_one": topic_one_a,
 "topicb_one": topic_one_b,
 "initial_var_one": 3
-}</spiffworkflow:messagePayload>
+        }}</spiffworkflow:messagePayload>
       <spiffworkflow:messageVariable>payload_var_one</spiffworkflow:messageVariable>
     </bpmn:extensionElements>
   </bpmn:message>
diff --git a/category_number_one/message-receiver-two/message_receiver_two.bpmn b/category_number_one/message-receiver-two/message_receiver_two.bpmn
index 36b46d41..fedc1f02 100644
--- a/category_number_one/message-receiver-two/message_receiver_two.bpmn
+++ b/category_number_one/message-receiver-two/message_receiver_two.bpmn
@@ -15,7 +15,7 @@
       <bpmn:formalExpression>topica_two</bpmn:formalExpression>
     </bpmn:correlationPropertyRetrievalExpression>
     <bpmn:correlationPropertyRetrievalExpression messageRef="message_response_two">
-      <bpmn:formalExpression>payload_var_two.topica</bpmn:formalExpression>
+      <bpmn:formalExpression>topica_two</bpmn:formalExpression>
     </bpmn:correlationPropertyRetrievalExpression>
   </bpmn:correlationProperty>
   <bpmn:correlationProperty id="mcp_topicb_two" name="MCP TopicB_two">
@@ -23,16 +23,16 @@
       <bpmn:formalExpression>topicb_two</bpmn:formalExpression>
     </bpmn:correlationPropertyRetrievalExpression>
     <bpmn:correlationPropertyRetrievalExpression messageRef="message_response_two">
-      <bpmn:formalExpression>payload_var_two.topicb</bpmn:formalExpression>
+      <bpmn:formalExpression>topicb_two</bpmn:formalExpression>
     </bpmn:correlationPropertyRetrievalExpression>
   </bpmn:correlationProperty>
   <bpmn:message id="message_send_two" name="Message Send Two">
     <bpmn:extensionElements>
-      <spiffworkflow:messagePayload>{
+      <spiffworkflow:messagePayload>{ "payload_var_two": {
 "topica_two": topic_one_a,
 "topicb_two": topic_one_b,
 "initial_var_two": 3
-}</spiffworkflow:messagePayload>
+        }}</spiffworkflow:messagePayload>
       <spiffworkflow:messageVariable>payload_var_two</spiffworkflow:messageVariable>
     </bpmn:extensionElements>
   </bpmn:message>
diff --git a/category_number_one/message-sender/message_sender.bpmn b/category_number_one/message-sender/message_sender.bpmn
index 4865a5c2..338bac17 100644
--- a/category_number_one/message-sender/message_sender.bpmn
+++ b/category_number_one/message-sender/message_sender.bpmn
@@ -22,7 +22,7 @@
       <bpmn:formalExpression>topica_one</bpmn:formalExpression>
     </bpmn:correlationPropertyRetrievalExpression>
     <bpmn:correlationPropertyRetrievalExpression messageRef="message_response_one">
-      <bpmn:formalExpression>payload_var_one.topica</bpmn:formalExpression>
+      <bpmn:formalExpression>payload_var_one.topica_one</bpmn:formalExpression>
     </bpmn:correlationPropertyRetrievalExpression>
   </bpmn:correlationProperty>
   <bpmn:correlationProperty id="mcp_topicb_one" name="MCP TopicB_one">