diff --git a/build/assembly.xml b/build/assembly.xml
index 363587e24fb8e1fbb7dc79816d9191bc601c4bad..33259bf894104ed94b84d23154341ab06ea1072e 100644
--- a/build/assembly.xml
+++ b/build/assembly.xml
@@ -30,8 +30,8 @@
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>john_smith_xta_tester.p12</include>
-                <include>xta-test-app_keystore.p12</include>
-                <include>xta-test-app_truststore.jks</include>
+                <include>xta-test-server_keystore.p12</include>
+                <include>xta-test-server_truststore.jks</include>
             </includes>
         </fileSet>
     </fileSets>
diff --git a/build/resources/application-local.yml b/build/resources/application-local.yml
index f6e381c57a32a36c122c29c0046d0383165d9a38..56e45ef748a9d29da9da05035da9695d63df787a 100644
--- a/build/resources/application-local.yml
+++ b/build/resources/application-local.yml
@@ -11,14 +11,14 @@ server:
   tomcat.max-swallow-size: 10MB
   ssl:
     # enthaelt den privaten und oeffentlichen Schluessel der Anwendung (SSL-Zertifikat für Webbrowser)
-    key-store: ./xta-test-app_keystore.p12
+    key-store: ./xta-test-server_keystore.p12
     key-store-password: password
     key-store-type: pkcs12
     # Alias im KeyStore
     key-alias: xta-test-application
     key-password: password
     # enthaelt alle vertrauenswuerdigen Zertifikate oder Oberzertifikate
-    trust-store: ./xta-test-app_truststore.jks
+    trust-store: ./xta-test-server_truststore.jks
     trust-store-password: password
     trust-store-type: JKS
     client-auth: want
diff --git a/doc/bedienungsanleitung.adoc b/doc/bedienungsanleitung.adoc
index 5e1f0f86e74a678d152700455eb81b8756a3ba50..397446cfdca8a9090330a7bb24b65aff87482af6 100644
--- a/doc/bedienungsanleitung.adoc
+++ b/doc/bedienungsanleitung.adoc
@@ -99,14 +99,14 @@ Eine Konsole im Programmordner starten und folgendes Kommando ausführen. Der Pl
 ist mit der jeweiligen Version zu ersetzen.
 
 ----
-java -jar xta-test-app-[VERSION].jar --spring.config.import=file:./application-local.yml
+java -jar xta-test-server-[VERSION].jar --spring.config.import=file:./application-local.yml
 ----
 
 Sofern mehrere Umgebungen gleichzeitig gestartet werden sollen, so kann man sowohl die *application-xxx.yml*, als auch die 
 genutzte Serverkonfiguration beim Start der Anwendung mitgeben.
 
 ----
-java -jar xta-test-app-[VERSION].jar --spring.config.import=file:./application-local.yml -DconfigFileName=file:config_second.yaml 
+java -jar xta-test-server-[VERSION].jar --spring.config.import=file:./application-local.yml -DconfigFileName=file:config_second.yaml
 ----
 
 Der Parameter "-DconfigFileName=file:config_second.yaml" ist wie folgt aufgebaut:
diff --git a/pom.xml b/pom.xml
index c2c9c794fb91dc3acd89c42687a3f47593572907..a1aa518a72bb98d29da260141e0aafb643d9cad8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,12 +10,12 @@
 		<relativePath/>
 	</parent>
 
-	<groupId>de.xoev.xta</groupId>
-	<artifactId>xta-test-app</artifactId>
+	<groupId>de.ozgcloud.xta</groupId>
+	<artifactId>xta-test-server</artifactId>
 	<version>1.4.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
-	<name>XTA Test Application</name>
-	<description>XTA Server and Client Test Application</description>
+	<name>XTA Test Server</name>
+	<description>A XTA Server for testing a client implementation.</description>
 
 	<properties>
 
@@ -674,7 +674,7 @@
 
 	<profiles>
 		<profile>
-			<!-- to build the xta-test-app.zip -->
+			<!-- to build the xta-test-server.zip -->
 			<!-- > mvn clean package -Pzip -->
 			<activation>
 				<activeByDefault>false</activeByDefault>
diff --git a/soapui/XTA-soapui-project.xml b/soapui/XTA-soapui-project.xml
index 32cf9fe9cf9c3d7817b66da7f8d83e5eb38f7d1c..2e0f250a6dd3c77df24882de139925b7f405c791 100644
--- a/soapui/XTA-soapui-project.xml
+++ b/soapui/XTA-soapui-project.xml
@@ -10846,4 +10846,4 @@ if (action[0..1] == "\\\"") {
          </ns:ContentContainer>
       </ns:GenericContentContainer>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:responseContent><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.osci.eu/ws/2008/05/transport/urn/messageTypes/MsgBoxFetchRequest"/></con:response><con:dispatchConfig/></con:mockOperation></con:mockService><con:properties/><con:afterLoadScript/><con:wssContainer><con:crypto><con:source>../src/main/resources/store/john_smith_xta_tester.p12</con:source><con:password>password</con:password><con:type>KEYSTORE</con:type></con:crypto><con:crypto><con:source>../src/main/resources/store/xta-test-app_keystore.p12</con:source><con:password>password</con:password><con:type>TRUSTSTORE</con:type></con:crypto></con:wssContainer><con:oAuth2ProfileContainer/><con:oAuth1ProfileContainer/><con:sensitiveInformation/></con:soapui-project>
\ No newline at end of file
+</soapenv:Envelope>]]></con:responseContent><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.osci.eu/ws/2008/05/transport/urn/messageTypes/MsgBoxFetchRequest"/></con:response><con:dispatchConfig/></con:mockOperation></con:mockService><con:properties/><con:afterLoadScript/><con:wssContainer><con:crypto><con:source>../src/main/resources/store/john_smith_xta_tester.p12</con:source><con:password>password</con:password><con:type>KEYSTORE</con:type></con:crypto><con:crypto><con:source>../src/main/resources/store/xta-test-server_keystore.p12</con:source><con:password>password</con:password><con:type>TRUSTSTORE</con:type></con:crypto></con:wssContainer><con:oAuth2ProfileContainer/><con:oAuth1ProfileContainer/><con:sensitiveInformation/></con:soapui-project>
\ No newline at end of file
diff --git a/src/main/java/de/xoev/xta/test/app/Application.java b/src/main/java/de/ozgcloud/xta/test/app/Application.java
similarity index 97%
rename from src/main/java/de/xoev/xta/test/app/Application.java
rename to src/main/java/de/ozgcloud/xta/test/app/Application.java
index 00232fce0aca3a7e553e84257cd17d35a5bdee96..536cefde59488874a731e6ae021f9a7b79802d97 100644
--- a/src/main/java/de/xoev/xta/test/app/Application.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/Application.java
@@ -17,7 +17,7 @@
 * @formatter:on
 */
 
-package de.xoev.xta.test.app;
+package de.ozgcloud.xta.test.app;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/src/main/java/de/xoev/xta/test/app/config/ClientConnectionProperties.java b/src/main/java/de/ozgcloud/xta/test/app/config/ClientConnectionProperties.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/config/ClientConnectionProperties.java
rename to src/main/java/de/ozgcloud/xta/test/app/config/ClientConnectionProperties.java
index cefb10cf0589c6be877753a0bb76345198078d5d..6d4fea6ec371f72b246ea29f66d3d89ac4bec36e 100644
--- a/src/main/java/de/xoev/xta/test/app/config/ClientConnectionProperties.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/config/ClientConnectionProperties.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.config;
+package de.ozgcloud.xta.test.app.config;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/de/xoev/xta/test/app/config/ClientProperties.java b/src/main/java/de/ozgcloud/xta/test/app/config/ClientProperties.java
similarity index 98%
rename from src/main/java/de/xoev/xta/test/app/config/ClientProperties.java
rename to src/main/java/de/ozgcloud/xta/test/app/config/ClientProperties.java
index c8e7250243bf1783f00ee7719c99ecb02cd46dea..75cf4637740863be53f7ec7ba59ebc01b739a4fa 100644
--- a/src/main/java/de/xoev/xta/test/app/config/ClientProperties.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/config/ClientProperties.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.config;
+package de.ozgcloud.xta.test.app.config;
 
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.FileSystemResource;
diff --git a/src/main/java/de/xoev/xta/test/app/config/MapStructConfiguration.java b/src/main/java/de/ozgcloud/xta/test/app/config/MapStructConfiguration.java
similarity index 87%
rename from src/main/java/de/xoev/xta/test/app/config/MapStructConfiguration.java
rename to src/main/java/de/ozgcloud/xta/test/app/config/MapStructConfiguration.java
index 14955afae6a35acad98297c5e53a3b9d91bd7288..4b1f76bef66ef1b7688bca081e8d5a81c8577b8a 100644
--- a/src/main/java/de/xoev/xta/test/app/config/MapStructConfiguration.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/config/MapStructConfiguration.java
@@ -1,7 +1,7 @@
 /*
  * Created 2023-03-24
  */
-package de.xoev.xta.test.app.config;
+package de.ozgcloud.xta.test.app.config;
 
 import org.mapstruct.MapperConfig;
 import org.mapstruct.ReportingPolicy;
