diff --git a/application/Espo/Core/Action/Service.php b/application/Espo/Core/Action/Service.php
index 027fb5ba2e..61317ccb6a 100644
--- a/application/Espo/Core/Action/Service.php
+++ b/application/Espo/Core/Action/Service.php
@@ -34,7 +34,7 @@ use Espo\Core\{
     Exceptions\ForbiddenSilent,
     Exceptions\BadRequest,
     Exceptions\NotFound,
-    RecordServiceContainer,
+    Record\ServiceContainer as RecordServiceContainer,
     Acl,
 };
 
diff --git a/application/Espo/Core/Binding/DefaultBinding.php b/application/Espo/Core/Binding/DefaultBinding.php
index 23ef18f386..3af5331d95 100644
--- a/application/Espo/Core/Binding/DefaultBinding.php
+++ b/application/Espo/Core/Binding/DefaultBinding.php
@@ -104,7 +104,7 @@ class DefaultBinding implements BindingProcessor
         );
 
         $binder->bindService(
-            'Espo\\Core\\RecordServiceContainer',
+            'Espo\\Core\\Record\\ServiceContainer',
             'recordServiceContainer'
         );
 
diff --git a/application/Espo/Core/Controllers/RecordBase.php b/application/Espo/Core/Controllers/RecordBase.php
index f92c6bcd1e..31f2d42c75 100644
--- a/application/Espo/Core/Controllers/RecordBase.php
+++ b/application/Espo/Core/Controllers/RecordBase.php
@@ -39,7 +39,7 @@ use Espo\Core\{
     ORM\EntityManager,
     Utils\ControllerUtil,
     Record\Collection as RecordCollection,
-    RecordServiceContainer,
+    Record\ServiceContainer as RecordServiceContainer,
     Api\Request,
     Api\Response,
     Record\Crud as CrudService,
diff --git a/application/Espo/Core/Di/RecordServiceContainerAware.php b/application/Espo/Core/Di/RecordServiceContainerAware.php
index fa78ba9c07..60b88dce04 100644
--- a/application/Espo/Core/Di/RecordServiceContainerAware.php
+++ b/application/Espo/Core/Di/RecordServiceContainerAware.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Core\Di;
 
-use Espo\Core\RecordServiceContainer;
+use Espo\Core\Record\ServiceContainer as RecordServiceContainer;
 
 interface RecordServiceContainerAware
 {
diff --git a/application/Espo/Core/Di/RecordServiceContainerSetter.php b/application/Espo/Core/Di/RecordServiceContainerSetter.php
index 2918c65721..ae3b549a58 100644
--- a/application/Espo/Core/Di/RecordServiceContainerSetter.php
+++ b/application/Espo/Core/Di/RecordServiceContainerSetter.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Core\Di;
 
-use Espo\Core\RecordServiceContainer;
+use Espo\Core\Record\ServiceContainer as RecordServiceContainer;
 
 trait RecordServiceContainerSetter
 {
diff --git a/application/Espo/Core/MassAction/Actions/MassDelete.php b/application/Espo/Core/MassAction/Actions/MassDelete.php
index 3b31cb06c7..ab507cbf16 100644
--- a/application/Espo/Core/MassAction/Actions/MassDelete.php
+++ b/application/Espo/Core/MassAction/Actions/MassDelete.php
@@ -36,7 +36,7 @@ use Espo\Core\{
     MassAction\Data,
     MassAction\MassAction,
     Acl,
-    RecordServiceContainer,
+    Record\ServiceContainer as RecordServiceContainer,
     ORM\EntityManager,
     Exceptions\Forbidden,
 };
diff --git a/application/Espo/Core/RecordServiceContainer.php b/application/Espo/Core/Record/ServiceContainer.php
similarity index 94%
rename from application/Espo/Core/RecordServiceContainer.php
rename to application/Espo/Core/Record/ServiceContainer.php
index 9fcbca4271..9e3367602f 100644
--- a/application/Espo/Core/RecordServiceContainer.php
+++ b/application/Espo/Core/Record/ServiceContainer.php
@@ -27,12 +27,13 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core;
+namespace Espo\Core\Record;
 
-use Espo\Core\Exceptions\Error;
-
-use Espo\Core\ServiceFactory;
-use Espo\Core\Utils\Metadata;
+use Espo\Core\{
+    Exceptions\Error,
+    ServiceFactory,
+    Utils\Metadata,
+};
 
 use Espo\Services\Record;
 
@@ -41,11 +42,11 @@ use Espo\Services\Record;
  * Usually there's no need to have multiple record service instances of the same entity type.
  * Use this container instead of serviceFactory to get record services.
  */
-class RecordServiceContainer
+class ServiceContainer
 {
     private $data = [];
 
-    protected $defaultTypeMap = [
+    private $defaultTypeMap = [
         'CategoryTree' => 'RecordTree',
     ];
 
diff --git a/application/Espo/Resources/metadata/app/containerServices.json b/application/Espo/Resources/metadata/app/containerServices.json
index ff9c5e8d6f..f6c2f13ef7 100644
--- a/application/Espo/Resources/metadata/app/containerServices.json
+++ b/application/Espo/Resources/metadata/app/containerServices.json
@@ -39,7 +39,7 @@
         "className": "Espo\\Core\\ServiceFactory"
     },
     "recordServiceContainer": {
-        "className": "Espo\\Core\\RecordServiceContainer"
+        "className": "Espo\\Core\\Record\\ServiceContainer"
     },
     "templateFileManager": {
         "className": "Espo\\Core\\Utils\\TemplateFileManager"
diff --git a/application/Espo/Tools/DataPrivacy/Erasor.php b/application/Espo/Tools/DataPrivacy/Erasor.php
index abaed0d2c7..365d2671a4 100644
--- a/application/Espo/Tools/DataPrivacy/Erasor.php
+++ b/application/Espo/Tools/DataPrivacy/Erasor.php
@@ -33,7 +33,7 @@ use Espo\Core\Exceptions\Forbidden;
 use Espo\Core\Exceptions\NotFound;
 
 use Espo\Core\{
-    RecordServiceContainer,
+    Record\ServiceContainer as RecordServiceContainer,
     FieldProcessing\EmailAddress\AccessChecker as EmailAddressAccessChecker,
     FieldProcessing\PhoneNumber\AccessChecker as PhoneNumberAccessChecker,
 };
diff --git a/application/Espo/Tools/Import/Import.php b/application/Espo/Tools/Import/Import.php
index 33c9bc30a1..0fb903cc2c 100644
--- a/application/Espo/Tools/Import/Import.php
+++ b/application/Espo/Tools/Import/Import.php
@@ -37,7 +37,7 @@ use Espo\Core\{
     Utils\Metadata,
     Utils\Config,
     FileStorage\Manager as FileStorageManager,
-    RecordServiceContainer,
+    Record\ServiceContainer as RecordServiceContainer,
 };
 
 use Espo\{
diff --git a/application/Espo/Tools/Kanban/Kanban.php b/application/Espo/Tools/Kanban/Kanban.php
index 236f40a9b4..5767b9d087 100644
--- a/application/Espo/Tools/Kanban/Kanban.php
+++ b/application/Espo/Tools/Kanban/Kanban.php
@@ -36,7 +36,7 @@ use Espo\Core\{
     Select\SearchParams,
     FieldProcessing\ListLoadProcessor,
     FieldProcessing\LoaderParams as FieldLoaderParams,
-    RecordServiceContainer,
+    Record\ServiceContainer as RecordServiceContainer,
 };
 
 use Espo\{