diff --git a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/BlogPostLister.cs b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/BlogPostLister.cs
index 4e0d170744..f0a8ae0a0d 100644
--- a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/BlogPostLister.cs
+++ b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/BlogPostLister.cs
@@ -4,7 +4,7 @@ using AbpDesk.Blogging;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Guids;
 using Volo.Abp.Uow;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace AbpDesk.ConsoleDemo
 {
diff --git a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/TicketLister.cs b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/TicketLister.cs
index 125d732a53..ab581b337a 100644
--- a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/TicketLister.cs
+++ b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/TicketLister.cs
@@ -2,7 +2,7 @@ using System;
 using AbpDesk.Tickets;
 using AbpDesk.Tickets.Dtos;
 using Volo.Abp.Threading;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace AbpDesk.ConsoleDemo
 {
diff --git a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/UserLister.cs b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/UserLister.cs
index b5aa8698d2..51a5a8f1e0 100644
--- a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/UserLister.cs
+++ b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/UserLister.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Linq;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Identity;
 using Volo.Abp.Threading;
 using Volo.Abp.Uow;
-using Volo.DependencyInjection;
 
 namespace AbpDesk.ConsoleDemo
 {
diff --git a/src/AbpDesk/AbpDesk.Domain/AbpDesk/Tickets/Ticket.cs b/src/AbpDesk/AbpDesk.Domain/AbpDesk/Tickets/Ticket.cs
index ac883c0889..2a5bc4579e 100644
--- a/src/AbpDesk/AbpDesk.Domain/AbpDesk/Tickets/Ticket.cs
+++ b/src/AbpDesk/AbpDesk.Domain/AbpDesk/Tickets/Ticket.cs
@@ -1,6 +1,7 @@
 using System;
 using JetBrains.Annotations;
 using Volo;
+using Volo.Abp;
 using Volo.Abp.Domain.Entities;
 
 namespace AbpDesk.Tickets
diff --git a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/BlogPost.cs b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/BlogPost.cs
index 3ae4b3f678..352b00d21c 100644
--- a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/BlogPost.cs
+++ b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/BlogPost.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using Volo;
+using Volo.Abp;
 using Volo.Abp.Domain.Entities;
 
 namespace AbpDesk.Blogging
diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs
index d4643e11e8..91562c41a0 100644
--- a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs
@@ -14,7 +14,7 @@ using Volo.Abp.Autofac;
 using Volo.Abp.Identity;
 using Volo.Abp.Identity.Web;
 using Volo.Abp.Modularity;
-using Volo.Abp.UI.Navigation;
+using Volo.Abp.Ui.Navigation;
 
 namespace AbpDesk.Web.Mvc
 {
diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Navigation/MainMenuContributor.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Navigation/MainMenuContributor.cs
index 2c3efe861d..bf5945ef62 100644
--- a/src/AbpDesk/AbpDesk.Web.Mvc/Navigation/MainMenuContributor.cs
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/Navigation/MainMenuContributor.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using Volo.Abp.UI.Navigation;
+using Volo.Abp.Ui.Navigation;
 
 namespace AbpDesk.Web.Mvc.Navigation
 {
diff --git a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll
index 95cabe3c23..961a4e684b 100644
Binary files a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll and b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll differ
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Views/Shared/Components/AbpMenu/Default.cshtml b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Views/Shared/Components/AbpMenu/Default.cshtml
index ab61aa4618..f00fcfe765 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Views/Shared/Components/AbpMenu/Default.cshtml
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Views/Shared/Components/AbpMenu/Default.cshtml
@@ -1,5 +1,6 @@
 @using System.Threading.Tasks
-@model Volo.Abp.UI.Navigation.ApplicationMenu
+@using Volo.Abp.Ui.Navigation
+@model Volo.Abp.Ui.Navigation.ApplicationMenu
 <nav class="navbar navbar-toggleable-md navbar-inverse bg-inverse fixed-top">
     <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Views/Shared/_AppLayout.cshtml b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Views/Shared/_AppLayout.cshtml
index 2e376dc2a8..816ab58948 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Views/Shared/_AppLayout.cshtml
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Views/Shared/_AppLayout.cshtml
@@ -1,4 +1,4 @@
-@using Volo.Abp.UI.Navigation
+@using Volo.Abp.Ui.Navigation
 @{
     Layout = null;
 }
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/AbpAspNetCoreMvcUiModule.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/AbpAspNetCoreMvcUiModule.cs
index f2c9f02f5c..44103429fd 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI/AbpAspNetCoreMvcUiModule.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI/AbpAspNetCoreMvcUiModule.cs
@@ -2,7 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.EmbeddedFiles;
 using Volo.Abp.Modularity;
-using Volo.Abp.UI.Navigation;
+using Volo.Abp.Ui.Navigation;
 
 namespace Volo.Abp.AspNetCore.Mvc
 {
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/Bundling/BundleManager.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Bundling/BundleManager.cs
index 6a4ecd8fdb..a8bccaacb8 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI/Bundling/BundleManager.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI/Bundling/BundleManager.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Options;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.AspNetCore.Mvc.Bundling
 {
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/EmbeddedDemoMainMenuContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/EmbeddedDemoMainMenuContributor.cs
index 1badcae029..994dc97b73 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI/EmbeddedDemoMainMenuContributor.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI/EmbeddedDemoMainMenuContributor.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using Volo.Abp.UI.Navigation;
+using Volo.Abp.Ui.Navigation;
 
 namespace Volo.Abp.AspNetCore.Mvc
 {
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpMenu/AbpMenuViewComponent.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpMenu/AbpMenuViewComponent.cs
index 0118709b41..769db22ead 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpMenu/AbpMenuViewComponent.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpMenu/AbpMenuViewComponent.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
-using Volo.Abp.UI.Navigation;
+using Volo.Abp.Ui.Navigation;
 
 namespace Volo.Abp.AspNetCore.Mvc.Views.Shared.Components.AbpMenu
 {
diff --git a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs
index a6f132ea1e..dd6bc14a65 100644
--- a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs
@@ -6,8 +6,8 @@ using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Volo.Abp.AspNetCore.EmbeddedFiles;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Modularity;
-using Volo.DependencyInjection;
 
 namespace Volo.Abp.AspNetCore.Mvc
 {
diff --git a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpController.cs b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpController.cs
index 7350ba5295..d3d49950cf 100644
--- a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpController.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpController.cs
@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.AspNetCore.Mvc
 {
diff --git a/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs b/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs
index 5ab6e59158..ff86c4993c 100644
--- a/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs
+++ b/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs
@@ -2,7 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo;
 using Volo.Abp;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Microsoft.AspNetCore.Builder
 {
diff --git a/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/EmbeddedFiles/EmbeddedResourceFileProvider.cs b/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/EmbeddedFiles/EmbeddedResourceFileProvider.cs
index 1d362ebc0e..ec0a332f22 100644
--- a/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/EmbeddedFiles/EmbeddedResourceFileProvider.cs
+++ b/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/EmbeddedFiles/EmbeddedResourceFileProvider.cs
@@ -3,8 +3,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.EmbeddedFiles;
-using Volo.DependencyInjection;
 
 namespace Volo.Abp.AspNetCore.EmbeddedFiles
 {
diff --git a/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/EmbeddedFiles/EmbeddedResourceViewFileProvider.cs b/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/EmbeddedFiles/EmbeddedResourceViewFileProvider.cs
index f7cada9d17..0974bec33c 100644
--- a/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/EmbeddedFiles/EmbeddedResourceViewFileProvider.cs
+++ b/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/EmbeddedFiles/EmbeddedResourceViewFileProvider.cs
@@ -1,6 +1,6 @@
 using System;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.EmbeddedFiles;
-using Volo.DependencyInjection;
 
 namespace Volo.Abp.AspNetCore.EmbeddedFiles
 {
diff --git a/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Modularity/ApplicationInitializationContextExtensions.cs b/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Modularity/ApplicationInitializationContextExtensions.cs
index e1fc78d6b7..2fe420a214 100644
--- a/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Modularity/ApplicationInitializationContextExtensions.cs
+++ b/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Modularity/ApplicationInitializationContextExtensions.cs
@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.AspNetCore.Modularity
 {
diff --git a/src/Volo.Abp.AspNetCore/Volo/Abp/ServiceProviderAccessorExtensions.cs b/src/Volo.Abp.AspNetCore/Volo/Abp/ServiceProviderAccessorExtensions.cs
index d6e4d9e124..e5349f771f 100644
--- a/src/Volo.Abp.AspNetCore/Volo/Abp/ServiceProviderAccessorExtensions.cs
+++ b/src/Volo.Abp.AspNetCore/Volo/Abp/ServiceProviderAccessorExtensions.cs
@@ -1,7 +1,7 @@
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp
 {
diff --git a/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapperObjectMapper.cs b/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapperObjectMapper.cs
index d943283514..6a38f0b3aa 100644
--- a/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapperObjectMapper.cs
+++ b/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapperObjectMapper.cs
@@ -1,8 +1,8 @@
 using System;
 using AutoMapper;
 using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.ObjectMapping;
-using Volo.DependencyInjection;
 
 namespace Volo.Abp.AutoMapper
 {
diff --git a/src/Volo.Abp.Autofac/Autofac/Builder/AbpRegistrationBuilderExtensions.cs b/src/Volo.Abp.Autofac/Autofac/Builder/AbpRegistrationBuilderExtensions.cs
index 27ad7f5b36..fb0daf42e5 100644
--- a/src/Volo.Abp.Autofac/Autofac/Builder/AbpRegistrationBuilderExtensions.cs
+++ b/src/Volo.Abp.Autofac/Autofac/Builder/AbpRegistrationBuilderExtensions.cs
@@ -5,6 +5,7 @@ using Autofac.Core;
 using Autofac.Extras.DynamicProxy;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Castle.DynamicProxy;
+using Volo.Abp.DependencyInjection;
 
 namespace Autofac.Builder
 {
diff --git a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextConfigurationContext.cs b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextConfigurationContext.cs
index dd76b50323..d4072b4849 100644
--- a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextConfigurationContext.cs
+++ b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextConfigurationContext.cs
@@ -1,7 +1,7 @@
 using System;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.EntityFrameworkCore.DependencyInjection
 {
diff --git a/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs b/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs
index a7afb9a61f..97d3ec3101 100644
--- a/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs
+++ b/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs
@@ -4,7 +4,7 @@ using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.EmbeddedFiles;
 using Volo.Abp.Identity.Web.Navigation;
 using Volo.Abp.Modularity;
-using Volo.Abp.UI.Navigation;
+using Volo.Abp.Ui.Navigation;
 
 namespace Volo.Abp.Identity.Web
 {
diff --git a/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs b/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs
index 92101fe24a..2f37e1d87b 100644
--- a/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs
+++ b/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using Volo.Abp.UI.Navigation;
+using Volo.Abp.Ui.Navigation;
 
 namespace Volo.Abp.Identity.Web.Navigation
 {
diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleStore.cs b/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleStore.cs
index b61f7fed1a..c96451594d 100644
--- a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleStore.cs
+++ b/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityRoleStore.cs
@@ -7,9 +7,9 @@ using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Logging;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Guids;
 using Volo.Abp.Uow;
-using Volo.DependencyInjection;
 
 namespace Volo.Abp.Identity
 {
diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserStore.cs b/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserStore.cs
index c4fa3d3830..63c3f4370a 100644
--- a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserStore.cs
+++ b/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUserStore.cs
@@ -8,9 +8,9 @@ using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Logging;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Guids;
 using Volo.Abp.Uow;
-using Volo.DependencyInjection;
 
 namespace Volo.Abp.Identity
 {
diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver.cs b/src/Volo.Abp.MultiTenancy/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver.cs
index 5967f630ca..1b3bb99859 100644
--- a/src/Volo.Abp.MultiTenancy/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver.cs
+++ b/src/Volo.Abp.MultiTenancy/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Options;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.MultiTenancy;
-using Volo.DependencyInjection;
 
 namespace Volo.Abp.Data.MultiTenancy
 {
diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AsyncLocalTenantScopeProvider.cs b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AsyncLocalTenantScopeProvider.cs
index e528357b72..ea01f9c0fa 100644
--- a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AsyncLocalTenantScopeProvider.cs
+++ b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AsyncLocalTenantScopeProvider.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Threading;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.MultiTenancy
 {
diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/ConfigurationTenantStore.cs b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/ConfigurationTenantStore.cs
index 1c2a985f53..6bdb6503f6 100644
--- a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/ConfigurationTenantStore.cs
+++ b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/ConfigurationTenantStore.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using Microsoft.Extensions.Options;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.MultiTenancy.ConfigurationStore
 {
diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantResolveContext.cs b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantResolveContext.cs
index d4b2512d45..9f5c890c14 100644
--- a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantResolveContext.cs
+++ b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantResolveContext.cs
@@ -1,5 +1,5 @@
 using JetBrains.Annotations;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.MultiTenancy
 {
diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyManager.cs b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyManager.cs
index edeb7983fa..1db22637d7 100644
--- a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyManager.cs
+++ b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyManager.cs
@@ -4,7 +4,7 @@ using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.MultiTenancy
 {
diff --git a/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionConventionalRegistrationExtensions.cs b/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionConventionalRegistrationExtensions.cs
index 3954ba5946..6089807ed9 100644
--- a/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionConventionalRegistrationExtensions.cs
+++ b/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionConventionalRegistrationExtensions.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
diff --git a/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionObjectAccessorExtensions.cs b/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionObjectAccessorExtensions.cs
index 882b2ae1be..a110c389a2 100644
--- a/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionObjectAccessorExtensions.cs
+++ b/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionObjectAccessorExtensions.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
diff --git a/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationActionExtensions.cs b/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationActionExtensions.cs
index ace9e81d7f..59cbdec860 100644
--- a/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationActionExtensions.cs
+++ b/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationActionExtensions.cs
@@ -1,5 +1,5 @@
 using System;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
diff --git a/src/Volo.Abp/System/AbpStringExtensions.cs b/src/Volo.Abp/System/AbpStringExtensions.cs
index 73c9b6aad9..c7ebe99df7 100644
--- a/src/Volo.Abp/System/AbpStringExtensions.cs
+++ b/src/Volo.Abp/System/AbpStringExtensions.cs
@@ -3,6 +3,7 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
 using Volo;
+using Volo.Abp;
 
 namespace System
 {
diff --git a/src/Volo.Abp/System/Collections/Generic/AbpCollectionExtensions.cs b/src/Volo.Abp/System/Collections/Generic/AbpCollectionExtensions.cs
index a2f82d6de8..018bb4d073 100644
--- a/src/Volo.Abp/System/Collections/Generic/AbpCollectionExtensions.cs
+++ b/src/Volo.Abp/System/Collections/Generic/AbpCollectionExtensions.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using JetBrains.Annotations;
 using Volo;
+using Volo.Abp;
 
 namespace System.Collections.Generic
 {
diff --git a/src/Volo.Abp/System/Collections/Generic/AbpListExtensions.cs b/src/Volo.Abp/System/Collections/Generic/AbpListExtensions.cs
index 5ad63cc82c..bf3ed64b42 100644
--- a/src/Volo.Abp/System/Collections/Generic/AbpListExtensions.cs
+++ b/src/Volo.Abp/System/Collections/Generic/AbpListExtensions.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using JetBrains.Annotations;
 using Volo;
+using Volo.Abp;
 
 namespace System.Collections.Generic
 {
diff --git a/src/Volo.Abp/Volo/Abp/AbpKernelModule.cs b/src/Volo.Abp/Volo/Abp/AbpKernelModule.cs
index 39c39416c8..0d48a199ca 100644
--- a/src/Volo.Abp/Volo/Abp/AbpKernelModule.cs
+++ b/src/Volo.Abp/Volo/Abp/AbpKernelModule.cs
@@ -1,10 +1,10 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Modularity;
 using Volo.Abp.ObjectMapping;
 using Volo.Abp.Reflection;
 using Volo.Abp.Uow;
-using Volo.DependencyInjection;
 
 namespace Volo.Abp
 {
diff --git a/src/Volo.Abp/Volo/Abp/Application/Services/IApplicationService.cs b/src/Volo.Abp/Volo/Abp/Application/Services/IApplicationService.cs
index 1658d3b85c..7877982e04 100644
--- a/src/Volo.Abp/Volo/Abp/Application/Services/IApplicationService.cs
+++ b/src/Volo.Abp/Volo/Abp/Application/Services/IApplicationService.cs
@@ -1,4 +1,4 @@
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Application.Services
 {
diff --git a/src/Volo.Abp/Volo/Abp/Check.cs b/src/Volo.Abp/Volo/Abp/Check.cs
index c8877569db..6eba3f58bc 100644
--- a/src/Volo.Abp/Volo/Abp/Check.cs
+++ b/src/Volo.Abp/Volo/Abp/Check.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
 
-namespace Volo
+namespace Volo.Abp
 {
     [DebuggerStepThrough]
     public static class Check
diff --git a/src/Volo.Abp/Volo/Abp/Data/DefaultConnectionStringResolver.cs b/src/Volo.Abp/Volo/Abp/Data/DefaultConnectionStringResolver.cs
index 2fb44348ce..b0f1fdf38a 100644
--- a/src/Volo.Abp/Volo/Abp/Data/DefaultConnectionStringResolver.cs
+++ b/src/Volo.Abp/Volo/Abp/Data/DefaultConnectionStringResolver.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.Options;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Data
 {
diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/AutoRegistrationHelper.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/AutoRegistrationHelper.cs
index 513edb7e71..dd8795855e 100644
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/AutoRegistrationHelper.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/AutoRegistrationHelper.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     public static class AutoRegistrationHelper
     {
diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/ConventionalRegistrarBase.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/ConventionalRegistrarBase.cs
index e346a01ba3..779119ffc4 100644
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/ConventionalRegistrarBase.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/ConventionalRegistrarBase.cs
@@ -4,7 +4,7 @@ using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Reflection;
 
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     public abstract class ConventionalRegistrarBase : IConventionalRegistrar
     {
diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/ConventionalRegistrarList.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/ConventionalRegistrarList.cs
index 74eece6493..e7e3fecd12 100644
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/ConventionalRegistrarList.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/ConventionalRegistrarList.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
-using Volo.DependencyInjection;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     internal class ConventionalRegistrarList : List<IConventionalRegistrar>
     {
diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/DefaultConventionalRegistrar.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/DefaultConventionalRegistrar.cs
index 2a59e4450f..9959344f70 100644
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/DefaultConventionalRegistrar.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/DefaultConventionalRegistrar.cs
@@ -3,7 +3,7 @@ using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     public class DefaultConventionalRegistrar : ConventionalRegistrarBase
     {
diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/DependencyAttribute.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/DependencyAttribute.cs
index 8e917cc71d..03e66f1126 100644
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/DependencyAttribute.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/DependencyAttribute.cs
@@ -1,7 +1,7 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     public class DependencyAttribute : Attribute
     {
diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/DisableConventionalRegistrationAttribute.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/DisableConventionalRegistrationAttribute.cs
index 3e1244a276..d8668dc42e 100644
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/DisableConventionalRegistrationAttribute.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/DisableConventionalRegistrationAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     public class DisableConventionalRegistrationAttribute : Attribute
     {
diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/ExposeServicesAttribute.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/ExposeServicesAttribute.cs
index 521e99cd5b..f46be345af 100644
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/ExposeServicesAttribute.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/ExposeServicesAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     public class ExposeServicesAttribute : Attribute, IExposedServiceTypesProvider
     {
diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/IConventionalRegistrar.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/IConventionalRegistrar.cs
index fee5802e81..36a80e7eb2 100644
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/IConventionalRegistrar.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/IConventionalRegistrar.cs
@@ -2,7 +2,7 @@
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     public interface IConventionalRegistrar
     {
diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/IExposedServiceTypesProvider.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/IExposedServiceTypesProvider.cs
index 4a04d55af8..9504e5e39a 100644
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/IExposedServiceTypesProvider.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/IExposedServiceTypesProvider.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     public interface IExposedServiceTypesProvider
     {
diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/IObjectAccessor.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/IObjectAccessor.cs
index b519d12f3c..8fcf486cb4 100644
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/IObjectAccessor.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/IObjectAccessor.cs
@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
 
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     public interface IObjectAccessor<out T>
     {
diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/IOnServiceRegistredContext.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/IOnServiceRegistredContext.cs
index 778260e1da..fd304a5d68 100644
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/IOnServiceRegistredContext.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/IOnServiceRegistredContext.cs
@@ -2,7 +2,7 @@ using System;
 using Volo.Abp.Collections;
 using Volo.Abp.DynamicProxy;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     public interface IOnServiceRegistredContext
     {
diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/IScopedDependency.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/IScopedDependency.cs
index f3764f2ccd..73d422e819 100644
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/IScopedDependency.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/IScopedDependency.cs
@@ -1,4 +1,4 @@
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     public interface IScopedDependency
     {
diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/IServiceExposingArgs.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/IServiceExposingArgs.cs
index 82db03a8e6..38963bbb53 100644
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/IServiceExposingArgs.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/IServiceExposingArgs.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     public interface IOnServiceExposingContext
     {
diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/IServiceProviderAccessor.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/IServiceProviderAccessor.cs
index 962e384745..af290f2768 100644
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/IServiceProviderAccessor.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/IServiceProviderAccessor.cs
@@ -1,7 +1,7 @@
 using System;
 using JetBrains.Annotations;
 
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     public interface IServiceProviderAccessor
     {
diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/ISingletonDependency.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/ISingletonDependency.cs
index 81beddee4e..286648fde2 100644
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/ISingletonDependency.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/ISingletonDependency.cs
@@ -1,4 +1,4 @@
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     public interface ISingletonDependency
     {
diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/ITransientDependency.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/ITransientDependency.cs
index 06d00d9de4..1213081bbd 100644
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/ITransientDependency.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/ITransientDependency.cs
@@ -1,4 +1,4 @@
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     public interface ITransientDependency
     {
diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/ObjectAccessor.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/ObjectAccessor.cs
index ef152fd10b..8e4a55a995 100644
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/ObjectAccessor.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/ObjectAccessor.cs
@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
 
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     public class ObjectAccessor<T> : IObjectAccessor<T>
     {
diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/OnServiceExposingArgs.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/OnServiceExposingArgs.cs
index df4badd262..03e00bef81 100644
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/OnServiceExposingArgs.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/OnServiceExposingArgs.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     public class OnServiceExposingContext : IOnServiceExposingContext
     {
diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/OnServiceRegistredContext.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/OnServiceRegistredContext.cs
index f6f3c97d5a..9aaae20b54 100644
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/OnServiceRegistredContext.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/OnServiceRegistredContext.cs
@@ -1,10 +1,9 @@
 using System;
 using JetBrains.Annotations;
-using Volo;
 using Volo.Abp.Collections;
 using Volo.Abp.DynamicProxy;
 
-namespace Microsoft.Extensions.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     public class OnServiceRegistredContext : IOnServiceRegistredContext
     {
diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/ServiceExposingActionList.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/ServiceExposingActionList.cs
index dd9289ee25..920ca26537 100644
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/ServiceExposingActionList.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/ServiceExposingActionList.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     public class ServiceExposingActionList : List<Action<IOnServiceExposingContext>>
     {
diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/ServiceRegistrationActionList.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/ServiceRegistrationActionList.cs
index e98e0fd69e..bb72d28929 100644
--- a/src/Volo.Abp/Volo/Abp/DependencyInjection/ServiceRegistrationActionList.cs
+++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/ServiceRegistrationActionList.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
-using Microsoft.Extensions.DependencyInjection;
 
-namespace Volo.DependencyInjection
+namespace Volo.Abp.DependencyInjection
 {
     public class ServiceRegistrationActionList : List<Action<IOnServiceRegistredContext>>
     {
diff --git a/src/Volo.Abp/Volo/Abp/Domain/Repositories/IRepository.cs b/src/Volo.Abp/Volo/Abp/Domain/Repositories/IRepository.cs
index eee5036345..fe2771ce50 100644
--- a/src/Volo.Abp/Volo/Abp/Domain/Repositories/IRepository.cs
+++ b/src/Volo.Abp/Volo/Abp/Domain/Repositories/IRepository.cs
@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Entities;
-using Volo.DependencyInjection;
 
 namespace Volo.Abp.Domain.Repositories
 {
diff --git a/src/Volo.Abp/Volo/Abp/Domain/Services/IDomainService.cs b/src/Volo.Abp/Volo/Abp/Domain/Services/IDomainService.cs
index 248c66c1d6..112243de44 100644
--- a/src/Volo.Abp/Volo/Abp/Domain/Services/IDomainService.cs
+++ b/src/Volo.Abp/Volo/Abp/Domain/Services/IDomainService.cs
@@ -1,4 +1,4 @@
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Domain.Services
 {
diff --git a/src/Volo.Abp/Volo/Abp/EmbeddedFiles/EmbeddedFileManager.cs b/src/Volo.Abp/Volo/Abp/EmbeddedFiles/EmbeddedFileManager.cs
index 82359299ec..33589ed5b6 100644
--- a/src/Volo.Abp/Volo/Abp/EmbeddedFiles/EmbeddedFileManager.cs
+++ b/src/Volo.Abp/Volo/Abp/EmbeddedFiles/EmbeddedFileManager.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.Options;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.EmbeddedFiles
 {
diff --git a/src/Volo.Abp/Volo/Abp/Guids/SequentialGuidGenerator.cs b/src/Volo.Abp/Volo/Abp/Guids/SequentialGuidGenerator.cs
index 0fc502431a..40435d017b 100644
--- a/src/Volo.Abp/Volo/Abp/Guids/SequentialGuidGenerator.cs
+++ b/src/Volo.Abp/Volo/Abp/Guids/SequentialGuidGenerator.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Security.Cryptography;
 using Microsoft.Extensions.Options;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Threading;
-using Volo.DependencyInjection;
 
 namespace Volo.Abp.Guids
 {
diff --git a/src/Volo.Abp/Volo/Abp/Json/Newtonsoft/AbpJsonIsoDateTimeConverter.cs b/src/Volo.Abp/Volo/Abp/Json/Newtonsoft/AbpJsonIsoDateTimeConverter.cs
index 479d763d84..4c771d6958 100644
--- a/src/Volo.Abp/Volo/Abp/Json/Newtonsoft/AbpJsonIsoDateTimeConverter.cs
+++ b/src/Volo.Abp/Volo/Abp/Json/Newtonsoft/AbpJsonIsoDateTimeConverter.cs
@@ -1,8 +1,8 @@
 using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Timing;
-using Volo.DependencyInjection;
 
 namespace Volo.Abp.Json.Newtonsoft
 {
diff --git a/src/Volo.Abp/Volo/Abp/Json/Newtonsoft/NewtonsoftJsonSerializer.cs b/src/Volo.Abp/Volo/Abp/Json/Newtonsoft/NewtonsoftJsonSerializer.cs
index 6ed5a055be..f6c746f47a 100644
--- a/src/Volo.Abp/Volo/Abp/Json/Newtonsoft/NewtonsoftJsonSerializer.cs
+++ b/src/Volo.Abp/Volo/Abp/Json/Newtonsoft/NewtonsoftJsonSerializer.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Json.Newtonsoft
 {
diff --git a/src/Volo.Abp/Volo/Abp/Linq/DefaultAsyncQueryableExecuter.cs b/src/Volo.Abp/Volo/Abp/Linq/DefaultAsyncQueryableExecuter.cs
index 6f03eb3bc1..45542d3bae 100644
--- a/src/Volo.Abp/Volo/Abp/Linq/DefaultAsyncQueryableExecuter.cs
+++ b/src/Volo.Abp/Volo/Abp/Linq/DefaultAsyncQueryableExecuter.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Linq
 {
diff --git a/src/Volo.Abp/Volo/Abp/Modularity/IAbpModule.cs b/src/Volo.Abp/Volo/Abp/Modularity/IAbpModule.cs
index 15c7fcca13..8b8208495c 100644
--- a/src/Volo.Abp/Volo/Abp/Modularity/IAbpModule.cs
+++ b/src/Volo.Abp/Volo/Abp/Modularity/IAbpModule.cs
@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Modularity
 {
diff --git a/src/Volo.Abp/Volo/Abp/Modularity/IModuleLifecycleContributer.cs b/src/Volo.Abp/Volo/Abp/Modularity/IModuleLifecycleContributer.cs
index ac0686453e..b1ec934100 100644
--- a/src/Volo.Abp/Volo/Abp/Modularity/IModuleLifecycleContributer.cs
+++ b/src/Volo.Abp/Volo/Abp/Modularity/IModuleLifecycleContributer.cs
@@ -1,5 +1,5 @@
 using JetBrains.Annotations;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Modularity
 {
diff --git a/src/Volo.Abp/Volo/Abp/Modularity/ModuleManager.cs b/src/Volo.Abp/Volo/Abp/Modularity/ModuleManager.cs
index 35263373c4..5644693da1 100644
--- a/src/Volo.Abp/Volo/Abp/Modularity/ModuleManager.cs
+++ b/src/Volo.Abp/Volo/Abp/Modularity/ModuleManager.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Logging;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Modularity
 {
diff --git a/src/Volo.Abp/Volo/Abp/ObjectMapping/DefaultObjectMapper.cs b/src/Volo.Abp/Volo/Abp/ObjectMapping/DefaultObjectMapper.cs
index 04c9ee60a9..01f1c1367b 100644
--- a/src/Volo.Abp/Volo/Abp/ObjectMapping/DefaultObjectMapper.cs
+++ b/src/Volo.Abp/Volo/Abp/ObjectMapping/DefaultObjectMapper.cs
@@ -1,6 +1,6 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.ObjectMapping
 {
diff --git a/src/Volo.Abp/Volo/Abp/Reflection/AssemblyFinder.cs b/src/Volo.Abp/Volo/Abp/Reflection/AssemblyFinder.cs
index ffa4624931..6d90a8fb5c 100644
--- a/src/Volo.Abp/Volo/Abp/Reflection/AssemblyFinder.cs
+++ b/src/Volo.Abp/Volo/Abp/Reflection/AssemblyFinder.cs
@@ -4,8 +4,8 @@ using System.Collections.Immutable;
 using System.Linq;
 using System.Reflection;
 using System.Threading;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Modularity;
-using Volo.DependencyInjection;
 
 namespace Volo.Abp.Reflection
 {
diff --git a/src/Volo.Abp/Volo/Abp/Reflection/TypeFinder.cs b/src/Volo.Abp/Volo/Abp/Reflection/TypeFinder.cs
index f70dffd7e9..619b2f9fd2 100644
--- a/src/Volo.Abp/Volo/Abp/Reflection/TypeFinder.cs
+++ b/src/Volo.Abp/Volo/Abp/Reflection/TypeFinder.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using Microsoft.Extensions.Logging;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Reflection
 {
diff --git a/src/Volo.Abp/Volo/Abp/Timing/Clock.cs b/src/Volo.Abp/Volo/Abp/Timing/Clock.cs
index 23896685d8..55bfbdc284 100644
--- a/src/Volo.Abp/Volo/Abp/Timing/Clock.cs
+++ b/src/Volo.Abp/Volo/Abp/Timing/Clock.cs
@@ -1,6 +1,6 @@
 using System;
 using Microsoft.Extensions.Options;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Timing
 {
diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenu.cs b/src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenu.cs
index d723aeec44..fff323edf4 100644
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenu.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenu.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 
-namespace Volo.Abp.UI.Navigation
+namespace Volo.Abp.Ui.Navigation
 {
     public class ApplicationMenu : IHasMenuItems
     {
diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs b/src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs
index 354cfd3b00..0b2d6db4fc 100644
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 
-namespace Volo.Abp.UI.Navigation
+namespace Volo.Abp.Ui.Navigation
 {
     public class ApplicationMenuItem : IHasMenuItems
     {
diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IHasMenuItems.cs b/src/Volo.Abp/Volo/Abp/Ui/Navigation/IHasMenuItems.cs
index adfa8f2f40..82b3058902 100644
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IHasMenuItems.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/IHasMenuItems.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Volo.Abp.UI.Navigation
+namespace Volo.Abp.Ui.Navigation
 {
     public interface IHasMenuItems
     {
diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuConfigurationContext.cs b/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuConfigurationContext.cs
index 041c8d126a..bdf758a514 100644
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuConfigurationContext.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuConfigurationContext.cs
@@ -1,6 +1,6 @@
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
-namespace Volo.Abp.UI.Navigation
+namespace Volo.Abp.Ui.Navigation
 {
     public interface IMenuConfigurationContext : IServiceProviderAccessor
     {
diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuContributor.cs b/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuContributor.cs
index 6a67281172..e38ad24a14 100644
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuContributor.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuContributor.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace Volo.Abp.UI.Navigation
+namespace Volo.Abp.Ui.Navigation
 {
     public interface IMenuContributor
     {
diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuManager.cs b/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuManager.cs
index c22c771e7b..81ae9d9318 100644
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuManager.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuManager.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace Volo.Abp.UI.Navigation
+namespace Volo.Abp.Ui.Navigation
 {
     public interface IMenuManager
     {
diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuConfigurationContext.cs b/src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuConfigurationContext.cs
index f4d7ad6461..98d650b758 100644
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuConfigurationContext.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuConfigurationContext.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Volo.Abp.UI.Navigation
+namespace Volo.Abp.Ui.Navigation
 {
     public class MenuConfigurationContext : IMenuConfigurationContext
     {
diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuManager.cs b/src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuManager.cs
index dc99e66e83..ea59fa6dec 100644
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuManager.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuManager.cs
@@ -2,9 +2,9 @@ using System;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
-namespace Volo.Abp.UI.Navigation
+namespace Volo.Abp.Ui.Navigation
 {
     //TODO: We can move Navigation to a dedicated dll, or to a Volo.Abp.Ui dll.
     public class MenuManager : IMenuManager, ITransientDependency
diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/NavigationOptions.cs b/src/Volo.Abp/Volo/Abp/Ui/Navigation/NavigationOptions.cs
index 2237add732..b39f5d5df0 100644
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/NavigationOptions.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/NavigationOptions.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 
-namespace Volo.Abp.UI.Navigation
+namespace Volo.Abp.Ui.Navigation
 {
     public class NavigationOptions
     {
diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/StandardMenus.cs b/src/Volo.Abp/Volo/Abp/Ui/Navigation/StandardMenus.cs
index f69a19357e..5df07aec5c 100644
--- a/src/Volo.Abp/Volo/Abp/Ui/Navigation/StandardMenus.cs
+++ b/src/Volo.Abp/Volo/Abp/Ui/Navigation/StandardMenus.cs
@@ -1,4 +1,4 @@
-namespace Volo.Abp.UI.Navigation
+namespace Volo.Abp.Ui.Navigation
 {
     public static class StandardMenus
     {
diff --git a/src/Volo.Abp/Volo/Abp/Uow/AmbientUnitOfWork.cs b/src/Volo.Abp/Volo/Abp/Uow/AmbientUnitOfWork.cs
index e5e4bfed20..6c01daf350 100644
--- a/src/Volo.Abp/Volo/Abp/Uow/AmbientUnitOfWork.cs
+++ b/src/Volo.Abp/Volo/Abp/Uow/AmbientUnitOfWork.cs
@@ -1,5 +1,5 @@
 using System.Threading;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Uow
 {
diff --git a/src/Volo.Abp/Volo/Abp/Uow/IDatabaseApiContainer.cs b/src/Volo.Abp/Volo/Abp/Uow/IDatabaseApiContainer.cs
index 8cfdc2b3fb..536823fd57 100644
--- a/src/Volo.Abp/Volo/Abp/Uow/IDatabaseApiContainer.cs
+++ b/src/Volo.Abp/Volo/Abp/Uow/IDatabaseApiContainer.cs
@@ -1,6 +1,6 @@
 using System;
 using JetBrains.Annotations;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Uow
 {
diff --git a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWork.cs b/src/Volo.Abp/Volo/Abp/Uow/UnitOfWork.cs
index 841fefe039..a94faba0d7 100644
--- a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWork.cs
+++ b/src/Volo.Abp/Volo/Abp/Uow/UnitOfWork.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Uow
 {
diff --git a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkInterceptor.cs b/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkInterceptor.cs
index 5571cd8ac0..53b6efb2fa 100644
--- a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkInterceptor.cs
+++ b/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkInterceptor.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.DynamicProxy;
-using Volo.DependencyInjection;
 
 namespace Volo.Abp.Uow
 {
diff --git a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkInterceptorRegistrar.cs b/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkInterceptorRegistrar.cs
index 90eec8c790..49f521a41f 100644
--- a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkInterceptorRegistrar.cs
+++ b/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkInterceptorRegistrar.cs
@@ -2,6 +2,7 @@
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Application.Services;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Repositories;
 
 namespace Volo.Abp.Uow
diff --git a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkManager.cs b/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkManager.cs
index 97e4819631..534b1c0db8 100644
--- a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkManager.cs
+++ b/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkManager.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Diagnostics;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.Uow
 {
diff --git a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntityToMyEntityDto2Mapper.cs b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntityToMyEntityDto2Mapper.cs
index 3b87d25552..f57e53964c 100644
--- a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntityToMyEntityDto2Mapper.cs
+++ b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntityToMyEntityDto2Mapper.cs
@@ -1,5 +1,5 @@
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.ObjectMapping;
-using Volo.DependencyInjection;
 
 namespace Volo.Abp.AutoMapper.SampleClasses
 {
diff --git a/test/Volo.Abp.Tests/Microsoft/Extensions/DependencyInjection/AbpConventionalDependencyInjectionExtensions_Tests.cs b/test/Volo.Abp.Tests/Microsoft/Extensions/DependencyInjection/AbpConventionalDependencyInjectionExtensions_Tests.cs
index ac9817a47d..369ee98cb9 100644
--- a/test/Volo.Abp.Tests/Microsoft/Extensions/DependencyInjection/AbpConventionalDependencyInjectionExtensions_Tests.cs
+++ b/test/Volo.Abp.Tests/Microsoft/Extensions/DependencyInjection/AbpConventionalDependencyInjectionExtensions_Tests.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using Shouldly;
-using Volo.DependencyInjection;
 using Xunit;
+using Volo.Abp.DependencyInjection;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
diff --git a/test/Volo.Abp.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs b/test/Volo.Abp.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs
index 1c7859172a..6d48cfa774 100644
--- a/test/Volo.Abp.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs
+++ b/test/Volo.Abp.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs
@@ -5,6 +5,7 @@ using Volo.Abp.Modularity;
 using Volo.Abp.TestBase;
 using System.Collections.Generic;
 using Xunit;
+using Volo.Abp.Ui.Navigation;
 
 namespace Volo.Abp.UI.Navigation
 {
diff --git a/test/Volo.Abp.Tests/Volo/DependencyInjection/AutoRegistrationHelper_Tests.cs b/test/Volo.Abp.Tests/Volo/DependencyInjection/AutoRegistrationHelper_Tests.cs
index d067be64fa..84459898b3 100644
--- a/test/Volo.Abp.Tests/Volo/DependencyInjection/AutoRegistrationHelper_Tests.cs
+++ b/test/Volo.Abp.Tests/Volo/DependencyInjection/AutoRegistrationHelper_Tests.cs
@@ -2,6 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Shouldly;
 using Xunit;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.DependencyInjection
 {
diff --git a/test/Volo.Abp.Tests/Volo/DependencyInjection/ConventionalRegistrar_Test.cs b/test/Volo.Abp.Tests/Volo/DependencyInjection/ConventionalRegistrar_Test.cs
index ee20014d76..011514e5a1 100644
--- a/test/Volo.Abp.Tests/Volo/DependencyInjection/ConventionalRegistrar_Test.cs
+++ b/test/Volo.Abp.Tests/Volo/DependencyInjection/ConventionalRegistrar_Test.cs
@@ -1,5 +1,6 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 
 namespace Volo.DependencyInjection
 {