diff --git a/service/app/src/main/kotlin/io/miragon/blueprint/adapter/process/BikeLeasingProcessProcessApi.kt b/service/app/src/main/kotlin/io/miragon/blueprint/adapter/process/BikeLeasingProcessProcessApi.kt
index 0e5d2eb..ebf8e7f 100644
--- a/service/app/src/main/kotlin/io/miragon/blueprint/adapter/process/BikeLeasingProcessProcessApi.kt
+++ b/service/app/src/main/kotlin/io/miragon/blueprint/adapter/process/BikeLeasingProcessProcessApi.kt
@@ -27,18 +27,6 @@ object BikeLeasingProcessProcessApi {
    * Worker runtime code rarely needs these.
    */
   object Elements {
-    val BOUNDARY_APPLICATION_INVALID: ElementId = ElementId("boundary_applicationInvalid")
-
-    val BOUNDARY_COMPENSATE_CONTRACT: ElementId = ElementId("boundary_compensateContract")
-
-    val BOUNDARY_COMPENSATE_INSURANCE: ElementId = ElementId("boundary_compensateInsurance")
-
-    val BOUNDARY_COMPENSATE_ORDER: ElementId = ElementId("boundary_compensateOrder")
-
-    val BOUNDARY_CONTRACT_NOT_SIGNED: ElementId = ElementId("boundary_contractNotSigned")
-
-    val BOUNDARY_SIGNATURE_REMINDER: ElementId = ElementId("boundary_signatureReminder")
-
     val BUSINESS_RULE_TASK_CHECK_CREDIT_RATING: ElementId =
         ElementId("businessRuleTask_checkCreditRating")
 
@@ -60,6 +48,16 @@ object BikeLeasingProcessProcessApi {
 
     val END_EVENT_PROSPECT_REMINDED: ElementId = ElementId("endEvent_prospectReminded")
 
+    val EVENT_APPLICATION_INVALID: ElementId = ElementId("event_applicationInvalid")
+
+    val EVENT_COMPENSATE_CONTRACT: ElementId = ElementId("event_compensateContract")
+
+    val EVENT_COMPENSATE_INSURANCE: ElementId = ElementId("event_compensateInsurance")
+
+    val EVENT_COMPENSATE_ORDER: ElementId = ElementId("event_compensateOrder")
+
+    val EVENT_CONTRACT_NOT_SIGNED: ElementId = ElementId("event_contractNotSigned")
+
     val EVENT_CONTRACT_SIGNED: ElementId = ElementId("event_contractSigned")
 
     val EVENT_HANDOVER_REPORTED: ElementId = ElementId("event_handoverReported")
@@ -68,6 +66,8 @@ object BikeLeasingProcessProcessApi {
 
     val EVENT_SIGNATURE_DEADLINE: ElementId = ElementId("event_signatureDeadline")
 
+    val EVENT_SIGNATURE_REMINDER: ElementId = ElementId("event_signatureReminder")
+
     val EVENT_TRIGGER_REVERSAL: ElementId = ElementId("event_triggerReversal")
 
     val EVENT_WITHDRAWAL_PERIOD_ELAPSED: ElementId =
@@ -87,6 +87,8 @@ object BikeLeasingProcessProcessApi {
 
     val GATEWAY_JOIN: ElementId = ElementId("gateway_join")
 
+    val GATEWAY_REJECTION_JOIN: ElementId = ElementId("gateway_rejectionJoin")
+
     val SERVICE_TASK_CANCEL_CONTRACT: ElementId = ElementId("serviceTask_cancelContract")
 
     val SERVICE_TASK_CANCEL_POLICY: ElementId = ElementId("serviceTask_cancelPolicy")
@@ -174,10 +176,10 @@ object BikeLeasingProcessProcessApi {
   }
 
   object Timers {
-    val BOUNDARY_SIGNATURE_REMINDER: BpmnTimer = BpmnTimer("Duration", "P7D")
-
     val EVENT_SIGNATURE_DEADLINE: BpmnTimer = BpmnTimer("Duration", "P14D")
 
+    val EVENT_SIGNATURE_REMINDER: BpmnTimer = BpmnTimer("Duration", "P7D")
+
     val EVENT_WITHDRAWAL_PERIOD_ELAPSED: BpmnTimer = BpmnTimer("Duration", "P14D")
   }
 
@@ -192,11 +194,11 @@ object BikeLeasingProcessProcessApi {
   }
 
   object Compensations {
-    val BOUNDARY_COMPENSATE_CONTRACT: ElementId = ElementId("boundary_compensateContract")
+    val EVENT_COMPENSATE_CONTRACT: ElementId = ElementId("event_compensateContract")
 
-    val BOUNDARY_COMPENSATE_INSURANCE: ElementId = ElementId("boundary_compensateInsurance")
+    val EVENT_COMPENSATE_INSURANCE: ElementId = ElementId("event_compensateInsurance")
 
-    val BOUNDARY_COMPENSATE_ORDER: ElementId = ElementId("boundary_compensateOrder")
+    val EVENT_COMPENSATE_ORDER: ElementId = ElementId("event_compensateOrder")
 
     val EVENT_REVERSE_APPLICATION: ElementId = ElementId("event_reverseApplication")
 
@@ -242,219 +244,225 @@ object BikeLeasingProcessProcessApi {
    * Worker code typically does not need these.
    */
   object Flows {
-    val E_01: BpmnFlow = BpmnFlow(
-          id = "E01",
-          sourceRef = "startEvent_applicationWithdrawn",
-          targetRef = "event_reverseApplication",
-        )
-
-    val E_02: BpmnFlow = BpmnFlow(
-          id = "E02",
-          sourceRef = "event_reverseApplication",
-          targetRef = "serviceTask_sendCancellationConfirmation",
-        )
-
-    val FLOW_00_BCTYK: BpmnFlow = BpmnFlow(
-          id = "Flow_00bctyk",
-          name = "No",
-          sourceRef = "gateway_isSolvent",
-          targetRef = "serviceTask_sendRejection",
-          condition = $$"""${!solvent}""",
-        )
-
-    val FLOW_054_Y_6_AF: BpmnFlow = BpmnFlow(
-          id = "Flow_054y6af",
-          sourceRef = "serviceTask_sendRejection",
-          targetRef = "endEvent_applicationRejected",
+    val FLOW_ALTERNATIVE_FOUND: BpmnFlow = BpmnFlow(
+          id = "flow_alternativeFound",
+          name = "Yes",
+          sourceRef = "gateway_alternativeFound",
+          targetRef = "gateway_bikeSourceJoin",
+          isDefault = true,
         )
 
-    val FLOW_08_AD_25_M: BpmnFlow = BpmnFlow(
-          id = "Flow_08ad25m",
-          sourceRef = "serviceTask_validateApplication",
-          targetRef = "businessRuleTask_checkCreditRating",
+    val FLOW_AWAIT_TO_DEADLINE: BpmnFlow = BpmnFlow(
+          id = "flow_awaitToDeadline",
+          sourceRef = "gateway_awaitSignature",
+          targetRef = "event_signatureDeadline",
         )
 
-    val FLOW_0_BGYQYX: BpmnFlow = BpmnFlow(
-          id = "Flow_0bgyqyx",
-          sourceRef = "serviceTask_orderBike",
-          targetRef = "gateway_bikeAvailable",
+    val FLOW_AWAIT_TO_SIGNED: BpmnFlow = BpmnFlow(
+          id = "flow_awaitToSigned",
+          sourceRef = "gateway_awaitSignature",
+          targetRef = "event_contractSigned",
         )
 
-    val FLOW_0_BMZE_33: BpmnFlow = BpmnFlow(
-          id = "Flow_0bmze33",
-          name = "No",
-          sourceRef = "gateway_alternativeFound",
-          targetRef = "event_triggerReversal",
-          condition = $$"""${!alternativeFound}""",
+    val FLOW_BIKE_AVAILABLE: BpmnFlow = BpmnFlow(
+          id = "flow_bikeAvailable",
+          name = "Yes",
+          sourceRef = "gateway_bikeAvailable",
+          targetRef = "gateway_join",
+          isDefault = true,
         )
 
-    val FLOW_0_CQ_39_PQ: BpmnFlow = BpmnFlow(
-          id = "Flow_0cq39pq",
-          sourceRef = "startEvent_leasingRequestReceived",
-          targetRef = "serviceTask_validateApplication",
+    val FLOW_BIKE_SOURCE_TO_ORDER: BpmnFlow = BpmnFlow(
+          id = "flow_bikeSourceToOrder",
+          sourceRef = "gateway_bikeSourceJoin",
+          targetRef = "serviceTask_orderBike",
         )
 
-    val FLOW_0_DBZ_33_I: BpmnFlow = BpmnFlow(
-          id = "Flow_0dbz33i",
+    val FLOW_BIKE_UNAVAILABLE: BpmnFlow = BpmnFlow(
+          id = "flow_bikeUnavailable",
           name = "No",
           sourceRef = "gateway_bikeAvailable",
           targetRef = "userTask_clarifyAlternative",
           condition = $$"""${!bikeAvailable}""",
         )
 
-    val FLOW_0_DJ_8_BXX: BpmnFlow = BpmnFlow(
-          id = "Flow_0dj8bxx",
-          sourceRef = "gateway_isSolvent",
-          targetRef = "subProcess_concludeContract",
-          isDefault = true,
+    val FLOW_CLARIFY_TO_ALTERNATIVE_GATEWAY: BpmnFlow = BpmnFlow(
+          id = "flow_clarifyToAlternativeGateway",
+          sourceRef = "userTask_clarifyAlternative",
+          targetRef = "gateway_alternativeFound",
         )
 
-    val FLOW_0_ETE_2_IJ: BpmnFlow = BpmnFlow(
-          id = "Flow_0ete2ij",
-          sourceRef = "gateway_awaitSignature",
-          targetRef = "event_contractSigned",
+    val FLOW_CONFIRMATION_TO_CANCELLED: BpmnFlow = BpmnFlow(
+          id = "flow_confirmationToCancelled",
+          sourceRef = "serviceTask_sendCancellationConfirmation",
+          targetRef = "endEvent_applicationCancelled",
         )
 
-    val FLOW_0_FF_6219: BpmnFlow = BpmnFlow(
-          id = "Flow_0ff6219",
+    val FLOW_CONTRACT_CONCLUDED_TO_FORK: BpmnFlow = BpmnFlow(
+          id = "flow_contractConcludedToFork",
+          sourceRef = "subProcess_concludeContract",
+          targetRef = "gateway_fork",
+        )
+
+    val FLOW_CONTRACT_SENT_TO_AWAIT: BpmnFlow = BpmnFlow(
+          id = "flow_contractSentToAwait",
           sourceRef = "serviceTask_sendContract",
           targetRef = "gateway_awaitSignature",
         )
 
-    val FLOW_0_M_29_PJ_0: BpmnFlow = BpmnFlow(
-          id = "Flow_0m29pj0",
-          sourceRef = "event_contractSigned",
-          targetRef = "endEvent_contractValid",
+    val FLOW_CREDIT_CHECK_TO_SOLVENCY: BpmnFlow = BpmnFlow(
+          id = "flow_creditCheckToSolvency",
+          sourceRef = "businessRuleTask_checkCreditRating",
+          targetRef = "gateway_isSolvent",
         )
 
-    val FLOW_0_MSL_1_D_4: BpmnFlow = BpmnFlow(
-          id = "Flow_0msl1d4",
-          sourceRef = "event_handoverReported",
-          targetRef = "event_withdrawalPeriodElapsed",
+    val FLOW_DEADLINE_TO_NOT_SIGNED: BpmnFlow = BpmnFlow(
+          id = "flow_deadlineToNotSigned",
+          sourceRef = "event_signatureDeadline",
+          targetRef = "endEvent_notSigned",
         )
 
-    val FLOW_0_NCGJTI: BpmnFlow = BpmnFlow(
-          id = "Flow_0ncgjti",
-          sourceRef = "gateway_fork",
-          targetRef = "gateway_bikeSourceJoin",
+    val FLOW_ELIGIBLE_TO_SEND_CONTRACT: BpmnFlow = BpmnFlow(
+          id = "flow_eligibleToSendContract",
+          sourceRef = "startEvent_customerEligible",
+          targetRef = "serviceTask_sendContract",
         )
 
-    val FLOW_0_P_7_DDAM: BpmnFlow = BpmnFlow(
-          id = "Flow_0p7ddam",
-          sourceRef = "boundary_contractNotSigned",
-          targetRef = "serviceTask_sendRejection",
+    val FLOW_FORK_TO_BIKE_SOURCE: BpmnFlow = BpmnFlow(
+          id = "flow_forkToBikeSource",
+          sourceRef = "gateway_fork",
+          targetRef = "gateway_bikeSourceJoin",
         )
 
-    val FLOW_0_SM_2_H_51: BpmnFlow = BpmnFlow(
-          id = "Flow_0sm2h51",
+    val FLOW_FORK_TO_INSURANCE: BpmnFlow = BpmnFlow(
+          id = "flow_forkToInsurance",
           sourceRef = "gateway_fork",
           targetRef = "serviceTask_issueInsurancePolicy",
         )
 
-    val FLOW_0_TJIT_66: BpmnFlow = BpmnFlow(
-          id = "Flow_0tjit66",
-          sourceRef = "gateway_join",
-          targetRef = "event_handoverReported",
+    val FLOW_HANDOVER_TO_WITHDRAWAL_PERIOD: BpmnFlow = BpmnFlow(
+          id = "flow_handoverToWithdrawalPeriod",
+          sourceRef = "event_handoverReported",
+          targetRef = "event_withdrawalPeriodElapsed",
         )
 
-    val FLOW_0_Z_1_VQEV: BpmnFlow = BpmnFlow(
-          id = "Flow_0z1vqev",
-          sourceRef = "serviceTask_sendCancellationConfirmation",
-          targetRef = "endEvent_applicationCancelled",
+    val FLOW_INSURANCE_TO_JOIN: BpmnFlow = BpmnFlow(
+          id = "flow_insuranceToJoin",
+          sourceRef = "serviceTask_issueInsurancePolicy",
+          targetRef = "gateway_join",
         )
 
-    val FLOW_0_ZI_701_M: BpmnFlow = BpmnFlow(
-          id = "Flow_0zi701m",
-          sourceRef = "event_triggerReversal",
-          targetRef = "endEvent_contractCancelled",
+    val FLOW_INVALID_TO_REJECTION: BpmnFlow = BpmnFlow(
+          id = "flow_invalidToRejection",
+          sourceRef = "event_applicationInvalid",
+          targetRef = "gateway_rejectionJoin",
         )
 
-    val FLOW_10_DSFGR: BpmnFlow = BpmnFlow(
-          id = "Flow_10dsfgr",
-          sourceRef = "businessRuleTask_checkCreditRating",
-          targetRef = "gateway_isSolvent",
+    val FLOW_JOIN_TO_HANDOVER: BpmnFlow = BpmnFlow(
+          id = "flow_joinToHandover",
+          sourceRef = "gateway_join",
+          targetRef = "event_handoverReported",
         )
 
-    val FLOW_13_LI_8_F_0: BpmnFlow = BpmnFlow(
-          id = "Flow_13li8f0",
-          sourceRef = "serviceTask_issueInsurancePolicy",
-          targetRef = "gateway_join",
+    val FLOW_MAIL_TO_PROSPECT_REMINDED: BpmnFlow = BpmnFlow(
+          id = "flow_mailToProspectReminded",
+          sourceRef = "serviceTask_sendReminderMail",
+          targetRef = "endEvent_prospectReminded",
         )
 
-    val FLOW_162_BKDK: BpmnFlow = BpmnFlow(
-          id = "Flow_162bkdk",
-          name = "Yes",
+    val FLOW_NO_ALTERNATIVE_FOUND: BpmnFlow = BpmnFlow(
+          id = "flow_noAlternativeFound",
+          name = "No",
           sourceRef = "gateway_alternativeFound",
-          targetRef = "gateway_bikeSourceJoin",
-          isDefault = true,
+          targetRef = "event_triggerReversal",
+          condition = $$"""${!alternativeFound}""",
         )
 
-    val FLOW_17_ZD_4_N_8: BpmnFlow = BpmnFlow(
-          id = "Flow_17zd4n8",
-          sourceRef = "subProcess_concludeContract",
-          targetRef = "gateway_fork",
+    val FLOW_NOT_SIGNED_TO_REJECTION: BpmnFlow = BpmnFlow(
+          id = "flow_notSignedToRejection",
+          sourceRef = "event_contractNotSigned",
+          targetRef = "gateway_rejectionJoin",
         )
 
-    val FLOW_1_CZYHQN: BpmnFlow = BpmnFlow(
-          id = "Flow_1czyhqn",
-          sourceRef = "event_withdrawalPeriodElapsed",
-          targetRef = "endEvent_leasingActive",
+    val FLOW_NOT_SOLVENT: BpmnFlow = BpmnFlow(
+          id = "flow_notSolvent",
+          name = "No",
+          sourceRef = "gateway_isSolvent",
+          targetRef = "gateway_rejectionJoin",
+          condition = $$"""${!solvent}""",
+        )
+
+    val FLOW_ORDERED_TO_BIKE_AVAILABLE: BpmnFlow = BpmnFlow(
+          id = "flow_orderedToBikeAvailable",
+          sourceRef = "serviceTask_orderBike",
+          targetRef = "gateway_bikeAvailable",
         )
 
-    val FLOW_1_G_1_DICT: BpmnFlow = BpmnFlow(
-          id = "Flow_1g1dict",
-          sourceRef = "boundary_applicationInvalid",
+    val FLOW_REJECTION_JOINED: BpmnFlow = BpmnFlow(
+          id = "flow_rejectionJoined",
+          sourceRef = "gateway_rejectionJoin",
           targetRef = "serviceTask_sendRejection",
         )
 
-    val FLOW_1_IT_2_FBS: BpmnFlow = BpmnFlow(
-          id = "Flow_1it2fbs",
-          sourceRef = "event_signatureDeadline",
-          targetRef = "endEvent_notSigned",
+    val FLOW_REJECTION_SENT: BpmnFlow = BpmnFlow(
+          id = "flow_rejectionSent",
+          sourceRef = "serviceTask_sendRejection",
+          targetRef = "endEvent_applicationRejected",
         )
 
-    val FLOW_1_JRA_6_G_7: BpmnFlow = BpmnFlow(
-          id = "Flow_1jra6g7",
-          sourceRef = "startEvent_customerEligible",
-          targetRef = "serviceTask_sendContract",
+    val FLOW_REMINDER_TO_MAIL: BpmnFlow = BpmnFlow(
+          id = "flow_reminderToMail",
+          sourceRef = "event_signatureReminder",
+          targetRef = "serviceTask_sendReminderMail",
         )
 
-    val FLOW_1_OUDVDG: BpmnFlow = BpmnFlow(
-          id = "Flow_1oudvdg",
-          sourceRef = "gateway_bikeSourceJoin",
-          targetRef = "serviceTask_orderBike",
+    val FLOW_REQUEST_TO_VALIDATION: BpmnFlow = BpmnFlow(
+          id = "flow_requestToValidation",
+          sourceRef = "startEvent_leasingRequestReceived",
+          targetRef = "serviceTask_validateApplication",
         )
 
-    val FLOW_1_Q_8_AWSJ: BpmnFlow = BpmnFlow(
-          id = "Flow_1q8awsj",
-          sourceRef = "userTask_clarifyAlternative",
-          targetRef = "gateway_alternativeFound",
+    val FLOW_REVERSAL_TO_CONFIRMATION: BpmnFlow = BpmnFlow(
+          id = "flow_reversalToConfirmation",
+          sourceRef = "event_reverseApplication",
+          targetRef = "serviceTask_sendCancellationConfirmation",
         )
 
-    val FLOW_1_QM_0_PCR: BpmnFlow = BpmnFlow(
-          id = "Flow_1qm0pcr",
-          name = "Yes",
-          sourceRef = "gateway_bikeAvailable",
-          targetRef = "gateway_join",
+    val FLOW_REVERSAL_TO_CONTRACT_CANCELLED: BpmnFlow = BpmnFlow(
+          id = "flow_reversalToContractCancelled",
+          sourceRef = "event_triggerReversal",
+          targetRef = "endEvent_contractCancelled",
+        )
+
+    val FLOW_SIGNED_TO_CONTRACT_VALID: BpmnFlow = BpmnFlow(
+          id = "flow_signedToContractValid",
+          sourceRef = "event_contractSigned",
+          targetRef = "endEvent_contractValid",
+        )
+
+    val FLOW_SOLVENT: BpmnFlow = BpmnFlow(
+          id = "flow_solvent",
+          sourceRef = "gateway_isSolvent",
+          targetRef = "subProcess_concludeContract",
           isDefault = true,
         )
 
-    val FLOW_1_UEKRWV: BpmnFlow = BpmnFlow(
-          id = "Flow_1uekrwv",
-          sourceRef = "gateway_awaitSignature",
-          targetRef = "event_signatureDeadline",
+    val FLOW_VALIDATED_TO_CREDIT_CHECK: BpmnFlow = BpmnFlow(
+          id = "flow_validatedToCreditCheck",
+          sourceRef = "serviceTask_validateApplication",
+          targetRef = "businessRuleTask_checkCreditRating",
         )
 
-    val FLOW_REMINDER_1: BpmnFlow = BpmnFlow(
-          id = "Flow_reminder1",
-          sourceRef = "boundary_signatureReminder",
-          targetRef = "serviceTask_sendReminderMail",
+    val FLOW_WITHDRAWAL_ELAPSED_TO_ACTIVE: BpmnFlow = BpmnFlow(
+          id = "flow_withdrawalElapsedToActive",
+          sourceRef = "event_withdrawalPeriodElapsed",
+          targetRef = "endEvent_leasingActive",
         )
 
-    val FLOW_REMINDER_2: BpmnFlow = BpmnFlow(
-          id = "Flow_reminder2",
-          sourceRef = "serviceTask_sendReminderMail",
-          targetRef = "endEvent_prospectReminded",
+    val FLOW_WITHDRAWAL_TO_REVERSAL: BpmnFlow = BpmnFlow(
+          id = "flow_withdrawalToReversal",
+          sourceRef = "startEvent_applicationWithdrawn",
+          targetRef = "event_reverseApplication",
         )
   }
 
@@ -463,60 +471,6 @@ object BikeLeasingProcessProcessApi {
    * Intended for tooling and tests, not worker runtime code.
    */
   object Relations {
-    val BOUNDARY_APPLICATION_INVALID: BpmnRelations = BpmnRelations(
-          name = "Application invalid",
-          previousElements = emptyList(),
-          followingElements = listOf("serviceTask_sendRejection"),
-          parentId = null,
-          attachedToRef = "serviceTask_validateApplication",
-          attachedElements = emptyList(),
-        )
-
-    val BOUNDARY_COMPENSATE_CONTRACT: BpmnRelations = BpmnRelations(
-          name = "Compensate contract",
-          previousElements = emptyList(),
-          followingElements = emptyList(),
-          parentId = null,
-          attachedToRef = "subProcess_concludeContract",
-          attachedElements = emptyList(),
-        )
-
-    val BOUNDARY_COMPENSATE_INSURANCE: BpmnRelations = BpmnRelations(
-          name = "Compensate policy",
-          previousElements = emptyList(),
-          followingElements = emptyList(),
-          parentId = null,
-          attachedToRef = "serviceTask_issueInsurancePolicy",
-          attachedElements = emptyList(),
-        )
-
-    val BOUNDARY_COMPENSATE_ORDER: BpmnRelations = BpmnRelations(
-          name = "Compensate order",
-          previousElements = emptyList(),
-          followingElements = emptyList(),
-          parentId = null,
-          attachedToRef = "serviceTask_orderBike",
-          attachedElements = emptyList(),
-        )
-
-    val BOUNDARY_CONTRACT_NOT_SIGNED: BpmnRelations = BpmnRelations(
-          name = "Contract not signed",
-          previousElements = emptyList(),
-          followingElements = listOf("serviceTask_sendRejection"),
-          parentId = null,
-          attachedToRef = "subProcess_concludeContract",
-          attachedElements = emptyList(),
-        )
-
-    val BOUNDARY_SIGNATURE_REMINDER: BpmnRelations = BpmnRelations(
-          name = "7 days",
-          previousElements = emptyList(),
-          followingElements = listOf("serviceTask_sendReminderMail"),
-          parentId = null,
-          attachedToRef = "subProcess_concludeContract",
-          attachedElements = emptyList(),
-        )
-
     val BUSINESS_RULE_TASK_CHECK_CREDIT_RATING: BpmnRelations = BpmnRelations(
           name = "Check credit rating",
           previousElements = listOf("serviceTask_validateApplication"),
@@ -598,6 +552,51 @@ object BikeLeasingProcessProcessApi {
           attachedElements = emptyList(),
         )
 
+    val EVENT_APPLICATION_INVALID: BpmnRelations = BpmnRelations(
+          name = "Application invalid",
+          previousElements = emptyList(),
+          followingElements = listOf("gateway_rejectionJoin"),
+          parentId = null,
+          attachedToRef = "serviceTask_validateApplication",
+          attachedElements = emptyList(),
+        )
+
+    val EVENT_COMPENSATE_CONTRACT: BpmnRelations = BpmnRelations(
+          name = "Compensate contract",
+          previousElements = emptyList(),
+          followingElements = emptyList(),
+          parentId = null,
+          attachedToRef = "subProcess_concludeContract",
+          attachedElements = emptyList(),
+        )
+
+    val EVENT_COMPENSATE_INSURANCE: BpmnRelations = BpmnRelations(
+          name = "Compensate policy",
+          previousElements = emptyList(),
+          followingElements = emptyList(),
+          parentId = null,
+          attachedToRef = "serviceTask_issueInsurancePolicy",
+          attachedElements = emptyList(),
+        )
+
+    val EVENT_COMPENSATE_ORDER: BpmnRelations = BpmnRelations(
+          name = "Compensate order",
+          previousElements = emptyList(),
+          followingElements = emptyList(),
+          parentId = null,
+          attachedToRef = "serviceTask_orderBike",
+          attachedElements = emptyList(),
+        )
+
+    val EVENT_CONTRACT_NOT_SIGNED: BpmnRelations = BpmnRelations(
+          name = "Contract not signed",
+          previousElements = emptyList(),
+          followingElements = listOf("gateway_rejectionJoin"),
+          parentId = null,
+          attachedToRef = "subProcess_concludeContract",
+          attachedElements = emptyList(),
+        )
+
     val EVENT_CONTRACT_SIGNED: BpmnRelations = BpmnRelations(
           name = "Contract signed",
           previousElements = listOf("gateway_awaitSignature"),
@@ -634,6 +633,15 @@ object BikeLeasingProcessProcessApi {
           attachedElements = emptyList(),
         )
 
+    val EVENT_SIGNATURE_REMINDER: BpmnRelations = BpmnRelations(
+          name = "7 days",
+          previousElements = emptyList(),
+          followingElements = listOf("serviceTask_sendReminderMail"),
+          parentId = null,
+          attachedToRef = "subProcess_concludeContract",
+          attachedElements = emptyList(),
+        )
+
     val EVENT_TRIGGER_REVERSAL: BpmnRelations = BpmnRelations(
           name = "Trigger reversal",
           previousElements = listOf("gateway_alternativeFound"),
@@ -697,7 +705,7 @@ object BikeLeasingProcessProcessApi {
     val GATEWAY_IS_SOLVENT: BpmnRelations = BpmnRelations(
           name = "Solvent?",
           previousElements = listOf("businessRuleTask_checkCreditRating"),
-          followingElements = listOf("subProcess_concludeContract", "serviceTask_sendRejection"),
+          followingElements = listOf("subProcess_concludeContract", "gateway_rejectionJoin"),
           parentId = null,
           attachedToRef = null,
           attachedElements = emptyList(),
@@ -711,6 +719,15 @@ object BikeLeasingProcessProcessApi {
           attachedElements = emptyList(),
         )
 
+    val GATEWAY_REJECTION_JOIN: BpmnRelations = BpmnRelations(
+          name = "Rejection reason",
+          previousElements = listOf("event_applicationInvalid", "gateway_isSolvent", "event_contractNotSigned"),
+          followingElements = listOf("serviceTask_sendRejection"),
+          parentId = null,
+          attachedToRef = null,
+          attachedElements = emptyList(),
+        )
+
     val SERVICE_TASK_CANCEL_CONTRACT: BpmnRelations = BpmnRelations(
           name = "Cancel contract",
           previousElements = emptyList(),
@@ -735,7 +752,7 @@ object BikeLeasingProcessProcessApi {
           followingElements = listOf("gateway_join"),
           parentId = null,
           attachedToRef = null,
-          attachedElements = listOf("boundary_compensateInsurance"),
+          attachedElements = listOf("event_compensateInsurance"),
         )
 
     val SERVICE_TASK_ORDER_BIKE: BpmnRelations = BpmnRelations(
@@ -744,7 +761,7 @@ object BikeLeasingProcessProcessApi {
           followingElements = listOf("gateway_bikeAvailable"),
           parentId = null,
           attachedToRef = null,
-          attachedElements = listOf("boundary_compensateOrder"),
+          attachedElements = listOf("event_compensateOrder"),
         )
 
     val SERVICE_TASK_SEND_CANCELLATION_CONFIRMATION: BpmnRelations = BpmnRelations(
@@ -767,7 +784,7 @@ object BikeLeasingProcessProcessApi {
 
     val SERVICE_TASK_SEND_REJECTION: BpmnRelations = BpmnRelations(
           name = "Send rejection",
-          previousElements = listOf("boundary_applicationInvalid", "gateway_isSolvent", "boundary_contractNotSigned"),
+          previousElements = listOf("gateway_rejectionJoin"),
           followingElements = listOf("endEvent_applicationRejected"),
           parentId = null,
           attachedToRef = null,
@@ -776,7 +793,7 @@ object BikeLeasingProcessProcessApi {
 
     val SERVICE_TASK_SEND_REMINDER_MAIL: BpmnRelations = BpmnRelations(
           name = "Send reminder mail",
-          previousElements = listOf("boundary_signatureReminder"),
+          previousElements = listOf("event_signatureReminder"),
           followingElements = listOf("endEvent_prospectReminded"),
           parentId = null,
           attachedToRef = null,
@@ -789,7 +806,7 @@ object BikeLeasingProcessProcessApi {
           followingElements = listOf("businessRuleTask_checkCreditRating"),
           parentId = null,
           attachedToRef = null,
-          attachedElements = listOf("boundary_applicationInvalid"),
+          attachedElements = listOf("event_applicationInvalid"),
         )
 
     val START_EVENT_APPLICATION_WITHDRAWN: BpmnRelations = BpmnRelations(
@@ -834,7 +851,7 @@ object BikeLeasingProcessProcessApi {
           followingElements = listOf("gateway_fork"),
           parentId = null,
           attachedToRef = null,
-          attachedElements = listOf("boundary_compensateContract", "boundary_contractNotSigned", "boundary_signatureReminder"),
+          attachedElements = listOf("event_compensateContract", "event_contractNotSigned", "event_signatureReminder"),
         )
 
     val USER_TASK_CLARIFY_ALTERNATIVE: BpmnRelations = BpmnRelations(
diff --git a/service/app/src/main/kotlin/io/miragon/blueprint/adapter/process/CancelBikeOrderProcessApi.kt b/service/app/src/main/kotlin/io/miragon/blueprint/adapter/process/CancelBikeOrderProcessApi.kt
index d2b5891..ac9b9b5 100644
--- a/service/app/src/main/kotlin/io/miragon/blueprint/adapter/process/CancelBikeOrderProcessApi.kt
+++ b/service/app/src/main/kotlin/io/miragon/blueprint/adapter/process/CancelBikeOrderProcessApi.kt
@@ -74,50 +74,50 @@ object CancelBikeOrderProcessApi {
    * Worker code typically does not need these.
    */
   object Flows {
-    val FLOW_0510_WB_5: BpmnFlow = BpmnFlow(
-          id = "Flow_0510wb5",
-          sourceRef = "startEvent_cancellationRequired",
-          targetRef = "serviceTask_requestCancellation",
-        )
-
-    val FLOW_0_GKP_33_W: BpmnFlow = BpmnFlow(
-          id = "Flow_0gkp33w",
-          sourceRef = "userTask_clarifyReturn",
-          targetRef = "serviceTask_bookCosts",
-        )
-
-    val FLOW_0_TC_4_YFK: BpmnFlow = BpmnFlow(
-          id = "Flow_0tc4yfk",
-          sourceRef = "serviceTask_requestCancellation",
-          targetRef = "gateway_cancellationPossible",
-        )
-
-    val FLOW_0_W_76_X_5_F: BpmnFlow = BpmnFlow(
-          id = "Flow_0w76x5f",
-          sourceRef = "gateway_join",
-          targetRef = "endEvent_orderReversed",
+    val FLOW_BOOK_COSTS_TO_JOIN: BpmnFlow = BpmnFlow(
+          id = "flow_bookCostsToJoin",
+          sourceRef = "serviceTask_bookCosts",
+          targetRef = "gateway_join",
         )
 
-    val FLOW_1_A_0_G_4_V_1: BpmnFlow = BpmnFlow(
-          id = "Flow_1a0g4v1",
+    val FLOW_CANCELLATION_NOT_POSSIBLE: BpmnFlow = BpmnFlow(
+          id = "flow_cancellationNotPossible",
           name = "No",
           sourceRef = "gateway_cancellationPossible",
           targetRef = "userTask_clarifyReturn",
           condition = $$"""${cancellationPossible}""",
         )
 
-    val FLOW_1_E_8_KS_1_K: BpmnFlow = BpmnFlow(
-          id = "Flow_1e8ks1k",
+    val FLOW_CANCELLATION_POSSIBLE: BpmnFlow = BpmnFlow(
+          id = "flow_cancellationPossible",
           name = "Yes",
           sourceRef = "gateway_cancellationPossible",
           targetRef = "gateway_join",
           isDefault = true,
         )
 
-    val FLOW_1_V_5_TEJ_2: BpmnFlow = BpmnFlow(
-          id = "Flow_1v5tej2",
-          sourceRef = "serviceTask_bookCosts",
-          targetRef = "gateway_join",
+    val FLOW_CLARIFY_TO_BOOK_COSTS: BpmnFlow = BpmnFlow(
+          id = "flow_clarifyToBookCosts",
+          sourceRef = "userTask_clarifyReturn",
+          targetRef = "serviceTask_bookCosts",
+        )
+
+    val FLOW_JOIN_TO_REVERSED: BpmnFlow = BpmnFlow(
+          id = "flow_joinToReversed",
+          sourceRef = "gateway_join",
+          targetRef = "endEvent_orderReversed",
+        )
+
+    val FLOW_REQUEST_TO_POSSIBLE_GATEWAY: BpmnFlow = BpmnFlow(
+          id = "flow_requestToPossibleGateway",
+          sourceRef = "serviceTask_requestCancellation",
+          targetRef = "gateway_cancellationPossible",
+        )
+
+    val FLOW_REQUIRED_TO_REQUEST: BpmnFlow = BpmnFlow(
+          id = "flow_requiredToRequest",
+          sourceRef = "startEvent_cancellationRequired",
+          targetRef = "serviceTask_requestCancellation",
         )
   }
 
diff --git a/service/app/src/main/resources/bpmn/bike-leasing.bpmn b/service/app/src/main/resources/bpmn/bike-leasing.bpmn
index 258a053..6124d59 100644
--- a/service/app/src/main/resources/bpmn/bike-leasing.bpmn
+++ b/service/app/src/main/resources/bpmn/bike-leasing.bpmn
@@ -16,7 +16,7 @@
           <camunda:property name="additionalInputVariables" value="applicationId, bikeId, monthlyNetIncome, age" />
         </camunda:properties>
       </bpmn:extensionElements>
-      <bpmn:outgoing>Flow_0cq39pq</bpmn:outgoing>
+      <bpmn:outgoing>flow_requestToValidation</bpmn:outgoing>
       <bpmn:messageEventDefinition id="MessageEventDefinition_0233gqq" messageRef="Message_LeasingRequestReceived" />
     </bpmn:startEvent>
     <bpmn:serviceTask id="serviceTask_orderBike" name="Order bike from dealer" camunda:asyncAfter="true" camunda:delegateExpression="#{orderBikeDelegate}">
@@ -28,98 +28,102 @@
         </camunda:properties>
         <camunda:executionListener event="end" delegateExpression="#{bikeOrderAuditListener}" />
       </bpmn:extensionElements>
-      <bpmn:incoming>Flow_1oudvdg</bpmn:incoming>
-      <bpmn:outgoing>Flow_0bgyqyx</bpmn:outgoing>
+      <bpmn:incoming>flow_bikeSourceToOrder</bpmn:incoming>
+      <bpmn:outgoing>flow_orderedToBikeAvailable</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:serviceTask id="serviceTask_cancelPolicy" name="Cancel policy" isForCompensation="true" camunda:asyncAfter="true" camunda:delegateExpression="#{cancelPolicyDelegate}" />
     <bpmn:endEvent id="endEvent_applicationRejected" name="Application rejected">
-      <bpmn:incoming>Flow_054y6af</bpmn:incoming>
+      <bpmn:incoming>flow_rejectionSent</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:intermediateCatchEvent id="event_handoverReported" name="Handover reported" camunda:asyncAfter="true">
-      <bpmn:incoming>Flow_0tjit66</bpmn:incoming>
-      <bpmn:outgoing>Flow_0msl1d4</bpmn:outgoing>
+      <bpmn:incoming>flow_joinToHandover</bpmn:incoming>
+      <bpmn:outgoing>flow_handoverToWithdrawalPeriod</bpmn:outgoing>
       <bpmn:messageEventDefinition id="MessageEventDefinition_1m0s1ya" messageRef="Message_HandoverReported" />
     </bpmn:intermediateCatchEvent>
     <bpmn:endEvent id="endEvent_leasingActive" name="Leasing active">
-      <bpmn:incoming>Flow_1czyhqn</bpmn:incoming>
+      <bpmn:incoming>flow_withdrawalElapsedToActive</bpmn:incoming>
       <bpmn:messageEventDefinition id="MessageEventDefinition_activateLeasingDelegate" messageRef="Message_LeasingActivated" camunda:delegateExpression="#{activateLeasingDelegate}" />
     </bpmn:endEvent>
+    <bpmn:exclusiveGateway id="gateway_rejectionJoin" name="Rejection reason">
+      <bpmn:incoming>flow_invalidToRejection</bpmn:incoming>
+      <bpmn:incoming>flow_notSolvent</bpmn:incoming>
+      <bpmn:incoming>flow_notSignedToRejection</bpmn:incoming>
+      <bpmn:outgoing>flow_rejectionJoined</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
     <bpmn:serviceTask id="serviceTask_sendRejection" name="Send rejection" camunda:asyncAfter="true" camunda:delegateExpression="#{sendRejectionDelegate}">
-      <bpmn:incoming>Flow_1g1dict</bpmn:incoming>
-      <bpmn:incoming>Flow_00bctyk</bpmn:incoming>
-      <bpmn:incoming>Flow_0p7ddam</bpmn:incoming>
-      <bpmn:outgoing>Flow_054y6af</bpmn:outgoing>
+      <bpmn:incoming>flow_rejectionJoined</bpmn:incoming>
+      <bpmn:outgoing>flow_rejectionSent</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:serviceTask id="serviceTask_validateApplication" name="Validate application" camunda:asyncAfter="true" camunda:delegateExpression="#{validateApplicationDelegate}">
-      <bpmn:incoming>Flow_0cq39pq</bpmn:incoming>
-      <bpmn:outgoing>Flow_08ad25m</bpmn:outgoing>
+      <bpmn:incoming>flow_requestToValidation</bpmn:incoming>
+      <bpmn:outgoing>flow_validatedToCreditCheck</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:exclusiveGateway id="gateway_isSolvent" name="Solvent?" default="Flow_0dj8bxx">
-      <bpmn:incoming>Flow_10dsfgr</bpmn:incoming>
-      <bpmn:outgoing>Flow_0dj8bxx</bpmn:outgoing>
-      <bpmn:outgoing>Flow_00bctyk</bpmn:outgoing>
+    <bpmn:exclusiveGateway id="gateway_isSolvent" name="Solvent?" default="flow_solvent">
+      <bpmn:incoming>flow_creditCheckToSolvency</bpmn:incoming>
+      <bpmn:outgoing>flow_solvent</bpmn:outgoing>
+      <bpmn:outgoing>flow_notSolvent</bpmn:outgoing>
     </bpmn:exclusiveGateway>
     <bpmn:businessRuleTask id="businessRuleTask_checkCreditRating" name="Check credit rating" camunda:resultVariable="solvent" camunda:decisionRef="checkCreditRating" camunda:mapDecisionResult="singleEntry">
-      <bpmn:incoming>Flow_08ad25m</bpmn:incoming>
-      <bpmn:outgoing>Flow_10dsfgr</bpmn:outgoing>
+      <bpmn:incoming>flow_validatedToCreditCheck</bpmn:incoming>
+      <bpmn:outgoing>flow_creditCheckToSolvency</bpmn:outgoing>
     </bpmn:businessRuleTask>
     <bpmn:subProcess id="subProcess_concludeContract" name="Conclude contract">
-      <bpmn:incoming>Flow_0dj8bxx</bpmn:incoming>
-      <bpmn:outgoing>Flow_17zd4n8</bpmn:outgoing>
+      <bpmn:incoming>flow_solvent</bpmn:incoming>
+      <bpmn:outgoing>flow_contractConcludedToFork</bpmn:outgoing>
       <bpmn:startEvent id="startEvent_customerEligible" name="Customer eligible">
-        <bpmn:outgoing>Flow_1jra6g7</bpmn:outgoing>
+        <bpmn:outgoing>flow_eligibleToSendContract</bpmn:outgoing>
       </bpmn:startEvent>
-      <bpmn:sequenceFlow id="Flow_1jra6g7" sourceRef="startEvent_customerEligible" targetRef="serviceTask_sendContract" />
-      <bpmn:sequenceFlow id="Flow_0ff6219" sourceRef="serviceTask_sendContract" targetRef="gateway_awaitSignature" />
+      <bpmn:sequenceFlow id="flow_eligibleToSendContract" sourceRef="startEvent_customerEligible" targetRef="serviceTask_sendContract" />
+      <bpmn:sequenceFlow id="flow_contractSentToAwait" sourceRef="serviceTask_sendContract" targetRef="gateway_awaitSignature" />
       <bpmn:eventBasedGateway id="gateway_awaitSignature">
-        <bpmn:incoming>Flow_0ff6219</bpmn:incoming>
-        <bpmn:outgoing>Flow_0ete2ij</bpmn:outgoing>
-        <bpmn:outgoing>Flow_1uekrwv</bpmn:outgoing>
+        <bpmn:incoming>flow_contractSentToAwait</bpmn:incoming>
+        <bpmn:outgoing>flow_awaitToSigned</bpmn:outgoing>
+        <bpmn:outgoing>flow_awaitToDeadline</bpmn:outgoing>
       </bpmn:eventBasedGateway>
       <bpmn:intermediateCatchEvent id="event_contractSigned" name="Contract signed" camunda:asyncAfter="true">
-        <bpmn:incoming>Flow_0ete2ij</bpmn:incoming>
-        <bpmn:outgoing>Flow_0m29pj0</bpmn:outgoing>
+        <bpmn:incoming>flow_awaitToSigned</bpmn:incoming>
+        <bpmn:outgoing>flow_signedToContractValid</bpmn:outgoing>
         <bpmn:messageEventDefinition id="MessageEventDefinition_1s3mj11" messageRef="Message_ContractSigned" />
       </bpmn:intermediateCatchEvent>
-      <bpmn:sequenceFlow id="Flow_0ete2ij" sourceRef="gateway_awaitSignature" targetRef="event_contractSigned" />
+      <bpmn:sequenceFlow id="flow_awaitToSigned" sourceRef="gateway_awaitSignature" targetRef="event_contractSigned" />
       <bpmn:endEvent id="endEvent_contractValid" name="Contract valid">
-        <bpmn:incoming>Flow_0m29pj0</bpmn:incoming>
+        <bpmn:incoming>flow_signedToContractValid</bpmn:incoming>
       </bpmn:endEvent>
-      <bpmn:sequenceFlow id="Flow_0m29pj0" sourceRef="event_contractSigned" targetRef="endEvent_contractValid" />
+      <bpmn:sequenceFlow id="flow_signedToContractValid" sourceRef="event_contractSigned" targetRef="endEvent_contractValid" />
       <bpmn:intermediateCatchEvent id="event_signatureDeadline" name="14 days">
-        <bpmn:incoming>Flow_1uekrwv</bpmn:incoming>
-        <bpmn:outgoing>Flow_1it2fbs</bpmn:outgoing>
+        <bpmn:incoming>flow_awaitToDeadline</bpmn:incoming>
+        <bpmn:outgoing>flow_deadlineToNotSigned</bpmn:outgoing>
         <bpmn:timerEventDefinition id="TimerEventDefinition_0hpbdck">
           <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">P14D</bpmn:timeDuration>
         </bpmn:timerEventDefinition>
       </bpmn:intermediateCatchEvent>
-      <bpmn:sequenceFlow id="Flow_1uekrwv" sourceRef="gateway_awaitSignature" targetRef="event_signatureDeadline" />
-      <bpmn:sequenceFlow id="Flow_1it2fbs" sourceRef="event_signatureDeadline" targetRef="endEvent_notSigned" />
+      <bpmn:sequenceFlow id="flow_awaitToDeadline" sourceRef="gateway_awaitSignature" targetRef="event_signatureDeadline" />
+      <bpmn:sequenceFlow id="flow_deadlineToNotSigned" sourceRef="event_signatureDeadline" targetRef="endEvent_notSigned" />
       <bpmn:endEvent id="endEvent_notSigned" name="Not signed">
-        <bpmn:incoming>Flow_1it2fbs</bpmn:incoming>
+        <bpmn:incoming>flow_deadlineToNotSigned</bpmn:incoming>
         <bpmn:escalationEventDefinition id="EscalationEventDefinition_0wpbfeq" escalationRef="Escalation_ContractNotSigned" />
       </bpmn:endEvent>
       <bpmn:serviceTask id="serviceTask_sendContract" name="Send contract" camunda:asyncAfter="true" camunda:delegateExpression="#{sendContractDelegate}">
-        <bpmn:incoming>Flow_1jra6g7</bpmn:incoming>
-        <bpmn:outgoing>Flow_0ff6219</bpmn:outgoing>
+        <bpmn:incoming>flow_eligibleToSendContract</bpmn:incoming>
+        <bpmn:outgoing>flow_contractSentToAwait</bpmn:outgoing>
       </bpmn:serviceTask>
     </bpmn:subProcess>
-    <bpmn:sequenceFlow id="Flow_reminder1" sourceRef="boundary_signatureReminder" targetRef="serviceTask_sendReminderMail" />
-    <bpmn:sequenceFlow id="Flow_reminder2" sourceRef="serviceTask_sendReminderMail" targetRef="endEvent_prospectReminded" />
+    <bpmn:sequenceFlow id="flow_reminderToMail" sourceRef="event_signatureReminder" targetRef="serviceTask_sendReminderMail" />
+    <bpmn:sequenceFlow id="flow_mailToProspectReminded" sourceRef="serviceTask_sendReminderMail" targetRef="endEvent_prospectReminded" />
     <bpmn:parallelGateway id="gateway_fork">
-      <bpmn:incoming>Flow_17zd4n8</bpmn:incoming>
-      <bpmn:outgoing>Flow_0ncgjti</bpmn:outgoing>
-      <bpmn:outgoing>Flow_0sm2h51</bpmn:outgoing>
+      <bpmn:incoming>flow_contractConcludedToFork</bpmn:incoming>
+      <bpmn:outgoing>flow_forkToBikeSource</bpmn:outgoing>
+      <bpmn:outgoing>flow_forkToInsurance</bpmn:outgoing>
     </bpmn:parallelGateway>
     <bpmn:parallelGateway id="gateway_join">
-      <bpmn:incoming>Flow_13li8f0</bpmn:incoming>
-      <bpmn:incoming>Flow_1qm0pcr</bpmn:incoming>
-      <bpmn:outgoing>Flow_0tjit66</bpmn:outgoing>
+      <bpmn:incoming>flow_insuranceToJoin</bpmn:incoming>
+      <bpmn:incoming>flow_bikeAvailable</bpmn:incoming>
+      <bpmn:outgoing>flow_joinToHandover</bpmn:outgoing>
     </bpmn:parallelGateway>
-    <bpmn:exclusiveGateway id="gateway_bikeAvailable" name="Bike available?" default="Flow_1qm0pcr">
-      <bpmn:incoming>Flow_0bgyqyx</bpmn:incoming>
-      <bpmn:outgoing>Flow_1qm0pcr</bpmn:outgoing>
-      <bpmn:outgoing>Flow_0dbz33i</bpmn:outgoing>
+    <bpmn:exclusiveGateway id="gateway_bikeAvailable" name="Bike available?" default="flow_bikeAvailable">
+      <bpmn:incoming>flow_orderedToBikeAvailable</bpmn:incoming>
+      <bpmn:outgoing>flow_bikeAvailable</bpmn:outgoing>
+      <bpmn:outgoing>flow_bikeUnavailable</bpmn:outgoing>
     </bpmn:exclusiveGateway>
     <bpmn:userTask id="userTask_clarifyAlternative" name="Clarify alternative with customer" camunda:asyncAfter="true" camunda:formRef="clarifyAlternativeForm" camunda:formRefBinding="deployment">
       <bpmn:documentation>Completable two ways: a human via the deployed Camunda Form (Tasklist), or a client via POST /api/bike-leasing/{id}/clarify-alternative. The REST path is the recommended one — it routes through the domain (persisting the chosen alternative bike on the aggregate) before completing the task, so the captured data actually reaches the domain model. See "Clarify return with supplier" in cancel-bike-order.bpmn for the form-only anti-pattern where data never leaves the process.</bpmn:documentation>
@@ -131,22 +135,22 @@
         </camunda:properties>
         <camunda:taskListener event="create" delegateExpression="#{clarifyAlternativeTaskListener}" />
       </bpmn:extensionElements>
-      <bpmn:incoming>Flow_0dbz33i</bpmn:incoming>
-      <bpmn:outgoing>Flow_1q8awsj</bpmn:outgoing>
+      <bpmn:incoming>flow_bikeUnavailable</bpmn:incoming>
+      <bpmn:outgoing>flow_clarifyToAlternativeGateway</bpmn:outgoing>
     </bpmn:userTask>
-    <bpmn:exclusiveGateway id="gateway_alternativeFound" name="Alternative found?" default="Flow_162bkdk">
-      <bpmn:incoming>Flow_1q8awsj</bpmn:incoming>
-      <bpmn:outgoing>Flow_162bkdk</bpmn:outgoing>
-      <bpmn:outgoing>Flow_0bmze33</bpmn:outgoing>
+    <bpmn:exclusiveGateway id="gateway_alternativeFound" name="Alternative found?" default="flow_alternativeFound">
+      <bpmn:incoming>flow_clarifyToAlternativeGateway</bpmn:incoming>
+      <bpmn:outgoing>flow_alternativeFound</bpmn:outgoing>
+      <bpmn:outgoing>flow_noAlternativeFound</bpmn:outgoing>
     </bpmn:exclusiveGateway>
     <bpmn:exclusiveGateway id="gateway_bikeSourceJoin">
-      <bpmn:incoming>Flow_0ncgjti</bpmn:incoming>
-      <bpmn:incoming>Flow_162bkdk</bpmn:incoming>
-      <bpmn:outgoing>Flow_1oudvdg</bpmn:outgoing>
+      <bpmn:incoming>flow_forkToBikeSource</bpmn:incoming>
+      <bpmn:incoming>flow_alternativeFound</bpmn:incoming>
+      <bpmn:outgoing>flow_bikeSourceToOrder</bpmn:outgoing>
     </bpmn:exclusiveGateway>
     <bpmn:intermediateThrowEvent id="event_triggerReversal" name="Trigger reversal">
-      <bpmn:incoming>Flow_0bmze33</bpmn:incoming>
-      <bpmn:outgoing>Flow_0zi701m</bpmn:outgoing>
+      <bpmn:incoming>flow_noAlternativeFound</bpmn:incoming>
+      <bpmn:outgoing>flow_reversalToContractCancelled</bpmn:outgoing>
       <bpmn:compensateEventDefinition id="CompensateEventDefinition_1acwjf2" />
     </bpmn:intermediateThrowEvent>
     <bpmn:serviceTask id="serviceTask_cancelContract" name="Cancel contract" isForCompensation="true" camunda:asyncAfter="true" camunda:delegateExpression="#{cancelContractDelegate}" />
@@ -158,103 +162,104 @@
       </bpmn:extensionElements>
     </bpmn:callActivity>
     <bpmn:serviceTask id="serviceTask_issueInsurancePolicy" name="Issue insurance policy" camunda:asyncAfter="true" camunda:delegateExpression="#{issueInsurancePolicyDelegate}">
-      <bpmn:incoming>Flow_0sm2h51</bpmn:incoming>
-      <bpmn:outgoing>Flow_13li8f0</bpmn:outgoing>
+      <bpmn:incoming>flow_forkToInsurance</bpmn:incoming>
+      <bpmn:outgoing>flow_insuranceToJoin</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:intermediateCatchEvent id="event_withdrawalPeriodElapsed" name="Await end of withdrawal period">
-      <bpmn:incoming>Flow_0msl1d4</bpmn:incoming>
-      <bpmn:outgoing>Flow_1czyhqn</bpmn:outgoing>
+      <bpmn:incoming>flow_handoverToWithdrawalPeriod</bpmn:incoming>
+      <bpmn:outgoing>flow_withdrawalElapsedToActive</bpmn:outgoing>
       <bpmn:timerEventDefinition id="TimerEventDefinition_0j3mkdd">
         <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">P14D</bpmn:timeDuration>
       </bpmn:timerEventDefinition>
     </bpmn:intermediateCatchEvent>
-    <bpmn:boundaryEvent id="boundary_compensateContract" name="Compensate contract" attachedToRef="subProcess_concludeContract">
+    <bpmn:boundaryEvent id="event_compensateContract" name="Compensate contract" attachedToRef="subProcess_concludeContract">
       <bpmn:compensateEventDefinition id="CompensateEventDefinition_0v0vumq" />
     </bpmn:boundaryEvent>
-    <bpmn:boundaryEvent id="boundary_contractNotSigned" name="Contract not signed" attachedToRef="subProcess_concludeContract">
-      <bpmn:outgoing>Flow_0p7ddam</bpmn:outgoing>
+    <bpmn:boundaryEvent id="event_contractNotSigned" name="Contract not signed" attachedToRef="subProcess_concludeContract">
+      <bpmn:outgoing>flow_notSignedToRejection</bpmn:outgoing>
       <bpmn:escalationEventDefinition id="EscalationEventDefinition_1rt6mgy" escalationRef="Escalation_ContractNotSigned" />
     </bpmn:boundaryEvent>
-    <bpmn:boundaryEvent id="boundary_applicationInvalid" name="Application&#10;invalid" attachedToRef="serviceTask_validateApplication">
-      <bpmn:outgoing>Flow_1g1dict</bpmn:outgoing>
+    <bpmn:boundaryEvent id="event_applicationInvalid" name="Application&#10;invalid" attachedToRef="serviceTask_validateApplication">
+      <bpmn:outgoing>flow_invalidToRejection</bpmn:outgoing>
       <bpmn:errorEventDefinition id="ErrorEventDefinition_1puuwjw" errorRef="Error_ApplicationInvalid" />
     </bpmn:boundaryEvent>
-    <bpmn:boundaryEvent id="boundary_compensateInsurance" name="Compensate policy" attachedToRef="serviceTask_issueInsurancePolicy">
+    <bpmn:boundaryEvent id="event_compensateInsurance" name="Compensate policy" attachedToRef="serviceTask_issueInsurancePolicy">
       <bpmn:compensateEventDefinition id="CompensateEventDefinition_1qc5iwc" />
     </bpmn:boundaryEvent>
-    <bpmn:boundaryEvent id="boundary_compensateOrder" name="Compensate order" attachedToRef="serviceTask_orderBike">
+    <bpmn:boundaryEvent id="event_compensateOrder" name="Compensate order" attachedToRef="serviceTask_orderBike">
       <bpmn:compensateEventDefinition id="CompensateEventDefinition_1eokj6r" />
     </bpmn:boundaryEvent>
-    <bpmn:sequenceFlow id="Flow_0cq39pq" sourceRef="startEvent_leasingRequestReceived" targetRef="serviceTask_validateApplication" />
-    <bpmn:sequenceFlow id="Flow_1oudvdg" sourceRef="gateway_bikeSourceJoin" targetRef="serviceTask_orderBike" />
-    <bpmn:sequenceFlow id="Flow_0bgyqyx" sourceRef="serviceTask_orderBike" targetRef="gateway_bikeAvailable" />
-    <bpmn:sequenceFlow id="Flow_054y6af" sourceRef="serviceTask_sendRejection" targetRef="endEvent_applicationRejected" />
-    <bpmn:sequenceFlow id="Flow_0tjit66" sourceRef="gateway_join" targetRef="event_handoverReported" />
-    <bpmn:sequenceFlow id="Flow_0msl1d4" sourceRef="event_handoverReported" targetRef="event_withdrawalPeriodElapsed" />
-    <bpmn:sequenceFlow id="Flow_1czyhqn" sourceRef="event_withdrawalPeriodElapsed" targetRef="endEvent_leasingActive" />
-    <bpmn:sequenceFlow id="Flow_1g1dict" sourceRef="boundary_applicationInvalid" targetRef="serviceTask_sendRejection" />
-    <bpmn:sequenceFlow id="Flow_00bctyk" name="No" sourceRef="gateway_isSolvent" targetRef="serviceTask_sendRejection">
+    <bpmn:sequenceFlow id="flow_requestToValidation" sourceRef="startEvent_leasingRequestReceived" targetRef="serviceTask_validateApplication" />
+    <bpmn:sequenceFlow id="flow_bikeSourceToOrder" sourceRef="gateway_bikeSourceJoin" targetRef="serviceTask_orderBike" />
+    <bpmn:sequenceFlow id="flow_orderedToBikeAvailable" sourceRef="serviceTask_orderBike" targetRef="gateway_bikeAvailable" />
+    <bpmn:sequenceFlow id="flow_rejectionSent" sourceRef="serviceTask_sendRejection" targetRef="endEvent_applicationRejected" />
+    <bpmn:sequenceFlow id="flow_joinToHandover" sourceRef="gateway_join" targetRef="event_handoverReported" />
+    <bpmn:sequenceFlow id="flow_handoverToWithdrawalPeriod" sourceRef="event_handoverReported" targetRef="event_withdrawalPeriodElapsed" />
+    <bpmn:sequenceFlow id="flow_withdrawalElapsedToActive" sourceRef="event_withdrawalPeriodElapsed" targetRef="endEvent_leasingActive" />
+    <bpmn:sequenceFlow id="flow_invalidToRejection" sourceRef="event_applicationInvalid" targetRef="gateway_rejectionJoin" />
+    <bpmn:sequenceFlow id="flow_notSolvent" name="No" sourceRef="gateway_isSolvent" targetRef="gateway_rejectionJoin">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!solvent}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="Flow_0p7ddam" sourceRef="boundary_contractNotSigned" targetRef="serviceTask_sendRejection" />
-    <bpmn:sequenceFlow id="Flow_08ad25m" sourceRef="serviceTask_validateApplication" targetRef="businessRuleTask_checkCreditRating" />
-    <bpmn:sequenceFlow id="Flow_10dsfgr" sourceRef="businessRuleTask_checkCreditRating" targetRef="gateway_isSolvent" />
-    <bpmn:sequenceFlow id="Flow_0dj8bxx" sourceRef="gateway_isSolvent" targetRef="subProcess_concludeContract" />
-    <bpmn:sequenceFlow id="Flow_17zd4n8" sourceRef="subProcess_concludeContract" targetRef="gateway_fork" />
-    <bpmn:sequenceFlow id="Flow_0ncgjti" sourceRef="gateway_fork" targetRef="gateway_bikeSourceJoin" />
-    <bpmn:sequenceFlow id="Flow_0sm2h51" sourceRef="gateway_fork" targetRef="serviceTask_issueInsurancePolicy" />
-    <bpmn:sequenceFlow id="Flow_13li8f0" sourceRef="serviceTask_issueInsurancePolicy" targetRef="gateway_join" />
-    <bpmn:sequenceFlow id="Flow_1qm0pcr" name="Yes" sourceRef="gateway_bikeAvailable" targetRef="gateway_join" />
-    <bpmn:sequenceFlow id="Flow_0dbz33i" name="No" sourceRef="gateway_bikeAvailable" targetRef="userTask_clarifyAlternative">
+    <bpmn:sequenceFlow id="flow_notSignedToRejection" sourceRef="event_contractNotSigned" targetRef="gateway_rejectionJoin" />
+    <bpmn:sequenceFlow id="flow_rejectionJoined" sourceRef="gateway_rejectionJoin" targetRef="serviceTask_sendRejection" />
+    <bpmn:sequenceFlow id="flow_validatedToCreditCheck" sourceRef="serviceTask_validateApplication" targetRef="businessRuleTask_checkCreditRating" />
+    <bpmn:sequenceFlow id="flow_creditCheckToSolvency" sourceRef="businessRuleTask_checkCreditRating" targetRef="gateway_isSolvent" />
+    <bpmn:sequenceFlow id="flow_solvent" sourceRef="gateway_isSolvent" targetRef="subProcess_concludeContract" />
+    <bpmn:sequenceFlow id="flow_contractConcludedToFork" sourceRef="subProcess_concludeContract" targetRef="gateway_fork" />
+    <bpmn:sequenceFlow id="flow_forkToBikeSource" sourceRef="gateway_fork" targetRef="gateway_bikeSourceJoin" />
+    <bpmn:sequenceFlow id="flow_forkToInsurance" sourceRef="gateway_fork" targetRef="serviceTask_issueInsurancePolicy" />
+    <bpmn:sequenceFlow id="flow_insuranceToJoin" sourceRef="serviceTask_issueInsurancePolicy" targetRef="gateway_join" />
+    <bpmn:sequenceFlow id="flow_bikeAvailable" name="Yes" sourceRef="gateway_bikeAvailable" targetRef="gateway_join" />
+    <bpmn:sequenceFlow id="flow_bikeUnavailable" name="No" sourceRef="gateway_bikeAvailable" targetRef="userTask_clarifyAlternative">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!bikeAvailable}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="Flow_1q8awsj" sourceRef="userTask_clarifyAlternative" targetRef="gateway_alternativeFound" />
-    <bpmn:sequenceFlow id="Flow_162bkdk" name="Yes" sourceRef="gateway_alternativeFound" targetRef="gateway_bikeSourceJoin" />
-    <bpmn:sequenceFlow id="Flow_0bmze33" name="No" sourceRef="gateway_alternativeFound" targetRef="event_triggerReversal">
+    <bpmn:sequenceFlow id="flow_clarifyToAlternativeGateway" sourceRef="userTask_clarifyAlternative" targetRef="gateway_alternativeFound" />
+    <bpmn:sequenceFlow id="flow_alternativeFound" name="Yes" sourceRef="gateway_alternativeFound" targetRef="gateway_bikeSourceJoin" />
+    <bpmn:sequenceFlow id="flow_noAlternativeFound" name="No" sourceRef="gateway_alternativeFound" targetRef="event_triggerReversal">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!alternativeFound}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="Flow_0zi701m" sourceRef="event_triggerReversal" targetRef="endEvent_contractCancelled" />
+    <bpmn:sequenceFlow id="flow_reversalToContractCancelled" sourceRef="event_triggerReversal" targetRef="endEvent_contractCancelled" />
     <bpmn:endEvent id="endEvent_contractCancelled" name="Contract cancelled">
-      <bpmn:incoming>Flow_0zi701m</bpmn:incoming>
+      <bpmn:incoming>flow_reversalToContractCancelled</bpmn:incoming>
       <bpmn:terminateEventDefinition id="TerminateEventDefinition_04n84yk" />
     </bpmn:endEvent>
     <bpmn:subProcess id="subProcess_applicationWithdrawn" name="Application withdrawn" triggeredByEvent="true">
       <bpmn:startEvent id="startEvent_applicationWithdrawn" name="Request withdrawn" camunda:asyncAfter="true">
-        <bpmn:outgoing>E01</bpmn:outgoing>
+        <bpmn:outgoing>flow_withdrawalToReversal</bpmn:outgoing>
         <bpmn:messageEventDefinition id="Msg_AntragZurueckgezogen_d" messageRef="Message_ApplicationWithdrawn" />
       </bpmn:startEvent>
       <bpmn:intermediateThrowEvent id="event_reverseApplication" name="Reverse application">
-        <bpmn:incoming>E01</bpmn:incoming>
-        <bpmn:outgoing>E02</bpmn:outgoing>
+        <bpmn:incoming>flow_withdrawalToReversal</bpmn:incoming>
+        <bpmn:outgoing>flow_reversalToConfirmation</bpmn:outgoing>
         <bpmn:compensateEventDefinition id="CompensateEventDefinition_01xv6ab" />
       </bpmn:intermediateThrowEvent>
-      <bpmn:sequenceFlow id="E01" sourceRef="startEvent_applicationWithdrawn" targetRef="event_reverseApplication" />
-      <bpmn:sequenceFlow id="E02" sourceRef="event_reverseApplication" targetRef="serviceTask_sendCancellationConfirmation" />
-      <bpmn:sequenceFlow id="Flow_0z1vqev" sourceRef="serviceTask_sendCancellationConfirmation" targetRef="endEvent_applicationCancelled" />
+      <bpmn:sequenceFlow id="flow_withdrawalToReversal" sourceRef="startEvent_applicationWithdrawn" targetRef="event_reverseApplication" />
+      <bpmn:sequenceFlow id="flow_reversalToConfirmation" sourceRef="event_reverseApplication" targetRef="serviceTask_sendCancellationConfirmation" />
+      <bpmn:sequenceFlow id="flow_confirmationToCancelled" sourceRef="serviceTask_sendCancellationConfirmation" targetRef="endEvent_applicationCancelled" />
       <bpmn:serviceTask id="serviceTask_sendCancellationConfirmation" name="Send cancellation confirmation" camunda:asyncAfter="true" camunda:delegateExpression="#{sendCancellationConfirmationDelegate}">
-        <bpmn:incoming>E02</bpmn:incoming>
-        <bpmn:outgoing>Flow_0z1vqev</bpmn:outgoing>
+        <bpmn:incoming>flow_reversalToConfirmation</bpmn:incoming>
+        <bpmn:outgoing>flow_confirmationToCancelled</bpmn:outgoing>
       </bpmn:serviceTask>
       <bpmn:endEvent id="endEvent_applicationCancelled" name="Leasing cancelled">
-        <bpmn:incoming>Flow_0z1vqev</bpmn:incoming>
+        <bpmn:incoming>flow_confirmationToCancelled</bpmn:incoming>
       </bpmn:endEvent>
     </bpmn:subProcess>
-    <bpmn:boundaryEvent id="boundary_signatureReminder" name="7 days" cancelActivity="false" attachedToRef="subProcess_concludeContract">
-      <bpmn:outgoing>Flow_reminder1</bpmn:outgoing>
+    <bpmn:boundaryEvent id="event_signatureReminder" name="7 days" cancelActivity="false" attachedToRef="subProcess_concludeContract">
+      <bpmn:outgoing>flow_reminderToMail</bpmn:outgoing>
       <bpmn:timerEventDefinition id="TimerEventDefinition_reminder">
         <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">P7D</bpmn:timeDuration>
       </bpmn:timerEventDefinition>
     </bpmn:boundaryEvent>
     <bpmn:serviceTask id="serviceTask_sendReminderMail" name="Send reminder mail" camunda:asyncAfter="true" camunda:delegateExpression="#{sendReminderMailDelegate}">
-      <bpmn:incoming>Flow_reminder1</bpmn:incoming>
-      <bpmn:outgoing>Flow_reminder2</bpmn:outgoing>
+      <bpmn:incoming>flow_reminderToMail</bpmn:incoming>
+      <bpmn:outgoing>flow_mailToProspectReminded</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:endEvent id="endEvent_prospectReminded" name="Prospect reminded">
-      <bpmn:incoming>Flow_reminder2</bpmn:incoming>
+      <bpmn:incoming>flow_mailToProspectReminded</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:association id="Association_0reycrf" associationDirection="One" sourceRef="boundary_compensateInsurance" targetRef="serviceTask_cancelPolicy" />
-    <bpmn:association id="Association_1q9i1wm" associationDirection="One" sourceRef="boundary_compensateContract" targetRef="serviceTask_cancelContract" />
-    <bpmn:association id="Association_185chbk" associationDirection="One" sourceRef="boundary_compensateOrder" targetRef="callActivity_cancelBikeOrder" />
+    <bpmn:association id="Association_0reycrf" associationDirection="One" sourceRef="event_compensateInsurance" targetRef="serviceTask_cancelPolicy" />
+    <bpmn:association id="Association_1q9i1wm" associationDirection="One" sourceRef="event_compensateContract" targetRef="serviceTask_cancelContract" />
+    <bpmn:association id="Association_185chbk" associationDirection="One" sourceRef="event_compensateOrder" targetRef="callActivity_cancelBikeOrder" />
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="bikeLeasingProcess">
@@ -288,6 +293,12 @@
           <dc:Bounds x="1908" y="290" width="65" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_rejectionJoin_di" bpmnElement="gateway_rejectionJoin" isMarkerVisible="true">
+        <dc:Bounds x="685" y="445" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="674" y="502" width="73" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1qdvy1t_di" bpmnElement="serviceTask_sendRejection">
         <dc:Bounds x="760" y="430" width="100" height="80" />
         <bpmndi:BPMNLabel />
@@ -344,28 +355,28 @@
       <bpmndi:BPMNShape id="Activity_0robame_di" bpmnElement="serviceTask_sendContract">
         <dc:Bounds x="650" y="210" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="Flow_1jra6g7_di" bpmnElement="Flow_1jra6g7">
+      <bpmndi:BPMNEdge id="Flow_1jra6g7_di" bpmnElement="flow_eligibleToSendContract">
         <di:waypoint x="608" y="250" />
         <di:waypoint x="650" y="250" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0ff6219_di" bpmnElement="Flow_0ff6219">
+      <bpmndi:BPMNEdge id="Flow_0ff6219_di" bpmnElement="flow_contractSentToAwait">
         <di:waypoint x="750" y="250" />
         <di:waypoint x="775" y="250" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0ete2ij_di" bpmnElement="Flow_0ete2ij">
+      <bpmndi:BPMNEdge id="Flow_0ete2ij_di" bpmnElement="flow_awaitToSigned">
         <di:waypoint x="825" y="250" />
         <di:waypoint x="862" y="250" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0m29pj0_di" bpmnElement="Flow_0m29pj0">
+      <bpmndi:BPMNEdge id="Flow_0m29pj0_di" bpmnElement="flow_signedToContractValid">
         <di:waypoint x="898" y="250" />
         <di:waypoint x="962" y="250" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1uekrwv_di" bpmnElement="Flow_1uekrwv">
+      <bpmndi:BPMNEdge id="Flow_1uekrwv_di" bpmnElement="flow_awaitToDeadline">
         <di:waypoint x="800" y="275" />
         <di:waypoint x="800" y="340" />
         <di:waypoint x="862" y="340" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1it2fbs_di" bpmnElement="Flow_1it2fbs">
+      <bpmndi:BPMNEdge id="Flow_1it2fbs_di" bpmnElement="flow_deadlineToNotSigned">
         <di:waypoint x="898" y="340" />
         <di:waypoint x="962" y="340" />
       </bpmndi:BPMNEdge>
@@ -446,15 +457,15 @@
           <dc:Bounds x="545" y="693" width="89" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="E01_di" bpmnElement="E01">
+      <bpmndi:BPMNEdge id="E01_di" bpmnElement="flow_withdrawalToReversal">
         <di:waypoint x="286" y="670" />
         <di:waypoint x="340" y="670" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="E02_di" bpmnElement="E02">
+      <bpmndi:BPMNEdge id="E02_di" bpmnElement="flow_reversalToConfirmation">
         <di:waypoint x="376" y="670" />
         <di:waypoint x="420" y="670" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0z1vqev_di" bpmnElement="Flow_0z1vqev">
+      <bpmndi:BPMNEdge id="Flow_0z1vqev_di" bpmnElement="flow_confirmationToCancelled">
         <di:waypoint x="520" y="670" />
         <di:waypoint x="572" y="670" />
       </bpmndi:BPMNEdge>
@@ -467,125 +478,129 @@
           <dc:Bounds x="778" y="105" width="46" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_reminder_di" bpmnElement="boundary_signatureReminder">
+      <bpmndi:BPMNShape id="Event_reminder_di" bpmnElement="event_signatureReminder">
         <dc:Bounds x="572" y="140" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="572" y="183" width="33" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_1udrygq_di" bpmnElement="boundary_compensateOrder">
+      <bpmndi:BPMNShape id="Event_1udrygq_di" bpmnElement="event_compensateOrder">
         <dc:Bounds x="1242" y="362" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1188" y="398" width="63" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_06zqvrx_di" bpmnElement="boundary_compensateInsurance">
+      <bpmndi:BPMNShape id="Event_06zqvrx_di" bpmnElement="event_compensateInsurance">
         <dc:Bounds x="1222" y="122" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1168" y="106" width="63" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_165tf2h_di" bpmnElement="boundary_applicationInvalid">
+      <bpmndi:BPMNShape id="Event_165tf2h_di" bpmnElement="event_applicationInvalid">
         <dc:Bounds x="192" y="272" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="223" y="316" width="54" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0xb7poa_di" bpmnElement="boundary_contractNotSigned">
+      <bpmndi:BPMNShape id="Event_0xb7poa_di" bpmnElement="event_contractNotSigned">
         <dc:Bounds x="632" y="380" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="655" y="421" width="73" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0w2fnun_di" bpmnElement="boundary_compensateContract">
+      <bpmndi:BPMNShape id="Event_0w2fnun_di" bpmnElement="event_compensateContract">
         <dc:Bounds x="862" y="140" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="Flow_reminder1_di" bpmnElement="Flow_reminder1">
+      <bpmndi:BPMNEdge id="Flow_reminder1_di" bpmnElement="flow_reminderToMail">
         <di:waypoint x="590" y="140" />
         <di:waypoint x="590" y="80" />
         <di:waypoint x="650" y="80" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_reminder2_di" bpmnElement="Flow_reminder2">
+      <bpmndi:BPMNEdge id="Flow_reminder2_di" bpmnElement="flow_mailToProspectReminded">
         <di:waypoint x="750" y="80" />
         <di:waypoint x="782" y="80" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0cq39pq_di" bpmnElement="Flow_0cq39pq">
+      <bpmndi:BPMNEdge id="Flow_0cq39pq_di" bpmnElement="flow_requestToValidation">
         <di:waypoint x="108" y="250" />
         <di:waypoint x="160" y="250" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1oudvdg_di" bpmnElement="Flow_1oudvdg">
+      <bpmndi:BPMNEdge id="Flow_1oudvdg_di" bpmnElement="flow_bikeSourceToOrder">
         <di:waypoint x="1155" y="340" />
         <di:waypoint x="1190" y="340" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0bgyqyx_di" bpmnElement="Flow_0bgyqyx">
+      <bpmndi:BPMNEdge id="Flow_0bgyqyx_di" bpmnElement="flow_orderedToBikeAvailable">
         <di:waypoint x="1290" y="340" />
         <di:waypoint x="1405" y="340" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_054y6af_di" bpmnElement="Flow_054y6af">
+      <bpmndi:BPMNEdge id="Flow_054y6af_di" bpmnElement="flow_rejectionSent">
         <di:waypoint x="860" y="470" />
         <di:waypoint x="962" y="470" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0tjit66_di" bpmnElement="Flow_0tjit66">
+      <bpmndi:BPMNEdge id="Flow_0tjit66_di" bpmnElement="flow_joinToHandover">
         <di:waypoint x="1655" y="265" />
         <di:waypoint x="1722" y="265" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0msl1d4_di" bpmnElement="Flow_0msl1d4">
+      <bpmndi:BPMNEdge id="Flow_0msl1d4_di" bpmnElement="flow_handoverToWithdrawalPeriod">
         <di:waypoint x="1758" y="265" />
         <di:waypoint x="1832" y="265" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1czyhqn_di" bpmnElement="Flow_1czyhqn">
+      <bpmndi:BPMNEdge id="Flow_1czyhqn_di" bpmnElement="flow_withdrawalElapsedToActive">
         <di:waypoint x="1868" y="265" />
         <di:waypoint x="1922" y="265" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1g1dict_di" bpmnElement="Flow_1g1dict">
+      <bpmndi:BPMNEdge id="Flow_1g1dict_di" bpmnElement="flow_invalidToRejection">
         <di:waypoint x="210" y="308" />
         <di:waypoint x="210" y="470" />
-        <di:waypoint x="760" y="470" />
+        <di:waypoint x="685" y="470" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_00bctyk_di" bpmnElement="Flow_00bctyk">
+      <bpmndi:BPMNEdge id="Flow_00bctyk_di" bpmnElement="flow_notSolvent">
         <di:waypoint x="463" y="275" />
         <di:waypoint x="463" y="470" />
-        <di:waypoint x="760" y="470" />
+        <di:waypoint x="685" y="470" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="471" y="283" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0p7ddam_di" bpmnElement="Flow_0p7ddam">
+      <bpmndi:BPMNEdge id="Flow_0p7ddam_di" bpmnElement="flow_notSignedToRejection">
         <di:waypoint x="650" y="416" />
         <di:waypoint x="650" y="470" />
+        <di:waypoint x="685" y="470" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_rejectionJoined_di" bpmnElement="flow_rejectionJoined">
+        <di:waypoint x="735" y="470" />
         <di:waypoint x="760" y="470" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_08ad25m_di" bpmnElement="Flow_08ad25m">
+      <bpmndi:BPMNEdge id="Flow_08ad25m_di" bpmnElement="flow_validatedToCreditCheck">
         <di:waypoint x="260" y="250" />
         <di:waypoint x="300" y="250" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_10dsfgr_di" bpmnElement="Flow_10dsfgr">
+      <bpmndi:BPMNEdge id="Flow_10dsfgr_di" bpmnElement="flow_creditCheckToSolvency">
         <di:waypoint x="400" y="250" />
         <di:waypoint x="438" y="250" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0dj8bxx_di" bpmnElement="Flow_0dj8bxx">
+      <bpmndi:BPMNEdge id="Flow_0dj8bxx_di" bpmnElement="flow_solvent">
         <di:waypoint x="488" y="250" />
         <di:waypoint x="530" y="250" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_17zd4n8_di" bpmnElement="Flow_17zd4n8">
+      <bpmndi:BPMNEdge id="Flow_17zd4n8_di" bpmnElement="flow_contractConcludedToFork">
         <di:waypoint x="1040" y="250" />
         <di:waypoint x="1105" y="250" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0ncgjti_di" bpmnElement="Flow_0ncgjti">
+      <bpmndi:BPMNEdge id="Flow_0ncgjti_di" bpmnElement="flow_forkToBikeSource">
         <di:waypoint x="1130" y="275" />
         <di:waypoint x="1130" y="315" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0sm2h51_di" bpmnElement="Flow_0sm2h51">
+      <bpmndi:BPMNEdge id="Flow_0sm2h51_di" bpmnElement="flow_forkToInsurance">
         <di:waypoint x="1130" y="225" />
         <di:waypoint x="1130" y="180" />
         <di:waypoint x="1190" y="180" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_13li8f0_di" bpmnElement="Flow_13li8f0">
+      <bpmndi:BPMNEdge id="Flow_13li8f0_di" bpmnElement="flow_insuranceToJoin">
         <di:waypoint x="1290" y="180" />
         <di:waypoint x="1630" y="180" />
         <di:waypoint x="1630" y="240" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1qm0pcr_di" bpmnElement="Flow_1qm0pcr">
+      <bpmndi:BPMNEdge id="Flow_1qm0pcr_di" bpmnElement="flow_bikeAvailable">
         <di:waypoint x="1455" y="340" />
         <di:waypoint x="1630" y="340" />
         <di:waypoint x="1630" y="290" />
@@ -593,7 +608,7 @@
           <dc:Bounds x="1534" y="322" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0dbz33i_di" bpmnElement="Flow_0dbz33i">
+      <bpmndi:BPMNEdge id="Flow_0dbz33i_di" bpmnElement="flow_bikeUnavailable">
         <di:waypoint x="1430" y="365" />
         <di:waypoint x="1430" y="450" />
         <di:waypoint x="1470" y="450" />
@@ -601,11 +616,11 @@
           <dc:Bounds x="1442" y="393" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1q8awsj_di" bpmnElement="Flow_1q8awsj">
+      <bpmndi:BPMNEdge id="Flow_1q8awsj_di" bpmnElement="flow_clarifyToAlternativeGateway">
         <di:waypoint x="1570" y="450" />
         <di:waypoint x="1605" y="450" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_162bkdk_di" bpmnElement="Flow_162bkdk">
+      <bpmndi:BPMNEdge id="Flow_162bkdk_di" bpmnElement="flow_alternativeFound">
         <di:waypoint x="1630" y="475" />
         <di:waypoint x="1630" y="540" />
         <di:waypoint x="1130" y="540" />
@@ -614,14 +629,14 @@
           <dc:Bounds x="1641" y="503" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0bmze33_di" bpmnElement="Flow_0bmze33">
+      <bpmndi:BPMNEdge id="Flow_0bmze33_di" bpmnElement="flow_noAlternativeFound">
         <di:waypoint x="1655" y="450" />
         <di:waypoint x="1722" y="450" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1672" y="433" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0zi701m_di" bpmnElement="Flow_0zi701m">
+      <bpmndi:BPMNEdge id="Flow_0zi701m_di" bpmnElement="flow_reversalToContractCancelled">
         <di:waypoint x="1758" y="450" />
         <di:waypoint x="1832" y="450" />
       </bpmndi:BPMNEdge>
diff --git a/service/app/src/main/resources/bpmn/cancel-bike-order.bpmn b/service/app/src/main/resources/bpmn/cancel-bike-order.bpmn
index 32e8629..c825e84 100644
--- a/service/app/src/main/resources/bpmn/cancel-bike-order.bpmn
+++ b/service/app/src/main/resources/bpmn/cancel-bike-order.bpmn
@@ -8,38 +8,38 @@
           <camunda:property name="additionalInputVariables" value="orderId, bikeId" />
         </camunda:properties>
       </bpmn:extensionElements>
-      <bpmn:outgoing>Flow_0510wb5</bpmn:outgoing>
+      <bpmn:outgoing>flow_requiredToRequest</bpmn:outgoing>
     </bpmn:startEvent>
-    <bpmn:sequenceFlow id="Flow_0510wb5" sourceRef="startEvent_cancellationRequired" targetRef="serviceTask_requestCancellation" />
-    <bpmn:exclusiveGateway id="gateway_cancellationPossible" name="Cancellation possible?" default="Flow_1e8ks1k">
-      <bpmn:incoming>Flow_0tc4yfk</bpmn:incoming>
-      <bpmn:outgoing>Flow_1a0g4v1</bpmn:outgoing>
-      <bpmn:outgoing>Flow_1e8ks1k</bpmn:outgoing>
+    <bpmn:sequenceFlow id="flow_requiredToRequest" sourceRef="startEvent_cancellationRequired" targetRef="serviceTask_requestCancellation" />
+    <bpmn:exclusiveGateway id="gateway_cancellationPossible" name="Cancellation possible?" default="flow_cancellationPossible">
+      <bpmn:incoming>flow_requestToPossibleGateway</bpmn:incoming>
+      <bpmn:outgoing>flow_cancellationNotPossible</bpmn:outgoing>
+      <bpmn:outgoing>flow_cancellationPossible</bpmn:outgoing>
     </bpmn:exclusiveGateway>
-    <bpmn:sequenceFlow id="Flow_0tc4yfk" sourceRef="serviceTask_requestCancellation" targetRef="gateway_cancellationPossible" />
-    <bpmn:sequenceFlow id="Flow_1a0g4v1" name="No" sourceRef="gateway_cancellationPossible" targetRef="userTask_clarifyReturn">
+    <bpmn:sequenceFlow id="flow_requestToPossibleGateway" sourceRef="serviceTask_requestCancellation" targetRef="gateway_cancellationPossible" />
+    <bpmn:sequenceFlow id="flow_cancellationNotPossible" name="No" sourceRef="gateway_cancellationPossible" targetRef="userTask_clarifyReturn">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${cancellationPossible}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:endEvent id="endEvent_orderReversed" name="Order reversed">
-      <bpmn:incoming>Flow_0w76x5f</bpmn:incoming>
+      <bpmn:incoming>flow_joinToReversed</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:sequenceFlow id="Flow_1e8ks1k" name="Yes" sourceRef="gateway_cancellationPossible" targetRef="gateway_join" />
+    <bpmn:sequenceFlow id="flow_cancellationPossible" name="Yes" sourceRef="gateway_cancellationPossible" targetRef="gateway_join" />
     <bpmn:userTask id="userTask_clarifyReturn" name="Clarify return with supplier" camunda:asyncAfter="true" camunda:formRef="clarifyReturnForm" camunda:formRefBinding="deployment">
       <bpmn:documentation>Kept deliberately as a FORM-ONLY task to show the trade-off. It is completed straight through its Camunda Form (Tasklist) or the engine REST API, so the completion never passes through our domain services: any data entered on the form lands only in process variables and never reaches the domain model. In other words, for capturing business data this is NOT best practice. Contrast this with "Clarify alternative with customer" in bike-leasing.bpmn, which offers a domain REST endpoint (POST /api/bike-leasing/{id}/clarify-alternative) that updates the aggregate before completing the task.</bpmn:documentation>
-      <bpmn:incoming>Flow_1a0g4v1</bpmn:incoming>
-      <bpmn:outgoing>Flow_0gkp33w</bpmn:outgoing>
+      <bpmn:incoming>flow_cancellationNotPossible</bpmn:incoming>
+      <bpmn:outgoing>flow_clarifyToBookCosts</bpmn:outgoing>
     </bpmn:userTask>
-    <bpmn:sequenceFlow id="Flow_0gkp33w" sourceRef="userTask_clarifyReturn" targetRef="serviceTask_bookCosts" />
+    <bpmn:sequenceFlow id="flow_clarifyToBookCosts" sourceRef="userTask_clarifyReturn" targetRef="serviceTask_bookCosts" />
     <bpmn:exclusiveGateway id="gateway_join">
-      <bpmn:incoming>Flow_1e8ks1k</bpmn:incoming>
-      <bpmn:incoming>Flow_1v5tej2</bpmn:incoming>
-      <bpmn:outgoing>Flow_0w76x5f</bpmn:outgoing>
+      <bpmn:incoming>flow_cancellationPossible</bpmn:incoming>
+      <bpmn:incoming>flow_bookCostsToJoin</bpmn:incoming>
+      <bpmn:outgoing>flow_joinToReversed</bpmn:outgoing>
     </bpmn:exclusiveGateway>
-    <bpmn:sequenceFlow id="Flow_0w76x5f" sourceRef="gateway_join" targetRef="endEvent_orderReversed" />
-    <bpmn:sequenceFlow id="Flow_1v5tej2" sourceRef="serviceTask_bookCosts" targetRef="gateway_join" />
+    <bpmn:sequenceFlow id="flow_joinToReversed" sourceRef="gateway_join" targetRef="endEvent_orderReversed" />
+    <bpmn:sequenceFlow id="flow_bookCostsToJoin" sourceRef="serviceTask_bookCosts" targetRef="gateway_join" />
     <bpmn:serviceTask id="serviceTask_bookCosts" name="Book costs" camunda:asyncAfter="true" camunda:delegateExpression="#{bookCostsDelegate}">
-      <bpmn:incoming>Flow_0gkp33w</bpmn:incoming>
-      <bpmn:outgoing>Flow_1v5tej2</bpmn:outgoing>
+      <bpmn:incoming>flow_clarifyToBookCosts</bpmn:incoming>
+      <bpmn:outgoing>flow_bookCostsToJoin</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:serviceTask id="serviceTask_requestCancellation" name="Request cancellation" camunda:asyncAfter="true" camunda:delegateExpression="#{requestCancellationDelegate}">
       <bpmn:extensionElements>
@@ -48,8 +48,8 @@
           <camunda:property name="additionalOutputVariables" value="cancellationPossible" />
         </camunda:properties>
       </bpmn:extensionElements>
-      <bpmn:incoming>Flow_0510wb5</bpmn:incoming>
-      <bpmn:outgoing>Flow_0tc4yfk</bpmn:outgoing>
+      <bpmn:incoming>flow_requiredToRequest</bpmn:incoming>
+      <bpmn:outgoing>flow_requestToPossibleGateway</bpmn:outgoing>
     </bpmn:serviceTask>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
@@ -86,15 +86,15 @@
         <dc:Bounds x="250" y="60" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="Flow_0510wb5_di" bpmnElement="Flow_0510wb5">
+      <bpmndi:BPMNEdge id="Flow_0510wb5_di" bpmnElement="flow_requiredToRequest">
         <di:waypoint x="208" y="100" />
         <di:waypoint x="250" y="100" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0tc4yfk_di" bpmnElement="Flow_0tc4yfk">
+      <bpmndi:BPMNEdge id="Flow_0tc4yfk_di" bpmnElement="flow_requestToPossibleGateway">
         <di:waypoint x="350" y="100" />
         <di:waypoint x="395" y="100" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1a0g4v1_di" bpmnElement="Flow_1a0g4v1">
+      <bpmndi:BPMNEdge id="Flow_1a0g4v1_di" bpmnElement="flow_cancellationNotPossible">
         <di:waypoint x="420" y="125" />
         <di:waypoint x="420" y="200" />
         <di:waypoint x="480" y="200" />
@@ -102,22 +102,22 @@
           <dc:Bounds x="432" y="153" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1e8ks1k_di" bpmnElement="Flow_1e8ks1k">
+      <bpmndi:BPMNEdge id="Flow_1e8ks1k_di" bpmnElement="flow_cancellationPossible">
         <di:waypoint x="445" y="100" />
         <di:waypoint x="755" y="100" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="591" y="82" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0gkp33w_di" bpmnElement="Flow_0gkp33w">
+      <bpmndi:BPMNEdge id="Flow_0gkp33w_di" bpmnElement="flow_clarifyToBookCosts">
         <di:waypoint x="580" y="200" />
         <di:waypoint x="620" y="200" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0w76x5f_di" bpmnElement="Flow_0w76x5f">
+      <bpmndi:BPMNEdge id="Flow_0w76x5f_di" bpmnElement="flow_joinToReversed">
         <di:waypoint x="805" y="100" />
         <di:waypoint x="852" y="100" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1v5tej2_di" bpmnElement="Flow_1v5tej2">
+      <bpmndi:BPMNEdge id="Flow_1v5tej2_di" bpmnElement="flow_bookCostsToJoin">
         <di:waypoint x="720" y="200" />
         <di:waypoint x="780" y="200" />
         <di:waypoint x="780" y="125" />
diff --git a/service/app/src/test/kotlin/io/miragon/blueprint/process/BikeLeasingProcessTest.kt b/service/app/src/test/kotlin/io/miragon/blueprint/process/BikeLeasingProcessTest.kt
index 5c82b25..fbcd834 100644
--- a/service/app/src/test/kotlin/io/miragon/blueprint/process/BikeLeasingProcessTest.kt
+++ b/service/app/src/test/kotlin/io/miragon/blueprint/process/BikeLeasingProcessTest.kt
@@ -158,7 +158,7 @@ class BikeLeasingProcessTest {
             .isEnded
             .hasPassed(
                 Elements.EVENT_SIGNATURE_DEADLINE.value,
-                Elements.BOUNDARY_CONTRACT_NOT_SIGNED.value,
+                Elements.EVENT_CONTRACT_NOT_SIGNED.value,
                 Elements.SERVICE_TASK_SEND_REJECTION.value,
                 Elements.END_EVENT_APPLICATION_REJECTED.value,
             )
diff --git a/tools/.bpmnlintrc b/tools/.bpmnlintrc
index 0c1faae..9192290 100644
--- a/tools/.bpmnlintrc
+++ b/tools/.bpmnlintrc
@@ -1,3 +1,10 @@
 {
-  "extends": "bpmnlint:recommended"
+  "extends": [
+    "bpmnlint:recommended",
+    "plugin:camunda-compat/camunda-platform-7-24",
+    "plugin:@miragon/rules/all"
+  ],
+  "moddleExtensions": {
+    "camunda": "camunda-bpmn-moddle/resources/camunda.json"
+  }
 }
diff --git a/tools/package-lock.json b/tools/package-lock.json
index 2618038..a37f96e 100644
--- a/tools/package-lock.json
+++ b/tools/package-lock.json
@@ -8,7 +8,36 @@
       "name": "fullstack-example-tooling",
       "version": "1.0.0",
       "devDependencies": {
-        "bpmnlint": "11.12.1"
+        "@miragon/bpmnlint-plugin-rules": "0.5.0",
+        "bpmnlint": "11.13.0"
+      }
+    },
+    "node_modules/@bpmn-io/feel-analyzer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@bpmn-io/feel-analyzer/-/feel-analyzer-0.3.0.tgz",
+      "integrity": "sha512-TJjNDg9c8f3Vg9rPuUTMV1vKQfX2mZGejyTUAzOWy4KXjqMTRG1PxlpAma5P444niivnZPtEukHgvO8R3aGd3g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@bpmn-io/lezer-feel": "^2.1.0"
+      },
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@bpmn-io/lezer-feel": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@bpmn-io/lezer-feel/-/lezer-feel-2.5.0.tgz",
+      "integrity": "sha512-09JlwNYeD5YYeFrl0dIFfgQKEL+NNiTyUwEtdcPhfftz1mYa7z+ylOPCv/8Z0GqG7X81uyMFvRZDFCRBFTiUPg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@lezer/highlight": "^1.2.3",
+        "@lezer/lr": "^1.4.10",
+        "min-dash": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 20.12.0"
       }
     },
     "node_modules/@bpmn-io/moddle-utils": {
@@ -21,6 +50,69 @@
         "min-dash": "^5.0.0"
       }
     },
+    "node_modules/@bpmn-io/semver-compat": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@bpmn-io/semver-compat/-/semver-compat-0.1.0.tgz",
+      "integrity": "sha512-hIcW42Ku92MUioL6aknDbRoW1jK8ZEqIe8qZZ+d3cjitDO+PMEFFXj/sezJYIHMe8elu4CBz9qpjkV8WIVG9qw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.7.2"
+      }
+    },
+    "node_modules/@camunda/feel-builtins": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@camunda/feel-builtins/-/feel-builtins-1.4.0.tgz",
+      "integrity": "sha512-G3jH5MRvF/3L9/h6fY1zn+kwgYgH7APa84p34jajSG9IVWPCIGpttVGyRTrnbsCI76C2QdPbR2AvOm3RaLzUJg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@lezer/common": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.5.2.tgz",
+      "integrity": "sha512-sxQE460fPZyU3sdc8lafxiPwJHBzZRy/udNFynGQky1SePYBdhkBl1kOagA9uT3pxR8K09bOrmTUqA9wb/PjSQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@lezer/highlight": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.3.tgz",
+      "integrity": "sha512-qXdH7UqTvGfdVBINrgKhDsVTJTxactNNxLk7+UMwZhU13lMHaOBlJe9Vqp907ya56Y3+ed2tlqzys7jDkTmW0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@lezer/common": "^1.3.0"
+      }
+    },
+    "node_modules/@lezer/lr": {
+      "version": "1.4.10",
+      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.10.tgz",
+      "integrity": "sha512-rnCpTIBafOx4mRp43xOxDJbFipJm/c0cia/V5TiGlhmMa+wsSdoGmUN3w5Bqrks/09Q/D4tNAmWaT8p6NRi77A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@lezer/common": "^1.0.0"
+      }
+    },
+    "node_modules/@miragon/bpmnlint-plugin-rules": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@miragon/bpmnlint-plugin-rules/-/bpmnlint-plugin-rules-0.5.0.tgz",
+      "integrity": "sha512-baY2/w1wXDz/khXTKSX5eCDacsP7Q6rAOd8WjRhWRfWj3GKB4T0jYJkYJUsei0HTTZwqhBM3uSARbWbnnqm9zg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bpmnlint-plugin-camunda-compat": "2.59.2",
+        "bpmnlint-utils": "1.1.1",
+        "camunda-bpmn-moddle": "7.0.1",
+        "zeebe-bpmn-moddle": "1.17.0"
+      },
+      "engines": {
+        "node": ">=22"
+      },
+      "peerDependencies": {
+        "bpmnlint": ">=11"
+      }
+    },
     "node_modules/ansi-colors": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
@@ -47,19 +139,19 @@
       }
     },
     "node_modules/bpmnlint": {
-      "version": "11.12.1",
-      "resolved": "https://registry.npmjs.org/bpmnlint/-/bpmnlint-11.12.1.tgz",
-      "integrity": "sha512-s/V68yzJU/ko7ea6ljp/xUUC8PUN+fzZaqI+votu0DPzDc6OqvpBcKzw7rMpqS4WPw/HOW3cLw/C2poWilClCw==",
+      "version": "11.13.0",
+      "resolved": "https://registry.npmjs.org/bpmnlint/-/bpmnlint-11.13.0.tgz",
+      "integrity": "sha512-EBUp+6yg2UWiCf44tZtxZUY0GpopALEE+/8ajV4inRGAVkuvHoICRmCPVkz88MSzBKdX0XSHOYijIk4yRdHW2Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@bpmn-io/moddle-utils": "^0.3.0",
         "ansi-colors": "^4.1.3",
-        "bpmn-moddle": "^10.0.0",
+        "bpmn-moddle": "^10.1.0",
         "bpmnlint-utils": "^1.1.1",
         "cli-table": "^0.3.11",
         "color-support": "^1.1.3",
-        "min-dash": "^5.0.0",
+        "min-dash": "^5.1.0",
         "mri": "^1.2.0",
         "pluralize": "^8.0.0",
         "tiny-glob": "^0.2.9"
@@ -71,6 +163,29 @@
         "node": ">= 20"
       }
     },
+    "node_modules/bpmnlint-plugin-camunda-compat": {
+      "version": "2.59.2",
+      "resolved": "https://registry.npmjs.org/bpmnlint-plugin-camunda-compat/-/bpmnlint-plugin-camunda-compat-2.59.2.tgz",
+      "integrity": "sha512-CTkzFIFv8FpiFP+AWIofMRzDWYVeeDraU3ZvC6s7xnrqMw6gCR+EDVfmi+LXiaR6bGrIleP2Q/FpO1Od6DLPyA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@bpmn-io/feel-analyzer": "^0.3.0",
+        "@bpmn-io/lezer-feel": "^2.5.0",
+        "@bpmn-io/moddle-utils": "^0.3.0",
+        "@bpmn-io/semver-compat": "^0.1.0",
+        "@camunda/feel-builtins": "^1.2.0",
+        "bpmnlint-utils": "^1.1.1",
+        "min-dash": "^5.0.0",
+        "semver-compare": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 20"
+      },
+      "peerDependencies": {
+        "bpmnlint": ">= 11.6.0"
+      }
+    },
     "node_modules/bpmnlint-utils": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/bpmnlint-utils/-/bpmnlint-utils-1.1.1.tgz",
@@ -78,6 +193,13 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/camunda-bpmn-moddle": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/camunda-bpmn-moddle/-/camunda-bpmn-moddle-7.0.1.tgz",
+      "integrity": "sha512-Br8Diu6roMpziHdpl66Dhnm0DTnCFMrSD9zwLV08LpD52QA0UsXxU87XfHf08HjuB7ly0Hd1bvajZRpf9hbmYQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/cli-table": {
       "version": "0.3.11",
       "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.11.tgz",
@@ -188,6 +310,26 @@
         "node": ">= 20.12"
       }
     },
+    "node_modules/semver": {
+      "version": "7.8.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
+      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
+      "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/tiny-glob": {
       "version": "0.2.9",
       "resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz",
@@ -198,6 +340,13 @@
         "globalyzer": "0.1.0",
         "globrex": "^0.1.2"
       }
+    },
+    "node_modules/zeebe-bpmn-moddle": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/zeebe-bpmn-moddle/-/zeebe-bpmn-moddle-1.17.0.tgz",
+      "integrity": "sha512-b+0AKsY90Kg+ewf8fiI9gGQkHhcs/4RTkVtVpKwZMaWvq3GoeBEP91GKxbeOxan7cKD9yQinKazPFb0BSE5lew==",
+      "dev": true,
+      "license": "MIT"
     }
   }
 }
diff --git a/tools/package.json b/tools/package.json
index 044c3e1..a6b568f 100644
--- a/tools/package.json
+++ b/tools/package.json
@@ -4,10 +4,11 @@
   "private": true,
   "description": "Dev tooling for the fullstack bike-leasing blueprint: BPMN linting (bpmnlint) and git hook installation. Run from the repo root via `npm --prefix tools run <script>`.",
   "scripts": {
-    "lint:bpmn": "bpmnlint \"../service/app/src/main/resources/bpmn/*.bpmn\"",
+    "lint:bpmn": "bpmnlint --max-warnings=0 \"../service/app/src/main/resources/bpmn/*.bpmn\"",
     "hooks:install": "git -C .. config core.hooksPath .githooks"
   },
   "devDependencies": {
-    "bpmnlint": "11.12.1"
+    "@miragon/bpmnlint-plugin-rules": "0.5.0",
+    "bpmnlint": "11.13.0"
   }
 }