diff --git a/application/Espo/Core/Binding/DefaultBinding.php b/application/Espo/Core/Binding/DefaultBinding.php
index 90e5d151df..665e1ceea0 100644
--- a/application/Espo/Core/Binding/DefaultBinding.php
+++ b/application/Espo/Core/Binding/DefaultBinding.php
@@ -48,11 +48,6 @@ class DefaultBinding
             'entityManager'
         );
 
-        $binder->bindService(
-            'Espo\\ORM\\Metadata',
-            'ormMetadata'
-        );
-
         $binder->bindService(
             'Espo\\Core\\ORM\\EntityManager',
             'entityManager'
diff --git a/application/Espo/ORM/Mapper/BaseMapper.php b/application/Espo/ORM/Mapper/BaseMapper.php
index da89c29185..4e9ea042ab 100644
--- a/application/Espo/ORM/Mapper/BaseMapper.php
+++ b/application/Espo/ORM/Mapper/BaseMapper.php
@@ -193,7 +193,7 @@ class BaseMapper implements Mapper
             throw new RuntimeException();
         }
 
-        $params = $select->getRawParams();
+        $params = $select->getRaw();
 
         $params['aggregation'] = $aggregation;
         $params['aggregationBy'] = $aggregationBy;
@@ -227,7 +227,7 @@ class BaseMapper implements Mapper
         $params = [];
 
         if ($select) {
-            $params = $select->getRawParams();
+            $params = $select->getRaw();
         }
 
         $entityType = $entity->getEntityType();
@@ -600,7 +600,7 @@ class BaseMapper implements Mapper
      */
     public function massRelate(Entity $entity, string $relationName, Select $select)
     {
-        $params = $select->getRawParams();
+        $params = $select->getRaw();
 
         $id = $entity->id;
 
diff --git a/application/Espo/ORM/QueryComposer/BaseQueryComposer.php b/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
index a166ffed54..877c847b9a 100644
--- a/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
+++ b/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
@@ -245,35 +245,35 @@ abstract class BaseQueryComposer implements QueryComposer
 
     public function composeSelect(SelectQuery $queryParams) : string
     {
-        $params = $queryParams->getRawParams();
+        $params = $queryParams->getRaw();
 
         return $this->createSelectQueryInternal($params);
     }
 
     public function composeUpdate(UpdateQuery $queryParams) : string
     {
-        $params = $queryParams->getRawParams();
+        $params = $queryParams->getRaw();
 
         return $this->createUpdateQuery($params);
     }
 
     public function composeDelete(DeleteQuery $queryParams) : string
     {
-        $params = $queryParams->getRawParams();
+        $params = $queryParams->getRaw();
 
         return $this->createDeleteQuery($params);
     }
 
     public function composeInsert(InsertQuery $queryParams) : string
     {
-        $params = $queryParams->getRawParams();
+        $params = $queryParams->getRaw();
 
         return $this->createInsertQuery($params);
     }
 
     public function composeUnion(UnionQuery $queryParams) : string
     {
-        $params = $queryParams->getRawParams();
+        $params = $queryParams->getRaw();
 
         return $this->createUnionQuery($params);
     }
@@ -413,7 +413,7 @@ abstract class BaseQueryComposer implements QueryComposer
         $subSqlList = [];
 
         foreach ($selectQueryList as $select) {
-            $rawSelectParams = $select->getRawParams();
+            $rawSelectParams = $select->getRaw();
             $rawSelectParams['strictSelect'] = true;
             $select = SelectQuery::fromRaw($rawSelectParams);
 
diff --git a/application/Espo/ORM/QueryComposer/MysqlQueryComposer.php b/application/Espo/ORM/QueryComposer/MysqlQueryComposer.php
index 9dcf01570f..562628a46c 100644
--- a/application/Espo/ORM/QueryComposer/MysqlQueryComposer.php
+++ b/application/Espo/ORM/QueryComposer/MysqlQueryComposer.php
@@ -37,7 +37,7 @@ class MysqlQueryComposer extends BaseQueryComposer
 {
     public function composeLockTable(LockTableQuery $queryParams) : string
     {
-        $params = $queryParams->getRawParams();
+        $params = $queryParams->getRaw();
 
         $table = $this->toDb($this->sanitize($params['table']));
 
diff --git a/application/Espo/ORM/QueryParams/BaseBuilderTrait.php b/application/Espo/ORM/QueryParams/BaseBuilderTrait.php
index 25dc9c672a..49ab523064 100644
--- a/application/Espo/ORM/QueryParams/BaseBuilderTrait.php
+++ b/application/Espo/ORM/QueryParams/BaseBuilderTrait.php
@@ -50,6 +50,6 @@ trait BaseBuilderTrait
             throw new RuntimeException("Clone can be called only on a new empty builder instance.");
         }
 
-        $this->params = $query->getRawParams();
+        $this->params = $query->getRaw();
     }
 }
diff --git a/application/Espo/ORM/QueryParams/BaseTrait.php b/application/Espo/ORM/QueryParams/BaseTrait.php
index 2d50d173c7..ddbb00171c 100644
--- a/application/Espo/ORM/QueryParams/BaseTrait.php
+++ b/application/Espo/ORM/QueryParams/BaseTrait.php
@@ -36,7 +36,7 @@ trait BaseTrait
     /**
      * Get parameters in RAW format.
      */
-    public function getRawParams() : array
+    public function getRaw() : array
     {
         return $this->params;
     }
diff --git a/application/Espo/ORM/QueryParams/Query.php b/application/Espo/ORM/QueryParams/Query.php
index 5ec30050b0..d2d840ea30 100644
--- a/application/Espo/ORM/QueryParams/Query.php
+++ b/application/Espo/ORM/QueryParams/Query.php
@@ -37,5 +37,5 @@ interface Query
     /**
      * Get parameters in RAW format.
      */
-    public function getRawParams() : array;
+    public function getRaw() : array;
 }
