From e8945661128d6a0a26c9d32d4b283bf179829f63 Mon Sep 17 00:00:00 2001
From: Kamil Patryk Kozakowski <kamil.p.kozakowski@gmail.com>
Date: Fri, 19 Jun 2026 07:44:54 +0200
Subject: [PATCH] transition enricher

---
 .../ast/app/AstTransitionParser.java          |   6 +-
 .../exporter/PlantUml.java                    |  20 +++---
 .../exporter/PlantUmlTest.java                |  67 ------------------
 .../ComplexStateMachineConfig.png             | Bin 160753 -> 160703 bytes
 .../ComplexStateMachineConfig.puml            |  30 ++++----
 .../EnterpriseStateMachineConfig.png          | Bin 31515 -> 31496 bytes
 .../EnterpriseStateMachineConfig.puml         |  12 ++--
 .../ExtendedStateMachineConfig.png            | Bin 19933 -> 19911 bytes
 .../ExtendedStateMachineConfig.puml           |  12 ++--
 .../ExtendedStateMachineConfig.png            | Bin 20494 -> 20472 bytes
 .../ExtendedStateMachineConfig.puml           |  12 ++--
 .../F1StateMachineConfiguration.png           | Bin 228405 -> 228338 bytes
 .../F1StateMachineConfiguration.puml          |  50 ++++++-------
 .../F2StateMachineConfiguration.png           | Bin 263646 -> 263578 bytes
 .../F2StateMachineConfiguration.puml          |  52 +++++++-------
 .../ForkJoinStateMachineConfig.png            | Bin 27875 -> 27856 bytes
 .../ForkJoinStateMachineConfig.puml           |   8 +--
 .../G1StateMachineConfiguration.png           | Bin 101690 -> 101648 bytes
 .../G1StateMachineConfiguration.puml          |  36 +++++-----
 .../G2StateMachineConfiguration.png           | Bin 107180 -> 107134 bytes
 .../G2StateMachineConfiguration.puml          |  38 +++++-----
 .../InheritanceStateMachineConfig.png         | Bin 6884 -> 6878 bytes
 .../InheritanceStateMachineConfig.puml        |   2 +-
 .../KamilEnumStateMachineConfiguration.png    | Bin 50177 -> 50155 bytes
 .../KamilEnumStateMachineConfiguration.puml   |  14 ++--
 .../MavenOrderStateMachine.puml               |   4 +-
 .../OneStateMachineConfiguration.png          | Bin 172123 -> 172067 bytes
 .../OneStateMachineConfiguration.puml         |  34 ++++-----
 .../OrderStateMachineConfig.puml              |   4 +-
 .../SimpleEnumStateMachineConfiguration.png   | Bin 56355 -> 56334 bytes
 .../SimpleEnumStateMachineConfiguration.puml  |  12 ++--
 .../ThreeStateMachineConfiguration.png        | Bin 228405 -> 228338 bytes
 .../ThreeStateMachineConfiguration.puml       |  50 ++++++-------
 .../TwoStateMachineConfiguration.png          | Bin 216044 -> 215979 bytes
 .../TwoStateMachineConfiguration.puml         |  48 ++++++-------
 .../html/HtmlExporterTest.java                |   8 +++
 36 files changed, 230 insertions(+), 289 deletions(-)
 delete mode 100644 state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/exporter/PlantUmlTest.java

diff --git a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/ast/app/AstTransitionParser.java b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/ast/app/AstTransitionParser.java
index dcb7d5d..fbec665 100644
--- a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/ast/app/AstTransitionParser.java
+++ b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/ast/app/AstTransitionParser.java
@@ -240,7 +240,7 @@ public class AstTransitionParser {
                         t.setEvent(Event.of(QuotedExpression.of(resolved).toStringWithoutQuotes()));
                     }
                 }
-                case "guard" -> {
+                case "guard", "guardExpression" -> {
                     Expression resolved = resolveArg((Expression) args.get(0), argsMap);
                     parseGuard(resolved, t, cu, context);
                 }
@@ -248,6 +248,10 @@ public class AstTransitionParser {
                     Expression resolved = resolveArg((Expression) args.get(0), argsMap);
                     parseAction(resolved, t, cu, context);
                 }
+                case "timer", "timerOnce" -> {
+                    Expression resolved = resolveArg((Expression) args.get(0), argsMap);
+                    t.setEvent(Event.of(methodName + "(" + resolved.toString() + ")", methodName + "(" + resolved.toString() + ")"));
+                }
             }
         }
         return t;
