diff --git a/spring-statemachine-samples/deploy/src/main/resources/model.notation b/spring-statemachine-samples/deploy/src/main/resources/model.notation
index 7655c663..da4ace32 100644
--- a/spring-statemachine-samples/deploy/src/main/resources/model.notation
+++ b/spring-statemachine-samples/deploy/src/main/resources/model.notation
@@ -1,144 +1,141 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_aWpBoAlKEeacC7Ug7AKYJw" type="PapyrusUMLStateMachineDiagram" name="StateMachine Diagram" measurementUnit="Pixel">
-  <children xmi:type="notation:Shape" xmi:id="_aWpBoQlKEeacC7Ug7AKYJw" type="2000" gradient="16777215, -1, 1">
-    <children xmi:type="notation:DecorationNode" xmi:id="_aWpBoglKEeacC7Ug7AKYJw" type="2001">
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aWpBowlKEeacC7Ug7AKYJw" width="1069" height="23"/>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_aWpBoAlKEeacC7Ug7AKYJw" type="PapyrusUMLStateMachineDiagram" name="StateMachine Diagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_aWpBoQlKEeacC7Ug7AKYJw" type="StateMachine_Shape" gradient="16777215, -1, 1">
+    <children xmi:type="notation:DecorationNode" xmi:id="_aWpBoglKEeacC7Ug7AKYJw" type="StateMachine_NameLabel">
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aWpBowlKEeacC7Ug7AKYJw" width="1069" height="25"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_aWpBpAlKEeacC7Ug7AKYJw" type="2002">
-      <children xmi:type="notation:Shape" xmi:id="_aWpBpQlKEeacC7Ug7AKYJw" type="3000">
+    <children xmi:type="notation:BasicCompartment" xmi:id="_UdXOgP_tEeq2u_3j9NOjBQ" type="StateMachine_RegionCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_aWpBpQlKEeacC7Ug7AKYJw" type="Region_Shape">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aWpBpglKEeacC7Ug7AKYJw" source="RegionAnnotationKey">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aWpBpwlKEeacC7Ug7AKYJw" key="RegionZoneKey" value=""/>
         </eAnnotations>
-        <children xmi:type="notation:DecorationNode" xmi:id="_aWpBqAlKEeacC7Ug7AKYJw" type="3002">
-          <children xmi:type="notation:Shape" xmi:id="_4Y5e4AlLEeacC7Ug7AKYJw" type="6000">
-            <children xmi:type="notation:DecorationNode" xmi:id="_4Y6F8AlLEeacC7Ug7AKYJw" type="6001">
+        <children xmi:type="notation:BasicCompartment" xmi:id="_UdXOgf_tEeq2u_3j9NOjBQ" type="Region_SubvertexCompartment">
+          <children xmi:type="notation:Shape" xmi:id="_4Y5e4AlLEeacC7Ug7AKYJw" type="State_Shape">
+            <children xmi:type="notation:DecorationNode" xmi:id="_4Y6F8AlLEeacC7Ug7AKYJw" type="State_NameLabel">
               <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6JO0EAlLEeacC7Ug7AKYJw" width="192"/>
             </children>
-            <children xmi:type="notation:DecorationNode" xmi:id="_4Y6F8QlLEeacC7Ug7AKYJw" type="19003">
+            <children xmi:type="notation:DecorationNode" xmi:id="_4Y6F8QlLEeacC7Ug7AKYJw" type="State_FloatingNameLabel">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_4Y6F8glLEeacC7Ug7AKYJw" x="40"/>
             </children>
-            <children xmi:type="notation:DecorationNode" xmi:id="_4Y6F8wlLEeacC7Ug7AKYJw" type="6002">
+            <children xmi:type="notation:BasicCompartment" xmi:id="_UdXOgv_tEeq2u_3j9NOjBQ" type="State_RegionCompartment">
               <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4Y6F9AlLEeacC7Ug7AKYJw" y="-1" width="192"/>
             </children>
             <children xmi:type="notation:BasicCompartment" xmi:id="_4ZCBwAlLEeacC7Ug7AKYJw" type="compartment_shape_display">
               <styles xmi:type="notation:TitleStyle" xmi:id="_4ZCBwQlLEeacC7Ug7AKYJw"/>
               <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4ZCBwglLEeacC7Ug7AKYJw"/>
             </children>
-            <children xmi:type="notation:Shape" xmi:id="_3MBJ4AnsEeacC7Ug7AKYJw" type="690">
+            <children xmi:type="notation:Shape" xmi:id="_3MBJ4AnsEeacC7Ug7AKYJw" type="Behavior_EntryBehaviorLabel">
               <element xmi:type="uml:OpaqueBehavior" href="model.uml#_3L51IAnsEeacC7Ug7AKYJw"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="_3MBJ4QnsEeacC7Ug7AKYJw"/>
             </children>
-            <children xmi:type="notation:Shape" xmi:id="_QBUrAAn3EeacC7Ug7AKYJw" type="692">
+            <children xmi:type="notation:Shape" xmi:id="_QBUrAAn3EeacC7Ug7AKYJw" type="Behavior_ExitBehaviorLabel">
               <element xmi:type="uml:OpaqueBehavior" href="model.uml#_QBLhEAn3EeacC7Ug7AKYJw"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="_QBUrAQn3EeacC7Ug7AKYJw"/>
             </children>
             <element xmi:type="uml:State" href="model.uml#_4Yz_UAlLEeacC7Ug7AKYJw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4Y5e4QlLEeacC7Ug7AKYJw" x="86" y="23" width="192" height="148"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_7RUdgAlLEeacC7Ug7AKYJw" type="6000">
-            <children xmi:type="notation:DecorationNode" xmi:id="_7RUdgglLEeacC7Ug7AKYJw" type="6001">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A94XsAlMEeacC7Ug7AKYJw" width="631" height="23"/>
+          <children xmi:type="notation:Shape" xmi:id="_7RUdgAlLEeacC7Ug7AKYJw" type="State_Shape">
+            <children xmi:type="notation:DecorationNode" xmi:id="_7RUdgglLEeacC7Ug7AKYJw" type="State_NameLabel">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A94XsAlMEeacC7Ug7AKYJw" width="631" height="25"/>
             </children>
-            <children xmi:type="notation:DecorationNode" xmi:id="_7RVEkAlLEeacC7Ug7AKYJw" type="19003">
+            <children xmi:type="notation:DecorationNode" xmi:id="_7RVEkAlLEeacC7Ug7AKYJw" type="State_FloatingNameLabel">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_7RVEkQlLEeacC7Ug7AKYJw" x="40"/>
             </children>
-            <children xmi:type="notation:DecorationNode" xmi:id="_7RVEkglLEeacC7Ug7AKYJw" type="6002">
-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7JqkEAlQEeacC7Ug7AKYJw" source="PapyrusCSSForceValue">
-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7JqkEQlQEeacC7Ug7AKYJw" key="visible" value="true"/>
-              </eAnnotations>
-              <children xmi:type="notation:Shape" xmi:id="_7JsZQAlQEeacC7Ug7AKYJw" type="3000">
+            <children xmi:type="notation:BasicCompartment" xmi:id="_UdXOg__tEeq2u_3j9NOjBQ" type="State_RegionCompartment">
+              <children xmi:type="notation:Shape" xmi:id="_7JsZQAlQEeacC7Ug7AKYJw" type="Region_Shape">
                 <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7JsZRAlQEeacC7Ug7AKYJw" source="RegionAnnotationKey">
                   <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7JsZRQlQEeacC7Ug7AKYJw" key="RegionZoneKey" value=""/>
                 </eAnnotations>
-                <children xmi:type="notation:DecorationNode" xmi:id="_7JsZQglQEeacC7Ug7AKYJw" type="3002">
-                  <children xmi:type="notation:Shape" xmi:id="_7JtnYAlQEeacC7Ug7AKYJw" type="6000">
-                    <children xmi:type="notation:DecorationNode" xmi:id="_7JtnYglQEeacC7Ug7AKYJw" type="6001">
+                <children xmi:type="notation:BasicCompartment" xmi:id="_UdXOhP_tEeq2u_3j9NOjBQ" type="Region_SubvertexCompartment">
+                  <children xmi:type="notation:Shape" xmi:id="_7JtnYAlQEeacC7Ug7AKYJw" type="State_Shape">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_7JtnYglQEeacC7Ug7AKYJw" type="State_NameLabel">
                       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8aw_kAlQEeacC7Ug7AKYJw" width="400"/>
                     </children>
-                    <children xmi:type="notation:DecorationNode" xmi:id="_7JtnYwlQEeacC7Ug7AKYJw" type="19003">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_7JtnYwlQEeacC7Ug7AKYJw" type="State_FloatingNameLabel">
                       <layoutConstraint xmi:type="notation:Location" xmi:id="_7JtnZAlQEeacC7Ug7AKYJw" x="40"/>
                     </children>
-                    <children xmi:type="notation:DecorationNode" xmi:id="_7JtnZQlQEeacC7Ug7AKYJw" type="6002">
+                    <children xmi:type="notation:BasicCompartment" xmi:id="_UdXOhf_tEeq2u_3j9NOjBQ" type="State_RegionCompartment">
                       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7JtnZglQEeacC7Ug7AKYJw" y="-1" width="400"/>
                     </children>
                     <children xmi:type="notation:BasicCompartment" xmi:id="_7J3YYAlQEeacC7Ug7AKYJw" type="compartment_shape_display">
                       <styles xmi:type="notation:TitleStyle" xmi:id="_7J3YYQlQEeacC7Ug7AKYJw"/>
                       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7J3YYglQEeacC7Ug7AKYJw"/>
                     </children>
