diff --git a/Yavsc/Views/Activity/Create.cshtml b/Yavsc/Views/Activity/Create.cshtml
index e657b1b9..87ba4bf8 100644
--- a/Yavsc/Views/Activity/Create.cshtml
+++ b/Yavsc/Views/Activity/Create.cshtml
@@ -1,4 +1,4 @@
-@model YavscWeb.Models.Activity
+@model Yavsc.Models.Activity
 
 @{
     ViewData["Title"] = "Create";
@@ -54,4 +54,4 @@
 
 @section Scripts {
     @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
-}
\ No newline at end of file
+}
diff --git a/Yavsc/Views/Activity/Delete.cshtml b/Yavsc/Views/Activity/Delete.cshtml
index 013b16d6..a80759ef 100644
--- a/Yavsc/Views/Activity/Delete.cshtml
+++ b/Yavsc/Views/Activity/Delete.cshtml
@@ -1,4 +1,4 @@
-@model YavscWeb.Models.Activity
+@model Yavsc.Models.Activity
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/Yavsc/Views/Activity/Details.cshtml b/Yavsc/Views/Activity/Details.cshtml
index 2b1e9acf..34f29b02 100644
--- a/Yavsc/Views/Activity/Details.cshtml
+++ b/Yavsc/Views/Activity/Details.cshtml
@@ -1,4 +1,4 @@
-@model YavscWeb.Models.Activity
+@model Yavsc.Models.Activity
 
 @{
     ViewData["Title"] = "Details";
diff --git a/Yavsc/Views/Activity/Edit.cshtml b/Yavsc/Views/Activity/Edit.cshtml
index 4774e18a..5737a19f 100644
--- a/Yavsc/Views/Activity/Edit.cshtml
+++ b/Yavsc/Views/Activity/Edit.cshtml
@@ -1,4 +1,4 @@
-@model YavscWeb.Models.Activity
+@model Yavsc.Models.Activity
 
 @{
     ViewData["Title"] = "Edit";
@@ -48,4 +48,4 @@
 
 @section Scripts {
     @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
-}
\ No newline at end of file
+}
diff --git a/Yavsc/Views/Activity/Index.cshtml b/Yavsc/Views/Activity/Index.cshtml
index 181ef3be..4ffe2c91 100644
--- a/Yavsc/Views/Activity/Index.cshtml
+++ b/Yavsc/Views/Activity/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<YavscWeb.Models.Activity>
+@model IEnumerable<Yavsc.Models.Activity>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/Yavsc/Views/Application/Create.cshtml b/Yavsc/Views/Application/Create.cshtml
index b62de88f..7ac14317 100644
--- a/Yavsc/Views/Application/Create.cshtml
+++ b/Yavsc/Views/Application/Create.cshtml
@@ -1,4 +1,4 @@
-@model YavscWeb.Application
+@model Yavsc.Application
 
 @{
     ViewData["Title"] = "Create";
diff --git a/Yavsc/Views/Application/Delete.cshtml b/Yavsc/Views/Application/Delete.cshtml
index ee9f2618..9f13eb84 100644
--- a/Yavsc/Views/Application/Delete.cshtml
+++ b/Yavsc/Views/Application/Delete.cshtml
@@ -1,4 +1,4 @@
-@model YavscWeb.Application
+@model Yavsc.Application
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/Yavsc/Views/Application/Details.cshtml b/Yavsc/Views/Application/Details.cshtml
index 60db7b89..13124a7d 100644
--- a/Yavsc/Views/Application/Details.cshtml
+++ b/Yavsc/Views/Application/Details.cshtml
@@ -1,4 +1,4 @@
-@model YavscWeb.Application
+@model Yavsc.Application
 
 @{
     ViewData["Title"] = "Details";
diff --git a/Yavsc/Views/Application/Edit.cshtml b/Yavsc/Views/Application/Edit.cshtml
index 944d4ecb..a54fab01 100644
--- a/Yavsc/Views/Application/Edit.cshtml
+++ b/Yavsc/Views/Application/Edit.cshtml
@@ -1,4 +1,4 @@
-@model YavscWeb.Application
+@model Yavsc.Application
 
 @{
     ViewData["Title"] = "Edit";
diff --git a/Yavsc/Views/Application/Index.cshtml b/Yavsc/Views/Application/Index.cshtml
index 59bfa996..8598618d 100644
--- a/Yavsc/Views/Application/Index.cshtml
+++ b/Yavsc/Views/Application/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<YavscWeb.Application>
+@model IEnumerable<Yavsc.Application>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/Yavsc/Views/Blogspot/Create.cshtml b/Yavsc/Views/Blogspot/Create.cshtml
index 64d52238..9a53baf6 100644
--- a/Yavsc/Views/Blogspot/Create.cshtml
+++ b/Yavsc/Views/Blogspot/Create.cshtml
@@ -1,4 +1,4 @@
-@model YavscWeb.Models.Blog
+@model Yavsc.Models.Blog
 
 @{
     ViewData["Title"] = "Create";
diff --git a/Yavsc/Views/Blogspot/Delete.cshtml b/Yavsc/Views/Blogspot/Delete.cshtml
index 4900a68b..4b987801 100644
--- a/Yavsc/Views/Blogspot/Delete.cshtml
+++ b/Yavsc/Views/Blogspot/Delete.cshtml
@@ -1,4 +1,4 @@
-@model YavscWeb.Models.Blog
+@model Yavsc.Models.Blog
 
 <!DOCTYPE html>
 
diff --git a/Yavsc/Views/Blogspot/Details.cshtml b/Yavsc/Views/Blogspot/Details.cshtml
index 7f9348ab..6a43700b 100644
--- a/Yavsc/Views/Blogspot/Details.cshtml
+++ b/Yavsc/Views/Blogspot/Details.cshtml
@@ -1,4 +1,4 @@
-@model YavscWeb.Models.Blog
+@model Yavsc.Models.Blog
 
 @{
     ViewData["Title"]="Details";
diff --git a/Yavsc/Views/Blogspot/Edit.cshtml b/Yavsc/Views/Blogspot/Edit.cshtml
index a3e88faa..1850ece4 100644
--- a/Yavsc/Views/Blogspot/Edit.cshtml
+++ b/Yavsc/Views/Blogspot/Edit.cshtml
@@ -1,4 +1,4 @@
-@model YavscWeb.Models.Blog
+@model Yavsc.Models.Blog
 
 @{
    ViewData["Title"] = SR["Blog post edition"];
diff --git a/Yavsc/Views/Blogspot/Index.cshtml b/Yavsc/Views/Blogspot/Index.cshtml
index 2e71580b..ca57b4b9 100644
--- a/Yavsc/Views/Blogspot/Index.cshtml
+++ b/Yavsc/Views/Blogspot/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<YavscWeb.Models.Blog>
+@model IEnumerable<Yavsc.Models.Blog>
 @{
     ViewData["Title"] = "Index";
     
diff --git a/Yavsc/Views/Blogspot/title.cshtml b/Yavsc/Views/Blogspot/title.cshtml
index 08d3c004..e3f8115f 100644
--- a/Yavsc/Views/Blogspot/title.cshtml
+++ b/Yavsc/Views/Blogspot/title.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<YavscWeb.Models.Blog>
+@model IEnumerable<Yavsc.Models.Blog>
 @{
     ViewData["Title"] = "Title";
 }
diff --git a/Yavsc/Views/Blogspot/userposts.cshtml b/Yavsc/Views/Blogspot/userposts.cshtml
index a0c728a0..36e8e396 100644
--- a/Yavsc/Views/Blogspot/userposts.cshtml
+++ b/Yavsc/Views/Blogspot/userposts.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<YavscWeb.Models.Blog>
+@model IEnumerable<Yavsc.Models.Blog>
 @{
     ViewData["Title"] = "User posts";
 }
diff --git a/Yavsc/Views/Circle/Create.cshtml b/Yavsc/Views/Circle/Create.cshtml
index 9c3a758c..788beab2 100644
--- a/Yavsc/Views/Circle/Create.cshtml
+++ b/Yavsc/Views/Circle/Create.cshtml
@@ -1,4 +1,4 @@
-@model YavscWeb.Models.CircleMember
+@model Yavsc.Models.CircleMember
 
 @{
     ViewData["Title"] = "Create";
diff --git a/Yavsc/Views/Circle/Delete.cshtml b/Yavsc/Views/Circle/Delete.cshtml
index 7f68b313..e3bb93da 100644
--- a/Yavsc/Views/Circle/Delete.cshtml
+++ b/Yavsc/Views/Circle/Delete.cshtml
@@ -1,4 +1,4 @@
-@model YavscWeb.Models.CircleMember
+@model Yavsc.Models.CircleMember
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/Yavsc/Views/Circle/Details.cshtml b/Yavsc/Views/Circle/Details.cshtml
index 27a7163c..80a9d8b5 100644
--- a/Yavsc/Views/Circle/Details.cshtml
+++ b/Yavsc/Views/Circle/Details.cshtml
@@ -1,4 +1,4 @@
-@model YavscWeb.Models.CircleMember
+@model Yavsc.Models.CircleMember
 
 @{
     ViewData["Title"] = "Details";
diff --git a/Yavsc/Views/Circle/Edit.cshtml b/Yavsc/Views/Circle/Edit.cshtml
index 0031c22b..a5983696 100644
--- a/Yavsc/Views/Circle/Edit.cshtml
+++ b/Yavsc/Views/Circle/Edit.cshtml
@@ -1,4 +1,4 @@
-@model YavscWeb.Models.CircleMember
+@model Yavsc.Models.CircleMember
 
 @{
     ViewData["Title"] = "Edit";
diff --git a/Yavsc/Views/Circle/Index.cshtml b/Yavsc/Views/Circle/Index.cshtml
index e646de61..0a98598c 100644
--- a/Yavsc/Views/Circle/Index.cshtml
+++ b/Yavsc/Views/Circle/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<YavscWeb.Models.CircleMember>
+@model IEnumerable<Yavsc.Models.CircleMember>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/Yavsc/Views/Estimate/Create.cshtml b/Yavsc/Views/Estimate/Create.cshtml
index 5de9c07d..9e09cf20 100644
--- a/Yavsc/Views/Estimate/Create.cshtml
+++ b/Yavsc/Views/Estimate/Create.cshtml
@@ -1,4 +1,4 @@
-@model YavscWeb.Models.Estimate
+@model Yavsc.Models.Estimate
 
 @{
     ViewData["Title"] = SR["Estimate"];
diff --git a/Yavsc/Views/Estimate/Delete.cshtml b/Yavsc/Views/Estimate/Delete.cshtml
index d154c3f2..9165fdc3 100644
--- a/Yavsc/Views/Estimate/Delete.cshtml
+++ b/Yavsc/Views/Estimate/Delete.cshtml
@@ -1,4 +1,4 @@
-@model YavscWeb.Models.Estimate
+@model Yavsc.Models.Estimate
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/Yavsc/Views/Estimate/Details.cshtml b/Yavsc/Views/Estimate/Details.cshtml
index 1d050b41..79293514 100644
--- a/Yavsc/Views/Estimate/Details.cshtml
+++ b/Yavsc/Views/Estimate/Details.cshtml
@@ -1,4 +1,4 @@
-@model YavscWeb.Models.Estimate
+@model Yavsc.Models.Estimate
 
 @{
     ViewData["Title"] = "Details";
diff --git a/Yavsc/Views/Estimate/Edit.cshtml b/Yavsc/Views/Estimate/Edit.cshtml
index 379465bc..2f996506 100644
--- a/Yavsc/Views/Estimate/Edit.cshtml
+++ b/Yavsc/Views/Estimate/Edit.cshtml
@@ -1,4 +1,4 @@
-@model YavscWeb.Models.Estimate
+@model Yavsc.Models.Estimate
 
 @{
     ViewData["Title"] = "Edit";
diff --git a/Yavsc/Views/Estimate/Index.cshtml b/Yavsc/Views/Estimate/Index.cshtml
index 8b158f13..4ef300a2 100644
--- a/Yavsc/Views/Estimate/Index.cshtml
+++ b/Yavsc/Views/Estimate/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<YavscWeb.Models.Estimate>
+@model IEnumerable<Yavsc.Models.Estimate>
 
 @{
     ViewData["Title"] = SR["My estimates"];
diff --git a/Yavsc/Views/FrontOffice/Index.cshtml b/Yavsc/Views/FrontOffice/Index.cshtml
index 15e1d348..7f2c4150 100644
--- a/Yavsc/Views/FrontOffice/Index.cshtml
+++ b/Yavsc/Views/FrontOffice/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<YavscWeb.Models.Blog>
+@model IEnumerable<Yavsc.Models.Blog>
 
 @{
     ViewData["Title"] = "Index des blogs";
diff --git a/Yavsc/Views/Home/TestaPdf.cshtml b/Yavsc/Views/Home/TestaPdf.cshtml
index 2d692ef2..272ec267 100644
--- a/Yavsc/Views/Home/TestaPdf.cshtml
+++ b/Yavsc/Views/Home/TestaPdf.cshtml
@@ -4,7 +4,8 @@
 @using Microsoft.Extensions.WebEncoders
 @using System.Diagnostics
 @using System.Text
-@using YavscWeb.Formatters
+@using Yavsc.Formatters
+
 @model Estimate
 @{
    Layout = null;
@@ -51,4 +52,4 @@
       }
       fi.Delete();
 }
-@ViewBag.Pdf
\ No newline at end of file
+@ViewBag.Pdf
diff --git a/Yavsc/Views/Shared/_PerformerPartial.cshtml b/Yavsc/Views/Shared/_PerformerPartial.cshtml
index 6d53b952..325c5910 100644
--- a/Yavsc/Views/Shared/_PerformerPartial.cshtml
+++ b/Yavsc/Views/Shared/_PerformerPartial.cshtml
@@ -1,4 +1,4 @@
-@model YavscWeb.Models.PerformerProfile
+@model Yavsc.Models.PerformerProfile
 
 <div class="performer @(Model.Active?"active":"inactive")">
     @Model.Performer?.UserName (rating: @Model.Rate%)
diff --git a/Yavsc/Views/_ViewImports.cshtml b/Yavsc/Views/_ViewImports.cshtml
index 88c5ec43..b5600aa7 100755
--- a/Yavsc/Views/_ViewImports.cshtml
+++ b/Yavsc/Views/_ViewImports.cshtml
@@ -1,10 +1,10 @@
-@using YavscWeb
-@using YavscWeb.Models
-@using YavscWeb.Models.Google
-@using YavscWeb.Models.Booking
-@using YavscWeb.ViewModels.Account
-@using YavscWeb.ViewModels.Manage
-@using YavscWeb.ViewModels.Calendar;
+@using Yavsc
+@using Yavsc.Models
+@using Yavsc.Models.Google
+@using Yavsc.Models.Booking
+@using Yavsc.ViewModels.Account
+@using Yavsc.ViewModels.Manage
+@using Yavsc.ViewModels.Calendar;
 @using Microsoft.AspNet.Identity
 @using Microsoft.AspNet.Mvc;
 @using Microsoft.Extensions.Localization;
@@ -15,8 +15,8 @@
 
 @inject IViewLocalizer LocString
 @addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers"
-@addTagHelper "*, yavsc"
-@inject IStringLocalizer<YavscWeb.Resources.YavscLoc> SR
+@addTagHelper "*, Yavsc"
+@inject IStringLocalizer<Yavsc.Resources.YavscLoc> SR
 @inject IAuthorizationService  AuthorizationService
 @inject IOptions<GoogleAuthSettings> GoogleSettings
-@inject IOptions<SiteSettings> SiteSettings
\ No newline at end of file
+@inject IOptions<SiteSettings> SiteSettings