diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo.Abp.BackgroundJobs.MongoDB.Tests.csproj b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo.Abp.BackgroundJobs.MongoDB.Tests.csproj
index f3fb433d10..e999356678 100644
--- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo.Abp.BackgroundJobs.MongoDB.Tests.csproj
+++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo.Abp.BackgroundJobs.MongoDB.Tests.csproj
@@ -13,8 +13,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Include="Mongo2Go" Version="2.2.9" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
+    <PackageReference Include="Mongo2Go" Version="2.2.11" />
   </ItemGroup>
 
 </Project>
diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyProjectNameAppServiceBase.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyProjectNameAppService.cs
similarity index 65%
rename from templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyProjectNameAppServiceBase.cs
rename to templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyProjectNameAppService.cs
index e54468cb79..31bfbeb0de 100644
--- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyProjectNameAppServiceBase.cs
+++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/MyProjectNameAppService.cs
@@ -3,9 +3,9 @@ using Volo.Abp.Application.Services;
 
 namespace MyCompanyName.MyProjectName
 {
-    public abstract class MyProjectNameAppServiceBase : ApplicationService
+    public abstract class MyProjectNameAppService : ApplicationService
     {
-        protected MyProjectNameAppServiceBase()
+        protected MyProjectNameAppService()
         {
             LocalizationResource = typeof(MyProjectNameResource);
         }
diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/Samples/SampleAppService.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/Samples/SampleAppService.cs
index d193c3f895..f34b7771bd 100644
--- a/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/Samples/SampleAppService.cs
+++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Application/Samples/SampleAppService.cs
@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Authorization;
 
 namespace MyCompanyName.MyProjectName.Samples
 {
-    public class SampleAppService : MyProjectNameAppServiceBase, ISampleAppService
+    public class SampleAppService : MyProjectNameAppService, ISampleAppService
     {
         public Task<SampleDto> GetAsync()
         {
diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameControllerBase.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameController.cs
similarity index 66%
rename from templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameControllerBase.cs
rename to templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameController.cs
index f447b65456..1dd9a6c8b2 100644
--- a/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameControllerBase.cs
+++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameController.cs
@@ -3,9 +3,9 @@ using Volo.Abp.AspNetCore.Mvc;
 
 namespace MyCompanyName.MyProjectName
 {
-    public class MyProjectNameControllerBase : AbpController
+    public abstract class MyProjectNameController : AbpController
     {
-        public MyProjectNameControllerBase()
+        protected MyProjectNameController()
         {
             LocalizationResource = typeof(MyProjectNameResource);
         }
diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/Samples/SampleController.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/Samples/SampleController.cs
index 7c4de3b65e..1bf34c32c4 100644
--- a/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/Samples/SampleController.cs
+++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.HttpApi/Samples/SampleController.cs
@@ -7,7 +7,7 @@ namespace MyCompanyName.MyProjectName.Samples
 {
     [RemoteService]
     [Route("api/MyProjectName/sample")]
-    public class SampleController : MyProjectNameControllerBase, ISampleAppService
+    public class SampleController : MyProjectNameController, ISampleAppService
     {
         private readonly ISampleAppService _sampleAppService;
 
diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectName/Index.cshtml b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectName/Index.cshtml
new file mode 100644
index 0000000000..0ef7562269
--- /dev/null
+++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectName/Index.cshtml
@@ -0,0 +1,7 @@
+@page
+@inherits MyCompanyName.MyProjectName.Web.Pages.MyProjectNamePage
+@model MyCompanyName.MyProjectName.Web.Pages.MyProjectName.IndexModel
+@{
+}
+<h1>MyProjectName</h1>
+<p>A sample page for the MyProjectName module.</p>
\ No newline at end of file
diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectName/Index.cshtml.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectName/Index.cshtml.cs
new file mode 100644
index 0000000000..a9c43a1c88
--- /dev/null
+++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectName/Index.cshtml.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace MyCompanyName.MyProjectName.Web.Pages.MyProjectName
+{
+    public class IndexModel : PageModel
+    {
+        public void OnGet()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePage.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePage.cs
new file mode 100644
index 0000000000..5fe044221d
--- /dev/null
+++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePage.cs
@@ -0,0 +1,16 @@
+using Microsoft.AspNetCore.Mvc.Localization;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using MyCompanyName.MyProjectName.Localization;
+using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
+
+namespace MyCompanyName.MyProjectName.Web.Pages
+{
+    /* Inherit your UI Pages from this class. To do that, add this line to your Pages (.cshtml files under the Page folder):
+     * @inherits MyCompanyName.MyProjectName.Web.Pages.MyProjectNamePage
+     */
+    public abstract class MyProjectNamePage : AbpPage
+    {
+        [RazorInject]
+        public IHtmlLocalizer<MyProjectNameResource> L { get; set; }
+    }
+}
diff --git a/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageModel.cs b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageModel.cs
new file mode 100644
index 0000000000..d0b9c04a45
--- /dev/null
+++ b/templates/mvc-module/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageModel.cs
@@ -0,0 +1,15 @@
+using MyCompanyName.MyProjectName.Localization;
+using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
+
+namespace MyCompanyName.MyProjectName.Web.Pages
+{
+    /* Inherit your PageModel classes from this class.
+     */
+    public abstract class MyProjectNamePageModel : AbpPageModel
+    {
+        protected MyProjectNamePageModel()
+        {
+            LocalizationResourceType = typeof(MyProjectNameResource);
+        }
+    }
+}
\ No newline at end of file