-                    <children xmi:type="notation:Shape" xmi:id="_N1zKsAlfEeacC7Ug7AKYJw" type="690">
+                    <children xmi:type="notation:Shape" xmi:id="_N1zKsAlfEeacC7Ug7AKYJw" type="Behavior_EntryBehaviorLabel">
                       <element xmi:type="uml:OpaqueBehavior" href="model.uml#_N1qAwAlfEeacC7Ug7AKYJw"/>
                       <layoutConstraint xmi:type="notation:Location" xmi:id="_N1zKsQlfEeacC7Ug7AKYJw"/>
                     </children>
                     <element xmi:type="uml:State" href="model.uml#_7JtAUAlQEeacC7Ug7AKYJw"/>
                     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7JtnYQlQEeacC7Ug7AKYJw" x="140" y="37" width="400"/>
                   </children>
-                  <children xmi:type="notation:Shape" xmi:id="_TFymAAlREeacC7Ug7AKYJw" type="6000">
-                    <children xmi:type="notation:DecorationNode" xmi:id="_TFzNEAlREeacC7Ug7AKYJw" type="6001">
+                  <children xmi:type="notation:Shape" xmi:id="_TFymAAlREeacC7Ug7AKYJw" type="State_Shape">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_TFzNEAlREeacC7Ug7AKYJw" type="State_NameLabel">
                       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VwqQ0AlREeacC7Ug7AKYJw" width="212"/>
                     </children>
-                    <children xmi:type="notation:DecorationNode" xmi:id="_TFzNEQlREeacC7Ug7AKYJw" type="19003">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_TFzNEQlREeacC7Ug7AKYJw" type="State_FloatingNameLabel">
                       <layoutConstraint xmi:type="notation:Location" xmi:id="_TFzNEglREeacC7Ug7AKYJw" x="40"/>
                     </children>
-                    <children xmi:type="notation:DecorationNode" xmi:id="_TFzNEwlREeacC7Ug7AKYJw" type="6002">
+                    <children xmi:type="notation:BasicCompartment" xmi:id="_UdXOhv_tEeq2u_3j9NOjBQ" type="State_RegionCompartment">
                       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TFzNFAlREeacC7Ug7AKYJw" y="-1" width="212"/>
                     </children>
                     <children xmi:type="notation:BasicCompartment" xmi:id="_TF6h0AlREeacC7Ug7AKYJw" type="compartment_shape_display">
                       <styles xmi:type="notation:TitleStyle" xmi:id="_TF6h0QlREeacC7Ug7AKYJw"/>
                       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TF6h0glREeacC7Ug7AKYJw"/>
                     </children>
-                    <children xmi:type="notation:Shape" xmi:id="_ubTLUAlhEeacC7Ug7AKYJw" type="690">
+                    <children xmi:type="notation:Shape" xmi:id="_ubTLUAlhEeacC7Ug7AKYJw" type="Behavior_EntryBehaviorLabel">
                       <element xmi:type="uml:OpaqueBehavior" href="model.uml#_ubLPgAlhEeacC7Ug7AKYJw"/>
                       <layoutConstraint xmi:type="notation:Location" xmi:id="_ubTLUQlhEeacC7Ug7AKYJw"/>
                     </children>
                     <element xmi:type="uml:State" href="model.uml#_TFpcEAlREeacC7Ug7AKYJw"/>
                     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TFymAQlREeacC7Ug7AKYJw" x="399" y="120" width="212" height="95"/>
                   </children>
-                  <children xmi:type="notation:Shape" xmi:id="_Wk2G0AlREeacC7Ug7AKYJw" type="6000">
-                    <children xmi:type="notation:DecorationNode" xmi:id="_Wk2G0glREeacC7Ug7AKYJw" type="6001">
+                  <children xmi:type="notation:Shape" xmi:id="_Wk2G0AlREeacC7Ug7AKYJw" type="State_Shape">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_Wk2G0glREeacC7Ug7AKYJw" type="State_NameLabel">
                       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X_QPUAlREeacC7Ug7AKYJw" width="224"/>
                     </children>
-                    <children xmi:type="notation:DecorationNode" xmi:id="_Wk2G0wlREeacC7Ug7AKYJw" type="19003">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_Wk2G0wlREeacC7Ug7AKYJw" type="State_FloatingNameLabel">
                       <layoutConstraint xmi:type="notation:Location" xmi:id="_Wk2G1AlREeacC7Ug7AKYJw" x="40"/>
                     </children>
-                    <children xmi:type="notation:DecorationNode" xmi:id="_Wk2G1QlREeacC7Ug7AKYJw" type="6002">
+                    <children xmi:type="notation:BasicCompartment" xmi:id="_Udg_gP_tEeq2u_3j9NOjBQ" type="State_RegionCompartment">
                       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wk2G1glREeacC7Ug7AKYJw" y="-1" width="224"/>
                     </children>
                     <children xmi:type="notation:BasicCompartment" xmi:id="_Wk9bkAlREeacC7Ug7AKYJw" type="compartment_shape_display">
                       <styles xmi:type="notation:TitleStyle" xmi:id="_Wk9bkQlREeacC7Ug7AKYJw"/>
                       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wk9bkglREeacC7Ug7AKYJw"/>
                     </children>
-                    <children xmi:type="notation:Shape" xmi:id="_muE6UAn4EeacC7Ug7AKYJw" type="690">
+                    <children xmi:type="notation:Shape" xmi:id="_muE6UAn4EeacC7Ug7AKYJw" type="Behavior_EntryBehaviorLabel">
                       <element xmi:type="uml:OpaqueBehavior" href="model.uml#_mt8-gAn4EeacC7Ug7AKYJw"/>
                       <layoutConstraint xmi:type="notation:Location" xmi:id="_muE6UQn4EeacC7Ug7AKYJw"/>
                     </children>
                     <element xmi:type="uml:State" href="model.uml#_WkruwAlREeacC7Ug7AKYJw"/>
                     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wk2G0QlREeacC7Ug7AKYJw" x="98" y="251" width="224" height="93"/>
                   </children>
-                  <children xmi:type="notation:Shape" xmi:id="_rOu78AlREeacC7Ug7AKYJw" type="11000">
-                    <children xmi:type="notation:DecorationNode" xmi:id="_rOvjAAlREeacC7Ug7AKYJw" type="11001">
+                  <children xmi:type="notation:Shape" xmi:id="_rOu78AlREeacC7Ug7AKYJw" type="Pseudostate_ChoiceShape">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_rOvjAAlREeacC7Ug7AKYJw" type="Pseudostate_ChoiceFloatingNameLabel">
                       <layoutConstraint xmi:type="notation:Location" xmi:id="_rOvjAQlREeacC7Ug7AKYJw" x="-120" y="-20"/>
                     </children>
-                    <children xmi:type="notation:DecorationNode" xmi:id="_rOvjAglREeacC7Ug7AKYJw" type="11002">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_rOvjAglREeacC7Ug7AKYJw" type="Pseudostate_ChoiceStereotypeLabel">
                       <layoutConstraint xmi:type="notation:Location" xmi:id="_rOvjAwlREeacC7Ug7AKYJw" x="25" y="-10"/>
                     </children>
                     <element xmi:type="uml:Pseudostate" href="model.uml#_rOj80AlREeacC7Ug7AKYJw"/>
                     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rOu78QlREeacC7Ug7AKYJw" x="158" y="170"/>
                   </children>
-                  <children xmi:type="notation:Shape" xmi:id="_GEF00AlSEeacC7Ug7AKYJw" type="8000">
-                    <children xmi:type="notation:DecorationNode" xmi:id="_GEF00glSEeacC7Ug7AKYJw" type="8001">
+                  <children xmi:type="notation:Shape" xmi:id="_GEF00AlSEeacC7Ug7AKYJw" type="Pseudostate_InitialShape">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_GEF00glSEeacC7Ug7AKYJw" type="Pseudostate_InitialFloatingNameLabel">
                       <layoutConstraint xmi:type="notation:Location" xmi:id="_GEF00wlSEeacC7Ug7AKYJw" x="25" y="3"/>
                     </children>
-                    <children xmi:type="notation:DecorationNode" xmi:id="_GEF01AlSEeacC7Ug7AKYJw" type="8002">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_GEF01AlSEeacC7Ug7AKYJw" type="Pseudostate_InitialStereotypeLabel">
                       <layoutConstraint xmi:type="notation:Location" xmi:id="_GEF01QlSEeacC7Ug7AKYJw" x="25" y="-10"/>
                     </children>
                     <element xmi:type="uml:Pseudostate" href="model.uml#_GD19MAlSEeacC7Ug7AKYJw"/>
                     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GEF00QlSEeacC7Ug7AKYJw" x="21" y="50"/>
                   </children>
-                  <children xmi:type="notation:Shape" xmi:id="_X7WfYAlUEeacC7Ug7AKYJw" type="11000">
-                    <children xmi:type="notation:DecorationNode" xmi:id="_X7XGcAlUEeacC7Ug7AKYJw" type="11001">
+                  <children xmi:type="notation:Shape" xmi:id="_X7WfYAlUEeacC7Ug7AKYJw" type="Pseudostate_ChoiceShape">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_X7XGcAlUEeacC7Ug7AKYJw" type="Pseudostate_ChoiceFloatingNameLabel">
                       <layoutConstraint xmi:type="notation:Location" xmi:id="_X7XGcQlUEeacC7Ug7AKYJw" x="38" y="21"/>
                     </children>
