diff --git a/samples/ErrorHandlerSample/project.json b/samples/ErrorHandlerSample/project.json
index a620f4479d..cf6967a474 100644
--- a/samples/ErrorHandlerSample/project.json
+++ b/samples/ErrorHandlerSample/project.json
@@ -12,7 +12,7 @@
         "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5000"
     },
     "frameworks": {
-        "aspnet50" : { },
-        "aspnetcore50" : { }
+        "dnx451" : { },
+        "dnxcore50" : { }
     }
 }
diff --git a/samples/ErrorPageSample/project.json b/samples/ErrorPageSample/project.json
index 0de17aa1f1..da010c4c17 100644
--- a/samples/ErrorPageSample/project.json
+++ b/samples/ErrorPageSample/project.json
@@ -1,4 +1,4 @@
-{
+{
   "dependencies": {
     "Microsoft.AspNet.Diagnostics": "1.0.0-*",
     "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
@@ -6,7 +6,7 @@
   },
   "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" },
   "frameworks": {
-    "aspnet50": {},
-    "aspnetcore50": {}
+    "dnx451": {},
+    "dnxcore50": {}
   }
 }
diff --git a/samples/RuntimeInfoPageSample/project.json b/samples/RuntimeInfoPageSample/project.json
index fe6d450cb3..4066d326dd 100644
--- a/samples/RuntimeInfoPageSample/project.json
+++ b/samples/RuntimeInfoPageSample/project.json
@@ -1,4 +1,4 @@
-{
+{
     "webroot" : "wwwroot",
     "exclude": "wwwroot/**/*.*",
     "dependencies": {
@@ -6,7 +6,7 @@
         "Microsoft.AspNet.Server.IIS": "1.0.0-*"
     },
     "frameworks" : {
-        "aspnet50" : { },
-        "aspnetcore50" : { }
+        "dnx451" : { },
+        "dnxcore50" : { }
     }
 }
diff --git a/samples/StatusCodePagesSample/project.json b/samples/StatusCodePagesSample/project.json
index 75974480ec..c40b6ae136 100644
--- a/samples/StatusCodePagesSample/project.json
+++ b/samples/StatusCodePagesSample/project.json
@@ -18,7 +18,7 @@
         "Microsoft.AspNet.Server.WebListener": "1.0.0-*"
     },
     "frameworks" : {
-        "aspnet50" : { },
-        "aspnetcore50" : { }
+        "dnx451" : { },
+        "dnxcore50" : { }
     }
 }
diff --git a/samples/WelcomePageSample/project.json b/samples/WelcomePageSample/project.json
index 6a2396801c..a1206bf447 100644
--- a/samples/WelcomePageSample/project.json
+++ b/samples/WelcomePageSample/project.json
@@ -1,4 +1,4 @@
-{
+{
   "dependencies": {
     "Microsoft.AspNet.Diagnostics": "",
     "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
@@ -6,7 +6,7 @@
   },
   "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" },
   "frameworks": {
-    "aspnet50": { },
-    "aspnetcore50": {}
+    "dnx451": { },
+    "dnxcore50": {}
   }
 }
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmScope.cs b/src/Microsoft.AspNet.Diagnostics.Elm/ElmScope.cs
index a1c65aed6f..32d00365c3 100644
--- a/src/Microsoft.AspNet.Diagnostics.Elm/ElmScope.cs
+++ b/src/Microsoft.AspNet.Diagnostics.Elm/ElmScope.cs
@@ -1,5 +1,5 @@
 using System;
-#if ASPNET50
+#if DNX451
 using System.Runtime.Remoting;
 using System.Runtime.Remoting.Messaging;
 #endif
@@ -25,7 +25,7 @@ namespace Microsoft.AspNet.Diagnostics.Elm
 
         public ScopeNode Node { get; set; }
 
