diff --git a/README.md b/README.md
index 429b4fc..63e17d0 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,11 @@
-ASP.NET DiagnosticsPages
+ASP.NET Core Diagnostics
 ================
+
 AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/5224cefq6y78aq21/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/Diagnostics/branch/dev)
 
 Travis:   [![Travis](https://travis-ci.org/aspnet/Diagnostics.svg?branch=dev)](https://travis-ci.org/aspnet/Diagnostics)
 
-Diagnostics middleware.
+Diagnostics middleware for reporting info and handling exceptions and errors in ASP.NET Core, and diagnosing Entity Framework Core migrations errors.
 
-This project is part of ASP.NET 5. You can find samples, documentation and getting started instructions for ASP.NET 5 at the [Home](https://github.com/aspnet/home) repo.
+
+This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo.
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json
index 6a28c10..2912e03 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json
+++ b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json
@@ -1,6 +1,11 @@
 {
   "version": "1.0.0-*",
-  "description": "ASP.NET 5 diagnostics middleware abstractions.",
+  "description": "ASP.NET Core diagnostics middleware abstractions and feature interface definitions.",
+  "tags": [
+    "aspnetcore",
+    "diagnostics"
+  ],
+
   "repository": {
     "type": "git",
     "url": "git://github.com/aspnet/diagnostics"
@@ -14,7 +19,7 @@
     "xmlDoc": true
   },
   "frameworks": {
-    "net451": {},
+    "net451": { },
     "netstandard1.3": {
       "dependencies": {
         "System.Resources.ResourceManager": "4.0.1-*"
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cs
index fc989d9..4bb45d3 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cs
+++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cs
@@ -143,14 +143,14 @@ using Microsoft.Extensions.Logging
 <html>
 <head>
     <meta charset=""utf-8"" />
-    <title>ASP.NET Logs</title>
+    <title>ASP.NET Core Logs</title>
     <script src=""http://ajax.aspnetcdn.com/ajax/jquery/jquery-2.1.1.min.js""></script>
     <style>
         <%$ include: Shared.css % > <%$ include: DetailsPage.css % >
     </style>
 </head>
 <body>
-    <h1>ASP.NET Logs</h1>
+    <h1>ASP.NET Core Logs</h1>
 ");
 #line 99 "DetailsPage.cshtml"
     
@@ -423,9 +423,9 @@ using Microsoft.Extensions.Logging
 #line hidden
 
             WriteLiteral("                    <option");
-            BeginWriteAttribute("value", " value=\"", 7693, "\"", 7713, 1);
+            BeginWriteAttribute("value", " value=\"", 7715, "\"", 7735, 1);
 #line 226 "DetailsPage.cshtml"
-WriteAttributeValue("", 7701, severityInt, 7701, 12, false);
+WriteAttributeValue("", 7723, severityInt, 7723, 12, false);
 
 #line default
 #line hidden
@@ -446,9 +446,9 @@ WriteAttributeValue("", 7701, severityInt, 7701, 12, false);
 #line hidden
 
             WriteLiteral("                    <option");
-            BeginWriteAttribute("value", " value=\"", 7842, "\"", 7862, 1);
+            BeginWriteAttribute("value", " value=\"", 7864, "\"", 7884, 1);
 #line 230 "DetailsPage.cshtml"
-WriteAttributeValue("", 7850, severityInt, 7850, 12, false);
+WriteAttributeValue("", 7872, severityInt, 7872, 12, false);
 
 #line default
 #line hidden
@@ -468,9 +468,9 @@ WriteAttributeValue("", 7850, severityInt, 7850, 12, false);
 #line hidden
 
             WriteLiteral("        </select>\r\n        <input type=\"text\" name=\"name\"");
-            BeginWriteAttribute("value", " value=\"", 7975, "\"", 8008, 1);
+            BeginWriteAttribute("value", " value=\"", 7997, "\"", 8030, 1);
 #line 234 "DetailsPage.cshtml"
-WriteAttributeValue("", 7983, Model.Options.NamePrefix, 7983, 25, false);
+WriteAttributeValue("", 8005, Model.Options.NamePrefix, 8005, 25, false);
 
 #line default
 #line hidden
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cshtml
index dadd8ab..f9f7767 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cshtml
+++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cshtml
@@ -1,4 +1,4 @@
-@using System
+﻿@using System
 @using System.Globalization
 @using System.Linq
 @using Microsoft.AspNetCore.Diagnostics.Elm
@@ -88,14 +88,14 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <title>ASP.NET Logs</title>
+    <title>ASP.NET Core Logs</title>
     <script src="http://ajax.aspnetcdn.com/ajax/jquery/jquery-2.1.1.min.js"></script>
     <style>
         <%$ include: Shared.css % > <%$ include: DetailsPage.css % >
     </style>
 </head>
 <body>
-    <h1>ASP.NET Logs</h1>
+    <h1>ASP.NET Core Logs</h1>
     @{
         var context = Model.Activity?.HttpInfo;
     }
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cs
index 90ea841..25121a6 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cs
+++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cs
@@ -179,7 +179,7 @@ using Microsoft.Extensions.Logging
 <html>
 <head>
     <meta charset=""utf-8"" />
-    <title>ASP.NET Logs</title>
+    <title>ASP.NET Core Logs</title>
     <script src=""//ajax.aspnetcdn.com/ajax/jquery/jquery-2.1.1.min.js""></script>
     <style>
         body {\r\n    font-size: .813em;\r\n    white-space: nowrap;\r\n    margin: 20px;\r\n}\r\n\r\ncol:nth-child(2n) {\r\n    background-color: #FAFAFA;\r\n}\r\n\r\nform { \r\n    display: inline-block; \r\n}\r\n\r\nh1 {\r\n    margin-left: 25px;\r\n}\r\n\r\ntable {\r\n    margin: 0px auto;\r\n    border-collapse: collapse;\r\n    border-spacing: 0px;\r\n    table-layout: fixed;\r\n    width: 100%;\r\n}\r\n\r\ntd, th {\r\n    padding: 4px;\r\n}\r\n\r\nthead {\r\n    font-size: 1em;\r\n    font-family: Arial;\r\n}\r\n\r\ntr {\r\n    height: 23px;\r\n}\r\n\r\n#requestHeader {\r\n    border-bottom: solid 1px gray;\r\n    border-top: solid 1px gray;\r\n    margin-bottom: 2px;\r\n    font-size: 1em;\r\n    line-height: 2em;\r\n}\r\n\r\n.collapse {\r\n    color: black;\r\n    float: right;\r\n    font-weight: normal;\r\n    width: 1em;\r\n}\r\n\r\n.date, .time {\r\n    width: 70px; \r\n}\r\n\r\n.logHeader {\r\n    border-bottom: 1px solid lightgray;\r\n    color: gray;\r\n    text-align: left;\r\n}\r\n\r\n.logState {\r\n    text-overflow: ellipsis;\r\n    overflow: hidden;\r\n}\r\n\r\n.logTd {\r\n    border-left: 1px solid gray;\r\n    padding: 0px;\r\n}\r\n\r\n.logs {\r\n    width: 80%;\r\n}\r\n\r\n.logRow:hover {\r\n    background-color: #D6F5FF;\r\n}\r\n\r\n.requestRow>td {\r\n    border-bottom: solid 1px gray;\r\n}\r\n\r\n.severity {\r\n    width: 80px;\r\n}\r\n\r\n.summary {\r\n    color: black;\r\n    line-height: 1.8em;\r\n}\r\n\r\n.summary>th {\r\n    font-weight: normal;\r\n}\r\n\r\n.tab {\r\n    margin-left: 30px;\r\n}\r\n\r\n#viewOptions {\r\n    margin: 20px;\r\n}\r\n\r\n#viewOptions > * {\r\n    margin: 5px;\r\n}
@@ -187,7 +187,7 @@ using Microsoft.Extensions.Logging
     </style>
 </head>
 <body>
-    <h1>ASP.NET Logs</h1>
+    <h1>ASP.NET Core Logs</h1>
     <form id=""viewOptions"" method=""get"">
         <select name=""level"">
 ");
@@ -208,9 +208,9 @@ using Microsoft.Extensions.Logging
 #line hidden
 
             WriteLiteral("                    <option");
-            BeginWriteAttribute("value", " value=\"", 4904, "\"", 4924, 1);
+            BeginWriteAttribute("value", " value=\"", 4926, "\"", 4946, 1);
 #line 138 "LogPage.cshtml"
-WriteAttributeValue("", 4912, severityInt, 4912, 12, false);
+WriteAttributeValue("", 4934, severityInt, 4934, 12, false);
 
 #line default
 #line hidden
@@ -231,9 +231,9 @@ WriteAttributeValue("", 4912, severityInt, 4912, 12, false);
 #line hidden
 
             WriteLiteral("                    <option");
-            BeginWriteAttribute("value", " value=\"", 5053, "\"", 5073, 1);
+            BeginWriteAttribute("value", " value=\"", 5075, "\"", 5095, 1);
 #line 142 "LogPage.cshtml"
-WriteAttributeValue("", 5061, severityInt, 5061, 12, false);
+WriteAttributeValue("", 5083, severityInt, 5083, 12, false);
 
 #line default
 #line hidden
@@ -253,9 +253,9 @@ WriteAttributeValue("", 5061, severityInt, 5061, 12, false);
 #line hidden
 
             WriteLiteral("        </select>\r\n        <input type=\"text\" name=\"name\"");
-            BeginWriteAttribute("value", " value=\"", 5186, "\"", 5219, 1);
+            BeginWriteAttribute("value", " value=\"", 5208, "\"", 5241, 1);
 #line 146 "LogPage.cshtml"
-WriteAttributeValue("", 5194, Model.Options.NamePrefix, 5194, 25, false);
+WriteAttributeValue("", 5216, Model.Options.NamePrefix, 5216, 25, false);
 
 #line default
 #line hidden
@@ -315,16 +315,16 @@ WriteAttributeValue("", 5194, Model.Options.NamePrefix, 5194, 25, false);
 #line hidden
 
             WriteLiteral("                        \t<td><a");
-            BeginWriteAttribute("href", " href=\"", 6283, "\"", 6303, 1);
+            BeginWriteAttribute("href", " href=\"", 6305, "\"", 6325, 1);
 #line 178 "LogPage.cshtml"
-WriteAttributeValue("", 6290, activityPath, 6290, 13, false);
+WriteAttributeValue("", 6312, activityPath, 6312, 13, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
-            BeginWriteAttribute("title", " title=\"", 6304, "\"", 6335, 1);
+            BeginWriteAttribute("title", " title=\"", 6326, "\"", 6357, 1);
 #line 178 "LogPage.cshtml"
-WriteAttributeValue("", 6312, activity.HttpInfo.Path, 6312, 23, false);
+WriteAttributeValue("", 6334, activity.HttpInfo.Path, 6334, 23, false);
 
 #line default
 #line hidden
@@ -363,16 +363,16 @@ WriteAttributeValue("", 6312, activity.HttpInfo.Path, 6312, 23, false);
 #line hidden
 
             WriteLiteral("                            <td colspan=\"4\"><a");
-            BeginWriteAttribute("href", " href=\"", 6725, "\"", 6745, 1);
+            BeginWriteAttribute("href", " href=\"", 6747, "\"", 6767, 1);
 #line 185 "LogPage.cshtml"
-WriteAttributeValue("", 6732, activityPath, 6732, 13, false);
+WriteAttributeValue("", 6754, activityPath, 6754, 13, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
-            BeginWriteAttribute("title", " title=\"", 6746, "\"", 6774, 1);
+            BeginWriteAttribute("title", " title=\"", 6768, "\"", 6796, 1);
 #line 185 "LogPage.cshtml"
-WriteAttributeValue("", 6754, activity.Root.State, 6754, 20, false);
+WriteAttributeValue("", 6776, activity.Root.State, 6776, 20, false);
 
 #line default
 #line hidden
@@ -393,9 +393,9 @@ WriteAttributeValue("", 6754, activity.Root.State, 6754, 20, false);
 #line hidden
 
             WriteLiteral("                            <td colspan=\"4\"><a");
-            BeginWriteAttribute("href", " href=\"", 6937, "\"", 6957, 1);
+            BeginWriteAttribute("href", " href=\"", 6959, "\"", 6979, 1);
 #line 189 "LogPage.cshtml"
-WriteAttributeValue("", 6944, activityPath, 6944, 13, false);
+WriteAttributeValue("", 6966, activityPath, 6966, 13, false);
 
 #line default
 #line hidden
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cshtml
index a32f842..9d4a72c 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cshtml
+++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cshtml
@@ -119,7 +119,7 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <title>ASP.NET Logs</title>
+    <title>ASP.NET Core Logs</title>
     <script src="//ajax.aspnetcdn.com/ajax/jquery/jquery-2.1.1.min.js"></script>
     <style>
         <%$ include: LogPage.css %>
@@ -127,7 +127,7 @@
     </style>
 </head>
 <body>
-    <h1>ASP.NET Logs</h1>
+    <h1>ASP.NET Core Logs</h1>
     <form id="viewOptions" method="get">
         <select name="level">
             @foreach (var severity in Enum.GetValues(typeof(LogLevel)))
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json b/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json
index 499f358..7027afc 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json
+++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json
@@ -1,6 +1,11 @@
 {
   "version": "0.1.0-*",
-  "description": "ASP.NET 5 Middleware to capture and display the request logs.",
+  "description": "ASP.NET Core Error Logging Middleware (ELM) to capture and display request logs.",
+  "tags": [
+    "aspnetcore",
+    "diagnostics"
+  ],
+
   "compilationOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
@@ -18,7 +23,7 @@
     "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*"
   },
   "frameworks": {
-    "net451": {},
+    "net451": { },
     "netstandard1.3": {
       "dependencies": {
         "System.Threading": "4.0.11-*"
diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json
index 8f2cf15..e06efde 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json
+++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json
@@ -1,6 +1,12 @@
 {
   "version": "1.0.0-*",
-  "description": "ASP.NET 5 Middleware for Entity Framework error pages.",
+  "description": "ASP.NET Core middleware for Entity Framework Core error pages. Use this middleware to detect and diagnose errors with Entity Framework Core migrations.",
+  "tags": [
+    "aspnetcore",
+    "diagnostics",
+    "entityframeworkcore"
+  ],
+
   "repository": {
     "type": "git",
     "url": "git://github.com/aspnet/diagnostics"
diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cs
index 8eb05f9..7670fe0 100644
--- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cs
+++ b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cs
@@ -135,9 +135,9 @@ using Microsoft.AspNetCore.Diagnostics
 #line hidden
 
             WriteLiteral("                    <li class=\"frame\"");
-            BeginWriteAttribute("tabindex", " tabindex=\"", 1269, "\"", 1289, 1);
+            BeginWriteAttribute("tabindex", " tabindex=\"", 1273, "\"", 1293, 1);
 #line 41 "CompilationErrorPage.cshtml"
-WriteAttributeValue("", 1280, tabIndex, 1280, 9, false);
+WriteAttributeValue("", 1284, tabIndex, 1284, 9, false);
 
 #line default
 #line hidden
@@ -205,9 +205,9 @@ WriteAttributeValue("", 1280, tabIndex, 1280, 9, false);
 #line hidden
 
             WriteLiteral("                                    <ol");
-            BeginWriteAttribute("start", " start=\"", 1813, "\"", 1842, 1);
+            BeginWriteAttribute("start", " start=\"", 1817, "\"", 1846, 1);
 #line 53 "CompilationErrorPage.cshtml"
-WriteAttributeValue("", 1821, frame.PreContextLine, 1821, 21, false);
+WriteAttributeValue("", 1825, frame.PreContextLine, 1825, 21, false);
 
 #line default
 #line hidden
@@ -247,9 +247,9 @@ WriteAttributeValue("", 1821, frame.PreContextLine, 1821, 21, false);
 #line hidden
 
             WriteLiteral("                                <ol");
-            BeginWriteAttribute("start", " start=\"", 2223, "\"", 2242, 1);
+            BeginWriteAttribute("start", " start=\"", 2227, "\"", 2246, 1);
 #line 60 "CompilationErrorPage.cshtml"
-WriteAttributeValue("", 2231, frame.Line, 2231, 11, false);
+WriteAttributeValue("", 2235, frame.Line, 2235, 11, false);
 
 #line default
 #line hidden
@@ -296,9 +296,9 @@ WriteAttributeValue("", 2231, frame.Line, 2231, 11, false);
 #line hidden
 
             WriteLiteral("                                    <ol");
-            BeginWriteAttribute("start", " start=\'", 2669, "\'", 2694, 1);
+            BeginWriteAttribute("start", " start=\'", 2673, "\'", 2698, 1);
 #line 68 "CompilationErrorPage.cshtml"
-WriteAttributeValue("", 2677, frame.Line + 1, 2677, 17, false);
+WriteAttributeValue("", 2681, frame.Line + 1, 2681, 17, false);
 
 #line default
 #line hidden
diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cs
index 84a4645..5e1f35c 100644
--- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cs
+++ b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cs
@@ -69,9 +69,9 @@ using Microsoft.AspNetCore.Diagnostics
 #line hidden
 
             WriteLiteral("<!DOCTYPE html>\r\n<html");
-            BeginWriteAttribute("lang", " lang=\"", 497, "\"", 558, 1);
+            BeginWriteAttribute("lang", " lang=\"", 505, "\"", 566, 1);
 #line 22 "ErrorPage.cshtml"
-WriteAttributeValue("", 504, CultureInfo.CurrentUICulture.TwoLetterISOLanguageName, 504, 54, false);
+WriteAttributeValue("", 512, CultureInfo.CurrentUICulture.TwoLetterISOLanguageName, 512, 54, false);
 
 #line default
 #line hidden
@@ -154,9 +154,9 @@ WriteAttributeValue("", 504, CultureInfo.CurrentUICulture.TwoLetterISOLanguageNa
 #line default
 #line hidden
             WriteLiteral(" in <code");
-            BeginWriteAttribute("title", " title=\"", 1874, "\"", 1898, 1);
+            BeginWriteAttribute("title", " title=\"", 1882, "\"", 1906, 1);
 #line 49 "ErrorPage.cshtml"
-WriteAttributeValue("", 1882, firstFrame.File, 1882, 16, false);
+WriteAttributeValue("", 1890, firstFrame.File, 1890, 16, false);
 
 #line default
 #line hidden
@@ -283,9 +283,9 @@ WriteAttributeValue("", 1882, firstFrame.File, 1882, 16, false);
 #line hidden
 
             WriteLiteral("                            <li class=\"frame\"");
-            BeginWriteAttribute("tabindex", " tabindex=\"", 3302, "\"", 3322, 1);
+            BeginWriteAttribute("tabindex", " tabindex=\"", 3310, "\"", 3330, 1);
 #line 85 "ErrorPage.cshtml"
-WriteAttributeValue("", 3313, tabIndex, 3313, 9, false);
+WriteAttributeValue("", 3321, tabIndex, 3321, 9, false);
 
 #line default
 #line hidden
@@ -333,9 +333,9 @@ WriteAttributeValue("", 3313, tabIndex, 3313, 9, false);
 #line default
 #line hidden
             WriteLiteral(" in <code");
-            BeginWriteAttribute("title", " title=\"", 3717, "\"", 3736, 1);
+            BeginWriteAttribute("title", " title=\"", 3725, "\"", 3744, 1);
 #line 93 "ErrorPage.cshtml"
-WriteAttributeValue("", 3725, frame.File, 3725, 11, false);
+WriteAttributeValue("", 3733, frame.File, 3733, 11, false);
 
 #line default
 #line hidden
@@ -382,9 +382,9 @@ WriteAttributeValue("", 3725, frame.File, 3725, 11, false);
 #line hidden
 
             WriteLiteral("                                            <ol");
-            BeginWriteAttribute("start", " start=\"", 4167, "\"", 4196, 1);
+            BeginWriteAttribute("start", " start=\"", 4175, "\"", 4204, 1);
 #line 101 "ErrorPage.cshtml"
-WriteAttributeValue("", 4175, frame.PreContextLine, 4175, 21, false);
+WriteAttributeValue("", 4183, frame.PreContextLine, 4183, 21, false);
 
 #line default
 #line hidden
@@ -424,9 +424,9 @@ WriteAttributeValue("", 4175, frame.PreContextLine, 4175, 21, false);
 #line hidden
 
             WriteLiteral("\r\n                                        <ol");
-            BeginWriteAttribute("start", " start=\"", 4635, "\"", 4654, 1);
+            BeginWriteAttribute("start", " start=\"", 4643, "\"", 4662, 1);
 #line 109 "ErrorPage.cshtml"
-WriteAttributeValue("", 4643, frame.Line, 4643, 11, false);
+WriteAttributeValue("", 4651, frame.Line, 4651, 11, false);
 
 #line default
 #line hidden
@@ -473,9 +473,9 @@ WriteAttributeValue("", 4643, frame.Line, 4643, 11, false);
 #line hidden
 
             WriteLiteral("                                            <ol");
-            BeginWriteAttribute("start", " start=\'", 5147, "\'", 5172, 1);
+            BeginWriteAttribute("start", " start=\'", 5155, "\'", 5180, 1);
 #line 118 "ErrorPage.cshtml"
-WriteAttributeValue("", 5155, frame.Line + 1, 5155, 17, false);
+WriteAttributeValue("", 5163, frame.Line + 1, 5163, 17, false);
 
 #line default
 #line hidden
diff --git a/src/Microsoft.AspNetCore.Diagnostics/Properties/Resources.Designer.cs b/src/Microsoft.AspNetCore.Diagnostics/Properties/Resources.Designer.cs
index 1e33a9e..417c866 100644
--- a/src/Microsoft.AspNetCore.Diagnostics/Properties/Resources.Designer.cs
+++ b/src/Microsoft.AspNetCore.Diagnostics/Properties/Resources.Designer.cs
@@ -427,7 +427,7 @@ namespace Microsoft.AspNetCore.Diagnostics
         }
 
         /// <summary>
-        /// Learn more about the Microsoft ASP.NET 5 components
+        /// Learn more about the Microsoft ASP.NET Core components
         /// </summary>
         internal static string WelcomeLearnMicrosoftAspNet
         {
@@ -435,7 +435,7 @@ namespace Microsoft.AspNetCore.Diagnostics
         }
 
         /// <summary>
-        /// Learn more about the Microsoft ASP.NET 5 components
+        /// Learn more about the Microsoft ASP.NET Core components
         /// </summary>
         internal static string FormatWelcomeLearnMicrosoftAspNet()
         {
@@ -507,7 +507,7 @@ namespace Microsoft.AspNetCore.Diagnostics
         }
 
         /// <summary>
-        /// Your ASP.NET 5 application has been successfully started
+        /// Your ASP.NET Core application has been successfully started
         /// </summary>
         internal static string WelcomeStarted
         {
@@ -515,7 +515,7 @@ namespace Microsoft.AspNetCore.Diagnostics
         }
 
         /// <summary>
-        /// Your ASP.NET 5 application has been successfully started
+        /// Your ASP.NET Core application has been successfully started
         /// </summary>
         internal static string FormatWelcomeStarted()
         {
@@ -523,7 +523,7 @@ namespace Microsoft.AspNetCore.Diagnostics
         }
 
         /// <summary>
-        /// Your ASP.NET 5 application has been successfully started.
+        /// Your ASP.NET Core application has been successfully started.
         /// </summary>
         internal static string WelcomeTitle
         {
@@ -531,7 +531,7 @@ namespace Microsoft.AspNetCore.Diagnostics
         }
 
         /// <summary>
-        /// Your ASP.NET 5 application has been successfully started.
+        /// Your ASP.NET Core application has been successfully started.
         /// </summary>
         internal static string FormatWelcomeTitle()
         {
diff --git a/src/Microsoft.AspNetCore.Diagnostics/Resources.resx b/src/Microsoft.AspNetCore.Diagnostics/Resources.resx
index 7c23c72..4c430b2 100644
--- a/src/Microsoft.AspNetCore.Diagnostics/Resources.resx
+++ b/src/Microsoft.AspNetCore.Diagnostics/Resources.resx
@@ -203,7 +203,7 @@
     <value>Welcome</value>
   </data>
   <data name="WelcomeLearnMicrosoftAspNet" xml:space="preserve">
-    <value>Learn more about the Microsoft ASP.NET 5 components</value>
+    <value>Learn more about the Microsoft ASP.NET Core components</value>
   </data>
   <data name="WelcomePageImageText_Browser" xml:space="preserve">
     <value>Browser</value>
@@ -218,10 +218,10 @@
     <value>Skyline</value>
   </data>
   <data name="WelcomeStarted" xml:space="preserve">
-    <value>Your ASP.NET 5 application has been successfully started</value>
+    <value>Your ASP.NET Core application has been successfully started</value>
   </data>
   <data name="WelcomeTitle" xml:space="preserve">
-    <value>Your ASP.NET 5 application has been successfully started.</value>
+    <value>Your ASP.NET Core application has been successfully started.</value>
   </data>
   <data name="ErrorPageHtml_CompilationException" xml:space="preserve">
     <value>An error occurred during the compilation of a resource required to process this request. Please review the following specific error details and modify your source code appropriately.</value>
diff --git a/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.cs b/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.cs
index 0f30279..9dfdc34 100644
--- a/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.cs
+++ b/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.cs
@@ -67,9 +67,9 @@ using Microsoft.Extensions.PlatformAbstractions;
 #line hidden
 
             WriteLiteral("<!DOCTYPE html>\r\n<html");
-            BeginWriteAttribute("lang", " lang=\"", 449, "\"", 510, 1);
+            BeginWriteAttribute("lang", " lang=\"", 457, "\"", 518, 1);
 #line 21 "RuntimeInfoPage.cshtml"
-WriteAttributeValue("", 456, CultureInfo.CurrentUICulture.TwoLetterISOLanguageName, 456, 54, false);
+WriteAttributeValue("", 464, CultureInfo.CurrentUICulture.TwoLetterISOLanguageName, 464, 54, false);
 
 #line default
 #line hidden
diff --git a/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.cs b/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.cs
index 68cb621..9dae08e 100644
--- a/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.cs
+++ b/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.cs
@@ -32,9 +32,9 @@ using Microsoft.AspNetCore.Diagnostics
 #line hidden
 
             WriteLiteral("<!DOCTYPE html>\r\n<html");
-            BeginWriteAttribute("lang", " lang=\"", 122, "\"", 204, 1);
+            BeginWriteAttribute("lang", " lang=\"", 126, "\"", 208, 1);
 #line 7 "WelcomePage.cshtml"
-WriteAttributeValue("", 129, System.Globalization.CultureInfo.CurrentUICulture.TwoLetterISOLanguageName, 129, 75, false);
+WriteAttributeValue("", 133, System.Globalization.CultureInfo.CurrentUICulture.TwoLetterISOLanguageName, 133, 75, false);
 
 #line default
 #line hidden
@@ -211,16 +211,16 @@ WriteAttributeValue("", 129, System.Globalization.CultureInfo.CurrentUICulture.T
             WriteLiteral(@"0Er5j1XqXtwqbr5+EpOyIrL/tHdo4Kn2/pPSJxLe9s7FzqeT9kmJDEn+8yq47m7L+YXghKWxJ44e82bRJqUucUicSSxoscYSk1TRyYEnDlpc4EyHJOyLrL26GbTqKy2chyXUNG98xYBfLZyHJcBqxwcoujUvaeC1pIhERdu1YSPKaRsLnaNwGz67tl/J1A6VMJMfOaUzCQtJmGgnrVJd76cqohKmkhInEkgZTiZC0mkZGQoKpREi8E2AyFpJOp5GhaYQeyfq+kpwnkolzF1OJkLT10XlL30KS6yeDswxJ/ISvz9RgKhGSVg6cr/TUX0KSxjRik5U+G8WPbAiJaQQsb4QEnKNC8sKyRkiwvBESpcfyRkiEBIo7V3MLia8LIKXlTTb3OmUTkvg5Br9Vg6lESFr54LzEBC0kXhSEREi8KNDQMJfLwFmEpNQfbsaSXEi8GBCYSLwY0Np7IREScO5mFBJfYkSyctjj2/MigDdCE4lpBOewkHgRIP19khxC8s55SOKS/4yYiQS6Z7PVRAKYSKAHUv/MzZ6XEHoh6X2SpEOS4++DgJCoOBS5RLe0ASEREkBIACEBEBJASAAhAYQEQEgAIQGEBHi0EhIHH9q6E5KODAaDhfMPhASwtPECgOk6j5BY3oCQmEgoXvJvhiYS8GYoJLWl85DEzYVESMBEYmkDnbtL/QkkH5LBYLAyleDNUEi8EJRsGd8MhURIoOxzN5eQfHc+kqh5Dk/CRALdusvhSWQRkrjGFBNSPHdNJJY3YFmTW0jmzksSMxMSIQFTdG4hifskYkIqljl9w19u35A2c35ighYSIaEUWZ2rWYWkHhXDZ25cBqbvVvW5KiQ9N3WeYhoREi8SQiIkvVjeuHpDXy1zW9bkOpFY3mAaEZKNTCUhJL5dnj66FRJTCbQxj0tvIVF+eLObXJ9YtiGJ5XcFh77IcpO1hIkk63cAknOd85PLOiTxS2NcCqZrq3gBQEgS9s15TMey36/LPiSmErqeRkpYYu8V8mKaSuhsGsn");
             WriteLiteral(@"hd2uExFRCd8KVmiLexPYKelFNJezadSlPtJiQxKnE3a7syiL3KzWlTiTrdwifwWEXLkt6skWFJN7t6tZ5tm2ayw9fCcnzMQl7Jb6OkW0JE+9VaU96r9AX+9L5zpZclXC5V0iqnxuvPofDps1L2mA1kTwIG69L5z4bXNJclPrkiw1JHD/Pnf9syEWuX1okJC/HZFEVdNMQWzPL+btGhOR1MQlXcdw+z1stS17SCMmvzis3qtHcj+VxiVdphOT/p5JwIpw5EjR0FZfHxROSx5gsjKg0MC31Uq+QvByTcGI4OXhJuF/Em46Q/DEm4QSx+cpzwuTqtgEheZXzyudx+J3NVSFpNJWsN1/FhKcROSv5pjMheXtMvlYuC/MYEW8sQvKmmCziZCImZRMRIRETWrkQkVf8f+IQvM79/f1+/edL/Rg6GsUsZ85L+6YzIdldTE7rx8jRyD4iljNCstWYDONksu9oiAhC0jYmYTIZOxpZWcTljEu8QrLToJzUfw4diSzMKzebCUmHMZnUfz47Ekmb+uyMkPQhJuO41HFFJy0/fjrCp3iFpE8xsQmblmVcythUFZJeBuVT/efIkei18P2qF/ZDhCSFpU7YiHW/iaWMkNB6qRMmk4mj0QvzqvCfjBAS0wmmECERkx/TyaSyd7Jr06rQ3+IVkryDMorTiTtitytcibn0gTshKWG5c1y5VLxpYf/j2jJGSEoLymFc7tg/aScsXW7jryYiJILiaDQPSP24sQ8iJPwalPCwh/KKJUz18OPdAiIkPBOUcQyKTxb/ah6nj5lDISS8PijDGJO/Cl72hOkjhOPWzWRCQvuo7MeoHBQQlVWMx8z0ISSIingICYlEZRSDMo6PlL4TZR4f//g4v5DQv2nlQ/Vws9v7qj83vYX9jUUMx527ToWE9OIyjkugUfV4aXlbl5gXcZkyj3/vwj9zmVZIyH+CWS+H3jdYGq0j8XAimTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
             WriteLiteral("AAAAAAAAAAAAAAHL0rwADANq3ok68n5URAAAAAElFTkSuQmCC\"");
-            BeginWriteAttribute("alt", "\r\n                    alt=\"", 7499, "\"", 7567, 1);
+            BeginWriteAttribute("alt", "\r\n                    alt=\"", 7503, "\"", 7571, 1);
 #line 169 "WelcomePage.cshtml"
-WriteAttributeValue("", 7526, Resources.WelcomePageImageText_LightBulb, 7526, 41, false);
+WriteAttributeValue("", 7530, Resources.WelcomePageImageText_LightBulb, 7530, 41, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
-            BeginWriteAttribute("title", " title=\"", 7568, "\"", 7617, 1);
+            BeginWriteAttribute("title", " title=\"", 7572, "\"", 7621, 1);
 #line 169 "WelcomePage.cshtml"
-WriteAttributeValue("", 7576, Resources.WelcomePageImageText_LightBulb, 7576, 41, false);
+WriteAttributeValue("", 7580, Resources.WelcomePageImageText_LightBulb, 7580, 41, false);
 
 #line default
 #line hidden
@@ -236,16 +236,16 @@ WriteAttributeValue("", 7576, Resources.WelcomePageImageText_LightBulb, 7576, 41
             WriteLiteral(@"Wp42ywyRsMrgNIXQVkXHwzBzt5gSuLSEcMyAuUlbzg0ShUIYu9YLAWkOZA1bKINMRguHnB8C8prS0GPcsL9sK52mGxFwxTAFZuCqk9ULXEwLu8oOAWlxXEoIu3uEyLgVuLKP3FbvICmfUT+sJgBSBSJ6OwwHigFg588gJv84IuWkTZk4TsFyqh78P9Kb4/eGABZc9drVtEy4JCXlDXIjp+DnmBsRiU2ZAy88f3B28EIEsMgpw+mbzAhhiQF3Q1L9gdz5IbvAAM2wKK9GZ9pWJAXqCVFwRlPVelNQo5FlHuccgLir5n4vtzZy/wpQMwH+zkBYU/U8WuIC0G1TKHAjFwmBcUWkTHvx/dtIjE77/3OKR6gJ8WkNlgJy9o1iIqF4Mu5gU6q4a7mhfIzV0IfcEfC0hDDPTCQQcWkYYYkBfoiQF5waoYyLX+kxmhL/hmAZUMsuoW0WrVJS9QFS8HJS9oMi8YzWSxF74/+G4BlRUx8oKMDsMsL7DRFaTFoIt5gZVLSo9/P5q1iOaLiMVegAAY2wnkBYUWkVHxVdzisvG8IKfzfDhisRcgAFbEgLyAvMCFRVRJDDK6xq24+E9Z7AUIgB0xaMIiqi0G5AXkBRlP2J/OkwcAAlBDDJq2iJbtnQqvibyAvODE108XETt8AgLg2iKqKwbkBTYsonIxGHJeIN9vc8T1/oAAtCoG5AXkBS4sopPfb2s8Ta78AUAAemMRpcWAvCD3GOQFhWKwH87VeIbvDwhAJ7uCuhbRsr1TQaAyj1GeF1i3iDJaJfKCenlBOFvg+wMC4IsYdGbL6rpiQF5QuysQx2eLHT4BAeinGJAXkBfUEQMp/tj+gAB0XAzICwzOEXmB1u/H7mTGnb0AAeiTENgTA/ICn/MC2d2TxV6AACAGqhd5gWWLyKj4qmHlBdN5pLbZ4RMQgP7jTV5QYBHVFYMmbnGZLwbt5gXyo8v2zqz1AgRgYJAXOM4LKtk77eYFu+FMzUh9AQEYLuQFFYVp4HnBeLZIHgAIgCc4t4");
             WriteLiteral(@"g0xIC8IPsnajIvmMU/0y6LvQD8EgAjO8HGLS7Thdxzi2hJDFrMC8Tx2RlT/AG8FgAjO6EreUHhltXmYmDFIqogBjbygmprFOLiH87UnNQXAAEw7QrMxYC8oKm8oIpFNJrOubMXAAJgVwzIC7qfF8jNXVjsBYAAWBcD8oJu5wWLJPRlsRcAAmBJDMgLTF6LmUW0dJ4t5AVyvT+2PwAC4KwrMBcDD/KCAosot7vK6goynpz3qf0pi70AEICOiAF5gbu8QHb3ZLEXAALQGTEgL3CTF8wJfQEQgC6Igcu8wIZFtCwGgcZsfvkDbecF8tfjuPjj+wMgAJ3vCszFoNktq5cFpfjVt5EXlAmBFP85vj8AAtBnMSAvMN+yejJfsNgLAAHovxiQF5jlBXK9/wjfHwAB6KsYkBcYCFOqVZJ/7oVs8gaAAAy4KzAXAz/ygn1CXwAEwFcx8DkvEN+fxV4ACIC3YuBrXiCFf8JiLwAEwDcx8D0vkEk/oS8AAkBXYEUM+pMXyJw/8f35NQBAABADfTEYQl4gts+C1BcAAQAzMeh7XiC+/3SB7w+AAICWGAwlL5BZ/2SG7w+AAIC1rsBcDNznBfJf2d4Z4wcAAQAHYmAlL7BhEamD6/3x/QEQAHAkBlbyAgu3uJSburPYCwABgIbFoGt5gcz6Q3b4BEAAoP2uwFwMqucFyVYPrPQFQACg22LQRF4wIfQFQACg+2Jg2yKSa/0JfQEQAOioGDRlEc0jQl8ABAB63RVUEQN5Prd1BEAAYKBiUCQEYv0w9wdAAKDnYmDaFcj1/jg/AAgAeNYViO8/p/oDIADglxiICBD6AiAA4JkYCGzvDOCeU5wCaBuZ+TP3B0AAwDPE92exFwACAJ6xIPQFQADAP6TsE/oCIADgITNCXwAEAHws/pHC9gdAAMAzFoS+AAgA+AeLvQAQAPCUWYTvD4AAgH/FH98fAAEA/2CxFwACAB4idZ/FXgAIAHgIm7wBIADgIVzxA4AAgIfMF/j+AAgAeEeyyRvFHw");
             WriteLiteral(@"ABAL9gkzcABAA8hU3eABAA8LL4s9gLAAEA72CTNwAEADyETd4AEADwFHx/AAQAvCz+kWLuD4AAgGewyRsAAgAewiZvAAgA+Fj8FZu8ASAA4CWEvgAIAHjInMVeAAgA+AebvAEgAOAhLPYCQADAU2YRvj8AAgD+FX98fwAEAPyDxV4ACAB4CIu9ABAA8BQWewEgAOAhXPEDgACAh+D7AyAA4CHJYi9m/wAIAPiFlH2sHwAEADyETd4AEADwsviz2AsAAQDvWBD6AiAA4B9s8gaAAICn4PsDIADgZfGPFHN/AAQAPIPFXgCAAHgIm7wBAALgKWzyBgAIAMUfABAA8IE5i70AAAHwj2STN6o/ACAAfsFiLwBAADxlFuH7AwAC4F/xx/cHAATAP9jkDQAQAA/B9wcABMBT2OQNABAAL4s/m7wBAALgHWzyBgAIgIewyRsAIAA+Fn/FPj8AgAB4CaEvACAAHsImbwCAAHgIm7wBAALgISz2AgAEwFPY5A0AEAAfiz++PwAgAP7BYi8AQAA8hMVeAIAAeAqLvQAAAfAQrvgBAATAQ8T2wfcHAATAM1jsBQAIgIdI2cf6AQAEwEPY5A0AEAAviz+LvQAAAfCOBYu9AKBh1nSe9Ol7b6jZqTOcLQCAHvBkuG1PAH5T82AAANAfsIAAADwWgGucBgAA77hJBwAA4CdbIgD/wnkAAPCL77726jURgJucCgAAr0jq/lEGsMX5AADwhr9PBCBuA6T4X+V8AAB4w9WjDkB4hS4AAMALXokn/reOBeCwC/ij+HGLcwMAMFj+Kq73f3n0P6eP/nHj+k831tdf+F78z0n8uBI/znGuAAAGwbX48c24+P9N+oP/L8AAx5G6SMzC+fMAAAAASUVORK5CYII=""");
-            BeginWriteAttribute("alt", "\r\n                     alt=\"", 16705, "\"", 16772, 1);
+            BeginWriteAttribute("alt", "\r\n                     alt=\"", 16709, "\"", 16776, 1);
 #line 172 "WelcomePage.cshtml"
-WriteAttributeValue("", 16733, Resources.WelcomePageImageText_Browser, 16733, 39, false);
+WriteAttributeValue("", 16737, Resources.WelcomePageImageText_Browser, 16737, 39, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
-            BeginWriteAttribute("title", " title=\"", 16773, "\"", 16820, 1);
+            BeginWriteAttribute("title", " title=\"", 16777, "\"", 16824, 1);
 #line 172 "WelcomePage.cshtml"
-WriteAttributeValue("", 16781, Resources.WelcomePageImageText_Browser, 16781, 39, false);
+WriteAttributeValue("", 16785, Resources.WelcomePageImageText_Browser, 16785, 39, false);
 
 #line default
 #line hidden
@@ -260,16 +260,16 @@ WriteAttributeValue("", 16781, Resources.WelcomePageImageText_Browser, 16781, 39
             WriteLiteral(@"lxLnmmsfPJY0bwzuV2987ZFlRWKt6Zqf+Ndc/+CJN0ZvTHNDxMIiUSNZfEn3lWOiGvjpIVjsJQ7yV074SiRWy5u8xGH6PJTl2mhJs/B3vpBI1Ex9owfslWOiGpQvjy1eO6PsO79QymqX+McvDV8Qv/G9gIIcO7tzkhauQAqLRA01NHrgrgxHVPDPubP97NbC+9Yu+QPecXFA4nwwftO5nDfk60MkFoeCx3njaL7C7OT6yvg+FgoLpUSiprowfiBfOZ7Hge+x3FwdTyOF2hftJX7YufFUkjdfkQncvyasz4Yu3LooLZJEUolcOEeOYWFI58ZSOI0sm0hSSCV5PfwbMkmeVNJpqYGUpUSSSCpBJvAmEYmUSiM+EkkqqQSZpF3OpDIdoPS0jqVFoqnkNJEDncuEpQfSkUgvkf0tnUZ8JRLrs10nyeTfjtGcFCSSyjleOgy0Pf4ypwleaExa40ZhgYsis1grFYmuNt9P6OCLTP7jmE5viQ8Jlq7D7Lu79CMvbc+/1EmCF5909I/5DkbPud4YUmume6kkvIpEmzUXCV6EZ44RnZiT5RuX5lPffa0kwhKJIjFplOBJkRPyL0cTNiauXVrDu5VVEK0qfrsvX750s4/DhC/Qfd0gXC41haSaIv/00RupVCQqk2fZRyfhC1VkKsfgAd/Z4EqZY5d2k1warC99/oNVimQt+3iRbSsJn7BVTSZ7fH+DIF+MKPUJhUeZSLyOsLaq/G0zmTzKPp5y/ZJOSCHBIHNGvM/5alX9W1Pi3Ekne47eSd2cO5vv4i1V0mTb62UnnzUlEkqcu0gqeZ5t2xyKSpHRM3lRfI9DUV1JU5tIVCY72ccB5/G7cufnbNviUHhF+h9vKWPqKWlqFYnK5FC/PHCXx1ru0D9ZDildzhyvX52EvHbz9yp/QJ0iWdESZ43zilAqEMiZow8yiZGWNIMqf0irzj3KZCJN12ec27lC+dHRQ1m0hLlEIDM5WfS1m9GIRGWym3084fzOpatSecyhuIPMBfnD2X11");
             WriteLiteral(@"rE9ksaKTOn5Qq4m9o19SiFWVyV7CZc+1iuPMMZlsUQZa0tTy3FtTIqFfUo4tlcpOAlK5UXm8J30Uppa+SOMiUZlsuq/9EuaXIBXk4ZdjX8sDBC8SlQnzS/zwQIUi5eK2lkOxID2PnoqDJRiWx+tTvVGIRGUiz+I84vx7Tyvb+vmDC2fSm/Q3Pqo48k/wRy+TSCOr9bVC2PtMJgd6R4XqkLSyruklb3RXNcR8pXV6T8uVj/r/GKatjlqbq6GKRPok0i/Z5HpoLMHk5dAPBUqjXBLf7ogcykYQebxsSiLBiGRMJozkABSXSK0jNJNoh3I01KbHLs31XgHKcty0RIISicrkts5DJgALcVLVsgBRi2RMJrwnBmC+RIKZa9MO8QipZU+4VgAmchqSRIIVicrkEpkAfIc8iBfcS+haoR81Zr8C3JFIkDfXVgxHD5kAhCuRaESCTACJhCuRqESCTCBRTkPsiUQtEpVJV2XC8gNgnZPQRmfMiERlwlomgEQQCTIBmMLtoyKhzFg1LxKVCU8NgzWJHIXw7ExSIhmTyYFjMWmIm0bXE0leJGNCYaU1iBVZx+UkVomYEonKhOFhiI1G1lhFJPNlQhMWYmCkKcTEqnIti2dI+ybyEq4O1ysEiPRD3sbYVE1KJGNC4fWgEBoyN+Q05n5IciJRmXQ0nVDqQNOlzGlMk8wQCaUOUMogkgqFIsPDu6QTqJGLTCCn1neyldpZ1VGdfcdsWKiWoQtocWZEUp1QaMRCZSkk295Za6gikukykZdxHTh6J0AKQSQehELvBJbFxAxVRLK8TEQi8rwOLzOHIvQ1hQxTPgiI5HuhSJnzk6MZC/PLmFMrU9wRSXVC2dFyh5eawzjSQL1IuYxBJOXKncfu6/IE9E/A5PR2RFKvUHYd652kLJB3qfdBEIk/oaypUGjIIhBAJN6E0qXkQSCASHyUPPRQEAgi4RB4E0rXMcoTI7ejMNl2ThMVkYQkFRHKjmNV+9CRR/ovrK4PgkjsCGVNy54uKSWo9NFT");
             WriteLiteral(@"gQw4HIiElAJFkGnskjx6lC+IxIJQ8l5KF6nUUrrk8qB5ikiQCiAPRAJFpNJxzE0pSk+3PvJAJHBXLJsqlC3HokuTUseVpo4+hwORwOJi6ahQRCybiSWWvopjoKmDZikiAY+JZUOlsmEotYg0hnnqYIgWkUD9cpG5KusqlTXdQkwvIxXFcEwaQ6SBSCCOBLOiclnX/70xJpl1t/ykOZHC57E/X+nnTbZ9EoEgC4DE044mHoCJ/F+AAQAgl3zNeDGxuQAAAABJRU5ErkJggg==""");
-            BeginWriteAttribute("alt", "\r\n                    alt=\"", 23242, "\"", 23310, 1);
+            BeginWriteAttribute("alt", "\r\n                    alt=\"", 23246, "\"", 23314, 1);
 #line 176 "WelcomePage.cshtml"
-WriteAttributeValue("", 23269, Resources.WelcomePageImageText_LightBulb, 23269, 41, false);
+WriteAttributeValue("", 23273, Resources.WelcomePageImageText_LightBulb, 23273, 41, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
-            BeginWriteAttribute("title", " title=\"", 23311, "\"", 23360, 1);
+            BeginWriteAttribute("title", " title=\"", 23315, "\"", 23364, 1);
 #line 176 "WelcomePage.cshtml"
-WriteAttributeValue("", 23319, Resources.WelcomePageImageText_LightBulb, 23319, 41, false);
+WriteAttributeValue("", 23323, Resources.WelcomePageImageText_LightBulb, 23323, 41, false);
 
 #line default
 #line hidden
@@ -284,16 +284,16 @@ WriteAttributeValue("", 23319, Resources.WelcomePageImageText_LightBulb, 23319,
             WriteLiteral(@"L4QB3Q5tmNG+V+cXHt+48ObNm3jCmbFzIABdndHWLsR2ELZ4aNlJeR4EgO6ENgTuVYOCu+aFOaCLM9pGrZGW568F6NSM9iDMIqeGEOB6S71hIcR2O9wcGkb47G3hcXs3u/rQx5dhixOUSfj5MVER2luFdhJ2rhjbcQN28j3XDaOG/W4Ubn4ettsuXQ3n/m0M7UHYPhJdSwc3xXYv3DyscxkhfO7j8HU8cXdS4T63E492KScZi74+EGe98Vwh8aiZeKmmdSNrRntdbOOj8kF5Fq8HWbXvGHsRYx+20/C53aOkDuzs/B6r3sfjx42Xa4oTlydxfzbaHQvtqp5yl7Pbvbq+GUsHJAzsWhnYUeJPNSqD+zAuzRl5SwfQl8jG2ethBZGdiVE/DJ/3sdEXWuhDZOO66VFWz7k9dsPnH7sXhBa6HtnDrN5zH4/EVmihq5GNcR1nzTjB/Kg8jAyhhU4ZZ/WfCvStr8fhX0ILXZrNxtljE8+dse/eEVroypJBU88EN4hvlHAvtc89QwBviYdUNflE8o9CbJ9f94aG8sEiLjMMw/bV7PMlkPhvXpW38VwLrlIitFDLbPZRw7/MtfLBYOeSr3+U3Xzeha25vz/NnGvB0gFUbJS14zL2jy4EdmvB8y4Mss/PtTB2lRKhhSp82JKvc62Ma7yNx/nuZ8ufeyE+yBx5N5qlA7js6X4MzDBss5MZDeaiMy23uBYZ1yYPrlrbLD9Omw6fepSt/jjfsxcC44VXy3NNY0ZLn33wwfvDcjY3e8o8KoM7uPDUeFg+PY5/53V5OsLhJR9y2LIhGGbpljm8G82Mlj771re+mf3ql7/Ivve97z5d8EPMTkc4Cbfbcy8CPTC6X4htZmYrtPRvFpt98LOfrnJGGF8Eiud+fZ5Vew7lNsX2VTk+CC1d95vtX2c//vGPUnzoszXJrF3rs1V6GsbnwOFfy8nLpwdGgsb65JN/HH3nO98WwvrsWUJY3FljhZaG76SzF7qo132z2sVD66gDmryDbolsYzwy");
             WriteLiteral(@"BJYO6F5k46FL8dCtNaPRCNPQifuGwYyWbmn6yV36ZuB8uIsTWpo6m/VUtXmGhmAxDu+ijpAOsvM3DsTDqgYX/vhldn5qP7PZ5nGfCC0tCWx8R9fIrKmV3jMEQkuzIxvjumtWZEYrtJAmso6Fpde8GEbqyO6IbGe49I3Q0sDIDrPzNVm64b+GQGhpHpHtlokhWIx3hpFyNntoJDoZ2ngI3p5zH9z6Z0FoSbZzeQGs++IVdLevu/Q5QkvanSuep2BgJDovRnYzNMQLZUJLDTtXYRR6Iy4hbJjZXh1aL4YBy4rPXHYNw9XMaDGjZVWcHNyMFkhsyxBcTmhJxcymf941BEJLtSaGoHecGFxoqdgLQ9A7jjoQWqqU53k8mH1qJHrllSEQWqq3bQh65cAQCC3Vz2on4ea5keiFiXeHXfOz4DhaUnPeg17YENor938zWiqZ2W6b2XbatshaOqAZsX0SbjYzh311STzK4GG4b/cMhaUDmvdUKh5v+WF2ftxl3Fz0r13i7DUevvfciWRut3QgtDTeb3/3+3gC8eGF/735pz/+YbLkD8AgcyrHOwVWWBcLravg0t+nc+cnQJkaCVKzRgsgtABCC4DQAggtgNACILQAQgsgtAAILYDQAiC0AEILILQACC2A0AIILQBCCyC0AEJrCACEFkBoARBaAKEFEFoAhBZAaAGEFgChBRBaAIQWQGgBhBYAoQUQWgChBUBoAYQWQGgBEFoAoQVAaAGEFkBoARBaAKEFEFoAhBZAaAEQWgChBRBaAIQWQGgBhBYAoQUQWgChBUBoAYQWAKEFEFoAoQVAaAGEFkBoARBaAKEFQGgBhBZAaAEQWgChBRBaAIQWQGgBhBYAoQUQWgCEFkBoAYQWAKEFEFoAoQVAaAGEFgChBRBaAKEFQGgBhBZAaAEQWgChBRBaAIQWQGgBEFoAoQUQWgCEFkBoAYQWAKEFEFoAhBZAaAGEFgChBRBaAKEFQGgBhBZAaAEQWgChBUBoAYQWQGgBEFoAoQUQWgCE");
             WriteLiteral(@"FkBoARBaAKEFEFoAhBZAaAGEFgChBRBaAKEFQGgBhBYAoQUQWgChBUBoAYQWQGgBEFoAoQVAaAGEFkBoARBaAKEFEFoAhBZAaAGEFgChBRBaAIQWQGgBhBYAoQUQWgChBUBoAYQWAKEFEFoAoQVAaAGEFkBoARBaAKEFEFoAhBZAaAEQWgChBRBaAIQWQGgBhBYAoQUQWgCEFkBoAYQWAKEFEFoAoQVAaAGEFkBoARBaAKEFQGgBhBZAaAEQWgChBRBaAIQWQGgBEFoAoQUQWgCEFkBoAYQWAKEFEFoAoQVAaAGEFgChBRBaAKEFQGgBhBZAaAEQWgChBUBoAYQWQGgBEFoAoQUQWgCEFkBoAYQWAKEFEFoAhBZAaAGEFgChBRBaAKEFQGgBhBYAoQUQWgChBUBoAYQWQGgBEFoAoQUQWgCEFkBoARBaAKEFEFoAhBZAaAGEFgChBRBaAIQWQGgBhBYAoQUQWgChBUBoAYQWQGgBEFoAoQVAaAGEFkBoARBaAKEFEFoAhBZAaAGE1hAACC2A0AIgtABCCyC0AAgtgNACCC0AQgsgtAAILYDQAggtAEILILQAQguA0AIILYDQAiC0AEILgNACCC2A0AIgtABCCyC0AAgtgNACMCcvisIoACT0fwEGAL+BBlr+j4JHAAAAAElFTkSuQmCC""");
-            BeginWriteAttribute("alt", "\r\n                     alt=\"", 31210, "\"", 31279, 1);
+            BeginWriteAttribute("alt", "\r\n                     alt=\"", 31214, "\"", 31283, 1);
 #line 179 "WelcomePage.cshtml"
-WriteAttributeValue("", 31238, Resources.WelcomePageImageText_LightBulb, 31238, 41, false);
+WriteAttributeValue("", 31242, Resources.WelcomePageImageText_LightBulb, 31242, 41, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
-            BeginWriteAttribute("title", " title=\"", 31280, "\"", 31329, 1);
+            BeginWriteAttribute("title", " title=\"", 31284, "\"", 31333, 1);
 #line 179 "WelcomePage.cshtml"
-WriteAttributeValue("", 31288, Resources.WelcomePageImageText_LightBulb, 31288, 41, false);
+WriteAttributeValue("", 31292, Resources.WelcomePageImageText_LightBulb, 31292, 41, false);
 
 #line default
 #line hidden
@@ -315,16 +315,16 @@ WriteAttributeValue("", 31288, Resources.WelcomePageImageText_LightBulb, 31288,
             WriteLiteral(@"q6e383uqQ/bje+n6rWro2vrMpYl8jqenvl/P2/+PXTvdbsAnyvXToG3RktsLQet/wuXr/odly4PqzVxswu3wuF63up33VorRxxerTGrs7B67M3P9Wnf6//+H1FQi2DJ+Pbytno518uieBWuRhTdrdO7Wd3WeHi6gUuFgAAADDnoJaX9Nq2tXqgtrYX+URke5VrwUe+Wf+jJz68K0qB9LJ8NVAvLz5IbP6n95++83/uPrZuQct8yMEBvyHg5YC720OWB7z0C2YoolbbjgIZVmvDwUA9Znb5xYqqFEqaa9t4JFRUBtXeM4oLVc3pDK/E4vJE11mW12dv5vUpoxx80/VOLxty7ewD5ZRWfRjoKu1FpWd1HbqwltwfnREAAADowo8ViwI8IttrdTe6IgJfIuPrXz5+59OJUxu9dC0R39L/7M/f/4P/8re/m/p0bS9atqhNbnFYwG/aRSwYulSy9+6P2tZHS3Rr1C/Ce63mCWvVrkfgFHW8BsIVV7bzWHhXynJq9UD4k+Lg+GORnY8cfDniPLzbywKMbo5vZvMpEcATI7TMGsttG9DbfDCmbK6eVdY+TSqntoeVB6N3lHpoz7IXK4JdFKoHAABA10TXxoV50dvhB1bd04rAlz795A/P3RN1w2aMz9hXOvl8rRwEn0RATnw5fRCIWvjn4vP5P7aoRXYUAl7woabpGfqNscjuytBEcv313089tbwR/4Id6yrXgnu/3xlcajXPmcHiVa2LGl6CCHb9wYU1V7bzs2N39rO8ZDgd2vvtk0Nr7zr4cu4+eWnpP1q1cP1c/1GTDwI/1d+Af3otk6sf/WU1WFWWRu8oe5KDXqI4/WMb5wh2AQAA+NBbN9Lyuw4szIsBqF5SDgJSsr2mvPzqm00+X4tA25UGf/q+6IHRYntvKJ0FzMx6U9/W1zjK4DetujRO0Tzy3SsMjNi1rlCwFtWCtaYFloKButZtsEsQXRpLFfeNoCdGZpQV7BK2KuFxh19ScnF5Imbh8rfNzCwCU0/cm1DObr");
             WriteLiteral(@"Uu/VbV98PRqR6oN513sDigTHx2kWAXAAAA5BGZXi+/+ifKQRfHVgV+h45NrUboEplZ324W7Orxc/ePLWiFHYuWC7heq4AX9bskW9kaGiqUNVsLE0W1StPi9ZFQ9XSvy3dj8frz0W2pyyvXg4M71dCQwy/LdeejGEHxyd8/oSSaBKlEBtjRqaKe7P4qRmIUXRgnPnucml0AAACwxsuvvqEcjGLeLEg1eWxqlBQgBoISWV3f0qfbFm2nyP56R/JSXzdGrwR8p2ENr2w+lWxykqMHHzxIjNq9TlHHa7sU3mj0t0gXozMet1YIK2eG91zVzjJGZzzufjF2YXCg/FsHX5YIeL3rtmM6VA0p59eSytnNMWUztqWsDWy07eooglwio2t4d1iJ7w1zYQAAAID1Xn71IGC1MC+ynZ5VPq+71Yq4sTgIQh0Eo+wguh7Kqj32ZpeZaEBf0FrcXEOyO5vDtge8omq1aUQhrFbP9rp8Ubjebc6GC9KXuVUNi770Tga8XD2AhAh8ndk+vT/tfzKIFJT3zv/mkXlGdk7tZ3OJeQEAAABHHGQ7vWFMom6WCHr992NziSDRa0aQzP7tk1Nw/2f6sl5nh8PPmnVpJOAl2epuNLpRjDjSLW4wVD4R9AqrteFAoO0onR1xU9BLdGcUNbxk266Exks1NezgS4stLk945rwUGVwnjrlqmGAXAAAA3OXlVxuNXvipI8Guz7dpe7/rpKL8tMFfxT3JuSPTyW1XlO8T7AIaBLyy+ZToypikaeRa2jg14tS6RbfG47+LhnrP7jq0Xgi7pp3HIruWLXu1HD3n8MtjIAkAAADAL15+VQS8MorI1vq86H6zgJcopi+6a37bxu6XgKtp3FTbY2k9PurUusNq9US6TVirjslavpsK11tRv+vQWjky/lhk5yMHX57I8PobziYAAADAJw4yzV7fnxbmxb26qD/23SNzfF+fbjuakQa4VLDJTTUku7s95FjASw3UQxG1+nAIvGCgrqnBurRq4cWKqhRKmuNtPB");
             WriteLiteral(@"IqKoNq2bLlFyohpzO8EovLE2RfAgAAAH50MDrkrWO/yxPsAhoj4GWD9+6Pjjq9DUe7NcYkdmc85IY6XmPhXUuXX64HB9fLEadHL53kjAIAAAAAoLVHAl7ZfIpglwVur59yPOAV1SoPC+aHQ/K6Mx5a33G+jtelgU3L1/FZKTbu8Mu8yhkFAAAAAEBrxzO8CHhZ4F5hYMTpbQgFa1EtWAsZP5+WvXzRpbFUUZ18fftdGq22WQk7HfBKLi5PxDirAAAAAABo7njAi4L1kq1sDQ0VylrUDdsS1SoDkVA1EQgolhTccrJ4/fnoti3rKdbURKmmOp3ORmAaAAAAAIAWHga8svmUKIadoEnk+uBBYtQt2yLqeEU1+fW7Dq0VnIsDWTk643H3SgNOZ3kR8AIAAAAAoIWjGV7UBrLAnc1h1wS8omp1OKzVxqxavihcX60FHHltZ8MF29a16fxojRSuBwAAAACghf8vwABfcA5F9k0oGQAAAABJRU5ErkJggg==""");
-            BeginWriteAttribute("alt", "\r\n                    alt=\"", 46177, "\"", 46243, 1);
+            BeginWriteAttribute("alt", "\r\n                    alt=\"", 46181, "\"", 46247, 1);
 #line 182 "WelcomePage.cshtml"
-WriteAttributeValue("", 46204, Resources.WelcomePageImageText_Skyline, 46204, 39, false);
+WriteAttributeValue("", 46208, Resources.WelcomePageImageText_Skyline, 46208, 39, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
-            BeginWriteAttribute("title", " title=\"", 46244, "\"", 46291, 1);
+            BeginWriteAttribute("title", " title=\"", 46248, "\"", 46295, 1);
 #line 182 "WelcomePage.cshtml"
-WriteAttributeValue("", 46252, Resources.WelcomePageImageText_Skyline, 46252, 39, false);
+WriteAttributeValue("", 46256, Resources.WelcomePageImageText_Skyline, 46256, 39, false);
 
 #line default
 #line hidden
@@ -351,16 +351,16 @@ WriteAttributeValue("", 46252, Resources.WelcomePageImageText_Skyline, 46252, 39
             <img src=""data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADoAAAAdCAYAAAD7En+mAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDozMjVCMDEwM0FBQkExMUUyQjdGNEEwODg0RjhFODY4OCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDozMjVCMDEwNEFBQkExMUUyQjdGNEEwODg0RjhFODY4OCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjMyNUIwM");
             WriteLiteral(@"TAxQUFCQTExRTJCN0Y0QTA4ODRGOEU4Njg4IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjMyNUIwMTAyQUFCQTExRTJCN0Y0QTA4ODRGOEU4Njg4Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+I1MZRAAAA4FJREFUeNq8md1x2kAQx3UaCoAKAg0YkgYQHTgV2KoAeMqjncfkBbsCSAd0AK5AOA1Y6YAOyJ7mf5rV6T4l8M3c2ALd/fZ/u/exh0gCy+VyyeiPrHPtqzPVd6p7IcTJ0rbxTO8FMe++/vIy/xY/TiF9CY+4If1ZUV1SHQb0V1L9Q/WFxJy7CCVxnZkk+hwtlIyTsCcGk53sMZJ8FGcY8Ux7NydB+xihJLI3k8Tug4TCi1uq92zEfpJxu4DwfoShY3y0o3a5Tyi82GKS0buA8G4xqV3uFAqRB4xYAoHPSURBH08IvwosR9omFCIbTDI0iok+GkxdrC5UjuqjHnpdCry7xaOcs2uLkQ2mLfQCBTeY1Ne6JRRzcoPH731EWsQuqM+jYU7WzD4iLWIX1GfFTLVwU+HaG4gQ3WExSRhcDzcVrldhYl63mAJCnwEtybiJx0tjNvETtCk9c/YDq2OuFjUSWjPJuInHSy0mtSk9c7ZmSvEpvntQIxswaGeE2wG1IDEzh1fl+694XLKvejFJzMzh1RZTwMhCdkZGjSJWVr5SnjEHT44o+MDjaPrt91gxyahRxMraYtpORoiCmpmyvesYMfcqCNvEKyNsnkVoq3ezLkx4qcW0eRahXTOl0C94eI9caGxiM0uTEzvVdGI6xHqZAzbJT4aQO8ADoUWJzQ0nqX/sfyuTjO7EpHa54SRVM1Ntwl+rbALf+zTmwDDKJtf7SqYZvwhs92nMATrOTFDbsY2F9gwrITdywVM0Vqbae0YmP7ZZVlMj05KiTXnoqjieRx7vFHAYIDJh28KxK5OJH");
             WriteLiteral(@"AaIbDCFvsc5DO0sku3VMkqEvse5EuauIvF+gSgRqbbHrW7gSX4i2hn2uNUNPNliCi3LkA0nIV6NDPFCz2BYllExQ7waGeIFz2BSlmWUGLHtFUXy/o48TcOed3Umu62omI00DUVl5PdIwK+1t81UUm34vmYiAb8ZUzgS5eq+p4cnN7g5cCbyWqJsvO+J8GSDyXNc0+XYlr18RA5ZRt7/btjSnqsFwXE51mK68k3L/W+DqR8HRcAViFq5Xm1pGBP4wAyu751Crjs1z9ZM1wU1BLaYptsK4VktN9pRq0R9Y5/NMZL8slmC1ioSIu51ezNtkSACQ3HJckjXAX1v8nzsTxLwVBTT99OEiFxkMsNIVpu/J6yjhBpEG5mhv7vI8l+AAQB7WiwH/DuungAAAABJRU5ErkJggg==""");
-            BeginWriteAttribute("alt", "\r\n                alt=\"", 49123, "\"", 49187, 1);
+            BeginWriteAttribute("alt", "\r\n                alt=\"", 49127, "\"", 49191, 1);
 #line 191 "WelcomePage.cshtml"
-WriteAttributeValue("", 49146, Resources.WelcomePageImageText_LearnMore, 49146, 41, false);
+WriteAttributeValue("", 49150, Resources.WelcomePageImageText_LearnMore, 49150, 41, false);
 
 #line default
 #line hidden
             EndWriteAttribute();
-            BeginWriteAttribute("title", " title=\"", 49188, "\"", 49237, 1);
+            BeginWriteAttribute("title", " title=\"", 49192, "\"", 49241, 1);
 #line 191 "WelcomePage.cshtml"
-WriteAttributeValue("", 49196, Resources.WelcomePageImageText_LearnMore, 49196, 41, false);
+WriteAttributeValue("", 49200, Resources.WelcomePageImageText_LearnMore, 49200, 41, false);
 
 #line default
 #line hidden
diff --git a/src/Microsoft.AspNetCore.Diagnostics/project.json b/src/Microsoft.AspNetCore.Diagnostics/project.json
index 62fb7b8..9941665 100644
--- a/src/Microsoft.AspNetCore.Diagnostics/project.json
+++ b/src/Microsoft.AspNetCore.Diagnostics/project.json
@@ -1,6 +1,11 @@
 {
   "version": "1.0.0-*",
-  "description": "ASP.NET 5 Middleware for exception handling, exception display pages, and diagnostics information.",
+  "description": "ASP.NET Core middleware for exception handling, exception display pages, and diagnostics information. Includes developer exception page middleware, exception handler middleware, runtime info middleware, status code page middleware, and welcome page middleware",
+  "tags": [
+    "aspnetcore",
+    "diagnostics"
+  ],
+
   "compilationOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
@@ -24,7 +29,7 @@
     "System.Diagnostics.DiagnosticSource": "4.0.0-*"
   },
   "frameworks": {
-    "net451": {},
+    "net451": { },
     "netstandard1.3": {
       "dependencies": {
         "System.Reflection.Extensions": "4.0.1-*"
diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json b/src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json
index 3c5d8f6..cb8451d 100644
--- a/src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json
+++ b/src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json
@@ -1,6 +1,11 @@
 {
   "version": "1.0.0-*",
-  "description": "ASP.NET 5 Middleware for analyzing middleware in the request pipeline.",
+  "description": "ASP.NET Core middleware for analyzing middleware in the request pipeline with System.Diagnostics.DiagnosticSource.",
+  "tags": [
+    "aspnetcore",
+    "diagnostics"
+  ],
+
   "compilationOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
@@ -19,7 +24,7 @@
     "System.Diagnostics.DiagnosticSource": "4.0.0-*"
   },
   "frameworks": {
-    "net451": {},
+    "net451": { },
     "netstandard1.3": {
       "imports": [
         "dotnet5.4"
diff --git a/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/WelcomePageSampleTest.cs b/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/WelcomePageSampleTest.cs
index 09f7553..a7dce13 100644
--- a/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/WelcomePageSampleTest.cs
+++ b/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/WelcomePageSampleTest.cs
@@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Diagnostics.FunctionalTests
             // Assert
             var body = await response.Content.ReadAsStringAsync();
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            Assert.Contains("Your ASP.NET 5 application has been successfully started", body);
+            Assert.Contains("Your ASP.NET Core application has been successfully started", body);
         }
     }
 }
diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmMiddlewareTest.cs b/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmMiddlewareTest.cs
index 5263909..8939350 100644
--- a/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmMiddlewareTest.cs
+++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmMiddlewareTest.cs
@@ -114,7 +114,7 @@ namespace Microsoft.AspNetCore.Diagnostics.Tests
 
                 // Assert
                 contextMock.VerifyGet(c => c.Request.Query, Times.AtLeastOnce());
-                Assert.True(response.Contains("<title>ASP.NET Logs</title>"));
+                Assert.True(response.Contains("<title>ASP.NET Core Logs</title>"));
             }
         }
 