-                    <children xmi:type="notation:DecorationNode" xmi:id="_X7XGcglUEeacC7Ug7AKYJw" type="11002">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_X7XGcglUEeacC7Ug7AKYJw" type="Pseudostate_ChoiceStereotypeLabel">
                       <layoutConstraint xmi:type="notation:Location" xmi:id="_X7XGcwlUEeacC7Ug7AKYJw" x="25" y="-10"/>
                     </children>
                     <element xmi:type="uml:Pseudostate" href="model.uml#_X6_6EAlUEeacC7Ug7AKYJw"/>
@@ -149,90 +146,87 @@
                 <element xmi:type="uml:Region" href="model.uml#_7JrLIAlQEeacC7Ug7AKYJw"/>
                 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7JsZQQlQEeacC7Ug7AKYJw" width="631" height="438"/>
               </children>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7RVEkwlLEeacC7Ug7AKYJw" y="23" width="631" height="438"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7RVEkwlLEeacC7Ug7AKYJw" y="25" width="631" height="438"/>
             </children>
             <children xmi:type="notation:BasicCompartment" xmi:id="_7RYu8AlLEeacC7Ug7AKYJw" type="compartment_shape_display">
               <styles xmi:type="notation:TitleStyle" xmi:id="_7RYu8QlLEeacC7Ug7AKYJw"/>
               <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7RYu8glLEeacC7Ug7AKYJw"/>
             </children>
-            <children xmi:type="notation:Shape" xmi:id="__JQewAlTEeacC7Ug7AKYJw" type="17000">
-              <children xmi:type="notation:DecorationNode" xmi:id="__JQewglTEeacC7Ug7AKYJw" type="17001">
+            <children xmi:type="notation:Shape" xmi:id="__JQewAlTEeacC7Ug7AKYJw" type="Pseudostate_ExitPointShape">
+              <children xmi:type="notation:DecorationNode" xmi:id="__JQewglTEeacC7Ug7AKYJw" type="Pseudostate_ExitPointFloatingNameLabel">
                 <layoutConstraint xmi:type="notation:Location" xmi:id="__JRF0AlTEeacC7Ug7AKYJw" x="24" y="17"/>
               </children>
-              <children xmi:type="notation:DecorationNode" xmi:id="__JRF0QlTEeacC7Ug7AKYJw" type="17002">
+              <children xmi:type="notation:DecorationNode" xmi:id="__JRF0QlTEeacC7Ug7AKYJw" type="Pseudostate_ExitPointStereotypeLabel">
                 <layoutConstraint xmi:type="notation:Location" xmi:id="__JRF0glTEeacC7Ug7AKYJw" x="25" y="-10"/>
               </children>
               <element xmi:type="uml:Pseudostate" href="model.uml#__I55cAlTEeacC7Ug7AKYJw"/>
               <layoutConstraint xmi:type="notation:Bounds" xmi:id="__JQewQlTEeacC7Ug7AKYJw" y="396"/>
             </children>
             <element xmi:type="uml:State" href="model.uml#_7RQzIAlLEeacC7Ug7AKYJw"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7RUdgQlLEeacC7Ug7AKYJw" x="390" y="27" width="631" height="461"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7RUdgQlLEeacC7Ug7AKYJw" x="390" y="27" width="631" height="463"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_8X65MAlLEeacC7Ug7AKYJw" type="6000">
-            <children xmi:type="notation:DecorationNode" xmi:id="_8X65MglLEeacC7Ug7AKYJw" type="6001">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BiFQ8AlMEeacC7Ug7AKYJw" width="630" height="23"/>
+          <children xmi:type="notation:Shape" xmi:id="_8X65MAlLEeacC7Ug7AKYJw" type="State_Shape">
+            <children xmi:type="notation:DecorationNode" xmi:id="_8X65MglLEeacC7Ug7AKYJw" type="State_NameLabel">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BiFQ8AlMEeacC7Ug7AKYJw" width="630" height="25"/>
             </children>
-            <children xmi:type="notation:DecorationNode" xmi:id="_8X65MwlLEeacC7Ug7AKYJw" type="19003">
+            <children xmi:type="notation:DecorationNode" xmi:id="_8X65MwlLEeacC7Ug7AKYJw" type="State_FloatingNameLabel">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_8X65NAlLEeacC7Ug7AKYJw" x="40"/>
             </children>
-            <children xmi:type="notation:DecorationNode" xmi:id="_8X65NQlLEeacC7Ug7AKYJw" type="6002">
-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z_VO4AlREeacC7Ug7AKYJw" source="PapyrusCSSForceValue">
-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z_V18AlREeacC7Ug7AKYJw" key="visible" value="true"/>
-              </eAnnotations>
-              <children xmi:type="notation:Shape" xmi:id="_z_WdAAlREeacC7Ug7AKYJw" type="3000">
+            <children xmi:type="notation:BasicCompartment" xmi:id="_Udg_gf_tEeq2u_3j9NOjBQ" type="State_RegionCompartment">
+              <children xmi:type="notation:Shape" xmi:id="_z_WdAAlREeacC7Ug7AKYJw" type="Region_Shape">
                 <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z_WdBAlREeacC7Ug7AKYJw" source="RegionAnnotationKey">
                   <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z_WdBQlREeacC7Ug7AKYJw" key="RegionZoneKey" value=""/>
                 </eAnnotations>
-                <children xmi:type="notation:DecorationNode" xmi:id="_z_WdAglREeacC7Ug7AKYJw" type="3002">
-                  <children xmi:type="notation:Shape" xmi:id="_z_XEEQlREeacC7Ug7AKYJw" type="6000">
-                    <children xmi:type="notation:DecorationNode" xmi:id="_z_XEEwlREeacC7Ug7AKYJw" type="6001">
+                <children xmi:type="notation:BasicCompartment" xmi:id="_Udg_gv_tEeq2u_3j9NOjBQ" type="Region_SubvertexCompartment">
+                  <children xmi:type="notation:Shape" xmi:id="_z_XEEQlREeacC7Ug7AKYJw" type="State_Shape">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_z_XEEwlREeacC7Ug7AKYJw" type="State_NameLabel">
                       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2mihsAlREeacC7Ug7AKYJw" width="201"/>
                     </children>
-                    <children xmi:type="notation:DecorationNode" xmi:id="_z_XrIAlREeacC7Ug7AKYJw" type="19003">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_z_XrIAlREeacC7Ug7AKYJw" type="State_FloatingNameLabel">
                       <layoutConstraint xmi:type="notation:Location" xmi:id="_z_XrIQlREeacC7Ug7AKYJw" x="40"/>
                     </children>
-                    <children xmi:type="notation:DecorationNode" xmi:id="_z_XrIglREeacC7Ug7AKYJw" type="6002">
+                    <children xmi:type="notation:BasicCompartment" xmi:id="_Udg_g__tEeq2u_3j9NOjBQ" type="State_RegionCompartment">
                       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z_XrIwlREeacC7Ug7AKYJw" y="-1" width="201"/>
                     </children>
                     <element xmi:type="uml:State" href="model.uml#_z_XEEAlREeacC7Ug7AKYJw"/>
                     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z_XEEglREeacC7Ug7AKYJw" x="160" y="17" width="201"/>
                   </children>
-                  <children xmi:type="notation:Shape" xmi:id="_4dYHgAlREeacC7Ug7AKYJw" type="6000">
-                    <children xmi:type="notation:DecorationNode" xmi:id="_4dYukAlREeacC7Ug7AKYJw" type="6001">
+                  <children xmi:type="notation:Shape" xmi:id="_4dYHgAlREeacC7Ug7AKYJw" type="State_Shape">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_4dYukAlREeacC7Ug7AKYJw" type="State_NameLabel">
                       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5wgjUAlREeacC7Ug7AKYJw" width="189"/>
                     </children>
-                    <children xmi:type="notation:DecorationNode" xmi:id="_4dYukQlREeacC7Ug7AKYJw" type="19003">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_4dYukQlREeacC7Ug7AKYJw" type="State_FloatingNameLabel">
                       <layoutConstraint xmi:type="notation:Location" xmi:id="_4dYukglREeacC7Ug7AKYJw" x="40"/>
                     </children>
-                    <children xmi:type="notation:DecorationNode" xmi:id="_4dYukwlREeacC7Ug7AKYJw" type="6002">
+                    <children xmi:type="notation:BasicCompartment" xmi:id="_Udg_hP_tEeq2u_3j9NOjBQ" type="State_RegionCompartment">
                       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4dYulAlREeacC7Ug7AKYJw" y="-1" width="189"/>
                     </children>
                     <children xmi:type="notation:BasicCompartment" xmi:id="_4dli4AlREeacC7Ug7AKYJw" type="compartment_shape_display">
                       <styles xmi:type="notation:TitleStyle" xmi:id="_4dli4QlREeacC7Ug7AKYJw"/>
                       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4dli4glREeacC7Ug7AKYJw"/>
                     </children>
