diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs
index 2a3c4652af..051b4a1da5 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs
@@ -71,7 +71,7 @@ namespace Volo.Abp.Cli.Commands
         private string FindTenantDbContextName(string dbMigrationsFolder)
         {
             var tenantDbContext = Directory
-                .GetFiles(dbMigrationsFolder, "*TenantMigrationsDbContext.cs", SearchOption.AllDirectories)
+                .GetFiles(dbMigrationsFolder, "*TenantDbContext.cs", SearchOption.AllDirectories)
                 .FirstOrDefault();
 
             if (tenantDbContext == null)
@@ -85,8 +85,8 @@ namespace Volo.Abp.Cli.Commands
         private string FindDbContextName(string dbMigrationsFolder)
         {
             var dbContext = Directory
-                .GetFiles(dbMigrationsFolder, "*MigrationsDbContext.cs", SearchOption.AllDirectories)
-                .FirstOrDefault(fp => !fp.EndsWith("TenantMigrationsDbContext.cs"));
+                .GetFiles(dbMigrationsFolder, "*DbContext.cs", SearchOption.AllDirectories)
+                .FirstOrDefault(fp => !fp.EndsWith("TenantDbContext.cs"));
 
             if (dbContext == null)
             {
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationManager.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationManager.cs
index 8143acf7b8..77c2ec0649 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationManager.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationManager.cs
@@ -70,8 +70,8 @@ namespace Volo.Abp.Cli.ProjectModification
         protected virtual string FindDbContextName(string dbMigrationsFolder)
         {
             var dbContext = Directory
-                .GetFiles(dbMigrationsFolder, "*MigrationsDbContext.cs", SearchOption.AllDirectories)
-                .FirstOrDefault(fp => !fp.EndsWith("TenantMigrationsDbContext.cs"));
+                .GetFiles(dbMigrationsFolder, "*DbContext.cs", SearchOption.AllDirectories)
+                .FirstOrDefault(fp => !fp.EndsWith("TenantDbContext.cs"));
 
             if (dbContext == null)
             {
@@ -84,7 +84,7 @@ namespace Volo.Abp.Cli.ProjectModification
         protected virtual string FindTenantDbContextName(string dbMigrationsFolder)
         {
             var tenantDbContext = Directory
-                .GetFiles(dbMigrationsFolder, "*TenantMigrationsDbContext.cs", SearchOption.AllDirectories)
+                .GetFiles(dbMigrationsFolder, "*TenantDbContext.cs", SearchOption.AllDirectories)
                 .FirstOrDefault();
 
             if (tenantDbContext == null)