diff --git a/application/Espo/Classes/DuplicateWhereBuilders/Company.php b/application/Espo/Classes/DuplicateWhereBuilders/Company.php
index 79ee3836b7..a9515c5daf 100644
--- a/application/Espo/Classes/DuplicateWhereBuilders/Company.php
+++ b/application/Espo/Classes/DuplicateWhereBuilders/Company.php
@@ -32,9 +32,9 @@ namespace Espo\Classes\DuplicateWhereBuilders;
 use Espo\Core\Duplicate\WhereBuilder;
 
 use Espo\ORM\{
-    QueryParams\Part\Condition as Cond,
-    QueryParams\Part\WhereItem,
-    QueryParams\Part\Where\OrGroup,
+    Query\Part\Condition as Cond,
+    Query\Part\WhereItem,
+    Query\Part\Where\OrGroup,
     Entity,
 };
 
diff --git a/application/Espo/Classes/DuplicateWhereBuilders/Person.php b/application/Espo/Classes/DuplicateWhereBuilders/Person.php
index b07966f772..57c4504645 100644
--- a/application/Espo/Classes/DuplicateWhereBuilders/Person.php
+++ b/application/Espo/Classes/DuplicateWhereBuilders/Person.php
@@ -35,9 +35,9 @@ use Espo\Core\{
 };
 
 use Espo\ORM\{
-    QueryParams\Part\Condition as Cond,
-    QueryParams\Part\WhereItem,
-    QueryParams\Part\Where\OrGroup,
+    Query\Part\Condition as Cond,
+    Query\Part\WhereItem,
+    Query\Part\Where\OrGroup,
     Entity,
 };
 
diff --git a/application/Espo/Classes/Select/ActionHistoryRecord/AccessControlFilters/OnlyOwn.php b/application/Espo/Classes/Select/ActionHistoryRecord/AccessControlFilters/OnlyOwn.php
index 0b4c2e9238..3f28031613 100644
--- a/application/Espo/Classes/Select/ActionHistoryRecord/AccessControlFilters/OnlyOwn.php
+++ b/application/Espo/Classes/Select/ActionHistoryRecord/AccessControlFilters/OnlyOwn.php
@@ -31,7 +31,7 @@ namespace Espo\Classes\Select\ActionHistoryRecord\AccessControlFilters;
 
 use Espo\{
     Core\Select\AccessControl\Filter,
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Entities\User,
 };
 
diff --git a/application/Espo/Classes/Select/ActionHistoryRecord/BoolFilters/OnlyMy.php b/application/Espo/Classes/Select/ActionHistoryRecord/BoolFilters/OnlyMy.php
index 8d679e3315..444ee0bc73 100644
--- a/application/Espo/Classes/Select/ActionHistoryRecord/BoolFilters/OnlyMy.php
+++ b/application/Espo/Classes/Select/ActionHistoryRecord/BoolFilters/OnlyMy.php
@@ -31,9 +31,9 @@ namespace Espo\Classes\Select\ActionHistoryRecord\BoolFilters;
 
 use Espo\{
     Core\Select\Boolean\Filter,
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\WhereClause,
-    ORM\QueryParams\Part\Where\OrGroupBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\WhereClause,
+    ORM\Query\Part\Where\OrGroupBuilder,
     Entities\User,
 };
 
diff --git a/application/Espo/Classes/Select/Attachment/PrimaryFilters/Orphan.php b/application/Espo/Classes/Select/Attachment/PrimaryFilters/Orphan.php
index ff498ff8da..5e22b3638f 100644
--- a/application/Espo/Classes/Select/Attachment/PrimaryFilters/Orphan.php
+++ b/application/Espo/Classes/Select/Attachment/PrimaryFilters/Orphan.php
@@ -30,7 +30,7 @@
 namespace Espo\Classes\Select\Attachment\PrimaryFilters;
 
 use Espo\Core\Select\Primary\Filter;
-use Espo\ORM\QueryParams\SelectBuilder;
+use Espo\ORM\Query\SelectBuilder;
 
 class Orphan implements Filter
 {
diff --git a/application/Espo/Classes/Select/AuthLogRecord/PrimaryFilters/Accepted.php b/application/Espo/Classes/Select/AuthLogRecord/PrimaryFilters/Accepted.php
index 0d6bd880a5..3619fb6d5a 100644
--- a/application/Espo/Classes/Select/AuthLogRecord/PrimaryFilters/Accepted.php
+++ b/application/Espo/Classes/Select/AuthLogRecord/PrimaryFilters/Accepted.php
@@ -30,7 +30,7 @@
 namespace Espo\Classes\Select\AuthLogRecord\PrimaryFilters;
 
 use Espo\Core\Select\Primary\Filter;
-use Espo\ORM\QueryParams\SelectBuilder;
+use Espo\ORM\Query\SelectBuilder;
 
 class Accepted implements Filter
 {
diff --git a/application/Espo/Classes/Select/AuthLogRecord/PrimaryFilters/Denied.php b/application/Espo/Classes/Select/AuthLogRecord/PrimaryFilters/Denied.php
index 4d065d9f5c..649b9bbe87 100644
--- a/application/Espo/Classes/Select/AuthLogRecord/PrimaryFilters/Denied.php
+++ b/application/Espo/Classes/Select/AuthLogRecord/PrimaryFilters/Denied.php
@@ -30,7 +30,7 @@
 namespace Espo\Classes\Select\AuthLogRecord\PrimaryFilters;
 
 use Espo\Core\Select\Primary\Filter;
-use Espo\ORM\QueryParams\SelectBuilder;
+use Espo\ORM\Query\SelectBuilder;
 
 class Denied implements Filter
 {
diff --git a/application/Espo/Classes/Select/AuthToken/PrimaryFilters/Active.php b/application/Espo/Classes/Select/AuthToken/PrimaryFilters/Active.php
index 256dbd9451..02123109f8 100644
--- a/application/Espo/Classes/Select/AuthToken/PrimaryFilters/Active.php
+++ b/application/Espo/Classes/Select/AuthToken/PrimaryFilters/Active.php
@@ -30,7 +30,7 @@
 namespace Espo\Classes\Select\AuthToken\PrimaryFilters;
 
 use Espo\Core\Select\Primary\Filter;
-use Espo\ORM\QueryParams\SelectBuilder;
+use Espo\ORM\Query\SelectBuilder;
 
 class Active implements Filter
 {
diff --git a/application/Espo/Classes/Select/AuthToken/PrimaryFilters/Inactive.php b/application/Espo/Classes/Select/AuthToken/PrimaryFilters/Inactive.php
index 38c8a4c7fb..cd4bf01b10 100644
--- a/application/Espo/Classes/Select/AuthToken/PrimaryFilters/Inactive.php
+++ b/application/Espo/Classes/Select/AuthToken/PrimaryFilters/Inactive.php
@@ -30,7 +30,7 @@
 namespace Espo\Classes\Select\AuthToken\PrimaryFilters;
 
 use Espo\Core\Select\Primary\Filter;
-use Espo\ORM\QueryParams\SelectBuilder;
+use Espo\ORM\Query\SelectBuilder;
 
 class Inactive implements Filter
 {
diff --git a/application/Espo/Classes/Select/Email/AccessControlFilters/OnlyOwn.php b/application/Espo/Classes/Select/Email/AccessControlFilters/OnlyOwn.php
index e61e10c796..c5ad6185d6 100644
--- a/application/Espo/Classes/Select/Email/AccessControlFilters/OnlyOwn.php
+++ b/application/Espo/Classes/Select/Email/AccessControlFilters/OnlyOwn.php
@@ -34,7 +34,7 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Classes\Select\Email\Helpers\JoinHelper,
     Entities\User,
 };
diff --git a/application/Espo/Classes/Select/Email/AccessControlFilters/OnlyTeam.php b/application/Espo/Classes/Select/Email/AccessControlFilters/OnlyTeam.php
index a700becef7..4238814787 100644
--- a/application/Espo/Classes/Select/Email/AccessControlFilters/OnlyTeam.php
+++ b/application/Espo/Classes/Select/Email/AccessControlFilters/OnlyTeam.php
@@ -34,7 +34,7 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Classes\Select\Email\Helpers\JoinHelper,
     Entities\User,
 };
diff --git a/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyAccount.php b/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyAccount.php
index 48b17aadd3..ac1caa255b 100644
--- a/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyAccount.php
+++ b/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyAccount.php
@@ -34,7 +34,7 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Classes\Select\Email\Helpers\JoinHelper,
     Entities\User,
 };
diff --git a/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyContact.php b/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyContact.php
index d837ef093c..679e0f4c23 100644
--- a/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyContact.php
+++ b/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyContact.php
@@ -34,7 +34,7 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Classes\Select\Email\Helpers\JoinHelper,
     Entities\User,
 };
diff --git a/application/Espo/Classes/Select/Email/Appliers/AdditionalApplier.php b/application/Espo/Classes/Select/Email/Appliers/AdditionalApplier.php
index 17fbb910a3..ebf0bcba48 100644
--- a/application/Espo/Classes/Select/Email/Appliers/AdditionalApplier.php
+++ b/application/Espo/Classes/Select/Email/Appliers/AdditionalApplier.php
@@ -34,7 +34,7 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Core\Select\SearchParams,
     Classes\Select\Email\Helpers\JoinHelper,
     Entities\User,
diff --git a/application/Espo/Classes/Select/Email/Appliers/TextFilterApplier.php b/application/Espo/Classes/Select/Email/Appliers/TextFilterApplier.php
index c41ca4c5ae..f746ccb8f5 100644
--- a/application/Espo/Classes/Select/Email/Appliers/TextFilterApplier.php
+++ b/application/Espo/Classes/Select/Email/Appliers/TextFilterApplier.php
@@ -36,7 +36,7 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
 };
 
 class TextFilterApplier extends TextFilterApplierBase implements EntityManagerAware
diff --git a/application/Espo/Classes/Select/Email/BoolFilters/OnlyMy.php b/application/Espo/Classes/Select/Email/BoolFilters/OnlyMy.php
index 88a7fcaa29..b3367b03a2 100644
--- a/application/Espo/Classes/Select/Email/BoolFilters/OnlyMy.php
+++ b/application/Espo/Classes/Select/Email/BoolFilters/OnlyMy.php
@@ -31,9 +31,9 @@ namespace Espo\Classes\Select\Email\BoolFilters;
 
 use Espo\{
     Core\Select\Boolean\Filter,
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\WhereClause,
-    ORM\QueryParams\Part\Where\OrGroupBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\WhereClause,
+    ORM\Query\Part\Where\OrGroupBuilder,
     Classes\Select\Email\Helpers\JoinHelper,
     Entities\User,
 };
diff --git a/application/Espo/Classes/Select/Email/Helpers/JoinHelper.php b/application/Espo/Classes/Select/Email/Helpers/JoinHelper.php
index 884f608423..c7e6548845 100644
--- a/application/Espo/Classes/Select/Email/Helpers/JoinHelper.php
+++ b/application/Espo/Classes/Select/Email/Helpers/JoinHelper.php
@@ -30,7 +30,7 @@
 namespace Espo\Classes\Select\Email\Helpers;
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
 };
 
 class JoinHelper
diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php
index 92306ff478..27fce3d2f3 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php
@@ -36,9 +36,9 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
-    ORM\QueryParams\Part\WhereClause,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\WhereItem as WhereClauseItem,
+    ORM\Query\Part\WhereClause,
     Classes\Select\Email\Helpers\EmailAddressHelper,
 };
 
diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/FromEquals.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/FromEquals.php
index 823161496e..9448339efc 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/FromEquals.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/FromEquals.php
@@ -35,9 +35,9 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
-    ORM\QueryParams\Part\WhereClause,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\WhereItem as WhereClauseItem,
+    ORM\Query\Part\WhereClause,
     ORM\EntityManager,
     Classes\Select\Email\Helpers\EmailAddressHelper,
 };
diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php
index 309d2fc16f..57f2bd4e9a 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php
@@ -35,9 +35,9 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
-    ORM\QueryParams\Part\WhereClause,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\WhereItem as WhereClauseItem,
+    ORM\Query\Part\WhereClause,
     ORM\EntityManager,
     Entities\User,
     Classes\Select\Email\Helpers\JoinHelper,
diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsFalse.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsFalse.php
index 04c9b8a5f4..f508f69138 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsFalse.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsFalse.php
@@ -35,9 +35,9 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
-    ORM\QueryParams\Part\WhereClause,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\WhereItem as WhereClauseItem,
+    ORM\Query\Part\WhereClause,
     Entities\User,
     Classes\Select\Email\Helpers\JoinHelper,
 };
diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsTrue.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsTrue.php
index 08b5397449..2161f61919 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsTrue.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsTrue.php
@@ -35,9 +35,9 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
-    ORM\QueryParams\Part\WhereClause,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\WhereItem as WhereClauseItem,
+    ORM\Query\Part\WhereClause,
     Entities\User,
     Classes\Select\Email\Helpers\JoinHelper,
 };
diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsFalse.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsFalse.php
index 4bfae3638a..b8b87e90d7 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsFalse.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsFalse.php
@@ -35,9 +35,9 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
-    ORM\QueryParams\Part\WhereClause,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\WhereItem as WhereClauseItem,
+    ORM\Query\Part\WhereClause,
     Entities\User,
     Classes\Select\Email\Helpers\JoinHelper,
 };
diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsTrue.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsTrue.php
index 1ebf4db1b4..42571058cb 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsTrue.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsTrue.php
@@ -35,9 +35,9 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
-    ORM\QueryParams\Part\WhereClause,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\WhereItem as WhereClauseItem,
+    ORM\Query\Part\WhereClause,
     Entities\User,
     Classes\Select\Email\Helpers\JoinHelper,
 };
diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotRepliedIsFalse.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotRepliedIsFalse.php
index 857f193399..4a97d0a73f 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotRepliedIsFalse.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotRepliedIsFalse.php
@@ -35,9 +35,9 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
-    ORM\QueryParams\Part\WhereClause,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\WhereItem as WhereClauseItem,
+    ORM\Query\Part\WhereClause,
 };
 
 class IsNotRepliedIsFalse implements ItemConverter
diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotRepliedIsTrue.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotRepliedIsTrue.php
index b93f87823a..3ca42f368f 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotRepliedIsTrue.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotRepliedIsTrue.php
@@ -35,9 +35,9 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
-    ORM\QueryParams\Part\WhereClause,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\WhereItem as WhereClauseItem,
+    ORM\Query\Part\WhereClause,
 };
 
 class IsNotRepliedIsTrue implements ItemConverter
diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php
index 749c492eb3..45d3201385 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php
@@ -36,9 +36,9 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
-    ORM\QueryParams\Part\WhereClause,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\WhereItem as WhereClauseItem,
+    ORM\Query\Part\WhereClause,
     Classes\Select\Email\Helpers\EmailAddressHelper,
 };
 
diff --git a/application/Espo/Classes/Select/EmailAccount/AccessControlFilters/Mandatory.php b/application/Espo/Classes/Select/EmailAccount/AccessControlFilters/Mandatory.php
index 5dd29d58ae..f6d25c904d 100644
--- a/application/Espo/Classes/Select/EmailAccount/AccessControlFilters/Mandatory.php
+++ b/application/Espo/Classes/Select/EmailAccount/AccessControlFilters/Mandatory.php
@@ -31,7 +31,7 @@ namespace Espo\Classes\Select\EmailAccount\AccessControlFilters;
 
 use Espo\{
     Core\Select\AccessControl\Filter,
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Entities\User,
 };
 
diff --git a/application/Espo/Classes/Select/EmailAddress/PrimaryFilters/Orphan.php b/application/Espo/Classes/Select/EmailAddress/PrimaryFilters/Orphan.php
index b7f0cf17ee..4e46cf9f81 100644
--- a/application/Espo/Classes/Select/EmailAddress/PrimaryFilters/Orphan.php
+++ b/application/Espo/Classes/Select/EmailAddress/PrimaryFilters/Orphan.php
@@ -30,7 +30,7 @@
 namespace Espo\Classes\Select\EmailAddress\PrimaryFilters;
 
 use Espo\Core\Select\Primary\Filter;
