diff --git a/NLog.Web.sln b/NLog.Web.sln
index 75b5ea0a..ea0112e1 100644
--- a/NLog.Web.sln
+++ b/NLog.Web.sln
@@ -22,7 +22,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{A9
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASP.NET 4.6.1 - VS2017", "examples\ASP.NET 4.6.1\Visual Studio 2017\ASP.NET 4.6.1 - VS2017\ASP.NET 4.6.1 - VS2017.csproj", "{0BF1FB4E-D5AE-46DE-9E80-E2DD40235552}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASP.NET Core 3 - VS2019", "examples\ASP.NET Core 3\ASP.NET Core 3 - VS2019\ASP.NET Core 3 - VS2019.csproj", "{A0DF49D3-74E1-4FD2-8197-017A824B9AED}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASP.NET Core 3 - VS2019", "examples\ASP.NET Core 3\ASP.NET Core 3 - VS2019\ASP.NET Core 3 - VS2019.csproj", "{A0DF49D3-74E1-4FD2-8197-017A824B9AED}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/ASP.NET Core 2 - VS2017.csproj b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/ASP.NET Core 2 - VS2017.csproj
index d0cf6f41..28239042 100644
--- a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/ASP.NET Core 2 - VS2017.csproj	
+++ b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/ASP.NET Core 2 - VS2017.csproj	
@@ -4,8 +4,8 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <TargetLatestAspNetCoreRuntimePatch>true</TargetLatestAspNetCoreRuntimePatch>
     <RuntimeFrameworkVersion>2.1.*</RuntimeFrameworkVersion>
-    <AssemblyName>NLog.Web.AspNetCore2.Example</AssemblyName>
-    <RootNamespace>NLog.Web.AspNetCore2.Example</RootNamespace>
+    <AssemblyName>ASP.NetCore2_NLog_Web_Example</AssemblyName>
+    <RootNamespace>ASP.NetCore2_NLog_Web_Example</RootNamespace>
     <FileVersion>1.0.0.1</FileVersion>
     <InformationalVersion>1.0.0.2</InformationalVersion>
   </PropertyGroup>
diff --git a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Controllers/HomeController.cs b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Controllers/HomeController.cs
index 24b56e07..c7ca1db3 100644
--- a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Controllers/HomeController.cs	
+++ b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Controllers/HomeController.cs	
@@ -4,10 +4,10 @@
 using System.Linq;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
-using NLog.Web.AspNetCore2.Example.Models;
+using ASP.NetCore2_NLog_Web_Example.Models;
 using NLog.Web.LayoutRenderers;
 
-namespace NLog.Web.AspNetCore2.Example.Controllers
+namespace ASP.NetCore2_NLog_Web_Example.Controllers
 {
     public class HomeController : Controller
     {
diff --git a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Models/ErrorViewModel.cs b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Models/ErrorViewModel.cs
index b09db2c5..2c99bc0d 100644
--- a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Models/ErrorViewModel.cs	
+++ b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Models/ErrorViewModel.cs	
@@ -1,6 +1,6 @@
 using System;
 
-namespace NLog.Web.AspNetCore2.Example.Models
+namespace ASP.NetCore2_NLog_Web_Example.Models
 {
     public class ErrorViewModel
     {
diff --git a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Models/MessageModel.cs b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Models/MessageModel.cs
index a9ff052a..4438347d 100644
--- a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Models/MessageModel.cs	
+++ b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Models/MessageModel.cs	
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace NLog.Web.AspNetCore2.Example.Models
+namespace ASP.NetCore2_NLog_Web_Example.Models
 {
     public class MessageModel
     {
diff --git a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/NLog.config b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/NLog.config
index f7a0ef9e..f42d2553 100644
--- a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/NLog.config	
+++ b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/NLog.config	
@@ -19,7 +19,7 @@
 
     <!-- another file log, only own logs. Uses some ASP.NET core renderers -->
     <target xsi:type="File" name="ownFile-web" fileName="c:\temp\nlog-AspNetCore2-own-${shortdate}.log"
-            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}|${callsite}" />
+            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}" />
   </targets>
 
   <!-- rules to map from logger name to target -->
diff --git a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Program.cs b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Program.cs
index 1f1b4ec6..2f374fc2 100644
--- a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Program.cs	
+++ b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Program.cs	
@@ -6,7 +6,7 @@
 using NLog.Extensions.Logging;
 using NLog.Web;
 
-namespace NLog.Web.AspNetCore2.Example
+namespace ASP.NetCore2_NLog_Web_Example
 {
     public static class Program
     {
diff --git a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Startup.cs b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Startup.cs
index fbfcae92..a0aa3b62 100644
--- a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Startup.cs	
+++ b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Startup.cs	
@@ -6,7 +6,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace NLog.Web.AspNetCore2.Example
+namespace ASP.NetCore2_NLog_Web_Example
 {
     public class Startup
     {
diff --git a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Views/Home/Contact.cshtml b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Views/Home/Contact.cshtml
index 26773bcf..5bdae398 100644
--- a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Views/Home/Contact.cshtml	
+++ b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Views/Home/Contact.cshtml	
@@ -1,4 +1,4 @@
-@model NLog.Web.AspNetCore2.Example.Models.MessageModel
+@model ASP.NetCore2_NLog_Web_Example.Models.MessageModel
 
 @{
     ViewData["Title"] = "Contact";
diff --git a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Views/Shared/Error.cshtml b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Views/Shared/Error.cshtml
index 381f7f03..693811a2 100644
--- a/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Views/Shared/Error.cshtml	
+++ b/examples/ASP.NET Core 2/Visual Studio 2017/ASP.NET Core 2 - VS2017/Views/Shared/Error.cshtml	
@@ -1,5 +1,5 @@
-@using NLog.Web.AspNetCore2.Example.Models
-@model NLog.Web.AspNetCore2.Example.Models.ErrorViewModel
+@using ASP.NetCore2_NLog_Web_Example.Models
+@model ASP.NetCore2_NLog_Web_Example.Models.ErrorViewModel
 @{
     ViewData["Title"] = "Error";
 }
diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/ASP.NET Core 3 - VS2019.csproj b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/ASP.NET Core 3 - VS2019.csproj
index b1108049..6199d8f5 100644
--- a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/ASP.NET Core 3 - VS2019.csproj	
+++ b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/ASP.NET Core 3 - VS2019.csproj	
@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <RootNamespace>ASP.NET_Core_3___VS2019</RootNamespace>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <AssemblyName>ASP.NetCore3_NLog_Web_Example</AssemblyName>
+    <RootNamespace>ASP.NetCore3_NLog_Web_Example</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Controllers/ApiController.cs b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Controllers/ApiController.cs
index 1239dc55..9dd55bb7 100644
--- a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Controllers/ApiController.cs	
+++ b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Controllers/ApiController.cs	
@@ -6,7 +6,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace ASP.NET_Core_3___VS2019.Controllers
+namespace ASP.NetCore3_NLog_Web_Example.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Controllers/HomeController.cs b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Controllers/HomeController.cs
index 4c67555e..bbea4b7e 100644
--- a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Controllers/HomeController.cs	
+++ b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Controllers/HomeController.cs	
@@ -5,9 +5,9 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
-using ASP.NET_Core_3___VS2019.Models;
+using ASP.NetCore3_NLog_Web_Example.Models;
 
-namespace ASP.NET_Core_3___VS2019.Controllers
+namespace ASP.NetCore3_NLog_Web_Example.Controllers
 {
     public class HomeController : Controller
     {
diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Models/ErrorViewModel.cs b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Models/ErrorViewModel.cs
index 7211ceea..d7d73a82 100644
--- a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Models/ErrorViewModel.cs	
+++ b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Models/ErrorViewModel.cs	
@@ -1,6 +1,6 @@
 using System;
 
-namespace ASP.NET_Core_3___VS2019.Models
+namespace ASP.NetCore3_NLog_Web_Example.Models
 {
     public class ErrorViewModel
     {
diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Models/ItemModel.cs b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Models/ItemModel.cs
index 763e9a6a..f41a3d38 100644
--- a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Models/ItemModel.cs	
+++ b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Models/ItemModel.cs	
@@ -3,12 +3,11 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace ASP.NET_Core_3___VS2019.Models
+namespace ASP.NetCore3_NLog_Web_Example.Models
 {
     public class ItemModel
     {
         public string Name { get; set; }
         public string Value { get; set; }
-
     }
 }
diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/NLog.config b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/NLog.config
index 9afbbfb3..b7ebfce3 100644
--- a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/NLog.config	
+++ b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/NLog.config	
@@ -19,7 +19,7 @@
 
     <!-- File Target for own log messages with extra web details using some ASP.NET core renderers -->
     <target xsi:type="File" name="ownFile-web" fileName="c:\temp\nlog-AspNetCore3-own-${shortdate}.log"
-            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}|${callsite}| body: ${aspnet-request-posted-body}" />
+            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}" />
 
     <!--Console Target for hosting lifetime messages to improve Docker / Visual Studio startup detection -->
     <target xsi:type="Console" name="lifetimeConsole" layout="${level:truncate=4:tolower=true}\: ${logger}[0]${newline}      ${message}${exception:format=tostring}" />
@@ -33,8 +33,8 @@
     <!--Output hosting lifetime messages to console target for faster startup detection -->
     <logger name="Microsoft.Hosting.Lifetime" minlevel="Info" writeTo="lifetimeConsole, ownFile-web" final="true" />
 
-    <!--Skip non-critical Microsoft logs and so log only own logs-->
-    <logger name="Microsoft.*" maxlevel="Info" final="true" />  <!-- BlackHole -->
+    <!--Skip non-critical Microsoft logs and so log only own logs (BlackHole) -->
+    <logger name="Microsoft.*" maxlevel="Info" final="true" />
 
     <logger name="*" minlevel="Trace" writeTo="ownFile-web" />
   </rules>
diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Program.cs b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Program.cs
index 5059b799..d588bc79 100644
--- a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Program.cs	
+++ b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Program.cs	
@@ -9,7 +9,7 @@
 using NLog;
 using NLog.Web;
 
-namespace ASP.NET_Core_3___VS2019
+namespace ASP.NetCore3_NLog_Web_Example
 {
     public class Program
     {
diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Properties/launchSettings.json b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Properties/launchSettings.json
index 1d95d9d3..fa6a663e 100644
--- a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Properties/launchSettings.json	
+++ b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Properties/launchSettings.json	
@@ -15,7 +15,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "ASP.NET_Core_3___VS2019": {
+    "ASP.NetCore3_NLog_Web_Example": {
       "commandName": "Project",
       "launchBrowser": true,
       "applicationUrl": "https://localhost:5001;http://localhost:5000",
diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Startup.cs b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Startup.cs
index 448b36bb..ead12a89 100644
--- a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Startup.cs	
+++ b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Startup.cs	
@@ -10,7 +10,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
-namespace ASP.NET_Core_3___VS2019
+namespace ASP.NetCore3_NLog_Web_Example
 {
     public class Startup
     {
diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Views/Shared/_Layout.cshtml b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Views/Shared/_Layout.cshtml
index ecf7548c..af19b650 100644
--- a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Views/Shared/_Layout.cshtml	
+++ b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Views/Shared/_Layout.cshtml	
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - ASP.NET_Core_3___VS2019</title>
+    <title>@ViewData["Title"] - ASP.NetCore3_NLog_Web_Example</title>
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.css" />
 </head>
@@ -11,7 +11,7 @@
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container">
-                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">ASP.NET_Core_3___VS2019</a>
+                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">ASP.NetCore3_NLog_Web_Example</a>
                 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
@@ -37,7 +37,7 @@
 
     <footer class="border-top footer text-muted">
         <div class="container">
-            &copy; 2019 - ASP.NET_Core_3___VS2019 - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
+            &copy; 2019 - ASP.NetCore3_NLog_Web_Example - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
         </div>
     </footer>
     <script src="~/lib/jquery/dist/jquery.min.js"></script>
diff --git a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Views/_ViewImports.cshtml b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Views/_ViewImports.cshtml
index 06f383ea..1bae80b1 100644
--- a/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Views/_ViewImports.cshtml	
+++ b/examples/ASP.NET Core 3/ASP.NET Core 3 - VS2019/Views/_ViewImports.cshtml	
@@ -1,3 +1,3 @@
-@using ASP.NET_Core_3___VS2019
-@using ASP.NET_Core_3___VS2019.Models
+@using ASP.NetCore3_NLog_Web_Example
+@using ASP.NetCore3_NLog_Web_Example.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/ASP.NET Core 5 NLog Example.csproj b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/ASP.NET Core 5 NLog Example.csproj
index cee3622f..eef1b631 100644
--- a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/ASP.NET Core 5 NLog Example.csproj	
+++ b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/ASP.NET Core 5 NLog Example.csproj	
@@ -1,13 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <RootNamespace>ASP.NET_Core_5_NLog_Example</RootNamespace>
+    <AssemblyName>ASP.NetCore5_NLog_Web_Example</AssemblyName>
+    <RootNamespace>ASP.NetCore5_NLog_Web_Example</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.3" />
-    <PackageReference Include="NLog" Version="4.7.6" />
+    <ProjectReference Include="..\..\..\src\NLog.Web.AspNetCore\NLog.Web.AspNetCore.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Controllers/HomeController.cs b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Controllers/HomeController.cs
index 1c94aa35..688d6105 100644
--- a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Controllers/HomeController.cs	
+++ b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Controllers/HomeController.cs	
@@ -1,4 +1,4 @@
-using ASP.NET_Core_5_NLog_Example.Models;
+using ASP.NetCore5_NLog_Web_Example.Models;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using System;
@@ -7,7 +7,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace ASP.NET_Core_5_NLog_Example.Controllers
+namespace ASP.NetCore5_NLog_Web_Example.Controllers
 {
     public class HomeController : Controller
     {
diff --git a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Models/ErrorViewModel.cs b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Models/ErrorViewModel.cs
index 5567e776..f3acadf4 100644
--- a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Models/ErrorViewModel.cs	
+++ b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Models/ErrorViewModel.cs	
@@ -1,6 +1,6 @@
 using System;
 
-namespace ASP.NET_Core_5_NLog_Example.Models
+namespace ASP.NetCore5_NLog_Web_Example.Models
 {
     public class ErrorViewModel
     {
diff --git a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Program.cs b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Program.cs
index 4b3b2a13..25cff88a 100644
--- a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Program.cs	
+++ b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Program.cs	
@@ -4,7 +4,7 @@
 using System;
 using NLog.Web;
 
-namespace ASP.NET_Core_5_NLog_Example
+namespace ASP.NetCore5_NLog_Web_Example
 {
     public class Program
     {
diff --git a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Properties/launchSettings.json b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Properties/launchSettings.json
index 1f08cdb3..550c1aa9 100644
--- a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Properties/launchSettings.json	
+++ b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Properties/launchSettings.json	
@@ -15,7 +15,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "ASP.NET_Core_5_NLog_Example": {
+    "ASP.NetCore5_NLog_Web_Example": {
       "commandName": "Project",
       "dotnetRunMessages": "true",
       "launchBrowser": true,
diff --git a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Startup.cs b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Startup.cs
index 7ee6aad0..29236126 100644
--- a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Startup.cs	
+++ b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Startup.cs	
@@ -9,7 +9,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace ASP.NET_Core_5_NLog_Example
+namespace ASP.NetCore5_NLog_Web_Example
 {
     public class Startup
     {
diff --git a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Views/Shared/_Layout.cshtml b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Views/Shared/_Layout.cshtml
index bca74821..030ad3f3 100644
--- a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Views/Shared/_Layout.cshtml	
+++ b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Views/Shared/_Layout.cshtml	
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - ASP.NET_Core_5_NLog_Example</title>
+    <title>@ViewData["Title"] - ASP.NetCore5_NLog_Web_Example</title>
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.css" />
 </head>
@@ -11,7 +11,7 @@
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container">
-                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">ASP.NET_Core_5_NLog_Example</a>
+                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">ASP.NetCore5_NLog_Web_Example</a>
                 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
@@ -37,7 +37,7 @@
 
     <footer class="border-top footer text-muted">
         <div class="container">
-            &copy; 2020 - ASP.NET_Core_5_NLog_Example - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
+            &copy; 2020 - ASP.NetCore5_NLog_Web_Example - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
         </div>
     </footer>
     <script src="~/lib/jquery/dist/jquery.min.js"></script>
diff --git a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Views/_ViewImports.cshtml b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Views/_ViewImports.cshtml
index ca4a580f..429bacac 100644
--- a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Views/_ViewImports.cshtml	
+++ b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/Views/_ViewImports.cshtml	
@@ -1,3 +1,3 @@
-@using ASP.NET_Core_5_NLog_Example
-@using ASP.NET_Core_5_NLog_Example.Models
+@using ASP.NetCore5_NLog_Web_Example
+@using ASP.NetCore5_NLog_Web_Example.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/nlog.config b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/nlog.config
index 82a73888..fbebb5d6 100644
--- a/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/nlog.config	
+++ b/examples/ASP.NET Core 5/ASP.NET Core 5 NLog Example/nlog.config	
@@ -3,7 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       autoReload="true"
       internalLogLevel="Info"
-      internalLogFile="c:\temp\internal-nlog.txt">
+      internalLogFile="c:\temp\internal-nlog-AspNetCore5.txt">
 
   <!-- enable asp.net core layout renderers -->
   <extensions>
@@ -12,13 +12,16 @@
 
   <!-- the targets to write to -->
   <targets>
-    <!-- write logs to file  -->
-    <target xsi:type="File" name="allfile" fileName="c:\temp\nlog-all-${shortdate}.log"
-            layout="${longdate}|${event-properties:item=EventId_Id}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}" />
+    <!-- File Target for all log messages with basic details -->
+    <target xsi:type="File" name="allfile" fileName="c:\temp\nlog-AspNetCore5-all-${shortdate}.log"
+            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}" />
 
-    <!-- another file log, only own logs. Uses some ASP.NET core renderers -->
-    <target xsi:type="File" name="ownFile-web" fileName="c:\temp\nlog-own-${shortdate}.log"
-            layout="${longdate}|${event-properties:item=EventId_Id}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}" />
+    <!-- File Target for own log messages with extra web details using some ASP.NET core renderers -->
+    <target xsi:type="File" name="ownFile-web" fileName="c:\temp\nlog-AspNetCore5-own-${shortdate}.log"
+            layout="${longdate}|${event-properties:item=EventId_Id:whenEmpty=0}|${uppercase:${level}}|${logger}|${message} ${exception:format=tostring}|url: ${aspnet-request-url}|action: ${aspnet-mvc-action}|${callsite}| body: ${aspnet-request-posted-body}" />
+
+    <!--Console Target for hosting lifetime messages to improve Docker / Visual Studio startup detection -->
+    <target xsi:type="Console" name="lifetimeConsole" layout="${level:truncate=4:tolower=true}\: ${logger}[0]${newline}      ${message}${exception:format=tostring}" />
   </targets>
 
   <!-- rules to map from logger name to target -->
@@ -26,10 +29,13 @@
     <!--All logs, including from Microsoft-->
     <logger name="*" minlevel="Trace" writeTo="allfile" />
 
-    <!--Skip non-critical Microsoft logs and so log only own logs-->
-    <logger name="Microsoft.*" maxlevel="Info" final="true" /> <!-- BlackHole without writeTo -->
-    <logger name="System.Net.Http.*" maxlevel="Info" final="true" /> <!-- BlackHole without writeTo -->
+    <!--Output hosting lifetime messages to console target for faster startup detection -->
+    <logger name="Microsoft.Hosting.Lifetime" minlevel="Info" writeTo="lifetimeConsole, ownFile-web" final="true" />
 
+    <!--Skip non-critical Microsoft logs and so log only own logs (BlackHole) -->
+    <logger name="Microsoft.*" maxlevel="Info" final="true" />
+    <logger name="System.Net.Http.*" maxlevel="Info" final="true" />
+    
     <logger name="*" minlevel="Trace" writeTo="ownFile-web" />
   </rules>
 </nlog>
\ No newline at end of file