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 56c75a1..0e5d2eb 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
@@ -182,13 +182,13 @@ object BikeLeasingProcessProcessApi {
   }
 
   object Errors {
-    val `APPLICATION INVALID`: BpmnError =
-        BpmnError("Application Invalid", "applicationInvalid")
+    val APPLICATION_INVALID: BpmnError =
+        BpmnError("Application_Invalid", "applicationInvalid")
   }
 
   object Escalations {
-    val `CONTRACT NOT SIGNED`: BpmnEscalation =
-        BpmnEscalation("Contract Not Signed", "contractNotSigned")
+    val CONTRACT_NOT_SIGNED: BpmnEscalation =
+        BpmnEscalation("Contract_Not_Signed", "contractNotSigned")
   }
 
   object Compensations {
diff --git a/service/app/src/main/resources/bpmn/bike-leasing.bpmn b/service/app/src/main/resources/bpmn/bike-leasing.bpmn
index 67c48f2..258a053 100644
--- a/service/app/src/main/resources/bpmn/bike-leasing.bpmn
+++ b/service/app/src/main/resources/bpmn/bike-leasing.bpmn
@@ -5,8 +5,8 @@
   <bpmn:message id="Message_HandoverReported" name="miravelo.handoverReported" />
   <bpmn:message id="Message_ApplicationWithdrawn" name="miravelo.applicationWithdrawn" />
   <bpmn:message id="Message_LeasingActivated" name="miravelo.leasingActivated" />
-  <bpmn:error id="Error_ApplicationInvalid" name="Application Invalid" errorCode="applicationInvalid" />
-  <bpmn:escalation id="Escalation_ContractNotSigned" name="Contract Not Signed" escalationCode="contractNotSigned" />
+  <bpmn:error id="Error_ApplicationInvalid" name="Application_Invalid" errorCode="applicationInvalid" />
+  <bpmn:escalation id="Escalation_ContractNotSigned" name="Contract_Not_Signed" escalationCode="contractNotSigned" />
   <bpmn:process id="bikeLeasingProcess" name="MiraVelo Bike Leasing" isExecutable="true" camunda:historyTimeToLive="P180D">
     <bpmn:startEvent id="startEvent_leasingRequestReceived" name="Leasing request received" camunda:asyncAfter="true">
       <bpmn:extensionElements>