-use Espo\ORM\QueryParams\SelectBuilder;
+use Espo\ORM\Query\SelectBuilder;
 
 class Orphan implements Filter
 {
diff --git a/application/Espo/Classes/Select/EmailFilter/AccessControlFilters/OnlyOwn.php b/application/Espo/Classes/Select/EmailFilter/AccessControlFilters/OnlyOwn.php
index 31db4b626a..34e9c2c74e 100644
--- a/application/Espo/Classes/Select/EmailFilter/AccessControlFilters/OnlyOwn.php
+++ b/application/Espo/Classes/Select/EmailFilter/AccessControlFilters/OnlyOwn.php
@@ -31,7 +31,7 @@ namespace Espo\Classes\Select\EmailFilter\AccessControlFilters;
 
 use Espo\{
     Core\Select\AccessControl\Filter,
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     ORM\EntityManager,
     Entities\User,
 };
diff --git a/application/Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php b/application/Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php
index e13e81f6dd..1a374ca132 100644
--- a/application/Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php
+++ b/application/Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php
@@ -31,9 +31,9 @@ namespace Espo\Classes\Select\EmailFilter\BoolFilters;
 
 use Espo\{
     Core\Select\Boolean\Filter,
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\WhereClause,
-    ORM\QueryParams\Part\Where\OrGroupBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\WhereClause,
+    ORM\Query\Part\Where\OrGroupBuilder,
     ORM\EntityManager,
     Entities\User,
 };
diff --git a/application/Espo/Classes/Select/EmailFolder/AccessControlFilters/Mandatory.php b/application/Espo/Classes/Select/EmailFolder/AccessControlFilters/Mandatory.php
index fe8c465d9b..b3016c8213 100644
--- a/application/Espo/Classes/Select/EmailFolder/AccessControlFilters/Mandatory.php
+++ b/application/Espo/Classes/Select/EmailFolder/AccessControlFilters/Mandatory.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Classes\Select\EmailFolder\AccessControlFilters;
 
-use Espo\ORM\QueryParams\SelectBuilder;
+use Espo\ORM\Query\SelectBuilder;
 
 use Espo\Core\Select\AccessControl\Filter;
 
diff --git a/application/Espo/Classes/Select/EmailTemplate/PrimaryFilters/Actual.php b/application/Espo/Classes/Select/EmailTemplate/PrimaryFilters/Actual.php
index d759408d7c..6f157a812e 100644
--- a/application/Espo/Classes/Select/EmailTemplate/PrimaryFilters/Actual.php
+++ b/application/Espo/Classes/Select/EmailTemplate/PrimaryFilters/Actual.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Classes\Select\EmailTemplate\PrimaryFilters;
 
-use Espo\ORM\QueryParams\SelectBuilder;
+use Espo\ORM\Query\SelectBuilder;
 
 use Espo\Core\Select\Primary\Filter;
 
diff --git a/application/Espo/Classes/Select/Import/AccessControlFilters/Mandatory.php b/application/Espo/Classes/Select/Import/AccessControlFilters/Mandatory.php
index 239a791b93..7bc84df04c 100644
--- a/application/Espo/Classes/Select/Import/AccessControlFilters/Mandatory.php
+++ b/application/Espo/Classes/Select/Import/AccessControlFilters/Mandatory.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Classes\Select\Import\AccessControlFilters;
 
-use Espo\ORM\QueryParams\SelectBuilder;
+use Espo\ORM\Query\SelectBuilder;
 
 use Espo\Core\Select\AccessControl\Filter;
 
diff --git a/application/Espo/Classes/Select/PhoneNumber/PrimaryFilters/Orphan.php b/application/Espo/Classes/Select/PhoneNumber/PrimaryFilters/Orphan.php
index 4e0291b914..f5a866991f 100644
--- a/application/Espo/Classes/Select/PhoneNumber/PrimaryFilters/Orphan.php
+++ b/application/Espo/Classes/Select/PhoneNumber/PrimaryFilters/Orphan.php
@@ -30,7 +30,7 @@
 namespace Espo\Classes\Select\PhoneNumber\PrimaryFilters;
 
 use Espo\Core\Select\Primary\Filter;
-use Espo\ORM\QueryParams\SelectBuilder;
+use Espo\ORM\Query\SelectBuilder;
 
 class Orphan implements Filter
 {
diff --git a/application/Espo/Classes/Select/ScheduledJob/AccessControlFilters/Mandatory.php b/application/Espo/Classes/Select/ScheduledJob/AccessControlFilters/Mandatory.php
index 598fefebea..fbc6d74c21 100644
--- a/application/Espo/Classes/Select/ScheduledJob/AccessControlFilters/Mandatory.php
+++ b/application/Espo/Classes/Select/ScheduledJob/AccessControlFilters/Mandatory.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Classes\Select\ScheduledJob\AccessControlFilters;
 
-use Espo\ORM\QueryParams\SelectBuilder;
+use Espo\ORM\Query\SelectBuilder;
 
 use Espo\Core\Select\AccessControl\Filter;
 
diff --git a/application/Espo/Classes/Select/Team/AccessControlFilters/OnlyTeam.php b/application/Espo/Classes/Select/Team/AccessControlFilters/OnlyTeam.php
index 89f38a6c61..fc0a6a7a96 100644
--- a/application/Espo/Classes/Select/Team/AccessControlFilters/OnlyTeam.php
+++ b/application/Espo/Classes/Select/Team/AccessControlFilters/OnlyTeam.php
@@ -33,7 +33,7 @@ use Espo\Entities\User;
 
 use Espo\Core\Select\AccessControl\Filter;
 
-use Espo\ORM\QueryParams\{
+use Espo\ORM\Query\{
     SelectBuilder,
     Part\Condition as Cond,
 };
diff --git a/application/Espo/Classes/Select/Team/BoolFilters/OnlyMy.php b/application/Espo/Classes/Select/Team/BoolFilters/OnlyMy.php
index 6d2263fa96..d60bfb0705 100644
--- a/application/Espo/Classes/Select/Team/BoolFilters/OnlyMy.php
+++ b/application/Espo/Classes/Select/Team/BoolFilters/OnlyMy.php
@@ -33,7 +33,7 @@ use Espo\Entities\User;
 
 use Espo\Core\Select\Boolean\Filter;
 
-use Espo\ORM\QueryParams\{
+use Espo\ORM\Query\{
     SelectBuilder,
     Part\Where\OrGroupBuilder,
     Part\Condition as Cond,
diff --git a/application/Espo/Classes/Select/Template/AccessControlFilters/Mandatory.php b/application/Espo/Classes/Select/Template/AccessControlFilters/Mandatory.php
index 0e78bdff7e..34bb748fd7 100644
--- a/application/Espo/Classes/Select/Template/AccessControlFilters/Mandatory.php
+++ b/application/Espo/Classes/Select/Template/AccessControlFilters/Mandatory.php
@@ -30,7 +30,7 @@
 namespace Espo\Classes\Select\Template\AccessControlFilters;
 
 use Espo\ORM\{
-    QueryParams\SelectBuilder,
+    Query\SelectBuilder,
     Defs,
 };
 
diff --git a/application/Espo/Classes/Select/User/AccessControlFilters/Mandatory.php b/application/Espo/Classes/Select/User/AccessControlFilters/Mandatory.php
index dd32dc0c9d..677a6963d0 100644
--- a/application/Espo/Classes/Select/User/AccessControlFilters/Mandatory.php
+++ b/application/Espo/Classes/Select/User/AccessControlFilters/Mandatory.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Classes\Select\User\AccessControlFilters;
 
-use Espo\ORM\QueryParams\SelectBuilder;
+use Espo\ORM\Query\SelectBuilder;
 
 use Espo\Core\{
     Select\AccessControl\Filter,
diff --git a/application/Espo/Classes/Select/User/AccessControlFilters/OnlyOwn.php b/application/Espo/Classes/Select/User/AccessControlFilters/OnlyOwn.php
index 8cf257bfb2..daafbdc5f4 100644
--- a/application/Espo/Classes/Select/User/AccessControlFilters/OnlyOwn.php
+++ b/application/Espo/Classes/Select/User/AccessControlFilters/OnlyOwn.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Classes\Select\User\AccessControlFilters;
 
-use Espo\ORM\QueryParams\SelectBuilder;
+use Espo\ORM\Query\SelectBuilder;
 
 use Espo\Core\{
     Select\AccessControl\Filter,
diff --git a/application/Espo/Classes/Select/User/AccessControlFilters/OnlyTeam.php b/application/Espo/Classes/Select/User/AccessControlFilters/OnlyTeam.php
index 35c96740a6..fccaae139e 100644
--- a/application/Espo/Classes/Select/User/AccessControlFilters/OnlyTeam.php
+++ b/application/Espo/Classes/Select/User/AccessControlFilters/OnlyTeam.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Classes\Select\User\AccessControlFilters;
 
-use Espo\ORM\QueryParams\SelectBuilder;
+use Espo\ORM\Query\SelectBuilder;
 
 use Espo\Core\{
     Select\AccessControl\Filter,
diff --git a/application/Espo/Classes/Select/User/AccessControlFilters/PortalOnlyOwn.php b/application/Espo/Classes/Select/User/AccessControlFilters/PortalOnlyOwn.php
index 2396a065f9..11edf41edc 100644
--- a/application/Espo/Classes/Select/User/AccessControlFilters/PortalOnlyOwn.php
+++ b/application/Espo/Classes/Select/User/AccessControlFilters/PortalOnlyOwn.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Classes\Select\User\AccessControlFilters;
 
-use Espo\ORM\QueryParams\SelectBuilder;
+use Espo\ORM\Query\SelectBuilder;
 
 use Espo\Core\Select\AccessControl\Filter;
 
diff --git a/application/Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php b/application/Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php
index 3c06b1306b..1a289bc39e 100644
--- a/application/Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php
+++ b/application/Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php
@@ -33,7 +33,7 @@ use Espo\Entities\User;
 
 use Espo\Core\Select\Boolean\Filter;
 
-use Espo\ORM\QueryParams\{
+use Espo\ORM\Query\{
     SelectBuilder,
     Part\Where\OrGroupBuilder,
     Part\WhereClause,
diff --git a/application/Espo/Classes/Select/User/PrimaryFilters/Active.php b/application/Espo/Classes/Select/User/PrimaryFilters/Active.php
index b23d6971d0..1decc1daf6 100644
--- a/application/Espo/Classes/Select/User/PrimaryFilters/Active.php
+++ b/application/Espo/Classes/Select/User/PrimaryFilters/Active.php
@@ -30,7 +30,7 @@
 namespace Espo\Classes\Select\User\PrimaryFilters;
 
 use Espo\Core\Select\Primary\Filter;
-use Espo\ORM\QueryParams\SelectBuilder;
+use Espo\ORM\Query\SelectBuilder;
 
 class Active implements Filter
 {
diff --git a/application/Espo/Classes/Select/User/PrimaryFilters/ActiveApi.php b/application/Espo/Classes/Select/User/PrimaryFilters/ActiveApi.php
index 80877e19b7..254fa2a877 100644
--- a/application/Espo/Classes/Select/User/PrimaryFilters/ActiveApi.php
+++ b/application/Espo/Classes/Select/User/PrimaryFilters/ActiveApi.php
@@ -30,7 +30,7 @@
 namespace Espo\Classes\Select\User\PrimaryFilters;
 
 use Espo\Core\Select\Primary\Filter;
-use Espo\ORM\QueryParams\SelectBuilder;
+use Espo\ORM\Query\SelectBuilder;
 
 class ActiveApi implements Filter
 {
diff --git a/application/Espo/Classes/Select/User/PrimaryFilters/ActivePortal.php b/application/Espo/Classes/Select/User/PrimaryFilters/ActivePortal.php
index f485d2b15d..6b400b26da 100644
--- a/application/Espo/Classes/Select/User/PrimaryFilters/ActivePortal.php
+++ b/application/Espo/Classes/Select/User/PrimaryFilters/ActivePortal.php
@@ -30,7 +30,7 @@
 namespace Espo\Classes\Select\User\PrimaryFilters;
 
 use Espo\Core\Select\Primary\Filter;
-use Espo\ORM\QueryParams\SelectBuilder;
+use Espo\ORM\Query\SelectBuilder;
 
 class ActivePortal implements Filter
 {
diff --git a/application/Espo/Classes/Select/User/PrimaryFilters/Api.php b/application/Espo/Classes/Select/User/PrimaryFilters/Api.php
index dc3af82c6f..da1f6e031e 100644
--- a/application/Espo/Classes/Select/User/PrimaryFilters/Api.php
+++ b/application/Espo/Classes/Select/User/PrimaryFilters/Api.php
@@ -30,7 +30,7 @@
 namespace Espo\Classes\Select\User\PrimaryFilters;
 
 use Espo\Core\Select\Primary\Filter;
-use Espo\ORM\QueryParams\SelectBuilder;
+use Espo\ORM\Query\SelectBuilder;
 
 class Api implements Filter
 {
diff --git a/application/Espo/Classes/Select/User/PrimaryFilters/Internal.php b/application/Espo/Classes/Select/User/PrimaryFilters/Internal.php
index 2afab3aae6..e2cc7988f2 100644
--- a/application/Espo/Classes/Select/User/PrimaryFilters/Internal.php
+++ b/application/Espo/Classes/Select/User/PrimaryFilters/Internal.php
@@ -30,7 +30,7 @@
 namespace Espo\Classes\Select\User\PrimaryFilters;
 
 use Espo\Core\Select\Primary\Filter;
-use Espo\ORM\QueryParams\SelectBuilder;
+use Espo\ORM\Query\SelectBuilder;
 
 class Internal implements Filter
 {
diff --git a/application/Espo/Classes/Select/User/PrimaryFilters/Portal.php b/application/Espo/Classes/Select/User/PrimaryFilters/Portal.php
index 98e6f60bbb..dda9e6fc52 100644
--- a/application/Espo/Classes/Select/User/PrimaryFilters/Portal.php
+++ b/application/Espo/Classes/Select/User/PrimaryFilters/Portal.php
@@ -30,7 +30,7 @@
 namespace Espo\Classes\Select\User\PrimaryFilters;
 
 use Espo\Core\Select\Primary\Filter;
-use Espo\ORM\QueryParams\SelectBuilder;
+use Espo\ORM\Query\SelectBuilder;
 
 class Portal implements Filter
 {
diff --git a/application/Espo/Classes/Select/User/Where/ItemConverters/IsOfType.php b/application/Espo/Classes/Select/User/Where/ItemConverters/IsOfType.php
index 0603f65147..7e70f9448d 100644
--- a/application/Espo/Classes/Select/User/Where/ItemConverters/IsOfType.php
+++ b/application/Espo/Classes/Select/User/Where/ItemConverters/IsOfType.php
@@ -35,9 +35,9 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
-    ORM\QueryParams\Part\WhereClause,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\WhereItem as WhereClauseItem,
+    ORM\Query\Part\WhereClause,
 };
 
 class IsOfType implements ItemConverter
diff --git a/application/Espo/Classes/Select/Webhook/AccessControlFilters/Mandatory.php b/application/Espo/Classes/Select/Webhook/AccessControlFilters/Mandatory.php
index d5136b60dc..898f28d6e4 100644
--- a/application/Espo/Classes/Select/Webhook/AccessControlFilters/Mandatory.php
+++ b/application/Espo/Classes/Select/Webhook/AccessControlFilters/Mandatory.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Classes\Select\Webhook\AccessControlFilters;
 
-use Espo\ORM\QueryParams\SelectBuilder;
+use Espo\ORM\Query\SelectBuilder;
 
 use Espo\Core\Select\AccessControl\Filter;
 
diff --git a/application/Espo/Core/Duplicate/Finder.php b/application/Espo/Core/Duplicate/Finder.php
index 7b67d32ac2..48616453c5 100644
--- a/application/Espo/Core/Duplicate/Finder.php
+++ b/application/Espo/Core/Duplicate/Finder.php
@@ -37,8 +37,8 @@ use Espo\ORM\{
     EntityManager,
     Entity,
     Collection,
-    QueryParams\Part\WhereItem,
-    QueryParams\Part\Condition as Cond,
+    Query\Part\WhereItem,
+    Query\Part\Condition as Cond,
 };
 
 class Finder
diff --git a/application/Espo/Core/Duplicate/WhereBuilder.php b/application/Espo/Core/Duplicate/WhereBuilder.php
index 8b1374426b..4ee93ecfbc 100644
--- a/application/Espo/Core/Duplicate/WhereBuilder.php
+++ b/application/Espo/Core/Duplicate/WhereBuilder.php
@@ -30,7 +30,7 @@
 namespace Espo\Core\Duplicate;
 
 use Espo\ORM\{
-    QueryParams\Part\WhereItem,
+    Query\Part\WhereItem,
     Entity,
 };
 
diff --git a/application/Espo/Core/MassAction/QueryBuilder.php b/application/Espo/Core/MassAction/QueryBuilder.php
index 7e8cb70325..0a6dbf76c8 100644
--- a/application/Espo/Core/MassAction/QueryBuilder.php
+++ b/application/Espo/Core/MassAction/QueryBuilder.php
@@ -30,7 +30,7 @@
 namespace Espo\Core\MassAction;
 
 use Espo\{
-    ORM\QueryParams\Select,
+    ORM\Query\Select,
 };
 
 use Espo\Core\{
diff --git a/application/Espo/Core/ORM/Repository/HookMediator.php b/application/Espo/Core/ORM/Repository/HookMediator.php
index 16b065281d..417de2a439 100644
--- a/application/Espo/Core/ORM/Repository/HookMediator.php
+++ b/application/Espo/Core/ORM/Repository/HookMediator.php
@@ -32,7 +32,7 @@ namespace Espo\Core\ORM\Repository;
 use Espo\ORM\{
     Entity,
     Repository\EmptyHookMediator,
-    QueryParams\Select,
+    Query\Select,
 };
 
 use Espo\Core\HookManager;
diff --git a/application/Espo/Core/Record/Service.php b/application/Espo/Core/Record/Service.php
index 1c81a2db81..284994a33b 100644
--- a/application/Espo/Core/Record/Service.php
+++ b/application/Espo/Core/Record/Service.php
@@ -44,7 +44,7 @@ use Espo\ORM\{
     Repository\RDBRepository,
     Collection,
     EntityManager,
-    QueryParams\Part\WhereClause,
+    Query\Part\WhereClause,
 };
 
 use Espo\Entities\User;
diff --git a/application/Espo/Core/Select/AccessControl/Filter.php b/application/Espo/Core/Select/AccessControl/Filter.php
index ec74f927e8..24ad700761 100644
--- a/application/Espo/Core/Select/AccessControl/Filter.php
+++ b/application/Espo/Core/Select/AccessControl/Filter.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Core\Select\AccessControl;
 
-use Espo\ORM\QueryParams\SelectBuilder as QueryBuilder;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 interface Filter
 {
diff --git a/application/Espo/Core/Select/AccessControl/Filters/All.php b/application/Espo/Core/Select/AccessControl/Filters/All.php
index 597f55a20e..f836290b9e 100644
--- a/application/Espo/Core/Select/AccessControl/Filters/All.php
+++ b/application/Espo/Core/Select/AccessControl/Filters/All.php
@@ -30,7 +30,7 @@
 namespace Espo\Core\Select\AccessControl\Filters;
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Core\Select\AccessControl\Filter,
 };
 
diff --git a/application/Espo/Core/Select/AccessControl/Filters/Mandatory.php b/application/Espo/Core/Select/AccessControl/Filters/Mandatory.php
index c72ad428b8..6008602472 100644
--- a/application/Espo/Core/Select/AccessControl/Filters/Mandatory.php
+++ b/application/Espo/Core/Select/AccessControl/Filters/Mandatory.php
@@ -30,7 +30,7 @@
 namespace Espo\Core\Select\AccessControl\Filters;
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Core\Select\AccessControl\Filter,
 };
 
diff --git a/application/Espo/Core/Select/AccessControl/Filters/No.php b/application/Espo/Core/Select/AccessControl/Filters/No.php
index c551856196..7e7fcd3f7b 100644
--- a/application/Espo/Core/Select/AccessControl/Filters/No.php
+++ b/application/Espo/Core/Select/AccessControl/Filters/No.php
@@ -30,7 +30,7 @@
 namespace Espo\Core\Select\AccessControl\Filters;
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Core\Select\AccessControl\Filter,
 };
 
diff --git a/application/Espo/Core/Select/AccessControl/Filters/OnlyOwn.php b/application/Espo/Core/Select/AccessControl/Filters/OnlyOwn.php
index 79603bda31..51aad0b67c 100644
--- a/application/Espo/Core/Select/AccessControl/Filters/OnlyOwn.php
+++ b/application/Espo/Core/Select/AccessControl/Filters/OnlyOwn.php
@@ -30,7 +30,7 @@
 namespace Espo\Core\Select\AccessControl\Filters;
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Core\Select\AccessControl\Filter,
     Core\Select\Helpers\FieldHelper,
     Entities\User,
diff --git a/application/Espo/Core/Select/AccessControl/Filters/OnlyTeam.php b/application/Espo/Core/Select/AccessControl/Filters/OnlyTeam.php
index 9facbe380d..560e5eee6c 100644
--- a/application/Espo/Core/Select/AccessControl/Filters/OnlyTeam.php
+++ b/application/Espo/Core/Select/AccessControl/Filters/OnlyTeam.php
@@ -30,7 +30,7 @@
 namespace Espo\Core\Select\AccessControl\Filters;
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Core\Select\AccessControl\Filter,
     Core\Select\Helpers\FieldHelper,
     Entities\User,
diff --git a/application/Espo/Core/Select/AccessControl/Filters/PortalAll.php b/application/Espo/Core/Select/AccessControl/Filters/PortalAll.php
index 8b8cbadeaa..ad7feca0dc 100644
--- a/application/Espo/Core/Select/AccessControl/Filters/PortalAll.php
+++ b/application/Espo/Core/Select/AccessControl/Filters/PortalAll.php
@@ -30,7 +30,7 @@
 namespace Espo\Core\Select\AccessControl\Filters;
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Core\Select\AccessControl\Filter,
 };
 
diff --git a/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyAccount.php b/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyAccount.php
index ae4f66608b..e817435e90 100644
--- a/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyAccount.php
+++ b/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyAccount.php
@@ -30,7 +30,7 @@
 namespace Espo\Core\Select\AccessControl\Filters;
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Core\Select\AccessControl\Filter,
     Core\Select\Helpers\FieldHelper,
     Entities\User,
diff --git a/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyContact.php b/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyContact.php
index ac4860e786..05d00352c8 100644
--- a/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyContact.php
+++ b/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyContact.php
@@ -30,7 +30,7 @@
 namespace Espo\Core\Select\AccessControl\Filters;
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Core\Select\AccessControl\Filter,
     Core\Select\Helpers\FieldHelper,
     Entities\User,
diff --git a/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyOwn.php b/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyOwn.php
index 4efddcc343..2568152e9f 100644
--- a/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyOwn.php
+++ b/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyOwn.php
@@ -30,7 +30,7 @@
 namespace Espo\Core\Select\AccessControl\Filters;
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Core\Select\AccessControl\Filter,
     Core\Select\Helpers\FieldHelper,
     Entities\User,
diff --git a/application/Espo/Core/Select/Applier/Appliers/AccessControlFilter.php b/application/Espo/Core/Select/Applier/Appliers/AccessControlFilter.php
index f05bf450de..ef3f38d302 100644
--- a/application/Espo/Core/Select/Applier/Appliers/AccessControlFilter.php
+++ b/application/Espo/Core/Select/Applier/Appliers/AccessControlFilter.php
@@ -38,7 +38,7 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Entities\User,
 };
 
diff --git a/application/Espo/Core/Select/Applier/Appliers/Additional.php b/application/Espo/Core/Select/Applier/Appliers/Additional.php
index 9417fb4b6f..61601a0e19 100644
--- a/application/Espo/Core/Select/Applier/Appliers/Additional.php
+++ b/application/Espo/Core/Select/Applier/Appliers/Additional.php
@@ -30,7 +30,7 @@
 namespace Espo\Core\Select\Applier\Appliers;
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Core\Select\SearchParams,
 };
 
diff --git a/application/Espo/Core/Select/Applier/Appliers/BoolFilterList.php b/application/Espo/Core/Select/Applier/Appliers/BoolFilterList.php
index 052538fece..70f6879a85 100644
--- a/application/Espo/Core/Select/Applier/Appliers/BoolFilterList.php
+++ b/application/Espo/Core/Select/Applier/Appliers/BoolFilterList.php
@@ -36,9 +36,9 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\Where\OrGroupBuilder,
-    ORM\QueryParams\Part\WhereClause,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\Where\OrGroupBuilder,
+    ORM\Query\Part\WhereClause,
     Entities\User,
 };
 
diff --git a/application/Espo/Core/Select/Applier/Appliers/Limit.php b/application/Espo/Core/Select/Applier/Appliers/Limit.php
index bb677bef4e..6869b0fd79 100644
--- a/application/Espo/Core/Select/Applier/Appliers/Limit.php
+++ b/application/Espo/Core/Select/Applier/Appliers/Limit.php
@@ -30,7 +30,7 @@
 namespace Espo\Core\Select\Applier\Appliers;
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
 };
 
 class Limit
diff --git a/application/Espo/Core/Select/Applier/Appliers/Order.php b/application/Espo/Core/Select/Applier/Appliers/Order.php
index dba5331a74..92651ac16b 100644
--- a/application/Espo/Core/Select/Applier/Appliers/Order.php
+++ b/application/Espo/Core/Select/Applier/Appliers/Order.php
@@ -40,7 +40,7 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Entities\User,
 };
 
diff --git a/application/Espo/Core/Select/Applier/Appliers/PrimaryFilter.php b/application/Espo/Core/Select/Applier/Appliers/PrimaryFilter.php
index db8ae7bb97..a4303a4577 100644
--- a/application/Espo/Core/Select/Applier/Appliers/PrimaryFilter.php
+++ b/application/Espo/Core/Select/Applier/Appliers/PrimaryFilter.php
@@ -36,7 +36,7 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Entities\User,
 };
 
diff --git a/application/Espo/Core/Select/Applier/Appliers/Select.php b/application/Espo/Core/Select/Applier/Appliers/Select.php
index 5c876b7baf..7e00f3dfc5 100644
--- a/application/Espo/Core/Select/Applier/Appliers/Select.php
+++ b/application/Espo/Core/Select/Applier/Appliers/Select.php
@@ -36,7 +36,7 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     ORM\Entity,
     Entities\User,
 };
diff --git a/application/Espo/Core/Select/Applier/Appliers/TextFilter.php b/application/Espo/Core/Select/Applier/Appliers/TextFilter.php
index 5f6b601102..6f822f1815 100644
--- a/application/Espo/Core/Select/Applier/Appliers/TextFilter.php
+++ b/application/Espo/Core/Select/Applier/Appliers/TextFilter.php
@@ -40,7 +40,7 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     ORM\Entity,
     Entities\User,
 };
diff --git a/application/Espo/Core/Select/Applier/Appliers/Where.php b/application/Espo/Core/Select/Applier/Appliers/Where.php
index 694f0f7422..e53ff75f50 100644
--- a/application/Espo/Core/Select/Applier/Appliers/Where.php
+++ b/application/Espo/Core/Select/Applier/Appliers/Where.php
@@ -37,7 +37,7 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Entities\User,
 };
 
diff --git a/application/Espo/Core/Select/Boolean/Filter.php b/application/Espo/Core/Select/Boolean/Filter.php
index f12548e300..89b9d93f40 100644
--- a/application/Espo/Core/Select/Boolean/Filter.php
+++ b/application/Espo/Core/Select/Boolean/Filter.php
@@ -30,8 +30,8 @@
 namespace Espo\Core\Select\Boolean;
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\Where\OrGroupBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\Where\OrGroupBuilder,
 };
 
 /**
diff --git a/application/Espo/Core/Select/Boolean/Filters/Followed.php b/application/Espo/Core/Select/Boolean/Filters/Followed.php
index 6fd494e7ad..baf50df869 100644
--- a/application/Espo/Core/Select/Boolean/Filters/Followed.php
+++ b/application/Espo/Core/Select/Boolean/Filters/Followed.php
@@ -30,9 +30,9 @@
 namespace Espo\Core\Select\Boolean\Filters;
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\WhereClause,
-    ORM\QueryParams\Part\Where\OrGroupBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\WhereClause,
+    ORM\Query\Part\Where\OrGroupBuilder,
     Core\Select\Boolean\Filter,
     Entities\User,
 };
diff --git a/application/Espo/Core/Select/OrmSelectBuilder.php b/application/Espo/Core/Select/OrmSelectBuilder.php
index 92c3a9dc28..4d255423a1 100644
--- a/application/Espo/Core/Select/OrmSelectBuilder.php
+++ b/application/Espo/Core/Select/OrmSelectBuilder.php
@@ -30,7 +30,7 @@
 namespace Espo\Core\Select;
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
 };
 
 /**
diff --git a/application/Espo/Core/Select/Primary/Filter.php b/application/Espo/Core/Select/Primary/Filter.php
index c3f09c1b02..ced5f7d024 100644
--- a/application/Espo/Core/Select/Primary/Filter.php
+++ b/application/Espo/Core/Select/Primary/Filter.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Core\Select\Primary;
 
-use Espo\ORM\QueryParams\SelectBuilder as QueryBuilder;
+use Espo\ORM\Query\SelectBuilder as QueryBuilder;
 
 interface Filter
 {
diff --git a/application/Espo/Core/Select/Primary/Filters/Followed.php b/application/Espo/Core/Select/Primary/Filters/Followed.php
index b41cac6cf3..85123fad2d 100644
--- a/application/Espo/Core/Select/Primary/Filters/Followed.php
+++ b/application/Espo/Core/Select/Primary/Filters/Followed.php
@@ -30,7 +30,7 @@
 namespace Espo\Core\Select\Primary\Filters;
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Core\Select\Primary\Filter,
     Entities\User,
 };
diff --git a/application/Espo/Core/Select/SelectBuilder.php b/application/Espo/Core/Select/SelectBuilder.php
index 7a070ce2d1..beff89a353 100644
--- a/application/Espo/Core/Select/SelectBuilder.php
+++ b/application/Espo/Core/Select/SelectBuilder.php
@@ -47,8 +47,8 @@ use Espo\Core\Select\{
 };
 
 use Espo\{
-    ORM\QueryParams\Select as Query,
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\Select as Query,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Entities\User,
 };
 
diff --git a/application/Espo/Core/Select/SelectManager.php b/application/Espo/Core/Select/SelectManager.php
index 4a82765fcc..8b2d9867cd 100644
--- a/application/Espo/Core/Select/SelectManager.php
+++ b/application/Espo/Core/Select/SelectManager.php
@@ -46,7 +46,7 @@ use Espo\Core\{
 
 use Espo\ORM\{
     QueryComposer\BaseQueryComposer as QueryComposer,
-    QueryParams\Select as SelectQuery,
+    Query\Select as SelectQuery,
     Entity,
 };
 
diff --git a/application/Espo/Core/Select/Where/Converter.php b/application/Espo/Core/Select/Where/Converter.php
index 20fece29fa..bbc72239f7 100644
--- a/application/Espo/Core/Select/Where/Converter.php
+++ b/application/Espo/Core/Select/Where/Converter.php
@@ -31,9 +31,9 @@ namespace Espo\Core\Select\Where;
 
 use Espo\{
     Core\Exceptions\Error,
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\WhereClause,
-    ORM\QueryParams\Part\WhereItem,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\WhereClause,
+    ORM\Query\Part\WhereItem,
     ORM\Entity,
     ORM\Defs as ORMDefs,
     Entities\User,
diff --git a/application/Espo/Core/Select/Where/ItemConverter.php b/application/Espo/Core/Select/Where/ItemConverter.php
index dd8035e567..dc725824be 100644
--- a/application/Espo/Core/Select/Where/ItemConverter.php
+++ b/application/Espo/Core/Select/Where/ItemConverter.php
@@ -30,8 +30,8 @@
 namespace Espo\Core\Select\Where;
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\WhereItem as WhereClauseItem,
 };
 
 /**
diff --git a/application/Espo/Core/Select/Where/ItemGeneralConverter.php b/application/Espo/Core/Select/Where/ItemGeneralConverter.php
index c35744aa1e..ac95b097e2 100644
--- a/application/Espo/Core/Select/Where/ItemGeneralConverter.php
+++ b/application/Espo/Core/Select/Where/ItemGeneralConverter.php
@@ -31,9 +31,9 @@ namespace Espo\Core\Select\Where;
 
 use Espo\{
     Core\Exceptions\Error,
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\WhereClause,
-    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\WhereClause,
+    ORM\Query\Part\WhereItem as WhereClauseItem,
     ORM\EntityManager,
     ORM\Entity,
     ORM\Defs as ORMDefs,
diff --git a/application/Espo/Core/Select/Where/Scanner.php b/application/Espo/Core/Select/Where/Scanner.php
index 4002da7673..4cab236339 100644
--- a/application/Espo/Core/Select/Where/Scanner.php
+++ b/application/Espo/Core/Select/Where/Scanner.php
@@ -33,7 +33,7 @@ use Espo\{
     Core\Exceptions\Error,
     ORM\EntityManager,
     ORM\Entity,
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     ORM\QueryComposer\BaseQueryComposer as QueryComposer,
 };
 
diff --git a/application/Espo/Core/Webhook/Queue.php b/application/Espo/Core/Webhook/Queue.php
index 06b0564169..3179383900 100644
--- a/application/Espo/Core/Webhook/Queue.php
+++ b/application/Espo/Core/Webhook/Queue.php
@@ -45,7 +45,7 @@ use Espo\Core\{
 
 use Espo\ORM\{
     EntityManager,
-    QueryParams\Part\Condition as Cond,
+    Query\Part\Condition as Cond,
 };
 
 use Exception;
diff --git a/application/Espo/Modules/Crm/Services/Activities.php b/application/Espo/Modules/Crm/Services/Activities.php
index f0de9cc1c2..6dfd1726ff 100644
--- a/application/Espo/Modules/Crm/Services/Activities.php
+++ b/application/Espo/Modules/Crm/Services/Activities.php
@@ -35,7 +35,7 @@ use Espo\Core\Exceptions\Forbidden;
 
 use Espo\ORM\{
     Entity,
-    QueryParams\Select,
+    Query\Select,
 };
 
 use Espo\Core\{
diff --git a/application/Espo/Modules/Crm/Services/Opportunity.php b/application/Espo/Modules/Crm/Services/Opportunity.php
index 4b1a00fa95..944eda7a99 100644
--- a/application/Espo/Modules/Crm/Services/Opportunity.php
+++ b/application/Espo/Modules/Crm/Services/Opportunity.php
@@ -30,7 +30,7 @@
 namespace Espo\Modules\Crm\Services;
 
 use Espo\ORM\{
-    QueryParams\SelectBuilder,
+    Query\SelectBuilder,
 };
 
 use Espo\{
diff --git a/application/Espo/Modules/Crm/Services/TargetList.php b/application/Espo/Modules/Crm/Services/TargetList.php
index 6af9cb6b87..8e6e909930 100644
--- a/application/Espo/Modules/Crm/Services/TargetList.php
+++ b/application/Espo/Modules/Crm/Services/TargetList.php
@@ -31,7 +31,7 @@ namespace Espo\Modules\Crm\Services;
 
 use Espo\ORM\Entity;
 
-use Espo\ORM\QueryParams\Select;
+use Espo\ORM\Query\Select;
 
 use Espo\Core\Exceptions\NotFound;
 use Espo\Core\Exceptions\BadRequest;
diff --git a/application/Espo/ORM/CollectionFactory.php b/application/Espo/ORM/CollectionFactory.php
index 48bd327de5..950b47f5df 100644
--- a/application/Espo/ORM/CollectionFactory.php
+++ b/application/Espo/ORM/CollectionFactory.php
@@ -30,7 +30,7 @@
 namespace Espo\ORM;
 
 use Espo\ORM\{
-    QueryParams\Select,
+    Query\Select,
 };
 
 /**
diff --git a/application/Espo/ORM/Locker/BaseLocker.php b/application/Espo/ORM/Locker/BaseLocker.php
index fdeb1153eb..8c482fe9e2 100644
--- a/application/Espo/ORM/Locker/BaseLocker.php
+++ b/application/Espo/ORM/Locker/BaseLocker.php
@@ -32,7 +32,7 @@ namespace Espo\ORM\Locker;
 use Espo\ORM\{
     TransactionManager,
     QueryComposer\QueryComposer,
-    QueryParams\LockTableBuilder,
+    Query\LockTableBuilder,
 };
 
 use PDO;
diff --git a/application/Espo/ORM/Locker/MysqlLocker.php b/application/Espo/ORM/Locker/MysqlLocker.php
index bfe25303c5..4f61672250 100644
--- a/application/Espo/ORM/Locker/MysqlLocker.php
+++ b/application/Espo/ORM/Locker/MysqlLocker.php
@@ -32,7 +32,7 @@ namespace Espo\ORM\Locker;
 use Espo\ORM\{
     TransactionManager,
     QueryComposer\QueryComposer,
-    QueryParams\LockTableBuilder,
+    Query\LockTableBuilder,
 };
 
 use PDO;
diff --git a/application/Espo/ORM/Mapper/BaseMapper.php b/application/Espo/ORM/Mapper/BaseMapper.php
index 208373bfb8..b9703c6489 100644
--- a/application/Espo/ORM/Mapper/BaseMapper.php
+++ b/application/Espo/ORM/Mapper/BaseMapper.php
@@ -39,10 +39,10 @@ use Espo\ORM\{
     Metadata,
     SqlExecutor,
     QueryComposer\QueryComposer,
-    QueryParams\Select,
-    QueryParams\Update,
-    QueryParams\Delete,
-    QueryParams\Insert,
+    Query\Select,
+    Query\Update,
+    Query\Delete,
+    Query\Insert,
 };
 
 use PDO;
diff --git a/application/Espo/ORM/Mapper/Mapper.php b/application/Espo/ORM/Mapper/Mapper.php
index a6b657ed60..6bbf807428 100644
--- a/application/Espo/ORM/Mapper/Mapper.php
+++ b/application/Espo/ORM/Mapper/Mapper.php
@@ -32,7 +32,7 @@ namespace Espo\ORM\Mapper;
 use Espo\ORM\{
     Entity,
     Collection,
-    QueryParams\Select,
+    Query\Select,
 };
 
 interface Mapper
diff --git a/application/Espo/ORM/Mapper/RDBMapper.php b/application/Espo/ORM/Mapper/RDBMapper.php
index a6b5236b6a..bce086a969 100644
--- a/application/Espo/ORM/Mapper/RDBMapper.php
+++ b/application/Espo/ORM/Mapper/RDBMapper.php
@@ -32,7 +32,7 @@ namespace Espo\ORM\Mapper;
 use Espo\ORM\{
     Entity,
     Collection,
-    QueryParams\Select,
+    Query\Select,
 };
 
 interface RDBMapper extends Mapper
diff --git a/application/Espo/ORM/QueryParams/BaseBuilderTrait.php b/application/Espo/ORM/Query/BaseBuilderTrait.php
similarity index 98%
rename from application/Espo/ORM/QueryParams/BaseBuilderTrait.php
rename to application/Espo/ORM/Query/BaseBuilderTrait.php
index 64c5657b2b..34852f6f7e 100644
--- a/application/Espo/ORM/QueryParams/BaseBuilderTrait.php
+++ b/application/Espo/ORM/Query/BaseBuilderTrait.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams;
+namespace Espo\ORM\Query;
 
 use RuntimeException;
 
diff --git a/application/Espo/ORM/QueryParams/BaseTrait.php b/application/Espo/ORM/Query/BaseTrait.php
similarity index 98%
rename from application/Espo/ORM/QueryParams/BaseTrait.php
rename to application/Espo/ORM/Query/BaseTrait.php
index 225d557855..b13736c95c 100644
--- a/application/Espo/ORM/QueryParams/BaseTrait.php
+++ b/application/Espo/ORM/Query/BaseTrait.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams;
+namespace Espo\ORM\Query;
 
 trait BaseTrait
 {
diff --git a/application/Espo/ORM/QueryParams/Builder.php b/application/Espo/ORM/Query/Builder.php
similarity index 98%
rename from application/Espo/ORM/QueryParams/Builder.php
rename to application/Espo/ORM/Query/Builder.php
index edecf89dd4..abd40368d1 100644
--- a/application/Espo/ORM/QueryParams/Builder.php
+++ b/application/Espo/ORM/Query/Builder.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams;
+namespace Espo\ORM\Query;
 
 /**
  * Builds query parameters.
diff --git a/application/Espo/ORM/QueryParams/Delete.php b/application/Espo/ORM/Query/Delete.php
similarity index 98%
rename from application/Espo/ORM/QueryParams/Delete.php
rename to application/Espo/ORM/Query/Delete.php
index 2d331ca561..6d6c6bad65 100644
--- a/application/Espo/ORM/QueryParams/Delete.php
+++ b/application/Espo/ORM/Query/Delete.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams;
+namespace Espo\ORM\Query;
 
 use RuntimeException;
 
diff --git a/application/Espo/ORM/QueryParams/DeleteBuilder.php b/application/Espo/ORM/Query/DeleteBuilder.php
similarity index 98%
rename from application/Espo/ORM/QueryParams/DeleteBuilder.php
rename to application/Espo/ORM/Query/DeleteBuilder.php
index 1a449d07cc..5a70f6f1cb 100644
--- a/application/Espo/ORM/QueryParams/DeleteBuilder.php
+++ b/application/Espo/ORM/Query/DeleteBuilder.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams;
+namespace Espo\ORM\Query;
 
 class DeleteBuilder implements Builder
 {
diff --git a/application/Espo/ORM/QueryParams/Insert.php b/application/Espo/ORM/Query/Insert.php
similarity index 98%
rename from application/Espo/ORM/QueryParams/Insert.php
rename to application/Espo/ORM/Query/Insert.php
index 34cd04f110..1df1c4fdbf 100644
--- a/application/Espo/ORM/QueryParams/Insert.php
+++ b/application/Espo/ORM/Query/Insert.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams;
+namespace Espo\ORM\Query;
 
 use RuntimeException;
 
diff --git a/application/Espo/ORM/QueryParams/InsertBuilder.php b/application/Espo/ORM/Query/InsertBuilder.php
similarity index 98%
rename from application/Espo/ORM/QueryParams/InsertBuilder.php
rename to application/Espo/ORM/Query/InsertBuilder.php
index 4073979a5e..1db24137ce 100644
--- a/application/Espo/ORM/QueryParams/InsertBuilder.php
+++ b/application/Espo/ORM/Query/InsertBuilder.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams;
+namespace Espo\ORM\Query;
 
 class InsertBuilder implements Builder
 {
diff --git a/application/Espo/ORM/QueryParams/LockTable.php b/application/Espo/ORM/Query/LockTable.php
similarity index 98%
rename from application/Espo/ORM/QueryParams/LockTable.php
rename to application/Espo/ORM/Query/LockTable.php
index 2a152c97a7..c719e9cd68 100644
--- a/application/Espo/ORM/QueryParams/LockTable.php
+++ b/application/Espo/ORM/Query/LockTable.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams;
+namespace Espo\ORM\Query;
 
 use RuntimeException;
 
diff --git a/application/Espo/ORM/QueryParams/LockTableBuilder.php b/application/Espo/ORM/Query/LockTableBuilder.php
similarity index 98%
rename from application/Espo/ORM/QueryParams/LockTableBuilder.php
rename to application/Espo/ORM/Query/LockTableBuilder.php
index 0ba2ce2bb9..008ff8751c 100644
--- a/application/Espo/ORM/QueryParams/LockTableBuilder.php
+++ b/application/Espo/ORM/Query/LockTableBuilder.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams;
+namespace Espo\ORM\Query;
 
 class LockTableBuilder implements Builder
 {
diff --git a/application/Espo/ORM/QueryParams/Part/Condition.php b/application/Espo/ORM/Query/Part/Condition.php
similarity index 98%
rename from application/Espo/ORM/QueryParams/Part/Condition.php
rename to application/Espo/ORM/Query/Part/Condition.php
index 81146c15b6..d624ce4209 100644
--- a/application/Espo/ORM/QueryParams/Part/Condition.php
+++ b/application/Espo/ORM/Query/Part/Condition.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams\Part;
+namespace Espo\ORM\Query\Part;
 
-use Espo\ORM\QueryParams\Part\{
+use Espo\ORM\Query\Part\{
     WhereItem,
     Where\AndGroup,
     Where\OrGroup,
@@ -37,7 +37,7 @@ use Espo\ORM\QueryParams\Part\{
     Where\Comparison,
 };
 
-use Espo\ORM\QueryParams\Select;
+use Espo\ORM\Query\Select;
 
 class Condition
 {
diff --git a/application/Espo/ORM/QueryParams/Part/Expression.php b/application/Espo/ORM/Query/Part/Expression.php
similarity index 99%
rename from application/Espo/ORM/QueryParams/Part/Expression.php
rename to application/Espo/ORM/Query/Part/Expression.php
index 3cebc5c375..34be4978a9 100644
--- a/application/Espo/ORM/QueryParams/Part/Expression.php
+++ b/application/Espo/ORM/Query/Part/Expression.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams\Part;
+namespace Espo\ORM\Query\Part;
 
 use RuntimeException;
 use InvalidArgumentException;
diff --git a/application/Espo/ORM/QueryParams/Part/Where/AndGroup.php b/application/Espo/ORM/Query/Part/Where/AndGroup.php
similarity index 97%
rename from application/Espo/ORM/QueryParams/Part/Where/AndGroup.php
rename to application/Espo/ORM/Query/Part/Where/AndGroup.php
index a4018da4dd..cb3d656a08 100644
--- a/application/Espo/ORM/QueryParams/Part/Where/AndGroup.php
+++ b/application/Espo/ORM/Query/Part/Where/AndGroup.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams\Part\Where;
+namespace Espo\ORM\Query\Part\Where;
 
-use Espo\ORM\QueryParams\Part\{
+use Espo\ORM\Query\Part\{
     WhereItem,
     WhereClause,
 };
diff --git a/application/Espo/ORM/QueryParams/Part/Where/AndGroupBuilder.php b/application/Espo/ORM/Query/Part/Where/AndGroupBuilder.php
similarity index 97%
rename from application/Espo/ORM/QueryParams/Part/Where/AndGroupBuilder.php
rename to application/Espo/ORM/Query/Part/Where/AndGroupBuilder.php
index b794c82304..a30f4f0326 100644
--- a/application/Espo/ORM/QueryParams/Part/Where/AndGroupBuilder.php
+++ b/application/Espo/ORM/Query/Part/Where/AndGroupBuilder.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams\Part\Where;
+namespace Espo\ORM\Query\Part\Where;
 
-use Espo\ORM\QueryParams\Part\{
+use Espo\ORM\Query\Part\{
     WhereItem,
 };
 
diff --git a/application/Espo/ORM/QueryParams/Part/Where/Comparison.php b/application/Espo/ORM/Query/Part/Where/Comparison.php
similarity index 99%
rename from application/Espo/ORM/QueryParams/Part/Where/Comparison.php
rename to application/Espo/ORM/Query/Part/Where/Comparison.php
index ab58807843..cfd8852f27 100644
--- a/application/Espo/ORM/QueryParams/Part/Where/Comparison.php
+++ b/application/Espo/ORM/Query/Part/Where/Comparison.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams\Part\Where;
+namespace Espo\ORM\Query\Part\Where;
 
-use Espo\ORM\QueryParams\{
+use Espo\ORM\Query\{
     Part\WhereItem,
     Part\Expression,
     Select,
diff --git a/application/Espo/ORM/QueryParams/Part/Where/Not.php b/application/Espo/ORM/Query/Part/Where/Not.php
similarity index 96%
rename from application/Espo/ORM/QueryParams/Part/Where/Not.php
rename to application/Espo/ORM/Query/Part/Where/Not.php
index 408dc048bf..a16fd54805 100644
--- a/application/Espo/ORM/QueryParams/Part/Where/Not.php
+++ b/application/Espo/ORM/Query/Part/Where/Not.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams\Part\Where;
+namespace Espo\ORM\Query\Part\Where;
 
-use Espo\ORM\QueryParams\Part\{
+use Espo\ORM\Query\Part\{
     WhereItem,
 };
 
diff --git a/application/Espo/ORM/QueryParams/Part/Where/OrGroup.php b/application/Espo/ORM/Query/Part/Where/OrGroup.php
similarity index 96%
rename from application/Espo/ORM/QueryParams/Part/Where/OrGroup.php
rename to application/Espo/ORM/Query/Part/Where/OrGroup.php
index 89c55831f5..46dc6b15fc 100644
--- a/application/Espo/ORM/QueryParams/Part/Where/OrGroup.php
+++ b/application/Espo/ORM/Query/Part/Where/OrGroup.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams\Part\Where;
+namespace Espo\ORM\Query\Part\Where;
 
-use Espo\ORM\QueryParams\Part\WhereItem;
+use Espo\ORM\Query\Part\WhereItem;
 
 class OrGroup implements WhereItem
 {
diff --git a/application/Espo/ORM/QueryParams/Part/Where/OrGroupBuilder.php b/application/Espo/ORM/Query/Part/Where/OrGroupBuilder.php
similarity index 97%
rename from application/Espo/ORM/QueryParams/Part/Where/OrGroupBuilder.php
rename to application/Espo/ORM/Query/Part/Where/OrGroupBuilder.php
index 456c675587..0dd63736b2 100644
--- a/application/Espo/ORM/QueryParams/Part/Where/OrGroupBuilder.php
+++ b/application/Espo/ORM/Query/Part/Where/OrGroupBuilder.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams\Part\Where;
+namespace Espo\ORM\Query\Part\Where;
 
-use Espo\ORM\QueryParams\Part\{
+use Espo\ORM\Query\Part\{
     WhereItem,
 };
 
diff --git a/application/Espo/ORM/QueryParams/Part/WhereClause.php b/application/Espo/ORM/Query/Part/WhereClause.php
similarity index 95%
rename from application/Espo/ORM/QueryParams/Part/WhereClause.php
rename to application/Espo/ORM/Query/Part/WhereClause.php
index db269964ea..d7305ae9c3 100644
--- a/application/Espo/ORM/QueryParams/Part/WhereClause.php
+++ b/application/Espo/ORM/Query/Part/WhereClause.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams\Part;
+namespace Espo\ORM\Query\Part;
 
-use Espo\ORM\QueryParams\{
+use Espo\ORM\Query\{
     Part\Where\AndGroup,
 };
 
diff --git a/application/Espo/ORM/QueryParams/Part/WhereItem.php b/application/Espo/ORM/Query/Part/WhereItem.php
similarity index 97%
rename from application/Espo/ORM/QueryParams/Part/WhereItem.php
rename to application/Espo/ORM/Query/Part/WhereItem.php
index 3f1432d07a..8b34a0b5a0 100644
--- a/application/Espo/ORM/QueryParams/Part/WhereItem.php
+++ b/application/Espo/ORM/Query/Part/WhereItem.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams\Part;
+namespace Espo\ORM\Query\Part;
 
 interface WhereItem
 {
diff --git a/application/Espo/ORM/QueryParams/Query.php b/application/Espo/ORM/Query/Query.php
similarity index 98%
rename from application/Espo/ORM/QueryParams/Query.php
rename to application/Espo/ORM/Query/Query.php
index d99c7871cf..4cbc81adca 100644
--- a/application/Espo/ORM/QueryParams/Query.php
+++ b/application/Espo/ORM/Query/Query.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams;
+namespace Espo\ORM\Query;
 
 /**
  * Query parameters. Instances are immutable. Need to clone with a builder to get a copy for a further modification.
diff --git a/application/Espo/ORM/QueryParams/Select.php b/application/Espo/ORM/Query/Select.php
similarity index 98%
rename from application/Espo/ORM/QueryParams/Select.php
rename to application/Espo/ORM/Query/Select.php
index d1fd2a567c..f8592806ee 100644
--- a/application/Espo/ORM/QueryParams/Select.php
+++ b/application/Espo/ORM/Query/Select.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams;
+namespace Espo\ORM\Query;
 
 use RuntimeException;
 
diff --git a/application/Espo/ORM/QueryParams/SelectBuilder.php b/application/Espo/ORM/Query/SelectBuilder.php
similarity index 98%
rename from application/Espo/ORM/QueryParams/SelectBuilder.php
rename to application/Espo/ORM/Query/SelectBuilder.php
index c2241422cc..47d356a80f 100644
--- a/application/Espo/ORM/QueryParams/SelectBuilder.php
+++ b/application/Espo/ORM/Query/SelectBuilder.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams;
+namespace Espo\ORM\Query;
 
-use Espo\ORM\QueryParams\Part\Expression;
+use Espo\ORM\Query\Part\Expression;
 
 use InvalidArgumentException;
 use RuntimeException;
diff --git a/application/Espo/ORM/QueryParams/SelectingBuilderTrait.php b/application/Espo/ORM/Query/SelectingBuilderTrait.php
similarity index 99%
rename from application/Espo/ORM/QueryParams/SelectingBuilderTrait.php
rename to application/Espo/ORM/Query/SelectingBuilderTrait.php
index a3b25c4b41..5b05239f02 100644
--- a/application/Espo/ORM/QueryParams/SelectingBuilderTrait.php
+++ b/application/Espo/ORM/Query/SelectingBuilderTrait.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams;
+namespace Espo\ORM\Query;
 
-use Espo\ORM\QueryParams\{
+use Espo\ORM\Query\{
     Part\WhereItem,
     Part\Expression,
 };
diff --git a/application/Espo/ORM/QueryParams/SelectingQuery.php b/application/Espo/ORM/Query/SelectingQuery.php
similarity index 97%
rename from application/Espo/ORM/QueryParams/SelectingQuery.php
rename to application/Espo/ORM/Query/SelectingQuery.php
index 4edc94aa0b..459868e8d9 100644
--- a/application/Espo/ORM/QueryParams/SelectingQuery.php
+++ b/application/Espo/ORM/Query/SelectingQuery.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams;
+namespace Espo\ORM\Query;
 
 interface SelectingQuery extends Query
 {
diff --git a/application/Espo/ORM/QueryParams/SelectingTrait.php b/application/Espo/ORM/Query/SelectingTrait.php
similarity index 97%
rename from application/Espo/ORM/QueryParams/SelectingTrait.php
rename to application/Espo/ORM/Query/SelectingTrait.php
index e438792c63..053dac7002 100644
--- a/application/Espo/ORM/QueryParams/SelectingTrait.php
+++ b/application/Espo/ORM/Query/SelectingTrait.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams;
+namespace Espo\ORM\Query;
 
 trait SelectingTrait
 {
diff --git a/application/Espo/ORM/QueryParams/Union.php b/application/Espo/ORM/Query/Union.php
similarity index 98%
rename from application/Espo/ORM/QueryParams/Union.php
rename to application/Espo/ORM/Query/Union.php
index f9fdf100e9..f1806fff85 100644
--- a/application/Espo/ORM/QueryParams/Union.php
+++ b/application/Espo/ORM/Query/Union.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams;
+namespace Espo\ORM\Query;
 
 use RuntimeException;
 
diff --git a/application/Espo/ORM/QueryParams/UnionBuilder.php b/application/Espo/ORM/Query/UnionBuilder.php
similarity index 99%
rename from application/Espo/ORM/QueryParams/UnionBuilder.php
rename to application/Espo/ORM/Query/UnionBuilder.php
index c4d0fec557..f4f39cab2e 100644
--- a/application/Espo/ORM/QueryParams/UnionBuilder.php
+++ b/application/Espo/ORM/Query/UnionBuilder.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams;
+namespace Espo\ORM\Query;
 
 use InvalidArgumentException;
 
diff --git a/application/Espo/ORM/QueryParams/Update.php b/application/Espo/ORM/Query/Update.php
similarity index 98%
rename from application/Espo/ORM/QueryParams/Update.php
rename to application/Espo/ORM/Query/Update.php
index 5c9ed54350..84c4fc6027 100644
--- a/application/Espo/ORM/QueryParams/Update.php
+++ b/application/Espo/ORM/Query/Update.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams;
+namespace Espo\ORM\Query;
 
 use RuntimeException;
 
diff --git a/application/Espo/ORM/QueryParams/UpdateBuilder.php b/application/Espo/ORM/Query/UpdateBuilder.php
similarity index 98%
rename from application/Espo/ORM/QueryParams/UpdateBuilder.php
rename to application/Espo/ORM/Query/UpdateBuilder.php
index ffe8e5e462..9811b7349b 100644
--- a/application/Espo/ORM/QueryParams/UpdateBuilder.php
+++ b/application/Espo/ORM/Query/UpdateBuilder.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams;
+namespace Espo\ORM\Query;
 
 use RuntimeException;
 
diff --git a/application/Espo/ORM/QueryBuilder.php b/application/Espo/ORM/QueryBuilder.php
index d0c47e4017..1bbdc029de 100644
--- a/application/Espo/ORM/QueryBuilder.php
+++ b/application/Espo/ORM/QueryBuilder.php
@@ -30,14 +30,14 @@
 namespace Espo\ORM;
 
 use Espo\ORM\{
-    QueryParams\SelectBuilder,
-    QueryParams\UpdateBuilder,
-    QueryParams\DeleteBuilder,
-    QueryParams\InsertBuilder,
-    QueryParams\UnionBuilder,
-    QueryParams\Query,
-    QueryParams\Builder,
-    QueryParams\Part\Expression,
+    Query\SelectBuilder,
+    Query\UpdateBuilder,
+    Query\DeleteBuilder,
+    Query\InsertBuilder,
+    Query\UnionBuilder,
+    Query\Query,
+    Query\Builder,
+    Query\Part\Expression,
 };
 
 use ReflectionClass;
diff --git a/application/Espo/ORM/QueryComposer/BaseQueryComposer.php b/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
index 117a49e1a4..d8f57f599c 100644
--- a/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
+++ b/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
@@ -35,14 +35,14 @@ use Espo\ORM\{
     BaseEntity,
     Metadata,
     Mapper\Helper,
-    QueryParams\Query as Query,
-    QueryParams\SelectingQuery,
-    QueryParams\Select as SelectQuery,
-    QueryParams\Update as UpdateQuery,
-    QueryParams\Insert as InsertQuery,
-    QueryParams\Delete as DeleteQuery,
-    QueryParams\Union as UnionQuery,
-    QueryParams\LockTable as LockTableQuery,
+    Query\Query as Query,
+    Query\SelectingQuery,
+    Query\Select as SelectQuery,
+    Query\Update as UpdateQuery,
+    Query\Insert as InsertQuery,
+    Query\Delete as DeleteQuery,
+    Query\Union as UnionQuery,
+    Query\LockTable as LockTableQuery,
 };
 
 use PDO;
diff --git a/application/Espo/ORM/QueryComposer/MysqlQueryComposer.php b/application/Espo/ORM/QueryComposer/MysqlQueryComposer.php
index 30241bfc69..c119463a6d 100644
--- a/application/Espo/ORM/QueryComposer/MysqlQueryComposer.php
+++ b/application/Espo/ORM/QueryComposer/MysqlQueryComposer.php
@@ -30,7 +30,7 @@
 namespace Espo\ORM\QueryComposer;
 
 use Espo\ORM\{
-    QueryParams\LockTable as LockTableQuery,
+    Query\LockTable as LockTableQuery,
 };
 
 class MysqlQueryComposer extends BaseQueryComposer
diff --git a/application/Espo/ORM/QueryComposer/QueryComposer.php b/application/Espo/ORM/QueryComposer/QueryComposer.php
index ca9b26505a..47a976ff65 100644
--- a/application/Espo/ORM/QueryComposer/QueryComposer.php
+++ b/application/Espo/ORM/QueryComposer/QueryComposer.php
@@ -30,13 +30,13 @@
 namespace Espo\ORM\QueryComposer;
 
 use Espo\ORM\{
-    QueryParams\Query as Query,
-    QueryParams\Select as SelectQuery,
-    QueryParams\Update as UpdateQuery,
-    QueryParams\Insert as InsertQuery,
-    QueryParams\Delete as DeleteQuery,
-    QueryParams\Union as UnionQuery,
-    QueryParams\LockTable as LockTableQuery,
+    Query\Query as Query,
+    Query\Select as SelectQuery,
+    Query\Update as UpdateQuery,
+    Query\Insert as InsertQuery,
+    Query\Delete as DeleteQuery,
+    Query\Union as UnionQuery,
+    Query\LockTable as LockTableQuery,
 };
 
 interface QueryComposer
diff --git a/application/Espo/ORM/QueryExecutor.php b/application/Espo/ORM/QueryExecutor.php
index 35c26bc7b0..dd18037b73 100644
--- a/application/Espo/ORM/QueryExecutor.php
+++ b/application/Espo/ORM/QueryExecutor.php
@@ -30,7 +30,7 @@
 namespace Espo\ORM;
 
 use Espo\ORM\{
-    QueryParams\Query,
+    Query\Query,
     QueryComposer\QueryComposer,
 };
 
diff --git a/application/Espo/ORM/Repository/EmptyHookMediator.php b/application/Espo/ORM/Repository/EmptyHookMediator.php
index edfa8cfefe..9d2ed99bb2 100644
--- a/application/Espo/ORM/Repository/EmptyHookMediator.php
+++ b/application/Espo/ORM/Repository/EmptyHookMediator.php
@@ -31,7 +31,7 @@ namespace Espo\ORM\Repository;
 
 use Espo\ORM\{
     Entity,
-    QueryParams\Select,
+    Query\Select,
 };
 
 class EmptyHookMediator implements HookMediator
diff --git a/application/Espo/ORM/Repository/HookMediator.php b/application/Espo/ORM/Repository/HookMediator.php
index 743cf671b8..85b5cda454 100644
--- a/application/Espo/ORM/Repository/HookMediator.php
+++ b/application/Espo/ORM/Repository/HookMediator.php
@@ -31,7 +31,7 @@ namespace Espo\ORM\Repository;
 
 use Espo\ORM\{
     Entity,
-    QueryParams\Select,
+    Query\Select,
 };
 
 interface HookMediator
diff --git a/application/Espo/ORM/Repository/RDBRelation.php b/application/Espo/ORM/Repository/RDBRelation.php
index bfcf83d615..e315445cdb 100644
--- a/application/Espo/ORM/Repository/RDBRelation.php
+++ b/application/Espo/ORM/Repository/RDBRelation.php
@@ -33,8 +33,8 @@ use Espo\ORM\{
     Collection,
     Entity,
     EntityManager,
-    QueryParams\Select,
-    QueryParams\Part\WhereItem,
+    Query\Select,
+    Query\Part\WhereItem,
     Mapper\RDBMapper,
     Repository\RDBRelationSelectBuilder as Builder,
 };
diff --git a/application/Espo/ORM/Repository/RDBRelationSelectBuilder.php b/application/Espo/ORM/Repository/RDBRelationSelectBuilder.php
index 92738ff680..f15d414381 100644
--- a/application/Espo/ORM/Repository/RDBRelationSelectBuilder.php
+++ b/application/Espo/ORM/Repository/RDBRelationSelectBuilder.php
@@ -34,9 +34,9 @@ use Espo\ORM\{
     SthCollection,
     Entity,
     EntityManager,
-    QueryParams\Select,
-    QueryParams\SelectBuilder,
-    QueryParams\Part\WhereItem,
+    Query\Select,
+    Query\SelectBuilder,
+    Query\Part\WhereItem,
     Mapper\Mapper,
 };
 
diff --git a/application/Espo/ORM/Repository/RDBRepository.php b/application/Espo/ORM/Repository/RDBRepository.php
index 6343eefda3..c4cae51c48 100644
--- a/application/Espo/ORM/Repository/RDBRepository.php
+++ b/application/Espo/ORM/Repository/RDBRepository.php
@@ -36,8 +36,8 @@ use Espo\ORM\{
     SthCollection,
     Entity,
     Mapper\RDBMapper,
-    QueryParams\Select,
-    QueryParams\Part\WhereItem,
+    Query\Select,
+    Query\Part\WhereItem,
 };
 
 use StdClass;
diff --git a/application/Espo/ORM/Repository/RDBSelectBuilder.php b/application/Espo/ORM/Repository/RDBSelectBuilder.php
index 3867cb388d..9e60e6c67b 100644
--- a/application/Espo/ORM/Repository/RDBSelectBuilder.php
+++ b/application/Espo/ORM/Repository/RDBSelectBuilder.php
@@ -34,9 +34,9 @@ use Espo\ORM\{
     SthCollection,
     Entity,
     EntityManager,
-    QueryParams\Select,
-    QueryParams\SelectBuilder,
-    QueryParams\Part\WhereItem,
+    Query\Select,
+    Query\SelectBuilder,
+    Query\Part\WhereItem,
     Mapper\Mapper,
 };
 
diff --git a/application/Espo/ORM/SthCollection.php b/application/Espo/ORM/SthCollection.php
index ffe2697ec1..d3e398058e 100644
--- a/application/Espo/ORM/SthCollection.php
+++ b/application/Espo/ORM/SthCollection.php
@@ -30,7 +30,7 @@
 namespace Espo\ORM;
 
 use Espo\ORM\{
-    QueryParams\Select as SelectQuery,
+    Query\Select as SelectQuery,
     QueryComposer\QueryComposer as QueryComposer,
 };
 
diff --git a/application/Espo/Repositories/Import.php b/application/Espo/Repositories/Import.php
index 67fcfdd48f..4ff1152f64 100644
--- a/application/Espo/Repositories/Import.php
+++ b/application/Espo/Repositories/Import.php
@@ -31,7 +31,7 @@ namespace Espo\Repositories;
 
 use Espo\ORM\{
     Entity,
-    QueryParams\Select as Query,
+    Query\Select as Query,
     Collection,
 };
 
diff --git a/application/Espo/Services/EmailAddress.php b/application/Espo/Services/EmailAddress.php
index 625a7241b5..eed69e0c55 100644
--- a/application/Espo/Services/EmailAddress.php
+++ b/application/Espo/Services/EmailAddress.php
@@ -30,7 +30,7 @@
 namespace Espo\Services;
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
 };
 
 class EmailAddress extends Record
diff --git a/application/Espo/Services/GlobalSearch.php b/application/Espo/Services/GlobalSearch.php
index 309ac48967..e30ce36b0a 100644
--- a/application/Espo/Services/GlobalSearch.php
+++ b/application/Espo/Services/GlobalSearch.php
@@ -30,7 +30,7 @@
 namespace Espo\Services;
 
 use Espo\ORM\{
-    QueryParams\Select,
+    Query\Select,
 };
 
 use Espo\Core\{
diff --git a/application/Espo/Tools/EmailNotification/Processor.php b/application/Espo/Tools/EmailNotification/Processor.php
index c77940f4a2..496696ef64 100644
--- a/application/Espo/Tools/EmailNotification/Processor.php
+++ b/application/Espo/Tools/EmailNotification/Processor.php
@@ -32,7 +32,7 @@ namespace Espo\Tools\EmailNotification;
 use Espo\{
     ORM\Entity,
     ORM\EntityManager,
-    ORM\QueryParams\SelectBuilder as SelectBuilder,
+    ORM\Query\SelectBuilder as SelectBuilder,
     Entities\User as UserEntity,
 };
 
diff --git a/tests/unit/Espo/Core/Select/AccessControl/FiltersTest.php b/tests/unit/Espo/Core/Select/AccessControl/FiltersTest.php
index ad5a05fc8b..5fb03ceeac 100644
--- a/tests/unit/Espo/Core/Select/AccessControl/FiltersTest.php
+++ b/tests/unit/Espo/Core/Select/AccessControl/FiltersTest.php
@@ -30,7 +30,7 @@
 namespace tests\unit\Espo\Core\Select\AccessControl;
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Core\Select\Helpers\FieldHelper,
     Core\Select\AccessControl\Filters\No,
     Core\Select\AccessControl\Filters\OnlyOwn,
diff --git a/tests/unit/Espo/Core/Select/Applier/Appliers/AccessControlFilterApplierTest.php b/tests/unit/Espo/Core/Select/Applier/Appliers/AccessControlFilterApplierTest.php
index abd288be19..85e3d6ea06 100644
--- a/tests/unit/Espo/Core/Select/Applier/Appliers/AccessControlFilterApplierTest.php
+++ b/tests/unit/Espo/Core/Select/Applier/Appliers/AccessControlFilterApplierTest.php
@@ -42,7 +42,7 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Entities\User,
 };
 
diff --git a/tests/unit/Espo/Core/Select/Applier/Appliers/BoolFilterListApplierTest.php b/tests/unit/Espo/Core/Select/Applier/Appliers/BoolFilterListApplierTest.php
index 27cfad438f..a8c29abe06 100644
--- a/tests/unit/Espo/Core/Select/Applier/Appliers/BoolFilterListApplierTest.php
+++ b/tests/unit/Espo/Core/Select/Applier/Appliers/BoolFilterListApplierTest.php
@@ -38,9 +38,9 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\WhereClause,
-    ORM\QueryParams\Part\Where\OrGroupBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\WhereClause,
+    ORM\Query\Part\Where\OrGroupBuilder,
     Entities\User,
 };
 
diff --git a/tests/unit/Espo/Core/Select/Applier/Appliers/OrderApplierTest.php b/tests/unit/Espo/Core/Select/Applier/Appliers/OrderApplierTest.php
index 1603824e65..2a28296fff 100644
--- a/tests/unit/Espo/Core/Select/Applier/Appliers/OrderApplierTest.php
+++ b/tests/unit/Espo/Core/Select/Applier/Appliers/OrderApplierTest.php
@@ -41,7 +41,7 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Entities\User,
 };
 
diff --git a/tests/unit/Espo/Core/Select/Applier/Appliers/PrimaryFilterApplierTest.php b/tests/unit/Espo/Core/Select/Applier/Appliers/PrimaryFilterApplierTest.php
index f41074ced6..32520c1cd3 100644
--- a/tests/unit/Espo/Core/Select/Applier/Appliers/PrimaryFilterApplierTest.php
+++ b/tests/unit/Espo/Core/Select/Applier/Appliers/PrimaryFilterApplierTest.php
@@ -38,7 +38,7 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Entities\User,
 };
 
diff --git a/tests/unit/Espo/Core/Select/Applier/Appliers/SelectApplierTest.php b/tests/unit/Espo/Core/Select/Applier/Appliers/SelectApplierTest.php
index 547cbfcf8d..f789aa8c5c 100644
--- a/tests/unit/Espo/Core/Select/Applier/Appliers/SelectApplierTest.php
+++ b/tests/unit/Espo/Core/Select/Applier/Appliers/SelectApplierTest.php
@@ -37,7 +37,7 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     ORM\Entity,
     Entities\User,
 };
diff --git a/tests/unit/Espo/Core/Select/Applier/Appliers/TextFilterApplierTest.php b/tests/unit/Espo/Core/Select/Applier/Appliers/TextFilterApplierTest.php
index 60778071f7..9f3d0d7b4a 100644
--- a/tests/unit/Espo/Core/Select/Applier/Appliers/TextFilterApplierTest.php
+++ b/tests/unit/Espo/Core/Select/Applier/Appliers/TextFilterApplierTest.php
@@ -41,7 +41,7 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     ORM\Entity,
     Entities\User,
 };
diff --git a/tests/unit/Espo/Core/Select/Applier/Appliers/WhereApplierTest.php b/tests/unit/Espo/Core/Select/Applier/Appliers/WhereApplierTest.php
index 010f4d01c5..f579312814 100644
--- a/tests/unit/Espo/Core/Select/Applier/Appliers/WhereApplierTest.php
+++ b/tests/unit/Espo/Core/Select/Applier/Appliers/WhereApplierTest.php
@@ -40,7 +40,7 @@ use Espo\Core\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Entities\User,
 };
 
diff --git a/tests/unit/Espo/Core/Select/SelectBuilderTest.php b/tests/unit/Espo/Core/Select/SelectBuilderTest.php
index ee163ad42f..58923dd241 100644
--- a/tests/unit/Espo/Core/Select/SelectBuilderTest.php
+++ b/tests/unit/Espo/Core/Select/SelectBuilderTest.php
@@ -48,7 +48,7 @@ use Espo\Core\Select\{
 };
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\SelectBuilder as QueryBuilder,
     Entities\User,
 };
 
diff --git a/tests/unit/Espo/Core/Select/Where/ConverterTest.php b/tests/unit/Espo/Core/Select/Where/ConverterTest.php
index cfeebac8ec..2ab814a592 100644
--- a/tests/unit/Espo/Core/Select/Where/ConverterTest.php
+++ b/tests/unit/Espo/Core/Select/Where/ConverterTest.php
@@ -45,10 +45,10 @@ use Espo\{
     ORM\EntityManager,
     ORM\Entity,
     ORM\Metadata as ormMetadata,
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\WhereClause,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\WhereClause,
     ORM\QueryBuilder as BaseQueryBuilder,
-    ORM\QueryParams\Select,
+    ORM\Query\Select,
     ORM\Defs as ORMDefs,
     ORM\Defs\EntityDefs,
     Entities\User,
diff --git a/tests/unit/Espo/Core/Select/Where/ScannerTest.php b/tests/unit/Espo/Core/Select/Where/ScannerTest.php
index beb5d7def0..0a79c6ac92 100644
--- a/tests/unit/Espo/Core/Select/Where/ScannerTest.php
+++ b/tests/unit/Espo/Core/Select/Where/ScannerTest.php
@@ -35,8 +35,8 @@ use Espo\{
     Core\Select\Where\Item,
     ORM\EntityManager,
     ORM\BaseEntity as Entity,
-    ORM\QueryParams\Select as Query,
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
+    ORM\Query\Select as Query,
+    ORM\Query\SelectBuilder as QueryBuilder,
     ORM\QueryComposer\BaseQueryComposer as QueryComposer,
 };
 
diff --git a/tests/unit/Espo/ORM/MapperTest.php b/tests/unit/Espo/ORM/MapperTest.php
index 6960d1efca..a1ab695d29 100644
--- a/tests/unit/Espo/ORM/MapperTest.php
+++ b/tests/unit/Espo/ORM/MapperTest.php
@@ -39,7 +39,7 @@ use Espo\ORM\{
     SqlExecutor,
     QueryComposer\MysqlQueryComposer as QueryComposer,
     Mapper\MysqlMapper,
-    QueryParams\Select,
+    Query\Select,
     MetadataDataProvider,
 };
 
diff --git a/tests/unit/Espo/ORM/MysqlQueryComposerTest.php b/tests/unit/Espo/ORM/MysqlQueryComposerTest.php
index efedf1d497..a2b5679826 100644
--- a/tests/unit/Espo/ORM/MysqlQueryComposerTest.php
+++ b/tests/unit/Espo/ORM/MysqlQueryComposerTest.php
@@ -38,7 +38,7 @@ use Espo\ORM\{
     MetadataDataProvider,
 };
 
-use Espo\ORM\QueryParams\{
+use Espo\ORM\Query\{
     Select,
     Insert,
     Update,
diff --git a/tests/unit/Espo/ORM/QueryBuilderTest.php b/tests/unit/Espo/ORM/QueryBuilderTest.php
index d67458ab4a..7d8231a07b 100644
--- a/tests/unit/Espo/ORM/QueryBuilderTest.php
+++ b/tests/unit/Espo/ORM/QueryBuilderTest.php
@@ -31,11 +31,11 @@ namespace tests\unit\Espo\ORM;
 
 use Espo\ORM\{
     QueryBuilder,
-    QueryParams\Select,
-    QueryParams\Insert,
-    QueryParams\Update,
-    QueryParams\Delete,
-    QueryParams\Union,
+    Query\Select,
+    Query\Insert,
+    Query\Update,
+    Query\Delete,
+    Query\Union,
 };
 
 use RuntimeException;
diff --git a/tests/unit/Espo/ORM/QueryParams/Parts/ExpressionTest.php b/tests/unit/Espo/ORM/QueryParams/Parts/ExpressionTest.php
index 7b6c887a90..8cc39a071c 100644
--- a/tests/unit/Espo/ORM/QueryParams/Parts/ExpressionTest.php
+++ b/tests/unit/Espo/ORM/QueryParams/Parts/ExpressionTest.php
@@ -27,10 +27,10 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\ORM\QueryParams\Part;
+namespace tests\unit\Espo\ORM\Query\Part;
 
 use Espo\ORM\{
-    QueryParams\Part\Expression as Expr,
+    Query\Part\Expression as Expr,
 };
 
 use RuntimeException;
diff --git a/tests/unit/Espo/ORM/QueryParams/Parts/WhereTest.php b/tests/unit/Espo/ORM/QueryParams/Parts/WhereTest.php
index 2a81a3c322..0d1fb08903 100644
--- a/tests/unit/Espo/ORM/QueryParams/Parts/WhereTest.php
+++ b/tests/unit/Espo/ORM/QueryParams/Parts/WhereTest.php
@@ -27,16 +27,16 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\ORM\QueryParams\Part;
+namespace tests\unit\Espo\ORM\Query\Part;
 
 use Espo\ORM\{
-    QueryParams\Part\Where\AndGroup,
-    QueryParams\Part\Where\OrGroup,
-    QueryParams\Part\WhereClause,
-    QueryParams\Part\Where\Comparison as Comp,
-    QueryParams\Part\Expression as Expr,
-    QueryParams\Part\Condition as Cond,
-    QueryParams\SelectBuilder,
+    Query\Part\Where\AndGroup,
+    Query\Part\Where\OrGroup,
+    Query\Part\WhereClause,
+    Query\Part\Where\Comparison as Comp,
+    Query\Part\Expression as Expr,
+    Query\Part\Condition as Cond,
+    Query\SelectBuilder,
 };
 
 class WhereTest extends \PHPUnit\Framework\TestCase
diff --git a/tests/unit/Espo/ORM/QueryParams/SelectBuilderTest.php b/tests/unit/Espo/ORM/QueryParams/SelectBuilderTest.php
index a7d2130241..0108a63522 100644
--- a/tests/unit/Espo/ORM/QueryParams/SelectBuilderTest.php
+++ b/tests/unit/Espo/ORM/QueryParams/SelectBuilderTest.php
@@ -27,12 +27,12 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\ORM\QueryParams;
+namespace tests\unit\Espo\ORM\Query;
 
 use Espo\ORM\{
-    QueryParams\SelectBuilder,
-    QueryParams\Part\Condition as Cond,
-    QueryParams\Part\Expression as Expr,
+    Query\SelectBuilder,
+    Query\Part\Condition as Cond,
+    Query\Part\Expression as Expr,
 };
 
 class SelectBuilderTest extends \PHPUnit\Framework\TestCase
diff --git a/tests/unit/Espo/ORM/Repository/RDBRepositoryTest.php b/tests/unit/Espo/ORM/Repository/RDBRepositoryTest.php
index 92a4909751..989253e7c9 100644
--- a/tests/unit/Espo/ORM/Repository/RDBRepositoryTest.php
+++ b/tests/unit/Espo/ORM/Repository/RDBRepositoryTest.php
@@ -37,7 +37,7 @@ use Espo\ORM\{
     Repository\RDBRelation,
     Repository\RDBRelationSelectBuilder,
     EntityCollection,
-    QueryParams\Select,
+    Query\Select,
     QueryBuilder,
     Entity,
     EntityManager,
@@ -46,8 +46,8 @@ use Espo\ORM\{
     CollectionFactory,
     Metadata,
     MetadataDataProvider,
-    QueryParams\Part\Condition as Cond,
-    QueryParams\Part\Expression as Expr,
+    Query\Part\Condition as Cond,
+    Query\Part\Expression as Expr,
 };
 
 use RuntimeException;
diff --git a/tests/unit/testClasses/Core/Select/Where/ItemConverters/TestConverter.php b/tests/unit/testClasses/Core/Select/Where/ItemConverters/TestConverter.php
index 37cca519e1..17a52844a5 100644
--- a/tests/unit/testClasses/Core/Select/Where/ItemConverters/TestConverter.php
+++ b/tests/unit/testClasses/Core/Select/Where/ItemConverters/TestConverter.php
@@ -30,9 +30,9 @@
 namespace tests\unit\testClasses\Core\Select\Where\ItemConverters;
 
 use Espo\{
-    ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Part\WhereClause,
-    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
+    ORM\Query\SelectBuilder as QueryBuilder,
+    ORM\Query\Part\WhereClause,
+    ORM\Query\Part\WhereItem as WhereClauseItem,
     Core\Select\Where\Item,
     Core\Select\Where\ItemConverter,
 };