-                    <children xmi:type="notation:Shape" xmi:id="_qS-kcAn4EeacC7Ug7AKYJw" type="690">
+                    <children xmi:type="notation:Shape" xmi:id="_qS-kcAn4EeacC7Ug7AKYJw" type="Behavior_EntryBehaviorLabel">
                       <element xmi:type="uml:OpaqueBehavior" href="model.uml#_qS3PsAn4EeacC7Ug7AKYJw"/>
                       <layoutConstraint xmi:type="notation:Location" xmi:id="_qS-kcQn4EeacC7Ug7AKYJw"/>
                     </children>
                     <element xmi:type="uml:State" href="model.uml#_4dLTMAlREeacC7Ug7AKYJw"/>
                     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4dYHgQlREeacC7Ug7AKYJw" x="420" y="99" width="189" height="98"/>
                   </children>
-                  <children xmi:type="notation:Shape" xmi:id="_IegBwAlSEeacC7Ug7AKYJw" type="8000">
-                    <children xmi:type="notation:DecorationNode" xmi:id="_IegBwglSEeacC7Ug7AKYJw" type="8001">
+                  <children xmi:type="notation:Shape" xmi:id="_IegBwAlSEeacC7Ug7AKYJw" type="Pseudostate_InitialShape">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_IegBwglSEeacC7Ug7AKYJw" type="Pseudostate_InitialFloatingNameLabel">
                       <layoutConstraint xmi:type="notation:Location" xmi:id="_IegBwwlSEeacC7Ug7AKYJw" x="25" y="3"/>
                     </children>
-                    <children xmi:type="notation:DecorationNode" xmi:id="_Iego0AlSEeacC7Ug7AKYJw" type="8002">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_Iego0AlSEeacC7Ug7AKYJw" type="Pseudostate_InitialStereotypeLabel">
                       <layoutConstraint xmi:type="notation:Location" xmi:id="_Iego0QlSEeacC7Ug7AKYJw" x="25" y="-10"/>
                     </children>
                     <element xmi:type="uml:Pseudostate" href="model.uml#_IeO8AAlSEeacC7Ug7AKYJw"/>
                     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IegBwQlSEeacC7Ug7AKYJw" x="21" y="23"/>
                   </children>
-                  <children xmi:type="notation:Shape" xmi:id="_TAc9kAlSEeacC7Ug7AKYJw" type="11000">
-                    <children xmi:type="notation:DecorationNode" xmi:id="_TAc9kglSEeacC7Ug7AKYJw" type="11001">
+                  <children xmi:type="notation:Shape" xmi:id="_TAc9kAlSEeacC7Ug7AKYJw" type="Pseudostate_ChoiceShape">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_TAc9kglSEeacC7Ug7AKYJw" type="Pseudostate_ChoiceFloatingNameLabel">
                       <layoutConstraint xmi:type="notation:Location" xmi:id="_TAc9kwlSEeacC7Ug7AKYJw" x="-80" y="-20"/>
                     </children>
-                    <children xmi:type="notation:DecorationNode" xmi:id="_TAdkoAlSEeacC7Ug7AKYJw" type="11002">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_TAdkoAlSEeacC7Ug7AKYJw" type="Pseudostate_ChoiceStereotypeLabel">
                       <layoutConstraint xmi:type="notation:Location" xmi:id="_TAdkoQlSEeacC7Ug7AKYJw" x="25" y="-10"/>
                     </children>
                     <element xmi:type="uml:Pseudostate" href="model.uml#_TAKpsAlSEeacC7Ug7AKYJw"/>
@@ -243,61 +237,61 @@
                 <element xmi:type="uml:Region" href="model.uml#_z_V18QlREeacC7Ug7AKYJw"/>
                 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z_WdAQlREeacC7Ug7AKYJw" width="630" height="248"/>
               </children>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8X65NglLEeacC7Ug7AKYJw" y="23" width="630" height="248"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8X65NglLEeacC7Ug7AKYJw" y="25" width="630" height="248"/>
             </children>
             <children xmi:type="notation:BasicCompartment" xmi:id="_8X-jkAlLEeacC7Ug7AKYJw" type="compartment_shape_display">
               <styles xmi:type="notation:TitleStyle" xmi:id="_8X-jkQlLEeacC7Ug7AKYJw"/>
               <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8X-jkglLEeacC7Ug7AKYJw"/>
             </children>
-            <children xmi:type="notation:Shape" xmi:id="_hgdqYAlSEeacC7Ug7AKYJw" type="17000">
-              <children xmi:type="notation:DecorationNode" xmi:id="_hgdqYglSEeacC7Ug7AKYJw" type="17001">
+            <children xmi:type="notation:Shape" xmi:id="_hgdqYAlSEeacC7Ug7AKYJw" type="Pseudostate_ExitPointShape">
+              <children xmi:type="notation:DecorationNode" xmi:id="_hgdqYglSEeacC7Ug7AKYJw" type="Pseudostate_ExitPointFloatingNameLabel">
                 <layoutConstraint xmi:type="notation:Location" xmi:id="_hgdqYwlSEeacC7Ug7AKYJw" x="19" y="29"/>
               </children>
-              <children xmi:type="notation:DecorationNode" xmi:id="_hgdqZAlSEeacC7Ug7AKYJw" type="17002">
+              <children xmi:type="notation:DecorationNode" xmi:id="_hgdqZAlSEeacC7Ug7AKYJw" type="Pseudostate_ExitPointStereotypeLabel">
                 <layoutConstraint xmi:type="notation:Location" xmi:id="_hgdqZQlSEeacC7Ug7AKYJw" x="25" y="-10"/>
               </children>
               <element xmi:type="uml:Pseudostate" href="model.uml#_hgKvcAlSEeacC7Ug7AKYJw"/>
               <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hgdqYQlSEeacC7Ug7AKYJw" y="144"/>
             </children>
             <element xmi:type="uml:State" href="model.uml#_8X2AsAlLEeacC7Ug7AKYJw"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8X65MQlLEeacC7Ug7AKYJw" x="391" y="513" width="630" height="271"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8X65MQlLEeacC7Ug7AKYJw" x="391" y="513" width="630" height="273"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_ETXs0AlMEeacC7Ug7AKYJw" type="6000">
-            <children xmi:type="notation:DecorationNode" xmi:id="_ETXs0glMEeacC7Ug7AKYJw" type="6001">
+          <children xmi:type="notation:Shape" xmi:id="_ETXs0AlMEeacC7Ug7AKYJw" type="State_Shape">
+            <children xmi:type="notation:DecorationNode" xmi:id="_ETXs0glMEeacC7Ug7AKYJw" type="State_NameLabel">
               <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Geb2MAlMEeacC7Ug7AKYJw" width="145"/>
             </children>
-            <children xmi:type="notation:DecorationNode" xmi:id="_ETXs0wlMEeacC7Ug7AKYJw" type="19003">
+            <children xmi:type="notation:DecorationNode" xmi:id="_ETXs0wlMEeacC7Ug7AKYJw" type="State_FloatingNameLabel">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_ETXs1AlMEeacC7Ug7AKYJw" x="40"/>
             </children>
-            <children xmi:type="notation:DecorationNode" xmi:id="_ETXs1QlMEeacC7Ug7AKYJw" type="6002">
+            <children xmi:type="notation:BasicCompartment" xmi:id="_Udg_hf_tEeq2u_3j9NOjBQ" type="State_RegionCompartment">
               <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ETXs1glMEeacC7Ug7AKYJw" y="-1" width="145"/>
             </children>
             <children xmi:type="notation:BasicCompartment" xmi:id="_ETb-QAlMEeacC7Ug7AKYJw" type="compartment_shape_display">
               <styles xmi:type="notation:TitleStyle" xmi:id="_ETb-QQlMEeacC7Ug7AKYJw"/>
               <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ETb-QglMEeacC7Ug7AKYJw"/>
             </children>
-            <children xmi:type="notation:Shape" xmi:id="_WL460Al-EeacC7Ug7AKYJw" type="690">
+            <children xmi:type="notation:Shape" xmi:id="_WL460Al-EeacC7Ug7AKYJw" type="Behavior_EntryBehaviorLabel">
               <element xmi:type="uml:OpaqueBehavior" href="model.uml#_WLxmEAl-EeacC7Ug7AKYJw"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="_WL460Ql-EeacC7Ug7AKYJw"/>
             </children>
             <element xmi:type="uml:State" href="model.uml#_ETRmMAlMEeacC7Ug7AKYJw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ETXs0QlMEeacC7Ug7AKYJw" x="22" y="234" width="145" height="119"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_ZvPYgAlMEeacC7Ug7AKYJw" type="8000">
-            <children xmi:type="notation:DecorationNode" xmi:id="_ZvP_kAlMEeacC7Ug7AKYJw" type="8001">
+          <children xmi:type="notation:Shape" xmi:id="_ZvPYgAlMEeacC7Ug7AKYJw" type="Pseudostate_InitialShape">
+            <children xmi:type="notation:DecorationNode" xmi:id="_ZvP_kAlMEeacC7Ug7AKYJw" type="Pseudostate_InitialFloatingNameLabel">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_ZvP_kQlMEeacC7Ug7AKYJw" x="25" y="3"/>
             </children>
-            <children xmi:type="notation:DecorationNode" xmi:id="_ZvP_kglMEeacC7Ug7AKYJw" type="8002">
+            <children xmi:type="notation:DecorationNode" xmi:id="_ZvP_kglMEeacC7Ug7AKYJw" type="Pseudostate_InitialStereotypeLabel">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_ZvP_kwlMEeacC7Ug7AKYJw" x="25" y="-10"/>
             </children>
             <element xmi:type="uml:Pseudostate" href="model.uml#_ZvIDwAlMEeacC7Ug7AKYJw"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZvPYgQlMEeacC7Ug7AKYJw" x="22" y="42"/>
           </children>
