diff --git a/src/Microsoft.DotNet.Cli.Utils/ScriptExecutor.cs b/src/Microsoft.DotNet.Cli.Utils/ScriptExecutor.cs
index 1d61288a3..3f24abe42 100644
--- a/src/Microsoft.DotNet.Cli.Utils/ScriptExecutor.cs
+++ b/src/Microsoft.DotNet.Cli.Utils/ScriptExecutor.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using Microsoft.DotNet.Cli.Utils.CommandParsing;
-using Microsoft.Extensions.ProjectModel;
+using Microsoft.DotNet.ProjectModel;
 
 namespace Microsoft.DotNet.Cli.Utils
 {
diff --git a/src/Microsoft.DotNet.Compiler.Common/CommonCompilerOptionsExtensions.cs b/src/Microsoft.DotNet.Compiler.Common/CommonCompilerOptionsExtensions.cs
index dc887fbd1..160e966ed 100644
--- a/src/Microsoft.DotNet.Compiler.Common/CommonCompilerOptionsExtensions.cs
+++ b/src/Microsoft.DotNet.Compiler.Common/CommonCompilerOptionsExtensions.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.CommandLine;
 using System.Linq;
 
-using Microsoft.Extensions.ProjectModel;
+using Microsoft.DotNet.ProjectModel;
 
 namespace Microsoft.DotNet.Cli.Compiler.Common
 {
diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/ProjectJsonWorkspace.cs b/src/Microsoft.DotNet.ProjectModel.Workspaces/ProjectJsonWorkspace.cs
index 84464b702..b52958fc8 100644
--- a/src/Microsoft.DotNet.ProjectModel.Workspaces/ProjectJsonWorkspace.cs
+++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/ProjectJsonWorkspace.cs
@@ -12,7 +12,7 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Text;
-using Microsoft.Extensions.ProjectModel;
+using Microsoft.DotNet.ProjectModel;
 using NuGet.Frameworks;
 
 namespace Microsoft.DotNet.ProjectModel.Workspaces
diff --git a/src/Microsoft.DotNet.ProjectModel/CommonCompilerOptions.cs b/src/Microsoft.DotNet.ProjectModel/CommonCompilerOptions.cs
index 68d03721d..ef97c3b4d 100644
--- a/src/Microsoft.DotNet.ProjectModel/CommonCompilerOptions.cs
+++ b/src/Microsoft.DotNet.ProjectModel/CommonCompilerOptions.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.DotNet.ProjectModel
 {
     public class CommonCompilerOptions
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryAsset.cs b/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryAsset.cs
index 999884195..69c203e84 100644
--- a/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryAsset.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryAsset.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.Extensions.ProjectModel.Compilation
+namespace Microsoft.DotNet.ProjectModel.Compilation
 {
     public struct LibraryAsset
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExport.cs b/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExport.cs
index 427a0f1da..e5f866f75 100644
--- a/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExport.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExport.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 
-namespace Microsoft.Extensions.ProjectModel.Compilation
+namespace Microsoft.DotNet.ProjectModel.Compilation
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public class LibraryExport
diff --git a/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs b/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs
index ed673a021..a63a0885c 100644
--- a/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs
@@ -6,12 +6,12 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using Microsoft.Extensions.ProjectModel.Graph;
-using Microsoft.Extensions.ProjectModel.Resolution;
-using Microsoft.Extensions.ProjectModel.Utilities;
+using Microsoft.DotNet.ProjectModel.Graph;
+using Microsoft.DotNet.ProjectModel.Resolution;
+using Microsoft.DotNet.ProjectModel.Utilities;
 using NuGet.Frameworks;
 
-namespace Microsoft.Extensions.ProjectModel.Compilation
+namespace Microsoft.DotNet.ProjectModel.Compilation
 {
     public class LibraryExporter
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/DiagnosticMessage.cs b/src/Microsoft.DotNet.ProjectModel/DiagnosticMessage.cs
index 2e8271da7..8604590fc 100644
--- a/src/Microsoft.DotNet.ProjectModel/DiagnosticMessage.cs
+++ b/src/Microsoft.DotNet.ProjectModel/DiagnosticMessage.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.DotNet.ProjectModel
 {
     /// <summary>
     /// Represents a single diagnostic message, such as a compilation error or a project.json parsing error.
diff --git a/src/Microsoft.DotNet.ProjectModel/DiagnosticMessageSeverity.cs b/src/Microsoft.DotNet.ProjectModel/DiagnosticMessageSeverity.cs
index 85553727a..36a0c6fb8 100644
--- a/src/Microsoft.DotNet.ProjectModel/DiagnosticMessageSeverity.cs
+++ b/src/Microsoft.DotNet.ProjectModel/DiagnosticMessageSeverity.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.DotNet.ProjectModel
 {
     /// <summary>
     /// Specifies the severity of a <see cref="DiagnosticMessage"/>.
diff --git a/src/Microsoft.DotNet.ProjectModel/EnvironmentNames.cs b/src/Microsoft.DotNet.ProjectModel/EnvironmentNames.cs
index 638004541..695eee323 100644
--- a/src/Microsoft.DotNet.ProjectModel/EnvironmentNames.cs
+++ b/src/Microsoft.DotNet.ProjectModel/EnvironmentNames.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.DotNet.ProjectModel
 {
     public class EnvironmentNames
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/ErrorCodes.DotNet.cs b/src/Microsoft.DotNet.ProjectModel/ErrorCodes.DotNet.cs
index 836cc87c1..566c4e2b8 100644
--- a/src/Microsoft.DotNet.ProjectModel/ErrorCodes.DotNet.cs
+++ b/src/Microsoft.DotNet.ProjectModel/ErrorCodes.DotNet.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.DotNet.ProjectModel
 {
     public static partial class ErrorCodes
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/ErrorCodes.NuGet.cs b/src/Microsoft.DotNet.ProjectModel/ErrorCodes.NuGet.cs
index e1b190092..0c3b0ca71 100644
--- a/src/Microsoft.DotNet.ProjectModel/ErrorCodes.NuGet.cs
+++ b/src/Microsoft.DotNet.ProjectModel/ErrorCodes.NuGet.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.DotNet.ProjectModel
 {
     public static partial class ErrorCodes
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/FileFormatException.cs b/src/Microsoft.DotNet.ProjectModel/FileFormatException.cs
index 752aac87d..4d723677a 100644
--- a/src/Microsoft.DotNet.ProjectModel/FileFormatException.cs
+++ b/src/Microsoft.DotNet.ProjectModel/FileFormatException.cs
@@ -4,7 +4,7 @@
 using System;
 using Microsoft.Extensions.JsonParser.Sources;
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.DotNet.ProjectModel
 {
     public sealed class FileFormatException : Exception
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Files/NamedResourceReader.cs b/src/Microsoft.DotNet.ProjectModel/Files/NamedResourceReader.cs
index 4244e5f23..dcd87c7eb 100644
--- a/src/Microsoft.DotNet.ProjectModel/Files/NamedResourceReader.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Files/NamedResourceReader.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.IO;
 using Microsoft.Extensions.JsonParser.Sources;
 
-namespace Microsoft.Extensions.ProjectModel.Files
+namespace Microsoft.DotNet.ProjectModel.Files
 {
     internal static class NamedResourceReader
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Files/PackIncludeEntry.cs b/src/Microsoft.DotNet.ProjectModel/Files/PackIncludeEntry.cs
index c70c05b71..49445b86a 100644
--- a/src/Microsoft.DotNet.ProjectModel/Files/PackIncludeEntry.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Files/PackIncludeEntry.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using Microsoft.Extensions.JsonParser.Sources;
 
-namespace Microsoft.Extensions.ProjectModel.Files
+namespace Microsoft.DotNet.ProjectModel.Files
 {
     public class PackIncludeEntry
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Files/PatternGroup.cs b/src/Microsoft.DotNet.ProjectModel/Files/PatternGroup.cs
index 1704e10d8..7091a8f02 100644
--- a/src/Microsoft.DotNet.ProjectModel/Files/PatternGroup.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Files/PatternGroup.cs
@@ -8,7 +8,7 @@ using System.Linq;
 using Microsoft.Extensions.FileSystemGlobbing;
 using Microsoft.Extensions.JsonParser.Sources;
 
-namespace Microsoft.Extensions.ProjectModel.Files
+namespace Microsoft.DotNet.ProjectModel.Files
 {
     public class PatternGroup
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Files/PatternsCollectionHelper.cs b/src/Microsoft.DotNet.ProjectModel/Files/PatternsCollectionHelper.cs
index 20040c5e1..96e3037b3 100644
--- a/src/Microsoft.DotNet.ProjectModel/Files/PatternsCollectionHelper.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Files/PatternsCollectionHelper.cs
@@ -7,7 +7,7 @@ using System.IO;
 using System.Linq;
 using Microsoft.Extensions.JsonParser.Sources;
 
-namespace Microsoft.Extensions.ProjectModel.Files
+namespace Microsoft.DotNet.ProjectModel.Files
 {
     internal static class PatternsCollectionHelper
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Files/ProjectFilesCollection.cs b/src/Microsoft.DotNet.ProjectModel/Files/ProjectFilesCollection.cs
index 1f5998139..941a44ca8 100644
--- a/src/Microsoft.DotNet.ProjectModel/Files/ProjectFilesCollection.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Files/ProjectFilesCollection.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Threading;
 using Microsoft.Extensions.JsonParser.Sources;
 
-namespace Microsoft.Extensions.ProjectModel.Files
+namespace Microsoft.DotNet.ProjectModel.Files
 {
     public class ProjectFilesCollection
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/GlobalSettings.cs b/src/Microsoft.DotNet.ProjectModel/GlobalSettings.cs
index 7026a7173..2357cf96c 100644
--- a/src/Microsoft.DotNet.ProjectModel/GlobalSettings.cs
+++ b/src/Microsoft.DotNet.ProjectModel/GlobalSettings.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using Microsoft.Extensions.JsonParser.Sources;
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.DotNet.ProjectModel
 {
     public class GlobalSettings
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Graph/LibraryDependencyType.cs b/src/Microsoft.DotNet.ProjectModel/Graph/LibraryDependencyType.cs
index f3799b8a3..d21019dc1 100644
--- a/src/Microsoft.DotNet.ProjectModel/Graph/LibraryDependencyType.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Graph/LibraryDependencyType.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Extensions.ProjectModel.Graph
+namespace Microsoft.DotNet.ProjectModel.Graph
 {
     public struct LibraryDependencyType
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Graph/LibraryDependencyTypeFlag.cs b/src/Microsoft.DotNet.ProjectModel/Graph/LibraryDependencyTypeFlag.cs
index 918109056..15aaa95cd 100644
--- a/src/Microsoft.DotNet.ProjectModel/Graph/LibraryDependencyTypeFlag.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Graph/LibraryDependencyTypeFlag.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Extensions.ProjectModel.Graph
+namespace Microsoft.DotNet.ProjectModel.Graph
 {
     [Flags]
     public enum LibraryDependencyTypeFlag
diff --git a/src/Microsoft.DotNet.ProjectModel/Graph/LibraryIdentity.cs b/src/Microsoft.DotNet.ProjectModel/Graph/LibraryIdentity.cs
index 2e12c8b3b..272e0245a 100644
--- a/src/Microsoft.DotNet.ProjectModel/Graph/LibraryIdentity.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Graph/LibraryIdentity.cs
@@ -6,7 +6,7 @@ using Microsoft.Extensions.Internal;
 using NuGet;
 using NuGet.Versioning;
 
-namespace Microsoft.Extensions.ProjectModel.Graph
+namespace Microsoft.DotNet.ProjectModel.Graph
 {
     public struct LibraryIdentity : IEquatable<LibraryIdentity>
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Graph/LibraryRange.cs b/src/Microsoft.DotNet.ProjectModel/Graph/LibraryRange.cs
index 068f4fd62..3e15c5a18 100644
--- a/src/Microsoft.DotNet.ProjectModel/Graph/LibraryRange.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Graph/LibraryRange.cs
@@ -6,7 +6,7 @@ using System.Text;
 using Microsoft.Extensions.Internal;
 using NuGet.Versioning;
 
-namespace Microsoft.Extensions.ProjectModel.Graph
+namespace Microsoft.DotNet.ProjectModel.Graph
 {
     public struct LibraryRange : IEquatable<LibraryRange>
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Graph/LibraryType.cs b/src/Microsoft.DotNet.ProjectModel/Graph/LibraryType.cs
index 3f5c7f4e6..f3cbcca70 100644
--- a/src/Microsoft.DotNet.ProjectModel/Graph/LibraryType.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Graph/LibraryType.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.Extensions.ProjectModel.Graph
+namespace Microsoft.DotNet.ProjectModel.Graph
 {
     public struct LibraryType : IEquatable<LibraryType>
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Graph/LockFile.cs b/src/Microsoft.DotNet.ProjectModel/Graph/LockFile.cs
index becea8d54..2761f9266 100644
--- a/src/Microsoft.DotNet.ProjectModel/Graph/LockFile.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Graph/LockFile.cs
@@ -5,10 +5,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Microsoft.Extensions.ProjectModel.Utilities;
+using Microsoft.DotNet.ProjectModel.Utilities;
 using NuGet.Versioning;
 
-namespace Microsoft.Extensions.ProjectModel.Graph
+namespace Microsoft.DotNet.ProjectModel.Graph
 {
     public class LockFile
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Graph/LockFileItem.cs b/src/Microsoft.DotNet.ProjectModel/Graph/LockFileItem.cs
index 66a3ac700..c147dfe21 100644
--- a/src/Microsoft.DotNet.ProjectModel/Graph/LockFileItem.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Graph/LockFileItem.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.Extensions.ProjectModel.Graph
+namespace Microsoft.DotNet.ProjectModel.Graph
 {
     public class LockFileItem
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Graph/LockFileLookup.cs b/src/Microsoft.DotNet.ProjectModel/Graph/LockFileLookup.cs
index 96ecd45bf..f76af2fa3 100644
--- a/src/Microsoft.DotNet.ProjectModel/Graph/LockFileLookup.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Graph/LockFileLookup.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using NuGet.Versioning;
 
-namespace Microsoft.Extensions.ProjectModel.Graph
+namespace Microsoft.DotNet.ProjectModel.Graph
 {
     public class LockFileLookup
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Graph/LockFilePackageLibrary.cs b/src/Microsoft.DotNet.ProjectModel/Graph/LockFilePackageLibrary.cs
index f72a6c767..f8c2d2986 100644
--- a/src/Microsoft.DotNet.ProjectModel/Graph/LockFilePackageLibrary.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Graph/LockFilePackageLibrary.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using NuGet.Versioning;
 
-namespace Microsoft.Extensions.ProjectModel.Graph
+namespace Microsoft.DotNet.ProjectModel.Graph
 {
     public class LockFilePackageLibrary
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Graph/LockFileProjectLibrary.cs b/src/Microsoft.DotNet.ProjectModel/Graph/LockFileProjectLibrary.cs
index 2a1ba6617..7a1b9d632 100644
--- a/src/Microsoft.DotNet.ProjectModel/Graph/LockFileProjectLibrary.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Graph/LockFileProjectLibrary.cs
@@ -3,7 +3,7 @@
 
 using NuGet.Versioning;
 
-namespace Microsoft.Extensions.ProjectModel.Graph
+namespace Microsoft.DotNet.ProjectModel.Graph
 {
     public class LockFileProjectLibrary
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Graph/LockFileReader.cs b/src/Microsoft.DotNet.ProjectModel/Graph/LockFileReader.cs
index 11e82a012..1d76a320a 100644
--- a/src/Microsoft.DotNet.ProjectModel/Graph/LockFileReader.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Graph/LockFileReader.cs
@@ -5,13 +5,13 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Microsoft.DotNet.ProjectModel.Utilities;
 using Microsoft.Extensions.JsonParser.Sources;
-using Microsoft.Extensions.ProjectModel.Utilities;
 using NuGet.Frameworks;
 using NuGet.Packaging.Core;
 using NuGet.Versioning;
 
-namespace Microsoft.Extensions.ProjectModel.Graph
+namespace Microsoft.DotNet.ProjectModel.Graph
 {
     internal static class LockFileReader
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Graph/LockFileTarget.cs b/src/Microsoft.DotNet.ProjectModel/Graph/LockFileTarget.cs
index f2a0f81c6..ad061559a 100644
--- a/src/Microsoft.DotNet.ProjectModel/Graph/LockFileTarget.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Graph/LockFileTarget.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using NuGet.Frameworks;
 
-namespace Microsoft.Extensions.ProjectModel.Graph
+namespace Microsoft.DotNet.ProjectModel.Graph
 {
     public class LockFileTarget
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Graph/LockFileTargetLibrary.cs b/src/Microsoft.DotNet.ProjectModel/Graph/LockFileTargetLibrary.cs
index dfdcb6156..7339fed39 100644
--- a/src/Microsoft.DotNet.ProjectModel/Graph/LockFileTargetLibrary.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Graph/LockFileTargetLibrary.cs
@@ -7,7 +7,7 @@ using NuGet.Frameworks;
 using NuGet.Packaging.Core;
 using NuGet.Versioning;
 
-namespace Microsoft.Extensions.ProjectModel.Graph
+namespace Microsoft.DotNet.ProjectModel.Graph
 {
     public class LockFileTargetLibrary
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/LibraryDescription.cs b/src/Microsoft.DotNet.ProjectModel/LibraryDescription.cs
index 1f5b982ec..171cf38eb 100644
--- a/src/Microsoft.DotNet.ProjectModel/LibraryDescription.cs
+++ b/src/Microsoft.DotNet.ProjectModel/LibraryDescription.cs
@@ -4,11 +4,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.DotNet.ProjectModel.Graph;
 using Microsoft.Extensions.Internal;
-using Microsoft.Extensions.ProjectModel.Graph;
 using NuGet.Frameworks;
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.DotNet.ProjectModel
 {
     /// <summary>
     /// Represents the result of resolving the library
diff --git a/src/Microsoft.DotNet.ProjectModel/PackageDescription.cs b/src/Microsoft.DotNet.ProjectModel/PackageDescription.cs
index 4649e8e4a..9fcd6f7f2 100644
--- a/src/Microsoft.DotNet.ProjectModel/PackageDescription.cs
+++ b/src/Microsoft.DotNet.ProjectModel/PackageDescription.cs
@@ -2,9 +2,9 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using Microsoft.Extensions.ProjectModel.Graph;
+using Microsoft.DotNet.ProjectModel.Graph;
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.DotNet.ProjectModel
 {
     public class PackageDescription : LibraryDescription
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Project.cs b/src/Microsoft.DotNet.ProjectModel/Project.cs
index 0af81dc9a..635aed22b 100644
--- a/src/Microsoft.DotNet.ProjectModel/Project.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Project.cs
@@ -4,12 +4,12 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Microsoft.Extensions.ProjectModel.Files;
-using Microsoft.Extensions.ProjectModel.Graph;
+using Microsoft.DotNet.ProjectModel.Files;
+using Microsoft.DotNet.ProjectModel.Graph;
 using NuGet.Frameworks;
 using NuGet.Versioning;
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.DotNet.ProjectModel
 {
     public class Project
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/ProjectContext.cs b/src/Microsoft.DotNet.ProjectModel/ProjectContext.cs
index 96aa4b252..83993dd48 100644
--- a/src/Microsoft.DotNet.ProjectModel/ProjectContext.cs
+++ b/src/Microsoft.DotNet.ProjectModel/ProjectContext.cs
@@ -5,11 +5,11 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Microsoft.Extensions.ProjectModel.Compilation;
-using Microsoft.Extensions.ProjectModel.Resolution;
+using Microsoft.DotNet.ProjectModel.Compilation;
+using Microsoft.DotNet.ProjectModel.Resolution;
 using NuGet.Frameworks;
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.DotNet.ProjectModel
 {
     // NOTE(anurse): Copied from ApplicationHostContext in DNX. This name seemed more appropriate for this :)
     public class ProjectContext
diff --git a/src/Microsoft.DotNet.ProjectModel/ProjectContextBuilder.cs b/src/Microsoft.DotNet.ProjectModel/ProjectContextBuilder.cs
index ca1091704..873eb1237 100644
--- a/src/Microsoft.DotNet.ProjectModel/ProjectContextBuilder.cs
+++ b/src/Microsoft.DotNet.ProjectModel/ProjectContextBuilder.cs
@@ -6,12 +6,12 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
+using Microsoft.DotNet.ProjectModel.Graph;
+using Microsoft.DotNet.ProjectModel.Resolution;
 using Microsoft.Extensions.Internal;
-using Microsoft.Extensions.ProjectModel.Graph;
-using Microsoft.Extensions.ProjectModel.Resolution;
 using NuGet.Frameworks;
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.DotNet.ProjectModel
 {
     public class ProjectContextBuilder
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/ProjectDescription.cs b/src/Microsoft.DotNet.ProjectModel/ProjectDescription.cs
index db3925885..2b19f7843 100644
--- a/src/Microsoft.DotNet.ProjectModel/ProjectDescription.cs
+++ b/src/Microsoft.DotNet.ProjectModel/ProjectDescription.cs
@@ -3,9 +3,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Extensions.ProjectModel.Graph;
+using Microsoft.DotNet.ProjectModel.Graph;
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.DotNet.ProjectModel
 {
     public class ProjectDescription : LibraryDescription
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/ProjectFileDependencyGroup.cs b/src/Microsoft.DotNet.ProjectModel/ProjectFileDependencyGroup.cs
index 25ce7c87a..6bf8d5d8a 100644
--- a/src/Microsoft.DotNet.ProjectModel/ProjectFileDependencyGroup.cs
+++ b/src/Microsoft.DotNet.ProjectModel/ProjectFileDependencyGroup.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using NuGet.Frameworks;
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.DotNet.ProjectModel
 {
     public class ProjectFileDependencyGroup
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/ProjectReader.cs b/src/Microsoft.DotNet.ProjectModel/ProjectReader.cs
index 800c853d9..92b877966 100644
--- a/src/Microsoft.DotNet.ProjectModel/ProjectReader.cs
+++ b/src/Microsoft.DotNet.ProjectModel/ProjectReader.cs
@@ -5,14 +5,14 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Microsoft.DotNet.ProjectModel.Files;
+using Microsoft.DotNet.ProjectModel.Graph;
+using Microsoft.DotNet.ProjectModel.Utilities;
 using Microsoft.Extensions.JsonParser.Sources;
-using Microsoft.Extensions.ProjectModel.Files;
-using Microsoft.Extensions.ProjectModel.Graph;
-using Microsoft.Extensions.ProjectModel.Utilities;
 using NuGet.Frameworks;
 using NuGet.Versioning;
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.DotNet.ProjectModel
 {
     public class ProjectReader
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/ProjectRootResolver.cs b/src/Microsoft.DotNet.ProjectModel/ProjectRootResolver.cs
index 438bf8025..536a4d01f 100644
--- a/src/Microsoft.DotNet.ProjectModel/ProjectRootResolver.cs
+++ b/src/Microsoft.DotNet.ProjectModel/ProjectRootResolver.cs
@@ -3,7 +3,7 @@
 
 using System.IO;
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.DotNet.ProjectModel
 {
     public static class ProjectRootResolver
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Resolution/FrameworkInformation.cs b/src/Microsoft.DotNet.ProjectModel/Resolution/FrameworkInformation.cs
index 645ee7ef3..3dcd22249 100644
--- a/src/Microsoft.DotNet.ProjectModel/Resolution/FrameworkInformation.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Resolution/FrameworkInformation.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace Microsoft.Extensions.ProjectModel.Resolution
+namespace Microsoft.DotNet.ProjectModel.Resolution
 {
     internal class FrameworkInformation
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Resolution/FrameworkReferenceResolver.cs b/src/Microsoft.DotNet.ProjectModel/Resolution/FrameworkReferenceResolver.cs
index 8c18f42cf..dc4a21ea4 100644
--- a/src/Microsoft.DotNet.ProjectModel/Resolution/FrameworkReferenceResolver.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Resolution/FrameworkReferenceResolver.cs
@@ -7,10 +7,10 @@ using System.IO;
 using System.Linq;
 using System.Runtime.Versioning;
 using System.Xml.Linq;
-using Microsoft.Extensions.ProjectModel.Utilities;
+using Microsoft.DotNet.ProjectModel.Utilities;
 using NuGet.Frameworks;
 
-namespace Microsoft.Extensions.ProjectModel.Resolution
+namespace Microsoft.DotNet.ProjectModel.Resolution
 {
     public class FrameworkReferenceResolver
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Resolution/LibraryManager.cs b/src/Microsoft.DotNet.ProjectModel/Resolution/LibraryManager.cs
index ade5b8ea0..1a776e52a 100644
--- a/src/Microsoft.DotNet.ProjectModel/Resolution/LibraryManager.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Resolution/LibraryManager.cs
@@ -3,11 +3,11 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Extensions.ProjectModel.Graph;
-using Microsoft.Extensions.ProjectModel.Utilities;
+using Microsoft.DotNet.ProjectModel.Graph;
+using Microsoft.DotNet.ProjectModel.Utilities;
 using NuGet.Versioning;
 
-namespace Microsoft.Extensions.ProjectModel.Resolution
+namespace Microsoft.DotNet.ProjectModel.Resolution
 {
     public class LibraryManager
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Resolution/PackageDependencyProvider.cs b/src/Microsoft.DotNet.ProjectModel/Resolution/PackageDependencyProvider.cs
index cc3fe3d22..ee8dc78be 100644
--- a/src/Microsoft.DotNet.ProjectModel/Resolution/PackageDependencyProvider.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Resolution/PackageDependencyProvider.cs
@@ -5,11 +5,11 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Microsoft.Extensions.ProjectModel.Graph;
+using Microsoft.DotNet.ProjectModel.Graph;
 using NuGet.Packaging;
 using NuGet.Versioning;
 
-namespace Microsoft.Extensions.ProjectModel.Resolution
+namespace Microsoft.DotNet.ProjectModel.Resolution
 {
     public class PackageDependencyProvider
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Resolution/ProjectDependencyProvider.cs b/src/Microsoft.DotNet.ProjectModel/Resolution/ProjectDependencyProvider.cs
index 7932db1bb..bed9cbd2d 100644
--- a/src/Microsoft.DotNet.ProjectModel/Resolution/ProjectDependencyProvider.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Resolution/ProjectDependencyProvider.cs
@@ -5,11 +5,11 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Versioning;
-using Microsoft.Extensions.ProjectModel.Graph;
+using Microsoft.DotNet.ProjectModel.Graph;
 using NuGet;
 using NuGet.Frameworks;
 
-namespace Microsoft.Extensions.ProjectModel.Resolution
+namespace Microsoft.DotNet.ProjectModel.Resolution
 {
     public class ProjectDependencyProvider
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Resolution/ReferenceAssemblyDependencyResolver.cs b/src/Microsoft.DotNet.ProjectModel/Resolution/ReferenceAssemblyDependencyResolver.cs
index 2e2d4ee3a..f9ddca6bb 100644
--- a/src/Microsoft.DotNet.ProjectModel/Resolution/ReferenceAssemblyDependencyResolver.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Resolution/ReferenceAssemblyDependencyResolver.cs
@@ -4,12 +4,12 @@
 using System;
 using System.Linq;
 using System.Runtime.Versioning;
-using Microsoft.Extensions.ProjectModel.Graph;
+using Microsoft.DotNet.ProjectModel.Graph;
 using NuGet;
 using NuGet.Frameworks;
 using NuGet.Versioning;
 
-namespace Microsoft.Extensions.ProjectModel.Resolution
+namespace Microsoft.DotNet.ProjectModel.Resolution
 {
     public class ReferenceAssemblyDependencyResolver
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Resolution/UnresolvedDependencyProvider.cs b/src/Microsoft.DotNet.ProjectModel/Resolution/UnresolvedDependencyProvider.cs
index 674030c6c..1c37516e3 100644
--- a/src/Microsoft.DotNet.ProjectModel/Resolution/UnresolvedDependencyProvider.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Resolution/UnresolvedDependencyProvider.cs
@@ -2,10 +2,10 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Linq;
-using Microsoft.Extensions.ProjectModel.Graph;
+using Microsoft.DotNet.ProjectModel.Graph;
 using NuGet.Frameworks;
 
-namespace Microsoft.Extensions.ProjectModel.Resolution
+namespace Microsoft.DotNet.ProjectModel.Resolution
 {
     public static class UnresolvedDependencyProvider
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/RuntimeIdentifier.cs b/src/Microsoft.DotNet.ProjectModel/RuntimeIdentifier.cs
index ef2ca3476..7e0d0f200 100644
--- a/src/Microsoft.DotNet.ProjectModel/RuntimeIdentifier.cs
+++ b/src/Microsoft.DotNet.ProjectModel/RuntimeIdentifier.cs
@@ -3,7 +3,7 @@
 
 using System.Runtime.InteropServices;
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.DotNet.ProjectModel
 {
     public static class RuntimeIdentifier
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/TargetFrameworkInformation.cs b/src/Microsoft.DotNet.ProjectModel/TargetFrameworkInformation.cs
index 4b943d9c6..88076ed21 100644
--- a/src/Microsoft.DotNet.ProjectModel/TargetFrameworkInformation.cs
+++ b/src/Microsoft.DotNet.ProjectModel/TargetFrameworkInformation.cs
@@ -2,10 +2,10 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using Microsoft.Extensions.ProjectModel.Graph;
+using Microsoft.DotNet.ProjectModel.Graph;
 using NuGet.Frameworks;
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.DotNet.ProjectModel
 {
     public class TargetFrameworkInformation
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Utilities/PathUtility.cs b/src/Microsoft.DotNet.ProjectModel/Utilities/PathUtility.cs
index 2d22c7c5a..6185a7313 100644
--- a/src/Microsoft.DotNet.ProjectModel/Utilities/PathUtility.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Utilities/PathUtility.cs
@@ -5,7 +5,7 @@ using System;
 using System.IO;
 using System.Runtime.InteropServices;
 
-namespace Microsoft.Extensions.ProjectModel.Utilities
+namespace Microsoft.DotNet.ProjectModel.Utilities
 {
     internal static class PathUtility
     {
diff --git a/src/Microsoft.DotNet.ProjectModel/Utilities/VersionUtility.cs b/src/Microsoft.DotNet.ProjectModel/Utilities/VersionUtility.cs
index 3bd6fa3ee..82e79824f 100644
--- a/src/Microsoft.DotNet.ProjectModel/Utilities/VersionUtility.cs
+++ b/src/Microsoft.DotNet.ProjectModel/Utilities/VersionUtility.cs
@@ -6,7 +6,7 @@ using System.Runtime.Loader;
 using System.Text;
 using NuGet.Versioning;
 
-namespace Microsoft.Extensions.ProjectModel.Utilities
+namespace Microsoft.DotNet.ProjectModel.Utilities
 {
     public static class VersionUtility
     {
diff --git a/src/Microsoft.DotNet.Tools.Compiler.Csc/Program.cs b/src/Microsoft.DotNet.Tools.Compiler.Csc/Program.cs
index 9db6e2550..836b7d13b 100644
--- a/src/Microsoft.DotNet.Tools.Compiler.Csc/Program.cs
+++ b/src/Microsoft.DotNet.Tools.Compiler.Csc/Program.cs
@@ -12,7 +12,7 @@ using System.Text;
 
 using Microsoft.DotNet.Cli.Compiler.Common;
 using Microsoft.DotNet.Cli.Utils;
-using Microsoft.Extensions.ProjectModel;
+using Microsoft.DotNet.ProjectModel;
 
 namespace Microsoft.DotNet.Tools.Compiler.Csc
 {
diff --git a/src/Microsoft.DotNet.Tools.Compiler/Program.cs b/src/Microsoft.DotNet.Tools.Compiler/Program.cs
index 2161400ea..326533606 100644
--- a/src/Microsoft.DotNet.Tools.Compiler/Program.cs
+++ b/src/Microsoft.DotNet.Tools.Compiler/Program.cs
@@ -11,8 +11,8 @@ using Microsoft.Dnx.Runtime.Common.CommandLine;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Cli.Compiler.Common;
 using Microsoft.DotNet.Tools.Common;
-using Microsoft.Extensions.ProjectModel;
-using Microsoft.Extensions.ProjectModel.Compilation;
+using Microsoft.DotNet.ProjectModel;
+using Microsoft.DotNet.ProjectModel.Compilation;
 using NuGet.Frameworks;
 
 namespace Microsoft.DotNet.Tools.Compiler
diff --git a/src/Microsoft.DotNet.Tools.Pack/Program.cs b/src/Microsoft.DotNet.Tools.Pack/Program.cs
index 91204403b..3136461c0 100644
--- a/src/Microsoft.DotNet.Tools.Pack/Program.cs
+++ b/src/Microsoft.DotNet.Tools.Pack/Program.cs
@@ -7,18 +7,18 @@ using System.IO;
 using System.Linq;
 
 using System.Text;
-using Microsoft.Extensions.ProjectModel;
+using Microsoft.DotNet.ProjectModel;
 using NuGet;
 using Microsoft.Dnx.Runtime.Common.CommandLine;
 using Microsoft.DotNet.Cli.Utils;
 using NuGet.Packaging.Core;
-using Microsoft.Extensions.ProjectModel.Graph;
+using Microsoft.DotNet.ProjectModel.Graph;
 using NuGet.Versioning;
 using NuGet.Frameworks;
-using Microsoft.Extensions.ProjectModel.Files;
+using Microsoft.DotNet.ProjectModel.Files;
 using Microsoft.Extensions.FileSystemGlobbing;
 using Microsoft.Extensions.FileSystemGlobbing.Abstractions;
-using Microsoft.Extensions.ProjectModel.Utilities;
+using Microsoft.DotNet.ProjectModel.Utilities;
 
 namespace Microsoft.DotNet.Tools.Compiler
 {
diff --git a/src/Microsoft.DotNet.Tools.Publish/Program.cs b/src/Microsoft.DotNet.Tools.Publish/Program.cs
index c2fa5f262..dd08d1a09 100644
--- a/src/Microsoft.DotNet.Tools.Publish/Program.cs
+++ b/src/Microsoft.DotNet.Tools.Publish/Program.cs
@@ -8,8 +8,8 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using Microsoft.Dnx.Runtime.Common.CommandLine;
 using Microsoft.DotNet.Cli.Utils;
-using Microsoft.Extensions.ProjectModel;
-using Microsoft.Extensions.ProjectModel.Compilation;
+using Microsoft.DotNet.ProjectModel;
+using Microsoft.DotNet.ProjectModel.Compilation;
 using NuGet.Frameworks;
 
 namespace Microsoft.DotNet.Tools.Publish
diff --git a/src/Microsoft.DotNet.Tools.Run/RunCommand.cs b/src/Microsoft.DotNet.Tools.Run/RunCommand.cs
index 73d69a702..6c03d6380 100644
--- a/src/Microsoft.DotNet.Tools.Run/RunCommand.cs
+++ b/src/Microsoft.DotNet.Tools.Run/RunCommand.cs
@@ -7,7 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using Microsoft.DotNet.Cli.Utils;
-using Microsoft.Extensions.ProjectModel;
+using Microsoft.DotNet.ProjectModel;
 using NuGet.Frameworks;
 
 namespace Microsoft.DotNet.Tools.Run