diff --git a/src/main/java/de/xoev/xta/test/app/config/SecurityConfig.java b/src/main/java/de/ozgcloud/xta/test/app/config/SecurityConfig.java
similarity index 98%
rename from src/main/java/de/xoev/xta/test/app/config/SecurityConfig.java
rename to src/main/java/de/ozgcloud/xta/test/app/config/SecurityConfig.java
index 2e2ecd7d310fa84f699ae18a580e1e24dd956f7e..f085241c4b50f47727020540c9d9ea6381c1264c 100644
--- a/src/main/java/de/xoev/xta/test/app/config/SecurityConfig.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/config/SecurityConfig.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.config;
+package de.ozgcloud.xta.test.app.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/de/xoev/xta/test/app/config/WebServiceConfig.java b/src/main/java/de/ozgcloud/xta/test/app/config/WebServiceConfig.java
similarity index 98%
rename from src/main/java/de/xoev/xta/test/app/config/WebServiceConfig.java
rename to src/main/java/de/ozgcloud/xta/test/app/config/WebServiceConfig.java
index e44fc16eef468851db40c957baaea9bf2e61d2c7..d13e960d2d66dfd2b99aae908e8029c619b19bfc 100644
--- a/src/main/java/de/xoev/xta/test/app/config/WebServiceConfig.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/config/WebServiceConfig.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.config;
+package de.ozgcloud.xta.test.app.config;
 
 import org.apache.catalina.Context;
 import org.apache.catalina.connector.Connector;
diff --git a/src/main/java/de/xoev/xta/test/app/config/XTAServer.java b/src/main/java/de/ozgcloud/xta/test/app/config/XTAServer.java
similarity index 92%
rename from src/main/java/de/xoev/xta/test/app/config/XTAServer.java
rename to src/main/java/de/ozgcloud/xta/test/app/config/XTAServer.java
index e87750657366aa2e1f943297e09e6e567b17552a..9195d8cd319adaa26c37a19018a64c9f8bbf6a14 100644
--- a/src/main/java/de/xoev/xta/test/app/config/XTAServer.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/config/XTAServer.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.config;
+package de.ozgcloud.xta.test.app.config;
 
 import java.util.Collection;
 import java.util.List;
@@ -13,9 +13,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import de.xoev.xta.test.app.service.interceptor.ServerProtocolFaultOutInterceptor;
-import de.xoev.xta.test.app.service.interceptor.ServerProtocolInInterceptor;
-import de.xoev.xta.test.app.service.interceptor.ServerProtocolOutInterceptor;
+import de.ozgcloud.xta.test.app.service.interceptor.ServerProtocolInInterceptor;
+import de.ozgcloud.xta.test.app.service.interceptor.ServerProtocolFaultOutInterceptor;
+import de.ozgcloud.xta.test.app.service.interceptor.ServerProtocolOutInterceptor;
 import genv3.de.xoev.transport.xta.x211.ManagementPortType;
 import genv3.de.xoev.transport.xta.x211.MsgBoxPortType;
 import genv3.de.xoev.transport.xta.x211.SendPortType;
diff --git a/src/main/java/de/xoev/xta/test/app/config/XtaConfig.java b/src/main/java/de/ozgcloud/xta/test/app/config/XtaConfig.java
similarity index 77%
rename from src/main/java/de/xoev/xta/test/app/config/XtaConfig.java
rename to src/main/java/de/ozgcloud/xta/test/app/config/XtaConfig.java
index 69855d237552a23c566c09e0372fe2df8f0dc7f4..f0fc7a377c5728eed7f02eea62c1717e1635871c 100644
--- a/src/main/java/de/xoev/xta/test/app/config/XtaConfig.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/config/XtaConfig.java
@@ -1,16 +1,16 @@
 /*
  * Created 2022-12-14
  */
-package de.xoev.xta.test.app.config;
+package de.ozgcloud.xta.test.app.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 
-import de.xoev.xta.test.app.model.ProtocolMetadata;
-import de.xoev.xta.test.app.model.XtaIdentifierConfig;
-import de.xoev.xta.test.app.service.ConfigurationService;
-import de.xoev.xta.test.app.util.YamlPropertySourceFactory;
+import de.ozgcloud.xta.test.app.model.ProtocolMetadata;
+import de.ozgcloud.xta.test.app.model.XtaIdentifierConfig;
+import de.ozgcloud.xta.test.app.util.YamlPropertySourceFactory;
+import de.ozgcloud.xta.test.app.service.ConfigurationService;
 import lombok.Data;
 
 @Data
diff --git a/src/main/java/de/xoev/xta/test/app/config/XtaConfigQualifierType.java b/src/main/java/de/ozgcloud/xta/test/app/config/XtaConfigQualifierType.java
similarity index 95%
rename from src/main/java/de/xoev/xta/test/app/config/XtaConfigQualifierType.java
rename to src/main/java/de/ozgcloud/xta/test/app/config/XtaConfigQualifierType.java
index d2d25e60a724976548a1ea72fe775c8c2f8ca476..f46b8f2c288ab650a5111bda13d041cd98009304 100644
--- a/src/main/java/de/xoev/xta/test/app/config/XtaConfigQualifierType.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/config/XtaConfigQualifierType.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.config;
+package de.ozgcloud.xta.test.app.config;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
diff --git a/src/main/java/de/xoev/xta/test/app/config/XtaTesterConfiguration.java b/src/main/java/de/ozgcloud/xta/test/app/config/XtaTesterConfiguration.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/config/XtaTesterConfiguration.java
rename to src/main/java/de/ozgcloud/xta/test/app/config/XtaTesterConfiguration.java
index e6e025eefa456489d028f3cb7ad2abb1e663b185..52e41d20d0ae8bbd67bc8758e8feb185df0c0271 100644
--- a/src/main/java/de/xoev/xta/test/app/config/XtaTesterConfiguration.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/config/XtaTesterConfiguration.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.config;
+package de.ozgcloud.xta.test.app.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
diff --git a/src/main/java/de/xoev/xta/test/app/controller/ExceptionHandlerAdvice.java b/src/main/java/de/ozgcloud/xta/test/app/controller/ExceptionHandlerAdvice.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/controller/ExceptionHandlerAdvice.java
rename to src/main/java/de/ozgcloud/xta/test/app/controller/ExceptionHandlerAdvice.java
index ed45ef1bd30584b97c100a14f2a49d44a738f1c5..3e567d1d818413ebf4a56630e40f96c81bea7254 100644
--- a/src/main/java/de/xoev/xta/test/app/controller/ExceptionHandlerAdvice.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/controller/ExceptionHandlerAdvice.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.controller;
+package de.ozgcloud.xta.test.app.controller;
 
 import org.apache.tomcat.util.http.fileupload.impl.SizeLimitExceededException;
 import org.springframework.core.Ordered;
@@ -28,7 +28,8 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MaxUploadSizeExceededException;
 
