diff --git a/src/Web/WebMonolithic/eShopWeb/CatalogSettings.cs b/src/Web/WebMonolithic/eShopWeb/CatalogSettings.cs
index d11c487b5..39a5880d8 100644
--- a/src/Web/WebMonolithic/eShopWeb/CatalogSettings.cs
+++ b/src/Web/WebMonolithic/eShopWeb/CatalogSettings.cs
@@ -1,4 +1,4 @@
-namespace eShopWeb
+namespace Microsoft.eShopWeb
 {
     public class CatalogSettings
     {
diff --git a/src/Web/WebMonolithic/eShopWeb/Controllers/CatalogController.cs b/src/Web/WebMonolithic/eShopWeb/Controllers/CatalogController.cs
index 33e62526c..a4e891f0c 100644
--- a/src/Web/WebMonolithic/eShopWeb/Controllers/CatalogController.cs
+++ b/src/Web/WebMonolithic/eShopWeb/Controllers/CatalogController.cs
@@ -1,5 +1,5 @@
-using eShopWeb.Services;
-using eShopWeb.ViewModels;
+using Microsoft.eShopWeb.Services;
+using Microsoft.eShopWeb.ViewModels;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using System;
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 // For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
 
-namespace eShopWeb.Controllers
+namespace Microsoft.eShopWeb.Controllers
 {
     public class CatalogController : Controller
     {
diff --git a/src/Web/WebMonolithic/eShopWeb/Infrastructure/CatalogContext.cs b/src/Web/WebMonolithic/eShopWeb/Infrastructure/CatalogContext.cs
index cb6e9c1cd..84bab2868 100644
--- a/src/Web/WebMonolithic/eShopWeb/Infrastructure/CatalogContext.cs
+++ b/src/Web/WebMonolithic/eShopWeb/Infrastructure/CatalogContext.cs
@@ -1,4 +1,4 @@
-namespace eShopWeb.Infrastructure
+namespace Microsoft.eShopWeb.Infrastructure
 {
     using eShopWeb.Models;
     using Microsoft.EntityFrameworkCore;
diff --git a/src/Web/WebMonolithic/eShopWeb/Infrastructure/CatalogContextSeed.cs b/src/Web/WebMonolithic/eShopWeb/Infrastructure/CatalogContextSeed.cs
index 5e5bd4be8..c67baebc3 100644
--- a/src/Web/WebMonolithic/eShopWeb/Infrastructure/CatalogContextSeed.cs
+++ b/src/Web/WebMonolithic/eShopWeb/Infrastructure/CatalogContextSeed.cs
@@ -1,4 +1,4 @@
-namespace eShopWeb.Infrastructure
+namespace Microsoft.eShopWeb.Infrastructure
 {
     using eShopWeb.Models;
     using Microsoft.AspNetCore.Builder;
diff --git a/src/Web/WebMonolithic/eShopWeb/Infrastructure/Migrations/20170302162241_Initial.Designer.cs b/src/Web/WebMonolithic/eShopWeb/Infrastructure/Migrations/20170302162241_Initial.Designer.cs
index 05bea6db2..382f8d6c0 100644
--- a/src/Web/WebMonolithic/eShopWeb/Infrastructure/Migrations/20170302162241_Initial.Designer.cs
+++ b/src/Web/WebMonolithic/eShopWeb/Infrastructure/Migrations/20170302162241_Initial.Designer.cs
@@ -1,11 +1,9 @@
-using System;
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
-using eShopWeb.Infrastructure;
 
-namespace eShopWeb.Infrastructure.Migrations
+namespace Microsoft.eShopWeb.Infrastructure.Migrations
 {
     [DbContext(typeof(CatalogContext))]
     [Migration("20170302162241_Initial")]
diff --git a/src/Web/WebMonolithic/eShopWeb/Infrastructure/Migrations/20170302162241_Initial.cs b/src/Web/WebMonolithic/eShopWeb/Infrastructure/Migrations/20170302162241_Initial.cs
index b27111cce..3817256d4 100644
--- a/src/Web/WebMonolithic/eShopWeb/Infrastructure/Migrations/20170302162241_Initial.cs
+++ b/src/Web/WebMonolithic/eShopWeb/Infrastructure/Migrations/20170302162241_Initial.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace eShopWeb.Infrastructure.Migrations
+namespace Microsoft.eShopWeb.Infrastructure.Migrations
 {
     public partial class Initial : Migration
     {
diff --git a/src/Web/WebMonolithic/eShopWeb/Infrastructure/Migrations/CatalogContextModelSnapshot.cs b/src/Web/WebMonolithic/eShopWeb/Infrastructure/Migrations/CatalogContextModelSnapshot.cs
index 64d6c1b7a..339e6d6bd 100644
--- a/src/Web/WebMonolithic/eShopWeb/Infrastructure/Migrations/CatalogContextModelSnapshot.cs
+++ b/src/Web/WebMonolithic/eShopWeb/Infrastructure/Migrations/CatalogContextModelSnapshot.cs
@@ -1,11 +1,8 @@
-using System;
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using eShopWeb.Infrastructure;
 
-namespace eShopWeb.Infrastructure.Migrations
+namespace Microsoft.eShopWeb.Infrastructure.Migrations
 {
     [DbContext(typeof(CatalogContext))]
     partial class CatalogContextModelSnapshot : ModelSnapshot
diff --git a/src/Web/WebMonolithic/eShopWeb/Models/CatalogBrand.cs b/src/Web/WebMonolithic/eShopWeb/Models/CatalogBrand.cs
index 9488eec5a..7b9e85543 100644
--- a/src/Web/WebMonolithic/eShopWeb/Models/CatalogBrand.cs
+++ b/src/Web/WebMonolithic/eShopWeb/Models/CatalogBrand.cs
@@ -1,4 +1,4 @@
-namespace eShopWeb.Models
+namespace Microsoft.eShopWeb.Models
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/Web/WebMonolithic/eShopWeb/Models/CatalogItem.cs b/src/Web/WebMonolithic/eShopWeb/Models/CatalogItem.cs
index 6970f1cd2..ec857a755 100644
--- a/src/Web/WebMonolithic/eShopWeb/Models/CatalogItem.cs
+++ b/src/Web/WebMonolithic/eShopWeb/Models/CatalogItem.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace eShopWeb.Models
+namespace Microsoft.eShopWeb.Models
 {
     public class CatalogItem
     {
diff --git a/src/Web/WebMonolithic/eShopWeb/Models/CatalogType.cs b/src/Web/WebMonolithic/eShopWeb/Models/CatalogType.cs
index 427a5d21e..a7a959bea 100644
--- a/src/Web/WebMonolithic/eShopWeb/Models/CatalogType.cs
+++ b/src/Web/WebMonolithic/eShopWeb/Models/CatalogType.cs
@@ -1,4 +1,4 @@
-namespace eShopWeb.Models
+namespace Microsoft.eShopWeb.Models
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/Web/WebMonolithic/eShopWeb/Program.cs b/src/Web/WebMonolithic/eShopWeb/Program.cs
index 44e992f64..c02012b02 100644
--- a/src/Web/WebMonolithic/eShopWeb/Program.cs
+++ b/src/Web/WebMonolithic/eShopWeb/Program.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 
-namespace eShopWeb
+namespace Microsoft.eShopWeb
 {
     public class Program
     {
diff --git a/src/Web/WebMonolithic/eShopWeb/Services/CatalogService.cs b/src/Web/WebMonolithic/eShopWeb/Services/CatalogService.cs
index 26142e823..d2a54f0b1 100644
--- a/src/Web/WebMonolithic/eShopWeb/Services/CatalogService.cs
+++ b/src/Web/WebMonolithic/eShopWeb/Services/CatalogService.cs
@@ -1,14 +1,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using eShopWeb.Models;
+using Microsoft.eShopWeb.Models;
 using Microsoft.AspNetCore.Mvc.Rendering;
-using eShopWeb.Infrastructure;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
-using eShopWeb.ViewModels;
+using Microsoft.eShopWeb.Infrastructure;
+using Microsoft.eShopWeb.ViewModels;
 
-namespace eShopWeb.Services
+namespace Microsoft.eShopWeb.Services
 {
     public class CatalogService : ICatalogService
     {
diff --git a/src/Web/WebMonolithic/eShopWeb/Services/ICatalogService.cs b/src/Web/WebMonolithic/eShopWeb/Services/ICatalogService.cs
index 7d8c8619b..efd1188dd 100644
--- a/src/Web/WebMonolithic/eShopWeb/Services/ICatalogService.cs
+++ b/src/Web/WebMonolithic/eShopWeb/Services/ICatalogService.cs
@@ -1,9 +1,9 @@
-using eShopWeb.ViewModels;
-using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.eShopWeb.ViewModels;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace eShopWeb.Services
+namespace Microsoft.eShopWeb.Services
 {
     public interface ICatalogService
     {
diff --git a/src/Web/WebMonolithic/eShopWeb/Startup.cs b/src/Web/WebMonolithic/eShopWeb/Startup.cs
index 3a9e876e6..0fce8a646 100644
--- a/src/Web/WebMonolithic/eShopWeb/Startup.cs
+++ b/src/Web/WebMonolithic/eShopWeb/Startup.cs
@@ -1,5 +1,5 @@
-using eShopWeb.Infrastructure;
-using eShopWeb.Services;
+using Microsoft.eShopWeb.Infrastructure;
+using Microsoft.eShopWeb.Services;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.EntityFrameworkCore;
@@ -8,7 +8,7 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-namespace eShopWeb
+namespace Microsoft.eShopWeb
 {
     public class Startup
     {
diff --git a/src/Web/WebMonolithic/eShopWeb/ViewModels/Catalog.cs b/src/Web/WebMonolithic/eShopWeb/ViewModels/Catalog.cs
index 2031f25ce..b66ac2680 100644
--- a/src/Web/WebMonolithic/eShopWeb/ViewModels/Catalog.cs
+++ b/src/Web/WebMonolithic/eShopWeb/ViewModels/Catalog.cs
@@ -1,7 +1,7 @@
-using eShopWeb.Models;
+using Microsoft.eShopWeb.Models;
 using System.Collections.Generic;
 
-namespace eShopWeb.ViewModels
+namespace Microsoft.eShopWeb.ViewModels
 {
     public class Catalog
     {
diff --git a/src/Web/WebMonolithic/eShopWeb/ViewModels/CatalogIndex.cs b/src/Web/WebMonolithic/eShopWeb/ViewModels/CatalogIndex.cs
index 75aec23f6..fc2ea7f41 100644
--- a/src/Web/WebMonolithic/eShopWeb/ViewModels/CatalogIndex.cs
+++ b/src/Web/WebMonolithic/eShopWeb/ViewModels/CatalogIndex.cs
@@ -1,8 +1,8 @@
-using eShopWeb.Models;
+using Microsoft.eShopWeb.Models;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using System.Collections.Generic;
 
-namespace eShopWeb.ViewModels
+namespace Microsoft.eShopWeb.ViewModels
 {
     public class CatalogIndex
     {
diff --git a/src/Web/WebMonolithic/eShopWeb/ViewModels/PaginationInfo.cs b/src/Web/WebMonolithic/eShopWeb/ViewModels/PaginationInfo.cs
index 2eea3f602..e343291a3 100644
--- a/src/Web/WebMonolithic/eShopWeb/ViewModels/PaginationInfo.cs
+++ b/src/Web/WebMonolithic/eShopWeb/ViewModels/PaginationInfo.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace eShopWeb.ViewModels
+namespace Microsoft.eShopWeb.ViewModels
 {
     public class PaginationInfo
     {
diff --git a/src/Web/WebMonolithic/eShopWeb/Views/Catalog/Index.cshtml b/src/Web/WebMonolithic/eShopWeb/Views/Catalog/Index.cshtml
index 5866261f6..fa99eae02 100644
--- a/src/Web/WebMonolithic/eShopWeb/Views/Catalog/Index.cshtml
+++ b/src/Web/WebMonolithic/eShopWeb/Views/Catalog/Index.cshtml
@@ -1,6 +1,6 @@
 @{
     ViewData["Title"] = "Catalog";
-    @model eShopWeb.ViewModels.CatalogIndex
+    @model Microsoft.eShopWeb.ViewModels.CatalogIndex
 }
 <section class="esh-catalog-hero">
     <div class="container">
diff --git a/src/Web/WebMonolithic/eShopWeb/Views/Catalog/_pagination.cshtml b/src/Web/WebMonolithic/eShopWeb/Views/Catalog/_pagination.cshtml
index ca8011ea6..852f89bd1 100644
--- a/src/Web/WebMonolithic/eShopWeb/Views/Catalog/_pagination.cshtml
+++ b/src/Web/WebMonolithic/eShopWeb/Views/Catalog/_pagination.cshtml
@@ -1,4 +1,4 @@
-@model eShopWeb.ViewModels.PaginationInfo
+@model Microsoft.eShopWeb.ViewModels.PaginationInfo
 
 <div class="esh-pager">
     <div class="container">
diff --git a/src/Web/WebMonolithic/eShopWeb/Views/Catalog/_product.cshtml b/src/Web/WebMonolithic/eShopWeb/Views/Catalog/_product.cshtml
index 7282e2a84..6fbca0de7 100644
--- a/src/Web/WebMonolithic/eShopWeb/Views/Catalog/_product.cshtml
+++ b/src/Web/WebMonolithic/eShopWeb/Views/Catalog/_product.cshtml
@@ -1,4 +1,4 @@
-@model eShopWeb.Models.CatalogItem
+@model Microsoft.eShopWeb.Models.CatalogItem
 
 
 <form asp-controller="Cart" asp-action="AddToCart">
diff --git a/src/Web/WebMonolithic/eShopWeb/Views/_ViewImports.cshtml b/src/Web/WebMonolithic/eShopWeb/Views/_ViewImports.cshtml
index 79b180381..b4d7baf3c 100644
--- a/src/Web/WebMonolithic/eShopWeb/Views/_ViewImports.cshtml
+++ b/src/Web/WebMonolithic/eShopWeb/Views/_ViewImports.cshtml
@@ -1,2 +1,2 @@
-@using eShopWeb
+@using Microsoft.eShopWeb
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers