diff --git a/examples/0-2-basic-example/user-guide-basics.bpmn b/examples/0-2-basic-example/user-guide-basics.bpmn
index a40c2ed5..52035ae9 100644
--- a/examples/0-2-basic-example/user-guide-basics.bpmn
+++ b/examples/0-2-basic-example/user-guide-basics.bpmn
@@ -4,7 +4,7 @@
     <bpmn:startEvent id="StartEvent_1">
       <bpmn:outgoing>Flow_1bsnw7a</bpmn:outgoing>
     </bpmn:startEvent>
-    <bpmn:userTask id="Activity_s__QUALI" name="Display Questions">
+    <bpmn:userTask id="Activity_s__QUALI__" name="Display Questions">
       <bpmn:extensionElements>
         <spiffworkflow:properties>
           <spiffworkflow:property name="formJsonSchemaFilename" value="norris-schema.json" />
@@ -34,7 +34,7 @@ Check out the "[1. Basics](https://spiffdemo.org/admin/process-groups/examples:1
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_11xcbxo</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:sequenceFlow id="Flow_1195zgn" sourceRef="Activity_s__QUALI" targetRef="Activity_0twfaq6" />
+    <bpmn:sequenceFlow id="Flow_1195zgn" sourceRef="Activity_s__QUALI__" targetRef="Activity_s__CNECT__" />
     <bpmn:manualTask id="Activity_0s0ak1j" name="0 Correct">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>## Total failure
@@ -49,7 +49,7 @@ As punishment, you are presented with this picture of Steven Seagal.
       <bpmn:incoming>Flow_1vku47h</bpmn:incoming>
       <bpmn:outgoing>Flow_12yxktn</bpmn:outgoing>
     </bpmn:manualTask>
-    <bpmn:scriptTask id="Activity_0twfaq6" name="Modify Information" scriptFormat="python">
+    <bpmn:scriptTask id="Activity_s__CNECT__" name="Modify Information" scriptFormat="python">
       <bpmn:extensionElements>
         <spiffworkflow:unitTests>
           <spiffworkflow:unitTest id="ScriptUnitTest_0tcx1qq">
@@ -90,7 +90,7 @@ if pushups:
       <bpmn:incoming>Flow_1vfw75z</bpmn:incoming>
       <bpmn:outgoing>Flow_0z9399c</bpmn:outgoing>
     </bpmn:businessRuleTask>
-    <bpmn:sequenceFlow id="Flow_1vfw75z" sourceRef="Activity_0twfaq6" targetRef="Activity_0sualuq" />
+    <bpmn:sequenceFlow id="Flow_1vfw75z" sourceRef="Activity_s__CNECT__" targetRef="Activity_0sualuq" />
     <bpmn:sequenceFlow id="Flow_0z9399c" sourceRef="Activity_0sualuq" targetRef="Gateway_1nez60d" />
     <bpmn:exclusiveGateway id="Gateway_1nez60d" name="The Real Chuck Norris?" default="Flow_0d2kg99">
       <bpmn:incoming>Flow_0z9399c</bpmn:incoming>
@@ -119,7 +119,7 @@ You don't get to see a complete picture of Chuck, as he is disappointed in you.
     </bpmn:exclusiveGateway>
     <bpmn:sequenceFlow id="Flow_12yxktn" sourceRef="Activity_0s0ak1j" targetRef="Gateway_1em7510" />
     <bpmn:sequenceFlow id="Flow_1yshk2s" sourceRef="Activity_1aggwmx" targetRef="Gateway_1em7510" />
-    <bpmn:manualTask id="Activity_s__NEW" name="Introduction">
+    <bpmn:manualTask id="Activity_s__NEW__" name="Introduction">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>## Welcome to a Basic Example
 
@@ -135,8 +135,8 @@ This process model will use all of the concepts covered individually in the "Bas
       <bpmn:incoming>Flow_1ul9fun</bpmn:incoming>
       <bpmn:outgoing>Flow_0scd0lj</bpmn:outgoing>
     </bpmn:manualTask>