-import de.xoev.xta.test.app.model.CustomResponseEntity;
+import de.ozgcloud.xta.test.app.model.CustomResponseEntity;
+
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.log4j.Log4j2;
diff --git a/src/main/java/de/xoev/xta/test/app/controller/ManagementController.java b/src/main/java/de/ozgcloud/xta/test/app/controller/ManagementController.java
similarity index 89%
rename from src/main/java/de/xoev/xta/test/app/controller/ManagementController.java
rename to src/main/java/de/ozgcloud/xta/test/app/controller/ManagementController.java
index 3bc2c01bad599350d9e893550b5b0b142e437836..44d31855db2cf28d0158a4652a2d66a5e61d7caa 100644
--- a/src/main/java/de/xoev/xta/test/app/controller/ManagementController.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/controller/ManagementController.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.controller;
+package de.ozgcloud.xta.test.app.controller;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -24,6 +24,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 
+import org.mapstruct.factory.Mappers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -39,15 +40,15 @@ import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import de.xoev.xta.test.app.config.XtaConfig;
-import de.xoev.xta.test.app.exception.XtaTesterException;
-import de.xoev.xta.test.app.model.CustomResponseEntity;
-import de.xoev.xta.test.app.model.XtaConfigDto;
-import de.xoev.xta.test.app.service.ConfigurationService;
-import de.xoev.xta.test.app.service.CustomizationService;
-import de.xoev.xta.test.app.service.ProtocolService;
-import de.xoev.xta.test.app.service.ScenarioService;
-import de.xoev.xta.test.app.service.XtaConfigDtoConverterImpl;
+import de.ozgcloud.xta.test.app.config.XtaConfig;
+import de.ozgcloud.xta.test.app.exception.XtaTesterException;
+import de.ozgcloud.xta.test.app.model.CustomResponseEntity;
+import de.ozgcloud.xta.test.app.model.XtaConfigDto;
+import de.ozgcloud.xta.test.app.service.ConfigurationService;
+import de.ozgcloud.xta.test.app.service.CustomizationService;
+import de.ozgcloud.xta.test.app.service.ProtocolService;
+import de.ozgcloud.xta.test.app.service.ScenarioService;
+import de.ozgcloud.xta.test.app.service.XtaConfigDtoConverter;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.log4j.Log4j2;
@@ -100,7 +101,7 @@ public class ManagementController {
     @ResponseStatus(HttpStatus.OK)
     public ResponseEntity<XtaConfigDto> saveXtaConfig(@RequestBody final XtaConfig xtaConfig) {
         configService.setXtaConfig(xtaConfig);
-        return ResponseEntity.ok(new XtaConfigDtoConverterImpl().fromModel(configService.getXtaConfig()));
+        return ResponseEntity.ok(Mappers.getMapper(XtaConfigDtoConverter.class).fromModel(configService.getXtaConfig()));
     }
 
     @Operation(summary = "resetXtaConfig")
@@ -109,7 +110,7 @@ public class ManagementController {
     public ResponseEntity<XtaConfigDto> resetXtaConfig() {
         try {
             configService.resetXtaConfig();
-            return ResponseEntity.ok(new XtaConfigDtoConverterImpl().fromModel(configService.getXtaConfig()));
+            return ResponseEntity.ok(Mappers.getMapper(XtaConfigDtoConverter.class).fromModel(configService.getXtaConfig()));
         } catch (XtaTesterException e) {
             return ResponseEntity.internalServerError().build();
         }
diff --git a/src/main/java/de/xoev/xta/test/app/controller/RedirectController.java b/src/main/java/de/ozgcloud/xta/test/app/controller/RedirectController.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/controller/RedirectController.java
rename to src/main/java/de/ozgcloud/xta/test/app/controller/RedirectController.java
index ca1379f2cd1a0f84492143484139a1dda8a57b4f..476430605210b75539c9a6b576e2913ec422488a 100644
--- a/src/main/java/de/xoev/xta/test/app/controller/RedirectController.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/controller/RedirectController.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.controller;
+package de.ozgcloud.xta.test.app.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/src/main/java/de/xoev/xta/test/app/controller/ViewController.java b/src/main/java/de/ozgcloud/xta/test/app/controller/ViewController.java
similarity index 94%
rename from src/main/java/de/xoev/xta/test/app/controller/ViewController.java
rename to src/main/java/de/ozgcloud/xta/test/app/controller/ViewController.java
index 616a920bca3e44b18d0437a2150cb1f7c29e5828..ce6e0d5f485fd0bd5abc1a0f4295bdf8c51ec770 100644
--- a/src/main/java/de/xoev/xta/test/app/controller/ViewController.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/controller/ViewController.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.controller;
+package de.ozgcloud.xta.test.app.controller;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -36,11 +36,11 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import de.xoev.xta.test.app.config.XtaConfig;
-import de.xoev.xta.test.app.model.ContainerCustomization;
-import de.xoev.xta.test.app.service.ConfigurationService;
-import de.xoev.xta.test.app.service.ProtocolService;
-import de.xoev.xta.test.app.service.ScenarioService;
+import de.ozgcloud.xta.test.app.config.XtaConfig;
+import de.ozgcloud.xta.test.app.model.ContainerCustomization;
+import de.ozgcloud.xta.test.app.service.ConfigurationService;
+import de.ozgcloud.xta.test.app.service.ProtocolService;
+import de.ozgcloud.xta.test.app.service.ScenarioService;
 
 @Controller
 @RequestMapping("view")
diff --git a/src/main/java/de/xoev/xta/test/app/exception/CancelScenarioExecution.java b/src/main/java/de/ozgcloud/xta/test/app/exception/CancelScenarioExecution.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/exception/CancelScenarioExecution.java
rename to src/main/java/de/ozgcloud/xta/test/app/exception/CancelScenarioExecution.java
index b20a45473222cbf61e26fa712ff4ff4dd1a9a6c9..833ea106f63b30c8cb40aa29e4809439e1529cde 100644
--- a/src/main/java/de/xoev/xta/test/app/exception/CancelScenarioExecution.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/exception/CancelScenarioExecution.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.exception;
+package de.ozgcloud.xta.test.app.exception;
 
 public class CancelScenarioExecution extends RuntimeException {
 
diff --git a/src/main/java/de/xoev/xta/test/app/exception/ConfigurationException.java b/src/main/java/de/ozgcloud/xta/test/app/exception/ConfigurationException.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/exception/ConfigurationException.java
rename to src/main/java/de/ozgcloud/xta/test/app/exception/ConfigurationException.java
index 23f9ca4b8c07f45ee7a68911e71bea986a14a07c..55fcddb86124834f1933614ffa340413213af0d1 100644
--- a/src/main/java/de/xoev/xta/test/app/exception/ConfigurationException.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/exception/ConfigurationException.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.exception;
+package de.ozgcloud.xta.test.app.exception;
 
 public class ConfigurationException extends RuntimeException {
 
diff --git a/src/main/java/de/xoev/xta/test/app/exception/XtaTesterException.java b/src/main/java/de/ozgcloud/xta/test/app/exception/XtaTesterException.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/exception/XtaTesterException.java
rename to src/main/java/de/ozgcloud/xta/test/app/exception/XtaTesterException.java
index 895101dd767f463c02a440d1ebfd3b0371a7bf0a..0467198939f373b40658de7d1da733db1f1da43c 100644
--- a/src/main/java/de/xoev/xta/test/app/exception/XtaTesterException.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/exception/XtaTesterException.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.exception;
+package de.ozgcloud.xta.test.app.exception;
 
 public class XtaTesterException extends Exception {
 
diff --git a/src/main/java/de/xoev/xta/test/app/model/ContainerCustomization.java b/src/main/java/de/ozgcloud/xta/test/app/model/ContainerCustomization.java
similarity index 97%
rename from src/main/java/de/xoev/xta/test/app/model/ContainerCustomization.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ContainerCustomization.java
index 79a84f08e7949f501a2c842848a916559509412c..8ebbe51e9d3355b005f7cd98ca00873a9610139b 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ContainerCustomization.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ContainerCustomization.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
 
 import java.nio.file.Path;
 import java.util.UUID;
diff --git a/src/main/java/de/xoev/xta/test/app/model/CustomResponseEntity.java b/src/main/java/de/ozgcloud/xta/test/app/model/CustomResponseEntity.java
similarity index 95%
rename from src/main/java/de/xoev/xta/test/app/model/CustomResponseEntity.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/CustomResponseEntity.java
index 66c363a0db18d4efa0f680770014db5b4c7680e5..2d276bd9d807971e7603064dca2ed60a6806c8bc 100644
--- a/src/main/java/de/xoev/xta/test/app/model/CustomResponseEntity.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/CustomResponseEntity.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/src/main/java/de/xoev/xta/test/app/model/ExecutionType.java b/src/main/java/de/ozgcloud/xta/test/app/model/ExecutionType.java
similarity index 94%
rename from src/main/java/de/xoev/xta/test/app/model/ExecutionType.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ExecutionType.java
index a3750600c0fcc5e805c3e0b132c13b746245208f..000ee4d9092098892b497137433a724d2fcb2ad5 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ExecutionType.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ExecutionType.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
 
 public enum ExecutionType {
 
diff --git a/src/main/java/de/xoev/xta/test/app/model/ProtocolMetadata.java b/src/main/java/de/ozgcloud/xta/test/app/model/ProtocolMetadata.java
similarity index 97%
rename from src/main/java/de/xoev/xta/test/app/model/ProtocolMetadata.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ProtocolMetadata.java
index b0a1cd9f2338516bd617e5673894e23125f1dfdd..c3174a2534c8a01cbc5bb3390e78446bf0e73e59 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ProtocolMetadata.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ProtocolMetadata.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/de/xoev/xta/test/app/model/ResultMessage.java b/src/main/java/de/ozgcloud/xta/test/app/model/ResultMessage.java
similarity index 95%
rename from src/main/java/de/xoev/xta/test/app/model/ResultMessage.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ResultMessage.java
index 3efb8340711dde9062512bc34c00e4e1858d983e..f8f3e782de89b04ce7fad68c8710c98a7b2763d2 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ResultMessage.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ResultMessage.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
 
 import lombok.Data;
 
diff --git a/src/main/java/de/xoev/xta/test/app/model/ResultType.java b/src/main/java/de/ozgcloud/xta/test/app/model/ResultType.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/model/ResultType.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ResultType.java
index 6766caed8191011c16492f9d4a9fd2be2b21651e..70b002391534b6871ef67518abeef3166ffeb784 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ResultType.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ResultType.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
 
 import lombok.Getter;
 
diff --git a/src/main/java/de/xoev/xta/test/app/model/Role.java b/src/main/java/de/ozgcloud/xta/test/app/model/Role.java
similarity index 94%
rename from src/main/java/de/xoev/xta/test/app/model/Role.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/Role.java
index 461796a4e1bb8d05c6846980e8578699f1eef554..4622868e3fb9790f7273c273427bbb5c08abc96a 100644
--- a/src/main/java/de/xoev/xta/test/app/model/Role.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/Role.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
 
 public enum Role {
 
diff --git a/src/main/java/de/xoev/xta/test/app/model/RoleType.java b/src/main/java/de/ozgcloud/xta/test/app/model/RoleType.java
similarity index 94%
rename from src/main/java/de/xoev/xta/test/app/model/RoleType.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/RoleType.java
index ded3ab8fd2fef85915b8399bf8d9aa0737a4bd62..6364f72cd1c5c76aa905dbcc339d6a18a3fc2b52 100644
--- a/src/main/java/de/xoev/xta/test/app/model/RoleType.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/RoleType.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
 
 public enum RoleType {
 
diff --git a/src/main/java/de/xoev/xta/test/app/model/ScenarioDefinition.java b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioDefinition.java
similarity index 98%
rename from src/main/java/de/xoev/xta/test/app/model/ScenarioDefinition.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ScenarioDefinition.java
index f972fd5cabe17f5587162357c1b677ca486a3eda..988b43b6304b3a0da94579a45d14a427188d7263 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ScenarioDefinition.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioDefinition.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/de/xoev/xta/test/app/model/ScenarioEventDefinition.java b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioEventDefinition.java
similarity index 97%
rename from src/main/java/de/xoev/xta/test/app/model/ScenarioEventDefinition.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ScenarioEventDefinition.java
index f4c5c834a27d1d51116653b8b96823649b3b7e86..3a839f0f706ff5e6512393f68d0d90b29251b988 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ScenarioEventDefinition.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioEventDefinition.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
 
 import java.util.List;
 
diff --git a/src/main/java/de/xoev/xta/test/app/model/ScenarioEventType.java b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioEventType.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/model/ScenarioEventType.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ScenarioEventType.java
index 29045db63cb5a58ba10fda279d44b3fae27e78c1..4034eb16fe4dd3a4048b5ad5364468703ac5aad7 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ScenarioEventType.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioEventType.java
@@ -16,13 +16,13 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
 
 import java.util.Optional;
 
 import org.apache.commons.lang3.StringUtils;
 
-import de.xoev.xta.test.app.model.XtaConstants.ConnectionPortType;
+import de.ozgcloud.xta.test.app.model.XtaConstants.ConnectionPortType;
 import lombok.Getter;
 
 public enum ScenarioEventType {
diff --git a/src/main/java/de/xoev/xta/test/app/model/ScenarioProtocol.java b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioProtocol.java
similarity index 99%
rename from src/main/java/de/xoev/xta/test/app/model/ScenarioProtocol.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ScenarioProtocol.java
index d753ef7dec130d19fae005043f6cfd06770670b5..2555e4340f8c695a22df0a47c4bdb76c4493694e 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ScenarioProtocol.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioProtocol.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/src/main/java/de/xoev/xta/test/app/model/ScenarioProtocolEvent.java b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioProtocolEvent.java
similarity index 97%
rename from src/main/java/de/xoev/xta/test/app/model/ScenarioProtocolEvent.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ScenarioProtocolEvent.java
index e17718f83e67a1f36c92324a722428a363d7bc13..c1298e19c57198ab1223986a574b2a3c1857be18 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ScenarioProtocolEvent.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioProtocolEvent.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/de/xoev/xta/test/app/model/ScenarioProtocolEventResult.java b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioProtocolEventResult.java
similarity index 99%
rename from src/main/java/de/xoev/xta/test/app/model/ScenarioProtocolEventResult.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ScenarioProtocolEventResult.java
index 017354d9ee13e20b50d86c2895c34f0f7999d4c7..26ba673c1eba7c913acdbc5172450e477cdec142 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ScenarioProtocolEventResult.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioProtocolEventResult.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
diff --git a/src/main/java/de/xoev/xta/test/app/model/ScenarioRole.java b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioRole.java
similarity index 97%
rename from src/main/java/de/xoev/xta/test/app/model/ScenarioRole.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/ScenarioRole.java
index 4aac55bce76ca03b6a98b5a20b9b81d9de034fb4..c0f0d1f66278f6fa3ad62c7e8c2d5a87bbe5ef38 100644
--- a/src/main/java/de/xoev/xta/test/app/model/ScenarioRole.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/ScenarioRole.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
 
 import lombok.Getter;
 
diff --git a/src/main/java/de/xoev/xta/test/app/model/XtaConfigDto.java b/src/main/java/de/ozgcloud/xta/test/app/model/XtaConfigDto.java
similarity index 70%
rename from src/main/java/de/xoev/xta/test/app/model/XtaConfigDto.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/XtaConfigDto.java
index d38b25dd96f31e58032d8e5d4513ab911d77f814..98f41eb475b4c105c7950e45f4a299ef9fbfa5d1 100644
--- a/src/main/java/de/xoev/xta/test/app/model/XtaConfigDto.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/XtaConfigDto.java
@@ -1,9 +1,9 @@
 /*
  * Created 2022-12-14
  */
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
 
-import de.xoev.xta.test.app.config.ClientProperties;
+import de.ozgcloud.xta.test.app.config.ClientProperties;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
diff --git a/src/main/java/de/xoev/xta/test/app/model/XtaConstants.java b/src/main/java/de/ozgcloud/xta/test/app/model/XtaConstants.java
similarity index 98%
rename from src/main/java/de/xoev/xta/test/app/model/XtaConstants.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/XtaConstants.java
index df830ec6c493a49e8a473f247fe20b6921b85540..dddf3c4b54f1a8811f18bb438b4a4a9340a76d59 100644
--- a/src/main/java/de/xoev/xta/test/app/model/XtaConstants.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/XtaConstants.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
 
 import javax.xml.namespace.QName;
 
diff --git a/src/main/java/de/xoev/xta/test/app/model/XtaIdentifierConfig.java b/src/main/java/de/ozgcloud/xta/test/app/model/XtaIdentifierConfig.java
similarity index 88%
rename from src/main/java/de/xoev/xta/test/app/model/XtaIdentifierConfig.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/XtaIdentifierConfig.java
index 6d49995a6b50cfe804c8b05a71dabef8500f68ca..c4859adef20ddb25907f6877b75011f2c5b0b58e 100644
--- a/src/main/java/de/xoev/xta/test/app/model/XtaIdentifierConfig.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/XtaIdentifierConfig.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/de/xoev/xta/test/app/model/XtaProtocol.java b/src/main/java/de/ozgcloud/xta/test/app/model/XtaProtocol.java
similarity index 98%
rename from src/main/java/de/xoev/xta/test/app/model/XtaProtocol.java
rename to src/main/java/de/ozgcloud/xta/test/app/model/XtaProtocol.java
index bd07504b9021ff44387de75a6bb5a58f58356d24..ec6b26e41fec546a6b261383ce165e89dfbb5828 100644
--- a/src/main/java/de/xoev/xta/test/app/model/XtaProtocol.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/model/XtaProtocol.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.model;
+package de.ozgcloud.xta.test.app.model;
 
 import java.util.Collections;
 import java.util.LinkedList;
diff --git a/src/main/java/de/xoev/xta/test/app/server/ManagementPortImpl.java b/src/main/java/de/ozgcloud/xta/test/app/server/ManagementPortImpl.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/server/ManagementPortImpl.java
rename to src/main/java/de/ozgcloud/xta/test/app/server/ManagementPortImpl.java
index d775dd559a24b978b10b0707905b10a54066c347..7379800a354a16b2f35aaba175d42babbbf1a558 100644
--- a/src/main/java/de/xoev/xta/test/app/server/ManagementPortImpl.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/server/ManagementPortImpl.java
@@ -1,5 +1,5 @@
 
-package de.xoev.xta.test.app.server;
+package de.ozgcloud.xta.test.app.server;
 
 import java.io.IOException;
 import java.math.BigInteger;
@@ -12,11 +12,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Component;
 
-import de.xoev.xta.test.app.service.ParameterValidatorService;
-import de.xoev.xta.test.app.service.ProtocolService;
-import de.xoev.xta.test.app.service.XtaParameter;
-import de.xoev.xta.test.app.util.UtilComponent;
-import de.xoev.xta.test.app.util.XtaIdGenerator;
+import de.ozgcloud.xta.test.app.util.UtilComponent;
+import de.ozgcloud.xta.test.app.util.XtaIdGenerator;
+import de.ozgcloud.xta.test.app.service.ParameterValidatorService;
+import de.ozgcloud.xta.test.app.service.ProtocolService;
+import de.ozgcloud.xta.test.app.service.XtaParameter;
 import genv3.de.xoev.transport.xta.x211.AdditionalReportListType;
 import genv3.de.xoev.transport.xta.x211.AdditionalReportListType.Report;
 import genv3.de.xoev.transport.xta.x211.CancelDeniedException;
diff --git a/src/main/java/de/xoev/xta/test/app/server/MsgBoxPortImpl.java b/src/main/java/de/ozgcloud/xta/test/app/server/MsgBoxPortImpl.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/server/MsgBoxPortImpl.java
rename to src/main/java/de/ozgcloud/xta/test/app/server/MsgBoxPortImpl.java
index 1b4e9c21090097d82737e4a5eb0e3a39af731ee9..1fef31b609636e529c41539632ff903daa8a7242 100644
--- a/src/main/java/de/xoev/xta/test/app/server/MsgBoxPortImpl.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/server/MsgBoxPortImpl.java
@@ -1,5 +1,5 @@
 
-package de.xoev.xta.test.app.server;
+package de.ozgcloud.xta.test.app.server;
 
 import java.math.BigInteger;
 import java.util.Optional;
@@ -9,12 +9,12 @@ import org.apache.cxf.ws.addressing.AttributedURIType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import de.xoev.xta.test.app.service.CustomizationService;
-import de.xoev.xta.test.app.service.ParameterValidatorService;
-import de.xoev.xta.test.app.service.ProtocolService;
-import de.xoev.xta.test.app.service.XtaParameter;
-import de.xoev.xta.test.app.util.UtilComponent;
-import de.xoev.xta.test.app.util.XtaIdGenerator;
+import de.ozgcloud.xta.test.app.util.UtilComponent;
+import de.ozgcloud.xta.test.app.util.XtaIdGenerator;
+import de.ozgcloud.xta.test.app.service.CustomizationService;
+import de.ozgcloud.xta.test.app.service.ParameterValidatorService;
+import de.ozgcloud.xta.test.app.service.ProtocolService;
+import de.ozgcloud.xta.test.app.service.XtaParameter;
 import genv3.de.xoev.transport.xta.x211.InvalidMessageIDException;
 import genv3.de.xoev.transport.xta.x211.MsgBoxPortType;
 import genv3.de.xoev.transport.xta.x211.PermissionDeniedException;
diff --git a/src/main/java/de/xoev/xta/test/app/server/SendXtaPortImpl.java b/src/main/java/de/ozgcloud/xta/test/app/server/SendXtaPortImpl.java
similarity index 93%
rename from src/main/java/de/xoev/xta/test/app/server/SendXtaPortImpl.java
rename to src/main/java/de/ozgcloud/xta/test/app/server/SendXtaPortImpl.java
index 99fbfd734331b77c8fdc38014bdb648e53b541ff..9eddbb82f20edf8898404aaa9e670aff52e47ff7 100644
--- a/src/main/java/de/xoev/xta/test/app/server/SendXtaPortImpl.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/server/SendXtaPortImpl.java
@@ -1,5 +1,5 @@
 
-package de.xoev.xta.test.app.server;
+package de.ozgcloud.xta.test.app.server;
 
 import java.util.Optional;
 
@@ -7,12 +7,12 @@ import org.apache.cxf.annotations.SchemaValidation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import de.xoev.xta.test.app.service.CustomizationService;
-import de.xoev.xta.test.app.service.ParameterValidatorService;
-import de.xoev.xta.test.app.service.ProtocolService;
-import de.xoev.xta.test.app.service.XtaParameter;
-import de.xoev.xta.test.app.util.UtilComponent;
-import de.xoev.xta.test.app.util.XtaIdGenerator;
+import de.ozgcloud.xta.test.app.util.UtilComponent;
+import de.ozgcloud.xta.test.app.util.XtaIdGenerator;
+import de.ozgcloud.xta.test.app.service.CustomizationService;
+import de.ozgcloud.xta.test.app.service.ParameterValidatorService;
+import de.ozgcloud.xta.test.app.service.ProtocolService;
+import de.ozgcloud.xta.test.app.service.XtaParameter;
 import genv3.de.xoev.transport.xta.x211.GenericContentContainer;
 import genv3.de.xoev.transport.xta.x211.MessageSchemaViolationException;
 import genv3.de.xoev.transport.xta.x211.MessageVirusDetectionException;
diff --git a/src/main/java/de/xoev/xta/test/app/service/ClientConfigurationContainer.java b/src/main/java/de/ozgcloud/xta/test/app/service/ClientConfigurationContainer.java
similarity index 92%
rename from src/main/java/de/xoev/xta/test/app/service/ClientConfigurationContainer.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/ClientConfigurationContainer.java
index 3e51a103bcbc61b7ffbec0b46a1da828e1c443b9..00523a2bb2156b0aee4d554c476a1ecabee03cf2 100644
--- a/src/main/java/de/xoev/xta/test/app/service/ClientConfigurationContainer.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/ClientConfigurationContainer.java
@@ -1,7 +1,7 @@
 /*
  * Created 2023-03-15
  */
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
 
 import java.util.Collection;
 import java.util.List;
@@ -15,10 +15,10 @@ import org.apache.cxf.message.Message;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import de.xoev.xta.test.app.exception.XtaTesterException;
-import de.xoev.xta.test.app.service.interceptor.ClientProtocolInInterceptor;
-import de.xoev.xta.test.app.service.interceptor.ClientProtocolOutInterceptor;
-import de.xoev.xta.test.app.service.interceptor.ServerProtocolFaultOutInterceptor;
+import de.ozgcloud.xta.test.app.service.interceptor.ClientProtocolInInterceptor;
+import de.ozgcloud.xta.test.app.service.interceptor.ClientProtocolOutInterceptor;
+import de.ozgcloud.xta.test.app.exception.XtaTesterException;
+import de.ozgcloud.xta.test.app.service.interceptor.ServerProtocolFaultOutInterceptor;
 import genv3.de.xoev.transport.xta.x211.ManagementPortType;
 import genv3.de.xoev.transport.xta.x211.MsgBoxPortType;
 import genv3.de.xoev.transport.xta.x211.SendPortType;
diff --git a/src/main/java/de/xoev/xta/test/app/service/ConfigurationService.java b/src/main/java/de/ozgcloud/xta/test/app/service/ConfigurationService.java
similarity index 94%
rename from src/main/java/de/xoev/xta/test/app/service/ConfigurationService.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/ConfigurationService.java
index 992500e6a28c2208a20716c88de39d1512478bf6..9abc8d07171913004169ccd2be44cdc3618e3bd5 100644
--- a/src/main/java/de/xoev/xta/test/app/service/ConfigurationService.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/ConfigurationService.java
@@ -1,7 +1,7 @@
 /*
  * Created 2022-12-14
  */
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -23,10 +23,11 @@ import org.springframework.stereotype.Service;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 
-import de.xoev.xta.test.app.config.ClientProperties;
-import de.xoev.xta.test.app.config.XtaConfig;
-import de.xoev.xta.test.app.exception.XtaTesterException;
-import de.xoev.xta.test.app.model.ProtocolMetadata;
+import de.ozgcloud.xta.test.app.config.ClientProperties;
+import de.ozgcloud.xta.test.app.config.XtaConfig;
+import de.ozgcloud.xta.test.app.model.ProtocolMetadata;
+import de.ozgcloud.xta.test.app.exception.XtaTesterException;
+
 import jakarta.annotation.PostConstruct;
 import lombok.Getter;
 import lombok.extern.log4j.Log4j2;
diff --git a/src/main/java/de/xoev/xta/test/app/service/CustomizationService.java b/src/main/java/de/ozgcloud/xta/test/app/service/CustomizationService.java
similarity index 98%
rename from src/main/java/de/xoev/xta/test/app/service/CustomizationService.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/CustomizationService.java
index d00a6511138301fd585fba1f5d8d0f0c13874b0c..b03e53b8765dc1e84099395a1a3d13c99f095e77 100644
--- a/src/main/java/de/xoev/xta/test/app/service/CustomizationService.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/CustomizationService.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -49,9 +49,9 @@ import org.xml.sax.SAXNotSupportedException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import de.xoev.xta.test.app.exception.ConfigurationException;
-import de.xoev.xta.test.app.model.ContainerCustomization;
-import de.xoev.xta.test.app.model.CustomResponseEntity;
+import de.ozgcloud.xta.test.app.exception.ConfigurationException;
+import de.ozgcloud.xta.test.app.model.ContainerCustomization;
+import de.ozgcloud.xta.test.app.model.CustomResponseEntity;
 import genv3.de.xoev.transport.xta.x211.ContentType;
 import genv3.de.xoev.transport.xta.x211.GenericContentContainer;
 import genv3.de.xoev.transport.xta.x211.GenericContentContainer.ContentContainer;
diff --git a/src/main/java/de/xoev/xta/test/app/service/ParameterValidatorService.java b/src/main/java/de/ozgcloud/xta/test/app/service/ParameterValidatorService.java
similarity index 99%
rename from src/main/java/de/xoev/xta/test/app/service/ParameterValidatorService.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/ParameterValidatorService.java
index 790ff9eb430d79c60edaf4e65eb423f1e3e54c44..caf9122ab2442a7152891058fd00fdde9c677778 100644
--- a/src/main/java/de/xoev/xta/test/app/service/ParameterValidatorService.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/ParameterValidatorService.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/src/main/java/de/xoev/xta/test/app/service/ProtocolService.java b/src/main/java/de/ozgcloud/xta/test/app/service/ProtocolService.java
similarity index 95%
rename from src/main/java/de/xoev/xta/test/app/service/ProtocolService.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/ProtocolService.java
index b28766d3c3401a35624f70ce4815ef8ab3a3682b..511209779d75a35bce8dbecc3f0928cd72e94ed7 100644
--- a/src/main/java/de/xoev/xta/test/app/service/ProtocolService.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/ProtocolService.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -29,14 +29,15 @@ import java.util.function.Supplier;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import de.xoev.xta.test.app.model.ContainerCustomization;
-import de.xoev.xta.test.app.model.ProtocolMetadata;
-import de.xoev.xta.test.app.model.ScenarioDefinition;
-import de.xoev.xta.test.app.model.ScenarioEventType;
-import de.xoev.xta.test.app.model.ScenarioProtocol;
-import de.xoev.xta.test.app.model.ScenarioProtocolEvent;
-import de.xoev.xta.test.app.model.ScenarioProtocolEventResult;
-import de.xoev.xta.test.app.model.XtaProtocol;
+import de.ozgcloud.xta.test.app.model.ContainerCustomization;
+import de.ozgcloud.xta.test.app.model.ProtocolMetadata;
+import de.ozgcloud.xta.test.app.model.ScenarioDefinition;
+import de.ozgcloud.xta.test.app.model.ScenarioEventType;
+import de.ozgcloud.xta.test.app.model.ScenarioProtocol;
+import de.ozgcloud.xta.test.app.model.ScenarioProtocolEvent;
+import de.ozgcloud.xta.test.app.model.ScenarioProtocolEventResult;
+import de.ozgcloud.xta.test.app.model.XtaProtocol;
+
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import lombok.Getter;
diff --git a/src/main/java/de/xoev/xta/test/app/service/ScenarioDefinitionComparator.java b/src/main/java/de/ozgcloud/xta/test/app/service/ScenarioDefinitionComparator.java
similarity index 93%
rename from src/main/java/de/xoev/xta/test/app/service/ScenarioDefinitionComparator.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/ScenarioDefinitionComparator.java
index 50a599ca68bf3b2d9b427218b993cb439fa6d464..a55a964193f470d0f908a13e108f3fba6f7a2cf9 100644
--- a/src/main/java/de/xoev/xta/test/app/service/ScenarioDefinitionComparator.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/ScenarioDefinitionComparator.java
@@ -16,11 +16,11 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
 
 import java.util.Comparator;
 
-import de.xoev.xta.test.app.model.ScenarioDefinition;
+import de.ozgcloud.xta.test.app.model.ScenarioDefinition;
 
 public class ScenarioDefinitionComparator implements Comparator<ScenarioDefinition> {
 
diff --git a/src/main/java/de/xoev/xta/test/app/service/ScenarioExecutor.java b/src/main/java/de/ozgcloud/xta/test/app/service/ScenarioExecutor.java
similarity index 95%
rename from src/main/java/de/xoev/xta/test/app/service/ScenarioExecutor.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/ScenarioExecutor.java
index da772ade15211a1e0578ee72c04718f052c70491..aca1ad8a53831a0a490f3a942fe321ae81249a68 100644
--- a/src/main/java/de/xoev/xta/test/app/service/ScenarioExecutor.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/ScenarioExecutor.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
@@ -24,10 +24,11 @@ import java.util.concurrent.atomic.AtomicReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import de.xoev.xta.test.app.exception.CancelScenarioExecution;
-import de.xoev.xta.test.app.exception.XtaTesterException;
-import de.xoev.xta.test.app.model.ScenarioDefinition;
-import de.xoev.xta.test.app.model.ScenarioEventDefinition;
+import de.ozgcloud.xta.test.app.model.ScenarioDefinition;
+import de.ozgcloud.xta.test.app.model.ScenarioEventDefinition;
+import de.ozgcloud.xta.test.app.exception.CancelScenarioExecution;
+import de.ozgcloud.xta.test.app.exception.XtaTesterException;
+
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import lombok.extern.log4j.Log4j2;
diff --git a/src/main/java/de/xoev/xta/test/app/service/ScenarioService.java b/src/main/java/de/ozgcloud/xta/test/app/service/ScenarioService.java
similarity index 97%
rename from src/main/java/de/xoev/xta/test/app/service/ScenarioService.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/ScenarioService.java
index 77eb4f55b6f85e1768838fc50d19b32d17348aa7..55ad2f25b240adc4666e5839e4277312bc5a29b5 100644
--- a/src/main/java/de/xoev/xta/test/app/service/ScenarioService.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/ScenarioService.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -29,12 +29,13 @@ import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import de.xoev.xta.test.app.exception.XtaTesterException;
-import de.xoev.xta.test.app.model.ExecutionType;
-import de.xoev.xta.test.app.model.ScenarioDefinition;
-import de.xoev.xta.test.app.model.ScenarioEventDefinition;
-import de.xoev.xta.test.app.model.ScenarioEventType;
-import de.xoev.xta.test.app.model.ScenarioRole;
+import de.ozgcloud.xta.test.app.model.ExecutionType;
+import de.ozgcloud.xta.test.app.model.ScenarioDefinition;
+import de.ozgcloud.xta.test.app.model.ScenarioEventDefinition;
+import de.ozgcloud.xta.test.app.model.ScenarioEventType;
+import de.ozgcloud.xta.test.app.model.ScenarioRole;
+import de.ozgcloud.xta.test.app.exception.XtaTesterException;
+
 import jakarta.annotation.PostConstruct;
 import lombok.extern.log4j.Log4j2;
 
diff --git a/src/main/java/de/xoev/xta/test/app/service/XtaClient.java b/src/main/java/de/ozgcloud/xta/test/app/service/XtaClient.java
similarity index 98%
rename from src/main/java/de/xoev/xta/test/app/service/XtaClient.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/XtaClient.java
index 1fa576861379133d0e4c73c4b3ca7e786a22d696..cc19104d46840ff04dbcd7cd28512377e6e739c8 100644
--- a/src/main/java/de/xoev/xta/test/app/service/XtaClient.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/XtaClient.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
  */
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
 
 import java.io.IOException;
 import java.math.BigInteger;
@@ -46,10 +46,10 @@ import org.apache.hc.core5.ssl.SSLContexts;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import de.xoev.xta.test.app.exception.XtaTesterException;
-import de.xoev.xta.test.app.model.XtaConstants;
-import de.xoev.xta.test.app.util.UtilComponent;
-import de.xoev.xta.test.app.util.XtaIdGenerator;
+import de.ozgcloud.xta.test.app.model.XtaConstants;
+import de.ozgcloud.xta.test.app.util.UtilComponent;
+import de.ozgcloud.xta.test.app.util.XtaIdGenerator;
+import de.ozgcloud.xta.test.app.exception.XtaTesterException;
 import genv3.de.xoev.transport.xta.x211.ContentType;
 import genv3.de.xoev.transport.xta.x211.GenericContentContainer;
 import genv3.de.xoev.transport.xta.x211.GenericContentContainer.ContentContainer;
diff --git a/src/main/java/de/xoev/xta/test/app/service/XtaConfigDtoConverter.java b/src/main/java/de/ozgcloud/xta/test/app/service/XtaConfigDtoConverter.java
similarity index 86%
rename from src/main/java/de/xoev/xta/test/app/service/XtaConfigDtoConverter.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/XtaConfigDtoConverter.java
index 1b32925e20379b6796e40e192893c63e0a1c7d76..9ec786d47f6454056b00d5e7691464bbf3f58386 100644
--- a/src/main/java/de/xoev/xta/test/app/service/XtaConfigDtoConverter.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/XtaConfigDtoConverter.java
@@ -1,17 +1,16 @@
 /*
  * Created 2023-03-24
  */
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
 
-import org.apache.commons.lang3.StringUtils;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
-import de.xoev.xta.test.app.config.MapStructConfiguration;
-import de.xoev.xta.test.app.config.XtaConfig;
-import de.xoev.xta.test.app.config.XtaConfigQualifierType;
-import de.xoev.xta.test.app.model.XtaConfigDto;
-import de.xoev.xta.test.app.model.XtaIdentifierConfig;
+import de.ozgcloud.xta.test.app.config.MapStructConfiguration;
+import de.ozgcloud.xta.test.app.config.XtaConfig;
+import de.ozgcloud.xta.test.app.config.XtaConfigQualifierType;
+import de.ozgcloud.xta.test.app.model.XtaConfigDto;
+import de.ozgcloud.xta.test.app.model.XtaIdentifierConfig;
 import genv3.eu.osci.ws.x2014.x10.transport.KeyCodeType;
 import genv3.eu.osci.ws.x2014.x10.transport.PartyType;
 import genv3.eu.osci.ws.x2014.x10.transport.QualifierType;
diff --git a/src/main/java/de/xoev/xta/test/app/service/XtaParameter.java b/src/main/java/de/ozgcloud/xta/test/app/service/XtaParameter.java
similarity index 99%
rename from src/main/java/de/xoev/xta/test/app/service/XtaParameter.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/XtaParameter.java
index 95d82f50cee2eb2a275cc43d00def278ca274402..dad0b90d14456afbaaf85c18b002ec928ed4b853 100644
--- a/src/main/java/de/xoev/xta/test/app/service/XtaParameter.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/XtaParameter.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
 
 import java.util.StringJoiner;
 
diff --git a/src/main/java/de/xoev/xta/test/app/service/interceptor/ClientProtocolInInterceptor.java b/src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ClientProtocolInInterceptor.java
similarity index 93%
rename from src/main/java/de/xoev/xta/test/app/service/interceptor/ClientProtocolInInterceptor.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ClientProtocolInInterceptor.java
index 5488a82e99151018a17c3005ba32b00a2bd4fbed..45887f66ada0bf7ad734a0c928e6cbf28dfdebd8 100644
--- a/src/main/java/de/xoev/xta/test/app/service/interceptor/ClientProtocolInInterceptor.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ClientProtocolInInterceptor.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.service.interceptor;
+package de.ozgcloud.xta.test.app.service.interceptor;
 
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
@@ -8,7 +8,7 @@ import org.apache.cxf.phase.Phase;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import de.xoev.xta.test.app.service.ProtocolService;
+import de.ozgcloud.xta.test.app.service.ProtocolService;
 import lombok.extern.log4j.Log4j2;
 
 /**
diff --git a/src/main/java/de/xoev/xta/test/app/service/interceptor/ClientProtocolOutInterceptor.java b/src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ClientProtocolOutInterceptor.java
similarity index 92%
rename from src/main/java/de/xoev/xta/test/app/service/interceptor/ClientProtocolOutInterceptor.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ClientProtocolOutInterceptor.java
index d068c028fccb8c0af8bfb454c45f2baa7a03f6b5..808a20a45a0bb8959d449d57f99807fbaa48defd 100644
--- a/src/main/java/de/xoev/xta/test/app/service/interceptor/ClientProtocolOutInterceptor.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ClientProtocolOutInterceptor.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.service.interceptor;
+package de.ozgcloud.xta.test.app.service.interceptor;
 
 import java.util.Optional;
 
@@ -11,8 +11,8 @@ import org.apache.cxf.ws.addressing.AddressingProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import de.xoev.xta.test.app.model.ScenarioEventType;
-import de.xoev.xta.test.app.service.ProtocolService;
+import de.ozgcloud.xta.test.app.model.ScenarioEventType;
+import de.ozgcloud.xta.test.app.service.ProtocolService;
 import lombok.extern.log4j.Log4j2;
 
 /**
diff --git a/src/main/java/de/xoev/xta/test/app/service/interceptor/ServerProtocolFaultOutInterceptor.java b/src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ServerProtocolFaultOutInterceptor.java
similarity index 90%
rename from src/main/java/de/xoev/xta/test/app/service/interceptor/ServerProtocolFaultOutInterceptor.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ServerProtocolFaultOutInterceptor.java
index 21050ad247949985b0729bd43c767f39dfbd5b1d..bf601cfde0270afda8a9ce4036a3aa07a7512150 100644
--- a/src/main/java/de/xoev/xta/test/app/service/interceptor/ServerProtocolFaultOutInterceptor.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ServerProtocolFaultOutInterceptor.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.service.interceptor;
+package de.ozgcloud.xta.test.app.service.interceptor;
 
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
@@ -7,7 +7,7 @@ import org.apache.cxf.phase.Phase;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import de.xoev.xta.test.app.service.ProtocolService;
+import de.ozgcloud.xta.test.app.service.ProtocolService;
 import lombok.extern.log4j.Log4j2;
 
 /**
diff --git a/src/main/java/de/xoev/xta/test/app/service/interceptor/ServerProtocolInInterceptor.java b/src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ServerProtocolInInterceptor.java
similarity index 94%
rename from src/main/java/de/xoev/xta/test/app/service/interceptor/ServerProtocolInInterceptor.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ServerProtocolInInterceptor.java
index 76b167c65a77d82c2d5deb95de7d70ed874c5996..4ae257a278b7db668f6a59cc0176a524c1254dab 100644
--- a/src/main/java/de/xoev/xta/test/app/service/interceptor/ServerProtocolInInterceptor.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ServerProtocolInInterceptor.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.service.interceptor;
+package de.ozgcloud.xta.test.app.service.interceptor;
 
 import java.security.cert.X509Certificate;
 import java.util.Optional;
@@ -12,8 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;
 
-import de.xoev.xta.test.app.model.ScenarioEventType;
-import de.xoev.xta.test.app.service.ProtocolService;
+import de.ozgcloud.xta.test.app.model.ScenarioEventType;
+import de.ozgcloud.xta.test.app.service.ProtocolService;
 import lombok.extern.log4j.Log4j2;
 
 /**
diff --git a/src/main/java/de/xoev/xta/test/app/service/interceptor/ServerProtocolOutInterceptor.java b/src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ServerProtocolOutInterceptor.java
similarity index 90%
rename from src/main/java/de/xoev/xta/test/app/service/interceptor/ServerProtocolOutInterceptor.java
rename to src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ServerProtocolOutInterceptor.java
index 1c4252e610bb6f59086fcd38de6dd965961069cc..51ab1be204f73c165910b0e6c8023434eddc9524 100644
--- a/src/main/java/de/xoev/xta/test/app/service/interceptor/ServerProtocolOutInterceptor.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/service/interceptor/ServerProtocolOutInterceptor.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.service.interceptor;
+package de.ozgcloud.xta.test.app.service.interceptor;
 
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
@@ -7,7 +7,7 @@ import org.apache.cxf.phase.Phase;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import de.xoev.xta.test.app.service.ProtocolService;
+import de.ozgcloud.xta.test.app.service.ProtocolService;
 import lombok.extern.log4j.Log4j2;
 
 /**
diff --git a/src/main/java/de/xoev/xta/test/app/util/UtilComponent.java b/src/main/java/de/ozgcloud/xta/test/app/util/UtilComponent.java
similarity index 95%
rename from src/main/java/de/xoev/xta/test/app/util/UtilComponent.java
rename to src/main/java/de/ozgcloud/xta/test/app/util/UtilComponent.java
index 7c645239c0fa4a50f0c3464e847efca4a8b4e742..2e5c7a820bb5747719611c089d8d03590ce1d023 100644
--- a/src/main/java/de/xoev/xta/test/app/util/UtilComponent.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/util/UtilComponent.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.util;
+package de.ozgcloud.xta.test.app.util;
 
 import java.math.BigInteger;
 import java.util.Calendar;
@@ -13,10 +13,10 @@ import org.apache.cxf.ws.addressing.AttributedURIType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import de.xoev.xta.test.app.model.Role;
-import de.xoev.xta.test.app.service.ConfigurationService;
-import de.xoev.xta.test.app.service.ProtocolService;
-import de.xoev.xta.test.app.service.XtaConfigDtoConverter;
+import de.ozgcloud.xta.test.app.model.Role;
+import de.ozgcloud.xta.test.app.service.ConfigurationService;
+import de.ozgcloud.xta.test.app.service.ProtocolService;
+import de.ozgcloud.xta.test.app.service.XtaConfigDtoConverter;
 import genv3.eu.osci.ws.x2008.x05.transport.MsgSelector;
 import genv3.eu.osci.ws.x2014.x10.transport.DeliveryAttributesType;
 import genv3.eu.osci.ws.x2014.x10.transport.DestinationsType;
diff --git a/src/main/java/de/xoev/xta/test/app/util/XtaId.java b/src/main/java/de/ozgcloud/xta/test/app/util/XtaId.java
similarity index 97%
rename from src/main/java/de/xoev/xta/test/app/util/XtaId.java
rename to src/main/java/de/ozgcloud/xta/test/app/util/XtaId.java
index aae6ddfe59a214e40db98b663d68dd5375e986a8..8871134d5c799720d83c994488897c0620cbc751 100644
--- a/src/main/java/de/xoev/xta/test/app/util/XtaId.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/util/XtaId.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.util;
+package de.ozgcloud.xta.test.app.util;
 
 import java.util.Optional;
 import java.util.regex.Matcher;
diff --git a/src/main/java/de/xoev/xta/test/app/util/XtaIdGenerator.java b/src/main/java/de/ozgcloud/xta/test/app/util/XtaIdGenerator.java
similarity index 97%
rename from src/main/java/de/xoev/xta/test/app/util/XtaIdGenerator.java
rename to src/main/java/de/ozgcloud/xta/test/app/util/XtaIdGenerator.java
index aba6314266d4f0a45329025b032b16d0699af9d4..97a697b52afad05347a4c87e3ac2dee9f9ce98cb 100644
--- a/src/main/java/de/xoev/xta/test/app/util/XtaIdGenerator.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/util/XtaIdGenerator.java
@@ -16,7 +16,7 @@
 * limitations under the License.
 * @formatter:on
 */
-package de.xoev.xta.test.app.util;
+package de.ozgcloud.xta.test.app.util;
 
 import java.util.UUID;
 
diff --git a/src/main/java/de/xoev/xta/test/app/util/YamlPropertySourceFactory.java b/src/main/java/de/ozgcloud/xta/test/app/util/YamlPropertySourceFactory.java
similarity index 96%
rename from src/main/java/de/xoev/xta/test/app/util/YamlPropertySourceFactory.java
rename to src/main/java/de/ozgcloud/xta/test/app/util/YamlPropertySourceFactory.java
index 11b4ed98e7d375f164fd2d1ea318600622a88425..70bbaaa288fd60800acead74f2ac79324c4d1aeb 100644
--- a/src/main/java/de/xoev/xta/test/app/util/YamlPropertySourceFactory.java
+++ b/src/main/java/de/ozgcloud/xta/test/app/util/YamlPropertySourceFactory.java
@@ -1,7 +1,7 @@
 /*
  * Created 2023-03-24
  */
-package de.xoev.xta.test.app.util;
+package de.ozgcloud.xta.test.app.util;
 
 import java.io.IOException;
 import java.util.Properties;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index eabea82b2ff25cde33a38258fafbac1cf0e5629d..393a557b2eb1e9e389e42ebecb27adbc5e65f21c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   application: 
-    name: xta-test-app
+    name: xta-test-server
   servlet:
     multipart:
       max-file-size: 10MB
@@ -12,14 +12,14 @@ server:
   tomcat.max-swallow-size: 10MB
   ssl:
     # enthaelt den privaten und oeffentlichen Schluessel der Anwendung
-    key-store: classpath:store/xta-test-app_keystore.p12
+    key-store: classpath:store/xta-test-server_keystore.p12
     key-store-password: password
     key-store-type: pkcs12
     # Alias im KeyStore
     key-alias: xta-test-application
     key-password: password
     # enthaelt alle vertrauenswuerdigen Zertifikate
-    trust-store: classpath:store/xta-test-app_truststore.jks
+    trust-store: classpath:store/xta-test-server_truststore.jks
     trust-store-password: password
     trust-store-type: JKS
     # want, need, none; see org.springframework.boot.web.server.ClientAuth
diff --git a/src/main/resources/application_second_app.yml b/src/main/resources/application_second_app.yml
index d34ec9a728defab5d011c4f53e207ec7d2430595..d86b9160a716df6c3cacd046088fd1384065defe 100644
--- a/src/main/resources/application_second_app.yml
+++ b/src/main/resources/application_second_app.yml
@@ -1,6 +1,6 @@
 spring:
   application: 
-    name: xta-test-app
+    name: xta-test-server
   servlet:
     multipart:
       max-file-size: 10MB
@@ -15,14 +15,14 @@ server:
   tomcat.max-swallow-size: 10MB
   ssl:
     # enthaelt den privaten und oeffentlichen Schluessel der Anwendung
-    key-store: classpath:store/xta-test-app_keystore.p12
+    key-store: classpath:store/xta-test-server_keystore.p12
     key-store-password: password
     key-store-type: pkcs12
     # Alias im KeyStore
     key-alias: xta-test-application
     key-password: password
     # enthaelt alle vertrauenswuerdigen Zertifikate
-    trust-store: classpath:store/xta-test-app_truststore.jks
+    trust-store: classpath:store/xta-test-server_truststore.jks
     trust-store-password: password
     trust-store-type: JKS
     # want, need, none; see org.springframework.boot.web.server.ClientAuth
@@ -43,6 +43,6 @@ logging:
     org.springframework.security: WARN
     org.springframework.web: INFO
     org.apache.axiom: INFO
-    de.xoev.xta.test.app.soap: DEBUG
+    de.ozgcloud.xta.test.app.soap: DEBUG
     org.apache.axis2: INFO
     
diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt
index 5f47f65fdb4041cfe7d215a5ff557bd5e0771daf..e94d4fc4c39f6b96ba0ca9dcaade54bbed4aeb41 100644
--- a/src/main/resources/banner.txt
+++ b/src/main/resources/banner.txt
@@ -1,10 +1,10 @@
- __   _________                  _______ ______  _____ _______                     _____  _____  
- \ \ / /__   __|/\              |__   __|  ____|/ ____|__   __|              /\   |  __ \|  __ \ 
-  \ V /   | |  /  \     ______     | |  | |__  | (___    | |     ______     /  \  | |__) | |__) |
-   > <    | | / /\ \   |______|    | |  |  __|  \___ \   | |    |______|   / /\ \ |  ___/|  ___/ 
-  / . \   | |/ ____ \              | |  | |____ ____) |  | |              / ____ \| |    | |     
- /_/ \_\  |_/_/    \_\             |_|  |______|_____/   |_|             /_/    \_\_|    |_|     
-                                                                                                 
-                                                                                                 
+       _              _            _
+ __  _| |_ __ _      | |_ ___  ___| |_      ___  ___ _ ____   _____ _ __
+ \ \/ / __/ _` |_____| __/ _ \/ __| __|____/ __|/ _ \ '__\ \ / / _ \ '__|
+  >  <| || (_| |_____| ||  __/\__ \ ||_____\__ \  __/ |   \ V /  __/ |
+ /_/\_\\__\__,_|      \__\___||___/\__|    |___/\___|_|    \_/ \___|_|
+
+
+
  :: XTA-Tester  ::  (v@project.version@)
  :: Spring Boot ::  (v@project.parent.version@)
diff --git a/src/main/resources/configDefault.yaml b/src/main/resources/configDefault.yaml
index a39c0bf575a22b75e9dfff91e29184dc1b55ae1d..87afee2c25dfcd6c2a4b60ed34c7f6f15c67e7bd 100644
--- a/src/main/resources/configDefault.yaml
+++ b/src/main/resources/configDefault.yaml
@@ -17,7 +17,7 @@ clientProperties:
   keyStorePassword: "password"
   keyPassword: "password"
   keyAlias: null
-  trustStore: "classpath:store/xta-test-app_truststore.jks"
+  trustStore: "classpath:store/xta-test-server_truststore.jks"
   trustStorePassword: "password"
 authorIdentifierConfig:
   identifierScheme: "xoev"
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 8ff45bec98154a00873c01b0219c0fb603a7c0ce..58516be8d741ba7b571f80f0405c71f67fc1447a 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -17,8 +17,8 @@
     </Appenders>
 
     <Loggers>
-        <!-- By default all logs from de.xoev.xta loggers are sent to Console -->
-        <Logger name="de.xoev.xta" level="debug" additivity="false">
+        <!-- By default all logs from de.ozgcloud.xta loggers are sent to Console -->
+        <Logger name="de.ozgcloud.xta" level="debug" additivity="false">
             <AppenderRef ref="Console" level="${env:LOG_LEVEL_STDOUT:-debug}" />
         </Logger>
 
diff --git a/src/main/resources/store/xta-test-app_keystore.p12 b/src/main/resources/store/xta-test-server_keystore.p12
similarity index 100%
rename from src/main/resources/store/xta-test-app_keystore.p12
rename to src/main/resources/store/xta-test-server_keystore.p12
diff --git a/src/main/resources/store/xta-test-app_truststore.jks b/src/main/resources/store/xta-test-server_truststore.jks
similarity index 100%
rename from src/main/resources/store/xta-test-app_truststore.jks
rename to src/main/resources/store/xta-test-server_truststore.jks
diff --git a/src/test/java/de/xoev/xta/test/app/ApplicationTests.java b/src/test/java/de/ozgcloud/xta/test/app/ApplicationTests.java
similarity index 91%
rename from src/test/java/de/xoev/xta/test/app/ApplicationTests.java
rename to src/test/java/de/ozgcloud/xta/test/app/ApplicationTests.java
index 341af015978fcc62c761d0ab17a3cab4968f5c18..bdce961193bc5a6ea6b175ee44c6e456f0da34a8 100644
--- a/src/test/java/de/xoev/xta/test/app/ApplicationTests.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/ApplicationTests.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app;
+package de.ozgcloud.xta.test.app;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/de/xoev/xta/test/app/TestingApplication.java b/src/test/java/de/ozgcloud/xta/test/app/TestingApplication.java
similarity index 92%
rename from src/test/java/de/xoev/xta/test/app/TestingApplication.java
rename to src/test/java/de/ozgcloud/xta/test/app/TestingApplication.java
index 4f26f8250b367728c75167b0710ff4bd09587740..59192874fb506808cef96344fdf918aeb513af9d 100644
--- a/src/test/java/de/xoev/xta/test/app/TestingApplication.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/TestingApplication.java
@@ -1,7 +1,7 @@
 /*
  * Created 2022-02-06
  */
-package de.xoev.xta.test.app;
+package de.ozgcloud.xta.test.app;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/src/test/java/de/xoev/xta/test/app/service/XtaClientTest.java b/src/test/java/de/ozgcloud/xta/test/app/service/XtaClientTest.java
similarity index 90%
rename from src/test/java/de/xoev/xta/test/app/service/XtaClientTest.java
rename to src/test/java/de/ozgcloud/xta/test/app/service/XtaClientTest.java
index 374cee6d0752af704dce7cdc2d8505ae49b0a015..90cb84888865ac804e33d0b58e6cdb7c59fb4266 100644
--- a/src/test/java/de/xoev/xta/test/app/service/XtaClientTest.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/service/XtaClientTest.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.service;
+package de.ozgcloud.xta.test.app.service;
 
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -21,11 +21,11 @@ import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import de.xoev.xta.test.app.TestingApplication;
-import de.xoev.xta.test.app.exception.CancelScenarioExecution;
-import de.xoev.xta.test.app.model.ExecutionType;
-import de.xoev.xta.test.app.model.ScenarioEventDefinition;
-import de.xoev.xta.test.app.model.ScenarioEventType;
+import de.ozgcloud.xta.test.app.model.ScenarioEventType;
+import de.ozgcloud.xta.test.app.TestingApplication;
+import de.ozgcloud.xta.test.app.exception.CancelScenarioExecution;
+import de.ozgcloud.xta.test.app.model.ExecutionType;
+import de.ozgcloud.xta.test.app.model.ScenarioEventDefinition;
 import lombok.extern.log4j.Log4j2;
 
 @Log4j2
diff --git a/src/test/java/de/xoev/xta/test/app/util/XtaIdGeneratorTest.java b/src/test/java/de/ozgcloud/xta/test/app/util/XtaIdGeneratorTest.java
similarity index 87%
rename from src/test/java/de/xoev/xta/test/app/util/XtaIdGeneratorTest.java
rename to src/test/java/de/ozgcloud/xta/test/app/util/XtaIdGeneratorTest.java
index 56c169328bb23f02ff2614b47561d253c6f14bff..f964cc1c7b9152658b5cb5e56b0f1caaf110983c 100644
--- a/src/test/java/de/xoev/xta/test/app/util/XtaIdGeneratorTest.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/util/XtaIdGeneratorTest.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.util;
+package de.ozgcloud.xta.test.app.util;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -6,9 +6,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.junit.jupiter.api.Test;
 
-import de.xoev.xta.test.app.util.XtaId;
-import de.xoev.xta.test.app.util.XtaIdGenerator;
-
 public class XtaIdGeneratorTest {
 
     @Test
diff --git a/src/test/java/de/xoev/xta/test/app/util/XtaIdTest.java b/src/test/java/de/ozgcloud/xta/test/app/util/XtaIdTest.java
similarity index 94%
rename from src/test/java/de/xoev/xta/test/app/util/XtaIdTest.java
rename to src/test/java/de/ozgcloud/xta/test/app/util/XtaIdTest.java
index 241a15fbac06cca0e5473aed0a5118b8a648bfe8..1e02d3bc9ac787f9b394e86215dd303b573337b1 100644
--- a/src/test/java/de/xoev/xta/test/app/util/XtaIdTest.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/util/XtaIdTest.java
@@ -1,4 +1,4 @@
-package de.xoev.xta.test.app.util;
+package de.ozgcloud.xta.test.app.util;
 
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -8,8 +8,6 @@ import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
 
-import de.xoev.xta.test.app.util.XtaId;
-
 public class XtaIdTest {
 
     @Test
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
index bf1d4102eea306909ced560d53428cacabed6f9a..3b93649c12db7fe0c15b08331ed4073608be207c 100644
--- a/src/test/resources/application.yml
+++ b/src/test/resources/application.yml
@@ -1,19 +1,19 @@
 spring:
   application: 
-    name: xta-test-app
+    name: xta-test-server
 
 server:
   port: 9443
   ssl:
     # enthaelt den privaten und oeffentlichen Schluessel der Anwendung
-    key-store: classpath:store/xta-test-app_keystore.p12
+    key-store: classpath:store/xta-test-server_keystore.p12
     key-store-password: password
     key-store-type: pkcs12
     # Alias im KeyStore
     key-alias: xta-test-application
     key-password: password
     # enthaelt alle vertrauenswuerdigen Zertifikate
-    trust-store: classpath:store/xta-test-app_truststore.jks
+    trust-store: classpath:store/xta-test-server_truststore.jks
     trust-store-password: password
     trust-store-type: JKS
     # want, need, none; see org.springframework.boot.web.server.ClientAuth
diff --git a/src/test/resources/configDefaultTest.yaml b/src/test/resources/configDefaultTest.yaml
index a7b6a22dac17e35db1b38baecc9dacb56268b8e8..948caf8ebe703e4f83dd3265040582508472eb6f 100644
--- a/src/test/resources/configDefaultTest.yaml
+++ b/src/test/resources/configDefaultTest.yaml
@@ -17,5 +17,5 @@ clientProperties:
   keyStorePassword: "password"
   keyPassword: "password"
   keyAlias: null
-  trustStore: "classpath:store/xta-test-app_truststore.jks"
+  trustStore: "classpath:store/xta-test-server_truststore.jks"
   trustStorePassword: "password"