-          <children xmi:type="notation:Shape" xmi:id="_WziNYAnxEeacC7Ug7AKYJw" type="12000">
-            <children xmi:type="notation:DecorationNode" xmi:id="_WziNYgnxEeacC7Ug7AKYJw" type="12001">
+          <children xmi:type="notation:Shape" xmi:id="_WziNYAnxEeacC7Ug7AKYJw" type="Pseudostate_JunctionShape">
+            <children xmi:type="notation:DecorationNode" xmi:id="_WziNYgnxEeacC7Ug7AKYJw" type="Pseudostate_JunctionFloatingNameLabel">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_WziNYwnxEeacC7Ug7AKYJw" x="-84" y="37"/>
             </children>
-            <children xmi:type="notation:DecorationNode" xmi:id="_WziNZAnxEeacC7Ug7AKYJw" type="12002">
+            <children xmi:type="notation:DecorationNode" xmi:id="_WziNZAnxEeacC7Ug7AKYJw" type="Pseudostate_JunctionStereotypeLabel">
               <layoutConstraint xmi:type="notation:Location" xmi:id="_WziNZQnxEeacC7Ug7AKYJw" x="25" y="-10"/>
             </children>
             <element xmi:type="uml:Pseudostate" href="model.uml#_WzKZ8AnxEeacC7Ug7AKYJw"/>
@@ -308,7 +302,7 @@
         <element xmi:type="uml:Region" href="model.uml#_aWoakAlKEeacC7Ug7AKYJw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aWpBqglKEeacC7Ug7AKYJw" width="1069" height="814"/>
       </children>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aWpBqwlKEeacC7Ug7AKYJw" y="23" width="1069" height="814"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aWpBqwlKEeacC7Ug7AKYJw" y="25" width="1069" height="812"/>
     </children>
     <children xmi:type="notation:BasicCompartment" xmi:id="_aahcEAlKEeacC7Ug7AKYJw" type="compartment_shape_display">
       <styles xmi:type="notation:TitleStyle" xmi:id="_aahcEQlKEeacC7Ug7AKYJw"/>
@@ -317,20 +311,20 @@
     <element xmi:type="uml:StateMachine" href="model.uml#_aWlXQAlKEeacC7Ug7AKYJw"/>
     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aWpBrAlKEeacC7Ug7AKYJw" x="30" y="30" width="1069" height="837"/>
   </children>
-  <styles xmi:type="notation:StringValueStyle" xmi:id="_aWpBrQlKEeacC7Ug7AKYJw" name="diagram_compatibility_version" stringValue="1.1.0"/>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_aWpBrQlKEeacC7Ug7AKYJw" name="diagram_compatibility_version" stringValue="1.4.0"/>
   <styles xmi:type="notation:DiagramStyle" xmi:id="_aWpBrglKEeacC7Ug7AKYJw"/>
-  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_aWpBrwlKEeacC7Ug7AKYJw">
+  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_UcedsP_tEeq2u_3j9NOjBQ" diagramKindId="org.eclipse.papyrus.uml.diagram.stateMachine">
     <owner xmi:type="uml:Model" href="model.uml#_aWepkAlKEeacC7Ug7AKYJw"/>
   </styles>
   <element xmi:type="uml:StateMachine" href="model.uml#_aWlXQAlKEeacC7Ug7AKYJw"/>
-  <edges xmi:type="notation:Connector" xmi:id="_bFs1IAlMEeacC7Ug7AKYJw" type="7000" source="_ZvPYgAlMEeacC7Ug7AKYJw" target="_4Y5e4AlLEeacC7Ug7AKYJw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_bFs1IwlMEeacC7Ug7AKYJw" type="7001">
+  <edges xmi:type="notation:Connector" xmi:id="_bFs1IAlMEeacC7Ug7AKYJw" type="Transition_Edge" source="_ZvPYgAlMEeacC7Ug7AKYJw" target="_4Y5e4AlLEeacC7Ug7AKYJw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_bFs1IwlMEeacC7Ug7AKYJw" type="Transition_NameLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_bFs1JAlMEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_bFs1JQlMEeacC7Ug7AKYJw" type="7002">
+    <children xmi:type="notation:DecorationNode" xmi:id="_bFs1JQlMEeacC7Ug7AKYJw" type="Transition_GuardLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_bFs1JglMEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_bFs1JwlMEeacC7Ug7AKYJw" type="7003">
+    <children xmi:type="notation:DecorationNode" xmi:id="_bFs1JwlMEeacC7Ug7AKYJw" type="Transition_StereotypeLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_bFs1KAlMEeacC7Ug7AKYJw" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_bFs1IQlMEeacC7Ug7AKYJw"/>
@@ -339,14 +333,14 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bGCzYAlMEeacC7Ug7AKYJw" id="(1.0,0.45)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bGCzYQlMEeacC7Ug7AKYJw" id="(0.0,0.19148936170212766)"/>
   </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_2xUnoAlMEeacC7Ug7AKYJw" type="7000" source="_4Y5e4AlLEeacC7Ug7AKYJw" target="_7RUdgAlLEeacC7Ug7AKYJw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_2xVOsAlMEeacC7Ug7AKYJw" type="7001">
+  <edges xmi:type="notation:Connector" xmi:id="_2xUnoAlMEeacC7Ug7AKYJw" type="Transition_Edge" source="_4Y5e4AlLEeacC7Ug7AKYJw" target="_7RUdgAlLEeacC7Ug7AKYJw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_2xVOsAlMEeacC7Ug7AKYJw" type="Transition_NameLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_2xVOsQlMEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_2xVOsglMEeacC7Ug7AKYJw" type="7002">
+    <children xmi:type="notation:DecorationNode" xmi:id="_2xVOsglMEeacC7Ug7AKYJw" type="Transition_GuardLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_2xVOswlMEeacC7Ug7AKYJw" x="-12" y="-12"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_2xVOtAlMEeacC7Ug7AKYJw" type="7003">
+    <children xmi:type="notation:DecorationNode" xmi:id="_2xVOtAlMEeacC7Ug7AKYJw" type="Transition_StereotypeLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_2xVOtQlMEeacC7Ug7AKYJw" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_2xUnoQlMEeacC7Ug7AKYJw"/>
@@ -355,14 +349,14 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2xveYAlMEeacC7Ug7AKYJw" id="(1.0,0.31756756756756754)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2xveYQlMEeacC7Ug7AKYJw" id="(0.0,0.09327548806941431)"/>
   </edges>
-  <edges xmi:type="notation:Connector" xmi:id="__nRiYAlREeacC7Ug7AKYJw" type="7000" source="_7JtnYAlQEeacC7Ug7AKYJw" target="_rOu78AlREeacC7Ug7AKYJw">
-    <children xmi:type="notation:DecorationNode" xmi:id="__nTXkAlREeacC7Ug7AKYJw" type="7001">
+  <edges xmi:type="notation:Connector" xmi:id="__nRiYAlREeacC7Ug7AKYJw" type="Transition_Edge" source="_7JtnYAlQEeacC7Ug7AKYJw" target="_rOu78AlREeacC7Ug7AKYJw">
+    <children xmi:type="notation:DecorationNode" xmi:id="__nTXkAlREeacC7Ug7AKYJw" type="Transition_NameLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="__nTXkQlREeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="__nTXkglREeacC7Ug7AKYJw" type="7002">
+    <children xmi:type="notation:DecorationNode" xmi:id="__nTXkglREeacC7Ug7AKYJw" type="Transition_GuardLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="__nT-oAlREeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="__nT-oQlREeacC7Ug7AKYJw" type="7003">
+    <children xmi:type="notation:DecorationNode" xmi:id="__nT-oQlREeacC7Ug7AKYJw" type="Transition_StereotypeLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="__nT-oglREeacC7Ug7AKYJw" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="__nRiYQlREeacC7Ug7AKYJw"/>
@@ -371,14 +365,14 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__oBwUAlREeacC7Ug7AKYJw" id="(0.1175,1.0)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__oBwUQlREeacC7Ug7AKYJw" id="(0.48333333333333334,0.0)"/>
   </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_A_mnQAlSEeacC7Ug7AKYJw" type="7000" source="_rOu78AlREeacC7Ug7AKYJw" target="_TFymAAlREeacC7Ug7AKYJw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_A_mnQwlSEeacC7Ug7AKYJw" type="7001">
+  <edges xmi:type="notation:Connector" xmi:id="_A_mnQAlSEeacC7Ug7AKYJw" type="Transition_Edge" source="_rOu78AlREeacC7Ug7AKYJw" target="_TFymAAlREeacC7Ug7AKYJw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_A_mnQwlSEeacC7Ug7AKYJw" type="Transition_NameLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_A_mnRAlSEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_A_mnRQlSEeacC7Ug7AKYJw" type="7002">
+    <children xmi:type="notation:DecorationNode" xmi:id="_A_mnRQlSEeacC7Ug7AKYJw" type="Transition_GuardLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_A_mnRglSEeacC7Ug7AKYJw" x="-8" y="-17"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_A_mnRwlSEeacC7Ug7AKYJw" type="7003">
+    <children xmi:type="notation:DecorationNode" xmi:id="_A_mnRwlSEeacC7Ug7AKYJw" type="Transition_StereotypeLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_A_mnSAlSEeacC7Ug7AKYJw" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_A_mnQQlSEeacC7Ug7AKYJw"/>
@@ -387,14 +381,14 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BAO5YAlSEeacC7Ug7AKYJw" id="(1.0,0.5)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BAO5YQlSEeacC7Ug7AKYJw" id="(0.0,0.631578947368421)"/>
   </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_CPLYwAlSEeacC7Ug7AKYJw" type="7000" source="_rOu78AlREeacC7Ug7AKYJw" target="_Wk2G0AlREeacC7Ug7AKYJw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_CPLYwwlSEeacC7Ug7AKYJw" type="7001">
