diff --git a/test/BlazorServerSide/AbpBlazorServerDemo/AbpBlazorServerDemo.csproj b/test/BlazorServerSide/AbpBlazorServerDemo/AbpBlazorServerDemo.csproj
index 2ed3a4bfc5..6680c3bb51 100644
--- a/test/BlazorServerSide/AbpBlazorServerDemo/AbpBlazorServerDemo.csproj
+++ b/test/BlazorServerSide/AbpBlazorServerDemo/AbpBlazorServerDemo.csproj
@@ -54,9 +54,9 @@
     <ProjectReference Include="..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
     <ProjectReference Include="..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
     <ProjectReference Include="..\..\..\framework\src\Volo.Abp.BlazoriseUI\Volo.Abp.BlazoriseUI.csproj" />
-    <ProjectReference Include="..\..\..\framework\src\Volo.Abp.AspNetCore.Components.UI.BasicTheme\Volo.Abp.AspNetCore.Components.UI.BasicTheme.csproj" />
-    <ProjectReference Include="..\..\..\framework\src\Volo.Abp.AspNetCore.Components.UI.Theming\Volo.Abp.AspNetCore.Components.UI.Theming.csproj" />
-    <ProjectReference Include="..\..\..\framework\src\Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server\Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server.csproj" />
+    <ProjectReference Include="..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Web.BasicTheme\Volo.Abp.AspNetCore.Components.Web.BasicTheme.csproj" />
+    <ProjectReference Include="..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Web.Theming\Volo.Abp.AspNetCore.Components.Web.Theming.csproj" />
+    <ProjectReference Include="..\..\..\framework\src\Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server\Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server.csproj" />
     
     
     <ProjectReference Include="..\..\..\modules\account\src\Volo.Abp.Account.Application.Contracts\Volo.Abp.Account.Application.Contracts.csproj" />
diff --git a/test/BlazorServerSide/AbpBlazorServerDemo/AbpBlazorServerDemoModule.cs b/test/BlazorServerSide/AbpBlazorServerDemo/AbpBlazorServerDemoModule.cs
index 880e1a0ec0..cf78319264 100644
--- a/test/BlazorServerSide/AbpBlazorServerDemo/AbpBlazorServerDemoModule.cs
+++ b/test/BlazorServerSide/AbpBlazorServerDemo/AbpBlazorServerDemoModule.cs
@@ -5,19 +5,19 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Volo.Abp;
-using Volo.Abp.AspNetCore.Components.UI.BasicTheme;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
 using Volo.Abp.Autofac;
 using Volo.Abp.BlazoriseUI;
 using Volo.Abp.Modularity;
-using Volo.Abp.AspNetCore.Components.UI.Theming.Routing;
+using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.UI.Navigation;
 using MyCompanyName.MyProjectName.Blazor.Menus;
+using Volo.Abp.AspNetCore.Components.Web.BasicTheme;
 using Volo.Abp.Identity.Blazor;
 using Volo.Abp.TenantManagement.Blazor;
-using Volo.Abp.AspNetCore.Components.UI.BasicTheme.Server;
-using Volo.Abp.AspNetCore.Components.UI.Theming.Toolbars;
+using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server;
+using Volo.Abp.AspNetCore.Components.Web.Theming.Toolbars;
 
 namespace AbpBlazorServerDemo
 {
@@ -26,7 +26,7 @@ namespace AbpBlazorServerDemo
         typeof( AbpAspNetCoreMvcModule ),
         typeof( AbpAspNetCoreMvcUiBasicThemeModule ),
         typeof( AbpBlazoriseUIModule ),
-        typeof( AbpAspNetCoreComponentsUiBasicThemeModule ),
+        typeof( AbpAspNetCoreComponentsWebBasicThemeModule ),
         typeof( AbpIdentityBlazorModule ),
         typeof( AbpTenantManagementBlazorModule )
     )]
diff --git a/test/BlazorServerSide/AbpBlazorServerDemo/Pages/_Host.cshtml b/test/BlazorServerSide/AbpBlazorServerDemo/Pages/_Host.cshtml
index cd648f073d..8c3bcb125f 100644
--- a/test/BlazorServerSide/AbpBlazorServerDemo/Pages/_Host.cshtml
+++ b/test/BlazorServerSide/AbpBlazorServerDemo/Pages/_Host.cshtml
@@ -1,5 +1,5 @@
 @page "/"
-@using Volo.Abp.AspNetCore.Components.UI.BasicTheme.Themes.Basic
+@using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic
 @namespace AbpBlazorServerDemo.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @{