diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.browser.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.browser.module.ts
similarity index 89%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.browser.ts
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.browser.module.ts
index 03104b4..3aec023 100644
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.browser.ts
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.browser.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { AppModuleShared } from './app.module.shared';
+import { AppModuleShared } from './app.shared.module';
 import { AppComponent } from './components/app/app.component';
 
 @NgModule({
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.server.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.server.module.ts
similarity index 84%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.server.ts
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.server.module.ts
index 0608381..90532ae 100644
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.server.ts
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.server.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { ServerModule } from '@angular/platform-server';
-import { AppModuleShared } from './app.module.shared';
+import { AppModuleShared } from './app.shared.module';
 import { AppComponent } from './components/app/app.component';
 
 @NgModule({
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.shared.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.shared.module.ts
similarity index 100%
rename from templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.shared.ts
rename to templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.shared.module.ts
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.browser.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.browser.ts
index f9c0ba2..5a5201b 100644
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.browser.ts
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.browser.ts
@@ -3,7 +3,7 @@ import 'zone.js';
 import 'bootstrap';
 import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-import { AppModule } from './app/app.module.browser';
+import { AppModule } from './app/app.browser.module';
 
 if (module.hot) {
     module.hot.accept();
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.server.ts b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.server.ts
index 00460e9..419a17f 100644
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.server.ts
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.server.ts
@@ -5,7 +5,7 @@ import { APP_BASE_HREF } from '@angular/common';
 import { enableProdMode, ApplicationRef, NgZone, ValueProvider } from '@angular/core';
 import { platformDynamicServer, PlatformState, INITIAL_CONFIG } from '@angular/platform-server';
 import { createServerRenderer, RenderResult } from 'aspnet-prerendering';
-import { AppModule } from './app/app.module.server';
+import { AppModule } from './app/app.server.module';
 
 enableProdMode();
 
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/webpack.config.js b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/webpack.config.js
index c5e834b..5ec3222 100644
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/webpack.config.js
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/webpack.config.js
@@ -47,7 +47,7 @@ module.exports = (env) => {
             new webpack.optimize.UglifyJsPlugin(),
             new AotPlugin({
                 tsConfigPath: './tsconfig.json',
-                entryModule: path.join(__dirname, 'ClientApp/app/app.module.browser#AppModule'),
+                entryModule: path.join(__dirname, 'ClientApp/app/app.browser.module#AppModule'),
                 exclude: ['./**/*.server.ts']
             })
         ])
@@ -68,7 +68,7 @@ module.exports = (env) => {
             // Plugins that apply in production builds only
             new AotPlugin({
                 tsConfigPath: './tsconfig.json',
-                entryModule: path.join(__dirname, 'ClientApp/app/app.module.server#AppModule'),
+                entryModule: path.join(__dirname, 'ClientApp/app/app.server.module#AppModule'),
                 exclude: ['./**/*.browser.ts']
             })
         ]),