diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/layout-account/layout-account.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.html
similarity index 100%
rename from npm/ng-packs/packages/theme-basic/src/lib/components/layout-account/layout-account.component.html
rename to npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.html
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/layout-account/layout-account.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.ts
similarity index 73%
rename from npm/ng-packs/packages/theme-basic/src/lib/components/layout-account/layout-account.component.ts
rename to npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.ts
index 32f358b869..e3e4d2db07 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/layout-account/layout-account.component.ts
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.ts
@@ -3,9 +3,9 @@ import { eLayoutType } from '@abp/ng.core';
 
 @Component({
   selector: 'abp-layout-account',
-  templateUrl: './layout-account.component.html',
+  templateUrl: './account-layout.component.html',
 })
-export class LayoutAccountComponent {
+export class AccountLayoutComponent {
   // required for dynamic component
   static type = eLayoutType.account;
 
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html
similarity index 100%
rename from npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.html
rename to npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts
similarity index 97%
rename from npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.ts
rename to npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts
index 9a948602e0..0295c61d24 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/layout-application/layout-application.component.ts
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts
@@ -32,9 +32,9 @@ import { LayoutState } from '../../states';
 
 @Component({
   selector: 'abp-layout-application',
-  templateUrl: './layout-application.component.html',
+  templateUrl: './application-layout.component.html',
 })
-export class LayoutApplicationComponent implements AfterViewInit, OnDestroy {
+export class ApplicationLayoutComponent implements AfterViewInit, OnDestroy {
   // required for dynamic component
   static type = eLayoutType.application;
 
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/layout-empty/layout-empty.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/empty-layout/empty-layout.component.ts
similarity index 88%
rename from npm/ng-packs/packages/theme-basic/src/lib/components/layout-empty/layout-empty.component.ts
rename to npm/ng-packs/packages/theme-basic/src/lib/components/empty-layout/empty-layout.component.ts
index 3c2186dd4a..77e6f2a8e4 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/layout-empty/layout-empty.component.ts
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/empty-layout/empty-layout.component.ts
@@ -8,7 +8,7 @@ import { eLayoutType } from '@abp/ng.core';
     <router-outlet></router-outlet>
   `,
 })
-export class LayoutEmptyComponent {
+export class EmptyLayoutComponent {
   // required for dynamic component
   static type = eLayoutType.empty;
 }
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/index.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/index.ts
index 39d04d163d..ca8f7982bc 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/index.ts
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/index.ts
@@ -1,3 +1,3 @@
-export * from './layout-account/layout-account.component';
-export * from './layout-application/layout-application.component';
-export * from './layout-empty/layout-empty.component';
+export * from './account-layout/account-layout.component';
+export * from './application-layout/application-layout.component';
+export * from './empty-layout/empty-layout.component';
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts b/npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts
index 4175cdbd13..a978a5c3da 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts
+++ b/npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts
@@ -2,9 +2,9 @@ import { CoreModule } from '@abp/ng.core';
 import { NgModule } from '@angular/core';
 import { NgbCollapseModule, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { ChangePasswordComponent } from './components/change-password/change-password.component';
-import { LayoutAccountComponent } from './components/layout-account/layout-account.component';
-import { LayoutApplicationComponent } from './components/layout-application/layout-application.component';
-import { LayoutEmptyComponent } from './components/layout-empty/layout-empty.component';
+import { AccountLayoutComponent } from './components/account-layout/account-layout.component';
+import { ApplicationLayoutComponent } from './components/application-layout/application-layout.component';
+import { EmptyLayoutComponent } from './components/empty-layout/empty-layout.component';
 import { LayoutComponent } from './components/layout/layout.component';
 import { ProfileComponent } from './components/profile/profile.component';
 import { ThemeSharedModule } from '@abp/ng.theme.shared';
@@ -13,7 +13,7 @@ import { NgxValidateCoreModule } from '@ngx-validate/core';
 import { NgxsModule } from '@ngxs/store';
 import { LayoutState } from './states/layout.state';
 
-export const LAYOUTS = [LayoutApplicationComponent, LayoutAccountComponent, LayoutEmptyComponent];
+export const LAYOUTS = [ApplicationLayoutComponent, AccountLayoutComponent, EmptyLayoutComponent];
 
 @NgModule({
   declarations: [...LAYOUTS, LayoutComponent, ChangePasswordComponent, ProfileComponent],
diff --git a/templates/app/angular/src/app/home/home-routing.module.ts b/templates/app/angular/src/app/home/home-routing.module.ts
index 70f7e5de7a..367affb583 100644
--- a/templates/app/angular/src/app/home/home-routing.module.ts
+++ b/templates/app/angular/src/app/home/home-routing.module.ts
@@ -1,12 +1,12 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { HomeComponent } from './home.component';
-import { LayoutApplicationComponent } from '@abp/ng.theme.basic';
+import { ApplicationLayoutComponent } from '@abp/ng.theme.basic';
 
 const routes: Routes = [
   {
     path: '',
-    component: LayoutApplicationComponent,
+    component: ApplicationLayoutComponent,
     children: [{ path: '', component: HomeComponent }],
   },
 ];