diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/project.json b/src/Microsoft.AspNet.Mvc.Abstractions/project.json
index c761ca246a..318cd96e67 100644
--- a/src/Microsoft.AspNet.Mvc.Abstractions/project.json
+++ b/src/Microsoft.AspNet.Mvc.Abstractions/project.json
@@ -28,8 +28,8 @@
     }
   },
   "frameworks": {
-    "dnx451": { },
-    "dnxcore50": {
+    "net451": {},
+    "dotnet5.4": {
       "dependencies": {
         "Microsoft.CSharp": "4.0.1-beta-*",
         "System.ComponentModel.TypeConverter": "4.0.1-beta-*",
@@ -38,4 +38,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc.ApiExplorer/project.json b/src/Microsoft.AspNet.Mvc.ApiExplorer/project.json
index 99bbfe6a21..7e3cd96a54 100644
--- a/src/Microsoft.AspNet.Mvc.ApiExplorer/project.json
+++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/project.json
@@ -1,20 +1,26 @@
 {
-    "description": "Contains API explorer functionality for ASP.NET MVC for discovering metadata such as the list of controllers and actions, and their URLs and allowed HTTP methods.",
-    "version": "6.0.0-*",
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/aspnet/mvc"
+  "description": "Contains API explorer functionality for ASP.NET MVC for discovering metadata such as the list of controllers and actions, and their URLs and allowed HTTP methods.",
+  "version": "6.0.0-*",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/aspnet/mvc"
+  },
+  "compilationOptions": {
+    "warningsAsErrors": true
+  },
+  "dependencies": {
+    "Microsoft.AspNet.Mvc.Core": "6.0.0-*",
+    "Microsoft.Extensions.PropertyHelper.Sources": {
+      "version": "1.0.0-*",
+      "type": "build"
     },
-    "compilationOptions": {
-        "warningsAsErrors": true
-    },
-    "dependencies": {
-        "Microsoft.AspNet.Mvc.Core": "6.0.0-*",
-        "Microsoft.Extensions.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" },
-        "Microsoft.Extensions.ClosedGenericMatcher.Sources": { "version": "1.0.0-*", "type": "build" }
-    },
-    "frameworks": {
-        "dnx451": { },
-        "dnxcore50": { }
+    "Microsoft.Extensions.ClosedGenericMatcher.Sources": {
+      "version": "1.0.0-*",
+      "type": "build"
     }
+  },
+  "frameworks": {
+    "net451": {},
+    "dotnet5.4": {}
+  }
 }
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc.Core/Infrastructure/ActionBindingContextAccessor.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/ActionBindingContextAccessor.cs
index 179c40b68b..345edf237b 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Infrastructure/ActionBindingContextAccessor.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/ActionBindingContextAccessor.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if DNX451
+#if NET451
 using System.Runtime.Remoting;
 using System.Runtime.Remoting.Messaging;
 #else
@@ -12,7 +12,7 @@ namespace Microsoft.AspNet.Mvc.Infrastructure
 {
     public class ActionBindingContextAccessor : IActionBindingContextAccessor
     {
-#if DNX451
+#if NET451
         private static string Key = typeof(ActionBindingContext).FullName;
 
         public ActionBindingContext ActionBindingContext
diff --git a/src/Microsoft.AspNet.Mvc.Core/Infrastructure/ActionContextAccessor.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/ActionContextAccessor.cs
index 4a06103e0a..1297871ea9 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Infrastructure/ActionContextAccessor.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/ActionContextAccessor.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if DNX451
+#if NET451
 using System.Runtime.Remoting;
 using System.Runtime.Remoting.Messaging;
 #else
@@ -12,7 +12,7 @@ namespace Microsoft.AspNet.Mvc.Infrastructure
 {
     public class ActionContextAccessor : IActionContextAccessor
     {
-#if DNX451
+#if NET451
         private static string Key = typeof(ActionContext).FullName;
 
         public ActionContext ActionContext
diff --git a/src/Microsoft.AspNet.Mvc.Core/Infrastructure/AmbiguousActionException.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/AmbiguousActionException.cs
index 04f06c65b6..a5f618f73b 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Infrastructure/AmbiguousActionException.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/AmbiguousActionException.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-#if DNX451
+#if NET451
 using System.Runtime.Serialization;
 #endif
 
@@ -11,7 +11,7 @@ namespace Microsoft.AspNet.Mvc.Infrastructure
     /// <summary>
     /// An exception which indicates multiple matches in action selection.
     /// </summary>
-#if DNX451
+#if NET451
     [Serializable]
 #endif
     public class AmbiguousActionException : InvalidOperationException
@@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Mvc.Infrastructure
         {
         }
 
-#if DNX451
+#if NET451
         protected AmbiguousActionException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
diff --git a/src/Microsoft.AspNet.Mvc.Core/Internal/NonDisposableStream.cs b/src/Microsoft.AspNet.Mvc.Core/Internal/NonDisposableStream.cs
index 3204131755..7f52396fae 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Internal/NonDisposableStream.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Internal/NonDisposableStream.cs
@@ -107,7 +107,7 @@ namespace Microsoft.AspNet.Mvc.Internal
         {
             return _innerStream.ReadAsync(buffer, offset, count, cancellationToken);
         }
-#if DNX451
+#if NET451
         /// <inheritdoc />
         public override IAsyncResult BeginRead(
             byte[] buffer,
@@ -166,7 +166,7 @@ namespace Microsoft.AspNet.Mvc.Internal
         {
             return _innerStream.WriteAsync(buffer, offset, count, cancellationToken);
         }
-#if DNX451
+#if NET451
         /// <inheritdoc />
         public override IAsyncResult BeginWrite(
             byte[] buffer,
@@ -189,7 +189,7 @@ namespace Microsoft.AspNet.Mvc.Internal
         {
             _innerStream.WriteByte(value);
         }
-#if DNX451
+#if NET451
         /// <inheritdoc />
         public override void Close()
         {
diff --git a/src/Microsoft.AspNet.Mvc.Core/Internal/TaskCache.cs b/src/Microsoft.AspNet.Mvc.Core/Internal/TaskCache.cs
index 41f1f955a9..005491aa59 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Internal/TaskCache.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Internal/TaskCache.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
@@ -7,7 +7,7 @@ namespace Microsoft.AspNet.Mvc.Internal
 {
     public static class TaskCache
     {
-#if DNX451
+#if NET451
         static readonly Task _completedTask = Task.FromResult(0);
 #endif
 
@@ -17,7 +17,7 @@ namespace Microsoft.AspNet.Mvc.Internal
         {
             get
             {
-#if DNX451
+#if NET451
                 return _completedTask;
 #else
                 return Task.CompletedTask;
diff --git a/src/Microsoft.AspNet.Mvc.Core/ModelBinding/CollectionModelBinder.cs b/src/Microsoft.AspNet.Mvc.Core/ModelBinding/CollectionModelBinder.cs
index af351d3323..855f460f36 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ModelBinding/CollectionModelBinder.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ModelBinding/CollectionModelBinder.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
-#if DNXCORE50
+#if DOTNET5_4
 using System.Reflection;
 #endif
 using System.Threading.Tasks;
diff --git a/src/Microsoft.AspNet.Mvc.Core/ModelBinding/DictionaryModelBinder.cs b/src/Microsoft.AspNet.Mvc.Core/ModelBinding/DictionaryModelBinder.cs
index b7beb0c78d..ab45bf7229 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ModelBinding/DictionaryModelBinder.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ModelBinding/DictionaryModelBinder.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-#if DNXCORE50
+#if DOTNET5_4
 using System.Reflection;
 #endif
 using System.Threading.Tasks;
diff --git a/src/Microsoft.AspNet.Mvc.Core/ModelBinding/FormFileModelBinder.cs b/src/Microsoft.AspNet.Mvc.Core/ModelBinding/FormFileModelBinder.cs
index d7ddfdc985..c98d189be2 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ModelBinding/FormFileModelBinder.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ModelBinding/FormFileModelBinder.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-#if DNXCORE50
+#if DOTNET5_4
 using System.Reflection;
 #endif
 using System.Threading.Tasks;
diff --git a/src/Microsoft.AspNet.Mvc.Core/ModelBinding/GenericModelBinder.cs b/src/Microsoft.AspNet.Mvc.Core/ModelBinding/GenericModelBinder.cs
index 8f6128576a..7df1ea63b4 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ModelBinding/GenericModelBinder.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ModelBinding/GenericModelBinder.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-#if DNXCORE50
+#if DOTNET5_4
 using System.Reflection;
 #endif
 using System.Threading.Tasks;
diff --git a/src/Microsoft.AspNet.Mvc.Core/ModelBinding/HeaderModelBinder.cs b/src/Microsoft.AspNet.Mvc.Core/ModelBinding/HeaderModelBinder.cs
index fbd4fa8770..a3348c3f42 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ModelBinding/HeaderModelBinder.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ModelBinding/HeaderModelBinder.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-#if DNXCORE50
+#if DOTNET5_4
 using System.Reflection;
 #endif
 using System.Threading.Tasks;
diff --git a/src/Microsoft.AspNet.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadata.cs b/src/Microsoft.AspNet.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadata.cs
index 922d9bc65c..091990a83b 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadata.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadata.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Linq;
-#if DNXCORE50
+#if DOTNET5_4
 using System.Reflection;
 #endif
 using Microsoft.Extensions.Internal;
diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectionDecisionTree.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectionDecisionTree.cs
index fcc923d2dd..d5302c2b7f 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectionDecisionTree.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectionDecisionTree.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-#if DNX451
+#if NET451
 using System.ComponentModel;
 #endif
 using System.Diagnostics;
@@ -174,7 +174,7 @@ namespace Microsoft.AspNet.Mvc.Routing
                         {
                             // We'd already have failed before getting here. The RouteDataActionConstraint constructor
                             // would throw.
-#if DNX451
+#if NET451
                             throw new InvalidEnumArgumentException(
                                 nameof(item),
                                 (int)constraint.KeyHandling,
diff --git a/src/Microsoft.AspNet.Mvc.Core/project.json b/src/Microsoft.AspNet.Mvc.Core/project.json
index 9da116951b..bab35530b4 100644
--- a/src/Microsoft.AspNet.Mvc.Core/project.json
+++ b/src/Microsoft.AspNet.Mvc.Core/project.json
@@ -35,15 +35,15 @@
     "System.Diagnostics.DiagnosticSource": "4.0.0-beta-*"
   },
   "frameworks": {
-    "dnx451": {
+    "net451": {
       "frameworkAssemblies": {
         "System.Runtime": ""
       }
     },
-    "dnxcore50": {
-        "dependencies": {
-            "System.Text.Encoding": "4.0.11-*"
-        }
+    "dotnet5.4": {
+      "dependencies": {
+        "System.Text.Encoding": "4.0.11-*"
+      }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc.Cors/project.json b/src/Microsoft.AspNet.Mvc.Cors/project.json
index 36c8efd5d4..c10c262868 100644
--- a/src/Microsoft.AspNet.Mvc.Cors/project.json
+++ b/src/Microsoft.AspNet.Mvc.Cors/project.json
@@ -1,20 +1,19 @@
-{
-    "description": "CORS features for the core MVC runtime",
-    "version": "6.0.0-*",
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/aspnet/mvc"
-    },
-    "compilationOptions": {
-        "warningsAsErrors": true
-    },
-    "dependencies": {
-        "Microsoft.AspNet.Cors": "6.0.0-*",
-        "Microsoft.AspNet.Mvc.Core": "6.0.0-*"
-    },
-
-    "frameworks": {
-        "dnx451": { },
-        "dnxcore50": { }
-    }
-}
+{
+  "description": "CORS features for the core MVC runtime",
+  "version": "6.0.0-*",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/aspnet/mvc"
+  },
+  "compilationOptions": {
+    "warningsAsErrors": true
+  },
+  "dependencies": {
+    "Microsoft.AspNet.Cors": "6.0.0-*",
+    "Microsoft.AspNet.Mvc.Core": "6.0.0-*"
+  },
+  "frameworks": {
+    "net451": {},
+    "dotnet5.4": {}
+  }
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc.DataAnnotations/project.json b/src/Microsoft.AspNet.Mvc.DataAnnotations/project.json
index bff6094d4a..c39889f4c2 100644
--- a/src/Microsoft.AspNet.Mvc.DataAnnotations/project.json
+++ b/src/Microsoft.AspNet.Mvc.DataAnnotations/project.json
@@ -1,30 +1,35 @@
 {
-    "description": "Metadata and Validation using System.ComponentModel.DataAnnotations for the MVC runtime",
-    "version": "6.0.0-*",
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/aspnet/mvc"
+  "description": "Metadata and Validation using System.ComponentModel.DataAnnotations for the MVC runtime",
+  "version": "6.0.0-*",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/aspnet/mvc"
+  },
+  "compilationOptions": {
+    "warningsAsErrors": true
+  },
+  "dependencies": {
+    "Microsoft.AspNet.Mvc.Core": "6.0.0-*",
+    "Microsoft.Extensions.ClosedGenericMatcher.Sources": {
+      "version": "1.0.0-*",
+      "type": "build"
     },
-    "compilationOptions": {
-        "warningsAsErrors": true
+    "Microsoft.Extensions.CopyOnWriteDictionary.Sources": {
+      "version": "1.0.0-*",
+      "type": "build"
     },
-    "dependencies": {
-        "Microsoft.AspNet.Mvc.Core": "6.0.0-*",
-        "Microsoft.Extensions.ClosedGenericMatcher.Sources": { "version": "1.0.0-*", "type": "build" },
-        "Microsoft.Extensions.CopyOnWriteDictionary.Sources": { "version": "1.0.0-*", "type": "build" },
-        "Microsoft.Extensions.Localization":  "1.0.0-*"
+    "Microsoft.Extensions.Localization": "1.0.0-*"
+  },
+  "frameworks": {
+    "net451": {
+      "frameworkAssemblies": {
+        "System.ComponentModel.DataAnnotations": ""
+      }
     },
-
-    "frameworks": {
-        "dnx451": {
-            "frameworkAssemblies": {
-                "System.ComponentModel.DataAnnotations": ""
-            }
-        },
-        "dnxcore50": {
-            "dependencies": {
-                "System.ComponentModel.Annotations": "4.0.11-beta-*"
-            }
-        }
+    "dotnet5.4": {
+      "dependencies": {
+        "System.ComponentModel.Annotations": "4.0.11-beta-*"
+      }
     }
-}
+  }
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Json/project.json b/src/Microsoft.AspNet.Mvc.Formatters.Json/project.json
index 097e8af541..09082f5753 100644
--- a/src/Microsoft.AspNet.Mvc.Formatters.Json/project.json
+++ b/src/Microsoft.AspNet.Mvc.Formatters.Json/project.json
@@ -1,25 +1,24 @@
 {
-    "description": "JSON input and output for the MVC runtime",
-    "version": "6.0.0-*",
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/aspnet/mvc"
+  "description": "JSON input and output for the MVC runtime",
+  "version": "6.0.0-*",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/aspnet/mvc"
+  },
+  "compilationOptions": {
+    "warningsAsErrors": true
+  },
+  "dependencies": {
+    "Microsoft.AspNet.JsonPatch": "1.0.0-*",
+    "Microsoft.AspNet.Mvc.Core": "6.0.0-*",
+    "Microsoft.Extensions.ClosedGenericMatcher.Sources": {
+      "version": "1.0.0-*",
+      "type": "build"
     },
-    "compilationOptions": {
-        "warningsAsErrors": true
-    },
-    "dependencies": {
-        "Microsoft.AspNet.JsonPatch": "1.0.0-*",
-        "Microsoft.AspNet.Mvc.Core": "6.0.0-*",
-        "Microsoft.Extensions.ClosedGenericMatcher.Sources": {
-            "version": "1.0.0-*",
-            "type": "build"
-        },
-        "Newtonsoft.Json": "6.0.6"
-    },
-
-    "frameworks": {
-        "dnx451": { },
-        "dnxcore50": { }
-    }
-}
+    "Newtonsoft.Json": "6.0.6"
+  },
+  "frameworks": {
+    "net451": {},
+    "dotnet5.4": {}
+  }
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/Internal/FormattingUtilities.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/Internal/FormattingUtilities.cs
index 6797884b3a..e83bde2dd9 100644
--- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/Internal/FormattingUtilities.cs
+++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/Internal/FormattingUtilities.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if DNX451
+#if NET451
 using System.Runtime.Serialization;
 #endif
 using System.Xml;
@@ -15,7 +15,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml.Internal
     {
         public static readonly int DefaultMaxDepth = 32;
 
-#if DNX451
+#if NET451
         public static readonly XsdDataContractExporter XsdDataContractExporter = new XsdDataContractExporter();
 #endif
 
diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs
index 1f91044824..b4c064eb66 100644
--- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs
+++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs
@@ -132,7 +132,7 @@ namespace Microsoft.AspNet.Mvc.Formatters
 
             try
             {
-#if DNX451
+#if NET451
                 // Verify that type is a valid data contract by forcing the serializer to try to create a data contract
                 FormattingUtilities.XsdDataContractExporter.GetRootElementName(type);
 #endif
diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/project.json b/src/Microsoft.AspNet.Mvc.Formatters.Xml/project.json
index 8a62ea9ad8..4ba63c9b8e 100644
--- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/project.json
+++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/project.json
@@ -1,30 +1,36 @@
 {
-    "description": "Contains DataContractSerializer and XmlSerializer based input and output formatters",
-    "version": "6.0.0-*",
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/aspnet/mvc"
+  "description": "Contains DataContractSerializer and XmlSerializer based input and output formatters",
+  "version": "6.0.0-*",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/aspnet/mvc"
+  },
+  "compilationOptions": {
+    "warningsAsErrors": true
+  },
+  "dependencies": {
+    "Microsoft.AspNet.Mvc.Core": "6.0.0-*",
+    "Microsoft.Extensions.ClosedGenericMatcher.Sources": {
+      "version": "1.0.0-*",
+      "type": "build"
     },
-    "compilationOptions": {
-        "warningsAsErrors": true
-    },
-    "dependencies": {
-        "Microsoft.AspNet.Mvc.Core": "6.0.0-*",
-        "Microsoft.Extensions.ClosedGenericMatcher.Sources": { "version": "1.0.0-*", "type": "build" },
-        "Microsoft.Extensions.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" }
-    },
-    "frameworks": {
-        "dnx451": {
-            "frameworkAssemblies": {
-                "System.Runtime.Serialization": "",
-                "System.Xml": ""
-            }
-        },
-        "dnxcore50": {
-            "dependencies": {
-                "System.Runtime.Serialization.Xml": "4.0.11-beta-*",
-                "System.Xml.XmlSerializer": "4.0.11-beta-*"
-            }
-        }
+    "Microsoft.Extensions.PropertyHelper.Sources": {
+      "version": "1.0.0-*",
+      "type": "build"
     }
-}
+  },
+  "frameworks": {
+    "net451": {
+      "frameworkAssemblies": {
+        "System.Runtime.Serialization": "",
+        "System.Xml": ""
+      }
+    },
+    "dotnet5.4": {
+      "dependencies": {
+        "System.Runtime.Serialization.Xml": "4.0.11-beta-*",
+        "System.Xml.XmlSerializer": "4.0.11-beta-*"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc.Localization/project.json b/src/Microsoft.AspNet.Mvc.Localization/project.json
index 7f034eae26..8e2f1393e6 100644
--- a/src/Microsoft.AspNet.Mvc.Localization/project.json
+++ b/src/Microsoft.AspNet.Mvc.Localization/project.json
@@ -1,30 +1,30 @@
 {
-    "description": "Features that enable globalization & localization of MVC applications.",
-    "version": "6.0.0-*",
-    "compilationOptions": {
-        "warningsAsErrors": true
-    },
-    "dependencies": {
-        "Microsoft.AspNet.Localization": "1.0.0-*",
-        "Microsoft.AspNet.Mvc.Razor": "6.0.0-*",
-        "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
-        "Microsoft.Extensions.Localization": "1.0.0-*",
-        "Microsoft.Extensions.PropertyHelper.Sources": {
-            "version": "1.0.0-*",
-            "type": "build"
-        }
-    },
-    "frameworks": {
-        "dnx451": { },
-        "dnxcore50": { }
-    },
-    "exclude": [
-        "wwwroot",
-        "node_modules",
-        "bower_components"
-    ],
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/aspnet/mvc"
+  "description": "Features that enable globalization & localization of MVC applications.",
+  "version": "6.0.0-*",
+  "compilationOptions": {
+    "warningsAsErrors": true
+  },
+  "dependencies": {
+    "Microsoft.AspNet.Localization": "1.0.0-*",
+    "Microsoft.AspNet.Mvc.Razor": "6.0.0-*",
+    "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
+    "Microsoft.Extensions.Localization": "1.0.0-*",
+    "Microsoft.Extensions.PropertyHelper.Sources": {
+      "version": "1.0.0-*",
+      "type": "build"
     }
-}
+  },
+  "frameworks": {
+    "net451": {},
+    "dotnet5.4": {}
+  },
+  "exclude": [
+    "wwwroot",
+    "node_modules",
+    "bower_components"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/aspnet/mvc"
+  }
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs
index 5d7de1693f..bcfe7cd680 100644
--- a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-#if NET45
+#if NET451
 using Microsoft.AspNet.FileProviders;
 #endif
 using Microsoft.AspNet.Mvc.Razor.Directives;
@@ -124,7 +124,7 @@ namespace Microsoft.AspNet.Mvc.Razor
             }
         }
 
-#if NET45
+#if NET451
         /// <summary>
         /// Initializes a new instance of <see cref="MvcRazorHost"/> with the specified  <paramref name="root"/>.
         /// </summary>
diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/project.json b/src/Microsoft.AspNet.Mvc.Razor.Host/project.json
index 55f6ee70ad..809681a177 100644
--- a/src/Microsoft.AspNet.Mvc.Razor.Host/project.json
+++ b/src/Microsoft.AspNet.Mvc.Razor.Host/project.json
@@ -12,16 +12,18 @@
     "Microsoft.AspNet.FileProviders.Physical": "1.0.0-*",
     "Microsoft.AspNet.Razor.Runtime": "4.0.0-*",
     "Microsoft.Extensions.Caching.Memory": "1.0.0-*",
-    "Microsoft.Extensions.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" }
+    "Microsoft.Extensions.PropertyHelper.Sources": {
+      "version": "1.0.0-*",
+      "type": "build"
+    }
   },
   "frameworks": {
-    "net45": { },
-    "dnx451": {
+    "net451": {
       "dependencies": {
         "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*"
       }
     },
-    "dnxcore50": {
+    "dotnet5.4": {
       "dependencies": {
         "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*",
         "System.Collections.Concurrent": "4.0.11-beta-*",
@@ -36,4 +38,4 @@
     "node_modules",
     "bower_components"
   ]
-}
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc.Razor/LanguageViewLocationExpander.cs b/src/Microsoft.AspNet.Mvc.Razor/LanguageViewLocationExpander.cs
index 286d7fc7bd..2957d0f48a 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/LanguageViewLocationExpander.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/LanguageViewLocationExpander.cs
@@ -51,7 +51,7 @@ namespace Microsoft.AspNet.Mvc.Razor
             }
 
             // Using CurrentUICulture so it loads the locale specific resources for the views.
-#if DNX451
+#if NET451
             context.Values[ValueKey] = Thread.CurrentThread.CurrentUICulture.Name;
 #else
             context.Values[ValueKey] = CultureInfo.CurrentUICulture.Name;
diff --git a/src/Microsoft.AspNet.Mvc.Razor/project.json b/src/Microsoft.AspNet.Mvc.Razor/project.json
index 2e01f5e1f7..a070fd055f 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/project.json
+++ b/src/Microsoft.AspNet.Mvc.Razor/project.json
@@ -11,16 +11,25 @@
   "dependencies": {
     "Microsoft.AspNet.Mvc.Razor.Host": "6.0.0-*",
     "Microsoft.AspNet.Mvc.ViewFeatures": "6.0.0-*",
-    "Microsoft.AspNet.Razor.Runtime.Precompilation":  "4.0.0-*",
+    "Microsoft.AspNet.Razor.Runtime.Precompilation": "4.0.0-*",
     "Microsoft.AspNet.PageExecutionInstrumentation.Interfaces": "1.0.0-*",
-    "Microsoft.Extensions.HashCodeCombiner.Sources": { "version": "1.0.0-*", "type": "build" },
-    "Microsoft.Extensions.PropertyActivator.Sources": { "version": "1.0.0-*", "type": "build" },
-    "Microsoft.Extensions.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" },
+    "Microsoft.Extensions.HashCodeCombiner.Sources": {
+      "version": "1.0.0-*",
+      "type": "build"
+    },
+    "Microsoft.Extensions.PropertyActivator.Sources": {
+      "version": "1.0.0-*",
+      "type": "build"
+    },
+    "Microsoft.Extensions.PropertyHelper.Sources": {
+      "version": "1.0.0-*",
+      "type": "build"
+    },
     "Microsoft.Dnx.Compilation.CSharp.Common": "1.0.0-*",
     "Microsoft.Dnx.Compilation.CSharp.Abstractions": "1.0.0-*"
   },
   "frameworks": {
-    "dnx451": {
+    "net451": {
       "frameworkAssemblies": {
         "System.Collections": "",
         "System.IO": "",
@@ -29,7 +38,7 @@
         "System.Threading.Tasks": ""
       }
     },
-    "dnxcore50": {
+    "dotnet5.4": {
       "dependencies": {
         "System.Text.Encoding": "4.0.11-*",
         "System.Threading.Tasks.Parallel": "4.0.1-beta-*"
@@ -41,4 +50,4 @@
     "node_modules",
     "bower_components"
   ]
-}
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/project.json b/src/Microsoft.AspNet.Mvc.TagHelpers/project.json
index 278f8c05c8..9c93bafee4 100644
--- a/src/Microsoft.AspNet.Mvc.TagHelpers/project.json
+++ b/src/Microsoft.AspNet.Mvc.TagHelpers/project.json
@@ -12,12 +12,18 @@
     "Microsoft.AspNet.Mvc.Razor": "6.0.0-*",
     "Microsoft.Extensions.Caching.Memory": "1.0.0-*",
     "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-*",
-    "Microsoft.Extensions.Logging.Abstractions": { "version": "1.0.0-*", "type": "build" },
-    "Microsoft.Extensions.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" }
+    "Microsoft.Extensions.Logging.Abstractions": {
+      "version": "1.0.0-*",
+      "type": "build"
+    },
+    "Microsoft.Extensions.PropertyHelper.Sources": {
+      "version": "1.0.0-*",
+      "type": "build"
+    }
   },
   "frameworks": {
-    "dnx451": { },
-    "dnxcore50": {
+    "net451": {},
+    "dotnet5.4": {
       "dependencies": {
         "System.Security.Cryptography.Algorithms": "4.0.0-beta-*"
       }
@@ -28,4 +34,4 @@
     "node_modules",
     "bower_components"
   ]
-}
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentMethodSelector.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentMethodSelector.cs
index 5a63795900..c6ef5c730b 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentMethodSelector.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentMethodSelector.cs
@@ -80,7 +80,7 @@ namespace Microsoft.AspNet.Mvc.ViewComponents
                 }
             }
 
-#if DNX451
+#if NET451
             return componentType.AsType().GetMethod(
                 methodName,
                 BindingFlags.Public | BindingFlags.Instance,
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs
index b2059cee17..05f0ac92b3 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
-#if DNXCORE50
+#if DOTNET5_4
 using System.Reflection;
 #endif
 using Microsoft.AspNet.Mvc.ModelBinding;
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/project.json b/src/Microsoft.AspNet.Mvc.ViewFeatures/project.json
index 869becbac5..244b6983d7 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/project.json
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/project.json
@@ -1,29 +1,43 @@
 {
-    "description": "View Rendering features for the MVC runtime",
-    "version": "6.0.0-*",
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/aspnet/mvc"
+  "description": "View Rendering features for the MVC runtime",
+  "version": "6.0.0-*",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/aspnet/mvc"
+  },
+  "compilationOptions": {
+    "warningsAsErrors": true
+  },
+  "dependencies": {
+    "Microsoft.AspNet.Antiforgery": "1.0.0-*",
+    "Microsoft.AspNet.Diagnostics.Abstractions": "1.0.0-*",
+    "Microsoft.AspNet.Html.Abstractions": "1.0.0-*",
+    "Microsoft.AspNet.Mvc.Core": "6.0.0-*",
+    "Microsoft.AspNet.Mvc.DataAnnotations": "6.0.0-*",
+    "Microsoft.AspNet.Mvc.Formatters.Json": "6.0.0-*",
+    "Microsoft.Extensions.BufferedHtmlContent.Sources": {
+      "version": "1.0.0-*",
+      "type": "build"
     },
-    "compilationOptions": {
-        "warningsAsErrors": true
+    "Microsoft.Extensions.ClosedGenericMatcher.Sources": {
+      "version": "1.0.0-*",
+      "type": "build"
     },
-    "dependencies": {
-        "Microsoft.AspNet.Antiforgery": "1.0.0-*",
-        "Microsoft.AspNet.Diagnostics.Abstractions": "1.0.0-*",
-        "Microsoft.AspNet.Html.Abstractions": "1.0.0-*",
-        "Microsoft.AspNet.Mvc.Core": "6.0.0-*",
-        "Microsoft.AspNet.Mvc.DataAnnotations": "6.0.0-*",
-        "Microsoft.AspNet.Mvc.Formatters.Json": "6.0.0-*",
-        "Microsoft.Extensions.BufferedHtmlContent.Sources": { "version": "1.0.0-*", "type": "build" },
-        "Microsoft.Extensions.ClosedGenericMatcher.Sources": { "version": "1.0.0-*", "type": "build" },
-        "Microsoft.Extensions.CopyOnWriteDictionary.Sources": { "version": "1.0.0-*", "type": "build" },
-        "Microsoft.Extensions.PropertyActivator.Sources": { "version": "1.0.0-*", "type": "build" },
-        "Microsoft.Extensions.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" }
+    "Microsoft.Extensions.CopyOnWriteDictionary.Sources": {
+      "version": "1.0.0-*",
+      "type": "build"
     },
-
-    "frameworks": {
-        "dnx451": { },
-        "dnxcore50": { }
+    "Microsoft.Extensions.PropertyActivator.Sources": {
+      "version": "1.0.0-*",
+      "type": "build"
+    },
+    "Microsoft.Extensions.PropertyHelper.Sources": {
+      "version": "1.0.0-*",
+      "type": "build"
     }
-}
+  },
+  "frameworks": {
+    "net451": {},
+    "dotnet5.4": {}
+  }
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/CollectionExtensions.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/CollectionExtensions.cs
index 5f95008cdf..89461b0c8c 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/CollectionExtensions.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/CollectionExtensions.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if DNXCORE50
+#if DOTNET5_4
 
 using System.Collections.ObjectModel;
 using System.Diagnostics;
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ContentNegotiationResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ContentNegotiationResult.cs
index c9bc1e8048..2c0a2a67a1 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ContentNegotiationResult.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ContentNegotiationResult.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if DNXCORE50
+#if DOTNET5_4
 
 using System.Collections.Generic;
 using System.Net.Http.Headers;
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/DefaultContentNegotiator.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/DefaultContentNegotiator.cs
index d0bac0e842..1883c03ee6 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/DefaultContentNegotiator.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/DefaultContentNegotiator.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if DNXCORE50
+#if DOTNET5_4
 
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/FormDataCollection.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/FormDataCollection.cs
index 4cc6d981dd..4fb97fa587 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/FormDataCollection.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/FormDataCollection.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if DNXCORE50
+#if DOTNET5_4
 
 using Microsoft.AspNet.WebUtilities;
 using System.Collections;
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/FormattingUtilities.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/FormattingUtilities.cs
index 6a782366c9..392210dd48 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/FormattingUtilities.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/FormattingUtilities.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if DNXCORE50
+#if DOTNET5_4
 
 using System.Collections.Generic;
 using System.Globalization;
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/IContentNegotiator.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/IContentNegotiator.cs
index d3321d232d..0438d4be56 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/IContentNegotiator.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/IContentNegotiator.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if DNXCORE50
+#if DOTNET5_4
 
 using System.Collections.Generic;
 using System.Net.Http.Headers;
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ListWrapperCollection.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ListWrapperCollection.cs
index bd3c9b7509..7b6b930378 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ListWrapperCollection.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ListWrapperCollection.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if DNXCORE50
+#if DOTNET5_4
 
 using System.Collections.Generic;
 
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeConstants.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeConstants.cs
index 8c810da1b1..10d7265dda 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeConstants.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeConstants.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if DNXCORE50
+#if DOTNET5_4
 
 using System.Net.Http.Headers;
 
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatch.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatch.cs
index f4dc9611ad..85ba927a63 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatch.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatch.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if DNXCORE50
+#if DOTNET5_4
 
 using System.Net.Http.Headers;
 
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatchRanking.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatchRanking.cs
index 9ac1e281a7..dbfea5e472 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatchRanking.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatchRanking.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if DNXCORE50
+#if DOTNET5_4
 
 namespace System.Net.Http.Formatting
 {
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeHeaderValueExtensions.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeHeaderValueExtensions.cs
index 2137e5d63f..b9fe1fe4e8 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeHeaderValueExtensions.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeHeaderValueExtensions.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if DNXCORE50
+#if DOTNET5_4
 
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeWithQualityHeaderComparer.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeWithQualityHeaderComparer.cs
index a62757f530..6ea60c0b14 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeWithQualityHeaderComparer.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeWithQualityHeaderComparer.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if DNXCORE50
+#if DOTNET5_4
 
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ParsedMediaTypeHeaderValue.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ParsedMediaTypeHeaderValue.cs
index 8dc7d98774..98debec8d5 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ParsedMediaTypeHeaderValue.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ParsedMediaTypeHeaderValue.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if DNXCORE50
+#if DOTNET5_4
 
 using System.Diagnostics;
 using System.Net.Http.Headers;
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/StringWithQualityHeaderValueComparer.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/StringWithQualityHeaderValueComparer.cs
index fa2b549ecc..9a3efa8bbc 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/StringWithQualityHeaderValueComparer.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/StringWithQualityHeaderValueComparer.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if DNXCORE50
+#if DOTNET5_4
 
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs
index bf2bdc6bec..69a421c8d7 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs
@@ -19,7 +19,7 @@ namespace System.Net.Http
     /// </summary>
     public static class HttpRequestMessageExtensions
     {
-#if !DNXCORE50
+#if !DOTNET5_4
 
         /// <summary>
         /// Helper method for creating an <see cref="HttpResponseMessage"/> message with a "416 (Requested Range Not
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/project.json b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/project.json
index b0f07a07c2..6c5a0c370b 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/project.json
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/project.json
@@ -18,20 +18,20 @@
       "type": "build"
     }
   },
-    "frameworks": {
-        "dnx451": {
-            "frameworkAssemblies": {
-                "System.Net.Http": "",
-                "System.Xml": "",
-                "System.Runtime.Serialization": ""
-            }
-        },
-        "dnxcore50": {
-            "dependencies": {
-                "System.Net.Http": "4.0.1-beta-*",
-                "System.Xml.XmlSerializer": "4.0.11-beta-*",
-                "System.Runtime.Serialization.Xml": "4.0.11-beta-*"
-            }
-        }
+  "frameworks": {
+    "net451": {
+      "frameworkAssemblies": {
+        "System.Net.Http": "",
+        "System.Xml": "",
+        "System.Runtime.Serialization": ""
+      }
+    },
+    "dotnet5.4": {
+      "dependencies": {
+        "System.Net.Http": "4.0.1-beta-*",
+        "System.Xml.XmlSerializer": "4.0.11-beta-*",
+        "System.Runtime.Serialization.Xml": "4.0.11-beta-*"
+      }
     }
-}
+  }
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc/project.json b/src/Microsoft.AspNet.Mvc/project.json
index e1a5b51503..2e5437acc1 100644
--- a/src/Microsoft.AspNet.Mvc/project.json
+++ b/src/Microsoft.AspNet.Mvc/project.json
@@ -1,27 +1,30 @@
 {
-    "description": "ASP.NET MVC is a web framework that gives you a powerful, patterns-based way to build dynamic websites and Web APIs. ASP.NET MVC enables a clean separation of concerns and gives you full control over markup.",
-    "version": "6.0.0-*",
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/aspnet/mvc"
-    },
-    "compilationOptions": {
-        "warningsAsErrors": true
-    },
-    "dependencies": {
-        "Microsoft.AspNet.Mvc.ApiExplorer": "6.0.0-*",
-        "Microsoft.AspNet.Mvc.Cors": "6.0.0-*",
-        "Microsoft.AspNet.Mvc.DataAnnotations": "6.0.0-*",
-        "Microsoft.AspNet.Mvc.Formatters.Json": "6.0.0-*",
-        "Microsoft.AspNet.Mvc.Localization": "6.0.0-*",
-        "Microsoft.AspNet.Mvc.Razor": "6.0.0-*",
-        "Microsoft.AspNet.Mvc.ViewFeatures": "6.0.0-*",
-        "Microsoft.Extensions.Caching.Memory": "1.0.0-*",
-        "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
-        "Microsoft.Extensions.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" }
-    },
-    "frameworks": {
-        "dnx451": {},
-        "dnxcore50": {}
+  "description": "ASP.NET MVC is a web framework that gives you a powerful, patterns-based way to build dynamic websites and Web APIs. ASP.NET MVC enables a clean separation of concerns and gives you full control over markup.",
+  "version": "6.0.0-*",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/aspnet/mvc"
+  },
+  "compilationOptions": {
+    "warningsAsErrors": true
+  },
+  "dependencies": {
+    "Microsoft.AspNet.Mvc.ApiExplorer": "6.0.0-*",
+    "Microsoft.AspNet.Mvc.Cors": "6.0.0-*",
+    "Microsoft.AspNet.Mvc.DataAnnotations": "6.0.0-*",
+    "Microsoft.AspNet.Mvc.Formatters.Json": "6.0.0-*",
+    "Microsoft.AspNet.Mvc.Localization": "6.0.0-*",
+    "Microsoft.AspNet.Mvc.Razor": "6.0.0-*",
+    "Microsoft.AspNet.Mvc.ViewFeatures": "6.0.0-*",
+    "Microsoft.Extensions.Caching.Memory": "1.0.0-*",
+    "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
+    "Microsoft.Extensions.PropertyHelper.Sources": {
+      "version": "1.0.0-*",
+      "type": "build"
     }
-}
+  },
+  "frameworks": {
+    "net451": {},
+    "dotnet5.4": {}
+  }
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/project.json b/src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/project.json
index ea7a04b6fb..b30a3173fd 100644
--- a/src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/project.json
+++ b/src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/project.json
@@ -1,20 +1,20 @@
 {
-    "description": "Abstractions for page instrumentation.",
-    "version": "1.0.0-*",
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/aspnet/mvc"
-    },
-    "compilationOptions": {
-        "warningsAsErrors": true
-    },
-    "frameworks": {
-        "dnx451": { },
-        "dnxcore50": {
-            "dependencies": {
-                "System.IO": "4.0.11-beta-*",
-                "System.Resources.ResourceManager": "4.0.1-beta-*"
-            }
-        }
+  "description": "Abstractions for page instrumentation.",
+  "version": "1.0.0-*",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/aspnet/mvc"
+  },
+  "compilationOptions": {
+    "warningsAsErrors": true
+  },
+  "frameworks": {
+    "net451": {},
+    "dotnet5.4": {
+      "dependencies": {
+        "System.IO": "4.0.11-beta-*",
+        "System.Resources.ResourceManager": "4.0.1-beta-*"
+      }
     }
-}
+  }
+}
\ No newline at end of file