diff --git a/api/src/main/java/de/fitko/fitconnect/api/services/auth/OAuthService.java b/api/src/main/java/de/fitko/fitconnect/api/services/auth/OAuthService.java
index c6683988ee5d7b2d25b6784ee2d03954d597dc99..91629731c569c8588a144da0872fe6364f1215b3 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/services/auth/OAuthService.java
+++ b/api/src/main/java/de/fitko/fitconnect/api/services/auth/OAuthService.java
@@ -1,15 +1,14 @@
 package de.fitko.fitconnect.api.services.auth;
 
 import de.fitko.fitconnect.api.domain.auth.OAuthToken;
-import de.fitko.fitconnect.api.domain.model.submission.SubmissionRequest;
-import de.fitko.fitconnect.api.exceptions.internal.AuthenticationException;
+import de.fitko.fitconnect.api.domain.model.submission.SubmissionSubmit;
+import de.fitko.fitconnect.api.exceptions.AuthenticationException;
 
 /**
  * A Service that provides an interface to authenticate against the Fit-Connect API in order
- * to send a {@link SubmissionRequest}.
+ * to send a {@link SubmissionSubmit}.
  *
  * @see <a href="https://docs.fitko.de/fit-connect/docs/getting-started/authentication">Fit-Connect documentation on authentication</a>
- *
  */
 public interface OAuthService {
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/services/crypto/CryptoService.java b/api/src/main/java/de/fitko/fitconnect/api/services/crypto/CryptoService.java
index 9a493990b7b217585cc667136a1ddfed1dbc5927..93b97d28060978dacf58ab1f867f7d58cbdff620 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/services/crypto/CryptoService.java
+++ b/api/src/main/java/de/fitko/fitconnect/api/services/crypto/CryptoService.java
@@ -3,12 +3,12 @@ package de.fitko.fitconnect.api.services.crypto;
 import com.nimbusds.jose.jwk.RSAKey;
 import de.fitko.fitconnect.api.domain.model.metadata.data.Data;
 import de.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
-import de.fitko.fitconnect.api.domain.model.submission.SubmissionRequest;
-import de.fitko.fitconnect.api.exceptions.internal.DecryptionException;
-import de.fitko.fitconnect.api.exceptions.internal.EncryptionException;
+import de.fitko.fitconnect.api.domain.model.submission.SubmissionSubmit;
+import de.fitko.fitconnect.api.exceptions.DecryptionException;
+import de.fitko.fitconnect.api.exceptions.EncryptionException;
 
 /**
- * A service that allows to encrypt and decrypt {@link Data} and {@link Attachment}s of a {@link SubmissionRequest} via JWE.
+ * A service that allows to encrypt and decrypt {@link Data} and {@link Attachment}s of a {@link SubmissionSubmit} via JWE.
  *
  * @see <a href="https://datatracker.ietf.org/doc/html/rfc7516">JSON-Web-Encryption</a>
  */
@@ -17,7 +17,7 @@ public interface CryptoService {
     /**
      * Decrypts a JWE encrypted string with the given private key
      *
-     * @param privateKey RSA private key the encrypted JWE string is decrypted with
+     * @param privateKey    RSA private key the encrypted JWE string is decrypted with
      * @param encryptedData serialized encrypted JWE string that is decrypted
      * @return a string serialization of the decrypted payload
      * @throws DecryptionException if the payload cannot be decrypted or there was an issue with the key
@@ -27,7 +27,7 @@ public interface CryptoService {
     /**
      * Decrypts a JWE encrypted byte[] with the given private key
      *
-     * @param privateKey RSA private key the encrypted JWE string is decrypted with
+     * @param privateKey    RSA private key the encrypted JWE string is decrypted with
      * @param encryptedData serialized encrypted JWE string that is decrypted
      * @return a byte[] of the decrypted string payload
      * @throws DecryptionException if the payload cannot be decrypted or there was an issue with the key
@@ -38,7 +38,7 @@ public interface CryptoService {
      * JWE encrypts a given string payload with the public key
      *
      * @param publicKey RSA public key the payload is encrypted with
-     * @param data json or xml data that should be encrypted
+     * @param data      json or xml data that should be encrypted
      * @return a string serialization of the encrypted JWE object
      * @throws EncryptionException if the payload cannot be encrypted or there was an issue with the key
      */
@@ -48,7 +48,7 @@ public interface CryptoService {
      * JWE encrypts a given byte[] payload with the public key
      *
      * @param publicKey RSA public key the payload is encrypted with
-     * @param bytes byte[] of the data that should be encrypted
+     * @param bytes     byte[] of the data that should be encrypted
      * @return a string serialization of the encrypted JWE object
      * @throws EncryptionException if the payload cannot be encrypted or there was an issue with the key
      */
diff --git a/api/src/main/java/de/fitko/fitconnect/api/services/metadata/MetadataService.java b/api/src/main/java/de/fitko/fitconnect/api/services/metadata/MetadataService.java
index 2071fdcf411078b524314742b431824ca5f4ac64..b8cfc4fc7742fdf82869cbaa92711a5fe93dbef8 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/services/metadata/MetadataService.java
+++ b/api/src/main/java/de/fitko/fitconnect/api/services/metadata/MetadataService.java
@@ -3,12 +3,12 @@ package de.fitko.fitconnect.api.services.metadata;
 import de.fitko.fitconnect.api.domain.model.metadata.Metadata;
 import de.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
 import de.fitko.fitconnect.api.domain.model.metadata.data.Data;
-import de.fitko.fitconnect.api.domain.model.submission.SubmissionRequest;
+import de.fitko.fitconnect.api.domain.model.submission.SubmissionSubmit;
 
 import java.util.List;
 
 /**
- * Provides the generation of correct and valid {@link Metadata} for a {@link SubmissionRequest}
+ * Provides the generation of correct and valid {@link Metadata} for a {@link SubmissionSubmit}
  *
  * @see
  * <a href="https://docs.fitko.de/fit-connect/docs/metadataoverview">Metadata</a> and
diff --git a/api/src/main/java/de/fitko/fitconnect/api/services/validation/MetadataValidator.java b/api/src/main/java/de/fitko/fitconnect/api/services/validation/MetadataValidator.java
index e788b315320a8fb9a32279131061e18f9f12459b..7f03d2ad8c7745149cddb57982a57f0befc96d82 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/services/validation/MetadataValidator.java
+++ b/api/src/main/java/de/fitko/fitconnect/api/services/validation/MetadataValidator.java
@@ -3,11 +3,11 @@ package de.fitko.fitconnect.api.services.validation;
 import de.fitko.fitconnect.api.domain.model.metadata.Metadata;
 import de.fitko.fitconnect.api.domain.model.metadata.attachment.Attachment;
 import de.fitko.fitconnect.api.domain.model.metadata.data.Data;
-import de.fitko.fitconnect.api.domain.model.submission.SubmissionRequest;
+import de.fitko.fitconnect.api.domain.model.submission.SubmissionSubmit;
 import de.fitko.fitconnect.api.domain.validation.ValidationResult;
 
 /**
- * A validator that ensure the integrity of the transferred {@link Metadata} of a {@link SubmissionRequest}.
+ * A validator that ensure the integrity of the transferred {@link Metadata} of a {@link SubmissionSubmit}.
  * Both schema-validation and hash value validation is provided.
  *
  * @see <a href="https://docs.fitko.de/fit-connect/docs/sending/metadata#integrity">Metadata Integrity</a>