-    <bpmn:sequenceFlow id="Flow_1bsnw7a" sourceRef="StartEvent_1" targetRef="Activity_s__NEW" />
-    <bpmn:sequenceFlow id="Flow_0scd0lj" sourceRef="Activity_s__NEW" targetRef="Activity_s__QUALI" />
+    <bpmn:sequenceFlow id="Flow_1bsnw7a" sourceRef="StartEvent_1" targetRef="Activity_s__NEW__" />
+    <bpmn:sequenceFlow id="Flow_0scd0lj" sourceRef="Activity_s__NEW__" targetRef="Activity_s__QUALI__" />
     <bpmn:sequenceFlow id="Flow_0hzwehr" sourceRef="Gateway_1em7510" targetRef="Activity_0shivvb" />
     <bpmn:manualTask id="Activity_0shivvb" name="Review">
       <bpmn:extensionElements>
@@ -159,7 +159,7 @@ To cause the event to fire just click on the "Try Again!" button below, or click
       <bpmn:outgoing>Flow_1ul9fun</bpmn:outgoing>
       <bpmn:signalEventDefinition id="SignalEventDefinition_0nrtqfp" />
     </bpmn:boundaryEvent>
-    <bpmn:sequenceFlow id="Flow_1ul9fun" sourceRef="Event_06zobyd" targetRef="Activity_s__NEW" />
+    <bpmn:sequenceFlow id="Flow_1ul9fun" sourceRef="Event_06zobyd" targetRef="Activity_s__NEW__" />
     <bpmn:sequenceFlow id="Flow_1vku47h" name="score == 0" sourceRef="Gateway_1nez60d" targetRef="Activity_0s0ak1j">
       <bpmn:conditionExpression>score == 0</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
@@ -185,11 +185,11 @@ Chuck Norris is proud of you.
     <bpmn:textAnnotation id="TextAnnotation_0xdb2cj">
       <bpmn:text>User Tasks allow you to collect information from real people through web forms.</bpmn:text>
     </bpmn:textAnnotation>
-    <bpmn:association id="Association_1puha8q" sourceRef="Activity_s__QUALI" targetRef="TextAnnotation_0xdb2cj" />
+    <bpmn:association id="Association_1puha8q" sourceRef="Activity_s__QUALI__" targetRef="TextAnnotation_0xdb2cj" />
     <bpmn:textAnnotation id="TextAnnotation_002deu1">
       <bpmn:text>Script Tasks provide a quick simple way to modify the data you collect.</bpmn:text>
     </bpmn:textAnnotation>
-    <bpmn:association id="Association_0xyvy14" sourceRef="Activity_0twfaq6" targetRef="TextAnnotation_002deu1" />
+    <bpmn:association id="Association_0xyvy14" sourceRef="Activity_s__CNECT__" targetRef="TextAnnotation_002deu1" />
     <bpmn:textAnnotation id="TextAnnotation_0u3ff93">
       <bpmn:text>Decision Tables are a great way to describe a set of business rules in a way that is easy to maintain and understand.</bpmn:text>
     </bpmn:textAnnotation>
@@ -212,7 +212,7 @@ Chuck Norris is proud of you.
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
         <dc:Bounds x="-198" y="199" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_15rn7j8_di" bpmnElement="Activity_s__QUALI">
+      <bpmndi:BPMNShape id="Activity_15rn7j8_di" bpmnElement="Activity_s__QUALI__">
         <dc:Bounds x="60" y="177" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
@@ -223,7 +223,7 @@ Chuck Norris is proud of you.
         <dc:Bounds x="670" y="70" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0qqdrd7_di" bpmnElement="Activity_0twfaq6">
+      <bpmndi:BPMNShape id="Activity_0qqdrd7_di" bpmnElement="Activity_s__CNECT__">
         <dc:Bounds x="210" y="177" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
@@ -244,7 +244,7 @@ Chuck Norris is proud of you.
       <bpmndi:BPMNShape id="Gateway_1em7510_di" bpmnElement="Gateway_1em7510" isMarkerVisible="true">
         <dc:Bounds x="825" y="192" width="50" height="50" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0j641hg_di" bpmnElement="Activity_s__NEW">
+      <bpmndi:BPMNShape id="Activity_0j641hg_di" bpmnElement="Activity_s__NEW__">
         <dc:Bounds x="-100" y="177" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>