diff --git a/application/Espo/ORM/Repository/RDBSelectBuilder.php b/application/Espo/ORM/Repository/RDBSelectBuilder.php
index 2578aee81f..129f191add 100644
--- a/application/Espo/ORM/Repository/RDBSelectBuilder.php
+++ b/application/Espo/ORM/Repository/RDBSelectBuilder.php
@@ -322,7 +322,7 @@ class RDBSelectBuilder
 
         $params = $params ?? [];
 
-        $builtParams = $this->builder->build()->getRawParams();
+        $builtParams = $this->builder->build()->getRaw();
 
         $whereClause = $builtParams['whereClause'] ?? [];
         $havingClause = $builtParams['havingClause'] ?? [];
diff --git a/application/Espo/Services/Stream.php b/application/Espo/Services/Stream.php
index 75053e8909..6922024e3d 100644
--- a/application/Espo/Services/Stream.php
+++ b/application/Espo/Services/Stream.php
@@ -1838,7 +1838,7 @@ class Stream
         $userList = $this->entityManager->getRepository('User')
             ->where([
                 'isActive' => true,
-                'id=s' => $subQuery->getRawParams(),
+                'id=s' => $subQuery->getRaw(),
             ])
             ->select(['id', 'type'])
             ->find();
diff --git a/tests/unit/Espo/ORM/QueryParams/SelectBuilderTest.php b/tests/unit/Espo/ORM/QueryParams/SelectBuilderTest.php
index 6e9a1d403e..30ec8f5a4a 100644
--- a/tests/unit/Espo/ORM/QueryParams/SelectBuilderTest.php
+++ b/tests/unit/Espo/ORM/QueryParams/SelectBuilderTest.php
@@ -47,7 +47,7 @@ class SelectBuilderTest extends \PHPUnit\Framework\TestCase
         $params = $this->builder
             ->from('Test')
             ->build()
-            ->getRawParams();
+            ->getRaw();
 
         $this->assertEquals('Test', $params['from']);
     }
@@ -108,7 +108,7 @@ class SelectBuilderTest extends \PHPUnit\Framework\TestCase
             ->where(['test' => null])
             ->build();
 
-        $raw = $select->getRawParams();
+        $raw = $select->getRaw();
 
         $this->assertEquals(['test' => null], $raw['whereClause']);
     }
@@ -120,7 +120,7 @@ class SelectBuilderTest extends \PHPUnit\Framework\TestCase
             ->where('test', null)
             ->build();
 
-        $raw = $select->getRawParams();
+        $raw = $select->getRaw();
 
         $this->assertEquals(['test' => null], $raw['whereClause']);
     }
@@ -133,7 +133,7 @@ class SelectBuilderTest extends \PHPUnit\Framework\TestCase
             ->groupBy(['test'])
             ->build();
 
-        $raw = $select->getRawParams();
+        $raw = $select->getRaw();
 
         $this->assertEquals(['test' => null], $raw['havingClause']);
 
@@ -157,8 +157,8 @@ class SelectBuilderTest extends \PHPUnit\Framework\TestCase
             ->where('test2', '2')
             ->build();
 
-        $params = $select->getRawParams();
-        $paramsCloned = $selectCloned->getRawParams();
+        $params = $select->getRaw();
+        $paramsCloned = $selectCloned->getRaw();
 
         $this->assertTrue($paramsCloned['distinct']);
         $this->assertFalse($params['distinct'] ?? false);
@@ -195,7 +195,7 @@ class SelectBuilderTest extends \PHPUnit\Framework\TestCase
             ->where(['test' => '2'])
             ->build();
 
-        $raw = $select->getRawParams();
+        $raw = $select->getRaw();
 
         $expected = [
             'test' => '1',
@@ -223,7 +223,7 @@ class SelectBuilderTest extends \PHPUnit\Framework\TestCase
             ])
             ->build();
 
-        $raw = $select->getRawParams();
+        $raw = $select->getRaw();
 
         $expected = [
             'OR' => [
@@ -247,7 +247,7 @@ class SelectBuilderTest extends \PHPUnit\Framework\TestCase
             ->leftJoin('link1')
             ->leftJoin('link2')
             ->build()
-            ->getRawParams();
+            ->getRaw();
 
         $this->assertEquals(['link1', 'link2'], $params['leftJoins']);
     }
@@ -260,7 +260,7 @@ class SelectBuilderTest extends \PHPUnit\Framework\TestCase
             ->join('link1')
             ->join('link2')
             ->build()
-            ->getRawParams();
+            ->getRaw();
 
         $this->assertEquals(['link1', 'link2'], $params['joins']);
     }