-#if ASPNET50
+#if DNX451
         private static string FieldKey = typeof(ElmScope).FullName + ".Value";
         public static ElmScope Current
         {
@@ -110,4 +110,4 @@ namespace Microsoft.AspNet.Diagnostics.Elm
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/project.json b/src/Microsoft.AspNet.Diagnostics.Elm/project.json
index 5c7d1770e0..13d31d5983 100644
--- a/src/Microsoft.AspNet.Diagnostics.Elm/project.json
+++ b/src/Microsoft.AspNet.Diagnostics.Elm/project.json
@@ -6,11 +6,11 @@
     },
 
     "frameworks": {
-        "aspnet50": { },
-        "aspnetcore50": {
+        "dnx451": { },
+        "dnxcore50": {
             "dependencies": {
                 "System.Threading": "4.0.10-beta-*"
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs b/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs
index 648d7889d1..01f41e42ae 100644
--- a/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs
+++ b/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs
@@ -6,7 +6,7 @@ using Microsoft.AspNet.Diagnostics.Entity.Utilities;
 using Microsoft.Data.Entity.Storage;
 using Microsoft.Framework.Logging;
 using System;
-#if ASPNETCORE50
+#if DNXCORE50
 using System.Threading;
 #else
 using System.Runtime.Remoting.Messaging;
@@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity
 {
     public class DataStoreErrorLogger : ILogger
     {
-#if ASPNETCORE50
+#if DNXCORE50
         private readonly AsyncLocal<DataStoreErrorLog> _log = new AsyncLocal<DataStoreErrorLog>(); 
 #else
         private const string ContextName = "__DataStoreErrorLog";
@@ -26,7 +26,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity
         {
             get
             {
-#if ASPNETCORE50
+#if DNXCORE50
                 return _log.Value; 
 #else
                 return (DataStoreErrorLog)CallContext.LogicalGetData(ContextName);
@@ -41,7 +41,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity
             // it will not be available to code outside of the current async context. 
             // We create it ahead of time so that any cloning just clones the reference
             // to the object that will hold any errors.
-#if ASPNETCORE50
+#if DNXCORE50
             _log.Value = new DataStoreErrorLog();
 #else
             CallContext.LogicalSetData(ContextName, new DataStoreErrorLog());
@@ -105,4 +105,4 @@ namespace Microsoft.AspNet.Diagnostics.Entity
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs
index 64037b16d8..a9756d5b41 100644
--- a/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs
+++ b/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using JetBrains.Annotations;
@@ -49,7 +49,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity
 
             try
             {
-#if !ASPNETCORE50
+#if !DNXCORE50
                 // TODO This probably isn't the correct place for this workaround, it
                 //      needs to be called before anything is written to CallContext
                 // http://msdn.microsoft.com/en-us/library/dn458353(v=vs.110).aspx
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/project.json b/src/Microsoft.AspNet.Diagnostics.Entity/project.json
index 6e0ee188dd..2ec6b38334 100644
--- a/src/Microsoft.AspNet.Diagnostics.Entity/project.json
+++ b/src/Microsoft.AspNet.Diagnostics.Entity/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "7.0.0-*",
     "description":  "ASP.NET 5 Middleware for Entity Framework error pages.",
     "compilationOptions": {
@@ -10,12 +10,12 @@
     },
     "code": [ "**\\*.cs", "..\\Shared\\*.cs" ],
     "frameworks": {
-        "aspnet50": {
+        "dnx451": {
             "frameworkAssemblies": {
                 "System.Configuration": ""
             }
         },
-        "aspnetcore50": {
+        "dnxcore50": {
             "dependencies": {
                 "System.Threading": "4.0.10-beta-*"
             }
diff --git a/src/Microsoft.AspNet.Diagnostics.Interfaces/project.json b/src/Microsoft.AspNet.Diagnostics.Interfaces/project.json
index 7ceb752a0b..6455423631 100644
--- a/src/Microsoft.AspNet.Diagnostics.Interfaces/project.json
+++ b/src/Microsoft.AspNet.Diagnostics.Interfaces/project.json
@@ -3,11 +3,11 @@
 	"description": "ASP.NET 5 diagnostics middleware interfaces.",
 	"compilationOptions": { "warningsAsErrors": true },
 	 "frameworks": {
-        "aspnet50": { },
-        "aspnetcore50": {
+        "dnx451": { },
+        "dnxcore50": {
             "dependencies": {
                 "System.Runtime": "4.0.20-beta-*"
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.AspNet.Diagnostics/project.json b/src/Microsoft.AspNet.Diagnostics/project.json
index 75da49084d..cc7e7546ca 100644
--- a/src/Microsoft.AspNet.Diagnostics/project.json
+++ b/src/Microsoft.AspNet.Diagnostics/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "1.0.0-*",
     "description": "ASP.NET 5 Middleware for error handling, error pages, and diagnostics information.",
     "dependencies": {
@@ -8,11 +8,11 @@
         "Microsoft.Framework.WebEncoders": "1.0.0-*"
     },
     "frameworks": {
-        "aspnet50": {},
-        "aspnetcore50": {
+        "dnx451": {},
+        "dnxcore50": {
             "dependencies": {
                 "System.Reflection.Extensions": "4.0.0-beta-*"
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/PageGenerator/project.json b/src/PageGenerator/project.json
index e05bc49712..6f2fb8e25a 100644
--- a/src/PageGenerator/project.json
+++ b/src/PageGenerator/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "1.0.0-*",
     "dependencies": {
         "Microsoft.AspNet.Diagnostics.Elm": "1.0.0-*",
@@ -6,8 +6,8 @@
     },
 
     "frameworks": {
-        "aspnet50": { },
-        "aspnetcore50": {
+        "dnx451": { },
+        "dnxcore50": {
             "dependencies": {
                 "System.Console": "4.0.0-beta-*"
             }
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/project.json b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/project.json
index 7b55cb635e..8d9630e88b 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/project.json
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/project.json
@@ -1,4 +1,4 @@
-{
+{
     "dependencies": {
         "EntityFramework.SqlServer": "7.0.0-*",
         "Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*",
@@ -10,6 +10,6 @@
         "test": "xunit.runner.kre"
     },
     "frameworks": {
-        "aspnet50": { }
+        "dnx451": { }
     }
 }
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.Tests/project.json b/test/Microsoft.AspNet.Diagnostics.Entity.Tests/project.json
index bca9f67fd0..3cd4d71c93 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.Tests/project.json
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.Tests/project.json
@@ -1,4 +1,4 @@
-{
+{
     "dependencies": {
         "EntityFramework.InMemory": "7.0.0-*",
         "Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*", 
@@ -10,6 +10,6 @@
         "test": "xunit.runner.kre"
     },
     "frameworks": {
-        "aspnet50": { }
+        "dnx451": { }
     }
 }
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/ElmMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Tests/ElmMiddlewareTest.cs
index be8813128f..7fb0f6a8ea 100644
--- a/test/Microsoft.AspNet.Diagnostics.Tests/ElmMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Tests/ElmMiddlewareTest.cs
@@ -10,7 +10,7 @@ using Microsoft.AspNet.Diagnostics.Elm;
 using Microsoft.AspNet.Http;
 using Microsoft.Framework.Logging;
 using Microsoft.Framework.OptionsModel;
-#if ASPNET50
+#if DNX451
 using Moq;
 #endif
 using Xunit;
@@ -31,7 +31,7 @@ namespace Microsoft.AspNet.Diagnostics.Tests
             Assert.Equal(DefaultPath, options.Path.Value);
         }
 
-#if ASPNET50
+#if DNX451
         [Fact]
         public async void Invoke_WithNonMatchingPath_IgnoresRequest()
         {
@@ -215,4 +215,4 @@ namespace Microsoft.AspNet.Diagnostics.Tests
         }
 #endif
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs
index 82308b0f4d..fb33c54c11 100644
--- a/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs
@@ -12,7 +12,7 @@ using Microsoft.AspNet.Http;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Runtime;
 using Microsoft.Framework.WebEncoders;
-#if ASPNET50
+#if DNX451
 using Moq;
 #endif
 using Xunit;
@@ -33,7 +33,7 @@ namespace Microsoft.AspNet.Diagnostics.Tests
             Assert.Equal(DefaultPath, options.Path.Value);
         }
 
-#if ASPNET50
+#if DNX451
         [Fact]
         public void CreateRuntimeInfoModel_GetsTheVersionAndAllPackages()
         {
@@ -240,4 +240,4 @@ namespace Microsoft.AspNet.Diagnostics.Tests
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/project.json b/test/Microsoft.AspNet.Diagnostics.Tests/project.json
index 8d43ffb74b..0a8b17f91a 100644
--- a/test/Microsoft.AspNet.Diagnostics.Tests/project.json
+++ b/test/Microsoft.AspNet.Diagnostics.Tests/project.json
@@ -1,4 +1,4 @@
-{
+{
     "compilationOptions": {
         "warningsAsErrors": true
     },
@@ -8,12 +8,12 @@
     },
 
     "frameworks": {
-        "aspnet50": {
+        "dnx451": {
             "dependencies": {
                 "Moq": "4.2.1312.1622"
             }
         },
-        "aspnetcore50": {
+        "dnxcore50": {
         }
     },
     "commands": {