diff --git a/Application/Controller/orderOverviewPdfGenerator.php b/Application/Controller/orderOverviewPdfGenerator.php
index 0d58e5a..61ead4a 100644
--- a/Application/Controller/orderOverviewPdfGenerator.php
+++ b/Application/Controller/orderOverviewPdfGenerator.php
@@ -15,13 +15,10 @@
 
 namespace D3\PdfDocuments\Application\Controller;
 
-use D3\PdfDocuments\Application\Model\Documents\deliverynotePdf;
-use D3\PdfDocuments\Application\Model\Documents\invoicePdf;
 use D3\PdfDocuments\Application\Model\Exceptions\noBaseObjectSetException;
 use D3\PdfDocuments\Application\Model\Exceptions\noPdfHandlerFoundException;
 use D3\PdfDocuments\Application\Model\Exceptions\pdfGeneratorExceptionAbstract;
-use D3\PdfDocuments\Application\Model\Interfaces\pdfdocuments_order_interface;
-use D3\PdfDocuments\Application\Model\Interfaces\pdfdocuments_order_interface as OrderPdfInterface;
+use D3\PdfDocuments\Application\Model\Interfaces\pdfdocumentsOrderInterface;
 use D3\PdfDocuments\Application\Model\Registries\registryOrderoverview;
 use OxidEsales\Eshop\Application\Model\Order;
 use OxidEsales\Eshop\Core\Registry;
@@ -48,7 +45,7 @@ class orderOverviewPdfGenerator
     /**
      * @param Order $order
      *
-     * @return OrderPdfInterface
+     * @return pdfdocumentsOrderInterface
      * @throws noPdfHandlerFoundException
      */
     public function getPdfClass(Order $order)
@@ -56,7 +53,7 @@ class orderOverviewPdfGenerator
         $requestedType = Registry::getRequest()->getRequestParameter('pdftype');
 
         $generatorList = oxNew(registryOrderoverview::class);
