diff --git a/src/Microsoft.AspNet.Diagnostics.Abstractions/CompilationFailure.cs b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/CompilationFailure.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Abstractions/CompilationFailure.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Abstractions/CompilationFailure.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Abstractions/DiagnosticMessage.cs b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/DiagnosticMessage.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Abstractions/DiagnosticMessage.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Abstractions/DiagnosticMessage.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Abstractions/ICompilationException.cs b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/ICompilationException.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Abstractions/ICompilationException.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Abstractions/ICompilationException.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Abstractions/IExceptionHandlerFeature.cs b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/IExceptionHandlerFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Abstractions/IExceptionHandlerFeature.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Abstractions/IExceptionHandlerFeature.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Abstractions/IStatusCodePagesFeature.cs b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/IStatusCodePagesFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Abstractions/IStatusCodePagesFeature.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Abstractions/IStatusCodePagesFeature.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Abstractions/IStatusCodeReExecuteFeature.cs b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/IStatusCodeReExecuteFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Abstractions/IStatusCodeReExecuteFeature.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Abstractions/IStatusCodeReExecuteFeature.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Abstractions/Microsoft.AspNet.Diagnostics.Abstractions.xproj b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/Microsoft.AspNetCore.Diagnostics.Abstractions.xproj
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Abstractions/Microsoft.AspNet.Diagnostics.Abstractions.xproj
rename to src/Microsoft.AspNetCore.Diagnostics.Abstractions/Microsoft.AspNetCore.Diagnostics.Abstractions.xproj
diff --git a/src/Microsoft.AspNet.Diagnostics.Abstractions/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Abstractions/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Abstractions/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Abstractions/project.json b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Abstractions/project.json
rename to src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ActivityContext.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ActivityContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/ActivityContext.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/ActivityContext.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmCaptureMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmCaptureMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/ElmCaptureMiddleware.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/ElmCaptureMiddleware.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/ElmExtensions.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/ElmExtensions.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmLogger.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLogger.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/ElmLogger.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLogger.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmLoggerProvider.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLoggerProvider.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/ElmLoggerProvider.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLoggerProvider.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmOptions.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/ElmOptions.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/ElmOptions.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmPageMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmPageMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/ElmPageMiddleware.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/ElmPageMiddleware.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmScope.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmScope.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/ElmScope.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/ElmScope.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmServiceCollectionExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmServiceCollectionExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/ElmServiceCollectionExtensions.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/ElmServiceCollectionExtensions.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmStore.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmStore.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/ElmStore.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/ElmStore.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/HttpInfo.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/HttpInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/HttpInfo.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/HttpInfo.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/HttpRequestIdentifierFeature.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/HttpRequestIdentifierFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/HttpRequestIdentifierFeature.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/HttpRequestIdentifierFeature.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/LogInfo.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/LogInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/LogInfo.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/LogInfo.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/Microsoft.AspNet.Diagnostics.Elm.xproj b/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.xproj
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/Microsoft.AspNet.Diagnostics.Elm.xproj
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.xproj
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/RequestIdentifier.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/RequestIdentifier.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/RequestIdentifier.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/RequestIdentifier.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ScopeNode.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ScopeNode.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/ScopeNode.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/ScopeNode.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ViewOptions.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ViewOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/ViewOptions.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/ViewOptions.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/Views/DetailsPage.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/Views/DetailsPage.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/Views/DetailsPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cshtml
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/Views/DetailsPage.cshtml
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.cshtml
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/Views/DetailsPage.css b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.css
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/Views/DetailsPage.css
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPage.css
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/Views/DetailsPageModel.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPageModel.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/Views/DetailsPageModel.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/Views/DetailsPageModel.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/Views/LogPage.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/Views/LogPage.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/Views/LogPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cshtml
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/Views/LogPage.cshtml
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.cshtml
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/Views/LogPage.css b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.css
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/Views/LogPage.css
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPage.css
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/Views/LogPageModel.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPageModel.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/Views/LogPageModel.cs
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/Views/LogPageModel.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/Views/Shared.css b/src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Shared.css
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/Views/Shared.css
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/Views/Shared.css
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/project.json b/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Elm/project.json
rename to src/Microsoft.AspNetCore.Diagnostics.Elm/project.json
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/CodeAnnotations.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/CodeAnnotations.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Entity/CodeAnnotations.cs
rename to src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/CodeAnnotations.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLogger.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs
rename to src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLogger.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLoggerProvider.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLoggerProvider.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLoggerProvider.cs
rename to src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLoggerProvider.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageExtensions.cs
rename to src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageExtensions.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs
rename to src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageOptions.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageOptions.cs
rename to src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageOptions.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/Microsoft.AspNet.Diagnostics.Entity.xproj b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.xproj
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Entity/Microsoft.AspNet.Diagnostics.Entity.xproj
rename to src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.xproj
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/MigrationsEndPointExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Entity/MigrationsEndPointExtensions.cs
rename to src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointExtensions.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/MigrationsEndPointMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Entity/MigrationsEndPointMiddleware.cs
rename to src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointMiddleware.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/MigrationsEndPointOptions.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Entity/MigrationsEndPointOptions.cs
rename to src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/MigrationsEndPointOptions.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Entity/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/Properties/Strings.Designer.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Properties/Strings.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Entity/Properties/Strings.Designer.cs
rename to src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Properties/Strings.Designer.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/Strings.resx b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Strings.resx
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Entity/Strings.resx
rename to src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Strings.resx
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/Utilities/Check.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Utilities/Check.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Entity/Utilities/Check.cs
rename to src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Utilities/Check.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/Views/DatabaseErrorPage.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Entity/Views/DatabaseErrorPage.cs
rename to src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/Views/DatabaseErrorPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.cshtml
similarity index 97%
rename from src/Microsoft.AspNet.Diagnostics.Entity/Views/DatabaseErrorPage.cshtml
rename to src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.cshtml
index d6e3b2d065..109d1ce663 100644
--- a/src/Microsoft.AspNet.Diagnostics.Entity/Views/DatabaseErrorPage.cshtml
+++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPage.cshtml
@@ -1,125 +1,125 @@
-@using System
-@using System.Linq
-@using Microsoft.AspNet.Diagnostics.Entity
-@using Microsoft.AspNet.Diagnostics.Entity.Views
-@{
-    Response.StatusCode = 500;
-    Response.ContentType = "text/html";
-    Response.ContentLength = null; // Clear any prior Content-Length
-}
-@functions
-{
-    public DatabaseErrorPageModel Model { get; set; }
-
-    public string UrlEncode(string content)
-    {
-        return UrlEncoder.Encode(content);
-    }
-
-    public string JavaScriptEncode(string content)
-    {
-        return JavaScriptEncoder.Encode(content);
-    }
-}
-<!DOCTYPE html>
-
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <meta charset="utf-8" />
-    <title>Internal Server Error</title>
-    <style>
-            <%$ include: ErrorPage.css %>
-    </style>
-</head>
-<body>
-    <h1>@Strings.DatabaseErrorPage_Title</h1>
-    <p>
-        @for (Exception ex = Model.Exception; ex != null; ex = ex.InnerException)
-            {
-            <span>@ex.GetType().Name: @ex.Message</span>
-            <br />
-        }
-    </p>
-    <hr />
-
-    @if (!Model.DatabaseExists && !Model.PendingMigrations.Any())
-    {
-        <h2>@Strings.FormatDatabaseErrorPage_NoDbOrMigrationsTitle(Model.ContextType.Name)</h2>
-        <p>@Strings.DatabaseErrorPage_NoDbOrMigrationsInfo</p>
-        <code> @Strings.DatabaseErrorPage_AddMigrationCommand </code>
-        <br />
-        <code> @Strings.DatabaseErrorPage_ApplyMigrationsCommand </code>
-        <hr />
-    }
-    else if (Model.PendingMigrations.Any())
-    {
-        <div>
-            <h2>@Strings.FormatDatabaseErrorPage_PendingMigrationsTitle(Model.ContextType.Name)</h2>
-            <p>@Strings.FormatDatabaseErrorPage_PendingMigrationsInfo(Model.ContextType.Name)</p>
-
-            <ul>
-                @foreach (var migration in Model.PendingMigrations)
-                {
-                    <li>@migration</li>
-                }
-            </ul>
-
-            <p>
-                <button id="applyMigrations" onclick="ApplyMigrations()">@Strings.DatabaseErrorPage_ApplyMigrationsButton</button>
-                <span id="applyMigrationsError" class="error"></span>
-                <span id="applyMigrationsSuccess"></span>
-            </p>
-            <script>
-                function ApplyMigrations() {
-                    applyMigrations.disabled = true;
-                    applyMigrationsError.innerHTML = "";
-                    applyMigrations.innerHTML = "@JavaScriptEncode(Strings.DatabaseErrorPage_ApplyMigrationsButtonRunning)";
-
-                    var req = new XMLHttpRequest();
-
-                    req.onload = function (e) {
-                        if (req.status === 204) {
-                            applyMigrations.innerHTML = "@JavaScriptEncode(Strings.DatabaseErrorPage_ApplyMigrationsButtonDone)";
-                            applyMigrationsSuccess.innerHTML = "@JavaScriptEncode(Strings.DatabaseErrorPage_MigrationsAppliedRefresh)";
-                        } else {
-                            ErrorApplyingMigrations();
-                        }
-                    };
-
-                    req.onerror = function (e) {
-                        ErrorApplyingMigrations();
-                    };
-
-                    var formBody = "context=@JavaScriptEncode(UrlEncode(Model.ContextType.AssemblyQualifiedName))";
-                    req.open("POST", "@JavaScriptEncode(Model.Options.MigrationsEndPointPath.Value)", true);
-                    req.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-                    req.setRequestHeader("Content-length", formBody.length);
-                    req.setRequestHeader("Connection", "close");
-                    req.send(formBody);
-                }
-
-                function ErrorApplyingMigrations() {
-                    applyMigrations.innerHTML = "@JavaScriptEncode(Strings.DatabaseErrorPage_ApplyMigrationsButton)";
-                    applyMigrationsError.innerHTML = "@JavaScriptEncode(Strings.DatabaseErrorPage_ApplyMigrationsFailed)";
-                    applyMigrations.disabled = false;
-                }
-            </script>
-
-            <p>@Strings.DatabaseErrorPage_HowToApplyFromCmd</p>
-            <code>@Strings.DatabaseErrorPage_ApplyMigrationsCommand</code>
-            <hr />
-        </div>
-    }
-    else if (Model.PendingModelChanges)
-    {
-        <div>
-            <h2>@Strings.FormatDatabaseErrorPage_PendingChangesTitle(Model.ContextType.Name)</h2>
-            <p>@Strings.DatabaseErrorPage_PendingChangesInfo</p>
-            <code>@Strings.DatabaseErrorPage_AddMigrationCommand</code>
-            <br />
-            <code>@Strings.DatabaseErrorPage_ApplyMigrationsCommand</code>
-            <hr />
-        </div>
-    }
-</body>
+@using System
+@using System.Linq
+@using Microsoft.AspNet.Diagnostics.Entity
+@using Microsoft.AspNet.Diagnostics.Entity.Views
+@{
+    Response.StatusCode = 500;
+    Response.ContentType = "text/html";
+    Response.ContentLength = null; // Clear any prior Content-Length
+}
+@functions
+{
+    public DatabaseErrorPageModel Model { get; set; }
+
+    public string UrlEncode(string content)
+    {
+        return UrlEncoder.Encode(content);
+    }
+
+    public string JavaScriptEncode(string content)
+    {
+        return JavaScriptEncoder.Encode(content);
+    }
+}
+<!DOCTYPE html>
+
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta charset="utf-8" />
+    <title>Internal Server Error</title>
+    <style>
+            <%$ include: ErrorPage.css %>
+    </style>
+</head>
+<body>
+    <h1>@Strings.DatabaseErrorPage_Title</h1>
+    <p>
+        @for (Exception ex = Model.Exception; ex != null; ex = ex.InnerException)
+            {
+            <span>@ex.GetType().Name: @ex.Message</span>
+            <br />
+        }
+    </p>
+    <hr />
+
+    @if (!Model.DatabaseExists && !Model.PendingMigrations.Any())
+    {
+        <h2>@Strings.FormatDatabaseErrorPage_NoDbOrMigrationsTitle(Model.ContextType.Name)</h2>
+        <p>@Strings.DatabaseErrorPage_NoDbOrMigrationsInfo</p>
+        <code> @Strings.DatabaseErrorPage_AddMigrationCommand </code>
+        <br />
+        <code> @Strings.DatabaseErrorPage_ApplyMigrationsCommand </code>
+        <hr />
+    }
+    else if (Model.PendingMigrations.Any())
+    {
+        <div>
+            <h2>@Strings.FormatDatabaseErrorPage_PendingMigrationsTitle(Model.ContextType.Name)</h2>
+            <p>@Strings.FormatDatabaseErrorPage_PendingMigrationsInfo(Model.ContextType.Name)</p>
+
+            <ul>
+                @foreach (var migration in Model.PendingMigrations)
+                {
+                    <li>@migration</li>
+                }
+            </ul>
+
+            <p>
+                <button id="applyMigrations" onclick="ApplyMigrations()">@Strings.DatabaseErrorPage_ApplyMigrationsButton</button>
+                <span id="applyMigrationsError" class="error"></span>
+                <span id="applyMigrationsSuccess"></span>
+            </p>
+            <script>
+                function ApplyMigrations() {
+                    applyMigrations.disabled = true;
+                    applyMigrationsError.innerHTML = "";
+                    applyMigrations.innerHTML = "@JavaScriptEncode(Strings.DatabaseErrorPage_ApplyMigrationsButtonRunning)";
+
+                    var req = new XMLHttpRequest();
+
+                    req.onload = function (e) {
+                        if (req.status === 204) {
+                            applyMigrations.innerHTML = "@JavaScriptEncode(Strings.DatabaseErrorPage_ApplyMigrationsButtonDone)";
+                            applyMigrationsSuccess.innerHTML = "@JavaScriptEncode(Strings.DatabaseErrorPage_MigrationsAppliedRefresh)";
+                        } else {
+                            ErrorApplyingMigrations();
+                        }
+                    };
+
+                    req.onerror = function (e) {
+                        ErrorApplyingMigrations();
+                    };
+
+                    var formBody = "context=@JavaScriptEncode(UrlEncode(Model.ContextType.AssemblyQualifiedName))";
+                    req.open("POST", "@JavaScriptEncode(Model.Options.MigrationsEndPointPath.Value)", true);
+                    req.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+                    req.setRequestHeader("Content-length", formBody.length);
+                    req.setRequestHeader("Connection", "close");
+                    req.send(formBody);
+                }
+
+                function ErrorApplyingMigrations() {
+                    applyMigrations.innerHTML = "@JavaScriptEncode(Strings.DatabaseErrorPage_ApplyMigrationsButton)";
+                    applyMigrationsError.innerHTML = "@JavaScriptEncode(Strings.DatabaseErrorPage_ApplyMigrationsFailed)";
+                    applyMigrations.disabled = false;
+                }
+            </script>
+
+            <p>@Strings.DatabaseErrorPage_HowToApplyFromCmd</p>
+            <code>@Strings.DatabaseErrorPage_ApplyMigrationsCommand</code>
+            <hr />
+        </div>
+    }
+    else if (Model.PendingModelChanges)
+    {
+        <div>
+            <h2>@Strings.FormatDatabaseErrorPage_PendingChangesTitle(Model.ContextType.Name)</h2>
+            <p>@Strings.DatabaseErrorPage_PendingChangesInfo</p>
+            <code>@Strings.DatabaseErrorPage_AddMigrationCommand</code>
+            <br />
+            <code>@Strings.DatabaseErrorPage_ApplyMigrationsCommand</code>
+            <hr />
+        </div>
+    }
+</body>
 </html>
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/Views/DatabaseErrorPageModel.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPageModel.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Entity/Views/DatabaseErrorPageModel.cs
rename to src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/DatabaseErrorPageModel.cs
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/Views/ErrorPage.css b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/ErrorPage.css
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics.Entity/Views/ErrorPage.css
rename to src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Views/ErrorPage.css
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/project.json b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json
similarity index 95%
rename from src/Microsoft.AspNet.Diagnostics.Entity/project.json
rename to src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json
index f32b50fa71..cca84f7c7b 100644
--- a/src/Microsoft.AspNet.Diagnostics.Entity/project.json
+++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json
@@ -1,32 +1,32 @@
-{
-  "version": "7.0.0-*",
-  "description": "ASP.NET 5 Middleware for Entity Framework error pages.",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/diagnostics"
-  },
-  "compilationOptions": {
-    "warningsAsErrors": true,
-    "keyFile": "../../tools/Key.snk"
-  },
-  "dependencies": {
-    "Microsoft.AspNet.Diagnostics": "1.0.0-*",
-    "EntityFramework.Relational": "7.0.0-*"
-  },
-  "compile": [
-    "..\\Shared\\*.cs"
-  ],
-  "frameworks": {
-    "net451": {
-      "frameworkAssemblies": {
-        "System.Configuration": "",
-        "System.Threading.Tasks": ""
-      }
-    },
-    "dotnet5.4": {
-      "dependencies": {
-        "System.Threading": "4.0.11-*"
-      }
-    }
-  }
-}
+{
+  "version": "7.0.0-*",
+  "description": "ASP.NET 5 Middleware for Entity Framework error pages.",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/aspnet/diagnostics"
+  },
+  "compilationOptions": {
+    "warningsAsErrors": true,
+    "keyFile": "../../tools/Key.snk"
+  },
+  "dependencies": {
+    "Microsoft.AspNet.Diagnostics": "1.0.0-*",
+    "EntityFramework.Relational": "7.0.0-*"
+  },
+  "compile": [
+    "..\\Shared\\*.cs"
+  ],
+  "frameworks": {
+    "net451": {
+      "frameworkAssemblies": {
+        "System.Configuration": "",
+        "System.Threading.Tasks": ""
+      }
+    },
+    "dotnet5.4": {
+      "dependencies": {
+        "System.Threading": "4.0.11-*"
+      }
+    }
+  }
+}
diff --git a/src/Microsoft.AspNet.Diagnostics/.csslintrc b/src/Microsoft.AspNetCore.Diagnostics/.csslintrc
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/.csslintrc
rename to src/Microsoft.AspNetCore.Diagnostics/.csslintrc
diff --git a/src/Microsoft.AspNet.Diagnostics/.jshintrc b/src/Microsoft.AspNetCore.Diagnostics/.jshintrc
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/.jshintrc
rename to src/Microsoft.AspNetCore.Diagnostics/.jshintrc
diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageExtensions.cs
rename to src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageExtensions.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs
rename to src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageOptions.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageOptions.cs
rename to src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageOptions.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorModel.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorModel.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorModel.cs
rename to src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorModel.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cs
rename to src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cshtml
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cshtml
rename to src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorPage.cshtml
diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorDetails.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorDetails.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorDetails.cs
rename to src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorDetails.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cs
rename to src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cshtml
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cshtml
rename to src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.cshtml
diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.css b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.css
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.css
rename to src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.css
diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.js b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.js
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.js
rename to src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPage.js
diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs
rename to src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/StackFrame.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/StackFrame.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/StackFrame.cs
rename to src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/Views/StackFrame.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerExtensions.cs
rename to src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerExtensions.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerFeature.cs b/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerFeature.cs
rename to src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerFeature.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs
rename to src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerOptions.cs b/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/ExceptionHandler/ExceptionHandlerOptions.cs
rename to src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerOptions.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/Microsoft.AspNet.Diagnostics.xproj b/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.xproj
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/Microsoft.AspNet.Diagnostics.xproj
rename to src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.xproj
diff --git a/src/Microsoft.AspNet.Diagnostics/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Diagnostics/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.Diagnostics/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/Properties/Resources.Designer.cs b/src/Microsoft.AspNetCore.Diagnostics/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/Properties/Resources.Designer.cs
rename to src/Microsoft.AspNetCore.Diagnostics/Properties/Resources.Designer.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/Resources.resx b/src/Microsoft.AspNetCore.Diagnostics/Resources.resx
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/Resources.resx
rename to src/Microsoft.AspNetCore.Diagnostics/Resources.resx
diff --git a/src/Microsoft.AspNet.Diagnostics/RuntimeInfo/RuntimeInfoExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/RuntimeInfoExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/RuntimeInfo/RuntimeInfoExtensions.cs
rename to src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/RuntimeInfoExtensions.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/RuntimeInfo/RuntimeInfoMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/RuntimeInfoMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/RuntimeInfo/RuntimeInfoMiddleware.cs
rename to src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/RuntimeInfoMiddleware.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/RuntimeInfo/RuntimeInfoPageOptions.cs b/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/RuntimeInfoPageOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/RuntimeInfo/RuntimeInfoPageOptions.cs
rename to src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/RuntimeInfoPageOptions.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.cs b/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.cs
rename to src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.cshtml b/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.cshtml
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.cshtml
rename to src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.cshtml
diff --git a/src/Microsoft.AspNet.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.css b/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.css
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.css
rename to src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPage.css
diff --git a/src/Microsoft.AspNet.Diagnostics/RuntimeInfo/Views/RuntimeInfoPageModel.cs b/src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPageModel.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/RuntimeInfo/Views/RuntimeInfoPageModel.cs
rename to src/Microsoft.AspNetCore.Diagnostics/RuntimeInfo/Views/RuntimeInfoPageModel.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodeContext.cs b/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodeContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodeContext.cs
rename to src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodeContext.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodePagesExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodePagesExtensions.cs
rename to src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesExtensions.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodePagesFeature.cs b/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodePagesFeature.cs
rename to src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesFeature.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodePagesMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodePagesMiddleware.cs
rename to src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesMiddleware.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodePagesOptions.cs b/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodePagesOptions.cs
rename to src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodePagesOptions.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodeReExecuteFeature.cs b/src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodeReExecuteFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/StatusCodePage/StatusCodeReExecuteFeature.cs
rename to src/Microsoft.AspNetCore.Diagnostics/StatusCodePage/StatusCodeReExecuteFeature.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/AttributeValue.cs b/src/Microsoft.AspNetCore.Diagnostics/Views/AttributeValue.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/Views/AttributeValue.cs
rename to src/Microsoft.AspNetCore.Diagnostics/Views/AttributeValue.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs b/src/Microsoft.AspNetCore.Diagnostics/Views/BaseView.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs
rename to src/Microsoft.AspNetCore.Diagnostics/Views/BaseView.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/HelperResult.cs b/src/Microsoft.AspNetCore.Diagnostics/Views/HelperResult.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/Views/HelperResult.cs
rename to src/Microsoft.AspNetCore.Diagnostics/Views/HelperResult.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/WelcomePage/Views/WelcomePage.cs b/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/WelcomePage/Views/WelcomePage.cs
rename to src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/WelcomePage/Views/WelcomePage.cshtml b/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.cshtml
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/WelcomePage/Views/WelcomePage.cshtml
rename to src/Microsoft.AspNetCore.Diagnostics/WelcomePage/Views/WelcomePage.cshtml
diff --git a/src/Microsoft.AspNet.Diagnostics/WelcomePage/WelcomePageExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/WelcomePage/WelcomePageExtensions.cs
rename to src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageExtensions.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/WelcomePage/WelcomePageMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/WelcomePage/WelcomePageMiddleware.cs
rename to src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageMiddleware.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/WelcomePage/WelcomePageOptions.cs b/src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/WelcomePage/WelcomePageOptions.cs
rename to src/Microsoft.AspNetCore.Diagnostics/WelcomePage/WelcomePageOptions.cs
diff --git a/src/Microsoft.AspNet.Diagnostics/gruntfile.js b/src/Microsoft.AspNetCore.Diagnostics/gruntfile.js
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/gruntfile.js
rename to src/Microsoft.AspNetCore.Diagnostics/gruntfile.js
diff --git a/src/Microsoft.AspNet.Diagnostics/package.json b/src/Microsoft.AspNetCore.Diagnostics/package.json
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/package.json
rename to src/Microsoft.AspNetCore.Diagnostics/package.json
diff --git a/src/Microsoft.AspNet.Diagnostics/project.json b/src/Microsoft.AspNetCore.Diagnostics/project.json
similarity index 100%
rename from src/Microsoft.AspNet.Diagnostics/project.json
rename to src/Microsoft.AspNetCore.Diagnostics/project.json
diff --git a/src/Microsoft.AspNet.MiddlewareAnalysis/AnalysisBuilder.cs b/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNet.MiddlewareAnalysis/AnalysisBuilder.cs
rename to src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisBuilder.cs
diff --git a/src/Microsoft.AspNet.MiddlewareAnalysis/AnalysisMiddleware.cs b/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNet.MiddlewareAnalysis/AnalysisMiddleware.cs
rename to src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisMiddleware.cs
diff --git a/src/Microsoft.AspNet.MiddlewareAnalysis/AnalysisServiceCollectionExtensions.cs b/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisServiceCollectionExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.MiddlewareAnalysis/AnalysisServiceCollectionExtensions.cs
rename to src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisServiceCollectionExtensions.cs
diff --git a/src/Microsoft.AspNet.MiddlewareAnalysis/AnalysisStartupFilter.cs b/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisStartupFilter.cs
similarity index 100%
rename from src/Microsoft.AspNet.MiddlewareAnalysis/AnalysisStartupFilter.cs
rename to src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisStartupFilter.cs
diff --git a/src/Microsoft.AspNet.MiddlewareAnalysis/Microsoft.AspNet.MiddlewareAnalysis.xproj b/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.xproj
similarity index 100%
rename from src/Microsoft.AspNet.MiddlewareAnalysis/Microsoft.AspNet.MiddlewareAnalysis.xproj
rename to src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.xproj
diff --git a/src/Microsoft.AspNet.MiddlewareAnalysis/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.MiddlewareAnalysis/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.MiddlewareAnalysis/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.MiddlewareAnalysis/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.MiddlewareAnalysis/project.json b/src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json
similarity index 100%
rename from src/Microsoft.AspNet.MiddlewareAnalysis/project.json
rename to src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
rename to test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/Helpers/PlatformHelper.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Helpers/PlatformHelper.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/Helpers/PlatformHelper.cs
rename to test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Helpers/PlatformHelper.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/Helpers/TestLoggerProvider.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Helpers/TestLoggerProvider.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/Helpers/TestLoggerProvider.cs
rename to test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Helpers/TestLoggerProvider.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests.xproj b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.xproj
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests.xproj
rename to test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.xproj
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
rename to test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/SqlServerTestStore.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/SqlServerTestStore.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/SqlServerTestStore.cs
rename to test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/SqlServerTestStore.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/Blog.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/Blog.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/Blog.cs
rename to test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/Blog.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContext.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContext.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContext.cs
rename to test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContext.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithMigrations.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContextWithMigrations.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithMigrations.cs
rename to test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContextWithMigrations.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithPendingModelChanges.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContextWithPendingModelChanges.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithPendingModelChanges.cs
rename to test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContextWithPendingModelChanges.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithSnapshotThatThrows.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContextWithSnapshotThatThrows.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/TestModels/BloggingContextWithSnapshotThatThrows.cs
rename to test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/TestModels/BloggingContextWithSnapshotThatThrows.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json
similarity index 95%
rename from test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/project.json
rename to test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json
index f51e89f76c..c67c2a6c3f 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/project.json
+++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json
@@ -1,33 +1,33 @@
-{
-  "dependencies": {
-    "EntityFramework.MicrosoftSqlServer": "7.0.0-*",
-    "Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*",
-    "Microsoft.AspNet.Diagnostics.Entity.Tests": "1.0.0",
-    "Microsoft.AspNet.TestHost": "1.0.0-*",
-    "Microsoft.AspNet.Testing": "1.0.0-*",
-    "xunit": "2.1.0"
-  },
-  "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
-  "frameworks": {
-    "dnx451": {
-     "frameworkAssemblies": {
-        "System.Runtime": "",
-        "System.Threading.Tasks": ""
-      },
-      "dependencies": {
-        "xunit.runner.console": "2.1.0"
-      }
-    },
-    "dnxcore50": { 
-      "dependencies": {
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      }
-    }
-  },
-  "compilationOptions": {
-    "warningsAsErrors": true
-  }
-}
+{
+  "dependencies": {
+    "EntityFramework.MicrosoftSqlServer": "7.0.0-*",
+    "Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*",
+    "Microsoft.AspNet.Diagnostics.Entity.Tests": "1.0.0",
+    "Microsoft.AspNet.TestHost": "1.0.0-*",
+    "Microsoft.AspNet.Testing": "1.0.0-*",
+    "xunit": "2.1.0"
+  },
+  "testRunner": "xunit",
+  "commands": {
+    "test": "xunit.runner.aspnet"
+  },
+  "frameworks": {
+    "dnx451": {
+     "frameworkAssemblies": {
+        "System.Runtime": "",
+        "System.Threading.Tasks": ""
+      },
+      "dependencies": {
+        "xunit.runner.console": "2.1.0"
+      }
+    },
+    "dnxcore50": { 
+      "dependencies": {
+        "xunit.runner.aspnet": "2.0.0-aspnet-*"
+      }
+    }
+  },
+  "compilationOptions": {
+    "warningsAsErrors": true
+  }
+}
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.Tests/ApiConsistencyTest.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/ApiConsistencyTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Entity.Tests/ApiConsistencyTest.cs
rename to test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/ApiConsistencyTest.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.Tests/ApiConsistencyTestBase.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/ApiConsistencyTestBase.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Entity.Tests/ApiConsistencyTestBase.cs
rename to test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/ApiConsistencyTestBase.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.Tests/DatabaseErrorPageOptionsTest.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DatabaseErrorPageOptionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Entity.Tests/DatabaseErrorPageOptionsTest.cs
rename to test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DatabaseErrorPageOptionsTest.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.Tests/DatabaseErrorPageTest.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DatabaseErrorPageTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Entity.Tests/DatabaseErrorPageTest.cs
rename to test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/DatabaseErrorPageTest.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.Tests/Helpers/AssertHelpers.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Helpers/AssertHelpers.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Entity.Tests/Helpers/AssertHelpers.cs
rename to test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Helpers/AssertHelpers.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.Tests/Helpers/StringHelpers.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Helpers/StringHelpers.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Entity.Tests/Helpers/StringHelpers.cs
rename to test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Helpers/StringHelpers.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.Tests/Microsoft.AspNet.Diagnostics.Entity.Tests.xproj b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.xproj
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Entity.Tests/Microsoft.AspNet.Diagnostics.Entity.Tests.xproj
rename to test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.xproj
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.Tests/TestHelperExtensions.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/TestHelperExtensions.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Entity.Tests/TestHelperExtensions.cs
rename to test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/TestHelperExtensions.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.Tests/project.json b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json
similarity index 95%
rename from test/Microsoft.AspNet.Diagnostics.Entity.Tests/project.json
rename to test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json
index 5a790db906..4a3dddbc7d 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.Tests/project.json
+++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json
@@ -1,34 +1,34 @@
-{
-  "compilationOptions": {
-    "warningsAsErrors": true
-  },
-  "dependencies": {
-    "EntityFramework.InMemory": "7.0.0-*",
-    "Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*",
-    "Microsoft.AspNet.Testing": "1.0.0-*",
-    "xunit": "2.1.0"
-  },
-  "compile": [ "../Shared/ApiConsistencyTestBase.cs", "../Shared/TestHelpers.cs" ],
-  "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
-  "frameworks": {
-    "dnx451": {
-      "frameworkAssemblies": {
-        "System.Runtime": "",
-        "System.Threading.Tasks": ""
-      },
-      "dependencies": {
-        "Moq": "4.2.1312.1622",
-        "xunit.runner.console": "2.1.0"
-      }
-    },
-    "dnxcore50": {
-      "dependencies": {
-        "moq.netcore": "4.4.0-beta8",
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      }
-    }
-  }
-}
+{
+  "compilationOptions": {
+    "warningsAsErrors": true
+  },
+  "dependencies": {
+    "EntityFramework.InMemory": "7.0.0-*",
+    "Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*",
+    "Microsoft.AspNet.Testing": "1.0.0-*",
+    "xunit": "2.1.0"
+  },
+  "compile": [ "../Shared/ApiConsistencyTestBase.cs", "../Shared/TestHelpers.cs" ],
+  "testRunner": "xunit",
+  "commands": {
+    "test": "xunit.runner.aspnet"
+  },
+  "frameworks": {
+    "dnx451": {
+      "frameworkAssemblies": {
+        "System.Runtime": "",
+        "System.Threading.Tasks": ""
+      },
+      "dependencies": {
+        "Moq": "4.2.1312.1622",
+        "xunit.runner.console": "2.1.0"
+      }
+    },
+    "dnxcore50": {
+      "dependencies": {
+        "moq.netcore": "4.4.0-beta8",
+        "xunit.runner.aspnet": "2.0.0-aspnet-*"
+      }
+    }
+  }
+}
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs b/test/Microsoft.AspNetCore.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs
rename to test/Microsoft.AspNetCore.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/ElmLoggerTest.cs b/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Tests/ElmLoggerTest.cs
rename to test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/ElmMiddlewareTest.cs b/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmMiddlewareTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Tests/ElmMiddlewareTest.cs
rename to test/Microsoft.AspNetCore.Diagnostics.Tests/ElmMiddlewareTest.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/ExceptionHandlerTest.cs b/test/Microsoft.AspNetCore.Diagnostics.Tests/ExceptionHandlerTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Tests/ExceptionHandlerTest.cs
rename to test/Microsoft.AspNetCore.Diagnostics.Tests/ExceptionHandlerTest.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/Microsoft.AspNet.Diagnostics.Tests.xproj b/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.xproj
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Tests/Microsoft.AspNet.Diagnostics.Tests.xproj
rename to test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.xproj
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/Resources/TestFiles/EmbeddedSourceFile.txt b/test/Microsoft.AspNetCore.Diagnostics.Tests/Resources/TestFiles/EmbeddedSourceFile.txt
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Tests/Resources/TestFiles/EmbeddedSourceFile.txt
rename to test/Microsoft.AspNetCore.Diagnostics.Tests/Resources/TestFiles/EmbeddedSourceFile.txt
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs b/test/Microsoft.AspNetCore.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs
rename to test/Microsoft.AspNetCore.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/TestDiagnosticListener.cs b/test/Microsoft.AspNetCore.Diagnostics.Tests/TestDiagnosticListener.cs
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Tests/TestDiagnosticListener.cs
rename to test/Microsoft.AspNetCore.Diagnostics.Tests/TestDiagnosticListener.cs
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/TestFiles/SourceFile.txt b/test/Microsoft.AspNetCore.Diagnostics.Tests/TestFiles/SourceFile.txt
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Tests/TestFiles/SourceFile.txt
rename to test/Microsoft.AspNetCore.Diagnostics.Tests/TestFiles/SourceFile.txt
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/project.json b/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json
similarity index 100%
rename from test/Microsoft.AspNet.Diagnostics.Tests/project.json
rename to test/Microsoft.AspNetCore.Diagnostics.Tests/project.json
diff --git a/test/Microsoft.AspNet.MiddlewareAnalysis.Tests/Microsoft.AspNet.MiddlewareAnalysis.Tests.xproj b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.xproj
similarity index 100%
rename from test/Microsoft.AspNet.MiddlewareAnalysis.Tests/Microsoft.AspNet.MiddlewareAnalysis.Tests.xproj
rename to test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.xproj
diff --git a/test/Microsoft.AspNet.MiddlewareAnalysis.Tests/MiddlewareAnalysisTests.cs b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/MiddlewareAnalysisTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.MiddlewareAnalysis.Tests/MiddlewareAnalysisTests.cs
rename to test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/MiddlewareAnalysisTests.cs
diff --git a/test/Microsoft.AspNet.MiddlewareAnalysis.Tests/TestDiagnosticListener.cs b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/TestDiagnosticListener.cs
similarity index 100%
rename from test/Microsoft.AspNet.MiddlewareAnalysis.Tests/TestDiagnosticListener.cs
rename to test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/TestDiagnosticListener.cs
diff --git a/test/Microsoft.AspNet.MiddlewareAnalysis.Tests/project.json b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json
similarity index 100%
rename from test/Microsoft.AspNet.MiddlewareAnalysis.Tests/project.json
rename to test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json