diff --git a/application/Espo/Classes/FieldProcessing/Email/AddressDataLoader.php b/application/Espo/Classes/FieldProcessing/Email/AddressDataLoader.php
index 67dbb50eec..ebf8781b1c 100644
--- a/application/Espo/Classes/FieldProcessing/Email/AddressDataLoader.php
+++ b/application/Espo/Classes/FieldProcessing/Email/AddressDataLoader.php
@@ -33,7 +33,7 @@ use Espo\ORM\Entity;
 
 use Espo\Core\{
     FieldProcessing\Loader,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params,
     ORM\EntityManager,
 };
 
@@ -48,7 +48,7 @@ class AddressDataLoader implements Loader
         $this->entityManager = $entityManager;
     }
 
-    public function process(Entity $entity, LoaderParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         /* @var $repository EmailRepository */
         $repository = $this->entityManager->getRepository('Email');
diff --git a/application/Espo/Classes/FieldProcessing/Email/IcsDataLoader.php b/application/Espo/Classes/FieldProcessing/Email/IcsDataLoader.php
index 7ab55a5c86..9be4a19b29 100644
--- a/application/Espo/Classes/FieldProcessing/Email/IcsDataLoader.php
+++ b/application/Espo/Classes/FieldProcessing/Email/IcsDataLoader.php
@@ -37,7 +37,7 @@ use Espo\Entities\Email;
 
 use Espo\Core\{
     FieldProcessing\Loader,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params,
     Mail\Event\Event as EspoEvent,
     Mail\Event\EventFactory,
     Utils\Log,
@@ -66,7 +66,7 @@ class IcsDataLoader implements Loader
         $this->log = $log;
     }
 
-    public function process(Entity $entity, LoaderParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         $icsContents = $entity->get('icsContents');
 
diff --git a/application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php b/application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php
index 899e2018f6..6d4382b730 100644
--- a/application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php
+++ b/application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php
@@ -33,7 +33,7 @@ use Espo\ORM\Entity;
 
 use Espo\Core\{
     FieldProcessing\Loader,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params,
     ORM\EntityManager,
 };
 
@@ -54,7 +54,7 @@ class StringDataLoader implements Loader
         $this->user = $user;
     }
 
-    public function process(Entity $entity, LoaderParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         $userEmailAdddressIdList = [];
 
diff --git a/application/Espo/Classes/FieldProcessing/Email/UserColumnsLoader.php b/application/Espo/Classes/FieldProcessing/Email/UserColumnsLoader.php
index a557341cdd..c279172e1f 100644
--- a/application/Espo/Classes/FieldProcessing/Email/UserColumnsLoader.php
+++ b/application/Espo/Classes/FieldProcessing/Email/UserColumnsLoader.php
@@ -33,7 +33,7 @@ use Espo\ORM\Entity;
 
 use Espo\Core\{
     FieldProcessing\Loader,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params,
     ORM\EntityManager,
 };
 
@@ -51,7 +51,7 @@ class UserColumnsLoader implements Loader
         $this->user = $user;
     }
 
-    public function process(Entity $entity, LoaderParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         $emailUser = $this->entityManager
             ->getRepository('EmailUser')
diff --git a/application/Espo/Classes/FieldProcessing/Import/CountsLoader.php b/application/Espo/Classes/FieldProcessing/Import/CountsLoader.php
index 20b9d40de3..fe2497e720 100644
--- a/application/Espo/Classes/FieldProcessing/Import/CountsLoader.php
+++ b/application/Espo/Classes/FieldProcessing/Import/CountsLoader.php
@@ -33,7 +33,7 @@ use Espo\ORM\Entity;
 
 use Espo\Core\{
     FieldProcessing\Loader,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params,
     ORM\EntityManager,
 };
 
@@ -48,7 +48,7 @@ class CountsLoader implements Loader
         $this->entityManager = $entityManager;
     }
 
-    public function process(Entity $entity, LoaderParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         /* @var $repository ImportRepository */
         $repository = $this->entityManager->getRepository('Import');
diff --git a/application/Espo/Classes/FieldProcessing/Note/AttachmentsLoader.php b/application/Espo/Classes/FieldProcessing/Note/AttachmentsLoader.php
index d4aa98cd14..272078d571 100644
--- a/application/Espo/Classes/FieldProcessing/Note/AttachmentsLoader.php
+++ b/application/Espo/Classes/FieldProcessing/Note/AttachmentsLoader.php
@@ -33,14 +33,14 @@ use Espo\ORM\Entity;
 
 use Espo\Core\{
     FieldProcessing\Loader,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params,
 };
 
 use Espo\Entities\Note;
 
 class AttachmentsLoader implements Loader
 {
-    public function process(Entity $entity, LoaderParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         /* @var $entity Note */
         $entity->loadAttachments();
diff --git a/application/Espo/Classes/FieldProcessing/Portal/UrlLoader.php b/application/Espo/Classes/FieldProcessing/Portal/UrlLoader.php
index decb08e75b..6480fb6852 100644
--- a/application/Espo/Classes/FieldProcessing/Portal/UrlLoader.php
+++ b/application/Espo/Classes/FieldProcessing/Portal/UrlLoader.php
@@ -33,7 +33,7 @@ use Espo\ORM\Entity;
 
 use Espo\Core\{
     FieldProcessing\Loader,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params,
     ORM\EntityManager,
 };
 
@@ -46,7 +46,7 @@ class UrlLoader implements Loader
         $this->entityManager = $entityManager;
     }
 
-    public function process(Entity $entity, LoaderParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         $this->entityManager
             ->getRepository('Portal')
diff --git a/application/Espo/Classes/FieldProcessing/User/LastAccessLoader.php b/application/Espo/Classes/FieldProcessing/User/LastAccessLoader.php
index 4ff90d177b..1ab699b77c 100644
--- a/application/Espo/Classes/FieldProcessing/User/LastAccessLoader.php
+++ b/application/Espo/Classes/FieldProcessing/User/LastAccessLoader.php
@@ -33,7 +33,7 @@ use Espo\ORM\Entity;
 
 use Espo\Core\{
     FieldProcessing\Loader,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params,
     ORM\EntityManager,
     Acl,
     Acl\Table,
@@ -54,7 +54,7 @@ class LastAccessLoader implements Loader
         $this->acl = $acl;
     }
 
-    public function process(Entity $entity, LoaderParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         $forbiddenFieldList = $this->acl
             ->getScopeForbiddenFieldList($entity->getEntityType(), Table::ACTION_READ);
diff --git a/application/Espo/Core/FieldProcessing/EmailAddress/Loader.php b/application/Espo/Core/FieldProcessing/EmailAddress/Loader.php
index 91407c851f..3dc5ff030a 100644
--- a/application/Espo/Core/FieldProcessing/EmailAddress/Loader.php
+++ b/application/Espo/Core/FieldProcessing/EmailAddress/Loader.php
@@ -34,7 +34,7 @@ use Espo\ORM\Entity;
 use Espo\Core\{
     ORM\EntityManager,
     FieldProcessing\Loader as LoaderInterface,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params,
 };
 
 use Espo\ORM\Defs as OrmDefs;
@@ -51,7 +51,7 @@ class Loader implements LoaderInterface
         $this->entityManager = $entityManager;
     }
 
-    public function process(Entity $entity, LoaderParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         $entityDefs = $this->ormDefs->getEntity($entity->getEntityType());
 
diff --git a/application/Espo/Core/FieldProcessing/EmailAddress/Saver.php b/application/Espo/Core/FieldProcessing/EmailAddress/Saver.php
index f64c2cb822..747484c1df 100644
--- a/application/Espo/Core/FieldProcessing/EmailAddress/Saver.php
+++ b/application/Espo/Core/FieldProcessing/EmailAddress/Saver.php
@@ -37,7 +37,7 @@ use Espo\Core\{
     ORM\EntityManager,
     ApplicationState,
     FieldProcessing\Saver as SaverInterface,
-    FieldProcessing\SaverParams,
+    FieldProcessing\Saver\Params,
 };
 
 class Saver implements SaverInterface
@@ -58,7 +58,7 @@ class Saver implements SaverInterface
         $this->accessChecker = $accessChecker;
     }
 
-    public function process(Entity $entity, SaverParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         $entityType = $entity->getEntityType();
 
diff --git a/application/Espo/Core/FieldProcessing/File/Saver.php b/application/Espo/Core/FieldProcessing/File/Saver.php
index 494f94ab21..77d8a557e7 100644
--- a/application/Espo/Core/FieldProcessing/File/Saver.php
+++ b/application/Espo/Core/FieldProcessing/File/Saver.php
@@ -34,7 +34,7 @@ use Espo\ORM\Entity;
 use Espo\Core\{
     ORM\EntityManager,
     FieldProcessing\Saver as SaverInterface,
-    FieldProcessing\SaverParams,
+    FieldProcessing\Saver\Params,
 };
 
 class Saver implements SaverInterface
@@ -48,7 +48,7 @@ class Saver implements SaverInterface
         $this->entityManager = $entityManager;
     }
 
-    public function process(Entity $entity, SaverParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         foreach ($this->getFieldList($entity->getEntityType()) as $name) {
             $this->processItem($entity, $name);
diff --git a/application/Espo/Core/FieldProcessing/Link/HasOneLoader.php b/application/Espo/Core/FieldProcessing/Link/HasOneLoader.php
index 2847a2731a..3b51a7edd4 100644
--- a/application/Espo/Core/FieldProcessing/Link/HasOneLoader.php
+++ b/application/Espo/Core/FieldProcessing/Link/HasOneLoader.php
@@ -33,7 +33,7 @@ use Espo\ORM\Entity;
 
 use Espo\Core\{
     FieldProcessing\Loader as LoaderInterface,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params,
 };
 
 use Espo\ORM\Defs as OrmDefs;
@@ -49,7 +49,7 @@ class HasOneLoader implements LoaderInterface
         $this->ormDefs = $ormDefs;
     }
 
-    public function process(Entity $entity, LoaderParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         foreach ($this->getFieldList($entity->getEntityType()) as $field) {
             if ($entity->get($field . 'Name')) {
diff --git a/application/Espo/Core/FieldProcessing/Link/NotJoinedLoader.php b/application/Espo/Core/FieldProcessing/Link/NotJoinedLoader.php
index 7321a00bef..d38f3dbffb 100644
--- a/application/Espo/Core/FieldProcessing/Link/NotJoinedLoader.php
+++ b/application/Espo/Core/FieldProcessing/Link/NotJoinedLoader.php
@@ -34,7 +34,7 @@ use Espo\ORM\Entity;
 use Espo\Core\{
     ORM\EntityManager,
     FieldProcessing\Loader as LoaderInterface,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params,
 };
 
 use Espo\ORM\Defs as OrmDefs;
@@ -53,7 +53,7 @@ class NotJoinedLoader implements LoaderInterface
         $this->entityManager = $entityManager;
     }
 
-    public function process(Entity $entity, LoaderParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         foreach ($this->getFieldList($entity->getEntityType()) as $field) {
             $this->processItem($entity, $field);
diff --git a/application/Espo/Core/FieldProcessing/LinkMultiple/ListLoader.php b/application/Espo/Core/FieldProcessing/LinkMultiple/ListLoader.php
index ff8e7d8338..ee9be1877e 100644
--- a/application/Espo/Core/FieldProcessing/LinkMultiple/ListLoader.php
+++ b/application/Espo/Core/FieldProcessing/LinkMultiple/ListLoader.php
@@ -33,7 +33,7 @@ use Espo\ORM\Entity;
 
 use Espo\Core\{
     FieldProcessing\Loader as LoaderInterface,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params,
 };
 
 use Espo\ORM\Defs as OrmDefs;
@@ -49,7 +49,7 @@ class ListLoader implements LoaderInterface
         $this->ormDefs = $ormDefs;
     }
 
-    public function process(Entity $entity, LoaderParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         $entityType = $entity->getEntityType();
 
diff --git a/application/Espo/Core/FieldProcessing/LinkMultiple/Loader.php b/application/Espo/Core/FieldProcessing/LinkMultiple/Loader.php
index d7d27f94e5..767f9cf5dc 100644
--- a/application/Espo/Core/FieldProcessing/LinkMultiple/Loader.php
+++ b/application/Espo/Core/FieldProcessing/LinkMultiple/Loader.php
@@ -33,7 +33,7 @@ use Espo\ORM\Entity;
 
 use Espo\Core\{
     FieldProcessing\Loader as LoaderInterface,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params,
 };
 
 use Espo\ORM\Defs as OrmDefs;
@@ -49,7 +49,7 @@ class Loader implements LoaderInterface
         $this->ormDefs = $ormDefs;
     }
 
-    public function process(Entity $entity, LoaderParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         $entityType = $entity->getEntityType();
 
diff --git a/application/Espo/Core/FieldProcessing/LinkParent/Loader.php b/application/Espo/Core/FieldProcessing/LinkParent/Loader.php
index 70bf06e8d6..ba4410df02 100644
--- a/application/Espo/Core/FieldProcessing/LinkParent/Loader.php
+++ b/application/Espo/Core/FieldProcessing/LinkParent/Loader.php
@@ -33,7 +33,7 @@ use Espo\ORM\Entity;
 
 use Espo\Core\{
     FieldProcessing\Loader as LoaderInterface,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params,
 };
 
 use Espo\ORM\Defs as OrmDefs;
@@ -49,7 +49,7 @@ class Loader implements LoaderInterface
         $this->ormDefs = $ormDefs;
     }
 
-    public function process(Entity $entity, LoaderParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         foreach ($this->getFieldList($entity->getEntityType()) as $field) {
             $entity->loadParentNameField($field);
diff --git a/application/Espo/Core/FieldProcessing/LinkParent/TargetLoader.php b/application/Espo/Core/FieldProcessing/LinkParent/TargetLoader.php
index a4b01a600d..a6d8eeaa93 100644
--- a/application/Espo/Core/FieldProcessing/LinkParent/TargetLoader.php
+++ b/application/Espo/Core/FieldProcessing/LinkParent/TargetLoader.php
@@ -34,7 +34,7 @@ use Espo\ORM\Entity;
 use Espo\Core\{
     ORM\EntityManager,
     FieldProcessing\Loader as LoaderInterface,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params,
 };
 
 class TargetLoader implements LoaderInterface
@@ -46,7 +46,7 @@ class TargetLoader implements LoaderInterface
         $this->entityManager = $entityManager;
     }
 
-    public function process(Entity $entity, LoaderParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         $targetType = $entity->get('targetType');
         $targetId = $entity->get('targetId');
diff --git a/application/Espo/Core/FieldProcessing/ListLoadProcessor.php b/application/Espo/Core/FieldProcessing/ListLoadProcessor.php
index c6bbec34e7..66b48da4ea 100644
--- a/application/Espo/Core/FieldProcessing/ListLoadProcessor.php
+++ b/application/Espo/Core/FieldProcessing/ListLoadProcessor.php
@@ -31,6 +31,8 @@ namespace Espo\Core\FieldProcessing;
 
 use Espo\Core\ORM\Entity;
 
+use Espo\Core\FieldProcessing\Loader\Params;
+
 use Espo\Core\{
     InjectableFactory,
     Utils\Metadata,
@@ -53,10 +55,10 @@ class ListLoadProcessor
         $this->metadata = $metadata;
     }
 
-    public function process(Entity $entity, ?LoaderParams $params = null): void
+    public function process(Entity $entity, ?Params $params = null): void
     {
         if (!$params) {
-            $params = new LoaderParams();
+            $params = new Params();
         }
 
         foreach ($this->getLoaderList($entity->getEntityType()) as $processor) {
diff --git a/application/Espo/Core/FieldProcessing/Loader.php b/application/Espo/Core/FieldProcessing/Loader.php
index e58a3fd688..6d4a8d36b7 100644
--- a/application/Espo/Core/FieldProcessing/Loader.php
+++ b/application/Espo/Core/FieldProcessing/Loader.php
@@ -31,10 +31,12 @@ namespace Espo\Core\FieldProcessing;
 
 use Espo\ORM\Entity;
 
+use Espo\Core\FieldProcessing\Loader\Params;
+
 /**
  * Processes loading special fields before output.
  */
 interface Loader
 {
-    public function process(Entity $entity, LoaderParams $params): void;
+    public function process(Entity $entity, Params $params): void;
 }
diff --git a/application/Espo/Core/FieldProcessing/LoaderParams.php b/application/Espo/Core/FieldProcessing/Loader/Params.php
similarity index 97%
rename from application/Espo/Core/FieldProcessing/LoaderParams.php
rename to application/Espo/Core/FieldProcessing/Loader/Params.php
index 759d88e087..1e33ca9443 100644
--- a/application/Espo/Core/FieldProcessing/LoaderParams.php
+++ b/application/Espo/Core/FieldProcessing/Loader/Params.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldProcessing;
+namespace Espo\Core\FieldProcessing\Loader;
 
-class LoaderParams
+class Params
 {
     private $select = null;
 
diff --git a/application/Espo/Core/FieldProcessing/MultiEnum/Saver.php b/application/Espo/Core/FieldProcessing/MultiEnum/Saver.php
index 4bea317452..b9833a7cf2 100644
--- a/application/Espo/Core/FieldProcessing/MultiEnum/Saver.php
+++ b/application/Espo/Core/FieldProcessing/MultiEnum/Saver.php
@@ -34,7 +34,7 @@ use Espo\ORM\Entity;
 use Espo\Core\{
     ORM\EntityManager,
     FieldProcessing\Saver as SaverInterface,
-    FieldProcessing\SaverParams,
+    FieldProcessing\Saver\Params,
 };
 
 class Saver implements SaverInterface
@@ -48,7 +48,7 @@ class Saver implements SaverInterface
         $this->entityManager = $entityManager;
     }
 
-    public function process(Entity $entity, SaverParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         foreach ($this->getFieldList($entity->getEntityType()) as $name) {
             $this->processItem($entity, $name);
diff --git a/application/Espo/Core/FieldProcessing/PhoneNumber/Loader.php b/application/Espo/Core/FieldProcessing/PhoneNumber/Loader.php
index 56d048217b..92da543ab3 100644
--- a/application/Espo/Core/FieldProcessing/PhoneNumber/Loader.php
+++ b/application/Espo/Core/FieldProcessing/PhoneNumber/Loader.php
@@ -34,7 +34,7 @@ use Espo\ORM\Entity;
 use Espo\Core\{
     ORM\EntityManager,
     FieldProcessing\Loader as LoaderInterface,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params,
 };
 
 use Espo\ORM\Defs as OrmDefs;
@@ -51,7 +51,7 @@ class Loader implements LoaderInterface
         $this->entityManager = $entityManager;
     }
 
-    public function process(Entity $entity, LoaderParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         $entityDefs = $this->ormDefs->getEntity($entity->getEntityType());
 
diff --git a/application/Espo/Core/FieldProcessing/PhoneNumber/Saver.php b/application/Espo/Core/FieldProcessing/PhoneNumber/Saver.php
index 192856e2b5..bdff2fcca7 100644
--- a/application/Espo/Core/FieldProcessing/PhoneNumber/Saver.php
+++ b/application/Espo/Core/FieldProcessing/PhoneNumber/Saver.php
@@ -38,7 +38,7 @@ use Espo\Core\{
     ApplicationState,
     Utils\Metadata,
     FieldProcessing\Saver as SaverInterface,
-    FieldProcessing\SaverParams,
+    FieldProcessing\Saver\Params,
 };
 
 class Saver implements SaverInterface
@@ -63,7 +63,7 @@ class Saver implements SaverInterface
         $this->metadata = $metadata;
     }
 
-    public function process(Entity $entity, SaverParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         $entityType = $entity->getEntityType();
 
diff --git a/application/Espo/Core/FieldProcessing/ReadLoadProcessor.php b/application/Espo/Core/FieldProcessing/ReadLoadProcessor.php
index f7ffa654cf..4e197bbdba 100644
--- a/application/Espo/Core/FieldProcessing/ReadLoadProcessor.php
+++ b/application/Espo/Core/FieldProcessing/ReadLoadProcessor.php
@@ -31,6 +31,8 @@ namespace Espo\Core\FieldProcessing;
 
 use Espo\Core\ORM\Entity;
 
+use Espo\Core\FieldProcessing\Loader\Params;
+
 use Espo\Core\{
     InjectableFactory,
     Utils\Metadata,
@@ -53,10 +55,10 @@ class ReadLoadProcessor
         $this->metadata = $metadata;
     }
 
-    public function process(Entity $entity, ?LoaderParams $params = null): void
+    public function process(Entity $entity, ?Params $params = null): void
     {
         if (!$params) {
-            $params = new LoaderParams();
+            $params = new Params();
         }
 
         foreach ($this->getLoaderList($entity->getEntityType()) as $processor) {
diff --git a/application/Espo/Core/FieldProcessing/Relation/LinkMultipleSaver.php b/application/Espo/Core/FieldProcessing/Relation/LinkMultipleSaver.php
index fbb7312af8..33c1f4e9fe 100644
--- a/application/Espo/Core/FieldProcessing/Relation/LinkMultipleSaver.php
+++ b/application/Espo/Core/FieldProcessing/Relation/LinkMultipleSaver.php
@@ -33,7 +33,7 @@ use Espo\ORM\Entity;
 
 use Espo\Core\{
     ORM\EntityManager,
-    FieldProcessing\SaverParams,
+    FieldProcessing\Saver\Params,
 };
 
 class LinkMultipleSaver
@@ -45,7 +45,7 @@ class LinkMultipleSaver
         $this->entityManager = $entityManager;
     }
 
-    public function process(Entity $entity, string $name, SaverParams $params): void
+    public function process(Entity $entity, string $name, Params $params): void
     {
         $entityType = $entity->getEntityType();
 
diff --git a/application/Espo/Core/FieldProcessing/Relation/Saver.php b/application/Espo/Core/FieldProcessing/Relation/Saver.php
index 9cb1329ad7..e7ddbfeeb7 100644
--- a/application/Espo/Core/FieldProcessing/Relation/Saver.php
+++ b/application/Espo/Core/FieldProcessing/Relation/Saver.php
@@ -34,7 +34,7 @@ use Espo\ORM\Entity;
 use Espo\Core\{
     ORM\EntityManager,
     FieldProcessing\Saver as SaverInterface,
-    FieldProcessing\SaverParams,
+    FieldProcessing\Saver\Params,
 };
 
 class Saver implements SaverInterface
@@ -57,14 +57,14 @@ class Saver implements SaverInterface
         $this->linkMultipleSaver = $linkMultipleSaver;
     }
 
-    public function process(Entity $entity, SaverParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         $this->processMany($entity, $params);
         $this->processHasOne($entity);
         $this->processBelongsToHasOne($entity);
     }
 
-    private function processMany(Entity $entity, SaverParams $params): void
+    private function processMany(Entity $entity, Params $params): void
     {
         $entityType = $entity->getEntityType();
 
@@ -73,7 +73,7 @@ class Saver implements SaverInterface
         }
     }
 
-    private function processManyItem(Entity $entity, string $name, SaverParams $params): void
+    private function processManyItem(Entity $entity, string $name, Params $params): void
     {
         $idListAttribute = $name . 'Ids';
         $columnsAttribute = $name . 'Columns';
diff --git a/application/Espo/Core/FieldProcessing/Reminder/Loader.php b/application/Espo/Core/FieldProcessing/Reminder/Loader.php
index 75aa2e2403..957574a96f 100644
--- a/application/Espo/Core/FieldProcessing/Reminder/Loader.php
+++ b/application/Espo/Core/FieldProcessing/Reminder/Loader.php
@@ -34,7 +34,7 @@ use Espo\ORM\Entity;
 use Espo\Core\{
     ORM\EntityManager,
     FieldProcessing\Loader as LoaderInterface,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params,
 };
 
 /**
@@ -49,7 +49,7 @@ class Loader implements LoaderInterface
         $this->entityManager = $entityManager;
     }
 
-    public function process(Entity $entity, LoaderParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         $hasReminder = $this->entityManager
             ->getDefs()
diff --git a/application/Espo/Core/FieldProcessing/Reminder/Saver.php b/application/Espo/Core/FieldProcessing/Reminder/Saver.php
index 00391cbd1c..83e3334488 100644
--- a/application/Espo/Core/FieldProcessing/Reminder/Saver.php
+++ b/application/Espo/Core/FieldProcessing/Reminder/Saver.php
@@ -34,7 +34,7 @@ use Espo\ORM\Entity;
 use Espo\Core\{
     ORM\EntityManager,
     FieldProcessing\Saver as SaverInterface,
-    FieldProcessing\SaverParams,
+    FieldProcessing\Saver\Params,
     Utils\Util,
 };
 
@@ -56,7 +56,7 @@ class Saver implements SaverInterface
         $this->entityManager = $entityManager;
     }
 
-    public function process(Entity $entity, SaverParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         $entityType = $entity->getEntityType();
 
diff --git a/application/Espo/Core/FieldProcessing/SaveProcessor.php b/application/Espo/Core/FieldProcessing/SaveProcessor.php
index 7df98d4129..d06c7e9f30 100644
--- a/application/Espo/Core/FieldProcessing/SaveProcessor.php
+++ b/application/Espo/Core/FieldProcessing/SaveProcessor.php
@@ -31,6 +31,8 @@ namespace Espo\Core\FieldProcessing;
 
 use Espo\Core\ORM\Entity;
 
+use Espo\Core\FieldProcessing\Saver\Params;
+
 use Espo\Core\{
     InjectableFactory,
     Utils\Metadata,
@@ -55,7 +57,7 @@ class SaveProcessor
 
     public function process(Entity $entity, array $options): void
     {
-        $params = SaverParams::create()->withRawOptions($options);
+        $params = Params::create()->withRawOptions($options);
 
         foreach ($this->getSaverList($entity->getEntityType()) as $processor) {
             $processor->process($entity, $params);
diff --git a/application/Espo/Core/FieldProcessing/Saver.php b/application/Espo/Core/FieldProcessing/Saver.php
index 2304fbea85..b9b80c4f01 100644
--- a/application/Espo/Core/FieldProcessing/Saver.php
+++ b/application/Espo/Core/FieldProcessing/Saver.php
@@ -30,11 +30,12 @@
 namespace Espo\Core\FieldProcessing;
 
 use Espo\ORM\Entity;
+use Espo\Core\FieldProcessing\Saver\Params;
 
 /**
  * Processes saving special fields.
  */
 interface Saver
 {
-    public function process(Entity $entity, SaverParams $params): void;
+    public function process(Entity $entity, Params $params): void;
 }
diff --git a/application/Espo/Core/FieldProcessing/SaverParams.php b/application/Espo/Core/FieldProcessing/Saver/Params.php
similarity index 97%
rename from application/Espo/Core/FieldProcessing/SaverParams.php
rename to application/Espo/Core/FieldProcessing/Saver/Params.php
index 61b69f1eb6..d49167e3eb 100644
--- a/application/Espo/Core/FieldProcessing/SaverParams.php
+++ b/application/Espo/Core/FieldProcessing/Saver/Params.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldProcessing;
+namespace Espo\Core\FieldProcessing\Saver;
 
-class SaverParams
+class Params
 {
     private $options = [];
 
diff --git a/application/Espo/Core/FieldProcessing/Stream/FollowersLoader.php b/application/Espo/Core/FieldProcessing/Stream/FollowersLoader.php
index 2944b37371..7455ef2593 100644
--- a/application/Espo/Core/FieldProcessing/Stream/FollowersLoader.php
+++ b/application/Espo/Core/FieldProcessing/Stream/FollowersLoader.php
@@ -33,7 +33,7 @@ use Espo\ORM\Entity;
 
 use Espo\Core\{
     FieldProcessing\Loader as LoaderInterface,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params,
     Utils\Metadata,
     Utils\Config,
     Acl,
@@ -71,7 +71,7 @@ class FollowersLoader implements LoaderInterface
         $this->config = $config;
     }
 
-    public function process(Entity $entity, LoaderParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         $this->processIsFollowed($entity);
         $this->processFollowers($entity);
diff --git a/application/Espo/Core/FieldProcessing/Wysiwyg/Saver.php b/application/Espo/Core/FieldProcessing/Wysiwyg/Saver.php
index a0c5ef5493..07475363c9 100644
--- a/application/Espo/Core/FieldProcessing/Wysiwyg/Saver.php
+++ b/application/Espo/Core/FieldProcessing/Wysiwyg/Saver.php
@@ -34,7 +34,7 @@ use Espo\ORM\Entity;
 use Espo\Core\{
     ORM\EntityManager,
     FieldProcessing\Saver as SaverInterface,
-    FieldProcessing\SaverParams,
+    FieldProcessing\Saver\Params,
 };
 
 class Saver implements SaverInterface
@@ -48,7 +48,7 @@ class Saver implements SaverInterface
         $this->entityManager = $entityManager;
     }
 
-    public function process(Entity $entity, SaverParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         foreach ($this->getFieldList($entity->getEntityType()) as $name) {
             $this->processItem($entity, $name);
diff --git a/application/Espo/Core/Mail/Importer.php b/application/Espo/Core/Mail/Importer.php
index 52c721606d..ecccfe5fea 100644
--- a/application/Espo/Core/Mail/Importer.php
+++ b/application/Espo/Core/Mail/Importer.php
@@ -39,7 +39,7 @@ use Espo\Core\Notification\AssignmentNotificator\Params as AssignmentNotificator
 use Espo\Core\Mail\MessageWrapper;
 use Espo\Core\Utils\Config;
 use Espo\Core\FieldProcessing\Relation\LinkMultipleSaver;
-use Espo\Core\FieldProcessing\SaverParams;
+use Espo\Core\FieldProcessing\Saver\Params as SaverParams;
 use Espo\Core\Job\QueueName;
 
 use Espo\Modules\Crm\Entities\Lead;
diff --git a/application/Espo/Core/Record/Service.php b/application/Espo/Core/Record/Service.php
index 8eeca2374a..a8e69e199f 100644
--- a/application/Espo/Core/Record/Service.php
+++ b/application/Espo/Core/Record/Service.php
@@ -63,7 +63,7 @@ use Espo\Core\{
     FieldValidation\FieldValidationParams as FieldValidationParams,
     FieldProcessing\ReadLoadProcessor,
     FieldProcessing\ListLoadProcessor,
-    FieldProcessing\LoaderParams as FieldLoaderParams,
+    FieldProcessing\Loader\Params as FieldLoaderParams,
     Duplicate\Finder as DuplicateFinder,
 };
 
diff --git a/application/Espo/Modules/Crm/Classes/FieldProcessing/Call/PhoneNumberMapLoader.php b/application/Espo/Modules/Crm/Classes/FieldProcessing/Call/PhoneNumberMapLoader.php
index 38590a47ea..192972743e 100644
--- a/application/Espo/Modules/Crm/Classes/FieldProcessing/Call/PhoneNumberMapLoader.php
+++ b/application/Espo/Modules/Crm/Classes/FieldProcessing/Call/PhoneNumberMapLoader.php
@@ -33,7 +33,7 @@ use Espo\ORM\Entity;
 
 use Espo\Core\{
     FieldProcessing\Loader,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params,
     ORM\EntityManager,
 };
 
@@ -50,7 +50,7 @@ class PhoneNumberMapLoader implements Loader
         $this->entityManager = $entityManager;
     }
 
-    public function process(Entity $entity, LoaderParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         $map = (object) [];
 
diff --git a/application/Espo/Modules/Crm/Classes/FieldProcessing/Campaign/StatsLoader.php b/application/Espo/Modules/Crm/Classes/FieldProcessing/Campaign/StatsLoader.php
index 9a42fc0142..8041a47b3f 100644
--- a/application/Espo/Modules/Crm/Classes/FieldProcessing/Campaign/StatsLoader.php
+++ b/application/Espo/Modules/Crm/Classes/FieldProcessing/Campaign/StatsLoader.php
@@ -33,7 +33,7 @@ use Espo\ORM\Entity;
 
 use Espo\Core\{
     FieldProcessing\Loader,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params,
     ORM\EntityManager,
     Acl,
     Field\Currency\CurrencyConfigDataProvider,
@@ -61,7 +61,7 @@ class StatsLoader implements Loader
         $this->currencyDataProvider = $currencyDataProvider;
     }
 
-    public function process(Entity $entity, LoaderParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         $sentCount = $this->entityManager
             ->getRDBRepository('CampaignLogRecord')
diff --git a/application/Espo/Modules/Crm/Classes/FieldProcessing/Meeting/SourceEmailSaver.php b/application/Espo/Modules/Crm/Classes/FieldProcessing/Meeting/SourceEmailSaver.php
index 6f40831e15..163c2c4919 100644
--- a/application/Espo/Modules/Crm/Classes/FieldProcessing/Meeting/SourceEmailSaver.php
+++ b/application/Espo/Modules/Crm/Classes/FieldProcessing/Meeting/SourceEmailSaver.php
@@ -33,7 +33,7 @@ use Espo\ORM\Entity;
 use Espo\ORM\EntityManager;
 
 use Espo\Core\FieldProcessing\Saver;
-use Espo\Core\FieldProcessing\SaverParams;
+use Espo\Core\FieldProcessing\Saver\Params;
 use Espo\Core\Mail\Event\EventFactory;
 
 use ICal\ICal;
@@ -47,7 +47,7 @@ class SourceEmailSaver implements Saver
         $this->entityManager = $entityManager;
     }
 
-    public function process(Entity $entity, SaverParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         if (!$entity->isNew()) {
             return;
diff --git a/application/Espo/Modules/Crm/Classes/FieldProcessing/TargetList/EntryCountLoader.php b/application/Espo/Modules/Crm/Classes/FieldProcessing/TargetList/EntryCountLoader.php
index b66edb471e..30b3b8dd9a 100644
--- a/application/Espo/Modules/Crm/Classes/FieldProcessing/TargetList/EntryCountLoader.php
+++ b/application/Espo/Modules/Crm/Classes/FieldProcessing/TargetList/EntryCountLoader.php
@@ -33,7 +33,7 @@ use Espo\ORM\Entity;
 
 use Espo\Core\{
     FieldProcessing\Loader,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params,
     ORM\EntityManager,
 };
 
@@ -48,7 +48,7 @@ class EntryCountLoader implements Loader
         $this->entityManager = $entityManager;
     }
 
-    public function process(Entity $entity, LoaderParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         if (
             $params->hasSelect() &&
diff --git a/application/Espo/Modules/Crm/Classes/FieldProcessing/TargetList/OptedOutCountLoader.php b/application/Espo/Modules/Crm/Classes/FieldProcessing/TargetList/OptedOutCountLoader.php
index 1547fe5561..f94eeba502 100644
--- a/application/Espo/Modules/Crm/Classes/FieldProcessing/TargetList/OptedOutCountLoader.php
+++ b/application/Espo/Modules/Crm/Classes/FieldProcessing/TargetList/OptedOutCountLoader.php
@@ -33,7 +33,7 @@ use Espo\ORM\Entity;
 
 use Espo\Core\{
     FieldProcessing\Loader,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params,
     ORM\EntityManager,
 };
 
@@ -48,7 +48,7 @@ class OptedOutCountLoader implements Loader
         $this->entityManager = $entityManager;
     }
 
-    public function process(Entity $entity, LoaderParams $params): void
+    public function process(Entity $entity, Params $params): void
     {
         if (
             $params->hasSelect() &&
diff --git a/application/Espo/Modules/Crm/Services/Activities.php b/application/Espo/Modules/Crm/Services/Activities.php
index aaf06fb3ca..2010dc4aea 100644
--- a/application/Espo/Modules/Crm/Services/Activities.php
+++ b/application/Espo/Modules/Crm/Services/Activities.php
@@ -46,7 +46,7 @@ use Espo\Core\{
     Select\Where\ConverterFactory as WhereConverterFactory,
     Select\SelectBuilderFactory,
     FieldProcessing\ListLoadProcessor,
-    FieldProcessing\LoaderParams as FieldLoaderParams,
+    FieldProcessing\Loader\Params as FieldLoaderParams,
     Di,
     Record\ServiceContainer as RecordServiceContainer,
 };
diff --git a/application/Espo/Tools/Export/Export.php b/application/Espo/Tools/Export/Export.php
index 73daf1d71d..00ca4e2904 100644
--- a/application/Espo/Tools/Export/Export.php
+++ b/application/Espo/Tools/Export/Export.php
@@ -40,7 +40,7 @@ use Espo\Core\{
     Utils\Metadata,
     FileStorage\Manager as FileStorageManager,
     FieldProcessing\ListLoadProcessor,
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params as LoaderParams,
     Utils\FieldUtil,
 };
 
diff --git a/application/Espo/Tools/Kanban/Kanban.php b/application/Espo/Tools/Kanban/Kanban.php
index 37bf35ce7f..08115dc841 100644
--- a/application/Espo/Tools/Kanban/Kanban.php
+++ b/application/Espo/Tools/Kanban/Kanban.php
@@ -35,7 +35,7 @@ use Espo\Core\{
     Select\SelectBuilderFactory,
     Select\SearchParams,
     FieldProcessing\ListLoadProcessor,
-    FieldProcessing\LoaderParams as FieldLoaderParams,
+    FieldProcessing\Loader\Params as FieldLoaderParams,
     Record\ServiceContainer as RecordServiceContainer,
 };
 
diff --git a/tests/unit/Espo/Core/FieldProcessing/LoaderParamsTest.php b/tests/unit/Espo/Core/FieldProcessing/LoaderParamsTest.php
index 9dcb0d2706..22a751e6a5 100644
--- a/tests/unit/Espo/Core/FieldProcessing/LoaderParamsTest.php
+++ b/tests/unit/Espo/Core/FieldProcessing/LoaderParamsTest.php
@@ -30,7 +30,7 @@
 namespace tests\unit\Espo\Core\FieldProcessing;
 
 use Espo\Core\{
-    FieldProcessing\LoaderParams,
+    FieldProcessing\Loader\Params as LoaderParams,
 };
 
 class LoaderParamsTest extends \PHPUnit\Framework\TestCase
diff --git a/tests/unit/Espo/Core/FieldProcessing/SaverParamsTest.php b/tests/unit/Espo/Core/FieldProcessing/SaverParamsTest.php
index ad90dfdb06..683ca9c578 100644
--- a/tests/unit/Espo/Core/FieldProcessing/SaverParamsTest.php
+++ b/tests/unit/Espo/Core/FieldProcessing/SaverParamsTest.php
@@ -30,7 +30,7 @@
 namespace tests\unit\Espo\Core\FieldProcessing;
 
 use Espo\Core\{
-    FieldProcessing\SaverParams,
+    FieldProcessing\Saver\Params,
 };
 
 class SaverParamsTest extends \PHPUnit\Framework\TestCase
@@ -41,7 +41,7 @@ class SaverParamsTest extends \PHPUnit\Framework\TestCase
             'silent' => true,
         ];
 
-        $params = SaverParams
+        $params = Params
             ::create()
             ->withRawOptions($options);