diff --git a/Identity.sln b/Identity.sln
index 7b0232a0d1..8f1066bfbe 100644
--- a/Identity.sln
+++ b/Identity.sln
@@ -9,16 +9,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{52D59F18-6
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity", "src\Microsoft.AspNet.Identity\Microsoft.AspNet.Identity.kproj", "{1729302E-A58E-4652-B639-5B6B68DA2748}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.SqlServer", "src\Microsoft.AspNet.Identity.SqlServer\Microsoft.AspNet.Identity.SqlServer.kproj", "{AD42BAFB-1993-4FAF-A280-3711A9F33E2F}"
-EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.Test", "test\Microsoft.AspNet.Identity.Test\Microsoft.AspNet.Identity.Test.kproj", "{2CF3927B-19E4-4866-9BAA-2C131580E7C3}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.InMemory.Test", "test\Microsoft.AspNet.Identity.InMemory.Test\Microsoft.AspNet.Identity.InMemory.Test.kproj", "{65161409-C4C4-4D63-A73B-231FCFF4D503}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.SqlServer.Test", "test\Microsoft.AspNet.Identity.SqlServer.Test\Microsoft.AspNet.Identity.SqlServer.Test.kproj", "{B4C067C1-F934-493C-9DBC-19E8CA305613}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.SqlServer.InMemory.Test", "test\Microsoft.AspNet.Identity.SqlServer.InMemory.Test\Microsoft.AspNet.Identity.SqlServer.InMemory.Test.kproj", "{813B36FE-BBA5-4449-B157-6EBBA5ED02CA}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{58D94A0E-C2B7-43A7-8826-99ECBB1E0A50}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IdentitySample.Mvc", "samples\IdentitySample.Mvc\IdentitySample.Mvc.kproj", "{E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}"
@@ -28,7 +22,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		global.json = global.json
 	EndProjectSection
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Hosting", "..\Hosting\src\Microsoft.AspNet.Hosting\Microsoft.AspNet.Hosting.kproj", "{3944F036-7E75-47E8-AA52-C4B89A64EC3A}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.EntityFramework.Test", "test\Microsoft.AspNet.Identity.EntityFramework.Test\Microsoft.AspNet.Identity.EntityFramework.Test.kproj", "{37236EA3-915D-46D5-997C-DF513C500E4B}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.EntityFramework.InMemory.Test", "test\Microsoft.AspNet.Identity.EntityFramework.InMemory.Test\Microsoft.AspNet.Identity.EntityFramework.InMemory.Test.kproj", "{EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.EntityFramework", "src\Microsoft.AspNet.Identity.EntityFramework\Microsoft.AspNet.Identity.EntityFramework.kproj", "{4490894C-3572-4E63-86F1-EE5105CE8A06}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -50,16 +48,6 @@ Global
 		{1729302E-A58E-4652-B639-5B6B68DA2748}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1729302E-A58E-4652-B639-5B6B68DA2748}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1729302E-A58E-4652-B639-5B6B68DA2748}.Release|x86.ActiveCfg = Release|Any CPU
