diff --git a/samples/SampleApp/project.json b/samples/SampleApp/project.json
index 4d30db9489..f627f9f10f 100644
--- a/samples/SampleApp/project.json
+++ b/samples/SampleApp/project.json
@@ -1,11 +1,11 @@
-{
+{
     "version": "1.0.0-*",
     "dependencies": {
         "Kestrel": "1.0.0-*"
     },
     "frameworks": {
-        "aspnet50": { },
-        "aspnetcore50": {
+        "dnx451": { },
+        "dnxcore50": {
             "dependencies": {
                 "System.Console": "4.0.0-beta-*"
             }
diff --git a/src/Kestrel/project.json b/src/Kestrel/project.json
index 726fa65fd7..c97ceea693 100644
--- a/src/Kestrel/project.json
+++ b/src/Kestrel/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "1.0.0-*",
     "description": "ASP.NET 5 cross platform development web server.",
     "dependencies": {
@@ -6,10 +6,10 @@
         "Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
     },
     "frameworks": {
-        "aspnet50": {
+        "dnx451": {
             "dependencies": { }
         },
-        "aspnetcore50": {
+        "dnxcore50": {
             "dependencies": {
                 "System.Runtime": "4.0.20-beta-*"
             }
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameDuplexStream.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/FrameDuplexStream.cs
index 27db2d30b0..661c9ec59f 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameDuplexStream.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Http/FrameDuplexStream.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 System;
@@ -19,7 +19,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
             _responseStream = responseStream;
         }
 
-#if ASPNET50
+#if DNX451
         public override void Close()
         {
             _requestStream.Close();
@@ -46,7 +46,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
             return _responseStream.FlushAsync(cancellationToken);
         }
 
-#if ASPNET50
+#if DNX451
         public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
         {
             return _requestStream.BeginRead(buffer, offset, count, callback, state);
@@ -68,7 +68,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
             return _requestStream.CopyToAsync(destination, bufferSize, cancellationToken);
         }
 
-#if ASPNET50
+#if DNX451
         public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
         {
             return _responseStream.BeginWrite(buffer, offset, count, callback, state);
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameRequestStream.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/FrameRequestStream.cs
index aed7e30cf3..645a7afb12 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/Http/FrameRequestStream.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Http/FrameRequestStream.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 System;
@@ -41,7 +41,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
             return ReadAsync(buffer, offset, count).Result;
         }
 
-#if ASPNET50
+#if DNX451
         public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
         {
             var task = ReadAsync(buffer, offset, count, CancellationToken.None, state);
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/KestrelThread.cs b/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/KestrelThread.cs
index b7fd07c627..3b6b885df1 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/KestrelThread.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Infrastructure/KestrelThread.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 Microsoft.AspNet.Server.Kestrel.Networking;
@@ -56,7 +56,7 @@ namespace Microsoft.AspNet.Server.Kestrel
                 Post(OnStopImmediate, null);
                 if (!_thread.Join((int)timeout.TotalMilliseconds))
                 {
-#if ASPNET50
+#if DNX451
                     _thread.Abort();
 #endif
                 }
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Networking/PlatformApis.cs b/src/Microsoft.AspNet.Server.Kestrel/Networking/PlatformApis.cs
index ff7c4fa12c..55a2fe77b4 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/Networking/PlatformApis.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Networking/PlatformApis.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 System;
@@ -12,7 +12,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Networking
     {
         public static bool IsWindows()
         {
-#if ASPNETCORE50
+#if DNXCORE50
             return true;
 #else
             var p = (int)Environment.OSVersion.Platform;
diff --git a/src/Microsoft.AspNet.Server.Kestrel/project.json b/src/Microsoft.AspNet.Server.Kestrel/project.json
index 4e685035cb..796e9ab1ed 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/project.json
+++ b/src/Microsoft.AspNet.Server.Kestrel/project.json
@@ -1,12 +1,12 @@
-{
+{
     "version": "1.0.0-*",
     "description": "ASP.NET 5 cross platform development web server.",
     "dependencies": {
         "Microsoft.Framework.Runtime.Interfaces": "1.0.0-*"
     },
     "frameworks": {
-        "aspnet50": { },
-        "aspnetcore50": {
+        "dnx451": { },
+        "dnxcore50": {
             "dependencies": {
                 "System.Collections": "4.0.10-beta-*",
                 "System.Diagnostics.Debug": "4.0.10-beta-*",
diff --git a/test/Microsoft.AspNet.Server.KestrelTests/project.json b/test/Microsoft.AspNet.Server.KestrelTests/project.json
index e7ccd24e25..1ea27e057b 100644
--- a/test/Microsoft.AspNet.Server.KestrelTests/project.json
+++ b/test/Microsoft.AspNet.Server.KestrelTests/project.json
@@ -1,12 +1,12 @@
-{
+{
     "version": "1.0.0-*",
     "dependencies": {
         "xunit.runner.kre": "1.0.0-*",
         "Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
     },
     "frameworks": {
-        "aspnet50": { },
-        "aspnetcore50": {
+        "dnx451": { },
+        "dnxcore50": {
             "dependencies": {
                 "System.Net.Sockets": "4.0.0-beta-*",
                 "System.Runtime.Handles": "4.0.0-beta-*",