-        /** @var pdfdocuments_order_interface $generator */
+        /** @var pdfdocumentsOrderInterface $generator */
         foreach ($generatorList->getList() as $generator) {
             if ($generator->getRequestId() == $requestedType) {
                 return $generator;
diff --git a/Application/Model/AbstractClasses/pdfDocuments_generic.php b/Application/Model/AbstractClasses/pdfdocumentsGeneric.php
similarity index 92%
rename from Application/Model/AbstractClasses/pdfDocuments_generic.php
rename to Application/Model/AbstractClasses/pdfdocumentsGeneric.php
index b96e725..c091b69 100644
--- a/Application/Model/AbstractClasses/pdfDocuments_generic.php
+++ b/Application/Model/AbstractClasses/pdfdocumentsGeneric.php
@@ -18,18 +18,18 @@
 namespace D3\PdfDocuments\Application\Model\AbstractClasses;
 
 use D3\PdfDocuments\Application\Model\Exceptions\noBaseObjectSetException;
-use D3\PdfDocuments\Application\Model\Interfaces\pdfdocuments_generic_interface as genericInterface;
+use D3\PdfDocuments\Application\Model\Interfaces\pdfdocumentsGenericInterface as genericInterface;
 use OxidEsales\Eshop\Core\Registry;
 use Smarty;
 use Spipu\Html2Pdf\Html2Pdf;
 
-abstract class pdfDocuments_generic implements genericInterface
+abstract class pdfdocumentsGeneric implements genericInterface
 {
     /** @var Smarty  */
     public $oSmarty;
 
     /**
-     * pdfDocuments_generic constructor.
+     * pdfDocumentsGeneric constructor.
      */
     public function __construct()
     {
diff --git a/Application/Model/AbstractClasses/pdfDocuments_order.php b/Application/Model/AbstractClasses/pdfdocumentsOrder.php
similarity index 92%
rename from Application/Model/AbstractClasses/pdfDocuments_order.php
rename to Application/Model/AbstractClasses/pdfdocumentsOrder.php
index d76ac3d..1e0125f 100644
--- a/Application/Model/AbstractClasses/pdfDocuments_order.php
+++ b/Application/Model/AbstractClasses/pdfdocumentsOrder.php
@@ -18,12 +18,12 @@
 namespace D3\PdfDocuments\Application\Model\AbstractClasses;
 
 use D3\PdfDocuments\Application\Model\Exceptions\noBaseObjectSetException;
-use D3\PdfDocuments\Application\Model\Interfaces\pdfdocuments_order_interface as orderInterface;
+use D3\PdfDocuments\Application\Model\Interfaces\pdfdocumentsOrderInterface as orderInterface;
 use \OxidEsales\Eshop\Application\Model\Order;
 use OxidEsales\Eshop\Application\Model\Payment;
 use OxidEsales\Eshop\Application\Model\User;
 
-abstract class pdfDocuments_order extends pdfDocuments_generic implements orderInterface
+abstract class pdfdocumentsOrder extends pdfdocumentsGeneric implements orderInterface
 {
     /** @var Order */
     public $oOrder;
diff --git a/Application/Model/Documents/deliverynotePdf.php b/Application/Model/Documents/deliverynotePdf.php
index 557027f..63b832f 100644
--- a/Application/Model/Documents/deliverynotePdf.php
+++ b/Application/Model/Documents/deliverynotePdf.php
@@ -17,9 +17,9 @@
 
 namespace D3\PdfDocuments\Application\Model\Documents;
 
-use D3\PdfDocuments\Application\Model\AbstractClasses\pdfDocuments_order;
+use D3\PdfDocuments\Application\Model\AbstractClasses\pdfdocumentsOrder;
 
-class deliverynotePdf extends pdfDocuments_order
+class deliverynotePdf extends pdfdocumentsOrder
 {
     /**
      * @return string
diff --git a/Application/Model/Documents/invoicePdf.php b/Application/Model/Documents/invoicePdf.php
index 4b3c936..a78c059 100644
--- a/Application/Model/Documents/invoicePdf.php
+++ b/Application/Model/Documents/invoicePdf.php
@@ -17,11 +17,11 @@
 
 namespace D3\PdfDocuments\Application\Model\Documents;
 
-use D3\PdfDocuments\Application\Model\AbstractClasses\pdfDocuments_order;
+use D3\PdfDocuments\Application\Model\AbstractClasses\pdfdocumentsOrder;
 use D3\PdfDocuments\Application\Model\Exceptions\noBaseObjectSetException;
-use D3\PdfDocuments\Application\Model\Interfaces\pdfdocuments_orderinvoice_interface;
+use D3\PdfDocuments\Application\Model\Interfaces\pdfdocumentsOrderinvoiceInterface;
 
-class invoicePdf extends pdfDocuments_order implements pdfdocuments_orderinvoice_interface
+class invoicePdf extends pdfdocumentsOrder implements pdfdocumentsOrderinvoiceInterface
 {
     protected $blIsNewOrder = false;
 
diff --git a/Application/Model/Interfaces/pdfdocuments_generic_interface.php b/Application/Model/Interfaces/pdfdocumentsGenericInterface.php
similarity index 96%
rename from Application/Model/Interfaces/pdfdocuments_generic_interface.php
rename to Application/Model/Interfaces/pdfdocumentsGenericInterface.php
index b99c9d2..1009d0d 100644
--- a/Application/Model/Interfaces/pdfdocuments_generic_interface.php
+++ b/Application/Model/Interfaces/pdfdocumentsGenericInterface.php
@@ -19,7 +19,7 @@ namespace D3\PdfDocuments\Application\Model\Interfaces;
 
 use D3\PdfDocuments\Application\Model\Exceptions\noBaseObjectSetException;
 
-interface pdfdocuments_generic_interface
+interface pdfdocumentsGenericInterface
 {
     /**
      * @return string
diff --git a/Application/Model/Interfaces/pdfdocuments_order_interface.php b/Application/Model/Interfaces/pdfdocumentsOrderInterface.php
similarity index 90%
rename from Application/Model/Interfaces/pdfdocuments_order_interface.php
rename to Application/Model/Interfaces/pdfdocumentsOrderInterface.php
index 1a28938..dfa2fdd 100644
--- a/Application/Model/Interfaces/pdfdocuments_order_interface.php
+++ b/Application/Model/Interfaces/pdfdocumentsOrderInterface.php
@@ -19,7 +19,7 @@ namespace D3\PdfDocuments\Application\Model\Interfaces;
 
 use OxidEsales\Eshop\Application\Model\Order;
 
-interface pdfdocuments_order_interface extends pdfdocuments_generic_interface
+interface pdfdocumentsOrderInterface extends pdfdocumentsGenericInterface
 {
     /**
      * @param Order $order
diff --git a/Application/Model/Interfaces/pdfdocuments_orderinvoice_interface.php b/Application/Model/Interfaces/pdfdocumentsOrderinvoiceInterface.php
similarity index 88%
rename from Application/Model/Interfaces/pdfdocuments_orderinvoice_interface.php
rename to Application/Model/Interfaces/pdfdocumentsOrderinvoiceInterface.php
index 91f7ece..bcdcf8d 100644
--- a/Application/Model/Interfaces/pdfdocuments_orderinvoice_interface.php
+++ b/Application/Model/Interfaces/pdfdocumentsOrderinvoiceInterface.php
@@ -17,7 +17,7 @@
 
 namespace D3\PdfDocuments\Application\Model\Interfaces;
 
-interface pdfdocuments_orderinvoice_interface extends pdfdocuments_order_interface
+interface pdfdocumentsOrderinvoiceInterface extends pdfdocumentsOrderInterface
 {
     public function setInvoiceNumber();
   
diff --git a/Application/Model/Registries/registryAbstract.php b/Application/Model/Registries/registryAbstract.php
index 66cd6c4..433c642 100644
--- a/Application/Model/Registries/registryAbstract.php
+++ b/Application/Model/Registries/registryAbstract.php
@@ -17,7 +17,7 @@
 
 namespace D3\PdfDocuments\Application\Model\Registries;
 
-use D3\PdfDocuments\Application\Model\Interfaces\pdfdocuments_generic_interface;
+use D3\PdfDocuments\Application\Model\Interfaces\pdfdocumentsGenericInterface;
 
 abstract class registryAbstract implements registryGenericInterface
 {
@@ -25,9 +25,9 @@ abstract class registryAbstract implements registryGenericInterface
 
     /**
      * @param $className * generator fully qualified class name
-     * @param pdfdocuments_generic_interface $item
+     * @param pdfdocumentsGenericInterface $item
      */
-    protected function addItem($className, pdfdocuments_generic_interface $item)
+    protected function addItem($className, pdfdocumentsGenericInterface $item)
     {
         $this->_aRegistry[$className] = $item;
     }
diff --git a/Application/Model/Registries/registryOrderoverview.php b/Application/Model/Registries/registryOrderoverview.php
index c5234fc..625a17e 100644
--- a/Application/Model/Registries/registryOrderoverview.php
+++ b/Application/Model/Registries/registryOrderoverview.php
@@ -21,7 +21,7 @@ use D3\PdfDocuments\Application\Model\Documents\deliverynotePdf;
 use D3\PdfDocuments\Application\Model\Documents\deliverynotewithoutlogoPdf;
 use D3\PdfDocuments\Application\Model\Documents\invoicePdf;
 use D3\PdfDocuments\Application\Model\Documents\invoicewithoutlogoPdf;
-use D3\PdfDocuments\Application\Model\Interfaces\pdfdocuments_order_interface;
+use D3\PdfDocuments\Application\Model\Interfaces\pdfdocumentsOrderInterface;
 
 class registryOrderoverview extends registryAbstract implements registryOrderoverviewInterface
 {
@@ -35,16 +35,16 @@ class registryOrderoverview extends registryAbstract implements registryOrderove
 
     /**
      * @param $className
-     * @param pdfdocuments_order_interface $pdfGenerator
+     * @param pdfdocumentsOrderInterface $pdfGenerator
      */
-    public function addGenerator($className, pdfdocuments_order_interface $pdfGenerator)
+    public function addGenerator($className, pdfdocumentsOrderInterface $pdfGenerator)
     {
         $this->addItem($className, $pdfGenerator);
     }
 
     /**
      * @param $className * generator fully qualified class name
-     * @return pdfdocuments_order_interface
+     * @return pdfdocumentsOrderInterface
      */
     public function getGenerator($className)
     {
diff --git a/Application/Model/Registries/registryOrderoverviewInterface.php b/Application/Model/Registries/registryOrderoverviewInterface.php
index fd8e501..0b7db65 100644
--- a/Application/Model/Registries/registryOrderoverviewInterface.php
+++ b/Application/Model/Registries/registryOrderoverviewInterface.php
@@ -17,13 +17,13 @@
 
 namespace D3\PdfDocuments\Application\Model\Registries;
 
-use D3\PdfDocuments\Application\Model\Interfaces\pdfdocuments_order_interface;
+use D3\PdfDocuments\Application\Model\Interfaces\pdfdocumentsOrderInterface;
 
 interface registryOrderoverviewInterface extends registryGenericInterface
 {
     /**
      * @param $className * generator fully qualified class name
-     * @param pdfdocuments_order_interface $pdfGenerator
+     * @param pdfdocumentsOrderInterface $pdfGenerator
      */
-    public function addGenerator($className, pdfdocuments_order_interface $pdfGenerator);
+    public function addGenerator($className, pdfdocumentsOrderInterface $pdfGenerator);
 }
\ No newline at end of file