-		{AD42BAFB-1993-4FAF-A280-3711A9F33E2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AD42BAFB-1993-4FAF-A280-3711A9F33E2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AD42BAFB-1993-4FAF-A280-3711A9F33E2F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AD42BAFB-1993-4FAF-A280-3711A9F33E2F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AD42BAFB-1993-4FAF-A280-3711A9F33E2F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AD42BAFB-1993-4FAF-A280-3711A9F33E2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AD42BAFB-1993-4FAF-A280-3711A9F33E2F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AD42BAFB-1993-4FAF-A280-3711A9F33E2F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AD42BAFB-1993-4FAF-A280-3711A9F33E2F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AD42BAFB-1993-4FAF-A280-3711A9F33E2F}.Release|x86.ActiveCfg = Release|Any CPU
 		{2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2CF3927B-19E4-4866-9BAA-2C131580E7C3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -80,26 +68,6 @@ Global
 		{65161409-C4C4-4D63-A73B-231FCFF4D503}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{65161409-C4C4-4D63-A73B-231FCFF4D503}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{65161409-C4C4-4D63-A73B-231FCFF4D503}.Release|x86.ActiveCfg = Release|Any CPU
-		{B4C067C1-F934-493C-9DBC-19E8CA305613}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B4C067C1-F934-493C-9DBC-19E8CA305613}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B4C067C1-F934-493C-9DBC-19E8CA305613}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B4C067C1-F934-493C-9DBC-19E8CA305613}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B4C067C1-F934-493C-9DBC-19E8CA305613}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B4C067C1-F934-493C-9DBC-19E8CA305613}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B4C067C1-F934-493C-9DBC-19E8CA305613}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B4C067C1-F934-493C-9DBC-19E8CA305613}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B4C067C1-F934-493C-9DBC-19E8CA305613}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B4C067C1-F934-493C-9DBC-19E8CA305613}.Release|x86.ActiveCfg = Release|Any CPU
-		{813B36FE-BBA5-4449-B157-6EBBA5ED02CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{813B36FE-BBA5-4449-B157-6EBBA5ED02CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{813B36FE-BBA5-4449-B157-6EBBA5ED02CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{813B36FE-BBA5-4449-B157-6EBBA5ED02CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{813B36FE-BBA5-4449-B157-6EBBA5ED02CA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{813B36FE-BBA5-4449-B157-6EBBA5ED02CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{813B36FE-BBA5-4449-B157-6EBBA5ED02CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{813B36FE-BBA5-4449-B157-6EBBA5ED02CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{813B36FE-BBA5-4449-B157-6EBBA5ED02CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{813B36FE-BBA5-4449-B157-6EBBA5ED02CA}.Release|x86.ActiveCfg = Release|Any CPU
 		{E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -110,27 +78,47 @@ Global
 		{E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6}.Release|x86.ActiveCfg = Release|Any CPU
-		{3944F036-7E75-47E8-AA52-C4B89A64EC3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3944F036-7E75-47E8-AA52-C4B89A64EC3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3944F036-7E75-47E8-AA52-C4B89A64EC3A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3944F036-7E75-47E8-AA52-C4B89A64EC3A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3944F036-7E75-47E8-AA52-C4B89A64EC3A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3944F036-7E75-47E8-AA52-C4B89A64EC3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3944F036-7E75-47E8-AA52-C4B89A64EC3A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3944F036-7E75-47E8-AA52-C4B89A64EC3A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3944F036-7E75-47E8-AA52-C4B89A64EC3A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3944F036-7E75-47E8-AA52-C4B89A64EC3A}.Release|x86.ActiveCfg = Release|Any CPU
+		{37236EA3-915D-46D5-997C-DF513C500E4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{37236EA3-915D-46D5-997C-DF513C500E4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37236EA3-915D-46D5-997C-DF513C500E4B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{37236EA3-915D-46D5-997C-DF513C500E4B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{37236EA3-915D-46D5-997C-DF513C500E4B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{37236EA3-915D-46D5-997C-DF513C500E4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{37236EA3-915D-46D5-997C-DF513C500E4B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{37236EA3-915D-46D5-997C-DF513C500E4B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{37236EA3-915D-46D5-997C-DF513C500E4B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{37236EA3-915D-46D5-997C-DF513C500E4B}.Release|x86.ActiveCfg = Release|Any CPU
+		{EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}.Release|x86.ActiveCfg = Release|Any CPU
+		{4490894C-3572-4E63-86F1-EE5105CE8A06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4490894C-3572-4E63-86F1-EE5105CE8A06}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4490894C-3572-4E63-86F1-EE5105CE8A06}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4490894C-3572-4E63-86F1-EE5105CE8A06}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4490894C-3572-4E63-86F1-EE5105CE8A06}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4490894C-3572-4E63-86F1-EE5105CE8A06}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4490894C-3572-4E63-86F1-EE5105CE8A06}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4490894C-3572-4E63-86F1-EE5105CE8A06}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4490894C-3572-4E63-86F1-EE5105CE8A06}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4490894C-3572-4E63-86F1-EE5105CE8A06}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{1729302E-A58E-4652-B639-5B6B68DA2748} = {0F647068-6602-4E24-B1DC-8ED91481A50A}
-		{AD42BAFB-1993-4FAF-A280-3711A9F33E2F} = {0F647068-6602-4E24-B1DC-8ED91481A50A}
 		{2CF3927B-19E4-4866-9BAA-2C131580E7C3} = {52D59F18-62D2-4D17-8CF2-BE192445AF8E}
 		{65161409-C4C4-4D63-A73B-231FCFF4D503} = {52D59F18-62D2-4D17-8CF2-BE192445AF8E}
-		{B4C067C1-F934-493C-9DBC-19E8CA305613} = {52D59F18-62D2-4D17-8CF2-BE192445AF8E}
-		{813B36FE-BBA5-4449-B157-6EBBA5ED02CA} = {52D59F18-62D2-4D17-8CF2-BE192445AF8E}
 		{E1BFA023-CFFD-49CE-8466-1C28DD2EC1F6} = {58D94A0E-C2B7-43A7-8826-99ECBB1E0A50}
+		{37236EA3-915D-46D5-997C-DF513C500E4B} = {52D59F18-62D2-4D17-8CF2-BE192445AF8E}
+		{EA7EB28F-53B8-4009-9C6B-74DB090CA8DD} = {52D59F18-62D2-4D17-8CF2-BE192445AF8E}
+		{4490894C-3572-4E63-86F1-EE5105CE8A06} = {0F647068-6602-4E24-B1DC-8ED91481A50A}
 	EndGlobalSection
 EndGlobal
diff --git a/samples/IdentitySample.Mvc/Models/IdentityModels.cs b/samples/IdentitySample.Mvc/Models/IdentityModels.cs
index 8e3a57b63a..50bdfc34dd 100644
--- a/samples/IdentitySample.Mvc/Models/IdentityModels.cs
+++ b/samples/IdentitySample.Mvc/Models/IdentityModels.cs
@@ -1,6 +1,6 @@
 using System;
 using Microsoft.AspNet.Identity;
-using Microsoft.AspNet.Identity.SqlServer;
+using Microsoft.AspNet.Identity.EntityFramework;
 using Microsoft.Data.Entity;
 using Microsoft.Framework.OptionsModel;
 
diff --git a/samples/IdentitySample.Mvc/project.json b/samples/IdentitySample.Mvc/project.json
index d9340de6c6..3622c41817 100644
--- a/samples/IdentitySample.Mvc/project.json
+++ b/samples/IdentitySample.Mvc/project.json
@@ -9,7 +9,8 @@
         "Microsoft.AspNet.Mvc": "6.0.0-*",
         "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
         "Microsoft.AspNet.Diagnostics": "1.0.0-*",
-        "Microsoft.AspNet.Identity.SqlServer": "3.0.0-*",
+        "Microsoft.AspNet.Identity": "3.0.0-*",
+        "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-*",
         "Microsoft.AspNet.Security.Cookies": "1.0.0-*",
         "Microsoft.AspNet.Security.Facebook": "1.0.0-*",
         "Microsoft.AspNet.Security.Google": "1.0.0-*",
diff --git a/src/Microsoft.AspNet.Identity.SqlServer/IdentityDbContext.cs b/src/Microsoft.AspNet.Identity.EntityFramework/IdentityDbContext.cs
similarity index 98%
rename from src/Microsoft.AspNet.Identity.SqlServer/IdentityDbContext.cs
rename to src/Microsoft.AspNet.Identity.EntityFramework/IdentityDbContext.cs
index 0a3a38e89f..a10a97dbd9 100644
--- a/src/Microsoft.AspNet.Identity.SqlServer/IdentityDbContext.cs
+++ b/src/Microsoft.AspNet.Identity.EntityFramework/IdentityDbContext.cs
@@ -5,7 +5,7 @@ using System;
 using Microsoft.Data.Entity;
 using Microsoft.Data.Entity.Metadata;
 
-namespace Microsoft.AspNet.Identity.SqlServer
+namespace Microsoft.AspNet.Identity.EntityFramework
 {
     public class IdentityDbContext :
         IdentityDbContext<IdentityUser, IdentityRole, string>
diff --git a/src/Microsoft.AspNet.Identity.SqlServer/IdentityEntityFrameworkBuilderExtensions.cs b/src/Microsoft.AspNet.Identity.EntityFramework/IdentityEntityFrameworkBuilderExtensions.cs
similarity index 98%
rename from src/Microsoft.AspNet.Identity.SqlServer/IdentityEntityFrameworkBuilderExtensions.cs
rename to src/Microsoft.AspNet.Identity.EntityFramework/IdentityEntityFrameworkBuilderExtensions.cs
index 36d3c404d2..313a9fff8e 100644
--- a/src/Microsoft.AspNet.Identity.SqlServer/IdentityEntityFrameworkBuilderExtensions.cs
+++ b/src/Microsoft.AspNet.Identity.EntityFramework/IdentityEntityFrameworkBuilderExtensions.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Identity;
-using Microsoft.AspNet.Identity.SqlServer;
+using Microsoft.AspNet.Identity.EntityFramework;
 using Microsoft.Data.Entity;
 using System;
 
diff --git a/src/Microsoft.AspNet.Identity.SqlServer/IdentityEntityFrameworkServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Identity.EntityFramework/IdentityEntityFrameworkServiceCollectionExtensions.cs
similarity index 98%
rename from src/Microsoft.AspNet.Identity.SqlServer/IdentityEntityFrameworkServiceCollectionExtensions.cs
rename to src/Microsoft.AspNet.Identity.EntityFramework/IdentityEntityFrameworkServiceCollectionExtensions.cs
index 6b2b1d5beb..0d8a6746b9 100644
--- a/src/Microsoft.AspNet.Identity.SqlServer/IdentityEntityFrameworkServiceCollectionExtensions.cs
+++ b/src/Microsoft.AspNet.Identity.EntityFramework/IdentityEntityFrameworkServiceCollectionExtensions.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Identity;
-using Microsoft.AspNet.Identity.SqlServer;
+using Microsoft.AspNet.Identity.EntityFramework;
 using Microsoft.Data.Entity;
 using Microsoft.Framework.ConfigurationModel;
 using System;
diff --git a/src/Microsoft.AspNet.Identity.SqlServer/Microsoft.AspNet.Identity.SqlServer.kproj b/src/Microsoft.AspNet.Identity.EntityFramework/Microsoft.AspNet.Identity.EntityFramework.kproj
similarity index 76%
rename from src/Microsoft.AspNet.Identity.SqlServer/Microsoft.AspNet.Identity.SqlServer.kproj
rename to src/Microsoft.AspNet.Identity.EntityFramework/Microsoft.AspNet.Identity.EntityFramework.kproj
index 95ec5bcb0b..7d88b642dc 100644
--- a/src/Microsoft.AspNet.Identity.SqlServer/Microsoft.AspNet.Identity.SqlServer.kproj
+++ b/src/Microsoft.AspNet.Identity.EntityFramework/Microsoft.AspNet.Identity.EntityFramework.kproj
@@ -6,9 +6,17 @@
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>ad42bafb-1993-4faf-a280-3711a9f33e2f</ProjectGuid>
+    <ProjectGuid>4490894c-3572-4e63-86f1-ee5105ce8a06</ProjectGuid>
     <OutputType>Library</OutputType>
   </PropertyGroup>
+
+  <PropertyGroup Condition="$(OutputType) == 'Console'">
+    <DebuggerFlavor>ConsoleDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="$(OutputType) == 'Web'">
+    <DebuggerFlavor>WebDebugger</DebuggerFlavor>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
diff --git a/src/Microsoft.AspNet.Identity.SqlServer/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Identity.EntityFramework/Properties/Resources.Designer.cs
similarity index 90%
rename from src/Microsoft.AspNet.Identity.SqlServer/Properties/Resources.Designer.cs
rename to src/Microsoft.AspNet.Identity.EntityFramework/Properties/Resources.Designer.cs
index 80a2517ffd..540771d085 100644
--- a/src/Microsoft.AspNet.Identity.SqlServer/Properties/Resources.Designer.cs
+++ b/src/Microsoft.AspNet.Identity.EntityFramework/Properties/Resources.Designer.cs
@@ -1,5 +1,5 @@
 // <auto-generated />
-namespace Microsoft.AspNet.Identity.SqlServer
+namespace Microsoft.AspNet.Identity.EntityFramework
 {
     using System.Globalization;
     using System.Reflection;
@@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Identity.SqlServer
     internal static class Resources
     {
         private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.AspNet.Identity.SqlServer.Resources", typeof(Resources).GetTypeInfo().Assembly);
+            = new ResourceManager("Microsoft.AspNet.Identity.EntityFramework.Resources", typeof(Resources).GetTypeInfo().Assembly);
 
         /// <summary>
         /// Role {0} does not exist.
diff --git a/src/Microsoft.AspNet.Identity.SqlServer/Resources.resx b/src/Microsoft.AspNet.Identity.EntityFramework/Resources.resx
similarity index 100%
rename from src/Microsoft.AspNet.Identity.SqlServer/Resources.resx
rename to src/Microsoft.AspNet.Identity.EntityFramework/Resources.resx
diff --git a/src/Microsoft.AspNet.Identity.SqlServer/RoleStore.cs b/src/Microsoft.AspNet.Identity.EntityFramework/RoleStore.cs
similarity index 99%
rename from src/Microsoft.AspNet.Identity.SqlServer/RoleStore.cs
rename to src/Microsoft.AspNet.Identity.EntityFramework/RoleStore.cs
index 5c75233738..9a5ae99264 100644
--- a/src/Microsoft.AspNet.Identity.SqlServer/RoleStore.cs
+++ b/src/Microsoft.AspNet.Identity.EntityFramework/RoleStore.cs
@@ -10,7 +10,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Data.Entity;
 
-namespace Microsoft.AspNet.Identity.SqlServer
+namespace Microsoft.AspNet.Identity.EntityFramework
 {
     public class RoleStore<TRole> : RoleStore<TRole, DbContext, string>
         where TRole : IdentityRole
diff --git a/src/Microsoft.AspNet.Identity.SqlServer/UserStore.cs b/src/Microsoft.AspNet.Identity.EntityFramework/UserStore.cs
similarity index 99%
rename from src/Microsoft.AspNet.Identity.SqlServer/UserStore.cs
rename to src/Microsoft.AspNet.Identity.EntityFramework/UserStore.cs
index c38fcc540e..75f97bb4b6 100644
--- a/src/Microsoft.AspNet.Identity.SqlServer/UserStore.cs
+++ b/src/Microsoft.AspNet.Identity.EntityFramework/UserStore.cs
@@ -11,7 +11,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Data.Entity;
 
-namespace Microsoft.AspNet.Identity.SqlServer
+namespace Microsoft.AspNet.Identity.EntityFramework
 {
     public class UserStore : UserStore<IdentityUser>
     {
diff --git a/src/Microsoft.AspNet.Identity.SqlServer/project.json b/src/Microsoft.AspNet.Identity.EntityFramework/project.json
similarity index 100%
rename from src/Microsoft.AspNet.Identity.SqlServer/project.json
rename to src/Microsoft.AspNet.Identity.EntityFramework/project.json
diff --git a/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/EntityInMemoryTestServiceCollectionExtensions.cs b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/EntityInMemoryTestServiceCollectionExtensions.cs
similarity index 93%
rename from test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/EntityInMemoryTestServiceCollectionExtensions.cs
rename to test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/EntityInMemoryTestServiceCollectionExtensions.cs
index 95811d7613..ebbb92a98d 100644
--- a/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/EntityInMemoryTestServiceCollectionExtensions.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/EntityInMemoryTestServiceCollectionExtensions.cs
@@ -1,8 +1,8 @@
 // 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.Identity.SqlServer;
-using Microsoft.AspNet.Identity.SqlServer.InMemory.Test;
+using Microsoft.AspNet.Identity.EntityFramework;
+using Microsoft.AspNet.Identity.EntityFramework.InMemory.Test;
 using Microsoft.Data.Entity;
 using Microsoft.Framework.DependencyInjection;
 
diff --git a/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/InMemoryContext.cs b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryContext.cs
similarity index 97%
rename from test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/InMemoryContext.cs
rename to test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryContext.cs
index 7feea9f8c4..fae7f5db2a 100644
--- a/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/InMemoryContext.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryContext.cs
@@ -5,7 +5,7 @@ using System;
 using Microsoft.Data.Entity;
 using Microsoft.Data.Entity.Metadata;
 
-namespace Microsoft.AspNet.Identity.SqlServer.InMemory.Test
+namespace Microsoft.AspNet.Identity.EntityFramework.InMemory.Test
 {
     public class InMemoryContext :
         InMemoryContext<IdentityUser, IdentityRole, string, IdentityUserLogin, IdentityUserRole, IdentityUserClaim>
diff --git a/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/InMemoryEFUserStoreTest.cs b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryEFUserStoreTest.cs
similarity index 96%
rename from test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/InMemoryEFUserStoreTest.cs
rename to test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryEFUserStoreTest.cs
index cd7d1f1ce5..653d8bbfab 100644
--- a/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/InMemoryEFUserStoreTest.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryEFUserStoreTest.cs
@@ -6,7 +6,7 @@ using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.DependencyInjection.Fallback;
 using Microsoft.Framework.OptionsModel;
 
-namespace Microsoft.AspNet.Identity.SqlServer.InMemory.Test
+namespace Microsoft.AspNet.Identity.EntityFramework.InMemory.Test
 {
     public class InMemoryEFUserStoreTest : UserManagerTestBase<IdentityUser, IdentityRole> 
     {
diff --git a/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/InMemoryUserStore.cs b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryUserStore.cs
similarity index 99%
rename from test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/InMemoryUserStore.cs
rename to test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryUserStore.cs
index 1374a107b9..c66a2eb85b 100644
--- a/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/InMemoryUserStore.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/InMemoryUserStore.cs
@@ -11,7 +11,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Data.Entity;
 
-namespace Microsoft.AspNet.Identity.SqlServer.InMemory.Test
+namespace Microsoft.AspNet.Identity.EntityFramework.InMemory.Test
 {
     public class InMemoryUserStore : InMemoryUserStore<IdentityUser, InMemoryContext>
     {
diff --git a/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test.kproj b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test.kproj
similarity index 76%
rename from test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test.kproj
rename to test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test.kproj
index ff42807996..fe19f8f78f 100644
--- a/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test.kproj
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test.kproj
@@ -6,10 +6,17 @@
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>813b36fe-bba5-4449-b157-6ebba5ed02ca</ProjectGuid>
+    <ProjectGuid>ea7eb28f-53b8-4009-9c6b-74db090ca8dd</ProjectGuid>
     <OutputType>Library</OutputType>
-    <ActiveTargetFramework>net45</ActiveTargetFramework>
   </PropertyGroup>
+
+  <PropertyGroup Condition="$(OutputType) == 'Console'">
+    <DebuggerFlavor>ConsoleDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="$(OutputType) == 'Web'">
+    <DebuggerFlavor>WebDebugger</DebuggerFlavor>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
diff --git a/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/RoleStoreTest.cs b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/RoleStoreTest.cs
similarity index 98%
rename from test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/RoleStoreTest.cs
rename to test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/RoleStoreTest.cs
index ad8cc5d332..03bc139ca5 100644
--- a/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/RoleStoreTest.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/RoleStoreTest.cs
@@ -8,7 +8,7 @@ using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.DependencyInjection.Fallback;
 using Xunit;
 
-namespace Microsoft.AspNet.Identity.SqlServer.InMemory.Test
+namespace Microsoft.AspNet.Identity.EntityFramework.InMemory.Test
 {
     public class RoleStoreTest
     {
diff --git a/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/TestIdentityFactory.cs b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/TestIdentityFactory.cs
similarity index 96%
rename from test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/TestIdentityFactory.cs
rename to test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/TestIdentityFactory.cs
index 1bac21ef3a..910551dc0f 100644
--- a/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/TestIdentityFactory.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/TestIdentityFactory.cs
@@ -5,7 +5,7 @@ using Microsoft.AspNet.Identity.Test;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.DependencyInjection.Fallback;
 
-namespace Microsoft.AspNet.Identity.SqlServer.InMemory.Test
+namespace Microsoft.AspNet.Identity.EntityFramework.InMemory.Test
 {
     public static class TestIdentityFactory
     {
diff --git a/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/project.json b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/project.json
similarity index 91%
rename from test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/project.json
rename to test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/project.json
index dbf9b27bf1..e0d9073c7d 100644
--- a/test/Microsoft.AspNet.Identity.SqlServer.InMemory.Test/project.json
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.InMemory.Test/project.json
@@ -2,7 +2,7 @@
   "dependencies": {
     "Microsoft.AspNet.Http": "1.0.0-*",
     "Microsoft.AspNet.Identity": "3.0.0-*",
-    "Microsoft.AspNet.Identity.SqlServer": "3.0.0-*",
+    "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-*",
     "Microsoft.AspNet.PipelineCore": "1.0.0-*",
     "Microsoft.AspNet.RequestContainer": "1.0.0-*",
     "Microsoft.AspNet.Security.DataProtection": "1.0.0-*",
diff --git a/test/Microsoft.AspNet.Identity.SqlServer.Test/CustomPocoTest.cs b/test/Microsoft.AspNet.Identity.EntityFramework.Test/CustomPocoTest.cs
similarity index 98%
rename from test/Microsoft.AspNet.Identity.SqlServer.Test/CustomPocoTest.cs
rename to test/Microsoft.AspNet.Identity.EntityFramework.Test/CustomPocoTest.cs
index 1072cbcc04..004c48d925 100644
--- a/test/Microsoft.AspNet.Identity.SqlServer.Test/CustomPocoTest.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.Test/CustomPocoTest.cs
@@ -15,9 +15,9 @@ using Microsoft.Framework.Logging;
 using Microsoft.Framework.OptionsModel;
 using Xunit;
 
-namespace Microsoft.AspNet.Identity.SqlServer.Test
+namespace Microsoft.AspNet.Identity.EntityFramework.Test
 {
-    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.SqlServer.Test")]
+    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.EntityFramework.Test")]
     public class CustomPocoTest
     {
         private readonly string ConnectionString = @"Server=(localdb)\v11.0;Database=CustomUserContextTest" + DateTime.Now.Month + "-" + DateTime.Now.Day + "-" + DateTime.Now.Year + ";Trusted_Connection=True;";
diff --git a/test/Microsoft.AspNet.Identity.SqlServer.Test/DefaultPocoTest.cs b/test/Microsoft.AspNet.Identity.EntityFramework.Test/DefaultPocoTest.cs
similarity index 96%
rename from test/Microsoft.AspNet.Identity.SqlServer.Test/DefaultPocoTest.cs
rename to test/Microsoft.AspNet.Identity.EntityFramework.Test/DefaultPocoTest.cs
index 363d5660d7..85e4de8eb6 100644
--- a/test/Microsoft.AspNet.Identity.SqlServer.Test/DefaultPocoTest.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.Test/DefaultPocoTest.cs
@@ -13,9 +13,9 @@ using Microsoft.Framework.Logging;
 using Microsoft.Framework.OptionsModel;
 using Xunit;
 
-namespace Microsoft.AspNet.Identity.SqlServer.Test
+namespace Microsoft.AspNet.Identity.EntityFramework.Test
 {
-    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.SqlServer.Test")]
+    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.EntityFramework.Test")]
     public class DefaultPocoTest
     {
         private readonly string ConnectionString = @"Server=(localdb)\v11.0;Database=DefaultSchemaTest" + DateTime.Now.Month + "-" + DateTime.Now.Day + "-" + DateTime.Now.Year + ";Trusted_Connection=True;";
diff --git a/test/Microsoft.AspNet.Identity.SqlServer.Test/Microsoft.AspNet.Identity.SqlServer.Test.kproj b/test/Microsoft.AspNet.Identity.EntityFramework.Test/Microsoft.AspNet.Identity.EntityFramework.Test.kproj
similarity index 76%
rename from test/Microsoft.AspNet.Identity.SqlServer.Test/Microsoft.AspNet.Identity.SqlServer.Test.kproj
rename to test/Microsoft.AspNet.Identity.EntityFramework.Test/Microsoft.AspNet.Identity.EntityFramework.Test.kproj
index 1d8dc0108a..fd3d658514 100644
--- a/test/Microsoft.AspNet.Identity.SqlServer.Test/Microsoft.AspNet.Identity.SqlServer.Test.kproj
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.Test/Microsoft.AspNet.Identity.EntityFramework.Test.kproj
@@ -6,10 +6,17 @@
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>b4c067c1-f934-493c-9dbc-19e8ca305613</ProjectGuid>
+    <ProjectGuid>37236ea3-915d-46d5-997c-df513c500e4b</ProjectGuid>
     <OutputType>Library</OutputType>
-    <ActiveTargetFramework>net45</ActiveTargetFramework>
   </PropertyGroup>
+
+  <PropertyGroup Condition="$(OutputType) == 'Console'">
+    <DebuggerFlavor>ConsoleDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="$(OutputType) == 'Web'">
+    <DebuggerFlavor>WebDebugger</DebuggerFlavor>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
diff --git a/test/Microsoft.AspNet.Identity.SqlServer.Test/SqlStoreTestBase.cs b/test/Microsoft.AspNet.Identity.EntityFramework.Test/SqlStoreTestBase.cs
similarity index 99%
rename from test/Microsoft.AspNet.Identity.SqlServer.Test/SqlStoreTestBase.cs
rename to test/Microsoft.AspNet.Identity.EntityFramework.Test/SqlStoreTestBase.cs
index d3d2c5cffb..763c3d1cd9 100644
--- a/test/Microsoft.AspNet.Identity.SqlServer.Test/SqlStoreTestBase.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.Test/SqlStoreTestBase.cs
@@ -15,7 +15,7 @@ using Microsoft.Framework.Logging;
 using Microsoft.Framework.OptionsModel;
 using Xunit;
 
-namespace Microsoft.AspNet.Identity.SqlServer.Test
+namespace Microsoft.AspNet.Identity.EntityFramework.Test
 {
 
     public abstract class SqlStoreTestBase<TUser, TRole, TKey> : UserManagerTestBase<TUser, TRole, TKey>
diff --git a/test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreGuidKeyTest.cs b/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreGuidKeyTest.cs
similarity index 96%
rename from test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreGuidKeyTest.cs
rename to test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreGuidKeyTest.cs
index eba062f417..7fbe9911e3 100644
--- a/test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreGuidKeyTest.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreGuidKeyTest.cs
@@ -9,7 +9,7 @@ using Microsoft.Framework.DependencyInjection.Fallback;
 using Microsoft.Framework.Logging;
 using Xunit;
 
-namespace Microsoft.AspNet.Identity.SqlServer.Test
+namespace Microsoft.AspNet.Identity.EntityFramework.Test
 {
     public class GuidUser : IdentityUser<Guid>
     {
@@ -29,7 +29,7 @@ namespace Microsoft.AspNet.Identity.SqlServer.Test
         }
     }
 
-    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.SqlServer.Test")]
+    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.EntityFramework.Test")]
     public class UserStoreGuidTest : SqlStoreTestBase<GuidUser, GuidRole, Guid>
     {
         private readonly string _connectionString = @"Server=(localdb)\v11.0;Database=SqlUserStoreGuidTest" + DateTime.Now.Month + "-" + DateTime.Now.Day + "-" + DateTime.Now.Year + ";Trusted_Connection=True;";
diff --git a/test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreIntKeyTest.cs b/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreIntKeyTest.cs
similarity index 91%
rename from test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreIntKeyTest.cs
rename to test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreIntKeyTest.cs
index 703ae41341..8873484182 100644
--- a/test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreIntKeyTest.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreIntKeyTest.cs
@@ -9,7 +9,7 @@ using Microsoft.Framework.OptionsModel;
 using System;
 using Xunit;
 
-namespace Microsoft.AspNet.Identity.SqlServer.Test
+namespace Microsoft.AspNet.Identity.EntityFramework.Test
 {
     public class IntUser : IdentityUser<int>
     {
@@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Identity.SqlServer.Test
         }
     }
 
-    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.SqlServer.Test")]
+    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.EntityFramework.Test")]
     public class UserStoreIntTest : SqlStoreTestBase<IntUser, IntRole, int>
     {
         private readonly string _connectionString = @"Server=(localdb)\v11.0;Database=SqlUserStoreIntTest" + DateTime.Now.Month + "-" + DateTime.Now.Day + "-" + DateTime.Now.Year + ";Trusted_Connection=True;";
diff --git a/test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreStringKeyTest.cs b/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreStringKeyTest.cs
similarity index 87%
rename from test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreStringKeyTest.cs
rename to test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreStringKeyTest.cs
index aa2ce411f6..1579a85fec 100644
--- a/test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreStringKeyTest.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreStringKeyTest.cs
@@ -4,9 +4,9 @@
 using System;
 using Xunit;
 
-namespace Microsoft.AspNet.Identity.SqlServer.Test
+namespace Microsoft.AspNet.Identity.EntityFramework.Test
 {
-    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.SqlServer.Test")]
+    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.EntityFramework.Test")]
     public class StringUser : IdentityUser
     {
         public StringUser()
@@ -25,7 +25,7 @@ namespace Microsoft.AspNet.Identity.SqlServer.Test
         }
     }
 
-    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.SqlServer.Test")]
+    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.EntityFramework.Test")]
     public class UserStoreStringKeyTest : SqlStoreTestBase<StringUser, StringRole, string>
     {
         private readonly string _connectionString = @"Server=(localdb)\v11.0;Database=SqlUserStoreStringTest" + DateTime.Now.Month + "-" + DateTime.Now.Day + "-" + DateTime.Now.Year + ";Trusted_Connection=True;";
diff --git a/test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreTest.cs b/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreTest.cs
similarity index 99%
rename from test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreTest.cs
rename to test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreTest.cs
index 77fa6bfdad..8e30cf9829 100644
--- a/test/Microsoft.AspNet.Identity.SqlServer.Test/UserStoreTest.cs
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.Test/UserStoreTest.cs
@@ -15,9 +15,9 @@ using Microsoft.Framework.Logging;
 using Microsoft.Framework.OptionsModel;
 using Xunit;
 
-namespace Microsoft.AspNet.Identity.SqlServer.Test
+namespace Microsoft.AspNet.Identity.EntityFramework.Test
 {
-    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.SqlServer.Test")]
+    [TestCaseOrderer("Microsoft.AspNet.Identity.Test.PriorityOrderer", "Microsoft.AspNet.Identity.EntityFramework.Test")]
     public class UserStoreTest : UserManagerTestBase<IdentityUser, IdentityRole>
     {
         private readonly string ConnectionString = @"Server=(localdb)\v11.0;Database=SqlUserStoreTest" + DateTime.Now.Month + "-" + DateTime.Now.Day + "-" + DateTime.Now.Year + ";Trusted_Connection=True;";
diff --git a/test/Microsoft.AspNet.Identity.SqlServer.Test/project.json b/test/Microsoft.AspNet.Identity.EntityFramework.Test/project.json
similarity index 92%
rename from test/Microsoft.AspNet.Identity.SqlServer.Test/project.json
rename to test/Microsoft.AspNet.Identity.EntityFramework.Test/project.json
index 895a6f6b7b..ff3b6abc7f 100644
--- a/test/Microsoft.AspNet.Identity.SqlServer.Test/project.json
+++ b/test/Microsoft.AspNet.Identity.EntityFramework.Test/project.json
@@ -2,7 +2,7 @@
   "dependencies": {
     "Microsoft.AspNet.Http": "1.0.0-*",
     "Microsoft.AspNet.Identity": "3.0.0-*",
-    "Microsoft.AspNet.Identity.SqlServer": "1.0.0-*",
+    "Microsoft.AspNet.Identity.EntityFramework": "1.0.0-*",
     "Microsoft.AspNet.PipelineCore": "1.0.0-*",
     "Microsoft.AspNet.RequestContainer": "1.0.0-*",
     "Microsoft.AspNet.Security.DataProtection": "1.0.0-*",