diff --git a/src/test/java/com/klst/xrechnung/test/CreateCiiXXXInvoice.java b/src/test/java/com/klst/xrechnung/test/CreateCiiXXXInvoice.java
index b31227d6..6353b10c 100644
--- a/src/test/java/com/klst/xrechnung/test/CreateCiiXXXInvoice.java
+++ b/src/test/java/com/klst/xrechnung/test/CreateCiiXXXInvoice.java
@@ -9,7 +9,7 @@
 
 import com.klst.einvoice.AllowancesAndCharges;
 import com.klst.einvoice.BG13_DeliveryInformation;
-import com.klst.einvoice.BG19_DirectDebit;
+import com.klst.einvoice.DirectDebit;
 import com.klst.einvoice.BG24_AdditionalSupportingDocs;
 import com.klst.einvoice.BG4_Seller;
 import com.klst.einvoice.BG7_Buyer;
@@ -234,7 +234,7 @@ CoreInvoice makeInvoice() {
 				break;
 			case DirectDebit:
 			case SEPADirectDebit:
-				BG19_DirectDebit dd = pi.getDirectDebit();
+				DirectDebit dd = pi.getDirectDebit();
 				LOG.info("DirectDebit Creditor:"+dd.getBankAssignedCreditorID()
 					+" Account="+dd.getDebitedAccountID()+" MandateReference:"+dd.getMandateReferencedID());
 //				dd.getBankAssignedCreditorID();
diff --git a/src/test/java/com/klst/xrechnung/test/CreateUblXXXInvoice.java b/src/test/java/com/klst/xrechnung/test/CreateUblXXXInvoice.java
index 59252032..4deefed3 100644
--- a/src/test/java/com/klst/xrechnung/test/CreateUblXXXInvoice.java
+++ b/src/test/java/com/klst/xrechnung/test/CreateUblXXXInvoice.java
@@ -9,7 +9,7 @@
 import java.util.logging.Logger;
 
 import com.klst.einvoice.AllowancesAndCharges;
-import com.klst.einvoice.BG19_DirectDebit;
+import com.klst.einvoice.DirectDebit;
 import com.klst.einvoice.VatBreakdown;
 import com.klst.einvoice.BG24_AdditionalSupportingDocs;
 import com.klst.einvoice.BG7_Buyer;
@@ -326,7 +326,7 @@ void makePaymentGroup(CoreInvoice ublInvoice, CoreInvoice testDoc) {
 				break;
 			case DirectDebit:
 			case SEPADirectDebit:
-				BG19_DirectDebit dd = pi.getDirectDebit();
+				DirectDebit dd = pi.getDirectDebit();
 				LOG.info("DirectDebit Creditor:"+dd.getBankAssignedCreditorID()
 					+" Account="+dd.getDebitedAccountID()+" MandateReference:"+dd.getMandateReferencedID());
 				paymentInstructions = ublInvoice.createPaymentInstructions(paymentMeansCode, pi.getPaymentMeansText()