diff --git a/EFCore.Cosmos.slnf b/EFCore.Cosmos.slnf
index 11538420b9..f6486ad2e0 100644
--- a/EFCore.Cosmos.slnf
+++ b/EFCore.Cosmos.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "All.sln",
+    "path": "EFCore.sln",
     "projects": [
       "src\\EFCore.Abstractions\\EFCore.Abstractions.csproj",
       "src\\EFCore.Analyzers\\EFCore.Analyzers.csproj",
diff --git a/EFCore.Relational.slnf b/EFCore.Relational.slnf
index d62c17dfd8..e099c50f5d 100644
--- a/EFCore.Relational.slnf
+++ b/EFCore.Relational.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "All.sln",
+    "path": "EFCore.sln",
     "projects": [
       "src\\EFCore.Abstractions\\EFCore.Abstractions.csproj",
       "src\\EFCore.Analyzers\\EFCore.Analyzers.csproj",
diff --git a/EFCore.Runtime.slnf b/EFCore.Runtime.slnf
index d095371225..512d05b823 100644
--- a/EFCore.Runtime.slnf
+++ b/EFCore.Runtime.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "All.sln",
+    "path": "EFCore.sln",
     "projects": [
       "src\\EFCore.Abstractions\\EFCore.Abstractions.csproj",
       "src\\EFCore.Analyzers\\EFCore.Analyzers.csproj",
diff --git a/EFCore.Sqlite.slnf b/EFCore.Sqlite.slnf
index e12faae7d2..a960cd5efe 100644
--- a/EFCore.Sqlite.slnf
+++ b/EFCore.Sqlite.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "All.sln",
+    "path": "EFCore.sln",
     "projects": [
       "src\\EFCore.Abstractions\\EFCore.Abstractions.csproj",
       "src\\EFCore.Analyzers\\EFCore.Analyzers.csproj",
diff --git a/EFCore.Tools.slnf b/EFCore.Tools.slnf
index beb719cd4f..7f4ecd9763 100644
--- a/EFCore.Tools.slnf
+++ b/EFCore.Tools.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "All.sln",
+    "path": "EFCore.sln",
     "projects": [
       "src\\dotnet-ef\\dotnet-ef.csproj",
       "src\\ef\\ef.csproj",
diff --git a/All.sln b/EFCore.sln
similarity index 100%
rename from All.sln
rename to EFCore.sln
diff --git a/All.sln.DotSettings b/EFCore.sln.DotSettings
similarity index 99%
rename from All.sln.DotSettings
rename to EFCore.sln.DotSettings
index 50460d834b..8712157ec9 100644
--- a/All.sln.DotSettings
+++ b/EFCore.sln.DotSettings
@@ -261,7 +261,7 @@ The .NET Foundation licenses this file to you under the MIT license.
 
 
 	<s:Boolean x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=EF4F00E20178B341995BD2EFE53739B5/@KeyIndexDefined">True</s:Boolean>
-	<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=EF4F00E20178B341995BD2EFE53739B5/AbsolutePath/@EntryValue">C:\repos\EntityFrameworkCore\All.sln.DotSettings</s:String>
+	<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=EF4F00E20178B341995BD2EFE53739B5/AbsolutePath/@EntryValue">C:\repos\EntityFrameworkCore\EFCore.sln.DotSettings</s:String>
 	<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=EF4F00E20178B341995BD2EFE53739B5/RelativePath/@EntryValue"></s:String>
 
 
@@ -343,4 +343,4 @@ The .NET Foundation licenses this file to you under the MIT license.&#xD;
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Uniquified/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Uniquifier/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Uniquify/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Xunit/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Xunit/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/EFCore.slnf b/EFCore.slnf
deleted file mode 100644
index 2581261552..0000000000
--- a/EFCore.slnf
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "solution": {
-    "path": "All.sln",
-    "projects": [
-      "benchmark\\EF.Benchmarks.Shared\\EF.Benchmarks.Shared.csproj",
-      "benchmark\\EF6.SqlServer.Benchmarks\\EF6.SqlServer.Benchmarks.csproj",
-      "benchmark\\EFCore.Benchmarks\\EFCore.Benchmarks.csproj",
-      "benchmark\\EFCore.SqlServer.Benchmarks\\EFCore.SqlServer.Benchmarks.csproj",
-      "benchmark\\EFCore.Sqlite.Benchmarks\\EFCore.Sqlite.Benchmarks.csproj",
-      "src\\EFCore.Abstractions\\EFCore.Abstractions.csproj",
-      "src\\EFCore.Analyzers\\EFCore.Analyzers.csproj",
-      "src\\EFCore.Cosmos\\EFCore.Cosmos.csproj",
-      "src\\EFCore.Design\\EFCore.Design.csproj",
-      "src\\EFCore.InMemory\\EFCore.InMemory.csproj",
-      "src\\EFCore.Proxies\\EFCore.Proxies.csproj",
-      "src\\EFCore.Relational\\EFCore.Relational.csproj",
-      "src\\EFCore.SqlServer.NTS\\EFCore.SqlServer.NTS.csproj",
-      "src\\EFCore.SqlServer\\EFCore.SqlServer.csproj",
-      "src\\EFCore.Sqlite.Core\\EFCore.Sqlite.Core.csproj",
-      "src\\EFCore.Sqlite.NTS\\EFCore.Sqlite.NTS.csproj",
-      "src\\EFCore.Sqlite\\EFCore.Sqlite.csproj",
-      "src\\EFCore.Tools\\EFCore.Tools.csproj",
-      "src\\EFCore\\EFCore.csproj",
-      "src\\dotnet-ef\\dotnet-ef.csproj",
-      "src\\ef\\ef.csproj",
-      "test\\EFCore.Analyzers.Tests\\EFCore.Analyzers.Tests.csproj",
-      "test\\EFCore.AspNet.InMemory.FunctionalTests\\EFCore.AspNet.InMemory.FunctionalTests.csproj",
-      "test\\EFCore.AspNet.Specification.Tests\\EFCore.AspNet.Specification.Tests.csproj",
-      "test\\EFCore.AspNet.SqlServer.FunctionalTests\\EFCore.AspNet.SqlServer.FunctionalTests.csproj",
-      "test\\EFCore.AspNet.Sqlite.FunctionalTests\\EFCore.AspNet.Sqlite.FunctionalTests.csproj",
-      "test\\EFCore.Cosmos.FunctionalTests\\EFCore.Cosmos.FunctionalTests.csproj",
-      "test\\EFCore.Cosmos.Tests\\EFCore.Cosmos.Tests.csproj",
-      "test\\EFCore.CrossStore.FunctionalTests\\EFCore.CrossStore.FunctionalTests.csproj",
-      "test\\EFCore.Design.Tests\\EFCore.Design.Tests.csproj",
-      "test\\EFCore.InMemory.FunctionalTests\\EFCore.InMemory.FunctionalTests.csproj",
-      "test\\EFCore.InMemory.Tests\\EFCore.InMemory.Tests.csproj",
-      "test\\EFCore.OData.FunctionalTests\\EFCore.OData.FunctionalTests.csproj",	  
-      "test\\EFCore.Proxies.Tests\\EFCore.Proxies.Tests.csproj",
-      "test\\EFCore.Relational.Specification.Tests\\EFCore.Relational.Specification.Tests.csproj",
-      "test\\EFCore.Relational.Tests\\EFCore.Relational.Tests.csproj",
-      "test\\EFCore.Specification.Tests\\EFCore.Specification.Tests.csproj",
-      "test\\EFCore.SqlServer.FunctionalTests\\EFCore.SqlServer.FunctionalTests.csproj",
-      "test\\EFCore.SqlServer.Tests\\EFCore.SqlServer.Tests.csproj",
-      "test\\EFCore.Sqlite.FunctionalTests\\EFCore.Sqlite.FunctionalTests.csproj",
-      "test\\EFCore.Sqlite.Tests\\EFCore.Sqlite.Tests.csproj",
-      "test\\EFCore.Tests\\EFCore.Tests.csproj",
-      "test\\dotnet-ef.Tests\\dotnet-ef.Tests.csproj",
-      "test\\ef.Tests\\ef.Tests.csproj"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/Microsoft.Data.Sqlite.slnf b/Microsoft.Data.Sqlite.slnf
index e3ba0427f1..993d24cad1 100644
--- a/Microsoft.Data.Sqlite.slnf
+++ b/Microsoft.Data.Sqlite.slnf
@@ -1,6 +1,6 @@
 {
   "solution": {
-    "path": "All.sln",
+    "path": "EFCore.sln",
     "projects": [
       "src\\Microsoft.Data.Sqlite.Core\\Microsoft.Data.Sqlite.Core.csproj",
       "src\\Microsoft.Data.Sqlite\\Microsoft.Data.Sqlite.csproj",