diff --git a/src/Builders/Document/CustomerUrgentCreditTransferBuilder.php b/src/Builders/Document/CustomerUrgentCreditTransferBuilder.php
index 9b87feb..1c8fe23 100644
--- a/src/Builders/Document/CustomerUrgentCreditTransferBuilder.php
+++ b/src/Builders/Document/CustomerUrgentCreditTransferBuilder.php
@@ -8,8 +8,8 @@
 use InvalidArgumentException;
 
 /**
- * CustomerCreditTransferBuilder
- * Corresponds to EbicsApi\Ebics\Builders\CustomerCreditTransfer\CustomerCreditTransferBuilder but with namespaces
+ * CustomerUrgentCreditTransferBuilder
+ * Corresponds to EbicsApi\Ebics\Builders\Document\CustomerCreditTransferBuilder but with namespaces
  *
  * @license http://www.opensource.org/licenses/mit-license.html  MIT License
  * @author Jan-Philipp Georg (moori)
diff --git a/src/Builders/Document/DocumentBuilder.php b/src/Builders/Document/DocumentBuilder.php
index 90305b4..ec136ca 100644
--- a/src/Builders/Document/DocumentBuilder.php
+++ b/src/Builders/Document/DocumentBuilder.php
@@ -4,10 +4,9 @@
 
 use DateTime;
 use DOMElement;
-use EbicsApi\Ebics\Contracts\OrderDataInterface;
 use EbicsApi\Ebics\Contracts\PostalAddressInterface;
 use EbicsApi\Ebics\Handlers\Traits\XPathTrait;
-use EbicsApi\Ebics\Models\DOMDocument;
+use EbicsApi\Ebics\Models\XmlData;
 use EbicsApi\Ebics\Services\DOMHelper;
 use EbicsApi\Ebics\Services\RandomService;
 
@@ -23,7 +22,7 @@ abstract class DocumentBuilder
     use XPathTrait;
 
     protected RandomService $randomService;
-    protected ?DOMDocument $instance = null;
+    protected ?XmlData $instance = null;
     protected string $ns;
 
     public function __construct(
@@ -35,7 +34,7 @@ public function __construct(
         $this->ns = sprintf("urn:iso:std:iso:20022:tech:xsd:%s", $split[0]);
     }
 
-    public function popInstance(): DOMDocument
+    public function popInstance(): XmlData
     {
         $instance = $this->instance;
         $this->instance = null;
diff --git a/tests/AbstractEbicsTestCase.php b/tests/AbstractEbicsTestCase.php
index a76a595..af8bcb4 100644
--- a/tests/AbstractEbicsTestCase.php
+++ b/tests/AbstractEbicsTestCase.php
@@ -7,7 +7,6 @@
 use EbicsApi\Ebics\Builders\Document\CustomerDirectDebitBuilder;
 use EbicsApi\Ebics\Builders\Document\CustomerUrgentCreditTransferBuilder;
 use EbicsApi\Ebics\Contracts\EbicsClientInterface;
-use EbicsApi\Ebics\Contracts\OrderDataInterface;
 use EbicsApi\Ebics\Contracts\X509GeneratorInterface;
 use EbicsApi\Ebics\EbicsClient;
 use EbicsApi\Ebics\Factories\Crypt\RSAFactory;
@@ -18,12 +17,12 @@
 use EbicsApi\Ebics\Models\Crypt\RSA;
 use EbicsApi\Ebics\Models\CustomerCreditTransfer;
 use EbicsApi\Ebics\Models\CustomerDirectDebit;
-use EbicsApi\Ebics\Models\DOMDocument;
 use EbicsApi\Ebics\Models\Keyring;
 use EbicsApi\Ebics\Models\StructuredPostalAddress;
 use EbicsApi\Ebics\Models\UnstructuredPostalAddress;
 use EbicsApi\Ebics\Models\User;
 use EbicsApi\Ebics\Models\X509\BankX509Generator;
+use EbicsApi\Ebics\Models\XmlData;
 use EbicsApi\Ebics\Services\DebuggerHttpClient;
 use EbicsApi\Ebics\Services\FakerHttpClient;
 use EbicsApi\Ebics\Services\FileKeyringManager;
@@ -246,10 +245,10 @@ public function credentialsDataProvider(int $credentialsId): array
      *
      * @param string $schema
      *
-     * @return OrderDataInterface
+     * @return XmlData
      * @throws DOMException
      */
-    protected function buildCustomerCreditTransferV2(string $schema): DOMDocument
+    protected function buildCustomerCreditTransferV2(string $schema): XmlData
     {
         $builder = new CustomerUrgentCreditTransferBuilder($schema);
         $customerCreditTransfer = $builder