+  <edges xmi:type="notation:Connector" xmi:id="_CPLYwAlSEeacC7Ug7AKYJw" type="Transition_Edge" source="_rOu78AlREeacC7Ug7AKYJw" target="_Wk2G0AlREeacC7Ug7AKYJw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_CPLYwwlSEeacC7Ug7AKYJw" type="Transition_NameLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_CPLYxAlSEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_CPLYxQlSEeacC7Ug7AKYJw" type="7002">
+    <children xmi:type="notation:DecorationNode" xmi:id="_CPLYxQlSEeacC7Ug7AKYJw" type="Transition_GuardLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_CPLYxglSEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_CPLYxwlSEeacC7Ug7AKYJw" type="7003">
+    <children xmi:type="notation:DecorationNode" xmi:id="_CPLYxwlSEeacC7Ug7AKYJw" type="Transition_StereotypeLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_CPLYyAlSEeacC7Ug7AKYJw" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_CPLYwQlSEeacC7Ug7AKYJw"/>
@@ -403,14 +397,14 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CP1gEAlSEeacC7Ug7AKYJw" id="(0.48333333333333334,1.0)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CP1gEQlSEeacC7Ug7AKYJw" id="(0.4049586776859504,0.0)"/>
   </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_Hc-TUAlSEeacC7Ug7AKYJw" type="7000" source="_GEF00AlSEeacC7Ug7AKYJw" target="_7JtnYAlQEeacC7Ug7AKYJw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_Hc-TUwlSEeacC7Ug7AKYJw" type="7001">
+  <edges xmi:type="notation:Connector" xmi:id="_Hc-TUAlSEeacC7Ug7AKYJw" type="Transition_Edge" source="_GEF00AlSEeacC7Ug7AKYJw" target="_7JtnYAlQEeacC7Ug7AKYJw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_Hc-TUwlSEeacC7Ug7AKYJw" type="Transition_NameLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_Hc-TVAlSEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_Hc-TVQlSEeacC7Ug7AKYJw" type="7002">
+    <children xmi:type="notation:DecorationNode" xmi:id="_Hc-TVQlSEeacC7Ug7AKYJw" type="Transition_GuardLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_Hc-TVglSEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_Hc-6YAlSEeacC7Ug7AKYJw" type="7003">
+    <children xmi:type="notation:DecorationNode" xmi:id="_Hc-6YAlSEeacC7Ug7AKYJw" type="Transition_StereotypeLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_Hc-6YQlSEeacC7Ug7AKYJw" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_Hc-TUQlSEeacC7Ug7AKYJw"/>
@@ -419,14 +413,14 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HdsFAAlSEeacC7Ug7AKYJw" id="(1.0,0.45)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HdsFAQlSEeacC7Ug7AKYJw" id="(0.0,0.3384615384615385)"/>
   </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_JkkR8AlSEeacC7Ug7AKYJw" type="7000" source="_IegBwAlSEeacC7Ug7AKYJw" target="_z_XEEQlREeacC7Ug7AKYJw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_JkkR8wlSEeacC7Ug7AKYJw" type="7001">
+  <edges xmi:type="notation:Connector" xmi:id="_JkkR8AlSEeacC7Ug7AKYJw" type="Transition_Edge" source="_IegBwAlSEeacC7Ug7AKYJw" target="_z_XEEQlREeacC7Ug7AKYJw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_JkkR8wlSEeacC7Ug7AKYJw" type="Transition_NameLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_JkkR9AlSEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_JkkR9QlSEeacC7Ug7AKYJw" type="7002">
+    <children xmi:type="notation:DecorationNode" xmi:id="_JkkR9QlSEeacC7Ug7AKYJw" type="Transition_GuardLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_JkkR9glSEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_JkkR9wlSEeacC7Ug7AKYJw" type="7003">
+    <children xmi:type="notation:DecorationNode" xmi:id="_JkkR9wlSEeacC7Ug7AKYJw" type="Transition_StereotypeLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_JkkR-AlSEeacC7Ug7AKYJw" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_JkkR8QlSEeacC7Ug7AKYJw"/>
@@ -435,14 +429,14 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JlQ1gAlSEeacC7Ug7AKYJw" id="(1.0,0.5)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JlQ1gQlSEeacC7Ug7AKYJw" id="(0.0,0.3404255319148936)"/>
   </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_dksYYAlSEeacC7Ug7AKYJw" type="7000" source="_z_XEEQlREeacC7Ug7AKYJw" target="_TAc9kAlSEeacC7Ug7AKYJw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_dks_cAlSEeacC7Ug7AKYJw" type="7001">
+  <edges xmi:type="notation:Connector" xmi:id="_dksYYAlSEeacC7Ug7AKYJw" type="Transition_Edge" source="_z_XEEQlREeacC7Ug7AKYJw" target="_TAc9kAlSEeacC7Ug7AKYJw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_dks_cAlSEeacC7Ug7AKYJw" type="Transition_NameLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_dks_cQlSEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_dks_cglSEeacC7Ug7AKYJw" type="7002">
+    <children xmi:type="notation:DecorationNode" xmi:id="_dks_cglSEeacC7Ug7AKYJw" type="Transition_GuardLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_dks_cwlSEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_dks_dAlSEeacC7Ug7AKYJw" type="7003">
+    <children xmi:type="notation:DecorationNode" xmi:id="_dks_dAlSEeacC7Ug7AKYJw" type="Transition_StereotypeLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_dks_dQlSEeacC7Ug7AKYJw" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_dksYYQlSEeacC7Ug7AKYJw"/>
@@ -451,14 +445,14 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dlfCkAlSEeacC7Ug7AKYJw" id="(0.31840796019900497,1.0)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dlfCkQlSEeacC7Ug7AKYJw" id="(0.48333333333333334,0.0)"/>
   </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_eYJOkAlSEeacC7Ug7AKYJw" type="7000" source="_TAc9kAlSEeacC7Ug7AKYJw" target="_4dYHgAlREeacC7Ug7AKYJw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_eYJ1oAlSEeacC7Ug7AKYJw" type="7001">
+  <edges xmi:type="notation:Connector" xmi:id="_eYJOkAlSEeacC7Ug7AKYJw" type="Transition_Edge" source="_TAc9kAlSEeacC7Ug7AKYJw" target="_4dYHgAlREeacC7Ug7AKYJw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_eYJ1oAlSEeacC7Ug7AKYJw" type="Transition_NameLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_eYJ1oQlSEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_eYJ1oglSEeacC7Ug7AKYJw" type="7002">
+    <children xmi:type="notation:DecorationNode" xmi:id="_eYJ1oglSEeacC7Ug7AKYJw" type="Transition_GuardLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_eYJ1owlSEeacC7Ug7AKYJw" x="-5" y="-15"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_eYJ1pAlSEeacC7Ug7AKYJw" type="7003">
+    <children xmi:type="notation:DecorationNode" xmi:id="_eYJ1pAlSEeacC7Ug7AKYJw" type="Transition_StereotypeLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_eYJ1pQlSEeacC7Ug7AKYJw" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_eYJOkQlSEeacC7Ug7AKYJw"/>
@@ -467,14 +461,14 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eY5cgAlSEeacC7Ug7AKYJw" id="(1.0,0.5)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eY5cgQlSEeacC7Ug7AKYJw" id="(0.0,0.22448979591836735)"/>
   </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_pap5wAlSEeacC7Ug7AKYJw" type="7000" source="_TAc9kAlSEeacC7Ug7AKYJw" target="_hgdqYAlSEeacC7Ug7AKYJw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_pap5wwlSEeacC7Ug7AKYJw" type="7001">
+  <edges xmi:type="notation:Connector" xmi:id="_pap5wAlSEeacC7Ug7AKYJw" type="Transition_Edge" source="_TAc9kAlSEeacC7Ug7AKYJw" target="_hgdqYAlSEeacC7Ug7AKYJw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_pap5wwlSEeacC7Ug7AKYJw" type="Transition_NameLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_pap5xAlSEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_pap5xQlSEeacC7Ug7AKYJw" type="7002">
+    <children xmi:type="notation:DecorationNode" xmi:id="_pap5xQlSEeacC7Ug7AKYJw" type="Transition_GuardLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_pap5xglSEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_pap5xwlSEeacC7Ug7AKYJw" type="7003">
+    <children xmi:type="notation:DecorationNode" xmi:id="_pap5xwlSEeacC7Ug7AKYJw" type="Transition_StereotypeLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_pap5yAlSEeacC7Ug7AKYJw" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_pap5wQlSEeacC7Ug7AKYJw"/>
@@ -483,14 +477,14 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ztde8AlVEeacC7Ug7AKYJw" id="(0.25,1.0)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pbkfwQlSEeacC7Ug7AKYJw" id="(0.8,0.0)"/>
   </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_t58vkAlSEeacC7Ug7AKYJw" type="7000" source="_ETXs0AlMEeacC7Ug7AKYJw" target="_4Y5e4AlLEeacC7Ug7AKYJw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_t58vkwlSEeacC7Ug7AKYJw" type="7001">