diff --git a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/exporter/PlantUml.java b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/exporter/PlantUml.java
index 4a63866..9beade8 100644
--- a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/exporter/PlantUml.java
+++ b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/exporter/PlantUml.java
@@ -116,23 +116,19 @@ public class PlantUml implements StateMachineExporter {
                     
                     sb.append(" <<").append(styleClass).append(">>");
 
-                    if (t.getEvent() != null) {
-                        String eventStr = options.formatEvent(t.getEvent());
-                        if (eventStr != null && !eventStr.isBlank()) {
-                            sb.append(" <<e_").append(normalize(eventStr)).append(">>");
-                        }
-                    }
 
                     String label = buildLabel(t, options);
                     if (options.isEmbedIdentifiers()) {
                         String eventStr = t.getEvent() != null ? options.formatEvent(t.getEvent()) : null;
                         String linkId = eventStr != null && !eventStr.isBlank() ? "link_" + normalize(source) + "__" + normalize(eventStr) : "link_anon_" + normalize(source) + "_" + normalize(target);
-                        // Force a label even if empty to ensure the link group exists in SVG
-                        String displayLabel = label.isEmpty() ? " " : label;
-                        // Brackets [...] in the label break PlantUML link syntax [[url label]], 
-                        // so we strip them for the interactive identification label.
-                        String safeLabel = displayLabel.replaceAll("[\\[\\]]", "");
-                        sb.append(" : ").append("[[#").append(linkId).append(" ").append(safeLabel).append("]]");
+                        
+                        sb.append(" : [[#").append(linkId).append(" ");
+                        if (!label.isEmpty()) {
+                            sb.append(label);
+                        } else {
+                            sb.append("<U+00A0>");
+                        }
+                        sb.append("]]");
                     } else if (!label.isEmpty()) {
                         sb.append(" : ").append(label);
                     }
diff --git a/state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/exporter/PlantUmlTest.java b/state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/exporter/PlantUmlTest.java
deleted file mode 100644
index 44e3a70..0000000
--- a/state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/exporter/PlantUmlTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package click.kamil.springstatemachineexporter.exporter;
-
-import click.kamil.springstatemachineexporter.analysis.model.AnalysisResult;
-import click.kamil.springstatemachineexporter.model.Event;
-import click.kamil.springstatemachineexporter.model.State;
-import click.kamil.springstatemachineexporter.model.Transition;
-import click.kamil.springstatemachineexporter.model.TransitionType;
-import org.junit.jupiter.api.Test;
-
-import java.util.List;
-import java.util.Set;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class PlantUmlTest {
-
-    @Test
-    void shouldFormatTransitionsWithDifferentEnumFormats() {
-        // Given
-        PlantUml exporter = new PlantUml();
-        Transition transition = new Transition();
-        transition.setType(TransitionType.EXTERNAL);
-        transition.setSourceStates(List.of(State.of("States.S1", "com.example.States.S1")));
-        transition.setTargetStates(List.of(State.of("States.S2", "com.example.States.S2")));
-        transition.setEvent(Event.of("Events.E1", "com.example.Events.E1"));
-
-        AnalysisResult result = AnalysisResult.builder()
-                .name("TestSM")
-                .transitions(List.of(transition))
-                .startStates(Set.of("States.S1"))
-                .endStates(Set.of("States.S2"))
-                .build();
-
-        // Test FN (Full Name - Default)
-        ExportOptions optionsFn = ExportOptions.builder()
-                .stateFormat(EnumFormat.fn)
-                .eventFormat(EnumFormat.fn)
-                .build();
-        String pumlFn = exporter.export(result, optionsFn);
-        assertThat(pumlFn)
-                .contains("States.S1 -[#")
-                .contains("]-> States.S2")
-                .contains(" : Events.E1");
-
-        // Test FQN (Fully Qualified Name)
-        ExportOptions optionsFqn = ExportOptions.builder()
-                .stateFormat(EnumFormat.fqn)
-                .eventFormat(EnumFormat.fqn)
-                .build();
-        String pumlFqn = exporter.export(result, optionsFqn);
-        assertThat(pumlFqn)
-                .contains("com.example.States.S1 -[#")
-                .contains("]-> com.example.States.S2")
-                .contains(" : com.example.Events.E1");
-
-        // Test SN (Short Name)
-        ExportOptions optionsSn = ExportOptions.builder()
-                .stateFormat(EnumFormat.sn)
-                .eventFormat(EnumFormat.sn)
-                .build();
-        String pumlSn = exporter.export(result, optionsSn);
-        assertThat(pumlSn)
-                .contains("S1 -[#")
-                .contains("]-> S2")
-                .contains(" : E1");
-    }
-}
diff --git a/state_machine_exporter/src/test/resources/golden/ComplexStateMachineConfig/ComplexStateMachineConfig.png b/state_machine_exporter/src/test/resources/golden/ComplexStateMachineConfig/ComplexStateMachineConfig.png
index 5c21761c568c22df8d94f78e3570c8735bf440d4..6dd9abf43b63d8d9c82cfd8a6b461ffda1539582 100644
GIT binary patch
delta 968
zcmV;(12_Ef=Lx^(36NTUqG?oEbZ~58Zgh2RYybfO004NLomX9R+By(@*RR-{z9gNJ
zv5fgJ)629;p=}y^Gl`p*Or|670-hMjm1R=e>3_d6`9i)Rnfr!!*XJCqkF@Aru9#HC
zA|-!ilFb$jQnnI>f_#CBaYk~~zcFKyDItLij%1$12)M}93S!KECo;)YBKSi%S13`a
zRfZ(LOL+O-LI;^b_)P##*yL^|MZx1!k!rmAd7`k43mKz)h`kB})*N@AqtQH>+;Plv
zpgJ}bTzzE=gwI@4JqE6lUkKsTgIc8sW0A%>aQVO`IZE(79k^g|obZ{(`m?EU&SG(2
z#-}XJH?_Z)Qrtg(lb)eEku2dkj06|k%GOf4)y(6{CgZq;w3^&p;7cmb5}?%E6uF$8
zC;TpAa;87Z_Z-tHAvdpYq0#8WRoUbG_$qoI4JaWGEjNN~c>8uT7s&+s{cZV<Bj0u8
zLwnx$9Pd*{-go2!d)^_>SRFBdp>gwy4nl7@d{esWw$kl?QWyTzX5=jG_n`-aC32M?
z53UDaBTCFtJ5<vK<rA~i4i(s-n#3%%L$z#B0WnMMP;DDji<qT$sE!S)P0Ug|RM!U8
zA!ex^Dzrg$iCJogqMi*aB$ZkR7`3|8Bb8zYn%(oJ>8Z>0)M|Tb`kuOsPp!_UruC`I
z`_yWFYPz3)y6jJ_{-@>!pz9ql9JZT5XFJ-<iT%BtxNE?hS;1s{&E()mp-0)_!IGr~
z(u1R0I9!j@zrCY9X}Yy({0$nqFHN|G<`K)UV09c=8?&Y=dEM|&$TaMe^!fUU9=ti2
z3SnuKi*;kd{$~Z%Zgl@oH?}vuX_4%r+1jWbl0%n&<T{Ea>OYhg!7h?L1pA%?tF^yL
zd~K33le-t-B;D4f9Sx^0sAipx&qO4s%_B~lpf*il+5b+OZJ%Su{`Xy2yZ65#xx9{0
z&(a$w(H@^OaAEm%M5jVz)VD}>($qhtT${1hV9+<htnBk{$u62&WA2G&BqZ*3p^M7W
zn~Dd2T_<a;^Lr}fy^e&td*hrF_VbXuLmrp6dvcL7uD*@VVTm%=*L9%BzUK$W&BJJ3
zz!1lvH=ytJ0<Y(_;B*i{nLZ+iA1}@!7loW4#7VAXGA_#N{t-E2O9qz(SIGi<@K1*P
z?8BF*01Wstk%BMuK}yc9M=u5KpmCBYxI(EimB96ge84FyQl;ORi1KRQgKyEW(Iw}M
q>we8NHga;R@9|2mdhqdt{0pq1K6vg}D}sYJ1cx^S0k<~<0=jSM6z<Oe

delta 1045
zcmV+w1nT?0=LzxW36NTU)M->$bZ~58Zgh2RYybfO004NLotRN`;x-V+-}Ncf+)L6q
zGL|u5Ggsy=Ik+|r*UZJ2mrN!j@B*F~$(3bN+Ua+%49Nv!qcwfQyX^13Uh8k!{+Ma5
zbiPc;PpRVbC8r5r%UsiJ37QK|GBCd(<%(;msE`84B94H<GSzE;8bLNyajIh}w&6^J
z0;$(2knAZIMcvW_xd!?Vq4a`JpXN&DBD$1`;XN;64Mkk42-G(AF7SAJ;{S+-i+K7Z
zAj>E-v5^$|D_;WrO&F<{z-|0D(BSnzuM?mXnM5Y=ZL6gODC#;UaKoc07IVY;celd@
zkK}U^pYbHy?fsK~Qu6tS=oRP-#bc4tu@tiIZ<|*9{mjdmO(#(Y*nV>N1m99o8dJuc
z-6mJ_>sUO6T+PizdCVZ05pw_Y18ubi^tPCBc77Xv3Wto4?Z`{PF8%Ofx{&b{27|hM
z56SyTKCtIq2dQUB-bM1BJ&&|kIy+JV)7JevHVmB6=zXz&svh>HUGxQinZ+o0G8hyG
zkHZxRojnfkhF?QwVtu-eoNptfTyDp=?Rd9>cS*V2j`!^Nb_L%i<#Ic|W5;_HyhqCA
zc6`^4?^N&|QZBdSdv<)cg71=YxgGD@@x2PZN6O`Pd|=1>6}(T%<#s%C?EIj@56E6U
zBES%5IaO<aIb@H3NMPozac|ka4D&BT49uzyW@QUA%)<;ZF{`?mm2J#0A2Y<rtm<S|
zwlc%K%n&oPs+(Ea&TQl7(Wu+@di4@-d)#C3jIsgV&vUM#JFbR*=4SIhJz4Q22X=Dy
zKu<RhAip?gN6Pq(W!xPZcC1WLBlE&?_gFoIwX-{a@3*`e_^-eX_O<oJ=7^oVKbc8s
z85E|v^Gs4XgZ*jv|7RNYLvLGJ#$;*-b)e+{Yq?3s3d|$8rD06uh=yGUVRepQB(7N`
z6Rr-Q04iEHr2_+J7^>Z5;&T~FW?LhujMrGkv-lsCsk<Bp{O@9{!~QR|T)e<B$1)pK
z=!naI>0vClNz;jxDRV6?qcY9!QkWSVZ4BleIxXgWxMfVH(Kh!gGnNVtuR=`9GMl|M
zh}~Hm-M?p2J)1~ycsA%hVZR@ek07GrdkDEnxX|Cn*K`Fci>09K+;v><ynPxjayo(u
zH3oE@zUTCv4!s<Pv`C+k(=RvIG?TfS0*&H-Osja37avH@$Q564`YjhaUP7P#k%GAT
z{QGNw4#g@~QY_7llw947-~Q0`S{JdVx1dZX^lnT(!;I&NHWgD@e9Y+6@8PKBlWQ)_
zyyk`tf?P_&RqH<eazXwBjM|@EtIv4n004jhNkl<ZcwX$?cX(7){>O29cXi!WS9e8&
PAOwdX1Oc}o1OlIL*0~L5

diff --git a/state_machine_exporter/src/test/resources/golden/ComplexStateMachineConfig/ComplexStateMachineConfig.puml b/state_machine_exporter/src/test/resources/golden/ComplexStateMachineConfig/ComplexStateMachineConfig.puml
index ee1136f..65692f3 100644
--- a/state_machine_exporter/src/test/resources/golden/ComplexStateMachineConfig/ComplexStateMachineConfig.puml
+++ b/state_machine_exporter/src/test/resources/golden/ComplexStateMachineConfig/ComplexStateMachineConfig.puml
@@ -34,21 +34,21 @@ state States.STATE14 <<choice>>
 state States.STATE9 <<choice>>
 state States.STATE8 <<choice>>
 
-States.STATE1 -[#1E90FF,bold]-> States.STATE2 <<external>> <<e_Events_EVENT1>> : Events.EVENT1
-States.STATE2 -[#1E90FF,bold]-> States.STATE3 <<external>> <<e_Events_EVENT2>> : Events.EVENT2
-States.STATE3 -[#1E90FF,bold]-> States.STATE4 <<external>> <<e_Events_EVENT3>> : Events.EVENT3
-States.STATE4 -[#1E90FF,bold]-> States.STATE5 <<external>> <<e_Events_EVENT4>> : Events.EVENT4
-States.STATE5 -[#1E90FF,bold]-> States.STATE6 <<external>> <<e_Events_EVENT5>> : Events.EVENT5
-States.STATE6 -[#1E90FF,bold]-> States.STATE7 <<external>> <<e_Events_EVENT6>> : Events.EVENT6
-States.STATE7 -[#1E90FF,bold]-> States.STATE8 <<external>> <<e_Events_EVENT7>> : Events.EVENT7
-States.STATE8 -[#1E90FF,bold]-> States.STATE9 <<external>> <<e_Events_EVENT8>> : Events.EVENT8
-States.STATE9 -[#1E90FF,bold]-> States.STATE10 <<external>> <<e_Events_EVENT9>> : Events.EVENT9
-States.STATE10 -[#1E90FF,bold]-> States.STATE11 <<external>> <<e_Events_EVENT10>> : Events.EVENT10
-States.STATE11 -[#1E90FF,bold]-> States.STATE12 <<external>> <<e_Events_EVENT11>> : Events.EVENT11
-States.STATE12 -[#1E90FF,bold]-> States.STATE13 <<external>> <<e_Events_EVENT12>> : Events.EVENT12
-States.STATE13 -[#1E90FF,bold]-> States.STATE14 <<external>> <<e_Events_EVENT13>> : Events.EVENT13
-States.STATE14 -[#1E90FF,bold]-> States.STATE15 <<external>> <<e_Events_EVENT14>> : Events.EVENT14
-States.STATE15 -[#1E90FF,bold]-> States.STATE16 <<external>> <<e_Events_EVENT15>> : Events.EVENT15
+States.STATE1 -[#1E90FF,bold]-> States.STATE2 <<external>> : Events.EVENT1
+States.STATE2 -[#1E90FF,bold]-> States.STATE3 <<external>> : Events.EVENT2
+States.STATE3 -[#1E90FF,bold]-> States.STATE4 <<external>> : Events.EVENT3
+States.STATE4 -[#1E90FF,bold]-> States.STATE5 <<external>> : Events.EVENT4
+States.STATE5 -[#1E90FF,bold]-> States.STATE6 <<external>> : Events.EVENT5
+States.STATE6 -[#1E90FF,bold]-> States.STATE7 <<external>> : Events.EVENT6
+States.STATE7 -[#1E90FF,bold]-> States.STATE8 <<external>> : Events.EVENT7
+States.STATE8 -[#1E90FF,bold]-> States.STATE9 <<external>> : Events.EVENT8
+States.STATE9 -[#1E90FF,bold]-> States.STATE10 <<external>> : Events.EVENT9
+States.STATE10 -[#1E90FF,bold]-> States.STATE11 <<external>> : Events.EVENT10
+States.STATE11 -[#1E90FF,bold]-> States.STATE12 <<external>> : Events.EVENT11
+States.STATE12 -[#1E90FF,bold]-> States.STATE13 <<external>> : Events.EVENT12
+States.STATE13 -[#1E90FF,bold]-> States.STATE14 <<external>> : Events.EVENT13
+States.STATE14 -[#1E90FF,bold]-> States.STATE15 <<external>> : Events.EVENT14
+States.STATE15 -[#1E90FF,bold]-> States.STATE16 <<external>> : Events.EVENT15
 States.STATE16 -[#FF6347,bold]-> States.STATE17 <<choice_type>> : [guardVarEquals("value1")] (order=0)
 States.STATE16 -[#FF6347,bold]-> States.STATE18 <<choice_type>> : [guardVarEquals("value2")] (order=1)
 States.STATE16 -[#FF6347,bold]-> States.STATE19 <<choice_type>> : (order=2)
diff --git a/state_machine_exporter/src/test/resources/golden/EnterpriseStateMachineConfig/EnterpriseStateMachineConfig.png b/state_machine_exporter/src/test/resources/golden/EnterpriseStateMachineConfig/EnterpriseStateMachineConfig.png
index 2de58f522eab62cef417d7b5851ce9d3dff7b1d1..7fbce79e2e7f56cd903430bd700c5559a0014c77 100644
GIT binary patch
delta 687
zcmV;g0#N;%_5q0Y0gzgMlW9~~bZ~58Zgh2RYybfO004NLjg;GN+CUJ7@AoOD%1x+B
zgcFh`C`C2KPE3qr5r-;`BDB~OSjFB&>oqB@`ec2FK2z6V4vneQJNujY|C!m-=S)$l
z@-!juW|B@)3JG0^TtSwiqMVWp^*7F_q)JHOf+Lx-7y;9nT0o3{StQv^F~L_jQz%iW
z#SBUI!g!%eHKYpR2Lb5N=w%{B&SOg?+V6GB6c${_80Cr`Tr}y)_<TddDT`h>W*Hco
zIf5&nrU)+ArAlzez9U?$f7BvD7>gv<V6dtsIZ8NgXb{jiW_+T(e(rWSrLlM|_%lti
z-QG<p#p|YM4^>BhQpPjr3oiDhEn7K%8!0D?#_=f{Z-cu7ZbR{mfnhXuo19NP#$Q4z
zCwfyx879w!JidQ|dc6(4{e_U#LR;6ibu%)Drt6s<*K@-MxV(&}f<@SF6QVPr{&-;6
z7Y)bxP^{CF*6$VJH@(K3Chaz~An;7f9^DSQ_JHik)|QTcb9U1FxUmduzw7!}qriOV
z+kUudVpJTDrRC%AUr%tj+~rS=+W)y)rf=DvXLtAbl~zWLyscdwI56FAWkmC#9B>(}
ziteu6Ah0XC0++&dMpfIjJ$Gmis%ppeP0#&m|EuWk#D57_fwJ({zUnZr!~20>HCXY|
zfNbj&2TC7*tX<ENY@F8MGxE52K1h&IuI~FD%u#0gJpkkAxN+P(IynrdIXE~5<5XY4
zR<qG+oPuSCP=ssb@G9^i6S<5KVwNe%#(D9c)JTucDGYM1Sc)yUogwdaZ`J^8K4((!
z6uBb3VSk%&)~t7!f;*JD6BzbM7oTaKD6NP@aravxa34DLbK+4x$>~IUBPW)AD3n~Z
V;HpFZ05biQ&@n+jfwKt%5_l%hRD}Ql

delta 706
zcmV;z0zLhR_5qvr0gzgMrfF1IbZ~58Zgh2RYybfO004NLjg;MP+CUJ6@AoOD%1x+B
zgcFh`C`B>GPE3qr5r-;`BDB~OSYhv?^_rAceX_nopQ&qpEud2Gm@_-yoE<N7lPM}y
zo+jkORMJsOA)#}TE67q*lv9$S{*6;AsS*;n;7G<SM!<Bc<`83l7D+Z$Oz@?gDU>MG
ze2OHSFkaN9TBHi$Cjn^DXfl!_=dmRc&3hj+g@rC;jB=?RUDfH?@N%PuV-`&~W*Hb-
za|BmDO%YtKTdjmg_5<N+9jJMNFce9wh2FB4<S5~^riFmUG2<i6`c-x~rm=W0^f#Jh
zW$&hx;(gP!gQ_KeDdQP*1s8{oEv#JbW>z<ghVeNXyUFqex2br_z%XiMle3Y>_#~uq
zq(90a!{m*SmyfSdtv128zY?+>v~_1&_XD$Ux}Mo`JvV%Y>+5JNScJ_cA^Id#Uycm>
zs^&PKiaEXN`h!LIUC)@)q}eQjLExE|J$UG~?VeT|P>RWafqLD<aW2m4pEpec+i$!6
z?I19pyS5*0Yz>MBvp~N5`TYvVi|_uWR{1}wW%`!wd3O5%Z-p`{WViSJ2m;e>AGoyn
zT)y%;B8$`ekjFbW2<!u#B2fZuL$WT}hqZ0b?c2RWILGx(&;4dEVC&#trpgoA;Ve@n
zV`YJC4eUdIdv^HL^A9nXnG&-s5VCbsJY4;N%WYQ52EG<<kjKTEB0)mAdg^*GLz(Hl
z1IEc|?X-S!b{vj#aBv95x&Es+>a|Ag94tG8B3&WJw}A(l$Yq2OvrI`g%!|EMAssrS
z(95}EDK_9?ioDalUkhOK8Iyvi$Q9}IyW0a7^=gYWDR@Mwoj|`!+W1EEMCpo16g#E?
oPoY!2Bp&6XoQ^abIkEIYQgYsa+ZOo?dDF6jlpV3nv-ScKc!<GX1^@s6

diff --git a/state_machine_exporter/src/test/resources/golden/EnterpriseStateMachineConfig/EnterpriseStateMachineConfig.puml b/state_machine_exporter/src/test/resources/golden/EnterpriseStateMachineConfig/EnterpriseStateMachineConfig.puml
index 77f98b3..4a4d240 100644
--- a/state_machine_exporter/src/test/resources/golden/EnterpriseStateMachineConfig/EnterpriseStateMachineConfig.puml
+++ b/state_machine_exporter/src/test/resources/golden/EnterpriseStateMachineConfig/EnterpriseStateMachineConfig.puml
@@ -25,14 +25,14 @@ skinparam svgLinkTarget _self
 
 state CHECK_AVAILABILITY <<choice>>
 
-NEW -[#1E90FF,bold]-> CHECK_AVAILABILITY <<external>> <<e_PLACE_ORDER>> : PLACE_ORDER
+NEW -[#1E90FF,bold]-> CHECK_AVAILABILITY <<external>> : PLACE_ORDER
 CHECK_AVAILABILITY -[#FF6347,bold]-> PENDING_PAYMENT <<choice_type>> : [λ] (order=0)
 CHECK_AVAILABILITY -[#FF6347,bold]-> CANCELLED <<choice_type>> : (order=1)
-PENDING_PAYMENT -[#1E90FF,bold]-> PAID <<external>> <<e_PAY_ORDER>> : PAY_ORDER
-PAID -[#1E90FF,bold]-> SHIPPED <<external>> <<e_SHIP_ORDER>> : SHIP_ORDER
-SHIPPED -[#1E90FF,bold]-> DELIVERED <<external>> <<e_FINALIZE>> : FINALIZE
-PAID -[#1E90FF,bold]-> CANCELLED <<external>> <<e_CANCEL_ORDER>> : CANCEL_ORDER
-DELIVERED -[#1E90FF,bold]-> RETURNED <<external>> <<e_RETURN_ORDER>> : RETURN_ORDER
+PENDING_PAYMENT -[#1E90FF,bold]-> PAID <<external>> : PAY_ORDER
+PAID -[#1E90FF,bold]-> SHIPPED <<external>> : SHIP_ORDER
+SHIPPED -[#1E90FF,bold]-> DELIVERED <<external>> : FINALIZE
+PAID -[#1E90FF,bold]-> CANCELLED <<external>> : CANCEL_ORDER
+DELIVERED -[#1E90FF,bold]-> RETURNED <<external>> : RETURN_ORDER
 
 CANCELLED --> [*]
 DELIVERED --> [*]
diff --git a/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig/ExtendedStateMachineConfig.png b/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig/ExtendedStateMachineConfig.png
index 590ac21296d7c4bf689b730c8d5f12f44f9e0812..caf7c05c4023bd4a564e22701a9e71c90277554f 100644
GIT binary patch
delta 603
zcmV-h0;K)jn*qn00gzgMKxtH1bZ~58Zgh2RYybfO004NLm6Ks_+At7?zx!9*)GzHc
zD$>H#q6!s)VX#0^V$h_jLWUf{BC#Xep<~nj`<y`wqLZqAO7h&@d+*t~dt<q_MV69J
zx#mg6A>~_DSTGq{E;%vi-ZAHzTctrNiDV^W1k7@~g&563i`)u-C3o0Z)Trz>M`G4O
zmUWqf+#>uY0ByclCt4LU_EqZio>#(R$(4>#@7URGjbG1iUMX9N#af~<;5pV+(vEnB
z(3h^&9z^07!tKk4-KGe0mBtQ)yIxwNhO4RrV;;vsCQj?mvBMRQ)pN<0JT=GOTUx8<
z*QNusZOw%=FjP{1{V(mGm7CMZezL_puA_GvJRa~6igN*;S3NelNdh6)jO)Z*%FJN8
zB;@h)6I3cq=#Tnr7O@tigb?=(8B`w6JbGL0cE6N|@#K=m;e$`3s6Xn#-5vgP2Pk>k
zY(fK~Nqgu7=#-8aIZAu0;Xe$=0cEsvD$#WoqHpgMw?;mH4T87DyTHEx$L)u-<+J{j
zz9X>XC$+6f=XLUrccwoW4M(kD#=?HDM?*pmGnV(_?uQ(X?1kK;jLW4X<CIG~83wRH
zZQK@tcX?I4s$E{6vsD3IoP$?)KW?K|ZB*;vQwC-Df}Hop0T@;21wt&0)nZ<hTX;bR
ze8V9uq!k%WHsB#gIp}<U0YK$OXeBe0mJFuDL&Dcur7bK(sGSp-4oL@>yhyF9Sg3Mi
p8Zcqq$_)v)ObVVjZIr}!>t*$}0lhZ)3%jFQu_RK<QM0)MBuk#>D186`

delta 653
zcmV;80&@Mwn*rUM0gzgMR%ujNbZ~58Zgh2RYybfO004NLos(~G+At8t-}_VC)Hm%k
zD$>H#qN*wc!(f4;#Gpx4g$%g{i^Ps>hmKAA?sH08(m&IrzOwy0`?<$w-<7dk+agQJ
zr(E+S<B;;LDlC``Eti}abaTwP=2mHtN+MZ_7y+}~ZXrgq)FQWkLdhLA7Bwon&5@Y3
zkmb3|L2eO#6Mzn1t`n^a8T%@AdiN_~vE)j}sCVq(yunWwXU~+a#Bwds81NkHDQU+%
zLl{Vx>JdcZ7sC0|!fsQ9g-T-w!d)&cQNu~yfeDXeArq(dr|NLUV|8EhJD!@V_qNvR
z{yFIoZAWt<4UCk3RPSwjuyXb~@_4i5B5tDhI#|8nJ{0EyJg;6gxk&;c*Np4LJ<8l*
zdPm63=Ub@NE@3bpuzAGVj1ofJ7&55c9C-A+-s^oSi*f5VO~PxRM$us0hl>mR=?W-$
zdU;tc=Fzk>auRe#$IPJ?Q~{}+d@Ji;k0t?SwEI@I=X^zf-yZaK)Bh;7$36{$_mp;_
zioYuO(2Yad_Ss-YE1ECSKUH`9jbMA)eNn;6`a=fk4@SdrJD9U@(C^dmLG(2wWM8!M
zBe)Mi_7Czzu29Bhmy=1#rJarf*q}D9ZNWP}sh>2CPY>CufF3TuYr0NpHR`Q;6MV{`
z3?Grh{v-f@qYAx5h=s9QEQ+%2kI0a3IE00?BEuG3=O~BW?@s`z+z72?hSHMZY_#9-
zwNdK`3lVDP1ZE@B#XDZ4)}2_YvPD}kWxd)N3AjuOo;Yok#CQE{^|l554*3gr>U$sx
nhYO1U080!>L_t(|UhSO+cooIk$3eZ<hP^jBC`F{RzXAwLq;y3Q

diff --git a/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig/ExtendedStateMachineConfig.puml b/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig/ExtendedStateMachineConfig.puml
index eac246a..d16ef6b 100644
--- a/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig/ExtendedStateMachineConfig.puml
+++ b/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig/ExtendedStateMachineConfig.puml
@@ -24,12 +24,12 @@ skinparam svgLinkTarget _self
 [*] --> INIT_STATE
 
 
-START -[#1E90FF,bold]-> PROCESSING <<external>> <<e_SUBMIT_EVENT>> : SUBMIT_EVENT
-PROCESSING -[#1E90FF,bold]-> COMPLETED <<external>> <<e_FINISH>> : FINISH
-PROCESSING -[#1E90FF,bold]-> CANCELLED <<external>> <<e_CANCEL_EVENT>> : CANCEL_EVENT
-START -[#1E90FF,bold]-> PROCESSING <<external>> <<e_REACTIVE_EVENT>> : REACTIVE_EVENT
-START -[#1E90FF,bold]-> START <<external>> <<e_AUDIT_EVENT>> : AUDIT_EVENT
-START -[#1E90FF,bold]-> PROCESSING <<external>> <<e_EXTERNAL_TRIGGER>> : EXTERNAL_TRIGGER
+START -[#1E90FF,bold]-> PROCESSING <<external>> : SUBMIT_EVENT
+PROCESSING -[#1E90FF,bold]-> COMPLETED <<external>> : FINISH
+PROCESSING -[#1E90FF,bold]-> CANCELLED <<external>> : CANCEL_EVENT
+START -[#1E90FF,bold]-> PROCESSING <<external>> : REACTIVE_EVENT
+START -[#1E90FF,bold]-> START <<external>> : AUDIT_EVENT
+START -[#1E90FF,bold]-> PROCESSING <<external>> : EXTERNAL_TRIGGER
 
 CANCELLED --> [*]
 COMPLETED --> [*]
diff --git a/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig_PROD/ExtendedStateMachineConfig.png b/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig_PROD/ExtendedStateMachineConfig.png
index 0bbb40be07e4aaa1adc0758d571f2837b3316e19..0b716e1d185467aabbf2394347ae22a79bbfd47b 100644
GIT binary patch
delta 604
zcmV-i0;BzopaJ-w0gzgML1|Q2bZ~58Zgh2RYybfO004NLm6Kg>+AtJ`@BJ&z)SGr1
z6=~_zqN-{LhJ^)+5`!jH6*A;BSR{62J9KQ?f1fkjg6O2Gcky#R-t&=jYb@8cDsu9v
z)I2LV<b0zl3#LHJB_{^mH<ny;t29U@kt{`ufJJFHkfK>=QCgvY<Q5x?8kOCYNX$ye
zI<9b#TZG>Ppu-odOsh(!fy!OJr=_r1bEQ+%TXuBS;^*_rSIU-Rv65&Ec#idyv?E?1
zgwjbpgGBs7xO#cmO^z^EdFnvC)zT6*oHZR7^E4GQbGiQPSGeS<daC&&&&_`AzSipL
zRdj&1qq&d<hDxe`|GE7u<?_(-+}UEDUZ8hq+;4DaN=pHr*W531okc>f7}uFw%FJN?
zNXY%?2WT{IU>x6dXW=Mhp&t=K66VJY8uv#Yy=wM)U+Qr@Y~2EyB;lwJ*Vp*djZpIZ
z<_6l3Ogh7m&FGYl7};}sn<Kazjw8xw_b^4z=_lXb3HC>S0ga-!!CS+#{>RIYsUNU#
zO5aJa<p;6;r2E?W$Cc?1M&pqm%~%}v`!ptG*JHgIw;{3{*$cTvnbv1V#yOXEGK^r2
z+PFIc@ARyB);c{uX3GkCI0x^-{krW|v)#OafHJ7fC*-(4j=-o&FA!2;tQPaCzQYqT
z;A;+XC9Nn<unl)5%0c)03jiwDLMvIIv}7<H?i{|h8XaLFLG3Dm>5z2skyp8O5erq{
qOdBSw*SI7Rms!O#mm4Js+<{rWX+yt5{sLB(TRT?#tyHtR0#r@ia4s|e

delta 653
zcmV;80&@NMp8<}b0gzgMS7}sObZ~58Zgh2RYybfO004NLos(~G+At8t-}_VC)Hm%k
zD$>H#qN-{LhJ^)+l7J>v6*A-+ED{^p4jr5J-RCrIN&iff`p);e^W(>7-<38@nIg}~
zr;TE1&LCquSs2hc8YURgXxF%5iW#XuNP%R<69mjRW(NuCrQ#cZ!=<ROHmFdV-3EzX
zb5ZWgEo27aHv#Cf<vLZe5Q!%<t9QTR21_ngf~sN%=Ph=+ID4k?iZ9m!wFbwsz7%H6
zas*%4qaH!Te<7Sd1!k8aEM%5g5LRa?feKEV7ED-@aFJTAKXr#ImdN{(-?2>By}L@u
z`{zT4Xu67Vp<yI{g?z8<!OGd|%;U|Li=>Ut>ty|c`&6>w;5f~?$!!{Nv5uKa?W4>!
zW_N_#e7=Q7;}Ry}b#LyE{n&Q{LP!+5VGNC%1BaeB`~5FvJ8r8ok4BL{9>B!~{<JL=
zEW5lcgLyRVj{JB|XLKA})PXu6wViKez3b5=pfT;eRqb1UQ_;5vy=wU%C3o!6Ab3xy
zO4a<;!G~@fQrC<98Ler)ME_K+_!~iY+I!K#TKpk{^hZp?u^Y_e&>swF_#pZk60&bv
z`4#M!Ao~Y-B3CGqa?Z&lW5P^F0c=reJGkH+pEOTe$ESz!s(?N&z-ilA>9m@iW*a;j
zLzzAzhl5Ff09qDmiI8w@6kinO;2)78+cF3XVR()mxZa=`_P##>pkm9F6gdh*hO^PW
z;A^YV<pv^D)(Ol;q=$E`$c){wl;x0iU>f%uXCz=EEm&%`Q4r5gv{Abb47%hmPse+z
n1X%Ps002!qNkl<ZcwX(D2Y3`k|HrYsie0h1`uCNyzXCZ;fqXpQ

diff --git a/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig_PROD/ExtendedStateMachineConfig.puml b/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig_PROD/ExtendedStateMachineConfig.puml
index b5b41c6..2802341 100644
--- a/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig_PROD/ExtendedStateMachineConfig.puml
+++ b/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig_PROD/ExtendedStateMachineConfig.puml
@@ -24,12 +24,12 @@ skinparam svgLinkTarget _self
 [*] --> PROD_INITIAL
 
 
-START -[#1E90FF,bold]-> PROCESSING <<external>> <<e_SUBMIT_EVENT>> : SUBMIT_EVENT
-PROCESSING -[#1E90FF,bold]-> COMPLETED <<external>> <<e_FINISH>> : FINISH
-PROCESSING -[#1E90FF,bold]-> CANCELLED <<external>> <<e_CANCEL_EVENT>> : CANCEL_EVENT
-START -[#1E90FF,bold]-> PROCESSING <<external>> <<e_REACTIVE_EVENT>> : REACTIVE_EVENT
-START -[#1E90FF,bold]-> START <<external>> <<e_AUDIT_EVENT>> : AUDIT_EVENT
-START -[#1E90FF,bold]-> PROCESSING <<external>> <<e_EXTERNAL_TRIGGER>> : EXTERNAL_TRIGGER
+START -[#1E90FF,bold]-> PROCESSING <<external>> : SUBMIT_EVENT
+PROCESSING -[#1E90FF,bold]-> COMPLETED <<external>> : FINISH
+PROCESSING -[#1E90FF,bold]-> CANCELLED <<external>> : CANCEL_EVENT
+START -[#1E90FF,bold]-> PROCESSING <<external>> : REACTIVE_EVENT
+START -[#1E90FF,bold]-> START <<external>> : AUDIT_EVENT
+START -[#1E90FF,bold]-> PROCESSING <<external>> : EXTERNAL_TRIGGER
 
 CANCELLED --> [*]
 COMPLETED --> [*]
diff --git a/state_machine_exporter/src/test/resources/golden/F1StateMachineConfiguration/F1StateMachineConfiguration.png b/state_machine_exporter/src/test/resources/golden/F1StateMachineConfiguration/F1StateMachineConfiguration.png
index b3d8485add66ef8f7d59091e19a44a655804a5ef..8da832e7c7fe48dcba609f46ed278808b3b3479a 100644
GIT binary patch
delta 1096
zcmV-O1h@OO_zm*+4Uk%Y9cffpbZ~58Zgh2RYybfO004NLt(a|d+Bgu$-|JK8(l<$`
zWGrJIr^hs*rq>j5nZ(T`&14vX7x2VLK3OKmb^6^;hJ@N2mJHW-u)F^KSF5!i{2`W9
z$YdU(-y%V$bBaT{<cY-b93*8F#h`veL<N;xV8$7sS>OYPc_f#A*oSy5f=C9Ot<A9n
z0bDL4K=D(+(&y&NNG0I!2;*})ewqrNFu%(~#e1Fw5>h)CK8UsLP0OLxQFCMUX2JN0
zK^$YEY(388C7lEQ%#_rN;U@S8aO?GtT!w&0JoJ^}daWfG2y9!*a7BGTU{l5Vk<D;M
zeg2%<Cp3(+xt|Gt!Jjvx7a-3C4Ool^obg>@t5llXo|lo0M}7^+wlh1xpDsTNFd<ep
z$;GrEuqTg-shX5w4B-T!hqsToQt9BEw8ru2jd$j`1fg}wv&MV;{{48ygE4eEJKUsh
z@HY(prorFR`)$kcJTdrfgWu8n4e1$1mlH=hU0iv1L)?~s)$6@Wd-8E>uF@yrZ`I0-
zhMf*>V|M{e#;5MBd+8CB57ncpI+Ts_p?Z{~Lsd~eRFA6ZP!7t6>QQwas)q8RdQ?M)
zs-t|U9@W&L8YmyCN40dQCd!BEQN+@*T4*cQ03+Hiwa`|ufu`^IeA5$C*As2qlYHM3
zQ{xkD=aYPY>l0J&6K(U8eD@Pm`x9;dlUmtzr+aqUb^AKja2-;1^*IcvnTo@Jn%OuE
zsF{#op5bPXE(G4Ae5gY8diAQ)*onH^>`24(G`6BWOcN^nTPobY5_QZuK3dQ)0djQm
zh>urCt>3May+pq45P2byJc-l|sLc7|e<W;{X_l6Mu`@DzkET^z8GDP>Ft9QwqwSPe
z?ePatg?&wZw)#ho-W^Ri*A&X6nmG>|=eBuBHFg)hs!7=-v$IeIDYr~1m&sUwx*cf}
zHi_(!ux%Mwwf&pKR!uUZqIdvC(Op$4C^#{ps%0uZ<sK)x9x=)|rDYt=`)`!lH5~=-
zzincF6~F(vl+(L4u{5<Y3hgnSj)`TLNjl^_BDN-FqfGf#%Jedp+8AO9QCjEXlua_F
zwz*fC0T)o*g(fLYZMJ&Qw6d03zb9NgD@&`mHpYEokM+=Sk{Y^q-u2l~dvCe>FY%xq
z;qYD9q?s8-xw32?C{-Qp&FOwmaOo5A(B4IV{uS2?Mb4qWt-g#synRF;fcfc1PIMJg
zCch5)cmW~~IK$-BwruCLdhE>-+=CHTOSf&c9jk5CaM$&4>OMiopRW2i=7|^s_Jdf8
zV3ed^Jx|aDT~K_TFd59DjsJ{*U3~oVYQQdA1cI}<$`xJQ4t@sIoyvJ2@eK%-3BDaJ
zppP)2NhsA5W1fDYY~!z9uhK+)%2bz46&o1pa>W(PHvV*u{sqrX%#Aed(<+0*1c$=}
O0f)l`0=L5i19EpqDkl#B

delta 1177
zcmV;K1ZMm4_YJl94Uk%YU};oXbZ~58Zgh2RYybfO004NLy;yB?+BgvYu3w=`za*WK
zv5a{!(_@;X(7PPuGKrf>n#nK%3-H89oGg>loBQu4LqctAv?iCiZ?Nlqp4Dm}Y3)yu
zqEf}P5dAWjbTXqjq)QPi9L<=boT7;7-)v4LRYGDeI78FGXPC`@=4y$37L8;uSApPb
zbEKGLLM`VEMUMeb;%3@N6~licj8Ez4aUw;`{WB42yr*fPSYj8_XL4<O=Q^}HY;LUH
zG#EW{7Dbq7TUT&(L1zsA&NbDu;X3%iu>0~yEklNfBJ{Q4YRx4%li0Sj;gb4(z$Y5(
zpLB*(>WinuKBi%Rl+OJ`O7XNIJ!k4v(tt;}FSsarY?VrL+w;7#(a^6kvh7SS@Tbe4
z2bd5mo#bND3;3f)<wS4FAY$Pdq5Jm_xKe53>!ilf@wIp2bqGT1lBbP#_~XaXR0Jc|
zZWp*o9q=~*e-rS#X1{F#@dWVOfZs9uf%JgYWyn#67gz3o-;s`Mb-N#uo_yHat0a<r
z*R9NH*ls6(2Au`tDjIZdIu{<%wiaGnj@K5H4L8GA&G2>(-bUGQGrVJlujb&ZC>w5u
zubJVU9K3_F;b!={8NQZ-uc2(X8NOkLujk<FC>w5uZ<^s7Irs+3hMVDCGkh}#-$dDP
zGd!`(_-+n=-$h&T009A%W#y%1p)CY}0upb5db9E+kbVguV3Job$x4_&8YX~<NnXVy
zD`Nubm;gd1c_ovqlnJC|0*IO9)l6z-PwKOii?dG8OfXnKlw*0emp!%Ln#!>IZ%t+B
zg14qJbi@C+s?A(wpt{SE+@Wl^hVORkRi{x1f4iA~EC$I`y+XU6#8mn>RCfM~^|*R?
zu%Kbg$idMAK3t8=zgkCok$fv4c}5~xBvJ>UQgh;eNEoJRmZq^&G<&bc-CY@b3#$QO
zr6%0%lvnNX8>1TbCH3j*A36ANFc!j4D2O#R*Moc8d`&fqi(WOP4AB%8YDda0lyaGj
zCDU(zxrT%xl06c(EdZ;wf0Nj{NrqJJUI0j1RHYpSClFM%OvNX{6U5XbAdOR+#xdw0
zq$%2t9s0K+tlj$0q?~*sA(o*wAkiM%=|EU^nWRG@=EOFn4APW8r64hux)>tG=1HA*
zrwq}Qy5?SJ`a-hZT?kPbYO~dY(8*fr{2mK``J^rG?%II&#2)7%FkKBgx8Bvs0C<<X
z%?(+%d6rk*60g6RA<opw%9UypP^x0Udm}WK!eo2Q*@OH`>c&&V`ZljeM%E1Nx78Qa
z`}Ys%6XSmJF&tfnl&i1(9$qjR1%hL8Y+JT-Ts`!rG48S<)>ngVwH&Ku)$m!z!-@NU
z2pxX8?BPhna>TG7L`nw3IQcq$gwE-L;;WdeV8&Yb&pG4gpZ|C<;0|8|Qt+A16`kMo
ze?CxmDyM<M*G%e6@J%0mW@8$MN=J-D@+G^4zk1zD6ZI(99Xrw3jH5H5apkgwznr3f
r0l12Ln?Ec(=KuhJ07*naRCr$O-3NGsjs%B}1ObPR1Om5?1OsGuCWcOP

diff --git a/state_machine_exporter/src/test/resources/golden/F1StateMachineConfiguration/F1StateMachineConfiguration.puml b/state_machine_exporter/src/test/resources/golden/F1StateMachineConfiguration/F1StateMachineConfiguration.puml
index d842d14..dcb4963 100644
--- a/state_machine_exporter/src/test/resources/golden/F1StateMachineConfiguration/F1StateMachineConfiguration.puml
+++ b/state_machine_exporter/src/test/resources/golden/F1StateMachineConfiguration/F1StateMachineConfiguration.puml
@@ -36,27 +36,27 @@ state States.STATE9 <<choice>>
 state States.STATE8 <<choice>>
 state States.STATE2 <<choice>>
 
-States.STATE1 -[#1E90FF,bold]-> States.STATE2 <<external>> <<e_Events_EVENT1>> : Events.EVENT1
-States.STATE2 -[#1E90FF,bold]-> States.STATE3 <<external>> <<e_Events_EVENT2>> : Events.EVENT2
-States.STATE3 -[#1E90FF,bold]-> States.STATE4 <<external>> <<e_Events_EVENT3>> : Events.EVENT3
-States.STATE4 -[#1E90FF,bold]-> States.STATE5 <<external>> <<e_Events_EVENT4>> : Events.EVENT4
-States.STATE5 -[#1E90FF,bold]-> States.STATE6 <<external>> <<e_Events_EVENT5>> : Events.EVENT5
-States.STATE6 -[#1E90FF,bold]-> States.STATE7 <<external>> <<e_Events_EVENT6>> : Events.EVENT6
-States.STATE7 -[#1E90FF,bold]-> States.STATE8 <<external>> <<e_Events_EVENT7>> : Events.EVENT7
-States.STATE8 -[#1E90FF,bold]-> States.STATE9 <<external>> <<e_Events_EVENT8>> : Events.EVENT8
-States.STATE9 -[#1E90FF,bold]-> States.STATE10 <<external>> <<e_Events_EVENT9>> : Events.EVENT9
-States.STATE10 -[#1E90FF,bold]-> States.STATE11 <<external>> <<e_Events_EVENT10>> : Events.EVENT10
-States.STATE11 -[#1E90FF,bold]-> States.STATE12 <<external>> <<e_Events_EVENT11>> : Events.EVENT11
-States.STATE12 -[#1E90FF,bold]-> States.STATE13 <<external>> <<e_Events_EVENT12>> : Events.EVENT12
-States.STATE13 -[#1E90FF,bold]-> States.STATE14 <<external>> <<e_Events_EVENT13>> : Events.EVENT13
-States.STATE14 -[#1E90FF,bold]-> States.STATE15 <<external>> <<e_Events_EVENT14>> : Events.EVENT14
-States.STATE15 -[#1E90FF,bold]-> States.STATE16 <<external>> <<e_Events_EVENT15>> : Events.EVENT15
-States.STATE1 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE2 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE3 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE4 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE5 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE4 -[#1E90FF,bold]-> States.STATEY <<external>> <<e_Events_EVENTY>> : Events.EVENTY
+States.STATE1 -[#1E90FF,bold]-> States.STATE2 <<external>> : Events.EVENT1
+States.STATE2 -[#1E90FF,bold]-> States.STATE3 <<external>> : Events.EVENT2
+States.STATE3 -[#1E90FF,bold]-> States.STATE4 <<external>> : Events.EVENT3
+States.STATE4 -[#1E90FF,bold]-> States.STATE5 <<external>> : Events.EVENT4
+States.STATE5 -[#1E90FF,bold]-> States.STATE6 <<external>> : Events.EVENT5
+States.STATE6 -[#1E90FF,bold]-> States.STATE7 <<external>> : Events.EVENT6
+States.STATE7 -[#1E90FF,bold]-> States.STATE8 <<external>> : Events.EVENT7
+States.STATE8 -[#1E90FF,bold]-> States.STATE9 <<external>> : Events.EVENT8
+States.STATE9 -[#1E90FF,bold]-> States.STATE10 <<external>> : Events.EVENT9
+States.STATE10 -[#1E90FF,bold]-> States.STATE11 <<external>> : Events.EVENT10
+States.STATE11 -[#1E90FF,bold]-> States.STATE12 <<external>> : Events.EVENT11
+States.STATE12 -[#1E90FF,bold]-> States.STATE13 <<external>> : Events.EVENT12
+States.STATE13 -[#1E90FF,bold]-> States.STATE14 <<external>> : Events.EVENT13
+States.STATE14 -[#1E90FF,bold]-> States.STATE15 <<external>> : Events.EVENT14
+States.STATE15 -[#1E90FF,bold]-> States.STATE16 <<external>> : Events.EVENT15
+States.STATE1 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE2 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE3 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE4 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE5 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE4 -[#1E90FF,bold]-> States.STATEY <<external>> : Events.EVENTY
 States.STATEY -[#FF6347,bold]-> States.STATEX <<choice_type>> : [guardVarEquals("value1")] (order=0)
 States.STATEY -[#FF6347,bold]-> States.STATEZ <<choice_type>> : (order=1)
 States.STATE16 -[#FF6347,bold]-> States.STATE17 <<choice_type>> : [guardVarEquals("value1")] (order=0)
@@ -82,12 +82,12 @@ States.STATE9 -[#FF6347,bold]-> States.STATE7 <<choice_type>> : [guardVarEquals(
 States.STATE9 -[#FF6347,bold]-> States.STATE6 <<choice_type>> : (order=2)
 States.STATE8 -[#FF6347,bold]-> States.STATE9 <<choice_type>> : [guardVarEquals("forward9")] (order=0)
 States.STATE8 -[#FF6347,bold]-> States.STATE10 <<choice_type>> : (order=1)
-States.STATE2 -[#1E90FF,bold]-> States.STATE_EXTRA_1 <<external>> <<e_Events_EVENTX>> : Events.EVENTX
+States.STATE2 -[#1E90FF,bold]-> States.STATE_EXTRA_1 <<external>> : Events.EVENTX
 States.STATE2 -[#FF6347,bold]-> States.STATE1 <<choice_type>> : [guardEventHeaderEquals("header1","foo")] (order=0)
 States.STATE2 -[#FF6347,bold]-> States.STATE_EXTRA_1 <<choice_type>> : (order=1)
-States.STATE_EXTRA_1 -[#1E90FF,bold]-> States.STATE_EXTRA_3 <<external>> <<e_Events_EVENTY>> : Events.EVENTY
-States.STATE_EXTRA_1 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL_2>> : Events.EVENT_CANCEL_2
-States.STATE_EXTRA_2 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL_2>> : Events.EVENT_CANCEL_2
+States.STATE_EXTRA_1 -[#1E90FF,bold]-> States.STATE_EXTRA_3 <<external>> : Events.EVENTY
+States.STATE_EXTRA_1 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL_2
+States.STATE_EXTRA_2 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL_2
 
 States.STATEZ --> [*]
 @enduml
diff --git a/state_machine_exporter/src/test/resources/golden/F2StateMachineConfiguration/F2StateMachineConfiguration.png b/state_machine_exporter/src/test/resources/golden/F2StateMachineConfiguration/F2StateMachineConfiguration.png
index 5d5b549db369b952aad4447079e1a7af5507cacc..43ad3887f5959c9be797b9dee0f6be303b81c19f 100644
GIT binary patch
delta 1107
zcmV-Z1g!hsix8TN5Rh7bBxzJwbZ~58Zgh2RYybfO004NLt(a|d+Bgu$-|JK8(l<$`
zWGrJIr)8Q@(>4cbCUG-uGZ{u;0iGC%$}&0Hx$k~5B-CbXt;z8Yc2~dsd$rbs-$#l{
z70*NT*Fw_ioZ^tKM67T$XNq!)BBp<{1(j3@iMikm%>ticHeaZJ74}&)mcc>=f^W=`
zVv-59S}+tn1Uwlx*G8%s{*5p`r{jmI6fyU^BGkOcS)f>A7t&{PV|&$dXm!-wTD@5?
ze&8&MFwwT2;Odgj8UD<5swcxu@QdNr^B=Ve86Jty*M{p&F3Fk1wxtbM)b|5E)vSNh
z3TM<8kBNOk!zitP{Y*;nxJ`P&)VZVqkMKZnkr%d>(%khtJ=u8V*BIG#rXTQ+%U=YT
z5GyTmIqe7h!J~4jCuJD1aDvd?>w8?Obns15<LLCpJM&zE(5B>R<9Gb_?RX}FG3#`4
z+@ucp8-TwF_*-VbZ2{v6;I{$4WA+2`fTtU}-@NOyAsJ?WRG^FiT)BHi+?Lhry-Aw$
zerM8>k?bGc)0~E#4sK(2$+(J6-COt4BPbhcMpaEH8)ZYyD941VqHL%cRWqR+lnphb
z>LyeTWkb!Vh6z<i*-$g8X+kwnHq?x2nNUrX4K<^PWn#6^PAmW;#xAwcPB1_-_k6bL
z3Dot(*!CoU+xG-&d}8c;l5Kqg^*%8+Kgo7Kf!d!K`=8Xxt~=ec%dXouv4)$Fva8R_
zfQG4f8PG5rF9RAT<lqXon{^@ZJIaP?RIgXBI*nY^x9yHJOpax1+TAp!(!ZtB{Tb`?
z&hgQbhA|^YC-?Yxedc;+o$Qt5M^2I_63LQC9YCdj4jTVMFr21YI*px5v-i`qiYsI9
zuo?g>bwt{gyl#(AjB4z&^x66!IeK$65yDU?C~N9q2+nQuCDq6;detBqN|Rft0?92%
zav8;v>1&cfFqC8u!L|jkYWp{dt(#;-W$^=mN%N{yP;dgFs%0uZ6`mlb9s$!hrPDZu
z_a97ulQ$g&@4pSPir@c?<m8e~EJJO;M0-r91F`HfqC+7T#5PC<)0AJOpqH`K#t<pC
zNa|cH8A?-Xn|n?(5Rw&lA(YBco1GqnR@PGM_e97?ZD|$P2HYpguZPg}XL~a@-dqwt
z${hy1D;fTwH|PCT<Sm~0g-Z=7S3#hDc0T=o5Z8|)_91Q}1?<C+Gw2`d?{s&s@6mh4
z{p6D?x(X>*Uk81>WHJf_$K=$uZ0EFk?9F1_V<W8h58G-xR@<uKuIu5%eS(fZUiEP#
zVmW5m4<aRlQJj2(JwX?AN%3{eRWN65{AI!T#fQJ24cO(&KngzBTG7Sr;7>r^shkHj
z3g0lPmEhX}`oJbM4wW7;7RmS0Hva1MDoxa<T=(=;vl&NSp}BI^#vjkoe-qR9z26Ul
ZcZ16Whsy*3hsy*4hsy*5x61?s69IRhCXxUE

delta 1181
zcmV;O1Y-M|ixA$65Rh7bXlYbfbZ~58Zgh2RYybfO004NLy;xmy;x-h0*RN2sFUii5
zv5fgJvt>46VcQhaOybRKHj`ll7T}4ISXm~eo&NXA5Lk?ju4(DM!M(oc99`+ivOYwL
zN)=B-^wUhz@s#3_E<~(wG-Zl%iXx_evl*3C35mJj3{3)`VK$wAsRi~~G?c+i1%j`_
zkz$ewwU{v!JqJ9go9ZA{4F82NzNEwFu@o`)TO!nWFOxvABrc@S<SO>Yb!d4|-$cDh
zFns1LiZIc!j^OH=P8t4{YpU14UGOKv?)r~fgbWWv=<C4kic4}Pv2E$V4fXwik2Tic
z+X^St7cWVCM8jx*Tl<BS;$=g6#nh#w0grG`aFO@eQc8U{^E$HOz^^c}o7^7Y_mn>i
zFd^2q$oaS%@Mn+8v7VHE#KI9mk8huFsno=GNspuRJMY446NFYR-wr<D_wR=j5e!+g
znUf|}AYTLWbs+DW^R@-l6CiH`dB>aw<N>4Wx4(F|7k$!yPpLpD0l4(|hO}L)(|MOH
z&ZnJ8ODfqPdQEd0Hk-+xetXWiiu&#Q_O(ZJtbtdN^Hl_;%gyj*GrXOFw^6#>4DXoX
z%Nh7GN|&4AD`t2n1Mi@8xf#A{hOcDcD=1xVhOe37s~PwzN|&4A>t^^`2EK;U<z{%-
z3}4T{*HOBE+zd}FGrpU_chOEgKtKRzSy^jYXa@nHfXtiY-n4xQ<X-|9m}DJH(iSF=
zhY4U}l65gj+n7K;CV-Ji*2yGoWdeDb0A?mxH<L=yow{{#-D-Eu1pU=R8J5?0(Ovu4
zREF6<HkDx&9Gl9p8h+rYHU}&N)kB8l0j0||e5X@?EjzVb_%EB2ML#)SFVP;yF_r#3
zmF;h_KDVBp%xM@ia&q>BPnT!spRKclNWSKfydse_5~%`ETL;GfAQ+~p7pAedXbv8Y
zyT3E`4pt4o+B)j)N?tCHUl`S}Yw45aKXUT!WF&;4Q4s6a0Uw;(`oHN$e$&ea$q-F$
zqxMLDb|J|{6icQ*cMXCek^=<W7JyYbe396CkqoHZKLC(4uS<IxP9Ugqk&cgrCx~f{
zfHY2F8pq&&kS1?B_W0k1u=e{uB{{h)A(o*xAkhKS=|EU^5z(O#Gh!PggEYl=Daee4
zUJQ|9v!u`aB||iYUUO@jo{((+Duk#Ez1dlRgV4@eX#XAw`JyB4{@#G^iQ@Yq^qIK1
zVFAA8k|(mqIUPi~Xpn_cw8wsDAFd*APtEV=R!OnOf^E%yU?#zQ(&KzW<x#FPhDQE)
z-v6I9Mf-Jm<NNsb34LJPPcHA#O-Q-=-0R{wlTjczCg-+gJLlz7ZxZ7U8({qgv#o}I
zV>PS_ZnZs}q|ealr<*R0L@b94`$42+Fo=`e{4;b#=M>+@Tm@6sz`xHJzxw#wI)K}J
z9!SBbS}VG`?|pxu>Xa@6h3}ZuO7MLTePkmVhe}rrMRN1rz@NQNsgAmoYx|5fHsh!z
vG_G7U@TW`k5BB7-A8W<o1^@tn07*oHjRc2{1ObPQ1OkVR1OvB?1OyEMEjdfg

diff --git a/state_machine_exporter/src/test/resources/golden/F2StateMachineConfiguration/F2StateMachineConfiguration.puml b/state_machine_exporter/src/test/resources/golden/F2StateMachineConfiguration/F2StateMachineConfiguration.puml
index 4596197..071a9cc 100644
--- a/state_machine_exporter/src/test/resources/golden/F2StateMachineConfiguration/F2StateMachineConfiguration.puml
+++ b/state_machine_exporter/src/test/resources/golden/F2StateMachineConfiguration/F2StateMachineConfiguration.puml
@@ -36,27 +36,27 @@ state States.STATE9 <<choice>>
 state States.STATE8 <<choice>>
 state States.STATE_EXTRA_1_2 <<choice>>
 
-States.STATE1 -[#1E90FF,bold]-> States.STATE2 <<external>> <<e_Events_EVENT1>> : Events.EVENT1
-States.STATE2 -[#1E90FF,bold]-> States.STATE3 <<external>> <<e_Events_EVENT2>> : Events.EVENT2
-States.STATE3 -[#1E90FF,bold]-> States.STATE4 <<external>> <<e_Events_EVENT3>> : Events.EVENT3
-States.STATE4 -[#1E90FF,bold]-> States.STATE5 <<external>> <<e_Events_EVENT4>> : Events.EVENT4
-States.STATE5 -[#1E90FF,bold]-> States.STATE6 <<external>> <<e_Events_EVENT5>> : Events.EVENT5
-States.STATE6 -[#1E90FF,bold]-> States.STATE7 <<external>> <<e_Events_EVENT6>> : Events.EVENT6
-States.STATE7 -[#1E90FF,bold]-> States.STATE8 <<external>> <<e_Events_EVENT7>> : Events.EVENT7
-States.STATE8 -[#1E90FF,bold]-> States.STATE9 <<external>> <<e_Events_EVENT8>> : Events.EVENT8
-States.STATE9 -[#1E90FF,bold]-> States.STATE10 <<external>> <<e_Events_EVENT9>> : Events.EVENT9
-States.STATE10 -[#1E90FF,bold]-> States.STATE11 <<external>> <<e_Events_EVENT10>> : Events.EVENT10
-States.STATE11 -[#1E90FF,bold]-> States.STATE12 <<external>> <<e_Events_EVENT11>> : Events.EVENT11
-States.STATE12 -[#1E90FF,bold]-> States.STATE13 <<external>> <<e_Events_EVENT12>> : Events.EVENT12
-States.STATE13 -[#1E90FF,bold]-> States.STATE14 <<external>> <<e_Events_EVENT13>> : Events.EVENT13
-States.STATE14 -[#1E90FF,bold]-> States.STATE15 <<external>> <<e_Events_EVENT14>> : Events.EVENT14
-States.STATE15 -[#1E90FF,bold]-> States.STATE16 <<external>> <<e_Events_EVENT15>> : Events.EVENT15
-States.STATE1 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE2 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE3 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE4 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE5 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE4 -[#1E90FF,bold]-> States.STATEY <<external>> <<e_Events_EVENTY>> : Events.EVENTY
+States.STATE1 -[#1E90FF,bold]-> States.STATE2 <<external>> : Events.EVENT1
+States.STATE2 -[#1E90FF,bold]-> States.STATE3 <<external>> : Events.EVENT2
+States.STATE3 -[#1E90FF,bold]-> States.STATE4 <<external>> : Events.EVENT3
+States.STATE4 -[#1E90FF,bold]-> States.STATE5 <<external>> : Events.EVENT4
+States.STATE5 -[#1E90FF,bold]-> States.STATE6 <<external>> : Events.EVENT5
+States.STATE6 -[#1E90FF,bold]-> States.STATE7 <<external>> : Events.EVENT6
+States.STATE7 -[#1E90FF,bold]-> States.STATE8 <<external>> : Events.EVENT7
+States.STATE8 -[#1E90FF,bold]-> States.STATE9 <<external>> : Events.EVENT8
+States.STATE9 -[#1E90FF,bold]-> States.STATE10 <<external>> : Events.EVENT9
+States.STATE10 -[#1E90FF,bold]-> States.STATE11 <<external>> : Events.EVENT10
+States.STATE11 -[#1E90FF,bold]-> States.STATE12 <<external>> : Events.EVENT11
+States.STATE12 -[#1E90FF,bold]-> States.STATE13 <<external>> : Events.EVENT12
+States.STATE13 -[#1E90FF,bold]-> States.STATE14 <<external>> : Events.EVENT13
+States.STATE14 -[#1E90FF,bold]-> States.STATE15 <<external>> : Events.EVENT14
+States.STATE15 -[#1E90FF,bold]-> States.STATE16 <<external>> : Events.EVENT15
+States.STATE1 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE2 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE3 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE4 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE5 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE4 -[#1E90FF,bold]-> States.STATEY <<external>> : Events.EVENTY
 States.STATEY -[#FF6347,bold]-> States.STATEX <<choice_type>> : [guardVarEquals("value1")] (order=0)
 States.STATEY -[#FF6347,bold]-> States.STATEZ <<choice_type>> : (order=1)
 States.STATE16 -[#FF6347,bold]-> States.STATE17 <<choice_type>> : [guardVarEquals("value1")] (order=0)
@@ -82,13 +82,13 @@ States.STATE9 -[#FF6347,bold]-> States.STATE7 <<choice_type>> : [guardVarEquals(
 States.STATE9 -[#FF6347,bold]-> States.STATE6 <<choice_type>> : (order=2)
 States.STATE8 -[#FF6347,bold]-> States.STATE9 <<choice_type>> : [guardVarEquals("forward9")] (order=0)
 States.STATE8 -[#FF6347,bold]-> States.STATE10 <<choice_type>> : (order=1)
-States.STATE9 -[#1E90FF,bold]-> States.STATE_EXTRA_1_1 <<external>> <<e_Events_EVENT_1_1>> : Events.EVENT_1_1
+States.STATE9 -[#1E90FF,bold]-> States.STATE_EXTRA_1_1 <<external>> : Events.EVENT_1_1
 States.STATE_EXTRA_1_2 -[#FF6347,bold]-> States.STATE_EXTRA_1_1 <<choice_type>> : [guardEventHeaderEquals("header1","foo")] (order=0)
 States.STATE_EXTRA_1_2 -[#FF6347,bold]-> States.STATE_EXTRA_1_3 <<choice_type>> : (order=1)
-States.STATE_EXTRA_1_3 -[#1E90FF,bold]-> States.STATE_EXTRA_1 <<external>> <<e_Events_EVENT_1_2>> : Events.EVENT_1_2
-States.STATE_EXTRA_1_1 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL_2>> : Events.EVENT_CANCEL_2
-States.STATE_EXTRA_1_2 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL_2>> : Events.EVENT_CANCEL_2
-States.STATE_EXTRA_1 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL_2>> : Events.EVENT_CANCEL_2
+States.STATE_EXTRA_1_3 -[#1E90FF,bold]-> States.STATE_EXTRA_1 <<external>> : Events.EVENT_1_2
+States.STATE_EXTRA_1_1 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL_2
+States.STATE_EXTRA_1_2 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL_2
+States.STATE_EXTRA_1 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL_2
 
 States.STATEZ --> [*]
 @enduml
diff --git a/state_machine_exporter/src/test/resources/golden/ForkJoinStateMachineConfig/ForkJoinStateMachineConfig.png b/state_machine_exporter/src/test/resources/golden/ForkJoinStateMachineConfig/ForkJoinStateMachineConfig.png
index 57623efea2629d6caf8a9afa37f849d9b943de72..2118dfc3a4e94794ef8f438ec50265f336a6a4fd 100644
GIT binary patch
delta 626
zcmV-&0*(FS*#Xem0gzgMS7}sObZ~58Zgh2RYybfO004NLos?~F+At8u-}_VC)Hm%k
zP?Ev~s6yo-ASe$Nq}8OVLWUf{BRNO5L&v6l_c^7d3>8(|yZC>1zx$tK`&t{WOqRs#
zQ>u8BaESR<W(IVEh7)HR?Kh@eaU&IwBxEZQB4Co5Erh5SN~A`ANZQHTph9W3DKfnl
zl-DIz<Obmv18DNaI#M#Duq9*5ds+#Dxh_?RYNwr5OZ;+P*{i`yEY^ftgKM>pBs1a(
zLXT{#7hx)XB2-@&W*Z~SWgJ>zvg@S?6?l#nZh06AiY)8*p~Dpq<x{RNd8`k;H<Xf3
z`=)&~O~nOi7)p|V@1;FksT@aMCR@zIGP=jX!vWtyVJg6NokNqGXdq}Ea245~GSe6@
z8GHEr2!%o&ruiQ0;xuSX0>;?k5(*Dzu3vRJoiF*WJicXj#*-Vky22lJD~ZSTI@G}5
zAQ@c@#<M)i4l^ysbDCbGam<<c-QIZQ&TPBDcP()#)w*7P|CeI#RPhn}<Sc*Xc_*ft
zxU-S}Enx4r{($X$!1mr@@BLVIrQtPw@0i^m_ePfZT?#rL+WWuaXYu4L{-}NWm)qd}
z?Bt30$+9PmT_c70Bf)NCPUdbnfDI~bZ#}q0&+$sd%kyBBK?mpHmhDBWm7JPWhL#^d
z9=>4b-P-|VXql-6LMXIRVxHx%#s%y14TniaMkH8+af;M$-@FRo(?%#si8aXj_rte@
zucbm$7?`56PT+pX+PLIdY;46s<~O_scR{C6VFON4#v{u{VlDd|7`3fIx5@qhKa`l`
M;jV&`v&{k)YFm0XL;wH)

delta 653
zcmV;80&@M(*#YC(0gzgMYH3thbZ~58Zgh2RYybfO004NLos@5H+At8t-}_VC)Hm%k
zP~y^wq6!t-P?hqhg0z}cRmhMdcqDdYJ9KQ?cb{D-&9bs;dxwALyXQIQxN~ioGI^Si
z51C?d${=BDnH$h48YURgXn$kI6f;tRkOIkqM+lf^W(^VQnc|s$;Zkg{HmFdVb%sPQ
zxo~-@h0GxQAOLMPTgFP}BD#=?t@pIx1|63wLbYKBr!{swt?y{K;IpMbt--gfBZV2T
z6yaJ}sVx}u?+B+a2eVEPrZR~v7;UtaKn2vZ;Fd)Z7qPANv*>WaBKhR_oF%&Gy`_|V
z+KG12v=!q*LthGi`PQ{(EA?_@+u3XyouFS178`sGMHvU*_lhQ0agU2-$W&}U%0y!_
zC*<MdBUCC)7`r#t)p6Jwg@lme5h@P{esJn_I-lIDJigxU3`aL`c81^VQwo+eo9-|P
zRw#^~gu{u8TiAdNs%{Y}rrYAwYtvS%TznK<T@MHT#CiyS1K(DjOSNn^|0S93OD@&k
z+u(2a=-yUG{$vn*35%_65qaCsJA(9GLHeg4eM4~P+zQrPv>nj0V0U;uu$8|`F3QhC
z|1bF&?rks_T>fohY`8Qqmh8sSCA(p@Lrcz4L~iep+k^>o*YCj!m9~on{3`Wmt$KVI
zE^_GL6#Nr^``>NUyoPrI7eNRvd_)efZhN3*u4V`k*GBPa?iSGz>9Q4rQ7#Nmu>r#j
zMfdXN1wbHHTuG5ygQR=kf4%UzR%vqsV^r1&-1o^P&RL!qn=zAaX*A$2>{RNc$3&d7
n*w#itF6@ReYTbaVHu(j4ue0O$?@~Pg0BQb7L_t)u!U7IzN>DyO

diff --git a/state_machine_exporter/src/test/resources/golden/ForkJoinStateMachineConfig/ForkJoinStateMachineConfig.puml b/state_machine_exporter/src/test/resources/golden/ForkJoinStateMachineConfig/ForkJoinStateMachineConfig.puml
index f45b533..5c5838c 100644
--- a/state_machine_exporter/src/test/resources/golden/ForkJoinStateMachineConfig/ForkJoinStateMachineConfig.puml
+++ b/state_machine_exporter/src/test/resources/golden/ForkJoinStateMachineConfig/ForkJoinStateMachineConfig.puml
@@ -24,14 +24,14 @@ skinparam svgLinkTarget _self
 [*] --> States.START
 
 
-States.START -[#1E90FF,bold]-> States.FORK <<external>> <<e_Events_TO_FORK>> : Events.TO_FORK
+States.START -[#1E90FF,bold]-> States.FORK <<external>> : Events.TO_FORK
 States.FORK -[#20B2AA,bold]-> States.REGION1_STATE1 <<fork>>
 States.FORK -[#20B2AA,bold]-> States.REGION2_STATE1 <<fork>>
-States.REGION1_STATE1 -[#1E90FF,bold]-> States.REGION1_STATE2 <<external>> <<e_Events_R1_NEXT>> : Events.R1_NEXT
-States.REGION2_STATE1 -[#1E90FF,bold]-> States.REGION2_STATE2 <<external>> <<e_Events_R2_NEXT>> : Events.R2_NEXT
+States.REGION1_STATE1 -[#1E90FF,bold]-> States.REGION1_STATE2 <<external>> : Events.R1_NEXT
+States.REGION2_STATE1 -[#1E90FF,bold]-> States.REGION2_STATE2 <<external>> : Events.R2_NEXT
 States.REGION1_STATE2 -[#8A2BE2,bold]-> States.JOIN <<join>>
 States.REGION2_STATE2 -[#8A2BE2,bold]-> States.JOIN <<join>>
-States.JOIN -[#1E90FF,bold]-> States.END <<external>> <<e_Events_TO_END>> : Events.TO_END
+States.JOIN -[#1E90FF,bold]-> States.END <<external>> : Events.TO_END
 
 States.END --> [*]
 @enduml
diff --git a/state_machine_exporter/src/test/resources/golden/G1StateMachineConfiguration/G1StateMachineConfiguration.png b/state_machine_exporter/src/test/resources/golden/G1StateMachineConfiguration/G1StateMachineConfiguration.png
index b71ca0147fe6912f0a6d73f982a4a2a1b9bb7bbd..186f510c7ca9e7e38f2a97b885cf9aff960accce 100644
GIT binary patch
delta 809
zcmV+^1J?Yyng)=X29R2R2x(MUbZ~58Zgh2RYybfO004NLt(I+X+At8u-}_VC+BYx_
zM0f^us6azC23=KB)UK+KAqQ9ln>h}QP5bV1prxb*msWj8{&)V}**<)C>MJT$F!ji%
znWUpB1&=O8punG^qMQ;R^>3U}NtKYm1xGSwE&@(xY6&j-1IcE8iV41!eT5Q*TF#L8
z6UM`JQ!P@3@RtD8=wLFEBH(Uac$&8uGliipq>FN`9hb5+(=TpRXUql@j=m3;)*6DV
z3pz#k#&xI%p~L<llpa6S(nIJA&(*@!I+o-pA)V5~C3RiKN1F9-JHs(`#Uj*))bqD<
zuSzKvo1jfpHAxwN_n|Gg*yXlLrTE<Pu(Ltm&7t+&xV^zAlRINzS*h(L=c5+m6Nk!?
zzLcJi-jI;H&-ai>RG<@{v7hWXRmZjnSs(efcnc>dgRx)(tW<WGOJ;L%+e{+CAaQqW
z*`-vY@g+R;`)A3d^-BD$?}}5eQh_qqbL7fT+Fkp?u}IW^)r`uRP-zl%HKVd7RE9)d
z&8VCSl_gPEGb(RF<w(@kj4GH=c@lLsqlzX}fka)+sFDd)BvDs0%1W77r9*49UcIQ>
zEfcD@b~&_C-v>0*>-&I)s(l~OP`e+V;pV~G3%n&!SB+{k@|kR5C+cSNdiBEAw4&XO
z0xI1umG-ZHK)?C1qdD~gw2tEU5L@+~uc`Q(g8bYO<bh<xUzWCkR6HbI-DziGJKdk~
zYhem+3DXu5w?e&fNBR9{la9Z9K@6nQAxRH~Txg}V|7>0hvwB?)yUo{HP0zk@uBts_
zAM9DZX#d(QI*4s-jQiLh^5l@{KOme$^h82Vk-Oo4P)RO5%GGtd1#^_Xo)W=Irc>!`
zG81#g0W`1=R!$FQ<!q{)%0b<BAT-BG?EJC?z6j(1!DYUZtRI9^W}GzXoWfPW6`Nui
ze$0?J&%QqjVDmYXf=_j(q}gphIpnj68dK0gsWX9Yo1Ed02A<L@1|pmY%W&;95=GLY
nT$j@qNVAcXx*i{uT$bUyM*agoFowt)dm*@kl>@hx0|BLpQy-7n

delta 851
zcmV-Z1FZazng+U>29R2RGHFy;bZ~58Zgh2RYybfO004NLy_RoN+CUJ--`}U$>Ko`3
zhwwj)Wkd{4DOg9Mqjj9jK~}gi+|kPgOFRAUy$C8Xc;JlfJMwJy_v~HRyFCaMl`5J9
z<ik|b(S$-k=OR)NPEb)!Nr?J4PN}3yNZ^7a88aUNCsQ>CAH$)4WK+ciU&x_Ci9*e%
zNWweD<GhI$sY3Wo01oN!ZX`v-{gwzc?|#e_#=4L`%7wOTmuPWNds5vo8{TmYL$I{g
z7F?as3Bnhyt(HQc{X(!GAJjZR7>K~v!r8)0a+FZWYvGjoKI0?J`m<W$nEK*A)^BML
zuGZd^Qrth8c2FIEO3HW$J;BAg*B(l#y^JhZHXQh6v|a{R7x*0VrwlABzgpyM)Mfn6
zrE;V{iWg#VOUU)d8_4Av(2w^x-0Qnd*Rcp$Z278q1^fHMv0y`NG}eS|bGWt|CJ8gh
zUGG|soo}~4#hZTfqL_lt#Gm?GaT+ul@q_2gkgL#hE}Rp8*V0-Y7Rug2A<1+zzG%i5
zQuqQ%rkn94GrpL@7fCYRj4zw<r4+tIlIdoA#f&ef@MV%rH{+{jd?kgikYu_UUo+#Y
zDSVYA)6IC>jIX8eHIhs><E^}zZ>RY7wtdxVp0u2<8SgD#N|`M6ZF}s!tqlG4-d2X*
zdv7a4AO6RGRXrW^2CJ)-$rVYaYka$1DVC~h@t05cfEQo#547u1M5TX0rSl`ww`XQ&
zMuP~go$L){9&Yf@`RtoazOOM^lB{gH2@Ry$Hs$J>Wf~7AuNS<@rur6}o{+d=^~M!d
zUf-KSHhumXNcJ{G-wJuJ75nwQ*<|x@4sQ1~H(kbmo^$D*HN6cJg=cx`TR#@bTGm#U
z8>WmmS^ncAkR&@Po(=VkNDh$u@t99e1IpETuM0Djp`P2p+AHJ>rM+Ut9Y@f{0a#@{
zD%VT-dcF)T$AvhYC7I*XE`%bILj<3NO0q!|&;41_p)(3+5m#)2b@(<#-Z}dED1gIf
zObR|h(Up?UMeq5AN-1~96!cN*O5mbLj_{U7fzla65zpv#ICtB*8tGE5|CS@oMowCK
dpjUEUhvP%?7YWe@spJ$LqJwJ#w`&6drHL)2s&xPW

diff --git a/state_machine_exporter/src/test/resources/golden/G1StateMachineConfiguration/G1StateMachineConfiguration.puml b/state_machine_exporter/src/test/resources/golden/G1StateMachineConfiguration/G1StateMachineConfiguration.puml
index 679f23c..60f2648 100644
--- a/state_machine_exporter/src/test/resources/golden/G1StateMachineConfiguration/G1StateMachineConfiguration.puml
+++ b/state_machine_exporter/src/test/resources/golden/G1StateMachineConfiguration/G1StateMachineConfiguration.puml
@@ -27,21 +27,21 @@ state States.STATEY <<choice>>
 state States.STATE9 <<choice>>
 state States.STATE8 <<choice>>
 
-States.STATE1 -[#1E90FF,bold]-> States.STATE2 <<external>> <<e_Events_EVENT1>> : Events.EVENT1
-States.STATE2 -[#1E90FF,bold]-> States.STATE3 <<external>> <<e_Events_EVENT2>> : Events.EVENT2
-States.STATE3 -[#1E90FF,bold]-> States.STATE4 <<external>> <<e_Events_EVENT3>> : Events.EVENT3
-States.STATE4 -[#1E90FF,bold]-> States.STATE5 <<external>> <<e_Events_EVENT4>> : Events.EVENT4
-States.STATE5 -[#1E90FF,bold]-> States.STATE6 <<external>> <<e_Events_EVENT5>> : Events.EVENT5
-States.STATE6 -[#1E90FF,bold]-> States.STATE7 <<external>> <<e_Events_EVENT6>> : Events.EVENT6
-States.STATE7 -[#1E90FF,bold]-> States.STATE8 <<external>> <<e_Events_EVENT7>> : Events.EVENT7
-States.STATE8 -[#1E90FF,bold]-> States.STATE9 <<external>> <<e_Events_EVENT8>> : Events.EVENT8
-States.STATE9 -[#1E90FF,bold]-> States.STATE10 <<external>> <<e_Events_EVENT9>> : Events.EVENT9
-States.STATE1 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE2 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE3 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE4 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE5 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE4 -[#1E90FF,bold]-> States.STATEY <<external>> <<e_Events_EVENTY>> : Events.EVENTY
+States.STATE1 -[#1E90FF,bold]-> States.STATE2 <<external>> : Events.EVENT1
+States.STATE2 -[#1E90FF,bold]-> States.STATE3 <<external>> : Events.EVENT2
+States.STATE3 -[#1E90FF,bold]-> States.STATE4 <<external>> : Events.EVENT3
+States.STATE4 -[#1E90FF,bold]-> States.STATE5 <<external>> : Events.EVENT4
+States.STATE5 -[#1E90FF,bold]-> States.STATE6 <<external>> : Events.EVENT5
+States.STATE6 -[#1E90FF,bold]-> States.STATE7 <<external>> : Events.EVENT6
+States.STATE7 -[#1E90FF,bold]-> States.STATE8 <<external>> : Events.EVENT7
+States.STATE8 -[#1E90FF,bold]-> States.STATE9 <<external>> : Events.EVENT8
+States.STATE9 -[#1E90FF,bold]-> States.STATE10 <<external>> : Events.EVENT9
+States.STATE1 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE2 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE3 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE4 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE5 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE4 -[#1E90FF,bold]-> States.STATEY <<external>> : Events.EVENTY
 States.STATEY -[#FF6347,bold]-> States.STATEX <<choice_type>> : [guardVarEquals("value1")] (order=0)
 States.STATEY -[#FF6347,bold]-> States.STATEZ <<choice_type>> : (order=1)
 States.STATE9 -[#FF6347,bold]-> States.STATE8 <<choice_type>> : [guardVarEquals("stepBack")] (order=0)
@@ -49,9 +49,9 @@ States.STATE9 -[#FF6347,bold]-> States.STATE7 <<choice_type>> : [guardVarEquals(
 States.STATE9 -[#FF6347,bold]-> States.STATE6 <<choice_type>> : (order=2)
 States.STATE8 -[#FF6347,bold]-> States.STATE9 <<choice_type>> : [guardVarEquals("forward9")] (order=0)
 States.STATE8 -[#FF6347,bold]-> States.STATE10 <<choice_type>> : (order=1)
-States.STATE3 -[#1E90FF,bold]-> States.STATE_EXTRA_2 <<external>> <<e_Events_EVENT_1_2>> : Events.EVENT_1_2
-States.STATE_EXTRA_2 -[#1E90FF,bold]-> States.STATE_EXTRA_3 <<external>> <<e_Events_EVENT_1_2>> : Events.EVENT_1_2
-States.STATE_EXTRA_3 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
+States.STATE3 -[#1E90FF,bold]-> States.STATE_EXTRA_2 <<external>> : Events.EVENT_1_2
+States.STATE_EXTRA_2 -[#1E90FF,bold]-> States.STATE_EXTRA_3 <<external>> : Events.EVENT_1_2
+States.STATE_EXTRA_3 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
 
 States.STATEZ --> [*]
 @enduml
diff --git a/state_machine_exporter/src/test/resources/golden/G2StateMachineConfiguration/G2StateMachineConfiguration.png b/state_machine_exporter/src/test/resources/golden/G2StateMachineConfiguration/G2StateMachineConfiguration.png
index ae74361a37c69276ca9f3eead475ce261d2c2d1a..122df2ea92c34151e42f20baa6c58961acfa4cd7 100644
GIT binary patch
delta 816
zcmV-01JC@d#RmSw29R2R4{20bbZ~58Zgh2RYybfO004NLt(I+X+At8u-}_VC+BYzb
zitr5TP=SVO47#dKQM;-_h8$oK?96dsY}$9911%+eZ~^rl{O|m`vwiX1Nua1y;nX9a
zd`U-B3LagEP(d(7ML8t_>fh*7NtKYm1xGSwE&@({wE!1`fn>gaVuG*aK%qpT7Cw?-
z!g#c9szs_0{t|#X9ZW`2gxqZiPxIzurZCclbWyIf!*Y&h`=zz&jM-qqF$loYT2pX!
zPNxXpxDNFoT(Lh0<;Op2;UV;e=W5|{6-#oIkV$Ldg1Ro_BhC7^nc<kaVjk&3>IIv*
z*Q6Blb<h^7x}=PM2hb5*yymt{rS#nLu(Ltm&7<|)xVgb6lj}3Etn_A*vr(Jzi9_W`
zUrH}PZ%D}9=X*${s&EyZad33y)EwI)WOd}5;w>B>55|HGuv&e^TsE6an`ROV2C2J4
z%Pyyz%`efR-#<$xqgUc@eOH`%)hblLo*`Gkk=?b=9gD<&UCpSh36&vnS2HSSLS;$Z
z)r`uUP&pEJHKPh9RG!3L&8VUYRUmO!Gpb}l6-nIHj4GQ@B@%ZvqpY-vRo=En8@2O>
z-8P|mE0=96bw8k?UiSkUs&+r1p>{t!!}WvpCh(TTT{WuNEM#-VS5Y_X*Q*z`rX}re
z6jJGSskDE8h5F4;9L%T}qIHnGhs3h)d`%~J3i9)nAP*!f`LeVPq|!F&>Q3uN?ey)0
z-wRXRB}_+1+z7SfjtXy|O(yyB1u>Ay+ax^{a;}x~+h_A$nC0uT-EF?tYI^pKb6M+I
z#_z-G#rxNK(N=6@kJaq#j_mzD=yft5z$Ni7E1GbB^rS;hkh{^aN-jLg)pe&0Gn9dz
zKEXQ5q%*mrY{D6b(8NAic|Gt|a_LGs4-MOa$ebjJvx_zaB9sFJmjz0)ei%)!Nz$S-
z3YQ^QY>E~5;UjOIet#6e<})S*pXy9WtJ`^UDCAOgrr-*t&IGz0a*9J5dP=Vth-lKR
uz_rsJOqEERa$Tk)%|=cddMs6PQGv5M`494_p|eRq13-hI1Gk_90Suq&Pn0PD

delta 862
zcmV-k1EKu>#0IRz29R2RJ!w=}bZ~58Zgh2RYybfO004NLy_a2Y+AtJ`@BJ&z+M6;B
zMEDNsP+J<Rb<kBMMeV8z8FC6%gUuX=j!paTbAVFPPy<r8yW~AN&wK3X_~R&0RH|^~
zlMiD_2O|nTor+LFFhWH+B?0PZ98*b^kiZ2;GGrbCj>c*V9tM4X$;OHaK9>W95`~(M
zkpz#7M|mSHQibrF0G!bN<3Ng#dv)P!-qVmNjC3JAlyhz0F3^0hvQ*t6>pyY~0<g5!
z5L{i*5yBU)trkL?{X(#xU)0n`=n3D`!qwbMa+HwEYT=T49^(Ve`m<W$kb2@N(jTZF
ztk!-krFdGJo})T{k(BWOT7rvppUq0CypAkJ*6(>mv|a~S2lx{5#tbYgyISOA&}974
zrE;KuN;g3Nfsnh8_mEE4pdHO|kZHTeu4550pYm1l77h>lL&5r3tE~y!=5S>-Ok!q`
zzT3APJKJb{iYER3RWUi8i9hwf;?%FzqL;2SL9T+X({V0;TuW<Jm@ApNLgMLWeBO-D
zCGa^CPdDQWW_&(@&y#q%8DBKx3kiII#M90Ak{Mr2;EN=lZpN3*_)-F2BJp%HzGB9g
z6ZkTTr<?J%8DB}@D<qz7##>o4-%jxDZTqTzd{K9rW_)-4QNm=QZ`)(<ZDr`U_qH<h
z-g{da`tU!0j%vBg8?0^<CbuM>uJMgVDPJhB#osLVfo`<P&uDjpkV>yZrSl`yyXV2)
zg!&;`d#QUknC;-7v#Fg-zOOM^kgQa)2@RymHs$Iw%Q!liyj}1noANF;Eg^BmYR3_k
z-kzIWD!Kj{NcJ{GKM47x75nYE*<>?Y2e<p1n>OQru5;sF9e1q_-DGu>yM82+wXCfy
zHymO#J$Vv{#2qc)d$Cwn|4$uBymzD1s6LgFBjjFmu^^W|<?6cCgbB((-xR>g<g&R!
zCV$`#Lug<RtfD@gR}0x{wg`2{g(#dN2WOW}2t+9R2p$WRWW6xDX{5+Golv+6xnd)%
z!nZL@^7GTL&jL7n!ld9MT`4*5v|c_a71Ae6K^vv61UfBpiVrmOmCopk=vGjLYqycE
okS6825eAx#oYeIdLdj_r&Q8c*x&SH2?a;J~gK`76asvSjpF#YpY5)KL

diff --git a/state_machine_exporter/src/test/resources/golden/G2StateMachineConfiguration/G2StateMachineConfiguration.puml b/state_machine_exporter/src/test/resources/golden/G2StateMachineConfiguration/G2StateMachineConfiguration.puml
index 6924f9d..25ef4aa 100644
--- a/state_machine_exporter/src/test/resources/golden/G2StateMachineConfiguration/G2StateMachineConfiguration.puml
+++ b/state_machine_exporter/src/test/resources/golden/G2StateMachineConfiguration/G2StateMachineConfiguration.puml
@@ -27,21 +27,21 @@ state States.STATEY <<choice>>
 state States.STATE9 <<choice>>
 state States.STATE8 <<choice>>
 
-States.STATE1 -[#1E90FF,bold]-> States.STATE2 <<external>> <<e_Events_EVENT1>> : Events.EVENT1
-States.STATE2 -[#1E90FF,bold]-> States.STATE3 <<external>> <<e_Events_EVENT2>> : Events.EVENT2
-States.STATE3 -[#1E90FF,bold]-> States.STATE4 <<external>> <<e_Events_EVENT3>> : Events.EVENT3
-States.STATE4 -[#1E90FF,bold]-> States.STATE5 <<external>> <<e_Events_EVENT4>> : Events.EVENT4
-States.STATE5 -[#1E90FF,bold]-> States.STATE6 <<external>> <<e_Events_EVENT5>> : Events.EVENT5
-States.STATE6 -[#1E90FF,bold]-> States.STATE7 <<external>> <<e_Events_EVENT6>> : Events.EVENT6
-States.STATE7 -[#1E90FF,bold]-> States.STATE8 <<external>> <<e_Events_EVENT7>> : Events.EVENT7
-States.STATE8 -[#1E90FF,bold]-> States.STATE9 <<external>> <<e_Events_EVENT8>> : Events.EVENT8
-States.STATE9 -[#1E90FF,bold]-> States.STATE10 <<external>> <<e_Events_EVENT9>> : Events.EVENT9
-States.STATE1 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE2 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE3 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE4 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE5 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE4 -[#1E90FF,bold]-> States.STATEY <<external>> <<e_Events_EVENTY>> : Events.EVENTY
+States.STATE1 -[#1E90FF,bold]-> States.STATE2 <<external>> : Events.EVENT1
+States.STATE2 -[#1E90FF,bold]-> States.STATE3 <<external>> : Events.EVENT2
+States.STATE3 -[#1E90FF,bold]-> States.STATE4 <<external>> : Events.EVENT3
+States.STATE4 -[#1E90FF,bold]-> States.STATE5 <<external>> : Events.EVENT4
+States.STATE5 -[#1E90FF,bold]-> States.STATE6 <<external>> : Events.EVENT5
+States.STATE6 -[#1E90FF,bold]-> States.STATE7 <<external>> : Events.EVENT6
+States.STATE7 -[#1E90FF,bold]-> States.STATE8 <<external>> : Events.EVENT7
+States.STATE8 -[#1E90FF,bold]-> States.STATE9 <<external>> : Events.EVENT8
+States.STATE9 -[#1E90FF,bold]-> States.STATE10 <<external>> : Events.EVENT9
+States.STATE1 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE2 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE3 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE4 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE5 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE4 -[#1E90FF,bold]-> States.STATEY <<external>> : Events.EVENTY
 States.STATEY -[#FF6347,bold]-> States.STATEX <<choice_type>> : [guardVarEquals("value1")] (order=0)
 States.STATEY -[#FF6347,bold]-> States.STATEZ <<choice_type>> : (order=1)
 States.STATE9 -[#FF6347,bold]-> States.STATE8 <<choice_type>> : [guardVarEquals("stepBack")] (order=0)
@@ -49,10 +49,10 @@ States.STATE9 -[#FF6347,bold]-> States.STATE7 <<choice_type>> : [guardVarEquals(
 States.STATE9 -[#FF6347,bold]-> States.STATE6 <<choice_type>> : (order=2)
 States.STATE8 -[#FF6347,bold]-> States.STATE9 <<choice_type>> : [guardVarEquals("forward9")] (order=0)
 States.STATE8 -[#FF6347,bold]-> States.STATE10 <<choice_type>> : (order=1)
-States.STATE3 -[#1E90FF,bold]-> States.STATE_EXTRA_1 <<external>> <<e_Events_EVENT_1_2>> : Events.EVENT_1_2
-States.STATE_EXTRA_1 -[#1E90FF,bold]-> States.STATE_EXTRA_2 <<external>> <<e_Events_EVENT_1_3>> : Events.EVENT_1_3
-States.STATE_EXTRA_1 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE_EXTRA_2 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
+States.STATE3 -[#1E90FF,bold]-> States.STATE_EXTRA_1 <<external>> : Events.EVENT_1_2
+States.STATE_EXTRA_1 -[#1E90FF,bold]-> States.STATE_EXTRA_2 <<external>> : Events.EVENT_1_3
+States.STATE_EXTRA_1 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE_EXTRA_2 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
 
 States.STATEZ --> [*]
 @enduml
diff --git a/state_machine_exporter/src/test/resources/golden/InheritanceStateMachineConfig/InheritanceStateMachineConfig.png b/state_machine_exporter/src/test/resources/golden/InheritanceStateMachineConfig/InheritanceStateMachineConfig.png
index 8e0ab0a94b78829324e08f427abf55b0cd540d9a..93d0cef0244b6357b660ffba72d7d13e1740419a 100644
GIT binary patch
delta 523
zcmV+m0`&dlHQqIlT7U3qR9JLyY+-J6b!}__0RR91c${sL-EP`I5QXpeDW=LzQkBRi
zP=OVpgx^AdATa4g6h(tQm=*S{wY!GWs_)))5)u^k%Ij}t&zzl^8)H%1B1^@WTw{_U
zq<Bz;1(T6QMq$XEDMyV~X<)@9HZmrlEVl=U$wXS_Rw{nQ#($C~We+(Cvz1)l%N#^Y
z@J9f&G1?|t6&!a|>h$&-X{qE&$E07`S+j;$tHwJGH!|8X83Vp!eZ_W)8NrZUsW-5Y
zzX_VhAA3j%Rw|7hn7`K2Od6`512c?c$%)hYd+Kn5vD%k>jj1{Heyg?GzZV^mZEKWl
zV4_(4FYU!j<9~DH?Pbv_u9N>cc>2JPP@GHfeecxdE*VSShNu%alxIWfT8PK5Pf)3}
zU=iNVLm|Y=7b=fuey{2E``^kwJh}MK`}y5)I)LkI`sEtOn6_FFz;ODbHy?(*?(<^V
zo(!GBF|ibN;^KxlF84#sQe?ZFjA2LGxPgOzS@o*5%YUo$a8p2^R^ZoNkAs>Qcy;LX
zLMX!*;(Rb0gHeT!2x4ihmaC#%m<ut&9m2d|D>Dk<J|`Y^?~VX^ypvjSMr_6CVe*mi
zy;f;U3k%ZD2|P?hm)2OM*4>CyIotr2VZYK4W8|d3#Ay?Yj@tyQ4*?9?;vYtz`ZFfM
NJ3;^e7_(dgh#0@<0-yi@

delta 527
zcmV+q0`UFbHRLsrT7ULwR9JLyY+-J6b!}__0RR91c${sLZ*ST#5XRs8Q{2=y?KG-{
z!UU*7E&n<wPz0fSQB~+jj$o0TBin(oY2STLDJ?>KW&3x&dmf+f&REnoPZRMa(-@}+
z3GP*H!K7r7Q5bT2%21<K8dx!jwTuWT&Fmf`GNG24m5LA8Sbx%_>^>u5Hj<0H)Iqca
ze*{1a!%eJJ&QV(>uHJ4fEfrkpi1dM7)GK(itbNd6EyE3yG2lDaQ*6hW67<<gy@Q$j
zO;A4`>^>n_sw8q?deG8L8p@sn6O1Csv8(m>)ZrQ<wJZ1v6LaeQUTd}c5FL<hX_RbW
zq*(p$+MAWyd4J^nW#KZal7AjNec)#($|U%{cWQDQ4<&B`)Uo@Ng`s36#LL%LD3zKp
z3+|_Z5aMlx(#wV4t$V%Rx1tZPF8=dr`q&>o!0j#la*bn5n$6;{=#PJNr~RPYS<L3G
zQ9p3F0q0PNV}7CKG{qfpRE&+7B*=C?8p4*eadQCvb${6_SFUd^gLMu)T7qA7t#4Gk
zhF67lH-I91B`zN(Loh1WAweXK)pD5^b95yJxJ8)eY-LIfc*=+eoyQ}9E^nn)oDy3x
zcpiOT_+BZsq=gx2=LDWdqC+dp6YDZURs4Aa=0UGi6GP-U$Jo^-7Hu~mR_`0|&=UUu
RxL*M2f&+M4v$InIix|f{`|SV#

diff --git a/state_machine_exporter/src/test/resources/golden/InheritanceStateMachineConfig/InheritanceStateMachineConfig.puml b/state_machine_exporter/src/test/resources/golden/InheritanceStateMachineConfig/InheritanceStateMachineConfig.puml
index 68247de..beeb601 100644
--- a/state_machine_exporter/src/test/resources/golden/InheritanceStateMachineConfig/InheritanceStateMachineConfig.puml
+++ b/state_machine_exporter/src/test/resources/golden/InheritanceStateMachineConfig/InheritanceStateMachineConfig.puml
@@ -24,7 +24,7 @@ skinparam svgLinkTarget _self
 [*] --> START
 
 
-START -[#1E90FF,bold]-> WORKING <<external>> <<e_INHERITED_SUBMIT>> : INHERITED_SUBMIT
+START -[#1E90FF,bold]-> WORKING <<external>> : INHERITED_SUBMIT
 
 WORKING --> [*]
 @enduml
diff --git a/state_machine_exporter/src/test/resources/golden/KamilEnumStateMachineConfiguration/KamilEnumStateMachineConfiguration.png b/state_machine_exporter/src/test/resources/golden/KamilEnumStateMachineConfiguration/KamilEnumStateMachineConfiguration.png
index a039165fbb88def0a4bd886c4a3450e60e33ce76..ce4c12289fb97058361f058a15b2ab55ded1cb0a 100644
GIT binary patch
delta 705
zcmV;y0zUnLhy&|~1CUyOrD;@HbZ~58Zgh2RYybfO004NLt(EOg8bK6>|IbyN#y{GK
zWdW@cOXOo$p^GK5m^8+iVfP3Vc4x@UES5ICGVj4_>WqAf77OV=_C05wdFRaG%$d?u
z>NJVThoPjsghEWmBGsT0)Ra@A(EP?Bl~fA}TyP|P79n6V)MJQ$P=%5WH4}UyD~%F`
z9uJYI0poUEVnnJDei48Q4F^3bQXW-BY<LfSrqSv`MkpuR&PjphyT@}i=(BLZQ7LeY
z<_WGZX@XGaW~-^tW<L>5W*>SSBXmU^8R2TOm*glRmo-9*MiJvZ!}`7KuumiLVD)<%
zt7Y$HDaFHl(+28)ilmGyXbLXgN_)0)yc(IFEbK;y=&S~p54Z?LLk5nMT{b!D`HT+&
zDtqQq?i9xNgxq|*g-oUd-)yPcw$SRJ-KjL|LEzR1nUsDx*ecg+4xFBbeZfL3l?Zur
zDP(ST9QP#adHc4Mw<}v%ih<w{a|xWrr4ke;ad(7V+xT~X@+yBl((CwM-S^$K+-cHQ
zo~z}{s{0Oqk^?tSkGGrp|9AXW?iYD$_~lBqw)K5F8<8g~4At|F@`cZTrRL_nc4x=J
zGuW0FcAx*<U$T2!Ve@ZcdnuKXGe<j{qc6&>mV5b*<=p1nrRG>APoeqO(A+j1_llDL
zFO>JZ%&vNWZ3Dq4czWCi8rlaV_j2;gZP;mMrrL|(Vm8d8XUHS_Y>`$>x$ZQ57@<@K
z3(i3<n=2gTcY}Tk9(KVwG^4**$QHAQP;~>a;XSf@-ts|-RE7u<Q(CfaYHjV21|3nj
zO1WkUnllWMH)>yJ0=Rs{q~M7;6lq*H7YRp&OoeGPXrnYv;JQg_cu&(<n-!t3Z%z?9
nftNWZKINuSdxnjiRLujW<+upv74ioTcy=BZ8{_t~9s}dRokUhK

delta 727
zcmV;|0x13KhXa9#1CUyOyJ=KdbZ~58Zgh2RYybfO004NLtyS$#8bK8OKTmNR|7atY
z1++>mk&j&q1xo}>j4@=`y~2du88S1ArA?pAckr1y!{-WCBJtnuxp&Svcjo5a3#F;l
zaTJnIBT4%ag^*4}tU*PnDW^oC`Nk2IR0|1Qa3lj3AYe4o69`a$`I3z^6MP0MjS_{P
zjF6}y<Mv!+K&lb`5P%Z(hkYqx9+X9B_#OvLqs4^`P|mQuvmDL#PM2tV!2BUcrNA+m
zC%C?%5ki$4sX5SMzY)$BKY9`(^h6jK;CiMdIZDW+4bY@Pz<A$q{Y^R?&_Fy|{DFol
z>AfhWcwCCsP?scsWn4i+aPeB&)XM34WL}xy3y#rQ4<-v-g@O?S$4Mtmj{9}ShixkR
z=25x|!v{j{KHozsRe+!Ns#^A<)lsWcYE;{8w?fG5>XX4{v08E9{M;W1=3}8i$g4*o
zb+_lZXKBwnv{!k*CSh3&3H~yVz-d@0*q`n+!yO~ns@p7o-WoIy3Cx_jB^xYn3wfQo
zSFP9GEo$?$4aGUWQ;p@~RoUIDJj>b;p22YU{B-}`l0QIqr+Qa;ZwePn<;sSv1$S;F
z=OYAXL`KZ>PO`bL{}szDd%tVP)Rfr166{Z>&A0TyPPEzAX!|jhfwQD`-cS9#*lfC2
zTP$bZ&ztCfv32G-X?Bw|vrFS{uw*}kWt*49Q}5DO@CBZq4uSf1uVr2i$fY|wbj|R6
z5nK(cMf3uBV7Du2hLr10qYh(~%Fu#ylu2iDN7?=MAO;V6;2fI`mCvQ~>0>CnZLr}3
zvVYmEgA%dy5dx;PWWCthIv_PVrf?l|%_1~4jF8t!DnAwgxO~i{;E^ec)NUH9gp*vV
z#5A-}8YghmAQgO|aj4A+U)a@{hfdo|osv4`rhof}8#yVPJ*wp-50@qK54K*e7!uTV
JXtM|d<G_#QVY2`L

diff --git a/state_machine_exporter/src/test/resources/golden/KamilEnumStateMachineConfiguration/KamilEnumStateMachineConfiguration.puml b/state_machine_exporter/src/test/resources/golden/KamilEnumStateMachineConfiguration/KamilEnumStateMachineConfiguration.puml
index edd446f..f4b8506 100644
--- a/state_machine_exporter/src/test/resources/golden/KamilEnumStateMachineConfiguration/KamilEnumStateMachineConfiguration.puml
+++ b/state_machine_exporter/src/test/resources/golden/KamilEnumStateMachineConfiguration/KamilEnumStateMachineConfiguration.puml
@@ -25,19 +25,19 @@ skinparam svgLinkTarget _self
 
 state OrderStates.PAID1 <<choice>>
 
-OrderStates.SUBMITTED -[#1E90FF,bold]-> OrderStates.PAID <<external>> <<e_OrderEvents_PAY>> : OrderEvents.PAY
-OrderStates.PAID -[#1E90FF,bold]-> OrderStates.FULFILLED <<external>> <<e_OrderEvents_FULFILL>> : OrderEvents.FULFILL
-OrderStates.SUBMITTED -[#1E90FF,bold]-> OrderStates.CANCELED <<external>> <<e_OrderEvents_CANCEL>> : OrderEvents.CANCEL [λ]
-OrderStates.PAID -[#1E90FF,bold]-> OrderStates.CANCELED <<external>> <<e_OrderEvents_CANCEL>> : OrderEvents.CANCEL
-OrderStates.SUBMITTED -[#1E90FF,bold]-> OrderStates.SUBMITTED <<external>> <<e_OrderEvents_ABCD>> : OrderEvents.ABCD
-OrderStates.SUBMITTED -[#1E90FF,bold]-> OrderStates.PAID1 <<external>> <<e_OrderEvents_ABCD>> : OrderEvents.ABCD
+OrderStates.SUBMITTED -[#1E90FF,bold]-> OrderStates.PAID <<external>> : OrderEvents.PAY
+OrderStates.PAID -[#1E90FF,bold]-> OrderStates.FULFILLED <<external>> : OrderEvents.FULFILL
+OrderStates.SUBMITTED -[#1E90FF,bold]-> OrderStates.CANCELED <<external>> : OrderEvents.CANCEL [λ]
+OrderStates.PAID -[#1E90FF,bold]-> OrderStates.CANCELED <<external>> : OrderEvents.CANCEL
+OrderStates.SUBMITTED -[#1E90FF,bold]-> OrderStates.SUBMITTED <<external>> : OrderEvents.ABCD
+OrderStates.SUBMITTED -[#1E90FF,bold]-> OrderStates.PAID1 <<external>> : OrderEvents.ABCD
 OrderStates.PAID1 -[#FF6347,bold]-> OrderStates.PAID2 <<choice_type>> : [λ] (order=0)
 OrderStates.PAID1 -[#FF6347,bold]-> OrderStates.PAID3 <<choice_type>> : [guard1] (order=1)
 OrderStates.PAID1 -[#FF6347,bold]-> OrderStates.HAPPEN <<choice_type>> : [λ] (order=2)
 OrderStates.PAID1 -[#FF6347,bold]-> OrderStates.CANCELED <<choice_type>> : (order=3)
 OrderStates.PAID2 -[#1E90FF,bold]-> OrderStates.CANCELED <<external>>
 OrderStates.PAID3 -[#1E90FF,bold]-> OrderStates.CANCELED <<external>>
-OrderStates.PAID2 -[#1E90FF,bold]-> OrderStates.PAID2 <<external>> <<e_OrderEvents_ABCD>> : OrderEvents.ABCD / λ, action2
+OrderStates.PAID2 -[#1E90FF,bold]-> OrderStates.PAID2 <<external>> : OrderEvents.ABCD / λ, action2
 
 OrderStates.CANCELED --> [*]
 OrderStates.FULFILLED --> [*]
diff --git a/state_machine_exporter/src/test/resources/golden/MavenOrderStateMachine/MavenOrderStateMachine.puml b/state_machine_exporter/src/test/resources/golden/MavenOrderStateMachine/MavenOrderStateMachine.puml
index cee713a..465e876 100644
--- a/state_machine_exporter/src/test/resources/golden/MavenOrderStateMachine/MavenOrderStateMachine.puml
+++ b/state_machine_exporter/src/test/resources/golden/MavenOrderStateMachine/MavenOrderStateMachine.puml
@@ -24,8 +24,8 @@ skinparam svgLinkTarget _self
 [*] --> INIT
 
 
-INIT -[#1E90FF,bold]-> BUSY <<external>> <<e_SUBMIT>> : SUBMIT / loggingAction()
-BUSY -[#1E90FF,bold]-> DONE <<external>> <<e_ORDER_EVENT>> : ORDER_EVENT
+INIT -[#1E90FF,bold]-> BUSY <<external>> : SUBMIT / loggingAction()
+BUSY -[#1E90FF,bold]-> DONE <<external>> : ORDER_EVENT
 
 DONE --> [*]
 @enduml
diff --git a/state_machine_exporter/src/test/resources/golden/OneStateMachineConfiguration/OneStateMachineConfiguration.png b/state_machine_exporter/src/test/resources/golden/OneStateMachineConfiguration/OneStateMachineConfiguration.png
index 31de85a983859f58c0dbe2b5818a70f2919a8a36..b749fe7c9c4c1429cae3469dbbe22a4c682e415b 100644
GIT binary patch
delta 1020
zcmV<Y0|WfqzzU<l3XoZU1J!9%Safh~VQzGFZEOGm0001ZoTXUXZreBzedkxqrZ35&
z4n$eL$Y_lwsogdkcY{O?k_JIQTVq>@OsW*+taq{hzLayRWLTu!eY0mq=Nt|XNl_nC
z#iYs>G5IZ#Y_?z!vz5pcqzhDxGm@hIjR})X2?<<qB=aalz(t~eRuE!3kx`-|!JopZ
zLWx4H5+vzE#PjDCI>;2lKLp^IO&(@aWIQ|(vBrCxM+)<}kRi&a*c;zt&2jfN8qA}~
z1IIK4s$)aJ)mOGa_`)^SbKo-i8^M41qgFA(Sj3?YTs(0}juKo)2hLd-Mtr8R{w*q;
zvrs(d@hOYbqV^+yDaGR}=_#sX$s(S@NN};OY%Qg`nRy=BWE{4TZYGNZ{Fw@q2q<-m
zBA2tXh(82O&h(_*rx;HOx&8eP8jU_&<~>diFN33CKnZzjc`<kc@7_)3BAQ^oza>rE
zmVC#O?^^P{Iqy1_=cy&{TJoMbZ;@9T9Vr1r<Ms_5_|9;D_%=7)-Nt0(y6`XURnFpm
zA9^rYB3J3*;A-$Sprl-ChH9FiTv9GILwP2sCMlPip;{&=kCaQzP;C=bi<C>vP#qIg
zo0Ln<P+b#Lhm=drP`(MOOUk8YDC(H7e6mq%0i#BjI%K2Rf@b!7+4R)rdTO*iE&HC@
zj8Bcur)BGZQ=9jx(fqXRermHnHTs{nc3PG<CafD$F4a)OVY}&dwnAOMZhrUq$-YLr
zon=ghS4<9mWctY5-&?XcL%Mfx2m9+|`@M6p6Up~2B+p2+j6~ZOsKQzGKLp!py0vNC
z0?p2&@vA%IZeVpRScOw|Q}Ws#pOI<U7wPl$Kf3pSc5f<#p;0#0!n=iaZo9wIjqOcu
z8YJ6jwl=ClvTu`IN3lfxrfm>xBiTW)>sYW_yPL$-CK)qXJpe1|wk}mPoZ6t8bviy1
zfuJUjSZTc4G@fDoTWPjUN5%SgZCKUoza%-or%}hy8!OQc)9Kl;+&ZFTArk5uBwK0f
z?^3pZ#aQcL&{yRo?{l?e8%?ca?uBL~Bv!l7MrG*Dh6imsYpwlzD&(V%_|?6!o)h)=
zL)&ZF{op#dIJ!5!B43v;h2PhAa(y=^ACQOn=M{1uGp@dk&R~f$jRXgJ=sK=<*xV21
z84Pg@dZD{c&vSZC3r+?B<mm&l|LOb;Qjy7K2|^g9N=D->|K4&yPT7*dMaEUMz#jaW
zAV2;1$4dYPd>Ki>7g{4Zy&C;2XnT$0NWmpatpu({<Rea57AyV4MC9K_dhjh6HoD}D
qaXl|Hjg6d~2#qUOJ@|A?{sWZcwwBq7a!7-41cz`00k?1j0_&S^Z}ouy

delta 1077
zcmV-51j_rPzzW;I3XoZU1Py6aSafh~VQzGFZEOGm0001ZoTZp=bJ{o%#^38x=+ZYy
zr(`T+{+MZ*CMmR+3%yL@W|C$yjKB+cVk9cd<hYyr?k7W%Vhmc-dxv+~-?Lupv1NZu
zG*>#E#^kq|;^Qf&F<;13(_{*o3r-R+zhTA|*HTd-1&~P;0)^>+OfP5%$xuZz9Z9hY
zCmIw;y_f+>9wU*}O-+z%p#Km`Px<h1tYj*}GZ`D+(<IW6#ia^CtzvI{k5>oH*Jv<_
zhK~Z0gfbKBN}<2<DbU}Ak$MhXM}GtLUk>yl20D;&XaZL&EhRuv*D--h9)^(^8`i(;
z9Zq;CpR)Lf$H{ts?<Y#hr&rN)(5H$=BB4Dg<hH*pTWM})p3iJJ2y4JLlj|q=GZoGv
z%9yj><a~S)iN}DevAHPy1mY1P_irC)rP8L?*^HCp>)<5lFhW)%Uk~2V_wR=j84aP`
z-jZf@B;P>tO(gHz^R9!`GbHaKdC#6l+RL3C$$@F*{tfGY_)fR`E?aaD8y6$%3;r@|
zRq(jo&JOyWIS8HfJ2#!L0W+}{T}6&p5t1*r<EwVOTfn;{Uv9^Hc6_yfuabPZ9bdEK
zy#n4N`EonHZpYUO_!`NV+wl!MzFxrBNxs~UZ`$#V0=_}=<#xPp$2SZ3CdrrE@yxOF
z{Q}=78}*2P07IPR6s_fu4FV#8nRknO^Y&$!e;Hz6R&+4STbN-UW{8Pd(ZwupV}|*d
zAx36JC$qej8Rlh%n3)yb%xZhxjPC3LcLn|($(I{^w_C4zjjj0G*GEV{+aE1y_v4hS
z@P@0-kJM~D4iDx$PJta9J<!AD=I4WRw3o>DEh5i<B$g+!I)Ykz;{T6^ahYam8Fx))
z@3ZlDPsZI~H4xU?US+f8<?{Ff++bf?pDd5q!MlTzl$JqZs%twm^x8ImWg6RuUbVE0
z$!s0ej+T9_<uV;BFz+jthB1*n8g?CoRoj1&xMq<IxY~UJsOYvS?HD-2P}MRMAIm^8
z+ZsWCWxUcdp2h#D%(lz1!~ZVE+U@^b%h}s5b1bt#h4#3d9>#LZG#yJhW3HuTRHpo0
z3NvG=2ScJ^md$y0%a}~5$J~odPb%2G3Nb0mY&O;)c4sYh{~k&8WFr3V*`Uvf^7lh*
z|JLu^23IG2WYd0I*ks-2U$?(6zjoZeeIOryL4?_dD{>igp}+Mm=p0lMNkQ4M>$u)=
z^)Q&Ev<m}j%<noa&uKX|de#YOmOdhfpD!<HB2zU48b*m$(ICyfWF3)nKIil*6*`(i
zi~czSasKI#mjLaEd8DM6njXpdP4DL)>R#nE()1dX>4e_&$R`-_G}fkKD6_9lE&44V
v=vJEKf(vu4#)b`ooJqq~ix&NSO8x@~L?o7iBBQN?I0T0{1Oc}=1On@uf*BYi

diff --git a/state_machine_exporter/src/test/resources/golden/OneStateMachineConfiguration/OneStateMachineConfiguration.puml b/state_machine_exporter/src/test/resources/golden/OneStateMachineConfiguration/OneStateMachineConfiguration.puml
index 4950430..7e16fb0 100644
--- a/state_machine_exporter/src/test/resources/golden/OneStateMachineConfiguration/OneStateMachineConfiguration.puml
+++ b/state_machine_exporter/src/test/resources/golden/OneStateMachineConfiguration/OneStateMachineConfiguration.puml
@@ -35,22 +35,22 @@ state States.STATE14 <<choice>>
 state States.STATE9 <<choice>>
 state States.STATE8 <<choice>>
 
-States.STATE1 -[#1E90FF,bold]-> States.STATE2 <<external>> <<e_Events_EVENT1>> : Events.EVENT1
-States.STATE2 -[#1E90FF,bold]-> States.STATE3 <<external>> <<e_Events_EVENT2>> : Events.EVENT2
-States.STATE3 -[#1E90FF,bold]-> States.STATE4 <<external>> <<e_Events_EVENT3>> : Events.EVENT3
-States.STATE4 -[#1E90FF,bold]-> States.STATE5 <<external>> <<e_Events_EVENT4>> : Events.EVENT4
-States.STATE5 -[#1E90FF,bold]-> States.STATE6 <<external>> <<e_Events_EVENT5>> : Events.EVENT5
-States.STATE6 -[#1E90FF,bold]-> States.STATE7 <<external>> <<e_Events_EVENT6>> : Events.EVENT6
-States.STATE7 -[#1E90FF,bold]-> States.STATE8 <<external>> <<e_Events_EVENT7>> : Events.EVENT7
-States.STATE8 -[#1E90FF,bold]-> States.STATE9 <<external>> <<e_Events_EVENT8>> : Events.EVENT8
-States.STATE9 -[#1E90FF,bold]-> States.STATE10 <<external>> <<e_Events_EVENT9>> : Events.EVENT9
-States.STATE10 -[#1E90FF,bold]-> States.STATE11 <<external>> <<e_Events_EVENT10>> : Events.EVENT10
-States.STATE11 -[#1E90FF,bold]-> States.STATE12 <<external>> <<e_Events_EVENT11>> : Events.EVENT11
-States.STATE12 -[#1E90FF,bold]-> States.STATE13 <<external>> <<e_Events_EVENT12>> : Events.EVENT12
-States.STATE13 -[#1E90FF,bold]-> States.STATE14 <<external>> <<e_Events_EVENT13>> : Events.EVENT13
-States.STATE14 -[#1E90FF,bold]-> States.STATE15 <<external>> <<e_Events_EVENT14>> : Events.EVENT14
-States.STATE15 -[#1E90FF,bold]-> States.STATE16 <<external>> <<e_Events_EVENT15>> : Events.EVENT15
-States.STATE4 -[#1E90FF,bold]-> States.STATEY <<external>> <<e_Events_EVENTY>> : Events.EVENTY
+States.STATE1 -[#1E90FF,bold]-> States.STATE2 <<external>> : Events.EVENT1
+States.STATE2 -[#1E90FF,bold]-> States.STATE3 <<external>> : Events.EVENT2
+States.STATE3 -[#1E90FF,bold]-> States.STATE4 <<external>> : Events.EVENT3
+States.STATE4 -[#1E90FF,bold]-> States.STATE5 <<external>> : Events.EVENT4
+States.STATE5 -[#1E90FF,bold]-> States.STATE6 <<external>> : Events.EVENT5
+States.STATE6 -[#1E90FF,bold]-> States.STATE7 <<external>> : Events.EVENT6
+States.STATE7 -[#1E90FF,bold]-> States.STATE8 <<external>> : Events.EVENT7
+States.STATE8 -[#1E90FF,bold]-> States.STATE9 <<external>> : Events.EVENT8
+States.STATE9 -[#1E90FF,bold]-> States.STATE10 <<external>> : Events.EVENT9
+States.STATE10 -[#1E90FF,bold]-> States.STATE11 <<external>> : Events.EVENT10
+States.STATE11 -[#1E90FF,bold]-> States.STATE12 <<external>> : Events.EVENT11
+States.STATE12 -[#1E90FF,bold]-> States.STATE13 <<external>> : Events.EVENT12
+States.STATE13 -[#1E90FF,bold]-> States.STATE14 <<external>> : Events.EVENT13
+States.STATE14 -[#1E90FF,bold]-> States.STATE15 <<external>> : Events.EVENT14
+States.STATE15 -[#1E90FF,bold]-> States.STATE16 <<external>> : Events.EVENT15
+States.STATE4 -[#1E90FF,bold]-> States.STATEY <<external>> : Events.EVENTY
 States.STATEY -[#FF6347,bold]-> States.STATEX <<choice_type>> : [guardVarEquals("value1")] (order=0)
 States.STATEY -[#FF6347,bold]-> States.STATEZ <<choice_type>> : (order=1)
 States.STATE16 -[#FF6347,bold]-> States.STATE17 <<choice_type>> : [guardVarEquals("value1")] (order=0)
@@ -76,7 +76,7 @@ States.STATE9 -[#FF6347,bold]-> States.STATE7 <<choice_type>> : [guardVarEquals(
 States.STATE9 -[#FF6347,bold]-> States.STATE6 <<choice_type>> : (order=2)
 States.STATE8 -[#FF6347,bold]-> States.STATE9 <<choice_type>> : [guardVarEquals("forward9")] (order=0)
 States.STATE8 -[#FF6347,bold]-> States.STATE10 <<choice_type>> : (order=1)
-States.STATE5 -[#1E90FF,bold]-> States.STATE_EXTRA_1 <<external>> <<e_Events_EVENTX>> : Events.EVENTX
+States.STATE5 -[#1E90FF,bold]-> States.STATE_EXTRA_1 <<external>> : Events.EVENTX
 
 States.STATEZ --> [*]
 @enduml
diff --git a/state_machine_exporter/src/test/resources/golden/OrderStateMachineConfig/OrderStateMachineConfig.puml b/state_machine_exporter/src/test/resources/golden/OrderStateMachineConfig/OrderStateMachineConfig.puml
index 3b59d0b..14ac988 100644
--- a/state_machine_exporter/src/test/resources/golden/OrderStateMachineConfig/OrderStateMachineConfig.puml
+++ b/state_machine_exporter/src/test/resources/golden/OrderStateMachineConfig/OrderStateMachineConfig.puml
@@ -24,8 +24,8 @@ skinparam svgLinkTarget _self
 [*] --> NEW
 
 
-NEW -[#1E90FF,bold]-> PROCESSING <<external>> <<e_SUBMIT>> : SUBMIT / processAction()
-PROCESSING -[#1E90FF,bold]-> COMPLETED <<external>> <<e_FINISH>> : FINISH
+NEW -[#1E90FF,bold]-> PROCESSING <<external>> : SUBMIT / processAction()
+PROCESSING -[#1E90FF,bold]-> COMPLETED <<external>> : FINISH
 
 COMPLETED --> [*]
 @enduml
diff --git a/state_machine_exporter/src/test/resources/golden/SimpleEnumStateMachineConfiguration/SimpleEnumStateMachineConfiguration.png b/state_machine_exporter/src/test/resources/golden/SimpleEnumStateMachineConfiguration/SimpleEnumStateMachineConfiguration.png
index a91e0b18f890492a2d931d63552c4128a3bb6f71..d57c055daf63dd8f890e2a805ba36d3522756e87 100644
GIT binary patch
delta 710
zcmV;%0y+JoxC4&31CUyOt7%kNbZ~58Zgh2RYybfO004NLt(D(S8bK7s@8>B_<Bc?8
z*#)f<OXSb4LctONlg1D;>>ig1yE9~F7E7BxneX5;bw&_TQIzy<_d92Q^UayrbB>j!
zQm08wK8+=f5(+V$id2J2P*YBcLi3DcDybF{xZp^JEJVO$tfvrvq6#D%YbN+iRvIM=
zJsl%aBgXA_i4mzr_(K3HG#Euvq&%#O*zj(KOrzC>3{lRst-}J%4-OV;cgTVfN2S0q
znlHFMqX|Nto2BMLhy6x4e0b5*7-1md&<N+VwIoLgZq5j88itHVhV^&Z;gE*n#_HEJ
zR?FVYQi_|!q7Br46-gOa&=Op%O1rmm@H{f#SuhCq(0LwQ-r!>>95Zm7+_K3@)MR|r
zr7|*ya-}f7Cgk#SAF|mJ{II3!*g~t_POs9cce`GVkXh+h2I1%^7z!3(sk9=kU9LaL
zAgdYK%Pq${%=!L~EqMQ#kvRl^nWN$~E|s7-i+dB~+Qxr>k{9`JBmG{}uQ!|Co7{QQ
zMxLwXv#Pg-Kg)s3yW9Rp{l6c-k^AM-eU)FXRBNx(eSbe+`1<O3x{F(JWq<Q~xGe;1
z-~X-Oa+!_M`4#9n)yb?Z^ctY^F|Y5WuB<?mQW-k^&HbL1+imY`jbV2q!*A3z{}SkK
za)Vz`^8bZ@;=H55IP0!De1W^$9iV|7Q|{AFwy<G)sOhCof{(rCA$p8Fw8N6LW6E`}
z)r1L3Ww7Avx;eM7o8RsZQ}A&B&Yl@K#X_!_+k>jt1sl$g?UQyBlt^WO5Hh7D8>H4&
zhBWAe!g<OyOVI3LjJ#3%{vd$ICrk>Sm`#z!Me8v+VZV^AFby4)#tB@sNDZ%P8f)`K
sAnc?oLa*y*4@i@8b4Me?Moy|`ENVF|!byev1IX%~E?CuLnxi8F*$jPTxc~qF

delta 731
zcmV<10wn#8xC5iO1CUyOz-d%ibZ~58Zgh2RYybfO004NLtyS$#A~6*G->0}6|HwvM
z2GCXF68V@>Sa6Aei7|wfnJYBRw509evYUM}-@#|v77$TTl=zQ1_x7A~Z_B->N>i!h
zC?sD-lJ+ACA)Sa=gNjg7PKiSE8%I=9EhKQkkqlUXfYC@#AVB4ROE%I>@ENQ$N)&oB
zLZXI@+jEftsYduq0E*Nf_N9n<P!gfxyBjc#78f!=Im332vozB?TA-}~^M@Rj0>@yU
z;QE3_2o-Lm=0KDEK{$T=(323MC&Iu0moqKNQ9?RpfCdc$#`}ir-?GC24aA+rZ)vEO
zy%(eucMH)f>Y}87j4P-MF4m<@tsK3K%q#PI!2voigUbazg@O?S$4M=l9QSLC4_j3B
z&82h|hPQ;=eC<FonTKDtRZZJywcl(P>y=i^EfX?p{n{X$ocII5e9Y(9q%{haXBlKY
zNAhOJagS4;w`UvPd0}Kug1^mGaT@0H_M<z^aL35C>NX00*9OhO5@t?alNFY?g}ipn
ztJG@l2DN$GisBsKs>V{`qU3H=o@K2F&tSNDxbJ+l<WJDus@~=I^M-JtSSqi`TJUvI
z&pXUyzrXsB(u?QVwew|4ZW{-?(=qWQmDrj(vxa)k>Lk`)%mzZ|V_x6My0!!Tn99KE
zZ14BH&}g`S7aI(xw=(=jUo)$O>1|&83QOiwSe$oEHfPI!0DOao`#qq(U7P9WlXc<F
z&U7=|p9P<$++*|<d0>|}X@r#PcD)8;l*-V8v!70-v-_Fd)*uECd*B?H1(?gGa;XC-
zxh=5a1lc`n)If<?`UnA2TC!ejZ6!#RjwxKmT(byHO${UD)$-3r09-z1Qt-$WMXFcz
zr-Z|7vdA<vQ5q+3RVQV<rE#du318UFn}c@COCFIL<>u-34L5R9GHY7PNe<46<UjRM
N&35&Bcu%7a1KFeUZQ=j`

diff --git a/state_machine_exporter/src/test/resources/golden/SimpleEnumStateMachineConfiguration/SimpleEnumStateMachineConfiguration.puml b/state_machine_exporter/src/test/resources/golden/SimpleEnumStateMachineConfiguration/SimpleEnumStateMachineConfiguration.puml
index bbdabed..82cada7 100644
--- a/state_machine_exporter/src/test/resources/golden/SimpleEnumStateMachineConfiguration/SimpleEnumStateMachineConfiguration.puml
+++ b/state_machine_exporter/src/test/resources/golden/SimpleEnumStateMachineConfiguration/SimpleEnumStateMachineConfiguration.puml
@@ -26,11 +26,11 @@ skinparam svgLinkTarget _self
 state OrderStates.SUBMITTED <<choice>>
 state OrderStates.PAID <<choice>>
 
-OrderStates.SUBMITTED -[#1E90FF,bold]-> OrderStates.PAID <<external>> <<e_OrderEvents_PAY>> : OrderEvents.PAY
-OrderStates.PAID -[#1E90FF,bold]-> OrderStates.FULFILLED <<external>> <<e_OrderEvents_FULFILL>> : OrderEvents.FULFILL
-OrderStates.SUBMITTED -[#1E90FF,bold]-> OrderStates.CANCELED <<external>> <<e_OrderEvents_CANCEL>> : OrderEvents.CANCEL [λ]
-OrderStates.PAID -[#1E90FF,bold]-> OrderStates.CANCELED <<external>> <<e_OrderEvents_CANCEL>> : OrderEvents.CANCEL
-OrderStates.SUBMITTED -[#1E90FF,bold]-> OrderStates.SUBMITTED <<external>> <<e_OrderEvents_ABCD>> : OrderEvents.ABCD
+OrderStates.SUBMITTED -[#1E90FF,bold]-> OrderStates.PAID <<external>> : OrderEvents.PAY
+OrderStates.PAID -[#1E90FF,bold]-> OrderStates.FULFILLED <<external>> : OrderEvents.FULFILL
+OrderStates.SUBMITTED -[#1E90FF,bold]-> OrderStates.CANCELED <<external>> : OrderEvents.CANCEL [λ]
+OrderStates.PAID -[#1E90FF,bold]-> OrderStates.CANCELED <<external>> : OrderEvents.CANCEL
+OrderStates.SUBMITTED -[#1E90FF,bold]-> OrderStates.SUBMITTED <<external>> : OrderEvents.ABCD
 OrderStates.SUBMITTED -[#FF6347,bold]-> OrderStates.PAID2 <<choice_type>> : [λ] (order=0)
 OrderStates.SUBMITTED -[#FF6347,bold]-> OrderStates.PAID3 <<choice_type>> : (order=1)
 OrderStates.PAID -[#FF6347,bold]-> OrderStates.PAID1 <<choice_type>> : [λ] (order=0)
@@ -39,7 +39,7 @@ OrderStates.PAID -[#FF6347,bold]-> OrderStates.HAPPEN <<choice_type>> : [λ] (or
 OrderStates.PAID -[#FF6347,bold]-> OrderStates.PAID3 <<choice_type>> : (order=3)
 OrderStates.PAID2 -[#1E90FF,bold]-> OrderStates.CANCELED <<external>>
 OrderStates.PAID3 -[#1E90FF,bold]-> OrderStates.CANCELED <<external>>
-OrderStates.PAID1 -[#1E90FF,bold]-> OrderStates.PAID1 <<external>> <<e_OrderEvents_ABCD>> : OrderEvents.ABCD / λ, action2
+OrderStates.PAID1 -[#1E90FF,bold]-> OrderStates.PAID1 <<external>> : OrderEvents.ABCD / λ, action2
 
 OrderStates.CANCELED --> [*]
 OrderStates.FULFILLED --> [*]
diff --git a/state_machine_exporter/src/test/resources/golden/ThreeStateMachineConfiguration/ThreeStateMachineConfiguration.png b/state_machine_exporter/src/test/resources/golden/ThreeStateMachineConfiguration/ThreeStateMachineConfiguration.png
index b3d8485add66ef8f7d59091e19a44a655804a5ef..8da832e7c7fe48dcba609f46ed278808b3b3479a 100644
GIT binary patch
delta 1096
zcmV-O1h@OO_zm*+4Uk%Y9cffpbZ~58Zgh2RYybfO004NLt(a|d+Bgu$-|JK8(l<$`
zWGrJIr^hs*rq>j5nZ(T`&14vX7x2VLK3OKmb^6^;hJ@N2mJHW-u)F^KSF5!i{2`W9
z$YdU(-y%V$bBaT{<cY-b93*8F#h`veL<N;xV8$7sS>OYPc_f#A*oSy5f=C9Ot<A9n
z0bDL4K=D(+(&y&NNG0I!2;*})ewqrNFu%(~#e1Fw5>h)CK8UsLP0OLxQFCMUX2JN0
zK^$YEY(388C7lEQ%#_rN;U@S8aO?GtT!w&0JoJ^}daWfG2y9!*a7BGTU{l5Vk<D;M
zeg2%<Cp3(+xt|Gt!Jjvx7a-3C4Ool^obg>@t5llXo|lo0M}7^+wlh1xpDsTNFd<ep
z$;GrEuqTg-shX5w4B-T!hqsToQt9BEw8ru2jd$j`1fg}wv&MV;{{48ygE4eEJKUsh
z@HY(prorFR`)$kcJTdrfgWu8n4e1$1mlH=hU0iv1L)?~s)$6@Wd-8E>uF@yrZ`I0-
zhMf*>V|M{e#;5MBd+8CB57ncpI+Ts_p?Z{~Lsd~eRFA6ZP!7t6>QQwas)q8RdQ?M)
zs-t|U9@W&L8YmyCN40dQCd!BEQN+@*T4*cQ03+Hiwa`|ufu`^IeA5$C*As2qlYHM3
zQ{xkD=aYPY>l0J&6K(U8eD@Pm`x9;dlUmtzr+aqUb^AKja2-;1^*IcvnTo@Jn%OuE
zsF{#op5bPXE(G4Ae5gY8diAQ)*onH^>`24(G`6BWOcN^nTPobY5_QZuK3dQ)0djQm
zh>urCt>3May+pq45P2byJc-l|sLc7|e<W;{X_l6Mu`@DzkET^z8GDP>Ft9QwqwSPe
z?ePatg?&wZw)#ho-W^Ri*A&X6nmG>|=eBuBHFg)hs!7=-v$IeIDYr~1m&sUwx*cf}
zHi_(!ux%Mwwf&pKR!uUZqIdvC(Op$4C^#{ps%0uZ<sK)x9x=)|rDYt=`)`!lH5~=-
zzincF6~F(vl+(L4u{5<Y3hgnSj)`TLNjl^_BDN-FqfGf#%Jedp+8AO9QCjEXlua_F
zwz*fC0T)o*g(fLYZMJ&Qw6d03zb9NgD@&`mHpYEokM+=Sk{Y^q-u2l~dvCe>FY%xq
z;qYD9q?s8-xw32?C{-Qp&FOwmaOo5A(B4IV{uS2?Mb4qWt-g#synRF;fcfc1PIMJg
zCch5)cmW~~IK$-BwruCLdhE>-+=CHTOSf&c9jk5CaM$&4>OMiopRW2i=7|^s_Jdf8
zV3ed^Jx|aDT~K_TFd59DjsJ{*U3~oVYQQdA1cI}<$`xJQ4t@sIoyvJ2@eK%-3BDaJ
zppP)2NhsA5W1fDYY~!z9uhK+)%2bz46&o1pa>W(PHvV*u{sqrX%#Aed(<+0*1c$=}
O0f)l`0=L5i19EpqDkl#B

delta 1177
zcmV;K1ZMm4_YJl94Uk%YU};oXbZ~58Zgh2RYybfO004NLy;yB?+BgvYu3w=`za*WK
zv5a{!(_@;X(7PPuGKrf>n#nK%3-H89oGg>loBQu4LqctAv?iCiZ?Nlqp4Dm}Y3)yu
zqEf}P5dAWjbTXqjq)QPi9L<=boT7;7-)v4LRYGDeI78FGXPC`@=4y$37L8;uSApPb
zbEKGLLM`VEMUMeb;%3@N6~licj8Ez4aUw;`{WB42yr*fPSYj8_XL4<O=Q^}HY;LUH
zG#EW{7Dbq7TUT&(L1zsA&NbDu;X3%iu>0~yEklNfBJ{Q4YRx4%li0Sj;gb4(z$Y5(
zpLB*(>WinuKBi%Rl+OJ`O7XNIJ!k4v(tt;}FSsarY?VrL+w;7#(a^6kvh7SS@Tbe4
z2bd5mo#bND3;3f)<wS4FAY$Pdq5Jm_xKe53>!ilf@wIp2bqGT1lBbP#_~XaXR0Jc|
zZWp*o9q=~*e-rS#X1{F#@dWVOfZs9uf%JgYWyn#67gz3o-;s`Mb-N#uo_yHat0a<r
z*R9NH*ls6(2Au`tDjIZdIu{<%wiaGnj@K5H4L8GA&G2>(-bUGQGrVJlujb&ZC>w5u
zubJVU9K3_F;b!={8NQZ-uc2(X8NOkLujk<FC>w5uZ<^s7Irs+3hMVDCGkh}#-$dDP
zGd!`(_-+n=-$h&T009A%W#y%1p)CY}0upb5db9E+kbVguV3Job$x4_&8YX~<NnXVy
zD`Nubm;gd1c_ovqlnJC|0*IO9)l6z-PwKOii?dG8OfXnKlw*0emp!%Ln#!>IZ%t+B
zg14qJbi@C+s?A(wpt{SE+@Wl^hVORkRi{x1f4iA~EC$I`y+XU6#8mn>RCfM~^|*R?
zu%Kbg$idMAK3t8=zgkCok$fv4c}5~xBvJ>UQgh;eNEoJRmZq^&G<&bc-CY@b3#$QO
zr6%0%lvnNX8>1TbCH3j*A36ANFc!j4D2O#R*Moc8d`&fqi(WOP4AB%8YDda0lyaGj
zCDU(zxrT%xl06c(EdZ;wf0Nj{NrqJJUI0j1RHYpSClFM%OvNX{6U5XbAdOR+#xdw0
zq$%2t9s0K+tlj$0q?~*sA(o*wAkiM%=|EU^nWRG@=EOFn4APW8r64hux)>tG=1HA*
zrwq}Qy5?SJ`a-hZT?kPbYO~dY(8*fr{2mK``J^rG?%II&#2)7%FkKBgx8Bvs0C<<X
z%?(+%d6rk*60g6RA<opw%9UypP^x0Udm}WK!eo2Q*@OH`>c&&V`ZljeM%E1Nx78Qa
z`}Ys%6XSmJF&tfnl&i1(9$qjR1%hL8Y+JT-Ts`!rG48S<)>ngVwH&Ku)$m!z!-@NU
z2pxX8?BPhna>TG7L`nw3IQcq$gwE-L;;WdeV8&Yb&pG4gpZ|C<;0|8|Qt+A16`kMo
ze?CxmDyM<M*G%e6@J%0mW@8$MN=J-D@+G^4zk1zD6ZI(99Xrw3jH5H5apkgwznr3f
r0l12Ln?Ec(=KuhJ07*naRCr$O-3NGsjs%B}1ObPR1Om5?1OsGuCWcOP

diff --git a/state_machine_exporter/src/test/resources/golden/ThreeStateMachineConfiguration/ThreeStateMachineConfiguration.puml b/state_machine_exporter/src/test/resources/golden/ThreeStateMachineConfiguration/ThreeStateMachineConfiguration.puml
index d842d14..dcb4963 100644
--- a/state_machine_exporter/src/test/resources/golden/ThreeStateMachineConfiguration/ThreeStateMachineConfiguration.puml
+++ b/state_machine_exporter/src/test/resources/golden/ThreeStateMachineConfiguration/ThreeStateMachineConfiguration.puml
@@ -36,27 +36,27 @@ state States.STATE9 <<choice>>
 state States.STATE8 <<choice>>
 state States.STATE2 <<choice>>
 
-States.STATE1 -[#1E90FF,bold]-> States.STATE2 <<external>> <<e_Events_EVENT1>> : Events.EVENT1
-States.STATE2 -[#1E90FF,bold]-> States.STATE3 <<external>> <<e_Events_EVENT2>> : Events.EVENT2
-States.STATE3 -[#1E90FF,bold]-> States.STATE4 <<external>> <<e_Events_EVENT3>> : Events.EVENT3
-States.STATE4 -[#1E90FF,bold]-> States.STATE5 <<external>> <<e_Events_EVENT4>> : Events.EVENT4
-States.STATE5 -[#1E90FF,bold]-> States.STATE6 <<external>> <<e_Events_EVENT5>> : Events.EVENT5
-States.STATE6 -[#1E90FF,bold]-> States.STATE7 <<external>> <<e_Events_EVENT6>> : Events.EVENT6
-States.STATE7 -[#1E90FF,bold]-> States.STATE8 <<external>> <<e_Events_EVENT7>> : Events.EVENT7
-States.STATE8 -[#1E90FF,bold]-> States.STATE9 <<external>> <<e_Events_EVENT8>> : Events.EVENT8
-States.STATE9 -[#1E90FF,bold]-> States.STATE10 <<external>> <<e_Events_EVENT9>> : Events.EVENT9
-States.STATE10 -[#1E90FF,bold]-> States.STATE11 <<external>> <<e_Events_EVENT10>> : Events.EVENT10
-States.STATE11 -[#1E90FF,bold]-> States.STATE12 <<external>> <<e_Events_EVENT11>> : Events.EVENT11
-States.STATE12 -[#1E90FF,bold]-> States.STATE13 <<external>> <<e_Events_EVENT12>> : Events.EVENT12
-States.STATE13 -[#1E90FF,bold]-> States.STATE14 <<external>> <<e_Events_EVENT13>> : Events.EVENT13
-States.STATE14 -[#1E90FF,bold]-> States.STATE15 <<external>> <<e_Events_EVENT14>> : Events.EVENT14
-States.STATE15 -[#1E90FF,bold]-> States.STATE16 <<external>> <<e_Events_EVENT15>> : Events.EVENT15
-States.STATE1 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE2 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE3 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE4 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE5 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE4 -[#1E90FF,bold]-> States.STATEY <<external>> <<e_Events_EVENTY>> : Events.EVENTY
+States.STATE1 -[#1E90FF,bold]-> States.STATE2 <<external>> : Events.EVENT1
+States.STATE2 -[#1E90FF,bold]-> States.STATE3 <<external>> : Events.EVENT2
+States.STATE3 -[#1E90FF,bold]-> States.STATE4 <<external>> : Events.EVENT3
+States.STATE4 -[#1E90FF,bold]-> States.STATE5 <<external>> : Events.EVENT4
+States.STATE5 -[#1E90FF,bold]-> States.STATE6 <<external>> : Events.EVENT5
+States.STATE6 -[#1E90FF,bold]-> States.STATE7 <<external>> : Events.EVENT6
+States.STATE7 -[#1E90FF,bold]-> States.STATE8 <<external>> : Events.EVENT7
+States.STATE8 -[#1E90FF,bold]-> States.STATE9 <<external>> : Events.EVENT8
+States.STATE9 -[#1E90FF,bold]-> States.STATE10 <<external>> : Events.EVENT9
+States.STATE10 -[#1E90FF,bold]-> States.STATE11 <<external>> : Events.EVENT10
+States.STATE11 -[#1E90FF,bold]-> States.STATE12 <<external>> : Events.EVENT11
+States.STATE12 -[#1E90FF,bold]-> States.STATE13 <<external>> : Events.EVENT12
+States.STATE13 -[#1E90FF,bold]-> States.STATE14 <<external>> : Events.EVENT13
+States.STATE14 -[#1E90FF,bold]-> States.STATE15 <<external>> : Events.EVENT14
+States.STATE15 -[#1E90FF,bold]-> States.STATE16 <<external>> : Events.EVENT15
+States.STATE1 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE2 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE3 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE4 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE5 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE4 -[#1E90FF,bold]-> States.STATEY <<external>> : Events.EVENTY
 States.STATEY -[#FF6347,bold]-> States.STATEX <<choice_type>> : [guardVarEquals("value1")] (order=0)
 States.STATEY -[#FF6347,bold]-> States.STATEZ <<choice_type>> : (order=1)
 States.STATE16 -[#FF6347,bold]-> States.STATE17 <<choice_type>> : [guardVarEquals("value1")] (order=0)
@@ -82,12 +82,12 @@ States.STATE9 -[#FF6347,bold]-> States.STATE7 <<choice_type>> : [guardVarEquals(
 States.STATE9 -[#FF6347,bold]-> States.STATE6 <<choice_type>> : (order=2)
 States.STATE8 -[#FF6347,bold]-> States.STATE9 <<choice_type>> : [guardVarEquals("forward9")] (order=0)
 States.STATE8 -[#FF6347,bold]-> States.STATE10 <<choice_type>> : (order=1)
-States.STATE2 -[#1E90FF,bold]-> States.STATE_EXTRA_1 <<external>> <<e_Events_EVENTX>> : Events.EVENTX
+States.STATE2 -[#1E90FF,bold]-> States.STATE_EXTRA_1 <<external>> : Events.EVENTX
 States.STATE2 -[#FF6347,bold]-> States.STATE1 <<choice_type>> : [guardEventHeaderEquals("header1","foo")] (order=0)
 States.STATE2 -[#FF6347,bold]-> States.STATE_EXTRA_1 <<choice_type>> : (order=1)
-States.STATE_EXTRA_1 -[#1E90FF,bold]-> States.STATE_EXTRA_3 <<external>> <<e_Events_EVENTY>> : Events.EVENTY
-States.STATE_EXTRA_1 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL_2>> : Events.EVENT_CANCEL_2
-States.STATE_EXTRA_2 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL_2>> : Events.EVENT_CANCEL_2
+States.STATE_EXTRA_1 -[#1E90FF,bold]-> States.STATE_EXTRA_3 <<external>> : Events.EVENTY
+States.STATE_EXTRA_1 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL_2
+States.STATE_EXTRA_2 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL_2
 
 States.STATEZ --> [*]
 @enduml
diff --git a/state_machine_exporter/src/test/resources/golden/TwoStateMachineExtraFunctionsConfiguration/TwoStateMachineConfiguration.png b/state_machine_exporter/src/test/resources/golden/TwoStateMachineExtraFunctionsConfiguration/TwoStateMachineConfiguration.png
index 6c76f4735d26132b2b77ddd65e52d7e891d1d7d8..cf4c7065283fc65fcc653be703958a2c43f14948 100644
GIT binary patch
delta 1068
zcmV+{1k?NMmkq0z4Uk%Y0cliNbZ~58Zgh2RYybfO004NLt(b39+c*%$-|JK8=o{!X
zjO93gr<W;Er*~Y!G2k+^43kmfP2$0kQdtg{ySeXvaso8Y#4Cs69qg`u`*`(OR{SZ^
zT<LTclV9eFPiCCPd?`~+lNo3(I7z_#4RfxzmWm1~fJ~zhD9q-6dPze_Mk<=?NQ!kh
z(V#%;<s3-z5Q*%%nF(?Y^dCa$DIYydluSi<CS${UoJJb5xKtsib?jZs<JDpFB^pel
z(Sv{_q0Gd(Qs@gl1Nyr#t)2qc(ceH@&;RIU40I^t&;+j5y_5h&UB?72c^F1wVp#uf
zDxC6AK4$STkCRP*?I%jf$Csw(pidQ#L_+&g$X#VCDb4N7)18fmVGY=Ja`Og%rowqd
z8FMy8E+)N5JOo@#%%Thuh{uH7y}zfGN{3!&Gfs}LgOk8#gsext8T>{+ejH6@G=ffN
zN1D|w`GzImwB%cO-gPY3GfUpJ<UKrZk(awWk^|Gq-8<%gx14VGLuR`Bt;NW6!C%I!
zg2$Z>ZBu^%LMO-mjeij^k}t(kRSe~ld?}9dFjSS~OL0^ULwO`$ilgcnsz&mqII4l6
z>Lg!^qna41LGq<Is)eDNBwvc7n1iueWUJN!W2j3VvQ=!M;hxW%p4nW_P}{S-@0rc`
z40S%sTc6o~yw6bcv%LG6&HfDaKdY79cg{{O&io$68mvpo?mn*rB1`c)AhH^-10oCZ
z<_ce4!iB(ZBwuP!-EO_=HFlzIU*1TA?6|d}-Az)i!W*vqAE`OV93CuqoB}&Ix~GS$
zv(&H7(Oyly?`ZNwVtEp)TTmMZi2otj-lkc)jl0o*X79Uc6;H<9Vl^zRjib-D<dr>s
z18%U-(x<Ec*ujT`v6RT5Y+W}FeAcyXzGfP`hh9Y_+uH0LRDtA{O>!B<3e3+RM6j*N
z9)exR!m90W64#hy$W`$TSex#eQo+EP4OJ~O@rev1!#rYb<CSjXA<w_H&93Drc>Y}*
ztN8hU&q>aHJTnKGjkVDp%jwxzZW+<Blyl}HlC5pZ?^3phvDAwp(J;^ETrAnvrqpZh
zxlLaxD0ZQ(6*8MG588ItQv3H<sz(!P70<@{o+!T`+Rn-Y|2DWf8KA#gZpqFo-uTS-
zhTMUh|F-ab^=aqs{XO{vBFw(hk;|A1{k7kJqYF?;Bn4&1uH$;g)x%(#(k=|C*_vFZ
z?Ky3yM$i0!X6Ykx_~o)k6Pc<J&@f80iiT<S+3tv(^983@snF33+Vsyki1W{XJO`*R
z7Lk%-X0(#?oBq#&x>q@kG`$98l+c?#`3z&8#@bvllG!J=HvJlOD^1el!Z>MS*dWLf
mnKWFrY|}5N<UgiRXm~5eQKf^W1c#*r0f(go0=K0E14l=l5+z^&

delta 1133
zcmV-z1d{u!mksQf4Uk%YLTOZ3bZ~58Zgh2RYybfO004NLy;yB?;x-Weu3w?%z9ctC
z#xmx`%$2!>GuNh&W)fc}xlD!;Sb!%+qOwd%JN@sKA>lAKTGM9k8|-?YXSLc#Uh7k=
zs8q=;LO;zVoy;hX=u#vK$1|oVrzmFnH=9#Qm5`VV&d@Xr7-qA7xmx0Y#UmNcRVet{
z94jW7P|G<(@l(jtxS2Lm#qi$<<8wNCnn;oGpd%uU_dE?1OYK4iOs;M3T!&VN&5hNc
zhNCCW;usTc>k6(e>5SoDxu$wC+=PEI?7sd{%ZTBjhyrc6UUNy#B(^PWxS~N2@`=X!
zXFJ0w4a9S5AJZs*-p>6@O7XlQy<qBG(vZivFSsarY?VrL*YmQn(J-hnvg_Pl;CELr
z4>2Luc9M%pFXT@?l@q-wgP28QgdW~M;!35BZ_*mar#JqY?-7L7CEqsQ<BuOlQxT3>
zyItTWb->>M{7t~`n*Fu~#1p`81AfQs2hz)|4rPFG<>4KF@m#Ch{g5`@<IZNJd9gor
zuW}l-+v%Tyw_sew1Mk+m^oh2$@Y-^^wxDdd8NO<Uw{!3|%7&Za9W#722VX_ma5H?(
z4DaON9h40>!`IF5wH$m6Wy8(z4KsW_2VY0oa5H?<4ByDXH&8a*4DXuZn>qL<%7&Za
ziDkxjbNDWQ+KC4U2%s!0FD(o0AOIAQcnj2<l`nzxO8^0ryn;zq!UWPV0YpslDkfPO
z6G+Dd5HiUtnPjC*AT1L>%p|X7QY(8>cg`+5Ue8Q0SU;3wd9jy0wcnb`u={UKW$1#p
zrZRNH4_wt|a57Nc=Sc2RHeADZyY;HmD1^V;OcsNGbZlOsJxmfRgIg-SKN3BU9v>}e
zlrVC1@`#UDGx5*X$w4IF3P@g%NEV6I0jRA(@P8x>(=<!d*jqFQug2Y98G8q-0bp&7
zu)8U*+T#~SHSBBZ)73w6^x<eMgrQIn>(<~7?rrnGRHL})RYS@UO<|$-r0hZ|m&sT%
z{TXY2NEjkHAYt1Auxf`liLIMtNag+ofTTrL+EZ`>K~>9Cd?I{7Og#e9IHhSEgZ@F9
zqV3qDe;dNuum4QS=_LrU47CA?4%kiy!m`UG9SJcfwjpJZru-=diLum+Ay#aj)_H%*
z5KXDq+$&9ANVdNVAu2;{c6tyxSxcSYV<De^wZ+|E8}L0*{yc=n`hj=nU!M(tZ@IhN
zkadR&QGVFe_@<15{72r#lf7;Fwz}+lc>jn#F&?D%w&*INTz&2L@Pf%W6daRN+p?Y0
z>ajmfaF-3SKICkx<ybANhC7~*Q}+ov{&LmBu}I{I;UJ8a42Ma2k$ZwJ=z`+wgsX5<
z##;FIIpY_fe|t4xk1s+g_)O=DE^hnZAE-N(^HAX%CUqwGwvRruF-;<+BSs><bZz0U
zez(#@J<4@YPBb>-s3SD4T(<C+bM!CM!4Ph5)}9N4WCVv~1ObO+1Om5Y1OrD$&Y>*&

diff --git a/state_machine_exporter/src/test/resources/golden/TwoStateMachineExtraFunctionsConfiguration/TwoStateMachineConfiguration.puml b/state_machine_exporter/src/test/resources/golden/TwoStateMachineExtraFunctionsConfiguration/TwoStateMachineConfiguration.puml
index cec31f0..be25fa3 100644
--- a/state_machine_exporter/src/test/resources/golden/TwoStateMachineExtraFunctionsConfiguration/TwoStateMachineConfiguration.puml
+++ b/state_machine_exporter/src/test/resources/golden/TwoStateMachineExtraFunctionsConfiguration/TwoStateMachineConfiguration.puml
@@ -35,27 +35,27 @@ state States.STATE14 <<choice>>
 state States.STATE9 <<choice>>
 state States.STATE8 <<choice>>
 
-States.STATE1 -[#1E90FF,bold]-> States.STATE2 <<external>> <<e_Events_EVENT1>> : Events.EVENT1
-States.STATE2 -[#1E90FF,bold]-> States.STATE3 <<external>> <<e_Events_EVENT2>> : Events.EVENT2
-States.STATE3 -[#1E90FF,bold]-> States.STATE4 <<external>> <<e_Events_EVENT3>> : Events.EVENT3
-States.STATE4 -[#1E90FF,bold]-> States.STATE5 <<external>> <<e_Events_EVENT4>> : Events.EVENT4
-States.STATE5 -[#1E90FF,bold]-> States.STATE6 <<external>> <<e_Events_EVENT5>> : Events.EVENT5
-States.STATE6 -[#1E90FF,bold]-> States.STATE7 <<external>> <<e_Events_EVENT6>> : Events.EVENT6
-States.STATE7 -[#1E90FF,bold]-> States.STATE8 <<external>> <<e_Events_EVENT7>> : Events.EVENT7
-States.STATE8 -[#1E90FF,bold]-> States.STATE9 <<external>> <<e_Events_EVENT8>> : Events.EVENT8
-States.STATE9 -[#1E90FF,bold]-> States.STATE10 <<external>> <<e_Events_EVENT9>> : Events.EVENT9
-States.STATE10 -[#1E90FF,bold]-> States.STATE11 <<external>> <<e_Events_EVENT10>> : Events.EVENT10
-States.STATE11 -[#1E90FF,bold]-> States.STATE12 <<external>> <<e_Events_EVENT11>> : Events.EVENT11
-States.STATE12 -[#1E90FF,bold]-> States.STATE13 <<external>> <<e_Events_EVENT12>> : Events.EVENT12
-States.STATE13 -[#1E90FF,bold]-> States.STATE14 <<external>> <<e_Events_EVENT13>> : Events.EVENT13
-States.STATE14 -[#1E90FF,bold]-> States.STATE15 <<external>> <<e_Events_EVENT14>> : Events.EVENT14
-States.STATE15 -[#1E90FF,bold]-> States.STATE16 <<external>> <<e_Events_EVENT15>> : Events.EVENT15
-States.STATE1 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE2 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE3 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE4 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE5 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE4 -[#1E90FF,bold]-> States.STATEY <<external>> <<e_Events_EVENTY>> : Events.EVENTY
+States.STATE1 -[#1E90FF,bold]-> States.STATE2 <<external>> : Events.EVENT1
+States.STATE2 -[#1E90FF,bold]-> States.STATE3 <<external>> : Events.EVENT2
+States.STATE3 -[#1E90FF,bold]-> States.STATE4 <<external>> : Events.EVENT3
+States.STATE4 -[#1E90FF,bold]-> States.STATE5 <<external>> : Events.EVENT4
+States.STATE5 -[#1E90FF,bold]-> States.STATE6 <<external>> : Events.EVENT5
+States.STATE6 -[#1E90FF,bold]-> States.STATE7 <<external>> : Events.EVENT6
+States.STATE7 -[#1E90FF,bold]-> States.STATE8 <<external>> : Events.EVENT7
+States.STATE8 -[#1E90FF,bold]-> States.STATE9 <<external>> : Events.EVENT8
+States.STATE9 -[#1E90FF,bold]-> States.STATE10 <<external>> : Events.EVENT9
+States.STATE10 -[#1E90FF,bold]-> States.STATE11 <<external>> : Events.EVENT10
+States.STATE11 -[#1E90FF,bold]-> States.STATE12 <<external>> : Events.EVENT11
+States.STATE12 -[#1E90FF,bold]-> States.STATE13 <<external>> : Events.EVENT12
+States.STATE13 -[#1E90FF,bold]-> States.STATE14 <<external>> : Events.EVENT13
+States.STATE14 -[#1E90FF,bold]-> States.STATE15 <<external>> : Events.EVENT14
+States.STATE15 -[#1E90FF,bold]-> States.STATE16 <<external>> : Events.EVENT15
+States.STATE1 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE2 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE3 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE4 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE5 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE4 -[#1E90FF,bold]-> States.STATEY <<external>> : Events.EVENTY
 States.STATEY -[#FF6347,bold]-> States.STATEX <<choice_type>> : [guardVarEquals("value1")] (order=0)
 States.STATEY -[#FF6347,bold]-> States.STATEZ <<choice_type>> : (order=1)
 States.STATE16 -[#FF6347,bold]-> States.STATE17 <<choice_type>> : [guardVarEquals("value1")] (order=0)
@@ -81,9 +81,9 @@ States.STATE9 -[#FF6347,bold]-> States.STATE7 <<choice_type>> : [guardVarEquals(
 States.STATE9 -[#FF6347,bold]-> States.STATE6 <<choice_type>> : (order=2)
 States.STATE8 -[#FF6347,bold]-> States.STATE9 <<choice_type>> : [guardVarEquals("forward9")] (order=0)
 States.STATE8 -[#FF6347,bold]-> States.STATE10 <<choice_type>> : (order=1)
-States.STATE5 -[#1E90FF,bold]-> States.STATE_EXTRA_1 <<external>> <<e_Events_EVENTX>> : Events.EVENTX
-States.STATE_EXTRA_1 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL>> : Events.EVENT_CANCEL
-States.STATE_EXTRA_1 -[#1E90FF,bold]-> States.CANCEL <<external>> <<e_Events_EVENT_CANCEL_2>> : Events.EVENT_CANCEL_2
+States.STATE5 -[#1E90FF,bold]-> States.STATE_EXTRA_1 <<external>> : Events.EVENTX
+States.STATE_EXTRA_1 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL
+States.STATE_EXTRA_1 -[#1E90FF,bold]-> States.CANCEL <<external>> : Events.EVENT_CANCEL_2
 
 States.STATEZ --> [*]
 @enduml
diff --git a/state_machine_exporter_html/src/test/java/click/kamil/springstatemachineexporter/html/HtmlExporterTest.java b/state_machine_exporter_html/src/test/java/click/kamil/springstatemachineexporter/html/HtmlExporterTest.java
index 8ffaa97..aa403a4 100644
--- a/state_machine_exporter_html/src/test/java/click/kamil/springstatemachineexporter/html/HtmlExporterTest.java
+++ b/state_machine_exporter_html/src/test/java/click/kamil/springstatemachineexporter/html/HtmlExporterTest.java
@@ -81,6 +81,14 @@ public class HtmlExporterTest {
 
         // 7. Assertions - Surgical SVG Identification
         // Every event should be wrapped in an identifying hyperlink for robust JS selection
+        java.nio.file.Files.writeString(java.nio.file.Paths.get("debug_html.html"), html);
+        
+        click.kamil.springstatemachineexporter.exporter.ExportOptions plantUmlOptions = click.kamil.springstatemachineexporter.exporter.ExportOptions.builder()
+            .embedIdentifiers(true)
+            .build();
+        click.kamil.springstatemachineexporter.exporter.PlantUml pumlExporter = new click.kamil.springstatemachineexporter.exporter.PlantUml();
+        java.nio.file.Files.writeString(java.nio.file.Paths.get("debug_puml.puml"), pumlExporter.export(result, plantUmlOptions));
+        
         assertThat(html).contains("__CREATE");
         assertThat(html).contains("__ASSIGN");
         assertThat(html).contains("__CLOSE_TICKET");