diff --git a/application/Espo/Core/SelectManagerFactory.php b/application/Espo/Core/SelectManagerFactory.php
index 12244a2d23..1055ca57d6 100644
--- a/application/Espo/Core/SelectManagerFactory.php
+++ b/application/Espo/Core/SelectManagerFactory.php
@@ -32,7 +32,7 @@ namespace Espo\Core;
 use Espo\Core\Exceptions\Error;
 
 use Espo\Core\InjectableFactory;
-use Espo\Core\SelectManager;
+use Espo\Core\SelectManagers\SelectManager;
 use Espo\Core\ORM\EntityManager;
 use Espo\Entities\User;
 use Espo\Core\Utils\Util;
diff --git a/application/Espo/Core/SelectManagers/Base.php b/application/Espo/Core/SelectManagers/Base.php
index cf24f14965..66a3854a0f 100644
--- a/application/Espo/Core/SelectManagers/Base.php
+++ b/application/Espo/Core/SelectManagers/Base.php
@@ -29,8 +29,6 @@
 
 namespace Espo\Core\SelectManagers;
 
-use Espo\Core\SelectManager;
-
 /** Deprecated */
 class Base extends SelectManager
 {
diff --git a/application/Espo/Core/SelectManager.php b/application/Espo/Core/SelectManagers/SelectManager.php
similarity index 99%
rename from application/Espo/Core/SelectManager.php
rename to application/Espo/Core/SelectManagers/SelectManager.php
index 605a94a7c3..90403855db 100644
--- a/application/Espo/Core/SelectManager.php
+++ b/application/Espo/Core/SelectManagers/SelectManager.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core;
+namespace Espo\Core\SelectManagers;
 
 use Espo\Core\Exceptions\{
     Error,
diff --git a/application/Espo/Modules/Crm/SelectManagers/Account.php b/application/Espo/Modules/Crm/SelectManagers/Account.php
index 650168c4a9..5b83e6a131 100644
--- a/application/Espo/Modules/Crm/SelectManagers/Account.php
+++ b/application/Espo/Modules/Crm/SelectManagers/Account.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Modules\Crm\SelectManagers;
 
-class Account extends \Espo\Core\SelectManagers\Base
+class Account extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function filterPartners(&$result)
     {
diff --git a/application/Espo/Modules/Crm/SelectManagers/Call.php b/application/Espo/Modules/Crm/SelectManagers/Call.php
index b10f0fe892..1d897b0e82 100644
--- a/application/Espo/Modules/Crm/SelectManagers/Call.php
+++ b/application/Espo/Modules/Crm/SelectManagers/Call.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Modules\Crm\SelectManagers;
 
-class Call extends \Espo\Core\SelectManagers\Base
+class Call extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function accessOnlyOwn(&$result)
     {
diff --git a/application/Espo/Modules/Crm/SelectManagers/Campaign.php b/application/Espo/Modules/Crm/SelectManagers/Campaign.php
index 92a0dd4010..260809b7d6 100644
--- a/application/Espo/Modules/Crm/SelectManagers/Campaign.php
+++ b/application/Espo/Modules/Crm/SelectManagers/Campaign.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Modules\Crm\SelectManagers;
 
-class Campaign extends \Espo\Core\SelectManagers\Base
+class Campaign extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function filterActive(&$result)
     {
@@ -37,5 +37,4 @@ class Campaign extends \Espo\Core\SelectManagers\Base
             'status' => 'Active'
         );
     }
-
  }
diff --git a/application/Espo/Modules/Crm/SelectManagers/CampaignLogRecord.php b/application/Espo/Modules/Crm/SelectManagers/CampaignLogRecord.php
index a9372f7165..d5b39ea0a1 100644
--- a/application/Espo/Modules/Crm/SelectManagers/CampaignLogRecord.php
+++ b/application/Espo/Modules/Crm/SelectManagers/CampaignLogRecord.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Modules\Crm\SelectManagers;
 
-class CampaignLogRecord extends \Espo\Core\SelectManagers\Base
+class CampaignLogRecord extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function accessOnlyOwn(&$result)
     {
diff --git a/application/Espo/Modules/Crm/SelectManagers/CampaignTrackingUrl.php b/application/Espo/Modules/Crm/SelectManagers/CampaignTrackingUrl.php
index 7934a0d853..b1dc788b46 100644
--- a/application/Espo/Modules/Crm/SelectManagers/CampaignTrackingUrl.php
+++ b/application/Espo/Modules/Crm/SelectManagers/CampaignTrackingUrl.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Modules\Crm\SelectManagers;
 
-class CampaignTrackingUrl extends \Espo\Core\SelectManagers\Base
+class CampaignTrackingUrl extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function accessOnlyOwn(&$result)
     {
diff --git a/application/Espo/Modules/Crm/SelectManagers/CaseObj.php b/application/Espo/Modules/Crm/SelectManagers/CaseObj.php
index 4b1f03d51b..8ae4a64f09 100644
--- a/application/Espo/Modules/Crm/SelectManagers/CaseObj.php
+++ b/application/Espo/Modules/Crm/SelectManagers/CaseObj.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Modules\Crm\SelectManagers;
 
-class CaseObj extends \Espo\Core\SelectManagers\Base
+class CaseObj extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function boolFilterOpen(&$result)
     {
diff --git a/application/Espo/Modules/Crm/SelectManagers/Contact.php b/application/Espo/Modules/Crm/SelectManagers/Contact.php
index e78bff14a8..3d3a539ce7 100644
--- a/application/Espo/Modules/Crm/SelectManagers/Contact.php
+++ b/application/Espo/Modules/Crm/SelectManagers/Contact.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Modules\Crm\SelectManagers;
 
-class Contact extends \Espo\Core\SelectManagers\Base
+class Contact extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function filterPortalUsers(&$result)
     {
diff --git a/application/Espo/Modules/Crm/SelectManagers/Document.php b/application/Espo/Modules/Crm/SelectManagers/Document.php
index 6478f55c1d..409d88a206 100644
--- a/application/Espo/Modules/Crm/SelectManagers/Document.php
+++ b/application/Espo/Modules/Crm/SelectManagers/Document.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Modules\Crm\SelectManagers;
 
-class Document extends \Espo\Core\SelectManagers\Base
+class Document extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function filterActive(&$result)
     {
diff --git a/application/Espo/Modules/Crm/SelectManagers/EmailQueueItem.php b/application/Espo/Modules/Crm/SelectManagers/EmailQueueItem.php
index ce1b16cc2e..49656886ad 100644
--- a/application/Espo/Modules/Crm/SelectManagers/EmailQueueItem.php
+++ b/application/Espo/Modules/Crm/SelectManagers/EmailQueueItem.php
@@ -29,9 +29,8 @@
 
 namespace Espo\Modules\Crm\SelectManagers;
 
-class EmailQueueItem extends \Espo\Core\SelectManagers\Base
+class EmailQueueItem extends \Espo\Core\SelectManagers\SelectManager
 {
-
     protected function filterPending(&$result)
     {
         $result['whereClause'][] = array(
diff --git a/application/Espo/Modules/Crm/SelectManagers/KnowledgeBaseArticle.php b/application/Espo/Modules/Crm/SelectManagers/KnowledgeBaseArticle.php
index bee62e3aff..35e32f5ef8 100644
--- a/application/Espo/Modules/Crm/SelectManagers/KnowledgeBaseArticle.php
+++ b/application/Espo/Modules/Crm/SelectManagers/KnowledgeBaseArticle.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Modules\Crm\SelectManagers;
 
-class KnowledgeBaseArticle extends \Espo\Core\SelectManagers\Base
+class KnowledgeBaseArticle extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function filterPublished(&$result)
     {
diff --git a/application/Espo/Modules/Crm/SelectManagers/Lead.php b/application/Espo/Modules/Crm/SelectManagers/Lead.php
index 232b4474ab..cd2c2d325e 100644
--- a/application/Espo/Modules/Crm/SelectManagers/Lead.php
+++ b/application/Espo/Modules/Crm/SelectManagers/Lead.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Modules\Crm\SelectManagers;
 
-class Lead extends \Espo\Core\SelectManagers\Base
+class Lead extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function filterActive(&$result)
     {
diff --git a/application/Espo/Modules/Crm/SelectManagers/MassEmail.php b/application/Espo/Modules/Crm/SelectManagers/MassEmail.php
index 95528c1a95..ebe217d28d 100644
--- a/application/Espo/Modules/Crm/SelectManagers/MassEmail.php
+++ b/application/Espo/Modules/Crm/SelectManagers/MassEmail.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Modules\Crm\SelectManagers;
 
-class MassEmail extends \Espo\Core\SelectManagers\Base
+class MassEmail extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function filterActual(&$result)
     {
diff --git a/application/Espo/Modules/Crm/SelectManagers/Meeting.php b/application/Espo/Modules/Crm/SelectManagers/Meeting.php
index 418c0d07a9..a034cd89c6 100644
--- a/application/Espo/Modules/Crm/SelectManagers/Meeting.php
+++ b/application/Espo/Modules/Crm/SelectManagers/Meeting.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Modules\Crm\SelectManagers;
 
-class Meeting extends \Espo\Core\SelectManagers\Base
+class Meeting extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function accessOnlyOwn(&$result)
     {
diff --git a/application/Espo/Modules/Crm/SelectManagers/Opportunity.php b/application/Espo/Modules/Crm/SelectManagers/Opportunity.php
index d61e41b92f..b971d2324d 100644
--- a/application/Espo/Modules/Crm/SelectManagers/Opportunity.php
+++ b/application/Espo/Modules/Crm/SelectManagers/Opportunity.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Modules\Crm\SelectManagers;
 
-class Opportunity extends \Espo\Core\SelectManagers\Base
+class Opportunity extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function filterOpen(&$result)
     {
diff --git a/application/Espo/Modules/Crm/SelectManagers/Task.php b/application/Espo/Modules/Crm/SelectManagers/Task.php
index 49fd78aa58..4ec93f7717 100644
--- a/application/Espo/Modules/Crm/SelectManagers/Task.php
+++ b/application/Espo/Modules/Crm/SelectManagers/Task.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Modules\Crm\SelectManagers;
 
-class Task extends \Espo\Core\SelectManagers\Base
+class Task extends \Espo\Core\SelectManagers\SelectManager
 {
     protected $selectAttributesDependancyMap = [
         'dateEnd' => ['status']
diff --git a/application/Espo/SelectManagers/ActionHistoryRecord.php b/application/Espo/SelectManagers/ActionHistoryRecord.php
index 0c6a9006ed..a3f3012444 100644
--- a/application/Espo/SelectManagers/ActionHistoryRecord.php
+++ b/application/Espo/SelectManagers/ActionHistoryRecord.php
@@ -29,7 +29,7 @@
 
 namespace Espo\SelectManagers;
 
-class ActionHistoryRecord extends \Espo\Core\SelectManagers\Base
+class ActionHistoryRecord extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function boolFilterOnlyMy(&$result)
     {
diff --git a/application/Espo/SelectManagers/Attachment.php b/application/Espo/SelectManagers/Attachment.php
index 859e6bba09..d3ad944298 100644
--- a/application/Espo/SelectManagers/Attachment.php
+++ b/application/Espo/SelectManagers/Attachment.php
@@ -29,7 +29,7 @@
 
 namespace Espo\SelectManagers;
 
-class Attachment extends \Espo\Core\SelectManagers\Base
+class Attachment extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function filterOrphan(&$result)
     {
diff --git a/application/Espo/SelectManagers/AuthLogRecord.php b/application/Espo/SelectManagers/AuthLogRecord.php
index 2e10d4c065..e953593982 100644
--- a/application/Espo/SelectManagers/AuthLogRecord.php
+++ b/application/Espo/SelectManagers/AuthLogRecord.php
@@ -29,7 +29,7 @@
 
 namespace Espo\SelectManagers;
 
-class AuthLogRecord extends \Espo\Core\SelectManagers\Base
+class AuthLogRecord extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function filterDenied(&$result)
     {
diff --git a/application/Espo/SelectManagers/AuthToken.php b/application/Espo/SelectManagers/AuthToken.php
index d690dfdc02..9777730251 100644
--- a/application/Espo/SelectManagers/AuthToken.php
+++ b/application/Espo/SelectManagers/AuthToken.php
@@ -29,7 +29,7 @@
 
 namespace Espo\SelectManagers;
 
-class AuthToken extends \Espo\Core\SelectManagers\Base
+class AuthToken extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function filterActive(&$result)
     {
diff --git a/application/Espo/SelectManagers/Email.php b/application/Espo/SelectManagers/Email.php
index 58d9e52574..fd6235c7a3 100644
--- a/application/Espo/SelectManagers/Email.php
+++ b/application/Espo/SelectManagers/Email.php
@@ -29,7 +29,7 @@
 
 namespace Espo\SelectManagers;
 
-class Email extends \Espo\Core\SelectManagers\Base
+class Email extends \Espo\Core\SelectManagers\SelectManager
 {
     protected $textFilterUseContainsAttributeList = ['name'];
 
diff --git a/application/Espo/SelectManagers/EmailAccount.php b/application/Espo/SelectManagers/EmailAccount.php
index 03145604dc..18468b1786 100644
--- a/application/Espo/SelectManagers/EmailAccount.php
+++ b/application/Espo/SelectManagers/EmailAccount.php
@@ -29,7 +29,7 @@
 
 namespace Espo\SelectManagers;
 
-class EmailAccount extends \Espo\Core\SelectManagers\Base
+class EmailAccount extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function access(&$result)
     {
diff --git a/application/Espo/SelectManagers/EmailAddress.php b/application/Espo/SelectManagers/EmailAddress.php
index 1a5de9ed24..8a048bdda5 100644
--- a/application/Espo/SelectManagers/EmailAddress.php
+++ b/application/Espo/SelectManagers/EmailAddress.php
@@ -29,7 +29,7 @@
 
 namespace Espo\SelectManagers;
 
-class EmailAddress extends \Espo\Core\SelectManagers\Base
+class EmailAddress extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function filterOrphan(&$result)
     {
diff --git a/application/Espo/SelectManagers/EmailFilter.php b/application/Espo/SelectManagers/EmailFilter.php
index 6458f59853..56ec9ed3a0 100644
--- a/application/Espo/SelectManagers/EmailFilter.php
+++ b/application/Espo/SelectManagers/EmailFilter.php
@@ -29,7 +29,7 @@
 
 namespace Espo\SelectManagers;
 
-class EmailFilter extends \Espo\Core\SelectManagers\Base
+class EmailFilter extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function boolFilterOnlyMy(&$result)
     {
diff --git a/application/Espo/SelectManagers/EmailFolder.php b/application/Espo/SelectManagers/EmailFolder.php
index 274c172a12..e0fc7003d7 100644
--- a/application/Espo/SelectManagers/EmailFolder.php
+++ b/application/Espo/SelectManagers/EmailFolder.php
@@ -29,7 +29,7 @@
 
 namespace Espo\SelectManagers;
 
-class EmailFolder extends \Espo\Core\SelectManagers\Base
+class EmailFolder extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function access(&$result)
     {
diff --git a/application/Espo/SelectManagers/EmailTemplate.php b/application/Espo/SelectManagers/EmailTemplate.php
index 183921e8d1..c15c90ee51 100644
--- a/application/Espo/SelectManagers/EmailTemplate.php
+++ b/application/Espo/SelectManagers/EmailTemplate.php
@@ -29,7 +29,7 @@
 
 namespace Espo\SelectManagers;
 
-class EmailTemplate extends \Espo\Core\SelectManagers\Base
+class EmailTemplate extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function filterActual(&$result)
     {
diff --git a/application/Espo/SelectManagers/Import.php b/application/Espo/SelectManagers/Import.php
index d28fd6b860..7046acf299 100644
--- a/application/Espo/SelectManagers/Import.php
+++ b/application/Espo/SelectManagers/Import.php
@@ -29,7 +29,7 @@
 
 namespace Espo\SelectManagers;
 
-class Import extends \Espo\Core\SelectManagers\Base
+class Import extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function access(&$result)
     {
diff --git a/application/Espo/SelectManagers/PhoneNumber.php b/application/Espo/SelectManagers/PhoneNumber.php
index bd2010dce0..9634a6cede 100644
--- a/application/Espo/SelectManagers/PhoneNumber.php
+++ b/application/Espo/SelectManagers/PhoneNumber.php
@@ -29,7 +29,7 @@
 
 namespace Espo\SelectManagers;
 
-class PhoneNumber extends \Espo\Core\SelectManagers\Base
+class PhoneNumber extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function filterOrphan(&$result)
     {
diff --git a/application/Espo/SelectManagers/ScheduledJob.php b/application/Espo/SelectManagers/ScheduledJob.php
index 5cd0f201a5..4b3e2d9aa5 100644
--- a/application/Espo/SelectManagers/ScheduledJob.php
+++ b/application/Espo/SelectManagers/ScheduledJob.php
@@ -29,7 +29,7 @@
 
 namespace Espo\SelectManagers;
 
-class ScheduledJob extends \Espo\Core\SelectManagers\Base
+class ScheduledJob extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function access(&$result)
     {
diff --git a/application/Espo/SelectManagers/Team.php b/application/Espo/SelectManagers/Team.php
index 56faf1baae..382063bfb3 100644
--- a/application/Espo/SelectManagers/Team.php
+++ b/application/Espo/SelectManagers/Team.php
@@ -29,7 +29,7 @@
 
 namespace Espo\SelectManagers;
 
-class Team extends \Espo\Core\SelectManagers\Base
+class Team extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function boolFilterOnlyMy(&$result)
     {
diff --git a/application/Espo/SelectManagers/Template.php b/application/Espo/SelectManagers/Template.php
index 48892af504..e50b64ea84 100644
--- a/application/Espo/SelectManagers/Template.php
+++ b/application/Espo/SelectManagers/Template.php
@@ -29,7 +29,7 @@
 
 namespace Espo\SelectManagers;
 
-class Template extends \Espo\Core\SelectManagers\Base
+class Template extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function access(&$result)
     {
diff --git a/application/Espo/SelectManagers/User.php b/application/Espo/SelectManagers/User.php
index 2863ef5365..2ba3edaeea 100644
--- a/application/Espo/SelectManagers/User.php
+++ b/application/Espo/SelectManagers/User.php
@@ -29,7 +29,7 @@
 
 namespace Espo\SelectManagers;
 
-class User extends \Espo\Core\SelectManagers\Base
+class User extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function access(&$result)
     {
diff --git a/application/Espo/SelectManagers/Webhook.php b/application/Espo/SelectManagers/Webhook.php
index e7f4c72b41..35359bffd5 100644
--- a/application/Espo/SelectManagers/Webhook.php
+++ b/application/Espo/SelectManagers/Webhook.php
@@ -29,7 +29,7 @@
 
 namespace Espo\SelectManagers;
 
-class Webhook extends \Espo\Core\SelectManagers\Base
+class Webhook extends \Espo\Core\SelectManagers\SelectManager
 {
     protected function access(&$result)
     {