+  <edges xmi:type="notation:Connector" xmi:id="_t58vkAlSEeacC7Ug7AKYJw" type="Transition_Edge" source="_ETXs0AlMEeacC7Ug7AKYJw" target="_4Y5e4AlLEeacC7Ug7AKYJw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_t58vkwlSEeacC7Ug7AKYJw" type="Transition_NameLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_t58vlAlSEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_t58vlQlSEeacC7Ug7AKYJw" type="7002">
+    <children xmi:type="notation:DecorationNode" xmi:id="_t58vlQlSEeacC7Ug7AKYJw" type="Transition_GuardLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_t58vlglSEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_t58vlwlSEeacC7Ug7AKYJw" type="7003">
+    <children xmi:type="notation:DecorationNode" xmi:id="_t58vlwlSEeacC7Ug7AKYJw" type="Transition_StereotypeLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_t58vmAlSEeacC7Ug7AKYJw" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_t58vkQlSEeacC7Ug7AKYJw"/>
@@ -499,14 +493,14 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_t62ugAlSEeacC7Ug7AKYJw" id="(0.7379310344827587,0.0)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_t62ugQlSEeacC7Ug7AKYJw" id="(0.22916666666666666,1.0)"/>
   </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_CYP_wAlTEeacC7Ug7AKYJw" type="7000" source="_4Y5e4AlLEeacC7Ug7AKYJw" target="_8X65MAlLEeacC7Ug7AKYJw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_CYRN4AlTEeacC7Ug7AKYJw" type="7001">
+  <edges xmi:type="notation:Connector" xmi:id="_CYP_wAlTEeacC7Ug7AKYJw" type="Transition_Edge" source="_4Y5e4AlLEeacC7Ug7AKYJw" target="_8X65MAlLEeacC7Ug7AKYJw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_CYRN4AlTEeacC7Ug7AKYJw" type="Transition_NameLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_CYRN4QlTEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_CYRN4glTEeacC7Ug7AKYJw" type="7002">
+    <children xmi:type="notation:DecorationNode" xmi:id="_CYRN4glTEeacC7Ug7AKYJw" type="Transition_GuardLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_CYRN4wlTEeacC7Ug7AKYJw" x="-190" y="-47"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_CYRN5AlTEeacC7Ug7AKYJw" type="7003">
+    <children xmi:type="notation:DecorationNode" xmi:id="_CYRN5AlTEeacC7Ug7AKYJw" type="Transition_StereotypeLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_CYRN5QlTEeacC7Ug7AKYJw" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_CYP_wQlTEeacC7Ug7AKYJw"/>
@@ -515,14 +509,14 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CZLz4AlTEeacC7Ug7AKYJw" id="(0.796875,1.0)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CZLz4QlTEeacC7Ug7AKYJw" id="(0.0,0.14760147601476015)"/>
   </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_3VluIAlTEeacC7Ug7AKYJw" type="7000" source="_WziNYAnxEeacC7Ug7AKYJw" target="_ETXs0AlMEeacC7Ug7AKYJw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_3VluIwlTEeacC7Ug7AKYJw" type="7001">
+  <edges xmi:type="notation:Connector" xmi:id="_3VluIAlTEeacC7Ug7AKYJw" type="Transition_Edge" source="_WziNYAnxEeacC7Ug7AKYJw" target="_ETXs0AlMEeacC7Ug7AKYJw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_3VluIwlTEeacC7Ug7AKYJw" type="Transition_NameLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_3VluJAlTEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_3VluJQlTEeacC7Ug7AKYJw" type="7002">
+    <children xmi:type="notation:DecorationNode" xmi:id="_3VluJQlTEeacC7Ug7AKYJw" type="Transition_GuardLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_3VluJglTEeacC7Ug7AKYJw" x="22" y="-16"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_3VluJwlTEeacC7Ug7AKYJw" type="7003">
+    <children xmi:type="notation:DecorationNode" xmi:id="_3VluJwlTEeacC7Ug7AKYJw" type="Transition_StereotypeLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_3VluKAlTEeacC7Ug7AKYJw" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_3VluIQlTEeacC7Ug7AKYJw"/>
@@ -531,14 +525,14 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3Wd34AlTEeacC7Ug7AKYJw" id="(0.0,0.4)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3Wd34QlTEeacC7Ug7AKYJw" id="(0.46206896551724136,1.0)"/>
   </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_4cK7sAlTEeacC7Ug7AKYJw" type="7000" source="_WziNYAnxEeacC7Ug7AKYJw" target="_4Y5e4AlLEeacC7Ug7AKYJw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_4cK7swlTEeacC7Ug7AKYJw" type="7001">
+  <edges xmi:type="notation:Connector" xmi:id="_4cK7sAlTEeacC7Ug7AKYJw" type="Transition_Edge" source="_WziNYAnxEeacC7Ug7AKYJw" target="_4Y5e4AlLEeacC7Ug7AKYJw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_4cK7swlTEeacC7Ug7AKYJw" type="Transition_NameLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_4cK7tAlTEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_4cK7tQlTEeacC7Ug7AKYJw" type="7002">
+    <children xmi:type="notation:DecorationNode" xmi:id="_4cK7tQlTEeacC7Ug7AKYJw" type="Transition_GuardLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_4cK7tglTEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_4cK7twlTEeacC7Ug7AKYJw" type="7003">
+    <children xmi:type="notation:DecorationNode" xmi:id="_4cK7twlTEeacC7Ug7AKYJw" type="Transition_StereotypeLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_4cK7uAlTEeacC7Ug7AKYJw" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_4cK7sQlTEeacC7Ug7AKYJw"/>
@@ -547,14 +541,14 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hIvtsAnxEeacC7Ug7AKYJw" id="(0.55,0.0)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4c-M8QlTEeacC7Ug7AKYJw" id="(0.5,1.0)"/>
   </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_9BGfcAlTEeacC7Ug7AKYJw" type="7000" source="_4dYHgAlREeacC7Ug7AKYJw" target="_hgdqYAlSEeacC7Ug7AKYJw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_9BHGgAlTEeacC7Ug7AKYJw" type="7001">
+  <edges xmi:type="notation:Connector" xmi:id="_9BGfcAlTEeacC7Ug7AKYJw" type="Transition_Edge" source="_4dYHgAlREeacC7Ug7AKYJw" target="_hgdqYAlSEeacC7Ug7AKYJw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_9BHGgAlTEeacC7Ug7AKYJw" type="Transition_NameLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_9BHGgQlTEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_9BHGgglTEeacC7Ug7AKYJw" type="7002">
+    <children xmi:type="notation:DecorationNode" xmi:id="_9BHGgglTEeacC7Ug7AKYJw" type="Transition_GuardLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_9BHGgwlTEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_9BHGhAlTEeacC7Ug7AKYJw" type="7003">
+    <children xmi:type="notation:DecorationNode" xmi:id="_9BHGhAlTEeacC7Ug7AKYJw" type="Transition_StereotypeLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_9BHGhQlTEeacC7Ug7AKYJw" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_9BGfcQlTEeacC7Ug7AKYJw"/>
@@ -563,14 +557,14 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9CC6oAlTEeacC7Ug7AKYJw" id="(0.0,0.8163265306122449)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9CC6oQlTEeacC7Ug7AKYJw" id="(1.0,0.35)"/>
   </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_EzPmEAlUEeacC7Ug7AKYJw" type="7000" source="_Wk2G0AlREeacC7Ug7AKYJw" target="__JQewAlTEeacC7Ug7AKYJw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_EzPmEwlUEeacC7Ug7AKYJw" type="7001">
+  <edges xmi:type="notation:Connector" xmi:id="_EzPmEAlUEeacC7Ug7AKYJw" type="Transition_Edge" source="_Wk2G0AlREeacC7Ug7AKYJw" target="__JQewAlTEeacC7Ug7AKYJw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_EzPmEwlUEeacC7Ug7AKYJw" type="Transition_NameLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_EzPmFAlUEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_EzPmFQlUEeacC7Ug7AKYJw" type="7002">
+    <children xmi:type="notation:DecorationNode" xmi:id="_EzPmFQlUEeacC7Ug7AKYJw" type="Transition_GuardLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_EzPmFglUEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_EzPmFwlUEeacC7Ug7AKYJw" type="7003">
+    <children xmi:type="notation:DecorationNode" xmi:id="_EzPmFwlUEeacC7Ug7AKYJw" type="Transition_StereotypeLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_EzPmGAlUEeacC7Ug7AKYJw" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_EzPmEQlUEeacC7Ug7AKYJw"/>
@@ -579,14 +573,14 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_E0Q5wAlUEeacC7Ug7AKYJw" id="(0.0,0.5319148936170213)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_E0Q5wQlUEeacC7Ug7AKYJw" id="(1.0,0.45)"/>
   </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_HHPB8AlUEeacC7Ug7AKYJw" type="7000" source="__JQewAlTEeacC7Ug7AKYJw" target="_WziNYAnxEeacC7Ug7AKYJw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_HHPpAAlUEeacC7Ug7AKYJw" type="7001">
