diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AbpModuleClassFinder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AbpModuleClassFinder.cs
index e42bd1e16a..0cdcc89fff 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AbpModuleClassFinder.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AbpModuleClassFinder.cs
@@ -14,7 +14,7 @@ namespace Volo.Abp.Cli.ProjectModification
             var moduleFilePaths = new List<string>();
 
             var csFiles = new DirectoryInfo(Path.GetDirectoryName(csprojFilePath))
-                .GetFiles("*Module.cs", SearchOption.AllDirectories) //TODO: Module assumption is not so good!
+                .GetFiles("*.cs", SearchOption.AllDirectories)
                 .Select(f => f.FullName)
                 .ToList();