diff --git a/application/Espo/Core/Select/Applier/Appliers/TextFilter.php b/application/Espo/Core/Select/Applier/Appliers/TextFilter.php
index 04a874afa2..06b5128dd7 100644
--- a/application/Espo/Core/Select/Applier/Appliers/TextFilter.php
+++ b/application/Espo/Core/Select/Applier/Appliers/TextFilter.php
@@ -41,7 +41,7 @@ use Espo\Core\{
 
 use Espo\{
     ORM\Query\SelectBuilder as QueryBuilder,
-    ORM\Query\Part\OrderExpression as OrderExpr,
+    ORM\Query\Part\Order as OrderExpr,
     ORM\Entity,
     Entities\User,
 };
diff --git a/application/Espo/Modules/Crm/Services/Activities.php b/application/Espo/Modules/Crm/Services/Activities.php
index 71a6082fe5..f143e45cbf 100644
--- a/application/Espo/Modules/Crm/Services/Activities.php
+++ b/application/Espo/Modules/Crm/Services/Activities.php
@@ -36,7 +36,7 @@ use Espo\Core\Exceptions\Forbidden;
 use Espo\ORM\{
     Entity,
     Query\Select,
-    Query\Part\OrderExpression,
+    Query\Part\Order,
 };
 
 use Espo\Core\{
@@ -633,7 +633,7 @@ class Activities implements
 
                 // Order by `dateStart`.
                 $subBuilder->order(
-                    OrderExpression
+                    Order
                         ::create(
                             $query->getSelect()[2]->getExpression()
                         )
diff --git a/application/Espo/ORM/Query/Part/OrderExpression.php b/application/Espo/ORM/Query/Part/Order.php
similarity index 99%
rename from application/Espo/ORM/Query/Part/OrderExpression.php
rename to application/Espo/ORM/Query/Part/Order.php
index 7dd9abecc7..1aecf3ac5d 100644
--- a/application/Espo/ORM/Query/Part/OrderExpression.php
+++ b/application/Espo/ORM/Query/Part/Order.php
@@ -31,7 +31,7 @@ namespace Espo\ORM\Query\Part;
 
 use RuntimeException;
 
-class OrderExpression
+class Order
 {
     public const ASC = 'ASC';
 
diff --git a/application/Espo/ORM/Query/Select.php b/application/Espo/ORM/Query/Select.php
index 565efebea2..d5a7501c5f 100644
--- a/application/Espo/ORM/Query/Select.php
+++ b/application/Espo/ORM/Query/Select.php
@@ -31,7 +31,7 @@ namespace Espo\ORM\Query;
 
 use Espo\ORM\Query\Part\WhereClause;
 use Espo\ORM\Query\Part\Selection;
-use Espo\ORM\Query\Part\OrderExpression;
+use Espo\ORM\Query\Part\Order;
 use Espo\ORM\Query\Part\Expression;
 
 use RuntimeException;
@@ -46,9 +46,9 @@ class Select implements SelectingQuery
     use SelectingTrait;
     use BaseTrait;
 
-    public const ORDER_ASC = OrderExpression::ASC;
+    public const ORDER_ASC = Order::ASC;
 
-    public const ORDER_DESC = OrderExpression::DESC;
+    public const ORDER_DESC = Order::DESC;
 
     /**
      * Get an entity type.
diff --git a/application/Espo/ORM/Query/SelectingBuilderTrait.php b/application/Espo/ORM/Query/SelectingBuilderTrait.php
index 6dbf5cd66f..8de99a03db 100644
--- a/application/Espo/ORM/Query/SelectingBuilderTrait.php
+++ b/application/Espo/ORM/Query/SelectingBuilderTrait.php
@@ -31,7 +31,7 @@ namespace Espo\ORM\Query;
 
 use Espo\ORM\Query\Part\WhereItem;
 use Espo\ORM\Query\Part\Expression;
-use Espo\ORM\Query\Part\OrderExpression;
+use Espo\ORM\Query\Part\Order;
 use Espo\ORM\Query\Part\Join;
 
 use InvalidArgumentException;
@@ -107,7 +107,7 @@ trait SelectingBuilderTrait
      * * `order([$expr1, $expr2, ...])
      * * `order(string $expression, string $direction)
      *
-     * @param OrderExpression|OrderExpression[]|Expression|string $orderBy
+     * @param Order|Order[]|Expression|string $orderBy
      * An attribute to order by or an array or order items.
      * Passing an array will reset a previously set order.
      * @param string|bool|null $direction OrderExpression::ASC|OrderExpression::DESC.
@@ -115,13 +115,13 @@ trait SelectingBuilderTrait
     public function order($orderBy, $direction = null): self
     {
         if (is_bool($direction)) {
-            $direction = $direction ? OrderExpression::DESC : OrderExpression::ASC;
+            $direction = $direction ? Order::DESC : Order::ASC;
         }
 
         if (is_array($orderBy)) {
             $this->params['orderBy'] = $this->normilizeOrderExpressionItemArray(
                 $orderBy,
-                $direction ?? OrderExpression::ASC
+                $direction ?? Order::ASC
             );
 
             return $this;
@@ -135,14 +135,14 @@ trait SelectingBuilderTrait
 
         if ($orderBy instanceof Expression) {
             $orderBy = $orderBy->getValue();
-            $direction = $direction ?? OrderExpression::ASC;
+            $direction = $direction ?? Order::ASC;
         }
-        else if ($orderBy instanceof OrderExpression) {
+        else if ($orderBy instanceof Order) {
             $direction = $direction ?? $orderBy->getDirection();
             $orderBy = $orderBy->getExpression()->getValue();
         }
         else {
-            $direction = $direction ?? OrderExpression::ASC;
+            $direction = $direction ?? Order::ASC;
         }
 
         $this->params['orderBy'][] = [$orderBy, $direction];
@@ -360,7 +360,7 @@ trait SelectingBuilderTrait
                 continue;
             }
 
-            if ($item instanceof OrderExpression) {
+            if ($item instanceof Order) {
                 $resultList[] = [
                     $item->getExpression()->getValue(),
                     $item->getDirection()
@@ -394,8 +394,8 @@ trait SelectingBuilderTrait
 
             if (is_bool($itemDirection)) {
                 $itemDirection = $itemDirection ?
-                    OrderExpression::DESC :
-                    OrderExpression::ASC;
+                    Order::DESC :
+                    Order::ASC;
             }
 
             $resultList[] = [$itemValue, $itemDirection];
diff --git a/application/Espo/ORM/Query/SelectingTrait.php b/application/Espo/ORM/Query/SelectingTrait.php
index 8b8a135e90..51bee24909 100644
--- a/application/Espo/ORM/Query/SelectingTrait.php
+++ b/application/Espo/ORM/Query/SelectingTrait.php
@@ -29,7 +29,7 @@
 
 namespace Espo\ORM\Query;
 
-use Espo\ORM\Query\Part\OrderExpression;
+use Espo\ORM\Query\Part\Order;
 use Espo\ORM\Query\Part\WhereClause;
 use Espo\ORM\Query\Part\Join;
 
@@ -40,7 +40,7 @@ trait SelectingTrait
     /**
      * Get ORDER items.
      *
-     * @return OrderExpression[]
+     * @return Order[]
      */
     public function getOrder(): array
     {
@@ -49,12 +49,12 @@ trait SelectingTrait
                 if (is_array($item) && count($item)) {
                     $itemValue = is_int($item[0]) ? (string) $item[0] : $item[0];
 
-                    return OrderExpression::fromString($itemValue)
-                        ->withDirection($item[1] ?? OrderExpression::ASC);
+                    return Order::fromString($itemValue)
+                        ->withDirection($item[1] ?? Order::ASC);
                 }
 
                 if (is_string($item)) {
-                    return OrderExpression::fromString($item);
+                    return Order::fromString($item);
                 }
 
                 throw new RuntimeException("Bad order item.");
diff --git a/application/Espo/ORM/Query/UnionBuilder.php b/application/Espo/ORM/Query/UnionBuilder.php
index 79c19bb6a1..1ea514541f 100644
--- a/application/Espo/ORM/Query/UnionBuilder.php
+++ b/application/Espo/ORM/Query/UnionBuilder.php
@@ -29,7 +29,7 @@
 
 namespace Espo\ORM\Query;
 
-use Espo\ORM\Query\Part\OrderExpression;
+use Espo\ORM\Query\Part\Order;
 
 use InvalidArgumentException;
 
@@ -91,10 +91,10 @@ class UnionBuilder implements Builder
      * @param int|string|array $orderBy A position in select (starting from 1) or select alias.
      * @param string|bool $direction OrderExpression::ASC|OrderExpression::DESC. TRUE for DESC order.
      */
-    public function order($orderBy, $direction = OrderExpression::ASC): self
+    public function order($orderBy, $direction = Order::ASC): self
     {
         if (is_bool($direction)) {
-            $direction = $direction ? OrderExpression::DESC : OrderExpression::ASC;
+            $direction = $direction ? Order::DESC : Order::ASC;
         }
 
         if (!$orderBy) {
diff --git a/application/Espo/Services/GlobalSearch.php b/application/Espo/Services/GlobalSearch.php
index 03461f0958..3faf623578 100644
--- a/application/Espo/Services/GlobalSearch.php
+++ b/application/Espo/Services/GlobalSearch.php
@@ -31,7 +31,7 @@ namespace Espo\Services;
 
 use Espo\ORM\{
     Query\Select,
-    Query\Part\OrderExpression,
+    Query\Part\Order,
 };
 
 use Espo\Core\{
@@ -211,7 +211,7 @@ class GlobalSearch implements
 
             $queryBuilder->select($fullTextSearchData->getExpression(), 'relevance');
 
-            $queryBuilder->order($fullTextSearchData->getExpression(), OrderExpression::DESC);
+            $queryBuilder->order($fullTextSearchData->getExpression(), Order::DESC);
         }
         else {
             $queryBuilder->select('VALUE:1.1', 'relevance');
diff --git a/tests/unit/Espo/ORM/MysqlQueryComposerTest.php b/tests/unit/Espo/ORM/MysqlQueryComposerTest.php
index 054ec2ac85..2d5a7ee7b9 100644
--- a/tests/unit/Espo/ORM/MysqlQueryComposerTest.php
+++ b/tests/unit/Espo/ORM/MysqlQueryComposerTest.php
@@ -37,7 +37,7 @@ use Espo\ORM\{
     EntityManager,
     MetadataDataProvider,
     Query\Part\Expression,
-    Query\Part\OrderExpression,
+    Query\Part\Order,
 };
 
 use Espo\ORM\Query\{
@@ -1069,7 +1069,7 @@ class MysqlQueryComposerTest extends \PHPUnit\Framework\TestCase
             ->from('Comment')
             ->leftJoin('post')
             ->order(
-                OrderExpression::createByPositionInList(
+                Order::createByPositionInList(
                     Expression::column('post.name'),
                     [
                         'Test',
diff --git a/tests/unit/Espo/ORM/Query/Part/OrderExpressionTest.php b/tests/unit/Espo/ORM/Query/Part/OrderExpressionTest.php
index 14f769ad74..99267793de 100644
--- a/tests/unit/Espo/ORM/Query/Part/OrderExpressionTest.php
+++ b/tests/unit/Espo/ORM/Query/Part/OrderExpressionTest.php
@@ -29,7 +29,7 @@
 
 namespace tests\unit\Espo\ORM\Query\Part;
 
-use Espo\ORM\Query\Part\OrderExpression as OrderExpr;
+use Espo\ORM\Query\Part\Order as OrderExpr;
 use Espo\ORM\Query\Part\Expression as Expr;
 
 class OrderExpressionTest extends \PHPUnit\Framework\TestCase
diff --git a/tests/unit/Espo/ORM/Query/SelectBuilderTest.php b/tests/unit/Espo/ORM/Query/SelectBuilderTest.php
index 64226ef134..5c00eb145d 100644
--- a/tests/unit/Espo/ORM/Query/SelectBuilderTest.php
+++ b/tests/unit/Espo/ORM/Query/SelectBuilderTest.php
@@ -34,7 +34,7 @@ use Espo\ORM\{
     Query\Part\Condition as Cond,
     Query\Part\Expression as Expr,
     Query\Part\Selection,
-    Query\Part\OrderExpression,
+    Query\Part\Order,
     Query\Part\Join,
     Query\Part\WhereClause,
 };
@@ -340,14 +340,14 @@ class SelectBuilderTest extends \PHPUnit\Framework\TestCase
     {
         $select = $this->builder
             ->from('Test')
-            ->order(OrderExpression::fromString('test')->withDesc())
+            ->order(Order::fromString('test')->withDesc())
             ->order('hello', true)
             ->build();
 
         $this->assertEquals(
             [
-                OrderExpression::fromString('test')->withDesc(),
-                OrderExpression::fromString('hello')->withDesc(),
+                Order::fromString('test')->withDesc(),
+                Order::fromString('hello')->withDesc(),
             ],
             $select->getOrder()
         );
@@ -358,15 +358,15 @@ class SelectBuilderTest extends \PHPUnit\Framework\TestCase
         $select = $this->builder
             ->from('Test')
             ->order([
-                OrderExpression::fromString('test')->withDesc(),
+                Order::fromString('test')->withDesc(),
                 ['hello', true],
             ])
             ->build();
 
         $this->assertEquals(
             [
-                OrderExpression::fromString('test')->withDesc(),
-                OrderExpression::fromString('hello')->withDesc(),
+                Order::fromString('test')->withDesc(),
+                Order::fromString('hello')->withDesc(),
             ],
             $select->getOrder()
         );
diff --git a/tests/unit/Espo/ORM/Repository/RDBRepositoryTest.php b/tests/unit/Espo/ORM/Repository/RDBRepositoryTest.php
index 8eb22749bc..87ffba1021 100644
--- a/tests/unit/Espo/ORM/Repository/RDBRepositoryTest.php
+++ b/tests/unit/Espo/ORM/Repository/RDBRepositoryTest.php
@@ -48,7 +48,7 @@ use Espo\ORM\{
     MetadataDataProvider,
     Query\Part\Condition as Cond,
     Query\Part\Expression as Expr,
-    Query\Part\OrderExpression as OrderExpr,
+    Query\Part\Order as OrderExpr,
 };
 
 use RuntimeException;