diff --git a/aio/content/examples/lazy-loading-ngmodules/e2e/src/app.e2e-spec.ts b/aio/content/examples/lazy-loading-ngmodules/e2e/src/app.e2e-spec.ts
index c064e540e8..c6ff7f79cf 100644
--- a/aio/content/examples/lazy-loading-ngmodules/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/lazy-loading-ngmodules/e2e/src/app.e2e-spec.ts
@@ -18,26 +18,26 @@ describe('providers App', () => {
     expect(page.getTitleText()).toEqual('Lazy loading feature modules');
   });
 
-  describe('Customers list', function() {
+  describe('Customers', function() {
     beforeEach(function() {
       customersButton.click();
     });
 
-    it('should show customers list when the button is clicked', function() {
-        let customersMessage = element(by.css('app-customer-list > p'));
-        expect(customersMessage.getText()).toBe('customer-list works!');
+    it('should show customers when the button is clicked', function() {
+        let customersMessage = element(by.css('app-customers > p'));
+        expect(customersMessage.getText()).toBe('customers works!');
     });
 
   });
 
-  describe('Orders list', function() {
+  describe('Orders', function() {
     beforeEach(function() {
       ordersButton.click();
     });
 
-    it('should show orders list when the button is clicked', function() {
-        let ordersMessage = element(by.css('app-order-list > p'));
-        expect(ordersMessage.getText()).toBe('order-list works!');
+    it('should show orders when the button is clicked', function() {
+        let ordersMessage = element(by.css('app-orders > p'));
+        expect(ordersMessage.getText()).toBe('orders works!');
     });
 
   });
diff --git a/aio/content/examples/lazy-loading-ngmodules/src/app/app.component.spec.ts b/aio/content/examples/lazy-loading-ngmodules/src/app/app.component.spec.ts
index 41967875b6..f1121210b4 100644
--- a/aio/content/examples/lazy-loading-ngmodules/src/app/app.component.spec.ts
+++ b/aio/content/examples/lazy-loading-ngmodules/src/app/app.component.spec.ts
@@ -21,16 +21,16 @@ describe('AppComponent', () => {
     expect(app).toBeTruthy();
   }));
 
-  it(`should have as title 'app works!'`, async(() => {
+  it(`should have as title 'customer-app'`, async(() => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.debugElement.componentInstance;
-    expect(app.title).toEqual('app works!');
+    expect(app.title).toEqual('customer-app');
   }));
 
   it('should render title in a h1 tag', async(() => {
     const fixture = TestBed.createComponent(AppComponent);
     fixture.detectChanges();
     const compiled = fixture.debugElement.nativeElement;
-    expect(compiled.querySelector('h1').textContent).toContain('app works!');
+    expect(compiled.querySelector('h1').textContent).toContain('customer-app');
   }));
 });
diff --git a/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customer-list/customer-list.component.html b/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customer-list/customer-list.component.html
deleted file mode 100644
index 125b263925..0000000000
--- a/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customer-list/customer-list.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<p>
-  customer-list works!
-</p>
diff --git a/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customer-list/customer-list.component.ts b/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customer-list/customer-list.component.ts
deleted file mode 100644
index e3b118ff80..0000000000
--- a/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customer-list/customer-list.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-customer-list',
-  templateUrl: './customer-list.component.html',
-  styleUrls: ['./customer-list.component.css']
-})
-export class CustomerListComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
-
-}
diff --git a/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customers-routing.module.ts b/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customers-routing.module.ts
index 2c7e16b4f4..21e9b46be9 100644
--- a/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customers-routing.module.ts
+++ b/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customers-routing.module.ts
@@ -3,13 +3,13 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
-import { CustomerListComponent } from './customer-list/customer-list.component';
+import { CustomersComponent } from './customers.component';
 
 
 const routes: Routes = [
   {
     path: '',
-    component: CustomerListComponent
+    component: CustomersComponent
   }
 ];
 
diff --git a/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customer-list/customer-list.component.css b/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customers.component.css
similarity index 100%
rename from aio/content/examples/lazy-loading-ngmodules/src/app/customers/customer-list/customer-list.component.css
rename to aio/content/examples/lazy-loading-ngmodules/src/app/customers/customers.component.css
diff --git a/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customers.component.html b/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customers.component.html
new file mode 100644
index 0000000000..2094219d29
--- /dev/null
+++ b/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customers.component.html
@@ -0,0 +1,3 @@
+<p>
+  customers works!
+</p>
diff --git a/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customer-list/customer-list.component.spec.ts b/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customers.component.spec.ts
similarity index 59%
rename from aio/content/examples/lazy-loading-ngmodules/src/app/customers/customer-list/customer-list.component.spec.ts
rename to aio/content/examples/lazy-loading-ngmodules/src/app/customers/customers.component.spec.ts
index c34e342ba0..1543c2d317 100644
--- a/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customer-list/customer-list.component.spec.ts
+++ b/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customers.component.spec.ts
@@ -1,20 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { CustomerListComponent } from './customer-list.component';
+import { CustomersComponent } from './customers.component';
 
 describe('CustomerListComponent', () => {
-  let component: CustomerListComponent;
-  let fixture: ComponentFixture<CustomerListComponent>;
+  let component: CustomersComponent;
+  let fixture: ComponentFixture<CustomersComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ CustomerListComponent ]
+      declarations: [ CustomersComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(CustomerListComponent);
+    fixture = TestBed.createComponent(CustomersComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customers.component.ts b/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customers.component.ts
new file mode 100644
index 0000000000..00e6c8639f
--- /dev/null
+++ b/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customers.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-customers',
+  templateUrl: './customers.component.html',
+  styleUrls: ['./customers.component.css']
+})
+export class CustomersComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customers.module.ts b/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customers.module.ts
index db6909da9b..83e841e50b 100644
--- a/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customers.module.ts
+++ b/aio/content/examples/lazy-loading-ngmodules/src/app/customers/customers.module.ts
@@ -3,14 +3,14 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { CustomersRoutingModule } from './customers-routing.module';
-import { CustomerListComponent } from './customer-list/customer-list.component';
+import { CustomersComponent } from './customers.component';
 
 @NgModule({
   imports: [
     CommonModule,
     CustomersRoutingModule
   ],
-  declarations: [CustomerListComponent]
+  declarations: [CustomersComponent]
 })
 export class CustomersModule { }
 // #enddocregion customers-module
diff --git a/aio/content/examples/lazy-loading-ngmodules/src/app/orders/order-list/order-list.component.html b/aio/content/examples/lazy-loading-ngmodules/src/app/orders/order-list/order-list.component.html
deleted file mode 100644
index ec99b36fea..0000000000
--- a/aio/content/examples/lazy-loading-ngmodules/src/app/orders/order-list/order-list.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<p>
-  order-list works!
-</p>
diff --git a/aio/content/examples/lazy-loading-ngmodules/src/app/orders/order-list/order-list.component.ts b/aio/content/examples/lazy-loading-ngmodules/src/app/orders/order-list/order-list.component.ts
deleted file mode 100644
index 33b31ce8cc..0000000000
--- a/aio/content/examples/lazy-loading-ngmodules/src/app/orders/order-list/order-list.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-order-list',
-  templateUrl: './order-list.component.html',
-  styleUrls: ['./order-list.component.css']
-})
-export class OrderListComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
-
-}
diff --git a/aio/content/examples/lazy-loading-ngmodules/src/app/orders/orders-routing.module.ts b/aio/content/examples/lazy-loading-ngmodules/src/app/orders/orders-routing.module.ts
index 4ebb23615f..8bf2520341 100644
--- a/aio/content/examples/lazy-loading-ngmodules/src/app/orders/orders-routing.module.ts
+++ b/aio/content/examples/lazy-loading-ngmodules/src/app/orders/orders-routing.module.ts
@@ -4,12 +4,12 @@ import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
 // #docregion orders-routing-module-detail
-import { OrderListComponent } from './order-list/order-list.component';
+import { OrdersComponent } from './orders.component';
 
 const routes: Routes = [
   {
     path: '',
-    component: OrderListComponent
+    component: OrdersComponent
   }
 ];
 // #enddocregion orders-routing-module-detail
diff --git a/aio/content/examples/lazy-loading-ngmodules/src/app/orders/order-list/order-list.component.css b/aio/content/examples/lazy-loading-ngmodules/src/app/orders/orders.component.css
similarity index 100%
rename from aio/content/examples/lazy-loading-ngmodules/src/app/orders/order-list/order-list.component.css
rename to aio/content/examples/lazy-loading-ngmodules/src/app/orders/orders.component.css
diff --git a/aio/content/examples/lazy-loading-ngmodules/src/app/orders/orders.component.html b/aio/content/examples/lazy-loading-ngmodules/src/app/orders/orders.component.html
new file mode 100644
index 0000000000..1f5843d4a3
--- /dev/null
+++ b/aio/content/examples/lazy-loading-ngmodules/src/app/orders/orders.component.html
@@ -0,0 +1,3 @@
+<p>
+  orders works!
+</p>
diff --git a/aio/content/examples/lazy-loading-ngmodules/src/app/orders/order-list/order-list.component.spec.ts b/aio/content/examples/lazy-loading-ngmodules/src/app/orders/orders.component.spec.ts
similarity index 61%
rename from aio/content/examples/lazy-loading-ngmodules/src/app/orders/order-list/order-list.component.spec.ts
rename to aio/content/examples/lazy-loading-ngmodules/src/app/orders/orders.component.spec.ts
index 2688bcf420..bc78306cb0 100644
--- a/aio/content/examples/lazy-loading-ngmodules/src/app/orders/order-list/order-list.component.spec.ts
+++ b/aio/content/examples/lazy-loading-ngmodules/src/app/orders/orders.component.spec.ts
@@ -1,20 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { OrderListComponent } from './order-list.component';
+import { OrdersComponent } from './orders.component';
 
 describe('OrderListComponent', () => {
-  let component: OrderListComponent;
-  let fixture: ComponentFixture<OrderListComponent>;
+  let component: OrdersComponent;
+  let fixture: ComponentFixture<OrdersComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ OrderListComponent ]
+      declarations: [ OrdersComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(OrderListComponent);
+    fixture = TestBed.createComponent(OrdersComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/aio/content/examples/lazy-loading-ngmodules/src/app/orders/orders.component.ts b/aio/content/examples/lazy-loading-ngmodules/src/app/orders/orders.component.ts
new file mode 100644
index 0000000000..62051ee88e
--- /dev/null
+++ b/aio/content/examples/lazy-loading-ngmodules/src/app/orders/orders.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-orders',
+  templateUrl: './orders.component.html',
+  styleUrls: ['./orders.component.css']
+})
+export class OrdersComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/aio/content/examples/lazy-loading-ngmodules/src/app/orders/orders.module.ts b/aio/content/examples/lazy-loading-ngmodules/src/app/orders/orders.module.ts
index a349d46898..0fbe55c108 100644
--- a/aio/content/examples/lazy-loading-ngmodules/src/app/orders/orders.module.ts
+++ b/aio/content/examples/lazy-loading-ngmodules/src/app/orders/orders.module.ts
@@ -2,13 +2,13 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
 import { OrdersRoutingModule } from './orders-routing.module';
-import { OrderListComponent } from './order-list/order-list.component';
+import { OrdersComponent } from './orders.component';
 
 @NgModule({
   imports: [
     CommonModule,
     OrdersRoutingModule
   ],
-  declarations: [OrderListComponent]
+  declarations: [OrdersComponent]
 })
 export class OrdersModule { }