diff --git a/application/Espo/Tools/Export/Export.php b/application/Espo/Tools/Export/Export.php
index 00ca4e2904..6881b4be8e 100644
--- a/application/Espo/Tools/Export/Export.php
+++ b/application/Espo/Tools/Export/Export.php
@@ -29,6 +29,9 @@
 
 namespace Espo\Tools\Export;
 
+use Espo\Tools\Export\Processor\Data as ProcessorData;
+use Espo\Tools\Export\Processor\Params as ProcessorParams;
+
 use Espo\Core\{
     Exceptions\Error,
     Utils\Json,
diff --git a/application/Espo/Tools/Export/Processor.php b/application/Espo/Tools/Export/Processor.php
index 8add389a3f..432b0acdb5 100644
--- a/application/Espo/Tools/Export/Processor.php
+++ b/application/Espo/Tools/Export/Processor.php
@@ -31,7 +31,10 @@ namespace Espo\Tools\Export;
 
 use Psr\Http\Message\StreamInterface;
 
+use Espo\Tools\Export\Processor\Params;
+use Espo\Tools\Export\Processor\Data;
+
 interface Processor
 {
-    public function process(ProcessorParams $params, ProcessorData $data): StreamInterface;
+    public function process(Params $params, Data $data): StreamInterface;
 }
diff --git a/application/Espo/Tools/Export/ProcessorData.php b/application/Espo/Tools/Export/Processor/Data.php
similarity index 97%
rename from application/Espo/Tools/Export/ProcessorData.php
rename to application/Espo/Tools/Export/Processor/Data.php
index a86144c11a..1ed7f88528 100644
--- a/application/Espo/Tools/Export/ProcessorData.php
+++ b/application/Espo/Tools/Export/Processor/Data.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Tools\Export;
+namespace Espo\Tools\Export\Processor;
 
-class ProcessorData
+class Data
 {
     private $resource;
 
diff --git a/application/Espo/Tools/Export/ProcessorParams.php b/application/Espo/Tools/Export/Processor/Params.php
similarity index 97%
rename from application/Espo/Tools/Export/ProcessorParams.php
rename to application/Espo/Tools/Export/Processor/Params.php
index 6eaa9e2cd1..644f61f7d2 100644
--- a/application/Espo/Tools/Export/ProcessorParams.php
+++ b/application/Espo/Tools/Export/Processor/Params.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Tools\Export;
+namespace Espo\Tools\Export\Processor;
 
-class ProcessorParams
+class Params
 {
     private $fileName;
 
diff --git a/application/Espo/Tools/Export/Processors/Csv.php b/application/Espo/Tools/Export/Processors/Csv.php
index 2aa116e7bd..640f6da33d 100644
--- a/application/Espo/Tools/Export/Processors/Csv.php
+++ b/application/Espo/Tools/Export/Processors/Csv.php
@@ -40,8 +40,8 @@ use Espo\Core\{
 use Espo\Entities\Preferences;
 
 use Espo\Tools\Export\{
-    ProcessorParams,
-    ProcessorData,
+    Processor\Params,
+    Processor\Data,
     Processor,
 };
 
@@ -64,7 +64,7 @@ class Csv implements Processor
         $this->metadata = $metadata;
     }
 
-    public function process(ProcessorParams $params, ProcessorData $data): StreamInterface
+    public function process(Params $params, Data $data): StreamInterface
     {
         $attributeList = $params->getAttributeList();
 
@@ -121,4 +121,4 @@ class Csv implements Processor
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/application/Espo/Tools/Export/Processors/Xlsx.php b/application/Espo/Tools/Export/Processors/Xlsx.php
index 2d9dd1a3d7..07a42cecd0 100644
--- a/application/Espo/Tools/Export/Processors/Xlsx.php
+++ b/application/Espo/Tools/Export/Processors/Xlsx.php
@@ -43,8 +43,8 @@ use Espo\Core\{
 };
 
 use Espo\Tools\Export\{
-    ProcessorParams,
-    ProcessorData,
+    Processor\Params,
+    Processor\Data,
     Processor,
 };
 
@@ -102,7 +102,7 @@ class Xlsx implements Processor
         $this->addressFormatterFactory = $addressFormatterFactory;
     }
 
-    public function process(ProcessorParams $params, ProcessorData $data): StreamInterface
+    public function process(Params $params, Data $data): StreamInterface
     {
         $entityType = $params->getEntityType();
 
@@ -819,7 +819,7 @@ class Xlsx implements Processor
         }
     }
 
-    private function getSheetNameFromParams(ProcessorParams $params): string
+    private function getSheetNameFromParams(Params $params): string
     {
         $exportName =
             $params->getName() ??