diff --git a/application/Espo/Classes/DuplicateWhereBuilders/Company.php b/application/Espo/Classes/DuplicateWhereBuilders/Company.php
index 78028717d6..79ee3836b7 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\Parts\Condition as Cond,
-    QueryParams\Parts\WhereItem,
-    QueryParams\Parts\Where\OrGroup,
+    QueryParams\Part\Condition as Cond,
+    QueryParams\Part\WhereItem,
+    QueryParams\Part\Where\OrGroup,
     Entity,
 };
 
diff --git a/application/Espo/Classes/DuplicateWhereBuilders/Person.php b/application/Espo/Classes/DuplicateWhereBuilders/Person.php
index 7de2966939..b07966f772 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\Parts\Condition as Cond,
-    QueryParams\Parts\WhereItem,
-    QueryParams\Parts\Where\OrGroup,
+    QueryParams\Part\Condition as Cond,
+    QueryParams\Part\WhereItem,
+    QueryParams\Part\Where\OrGroup,
     Entity,
 };
 
diff --git a/application/Espo/Classes/Select/ActionHistoryRecord/BoolFilters/OnlyMy.php b/application/Espo/Classes/Select/ActionHistoryRecord/BoolFilters/OnlyMy.php
index 14b8cd6f04..8d679e3315 100644
--- a/application/Espo/Classes/Select/ActionHistoryRecord/BoolFilters/OnlyMy.php
+++ b/application/Espo/Classes/Select/ActionHistoryRecord/BoolFilters/OnlyMy.php
@@ -32,8 +32,8 @@ namespace Espo\Classes\Select\ActionHistoryRecord\BoolFilters;
 use Espo\{
     Core\Select\Boolean\Filter,
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\WhereClause,
-    ORM\QueryParams\Parts\Where\OrGroupBuilder,
+    ORM\QueryParams\Part\WhereClause,
+    ORM\QueryParams\Part\Where\OrGroupBuilder,
     Entities\User,
 };
 
diff --git a/application/Espo/Classes/Select/Email/BoolFilters/OnlyMy.php b/application/Espo/Classes/Select/Email/BoolFilters/OnlyMy.php
index 2465fb819a..88a7fcaa29 100644
--- a/application/Espo/Classes/Select/Email/BoolFilters/OnlyMy.php
+++ b/application/Espo/Classes/Select/Email/BoolFilters/OnlyMy.php
@@ -32,8 +32,8 @@ namespace Espo\Classes\Select\Email\BoolFilters;
 use Espo\{
     Core\Select\Boolean\Filter,
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\WhereClause,
-    ORM\QueryParams\Parts\Where\OrGroupBuilder,
+    ORM\QueryParams\Part\WhereClause,
+    ORM\QueryParams\Part\Where\OrGroupBuilder,
     Classes\Select\Email\Helpers\JoinHelper,
     Entities\User,
 };
diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php
index efad9347b9..92306ff478 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php
@@ -37,8 +37,8 @@ use Espo\Core\{
 
 use Espo\{
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\WhereItem as WhereClauseItem,
-    ORM\QueryParams\Parts\WhereClause,
+    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
+    ORM\QueryParams\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 3f9b4f1f12..823161496e 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/FromEquals.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/FromEquals.php
@@ -36,8 +36,8 @@ use Espo\Core\{
 
 use Espo\{
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\WhereItem as WhereClauseItem,
-    ORM\QueryParams\Parts\WhereClause,
+    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
+    ORM\QueryParams\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 a46ffef08e..309d2fc16f 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php
@@ -36,8 +36,8 @@ use Espo\Core\{
 
 use Espo\{
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\WhereItem as WhereClauseItem,
-    ORM\QueryParams\Parts\WhereClause,
+    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
+    ORM\QueryParams\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 4dc5c7705e..04c9b8a5f4 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsFalse.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsFalse.php
@@ -36,8 +36,8 @@ use Espo\Core\{
 
 use Espo\{
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\WhereItem as WhereClauseItem,
-    ORM\QueryParams\Parts\WhereClause,
+    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
+    ORM\QueryParams\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 abd8727d39..08b5397449 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsTrue.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsTrue.php
@@ -36,8 +36,8 @@ use Espo\Core\{
 
 use Espo\{
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\WhereItem as WhereClauseItem,
-    ORM\QueryParams\Parts\WhereClause,
+    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
+    ORM\QueryParams\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 b0da55893e..4bfae3638a 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsFalse.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsFalse.php
@@ -36,8 +36,8 @@ use Espo\Core\{
 
 use Espo\{
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\WhereItem as WhereClauseItem,
-    ORM\QueryParams\Parts\WhereClause,
+    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
+    ORM\QueryParams\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 f3cc6c1e0f..1ebf4db1b4 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsTrue.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsTrue.php
@@ -36,8 +36,8 @@ use Espo\Core\{
 
 use Espo\{
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\WhereItem as WhereClauseItem,
-    ORM\QueryParams\Parts\WhereClause,
+    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
+    ORM\QueryParams\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 75c33f809b..857f193399 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotRepliedIsFalse.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotRepliedIsFalse.php
@@ -36,8 +36,8 @@ use Espo\Core\{
 
 use Espo\{
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\WhereItem as WhereClauseItem,
-    ORM\QueryParams\Parts\WhereClause,
+    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
+    ORM\QueryParams\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 923b2e0106..b93f87823a 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotRepliedIsTrue.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotRepliedIsTrue.php
@@ -36,8 +36,8 @@ use Espo\Core\{
 
 use Espo\{
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\WhereItem as WhereClauseItem,
-    ORM\QueryParams\Parts\WhereClause,
+    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
+    ORM\QueryParams\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 13a8613143..749c492eb3 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php
@@ -37,8 +37,8 @@ use Espo\Core\{
 
 use Espo\{
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\WhereItem as WhereClauseItem,
-    ORM\QueryParams\Parts\WhereClause,
+    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
+    ORM\QueryParams\Part\WhereClause,
     Classes\Select\Email\Helpers\EmailAddressHelper,
 };
 
diff --git a/application/Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php b/application/Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php
index d55eb36ce0..e13e81f6dd 100644
--- a/application/Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php
+++ b/application/Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php
@@ -32,8 +32,8 @@ namespace Espo\Classes\Select\EmailFilter\BoolFilters;
 use Espo\{
     Core\Select\Boolean\Filter,
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\WhereClause,
-    ORM\QueryParams\Parts\Where\OrGroupBuilder,
+    ORM\QueryParams\Part\WhereClause,
+    ORM\QueryParams\Part\Where\OrGroupBuilder,
     ORM\EntityManager,
     Entities\User,
 };
diff --git a/application/Espo/Classes/Select/Team/AccessControlFilters/OnlyTeam.php b/application/Espo/Classes/Select/Team/AccessControlFilters/OnlyTeam.php
index 258c47ed64..89f38a6c61 100644
--- a/application/Espo/Classes/Select/Team/AccessControlFilters/OnlyTeam.php
+++ b/application/Espo/Classes/Select/Team/AccessControlFilters/OnlyTeam.php
@@ -35,7 +35,7 @@ use Espo\Core\Select\AccessControl\Filter;
 
 use Espo\ORM\QueryParams\{
     SelectBuilder,
-    Parts\Condition as Cond,
+    Part\Condition as Cond,
 };
 
 class OnlyTeam implements Filter
diff --git a/application/Espo/Classes/Select/Team/BoolFilters/OnlyMy.php b/application/Espo/Classes/Select/Team/BoolFilters/OnlyMy.php
index 1eaa0264ba..6d2263fa96 100644
--- a/application/Espo/Classes/Select/Team/BoolFilters/OnlyMy.php
+++ b/application/Espo/Classes/Select/Team/BoolFilters/OnlyMy.php
@@ -35,8 +35,8 @@ use Espo\Core\Select\Boolean\Filter;
 
 use Espo\ORM\QueryParams\{
     SelectBuilder,
-    Parts\Where\OrGroupBuilder,
-    Parts\Condition as Cond,
+    Part\Where\OrGroupBuilder,
+    Part\Condition as Cond,
 };
 
 class OnlyMy implements Filter
diff --git a/application/Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php b/application/Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php
index f60fc220da..3c06b1306b 100644
--- a/application/Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php
+++ b/application/Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php
@@ -35,8 +35,8 @@ use Espo\Core\Select\Boolean\Filter;
 
 use Espo\ORM\QueryParams\{
     SelectBuilder,
-    Parts\Where\OrGroupBuilder,
-    Parts\WhereClause,
+    Part\Where\OrGroupBuilder,
+    Part\WhereClause,
 };
 
 class OnlyMyTeam 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 9bc9ccad65..0603f65147 100644
--- a/application/Espo/Classes/Select/User/Where/ItemConverters/IsOfType.php
+++ b/application/Espo/Classes/Select/User/Where/ItemConverters/IsOfType.php
@@ -36,8 +36,8 @@ use Espo\Core\{
 
 use Espo\{
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\WhereItem as WhereClauseItem,
-    ORM\QueryParams\Parts\WhereClause,
+    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
+    ORM\QueryParams\Part\WhereClause,
 };
 
 class IsOfType implements ItemConverter
diff --git a/application/Espo/Core/Duplicate/Finder.php b/application/Espo/Core/Duplicate/Finder.php
index f05471d431..7b67d32ac2 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\Parts\WhereItem,
-    QueryParams\Parts\Condition as Cond,
+    QueryParams\Part\WhereItem,
+    QueryParams\Part\Condition as Cond,
 };
 
 class Finder
diff --git a/application/Espo/Core/Duplicate/WhereBuilder.php b/application/Espo/Core/Duplicate/WhereBuilder.php
index a70cc5cbb4..8b1374426b 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\Parts\WhereItem,
+    QueryParams\Part\WhereItem,
     Entity,
 };
 
diff --git a/application/Espo/Core/Record/Service.php b/application/Espo/Core/Record/Service.php
index 2cd5dde85a..1c81a2db81 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\Parts\WhereClause,
+    QueryParams\Part\WhereClause,
 };
 
 use Espo\Entities\User;
diff --git a/application/Espo/Core/Select/Applier/Appliers/BoolFilterList.php b/application/Espo/Core/Select/Applier/Appliers/BoolFilterList.php
index 6b9251a505..052538fece 100644
--- a/application/Espo/Core/Select/Applier/Appliers/BoolFilterList.php
+++ b/application/Espo/Core/Select/Applier/Appliers/BoolFilterList.php
@@ -37,8 +37,8 @@ use Espo\Core\{
 
 use Espo\{
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\Where\OrGroupBuilder,
-    ORM\QueryParams\Parts\WhereClause,
+    ORM\QueryParams\Part\Where\OrGroupBuilder,
+    ORM\QueryParams\Part\WhereClause,
     Entities\User,
 };
 
diff --git a/application/Espo/Core/Select/Boolean/Filter.php b/application/Espo/Core/Select/Boolean/Filter.php
index 13acb1ce8a..f12548e300 100644
--- a/application/Espo/Core/Select/Boolean/Filter.php
+++ b/application/Espo/Core/Select/Boolean/Filter.php
@@ -31,7 +31,7 @@ namespace Espo\Core\Select\Boolean;
 
 use Espo\{
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\Where\OrGroupBuilder,
+    ORM\QueryParams\Part\Where\OrGroupBuilder,
 };
 
 /**
diff --git a/application/Espo/Core/Select/Boolean/Filters/Followed.php b/application/Espo/Core/Select/Boolean/Filters/Followed.php
index be63c90143..6fd494e7ad 100644
--- a/application/Espo/Core/Select/Boolean/Filters/Followed.php
+++ b/application/Espo/Core/Select/Boolean/Filters/Followed.php
@@ -31,8 +31,8 @@ namespace Espo\Core\Select\Boolean\Filters;
 
 use Espo\{
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\WhereClause,
-    ORM\QueryParams\Parts\Where\OrGroupBuilder,
+    ORM\QueryParams\Part\WhereClause,
+    ORM\QueryParams\Part\Where\OrGroupBuilder,
     Core\Select\Boolean\Filter,
     Entities\User,
 };
diff --git a/application/Espo/Core/Select/Where/Converter.php b/application/Espo/Core/Select/Where/Converter.php
index 0abfb524a6..20fece29fa 100644
--- a/application/Espo/Core/Select/Where/Converter.php
+++ b/application/Espo/Core/Select/Where/Converter.php
@@ -32,8 +32,8 @@ namespace Espo\Core\Select\Where;
 use Espo\{
     Core\Exceptions\Error,
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\WhereClause,
-    ORM\QueryParams\Parts\WhereItem,
+    ORM\QueryParams\Part\WhereClause,
+    ORM\QueryParams\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 1021561c0b..dd8035e567 100644
--- a/application/Espo/Core/Select/Where/ItemConverter.php
+++ b/application/Espo/Core/Select/Where/ItemConverter.php
@@ -31,7 +31,7 @@ namespace Espo\Core\Select\Where;
 
 use Espo\{
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\WhereItem as WhereClauseItem,
+    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
 };
 
 /**
diff --git a/application/Espo/Core/Select/Where/ItemGeneralConverter.php b/application/Espo/Core/Select/Where/ItemGeneralConverter.php
index d4b43194b0..c35744aa1e 100644
--- a/application/Espo/Core/Select/Where/ItemGeneralConverter.php
+++ b/application/Espo/Core/Select/Where/ItemGeneralConverter.php
@@ -32,8 +32,8 @@ namespace Espo\Core\Select\Where;
 use Espo\{
     Core\Exceptions\Error,
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\WhereClause,
-    ORM\QueryParams\Parts\WhereItem as WhereClauseItem,
+    ORM\QueryParams\Part\WhereClause,
+    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
     ORM\EntityManager,
     ORM\Entity,
     ORM\Defs as ORMDefs,
diff --git a/application/Espo/Core/Webhook/Queue.php b/application/Espo/Core/Webhook/Queue.php
index 22bab6ad29..06b0564169 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\Parts\Condition as Cond,
+    QueryParams\Part\Condition as Cond,
 };
 
 use Exception;
diff --git a/application/Espo/ORM/QueryBuilder.php b/application/Espo/ORM/QueryBuilder.php
index af0a394d10..d0c47e4017 100644
--- a/application/Espo/ORM/QueryBuilder.php
+++ b/application/Espo/ORM/QueryBuilder.php
@@ -37,7 +37,7 @@ use Espo\ORM\{
     QueryParams\UnionBuilder,
     QueryParams\Query,
     QueryParams\Builder,
-    QueryParams\Parts\Expression,
+    QueryParams\Part\Expression,
 };
 
 use ReflectionClass;
diff --git a/application/Espo/ORM/QueryComposer/BaseQueryComposer.php b/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
index 7885716075..117a49e1a4 100644
--- a/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
+++ b/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
@@ -52,7 +52,7 @@ use LogicException;
 /**
  * Composes SQL queries.
  *
- * @todo Break into sub-classes. Put sub-classes into `\Parts` namespace.
+ * @todo Break into sub-classes. Put sub-classes into `\Part` namespace.
  * @todo Use entityDefs. Don't use methods of BaseEntity.
  */
 abstract class BaseQueryComposer implements QueryComposer
diff --git a/application/Espo/ORM/QueryParams/Parts/Condition.php b/application/Espo/ORM/QueryParams/Part/Condition.php
similarity index 98%
rename from application/Espo/ORM/QueryParams/Parts/Condition.php
rename to application/Espo/ORM/QueryParams/Part/Condition.php
index e08d2d161f..81146c15b6 100644
--- a/application/Espo/ORM/QueryParams/Parts/Condition.php
+++ b/application/Espo/ORM/QueryParams/Part/Condition.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams\Parts;
+namespace Espo\ORM\QueryParams\Part;
 
-use Espo\ORM\QueryParams\Parts\{
+use Espo\ORM\QueryParams\Part\{
     WhereItem,
     Where\AndGroup,
     Where\OrGroup,
diff --git a/application/Espo/ORM/QueryParams/Parts/Expression.php b/application/Espo/ORM/QueryParams/Part/Expression.php
similarity index 99%
rename from application/Espo/ORM/QueryParams/Parts/Expression.php
rename to application/Espo/ORM/QueryParams/Part/Expression.php
index 606c35caed..3cebc5c375 100644
--- a/application/Espo/ORM/QueryParams/Parts/Expression.php
+++ b/application/Espo/ORM/QueryParams/Part/Expression.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams\Parts;
+namespace Espo\ORM\QueryParams\Part;
 
 use RuntimeException;
 use InvalidArgumentException;
diff --git a/application/Espo/ORM/QueryParams/Parts/Where/AndGroup.php b/application/Espo/ORM/QueryParams/Part/Where/AndGroup.php
similarity index 96%
rename from application/Espo/ORM/QueryParams/Parts/Where/AndGroup.php
rename to application/Espo/ORM/QueryParams/Part/Where/AndGroup.php
index 3e370e3051..a4018da4dd 100644
--- a/application/Espo/ORM/QueryParams/Parts/Where/AndGroup.php
+++ b/application/Espo/ORM/QueryParams/Part/Where/AndGroup.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams\Parts\Where;
+namespace Espo\ORM\QueryParams\Part\Where;
 
-use Espo\ORM\QueryParams\Parts\{
+use Espo\ORM\QueryParams\Part\{
     WhereItem,
     WhereClause,
 };
diff --git a/application/Espo/ORM/QueryParams/Parts/Where/AndGroupBuilder.php b/application/Espo/ORM/QueryParams/Part/Where/AndGroupBuilder.php
similarity index 97%
rename from application/Espo/ORM/QueryParams/Parts/Where/AndGroupBuilder.php
rename to application/Espo/ORM/QueryParams/Part/Where/AndGroupBuilder.php
index e4dd499b3e..b794c82304 100644
--- a/application/Espo/ORM/QueryParams/Parts/Where/AndGroupBuilder.php
+++ b/application/Espo/ORM/QueryParams/Part/Where/AndGroupBuilder.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams\Parts\Where;
+namespace Espo\ORM\QueryParams\Part\Where;
 
-use Espo\ORM\QueryParams\Parts\{
+use Espo\ORM\QueryParams\Part\{
     WhereItem,
 };
 
diff --git a/application/Espo/ORM/QueryParams/Parts/Where/Comparison.php b/application/Espo/ORM/QueryParams/Part/Where/Comparison.php
similarity index 99%
rename from application/Espo/ORM/QueryParams/Parts/Where/Comparison.php
rename to application/Espo/ORM/QueryParams/Part/Where/Comparison.php
index 66b4f0ed60..ab58807843 100644
--- a/application/Espo/ORM/QueryParams/Parts/Where/Comparison.php
+++ b/application/Espo/ORM/QueryParams/Part/Where/Comparison.php
@@ -27,11 +27,11 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams\Parts\Where;
+namespace Espo\ORM\QueryParams\Part\Where;
 
 use Espo\ORM\QueryParams\{
-    Parts\WhereItem,
-    Parts\Expression,
+    Part\WhereItem,
+    Part\Expression,
     Select,
 };
 
diff --git a/application/Espo/ORM/QueryParams/Parts/Where/Not.php b/application/Espo/ORM/QueryParams/Part/Where/Not.php
similarity index 96%
rename from application/Espo/ORM/QueryParams/Parts/Where/Not.php
rename to application/Espo/ORM/QueryParams/Part/Where/Not.php
index b36e19b3bc..408dc048bf 100644
--- a/application/Espo/ORM/QueryParams/Parts/Where/Not.php
+++ b/application/Espo/ORM/QueryParams/Part/Where/Not.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams\Parts\Where;
+namespace Espo\ORM\QueryParams\Part\Where;
 
-use Espo\ORM\QueryParams\Parts\{
+use Espo\ORM\QueryParams\Part\{
     WhereItem,
 };
 
diff --git a/application/Espo/ORM/QueryParams/Parts/Where/OrGroup.php b/application/Espo/ORM/QueryParams/Part/Where/OrGroup.php
similarity index 96%
rename from application/Espo/ORM/QueryParams/Parts/Where/OrGroup.php
rename to application/Espo/ORM/QueryParams/Part/Where/OrGroup.php
index 53f6beb868..89c55831f5 100644
--- a/application/Espo/ORM/QueryParams/Parts/Where/OrGroup.php
+++ b/application/Espo/ORM/QueryParams/Part/Where/OrGroup.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams\Parts\Where;
+namespace Espo\ORM\QueryParams\Part\Where;
 
-use Espo\ORM\QueryParams\Parts\WhereItem;
+use Espo\ORM\QueryParams\Part\WhereItem;
 
 class OrGroup implements WhereItem
 {
diff --git a/application/Espo/ORM/QueryParams/Parts/Where/OrGroupBuilder.php b/application/Espo/ORM/QueryParams/Part/Where/OrGroupBuilder.php
similarity index 97%
rename from application/Espo/ORM/QueryParams/Parts/Where/OrGroupBuilder.php
rename to application/Espo/ORM/QueryParams/Part/Where/OrGroupBuilder.php
index 847445cecb..456c675587 100644
--- a/application/Espo/ORM/QueryParams/Parts/Where/OrGroupBuilder.php
+++ b/application/Espo/ORM/QueryParams/Part/Where/OrGroupBuilder.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams\Parts\Where;
+namespace Espo\ORM\QueryParams\Part\Where;
 
-use Espo\ORM\QueryParams\Parts\{
+use Espo\ORM\QueryParams\Part\{
     WhereItem,
 };
 
diff --git a/application/Espo/ORM/QueryParams/Parts/WhereClause.php b/application/Espo/ORM/QueryParams/Part/WhereClause.php
similarity index 95%
rename from application/Espo/ORM/QueryParams/Parts/WhereClause.php
rename to application/Espo/ORM/QueryParams/Part/WhereClause.php
index 5b8c90d9ad..db269964ea 100644
--- a/application/Espo/ORM/QueryParams/Parts/WhereClause.php
+++ b/application/Espo/ORM/QueryParams/Part/WhereClause.php
@@ -27,10 +27,10 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams\Parts;
+namespace Espo\ORM\QueryParams\Part;
 
 use Espo\ORM\QueryParams\{
-    Parts\Where\AndGroup,
+    Part\Where\AndGroup,
 };
 
 class WhereClause extends AndGroup
diff --git a/application/Espo/ORM/QueryParams/Parts/WhereItem.php b/application/Espo/ORM/QueryParams/Part/WhereItem.php
similarity index 97%
rename from application/Espo/ORM/QueryParams/Parts/WhereItem.php
rename to application/Espo/ORM/QueryParams/Part/WhereItem.php
index 5b2a79fbf3..3f1432d07a 100644
--- a/application/Espo/ORM/QueryParams/Parts/WhereItem.php
+++ b/application/Espo/ORM/QueryParams/Part/WhereItem.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\ORM\QueryParams\Parts;
+namespace Espo\ORM\QueryParams\Part;
 
 interface WhereItem
 {
diff --git a/application/Espo/ORM/QueryParams/SelectBuilder.php b/application/Espo/ORM/QueryParams/SelectBuilder.php
index dafb0ab377..c2241422cc 100644
--- a/application/Espo/ORM/QueryParams/SelectBuilder.php
+++ b/application/Espo/ORM/QueryParams/SelectBuilder.php
@@ -29,7 +29,7 @@
 
 namespace Espo\ORM\QueryParams;
 
-use Espo\ORM\QueryParams\Parts\Expression;
+use Espo\ORM\QueryParams\Part\Expression;
 
 use InvalidArgumentException;
 use RuntimeException;
diff --git a/application/Espo/ORM/QueryParams/SelectingBuilderTrait.php b/application/Espo/ORM/QueryParams/SelectingBuilderTrait.php
index fcf1097933..a3b25c4b41 100644
--- a/application/Espo/ORM/QueryParams/SelectingBuilderTrait.php
+++ b/application/Espo/ORM/QueryParams/SelectingBuilderTrait.php
@@ -30,8 +30,8 @@
 namespace Espo\ORM\QueryParams;
 
 use Espo\ORM\QueryParams\{
-    Parts\WhereItem,
-    Parts\Expression,
+    Part\WhereItem,
+    Part\Expression,
 };
 
 use InvalidArgumentException;
diff --git a/application/Espo/ORM/Repository/RDBRelation.php b/application/Espo/ORM/Repository/RDBRelation.php
index 51573fc26d..bfcf83d615 100644
--- a/application/Espo/ORM/Repository/RDBRelation.php
+++ b/application/Espo/ORM/Repository/RDBRelation.php
@@ -34,7 +34,7 @@ use Espo\ORM\{
     Entity,
     EntityManager,
     QueryParams\Select,
-    QueryParams\Parts\WhereItem,
+    QueryParams\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 7e122cf606..92738ff680 100644
--- a/application/Espo/ORM/Repository/RDBRelationSelectBuilder.php
+++ b/application/Espo/ORM/Repository/RDBRelationSelectBuilder.php
@@ -36,7 +36,7 @@ use Espo\ORM\{
     EntityManager,
     QueryParams\Select,
     QueryParams\SelectBuilder,
-    QueryParams\Parts\WhereItem,
+    QueryParams\Part\WhereItem,
     Mapper\Mapper,
 };
 
diff --git a/application/Espo/ORM/Repository/RDBRepository.php b/application/Espo/ORM/Repository/RDBRepository.php
index 2349e479d2..6343eefda3 100644
--- a/application/Espo/ORM/Repository/RDBRepository.php
+++ b/application/Espo/ORM/Repository/RDBRepository.php
@@ -37,7 +37,7 @@ use Espo\ORM\{
     Entity,
     Mapper\RDBMapper,
     QueryParams\Select,
-    QueryParams\Parts\WhereItem,
+    QueryParams\Part\WhereItem,
 };
 
 use StdClass;
diff --git a/application/Espo/ORM/Repository/RDBSelectBuilder.php b/application/Espo/ORM/Repository/RDBSelectBuilder.php
index bf19a12c73..3867cb388d 100644
--- a/application/Espo/ORM/Repository/RDBSelectBuilder.php
+++ b/application/Espo/ORM/Repository/RDBSelectBuilder.php
@@ -36,7 +36,7 @@ use Espo\ORM\{
     EntityManager,
     QueryParams\Select,
     QueryParams\SelectBuilder,
-    QueryParams\Parts\WhereItem,
+    QueryParams\Part\WhereItem,
     Mapper\Mapper,
 };
 
diff --git a/tests/unit/Espo/Core/Select/Applier/Appliers/BoolFilterListApplierTest.php b/tests/unit/Espo/Core/Select/Applier/Appliers/BoolFilterListApplierTest.php
index d8c1088d30..27cfad438f 100644
--- a/tests/unit/Espo/Core/Select/Applier/Appliers/BoolFilterListApplierTest.php
+++ b/tests/unit/Espo/Core/Select/Applier/Appliers/BoolFilterListApplierTest.php
@@ -39,8 +39,8 @@ use Espo\Core\{
 
 use Espo\{
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\WhereClause,
-    ORM\QueryParams\Parts\Where\OrGroupBuilder,
+    ORM\QueryParams\Part\WhereClause,
+    ORM\QueryParams\Part\Where\OrGroupBuilder,
     Entities\User,
 };
 
diff --git a/tests/unit/Espo/Core/Select/Where/ConverterTest.php b/tests/unit/Espo/Core/Select/Where/ConverterTest.php
index 69a577ee9e..cfeebac8ec 100644
--- a/tests/unit/Espo/Core/Select/Where/ConverterTest.php
+++ b/tests/unit/Espo/Core/Select/Where/ConverterTest.php
@@ -46,7 +46,7 @@ use Espo\{
     ORM\Entity,
     ORM\Metadata as ormMetadata,
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\WhereClause,
+    ORM\QueryParams\Part\WhereClause,
     ORM\QueryBuilder as BaseQueryBuilder,
     ORM\QueryParams\Select,
     ORM\Defs as ORMDefs,
diff --git a/tests/unit/Espo/ORM/QueryParams/Parts/ExpressionTest.php b/tests/unit/Espo/ORM/QueryParams/Parts/ExpressionTest.php
index fbccf9a357..7b6c887a90 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\Parts;
+namespace tests\unit\Espo\ORM\QueryParams\Part;
 
 use Espo\ORM\{
-    QueryParams\Parts\Expression as Expr,
+    QueryParams\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 0dff5e8f0a..2a81a3c322 100644
--- a/tests/unit/Espo/ORM/QueryParams/Parts/WhereTest.php
+++ b/tests/unit/Espo/ORM/QueryParams/Parts/WhereTest.php
@@ -27,15 +27,15 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\ORM\QueryParams\Parts;
+namespace tests\unit\Espo\ORM\QueryParams\Part;
 
 use Espo\ORM\{
-    QueryParams\Parts\Where\AndGroup,
-    QueryParams\Parts\Where\OrGroup,
-    QueryParams\Parts\WhereClause,
-    QueryParams\Parts\Where\Comparison as Comp,
-    QueryParams\Parts\Expression as Expr,
-    QueryParams\Parts\Condition as Cond,
+    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,
 };
 
diff --git a/tests/unit/Espo/ORM/QueryParams/SelectBuilderTest.php b/tests/unit/Espo/ORM/QueryParams/SelectBuilderTest.php
index 0da2d61f99..a7d2130241 100644
--- a/tests/unit/Espo/ORM/QueryParams/SelectBuilderTest.php
+++ b/tests/unit/Espo/ORM/QueryParams/SelectBuilderTest.php
@@ -31,8 +31,8 @@ namespace tests\unit\Espo\ORM\QueryParams;
 
 use Espo\ORM\{
     QueryParams\SelectBuilder,
-    QueryParams\Parts\Condition as Cond,
-    QueryParams\Parts\Expression as Expr,
+    QueryParams\Part\Condition as Cond,
+    QueryParams\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 1025ab75dc..92a4909751 100644
--- a/tests/unit/Espo/ORM/Repository/RDBRepositoryTest.php
+++ b/tests/unit/Espo/ORM/Repository/RDBRepositoryTest.php
@@ -46,8 +46,8 @@ use Espo\ORM\{
     CollectionFactory,
     Metadata,
     MetadataDataProvider,
-    QueryParams\Parts\Condition as Cond,
-    QueryParams\Parts\Expression as Expr,
+    QueryParams\Part\Condition as Cond,
+    QueryParams\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 414005aeb9..37cca519e1 100644
--- a/tests/unit/testClasses/Core/Select/Where/ItemConverters/TestConverter.php
+++ b/tests/unit/testClasses/Core/Select/Where/ItemConverters/TestConverter.php
@@ -31,8 +31,8 @@ namespace tests\unit\testClasses\Core\Select\Where\ItemConverters;
 
 use Espo\{
     ORM\QueryParams\SelectBuilder as QueryBuilder,
-    ORM\QueryParams\Parts\WhereClause,
-    ORM\QueryParams\Parts\WhereItem as WhereClauseItem,
+    ORM\QueryParams\Part\WhereClause,
+    ORM\QueryParams\Part\WhereItem as WhereClauseItem,
     Core\Select\Where\Item,
     Core\Select\Where\ItemConverter,
 };