diff --git a/scripts/setup_fuzzer.sh b/scripts/setup_fuzzer.sh
index 633fdc51..e775cca1 100755
--- a/scripts/setup_fuzzer.sh
+++ b/scripts/setup_fuzzer.sh
@@ -8,7 +8,7 @@ readonly BASE_DIR
 setup_psf() {
     # setup protocol-state-fuzzer library
 
-    CHECKOUT="83bcc0e1b8d6e093a656d41cc1fb59f2c600e86a"
+    CHECKOUT="658a49d8b73ffca644ef3b05bf254177ed37d18b"
 
     set -e
     cd "${BASE_DIR}"
diff --git a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/EdhocDotProcessor.java b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/EdhocDotProcessor.java
index a1557619..aa54f81c 100644
--- a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/EdhocDotProcessor.java
+++ b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/EdhocDotProcessor.java
@@ -43,7 +43,7 @@ public static void beautify(LearnerResult<?> learnerResult) {
 
         if (stateFuzzerEnabler.isFuzzingClient()) {
             // SUL is a client implementation
-            MapperConfig mapperConfig = stateFuzzerEnabler.getSulConfig().getMapperConfig();
+            MapperConfig mapperConfig = stateFuzzerEnabler.getSULConfig().getMapperConfig();
 
             if (!(mapperConfig instanceof EdhocMapperConfig edhocMapperConfig)) {
                 LOGGER.error("MapperConfig of StateFuzzerEnabler is not EdhocMapperConfig");
diff --git a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/MultiBuilder.java b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/MultiBuilder.java
index 07e70c31..399deb5c 100644
--- a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/MultiBuilder.java
+++ b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/MultiBuilder.java
@@ -13,7 +13,7 @@
 import com.github.protocolfuzzing.protocolstatefuzzer.components.learner.alphabet.xml.AlphabetSerializerXml;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.learner.config.LearnerConfigStandard;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.learner.statistics.MealyMachineWrapper;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SulBuilder;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SULBuilder;
 import com.github.protocolfuzzing.protocolstatefuzzer.statefuzzer.core.StateFuzzer;
 import com.github.protocolfuzzing.protocolstatefuzzer.statefuzzer.core.StateFuzzerBuilder;
 import com.github.protocolfuzzing.protocolstatefuzzer.statefuzzer.core.StateFuzzerComposerStandard;
@@ -45,7 +45,7 @@ public class MultiBuilder implements
         new AlphabetSerializerXml<EdhocInput, EdhocAlphabetPojoXml>(EdhocInput.class, EdhocAlphabetPojoXml.class)
     );
 
-    protected SulBuilder<EdhocInput, EdhocOutput, EdhocExecutionContext> sulBuilder = new EdhocSulBuilder();
+    protected SULBuilder<EdhocInput, EdhocOutput, EdhocExecutionContext> sulBuilder = new EdhocSulBuilder();
 
     @Override
     public StateFuzzerClientConfig buildClientConfig() {
diff --git a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/core/EdhocSul.java b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/core/EdhocSul.java
index 002690ea..dfda1ec5 100644
--- a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/core/EdhocSul.java
+++ b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/core/EdhocSul.java
@@ -18,9 +18,9 @@
 import com.github.protocolfuzzing.edhocfuzzer.components.sul.mapper.symbols.outputs.EdhocOutputBuilder;
 import com.github.protocolfuzzing.edhocfuzzer.components.sul.mapper.symbols.outputs.EdhocOutputChecker;
 import com.github.protocolfuzzing.edhocfuzzer.components.sul.mapper.symbols.outputs.MessageOutputType;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.AbstractSul;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SulAdapter;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulConfig;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.AbstractSUL;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SULAdapter;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULConfig;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.sulwrappers.DynamicPortProvider;
 import com.github.protocolfuzzing.protocolstatefuzzer.utils.CleanupTasks;
 import org.apache.logging.log4j.LogManager;
@@ -30,10 +30,10 @@
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
-public class EdhocSul implements AbstractSul<EdhocInput, EdhocOutput, EdhocExecutionContext> {
+public class EdhocSul implements AbstractSUL<EdhocInput, EdhocOutput, EdhocExecutionContext> {
     private static final Logger LOGGER = LogManager.getLogger();
 
-    protected SulConfig sulConfig;
+    protected SULConfig sulConfig;
     protected CleanupTasks cleanupTasks;
     protected EdhocMapperConfig edhocMapperConfig;
     protected EdhocMapperComposer edhocMapperComposer;
@@ -43,7 +43,7 @@ public class EdhocSul implements AbstractSul<EdhocInput, EdhocOutput, EdhocExecu
     protected EdhocMapperConnector edhocMapperConnector;
     protected boolean serverWaitForInitialMessageDone;
 
-    public EdhocSul(SulConfig sulConfig, CleanupTasks cleanupTasks) {
+    public EdhocSul(SULConfig sulConfig, CleanupTasks cleanupTasks) {
         this.sulConfig = sulConfig;
         this.cleanupTasks = cleanupTasks;
         this.edhocMapperConfig = (EdhocMapperConfig) sulConfig.getMapperConfig();
@@ -91,7 +91,7 @@ public EdhocSul initialize() {
     }
 
     @Override
-    public SulConfig getSulConfig() {
+    public SULConfig getSULConfig() {
         return sulConfig;
     }
 
@@ -116,7 +116,7 @@ public DynamicPortProvider getDynamicPortProvider() {
     }
 
     @Override
-    public SulAdapter getSulAdapter() {
+    public SULAdapter getSULAdapter() {
         throw new RuntimeException("No sul adapter available");
     }
 
diff --git a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/core/EdhocSulBuilder.java b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/core/EdhocSulBuilder.java
index 7d51daae..0f314a24 100644
--- a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/core/EdhocSulBuilder.java
+++ b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/core/EdhocSulBuilder.java
@@ -3,22 +3,22 @@
 import com.github.protocolfuzzing.edhocfuzzer.components.sul.mapper.context.EdhocExecutionContext;
 import com.github.protocolfuzzing.edhocfuzzer.components.sul.mapper.symbols.inputs.EdhocInput;
 import com.github.protocolfuzzing.edhocfuzzer.components.sul.mapper.symbols.outputs.EdhocOutput;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.AbstractSul;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SulBuilder;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SulWrapper;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SulWrapperStandard;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulConfig;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.AbstractSUL;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SULBuilder;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SULWrapper;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SULWrapperStandard;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULConfig;
 import com.github.protocolfuzzing.protocolstatefuzzer.utils.CleanupTasks;
 
-public class EdhocSulBuilder implements SulBuilder<EdhocInput, EdhocOutput, EdhocExecutionContext>{
+public class EdhocSulBuilder implements SULBuilder<EdhocInput, EdhocOutput, EdhocExecutionContext>{
     @Override
-    public AbstractSul<EdhocInput, EdhocOutput, EdhocExecutionContext>
-    buildSul(SulConfig sulConfig, CleanupTasks cleanupTasks) {
+    public AbstractSUL<EdhocInput, EdhocOutput, EdhocExecutionContext>
+    buildSUL(SULConfig sulConfig, CleanupTasks cleanupTasks) {
         return new EdhocSul(sulConfig, cleanupTasks).initialize();
     }
 
     @Override
-    public SulWrapper<EdhocInput, EdhocOutput, EdhocExecutionContext> buildWrapper() {
-        return new SulWrapperStandard<>();
+    public SULWrapper<EdhocInput, EdhocOutput, EdhocExecutionContext> buildWrapper() {
+        return new SULWrapperStandard<>();
     }
 }
diff --git a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/core/config/EdhocSulClientConfig.java b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/core/config/EdhocSulClientConfig.java
index fb2d431d..3c74c79a 100644
--- a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/core/config/EdhocSulClientConfig.java
+++ b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/core/config/EdhocSulClientConfig.java
@@ -2,14 +2,14 @@
 
 import com.github.protocolfuzzing.edhocfuzzer.components.sul.mapper.config.EdhocMapperConfig;
 import com.github.protocolfuzzing.edhocfuzzer.components.sul.mapper.config.EdhocMapperConnectionConfig;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulAdapterConfig;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulClientConfigStandard;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULAdapterConfig;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULClientConfigStandard;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.mapper.config.MapperConfig;
 import org.eclipse.californium.elements.config.Configuration;
 
-public class EdhocSulClientConfig extends SulClientConfigStandard {
+public class EdhocSulClientConfig extends SULClientConfigStandard {
     public EdhocSulClientConfig(EdhocMapperConfig edhocMapperConfig) {
-        super(edhocMapperConfig, new SulAdapterConfig(){});
+        super(edhocMapperConfig, new SULAdapterConfig(){});
     }
 
     @Override
diff --git a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/core/config/EdhocSulServerConfig.java b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/core/config/EdhocSulServerConfig.java
index 4ae3ad46..9126148a 100644
--- a/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/core/config/EdhocSulServerConfig.java
+++ b/src/main/java/com/github/protocolfuzzing/edhocfuzzer/components/sul/core/config/EdhocSulServerConfig.java
@@ -2,14 +2,14 @@
 
 import com.github.protocolfuzzing.edhocfuzzer.components.sul.mapper.config.EdhocMapperConfig;
 import com.github.protocolfuzzing.edhocfuzzer.components.sul.mapper.config.EdhocMapperConnectionConfig;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulAdapterConfig;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SulServerConfigStandard;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULAdapterConfig;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.config.SULServerConfigStandard;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.mapper.config.MapperConfig;
 import org.eclipse.californium.elements.config.Configuration;
 
-public class EdhocSulServerConfig extends SulServerConfigStandard {
+public class EdhocSulServerConfig extends SULServerConfigStandard {
     public EdhocSulServerConfig(EdhocMapperConfig edhocMapperConfig) {
-        super(edhocMapperConfig, new SulAdapterConfig(){});
+        super(edhocMapperConfig, new SULAdapterConfig(){});
     }
 
     @Override