+  <edges xmi:type="notation:Connector" xmi:id="_HHPB8AlUEeacC7Ug7AKYJw" type="Transition_Edge" source="__JQewAlTEeacC7Ug7AKYJw" target="_WziNYAnxEeacC7Ug7AKYJw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_HHPpAAlUEeacC7Ug7AKYJw" type="Transition_NameLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_HHPpAQlUEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_HHPpAglUEeacC7Ug7AKYJw" type="7002">
+    <children xmi:type="notation:DecorationNode" xmi:id="_HHPpAglUEeacC7Ug7AKYJw" type="Transition_GuardLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_HHPpAwlUEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_HHPpBAlUEeacC7Ug7AKYJw" type="7003">
+    <children xmi:type="notation:DecorationNode" xmi:id="_HHPpBAlUEeacC7Ug7AKYJw" type="Transition_StereotypeLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_HHPpBQlUEeacC7Ug7AKYJw" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_HHPB8QlUEeacC7Ug7AKYJw"/>
@@ -595,14 +589,14 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HIGkoAlUEeacC7Ug7AKYJw" id="(0.0,0.5)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_b8H30AnxEeacC7Ug7AKYJw" id="(1.0,0.4)"/>
   </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_cPRLoAlUEeacC7Ug7AKYJw" type="7000" source="_TFymAAlREeacC7Ug7AKYJw" target="_X7WfYAlUEeacC7Ug7AKYJw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_cPRLowlUEeacC7Ug7AKYJw" type="7001">
+  <edges xmi:type="notation:Connector" xmi:id="_cPRLoAlUEeacC7Ug7AKYJw" type="Transition_Edge" source="_TFymAAlREeacC7Ug7AKYJw" target="_X7WfYAlUEeacC7Ug7AKYJw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_cPRLowlUEeacC7Ug7AKYJw" type="Transition_NameLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_cPRLpAlUEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_cPRysAlUEeacC7Ug7AKYJw" type="7002">
+    <children xmi:type="notation:DecorationNode" xmi:id="_cPRysAlUEeacC7Ug7AKYJw" type="Transition_GuardLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_cPRysQlUEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_cPRysglUEeacC7Ug7AKYJw" type="7003">
+    <children xmi:type="notation:DecorationNode" xmi:id="_cPRysglUEeacC7Ug7AKYJw" type="Transition_StereotypeLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_cPRyswlUEeacC7Ug7AKYJw" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_cPRLoQlUEeacC7Ug7AKYJw"/>
@@ -611,14 +605,14 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cQSfUAlUEeacC7Ug7AKYJw" id="(0.4339622641509434,1.0)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cQSfUQlUEeacC7Ug7AKYJw" id="(0.5,0.0)"/>
   </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_dT87wAlUEeacC7Ug7AKYJw" type="7000" source="_X7WfYAlUEeacC7Ug7AKYJw" target="_Wk2G0AlREeacC7Ug7AKYJw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_dT87wwlUEeacC7Ug7AKYJw" type="7001">
+  <edges xmi:type="notation:Connector" xmi:id="_dT87wAlUEeacC7Ug7AKYJw" type="Transition_Edge" source="_X7WfYAlUEeacC7Ug7AKYJw" target="_Wk2G0AlREeacC7Ug7AKYJw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_dT87wwlUEeacC7Ug7AKYJw" type="Transition_NameLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_dT87xAlUEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_dT87xQlUEeacC7Ug7AKYJw" type="7002">
+    <children xmi:type="notation:DecorationNode" xmi:id="_dT87xQlUEeacC7Ug7AKYJw" type="Transition_GuardLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_dT87xglUEeacC7Ug7AKYJw" x="4" y="46"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_dT87xwlUEeacC7Ug7AKYJw" type="7003">
+    <children xmi:type="notation:DecorationNode" xmi:id="_dT87xwlUEeacC7Ug7AKYJw" type="Transition_StereotypeLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_dT87yAlUEeacC7Ug7AKYJw" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_dT87wQlUEeacC7Ug7AKYJw"/>
@@ -627,14 +621,14 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dU6lEAlUEeacC7Ug7AKYJw" id="(0.0,0.4)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dU6lEQlUEeacC7Ug7AKYJw" id="(1.0,0.6170212765957447)"/>
   </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_eX99gAlUEeacC7Ug7AKYJw" type="7000" source="_X7WfYAlUEeacC7Ug7AKYJw" target="__JQewAlTEeacC7Ug7AKYJw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_eX99gwlUEeacC7Ug7AKYJw" type="7001">
+  <edges xmi:type="notation:Connector" xmi:id="_eX99gAlUEeacC7Ug7AKYJw" type="Transition_Edge" source="_X7WfYAlUEeacC7Ug7AKYJw" target="__JQewAlTEeacC7Ug7AKYJw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_eX99gwlUEeacC7Ug7AKYJw" type="Transition_NameLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_eX99hAlUEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_eX99hQlUEeacC7Ug7AKYJw" type="7002">
+    <children xmi:type="notation:DecorationNode" xmi:id="_eX99hQlUEeacC7Ug7AKYJw" type="Transition_GuardLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_eX99hglUEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_eX99hwlUEeacC7Ug7AKYJw" type="7003">
+    <children xmi:type="notation:DecorationNode" xmi:id="_eX99hwlUEeacC7Ug7AKYJw" type="Transition_StereotypeLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_eX99iAlUEeacC7Ug7AKYJw" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_eX99gQlUEeacC7Ug7AKYJw"/>
@@ -643,14 +637,14 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eZMFgAlUEeacC7Ug7AKYJw" id="(0.0,0.25)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eZMskAlUEeacC7Ug7AKYJw" id="(1.0,0.3)"/>
   </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_v2bqIAnxEeacC7Ug7AKYJw" type="7000" source="_hgdqYAlSEeacC7Ug7AKYJw" target="_WziNYAnxEeacC7Ug7AKYJw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_v2c4QAnxEeacC7Ug7AKYJw" type="7001">
+  <edges xmi:type="notation:Connector" xmi:id="_v2bqIAnxEeacC7Ug7AKYJw" type="Transition_Edge" source="_hgdqYAlSEeacC7Ug7AKYJw" target="_WziNYAnxEeacC7Ug7AKYJw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_v2c4QAnxEeacC7Ug7AKYJw" type="Transition_NameLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_v2c4QQnxEeacC7Ug7AKYJw"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_v2c4QgnxEeacC7Ug7AKYJw" type="7002">
+    <children xmi:type="notation:DecorationNode" xmi:id="_v2c4QgnxEeacC7Ug7AKYJw" type="Transition_GuardLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_v2c4QwnxEeacC7Ug7AKYJw" x="-6" y="-96"/>
     </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_v2c4RAnxEeacC7Ug7AKYJw" type="7003">
+    <children xmi:type="notation:DecorationNode" xmi:id="_v2c4RAnxEeacC7Ug7AKYJw" type="Transition_StereotypeLabel">
       <layoutConstraint xmi:type="notation:Location" xmi:id="_v2c4RQnxEeacC7Ug7AKYJw" y="60"/>
     </children>
     <styles xmi:type="notation:FontStyle" xmi:id="_v2bqIQnxEeacC7Ug7AKYJw"/>
diff --git a/spring-statemachine-samples/deploy/src/main/resources/model.uml b/spring-statemachine-samples/deploy/src/main/resources/model.uml
index b036c036..952b8790 100644
--- a/spring-statemachine-samples/deploy/src/main/resources/model.uml
+++ b/spring-statemachine-samples/deploy/src/main/resources/model.uml
@@ -22,9 +22,9 @@
       <transition xmi:type="uml:Transition" xmi:id="_HG8uEAlUEeacC7Ug7AKYJw" source="__I55cAlTEeacC7Ug7AKYJw" target="_WzKZ8AnxEeacC7Ug7AKYJw"/>
       <transition xmi:type="uml:Transition" xmi:id="_v2Fr4AnxEeacC7Ug7AKYJw" source="_hgKvcAlSEeacC7Ug7AKYJw" target="_WzKZ8AnxEeacC7Ug7AKYJw"/>
       <subvertex xmi:type="uml:State" xmi:id="_4Yz_UAlLEeacC7Ug7AKYJw" name="READY">
-        <entry xmi:type="uml:OpaqueBehavior" xmi:id="_3L51IAnsEeacC7Ug7AKYJw" name="readyEntryction">
+        <entry xmi:type="uml:OpaqueBehavior" xmi:id="_3L51IAnsEeacC7Ug7AKYJw" name="readyEntryAction">
           <language>bean</language>
-          <body>readyEntryction</body>
+          <body>readyEntryAction</body>
         </entry>
         <exit xmi:type="uml:OpaqueBehavior" xmi:id="_QBLhEAn3EeacC7Ug7AKYJw" name="exitErrorAction">
           <language>bean</language>
@@ -57,9 +57,9 @@
           </transition>
           <transition xmi:type="uml:Transition" xmi:id="_eXmxIAlUEeacC7Ug7AKYJw" source="_X6_6EAlUEeacC7Ug7AKYJw" target="__I55cAlTEeacC7Ug7AKYJw"/>
           <subvertex xmi:type="uml:State" xmi:id="_7JtAUAlQEeacC7Ug7AKYJw" name="PREPAREDEPLOY">
-            <entry xmi:type="uml:OpaqueBehavior" xmi:id="_N1qAwAlfEeacC7Ug7AKYJw" name="preparedeployEntryAction">
+            <entry xmi:type="uml:OpaqueBehavior" xmi:id="_N1qAwAlfEeacC7Ug7AKYJw" name="prepareDeployEntryAction">
               <language>bean</language>
-              <body>preparedeployEntryAction</body>
+              <body>prepareDeployEntryAction</body>
             </entry>
           </subvertex>
           <subvertex xmi:type="uml:State" xmi:id="_TFpcEAlREeacC7Ug7AKYJw" name="INSTALL">