diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 91822b4..8f82700 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -35,7 +35,7 @@ jobs:
       run: dotnet restore
 
     - name: Test SqlServer
-      run: dotnet test "N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/N.EntityFramework.Extensions.SqlServer.Test.csproj" --configuration Release --settings N.EntityFramework.Extensions.SqlServer.runsettings --verbosity normal
+      run: dotnet test "N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test.csproj" --configuration Release --settings N.EntityFrameworkCore.Extensions.SqlServer.runsettings --verbosity normal
 
   test-mysql:
     runs-on: ubuntu-latest
@@ -49,7 +49,7 @@ jobs:
       run: dotnet restore
 
     - name: Test MySQL
-      run: dotnet test "N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/N.EntityFramework.Extensions.MySql.Test.csproj" --configuration Release --settings N.EntityFramework.Extensions.MySql.runsettings --verbosity normal
+      run: dotnet test "N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/N.EntityFrameworkCore.Extensions.MySql.Test.csproj" --configuration Release --settings N.EntityFrameworkCore.Extensions.MySql.runsettings --verbosity normal
 
   test-postgresql:
     runs-on: ubuntu-latest
@@ -63,4 +63,4 @@ jobs:
       run: dotnet restore
 
     - name: Test PostgreSQL
-      run: dotnet test "N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/N.EntityFramework.Extensions.PostgreSql.Test.csproj" --configuration Release --settings N.EntityFramework.Extensions.PostgreSql.runsettings --verbosity normal
+      run: dotnet test "N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test.csproj" --configuration Release --settings N.EntityFrameworkCore.Extensions.PostgreSql.runsettings --verbosity normal
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 104e1ec..c05c8b3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ env:
 
 jobs:
   publish-and-release:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     permissions:
       contents: write   # create tag and release, upload assets
 
@@ -46,22 +46,22 @@ jobs:
       - name: Pack (ensure .nupkg output)
         id: pack
         run: |
-          dotnet pack N.EntityFramework.Extensions.SqlServer/N.EntityFramework.Extensions.SqlServer.csproj --no-build -c Release -o out
-          dotnet pack N.EntityFramework.Extensions.PostgreSql/N.EntityFramework.Extensions.PostgreSql.csproj --no-build -c Release -o out
+          dotnet pack N.EntityFrameworkCore.Extensions.SqlServer/N.EntityFrameworkCore.Extensions.SqlServer.csproj --no-build -c Release -o out
+          dotnet pack N.EntityFrameworkCore.Extensions.PostgreSql/N.EntityFrameworkCore.Extensions.PostgreSql.csproj --no-build -c Release -o out
           dotnet pack N.EntityFrameworkCore.Extensions/N.EntityFrameworkCore.Extensions.csproj --no-build -c Release -o out
 
       - name: Publish to NuGet
         if: ${{ inputs.nuget_publish }}
-        run: dotnet nuget push .\out\*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source ${{ env.NUGET_SOURCE }} --skip-duplicate
+        run: dotnet nuget push ./out/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source ${{ env.NUGET_SOURCE }} --skip-duplicate
         env:
           NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
 
       - name: Create source zip
         run: |
-          $tag = "v${{ inputs.version }}"
-          git archive --format=zip --output=source-$tag.zip HEAD
-          echo "SOURCE_ZIP=source-$tag.zip" >> $env:GITHUB_ENV
-          echo "ARCHIVE_NAME=source-$tag.zip" >> $env:GITHUB_ENV
+          tag="v${{ inputs.version }}"
+          git archive --format=zip --output="source-${tag}.zip" HEAD
+          echo "SOURCE_ZIP=source-${tag}.zip" >> $GITHUB_ENV
+          echo "ARCHIVE_NAME=source-${tag}.zip" >> $GITHUB_ENV
 
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v2
diff --git a/N.EntityFramework.Extensions.MySql.runsettings b/N.EntityFrameworkCore.Extensions.MySql.runsettings
similarity index 100%
rename from N.EntityFramework.Extensions.MySql.runsettings
rename to N.EntityFrameworkCore.Extensions.MySql.runsettings
diff --git a/N.EntityFramework.Extensions.MySql/Common/Constants.cs b/N.EntityFrameworkCore.Extensions.MySql/Common/Constants.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Common/Constants.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Common/Constants.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/BulkDeleteOptions.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/BulkDeleteOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/BulkDeleteOptions.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/BulkDeleteOptions.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/BulkFetchOptions.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/BulkFetchOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/BulkFetchOptions.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/BulkFetchOptions.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/BulkInsertOptions.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/BulkInsertOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/BulkInsertOptions.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/BulkInsertOptions.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/BulkInsertResult.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/BulkInsertResult.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/BulkInsertResult.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/BulkInsertResult.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/BulkMergeOption.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/BulkMergeOption.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/BulkMergeOption.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/BulkMergeOption.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/BulkMergeOutputRow.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/BulkMergeOutputRow.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/BulkMergeOutputRow.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/BulkMergeOutputRow.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/BulkMergeResult.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/BulkMergeResult.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/BulkMergeResult.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/BulkMergeResult.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/BulkOperation.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/BulkOperation.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/BulkOperation.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/BulkOperation.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/BulkOperationAsync.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/BulkOperationAsync.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/BulkOperationAsync.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/BulkOperationAsync.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/BulkOptions.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/BulkOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/BulkOptions.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/BulkOptions.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/BulkQueryResult.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/BulkQueryResult.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/BulkQueryResult.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/BulkQueryResult.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/BulkSyncOptions.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/BulkSyncOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/BulkSyncOptions.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/BulkSyncOptions.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/BulkSyncResult.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/BulkSyncResult.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/BulkSyncResult.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/BulkSyncResult.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/BulkUpdateOptions.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/BulkUpdateOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/BulkUpdateOptions.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/BulkUpdateOptions.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/DatabaseFacadeExtensions.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/DatabaseFacadeExtensions.cs
similarity index 98%
rename from N.EntityFramework.Extensions.MySql/Data/DatabaseFacadeExtensions.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/DatabaseFacadeExtensions.cs
index 602cf86..94b1bb0 100644
--- a/N.EntityFramework.Extensions.MySql/Data/DatabaseFacadeExtensions.cs
+++ b/N.EntityFrameworkCore.Extensions.MySql/Data/DatabaseFacadeExtensions.cs
@@ -19,7 +19,8 @@ public static SqlQuery FromSqlQuery(this DatabaseFacade database, string sqlText
     }
     public static int ClearTable(this DatabaseFacade database, string tableName)
     {
-        return database.ExecuteSqlRaw($"DELETE FROM {database.DelimitTableName(tableName)}");
+        string sql = $"DELETE FROM {database.DelimitTableName(tableName)}";
+        return database.ExecuteSqlRaw(sql);
     }
     public static int DropTable(this DatabaseFacade database, string tableName, bool ifExists = false, bool isTemporary = false)
     {
diff --git a/N.EntityFramework.Extensions.MySql/Data/DatabaseFacadeExtensionsAsync.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/DatabaseFacadeExtensionsAsync.cs
similarity index 96%
rename from N.EntityFramework.Extensions.MySql/Data/DatabaseFacadeExtensionsAsync.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/DatabaseFacadeExtensionsAsync.cs
index a340222..e695d9d 100644
--- a/N.EntityFramework.Extensions.MySql/Data/DatabaseFacadeExtensionsAsync.cs
+++ b/N.EntityFrameworkCore.Extensions.MySql/Data/DatabaseFacadeExtensionsAsync.cs
@@ -12,7 +12,8 @@ public static class DatabaseFacadeExtensionsAsync
 {
     public static async Task<int> ClearTableAsync(this DatabaseFacade database, string tableName, CancellationToken cancellationToken = default)
     {
-        return await database.ExecuteSqlRawAsync($"DELETE FROM {database.DelimitTableName(tableName)}", cancellationToken);
+        string sql = $"DELETE FROM {database.DelimitTableName(tableName)}";
+        return await database.ExecuteSqlRawAsync(sql, cancellationToken);
     }
     public static async Task TruncateTableAsync(this DatabaseFacade database, string tableName, bool ifExists = false, CancellationToken cancellationToken = default)
     {
diff --git a/N.EntityFramework.Extensions.MySql/Data/DbContextExtensions.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/DbContextExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/DbContextExtensions.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/DbContextExtensions.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/DbContextExtensionsAsync.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/DbContextExtensionsAsync.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/DbContextExtensionsAsync.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/DbContextExtensionsAsync.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/DbTransactionContext.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/DbTransactionContext.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/DbTransactionContext.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/DbTransactionContext.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/EfExtensionsCommand.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/EfExtensionsCommand.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/EfExtensionsCommand.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/EfExtensionsCommand.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/EfExtensionsCommandInterceptor.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/EfExtensionsCommandInterceptor.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/EfExtensionsCommandInterceptor.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/EfExtensionsCommandInterceptor.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/EntityDataReader.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/EntityDataReader.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/EntityDataReader.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/EntityDataReader.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/FetchOptions.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/FetchOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/FetchOptions.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/FetchOptions.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/FetchResult.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/FetchResult.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/FetchResult.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/FetchResult.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/QueryToFileOptions.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/QueryToFileOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/QueryToFileOptions.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/QueryToFileOptions.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/QueryToFileResult.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/QueryToFileResult.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/QueryToFileResult.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/QueryToFileResult.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/SqlMergeAction.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/SqlMergeAction.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/SqlMergeAction.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/SqlMergeAction.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/SqlQuery.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/SqlQuery.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/SqlQuery.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/SqlQuery.cs
diff --git a/N.EntityFramework.Extensions.MySql/Data/TableMapping.cs b/N.EntityFrameworkCore.Extensions.MySql/Data/TableMapping.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Data/TableMapping.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Data/TableMapping.cs
diff --git a/N.EntityFramework.Extensions.MySql/Enums/ConnectionBehavior.cs b/N.EntityFrameworkCore.Extensions.MySql/Enums/ConnectionBehavior.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Enums/ConnectionBehavior.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Enums/ConnectionBehavior.cs
diff --git a/N.EntityFramework.Extensions.MySql/Enums/EfExtensionsCommandType.cs b/N.EntityFrameworkCore.Extensions.MySql/Enums/EfExtensionsCommandType.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Enums/EfExtensionsCommandType.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Enums/EfExtensionsCommandType.cs
diff --git a/N.EntityFramework.Extensions.MySql/Extensions/CommonExtensions.cs b/N.EntityFrameworkCore.Extensions.MySql/Extensions/CommonExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Extensions/CommonExtensions.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Extensions/CommonExtensions.cs
diff --git a/N.EntityFramework.Extensions.MySql/Extensions/DbDataReaderExtensions.cs b/N.EntityFrameworkCore.Extensions.MySql/Extensions/DbDataReaderExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Extensions/DbDataReaderExtensions.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Extensions/DbDataReaderExtensions.cs
diff --git a/N.EntityFramework.Extensions.MySql/Extensions/IPropertyExtensions.cs b/N.EntityFrameworkCore.Extensions.MySql/Extensions/IPropertyExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Extensions/IPropertyExtensions.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Extensions/IPropertyExtensions.cs
diff --git a/N.EntityFramework.Extensions.MySql/Extensions/LinqExtensions.cs b/N.EntityFrameworkCore.Extensions.MySql/Extensions/LinqExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Extensions/LinqExtensions.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Extensions/LinqExtensions.cs
diff --git a/N.EntityFramework.Extensions.MySql/Extensions/ObjectExtensions.cs b/N.EntityFrameworkCore.Extensions.MySql/Extensions/ObjectExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Extensions/ObjectExtensions.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Extensions/ObjectExtensions.cs
diff --git a/N.EntityFramework.Extensions.MySql/Extensions/SqlStatementExtensions.cs b/N.EntityFrameworkCore.Extensions.MySql/Extensions/SqlStatementExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Extensions/SqlStatementExtensions.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Extensions/SqlStatementExtensions.cs
diff --git a/N.EntityFramework.Extensions.MySql/GlobalSuppressions.cs b/N.EntityFrameworkCore.Extensions.MySql/GlobalSuppressions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/GlobalSuppressions.cs
rename to N.EntityFrameworkCore.Extensions.MySql/GlobalSuppressions.cs
diff --git a/N.EntityFramework.Extensions.MySql/N.EntityFramework.Extensions.MySql.csproj b/N.EntityFrameworkCore.Extensions.MySql/N.EntityFrameworkCore.Extensions.MySql.csproj
similarity index 75%
rename from N.EntityFramework.Extensions.MySql/N.EntityFramework.Extensions.MySql.csproj
rename to N.EntityFrameworkCore.Extensions.MySql/N.EntityFrameworkCore.Extensions.MySql.csproj
index 50f8d7d..3f11815 100644
--- a/N.EntityFramework.Extensions.MySql/N.EntityFramework.Extensions.MySql.csproj
+++ b/N.EntityFrameworkCore.Extensions.MySql/N.EntityFrameworkCore.Extensions.MySql.csproj
@@ -3,13 +3,13 @@
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
     <Version>9.0.0.1</Version>
-    <PackageId>N.EntityFramework.Extensions.MySql</PackageId>
+    <PackageId>N.EntityFrameworkCore.Extensions.MySql</PackageId>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageProjectUrl>https://github.com/NorthernLight1/N.EntityFrameworkCore.Extensions/</PackageProjectUrl>
     <Authors>Northern25</Authors>
     <Copyright>Copyright © 2026</Copyright>
     <Company />
-    <Description>N.EntityFramework.Extensions.MySql extends your DbContext in EF Core with high-performance bulk operations for MySql: BulkDelete, BulkInsert, BulkMerge, BulkSync, BulkUpdate, Fetch, DeleteFromQuery, InsertFromQuery, UpdateFromQuery.
+    <Description>N.EntityFrameworkCore.Extensions.MySql extends your DbContext in EF Core with high-performance bulk operations for MySql: BulkDelete, BulkInsert, BulkMerge, BulkSync, BulkUpdate, Fetch, DeleteFromQuery, InsertFromQuery, UpdateFromQuery.
 
 Inheritance models supported: Table-Per-Concrete, Table-Per-Hierarchy, Table-Per-Type</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -34,7 +34,7 @@ Inheritance models supported: Table-Per-Concrete, Table-Per-Hierarchy, Table-Per
   </ItemGroup>
 
   <ItemGroup>
-    <InternalsVisibleTo Include="N.EntityFramework.Extensions.MySql.Test" />
+    <InternalsVisibleTo Include="N.EntityFrameworkCore.Extensions.MySql.Test" />
   </ItemGroup>
   
 </Project>
diff --git a/N.EntityFramework.Extensions.MySql/Sql/SqlBuilder.cs b/N.EntityFrameworkCore.Extensions.MySql/Sql/SqlBuilder.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Sql/SqlBuilder.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Sql/SqlBuilder.cs
diff --git a/N.EntityFramework.Extensions.MySql/Sql/SqlClause.cs b/N.EntityFrameworkCore.Extensions.MySql/Sql/SqlClause.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Sql/SqlClause.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Sql/SqlClause.cs
diff --git a/N.EntityFramework.Extensions.MySql/Sql/SqlExpression.cs b/N.EntityFrameworkCore.Extensions.MySql/Sql/SqlExpression.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Sql/SqlExpression.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Sql/SqlExpression.cs
diff --git a/N.EntityFramework.Extensions.MySql/Sql/SqlExpressionType.cs b/N.EntityFrameworkCore.Extensions.MySql/Sql/SqlExpressionType.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Sql/SqlExpressionType.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Sql/SqlExpressionType.cs
diff --git a/N.EntityFramework.Extensions.MySql/Sql/SqlKeyword.cs b/N.EntityFrameworkCore.Extensions.MySql/Sql/SqlKeyword.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Sql/SqlKeyword.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Sql/SqlKeyword.cs
diff --git a/N.EntityFramework.Extensions.MySql/Sql/SqlPart.cs b/N.EntityFrameworkCore.Extensions.MySql/Sql/SqlPart.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Sql/SqlPart.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Sql/SqlPart.cs
diff --git a/N.EntityFramework.Extensions.MySql/Sql/SqlStatement.cs b/N.EntityFrameworkCore.Extensions.MySql/Sql/SqlStatement.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Sql/SqlStatement.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Sql/SqlStatement.cs
diff --git a/N.EntityFramework.Extensions.MySql/Util/CommonUtil.cs b/N.EntityFrameworkCore.Extensions.MySql/Util/CommonUtil.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Util/CommonUtil.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Util/CommonUtil.cs
diff --git a/N.EntityFramework.Extensions.MySql/Util/RelationalProviderUtil.cs b/N.EntityFrameworkCore.Extensions.MySql/Util/RelationalProviderUtil.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Util/RelationalProviderUtil.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Util/RelationalProviderUtil.cs
diff --git a/N.EntityFramework.Extensions.MySql/Util/SqlUtil.cs b/N.EntityFrameworkCore.Extensions.MySql/Util/SqlUtil.cs
similarity index 100%
rename from N.EntityFramework.Extensions.MySql/Util/SqlUtil.cs
rename to N.EntityFrameworkCore.Extensions.MySql/Util/SqlUtil.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql.runsettings b/N.EntityFrameworkCore.Extensions.PostgreSql.runsettings
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql.runsettings
rename to N.EntityFrameworkCore.Extensions.PostgreSql.runsettings
diff --git a/N.EntityFramework.Extensions.PostgreSql/Common/Constants.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Common/Constants.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Common/Constants.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Common/Constants.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/BulkDeleteOptions.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkDeleteOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/BulkDeleteOptions.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkDeleteOptions.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/BulkFetchOptions.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkFetchOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/BulkFetchOptions.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkFetchOptions.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/BulkInsertOptions.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkInsertOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/BulkInsertOptions.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkInsertOptions.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/BulkInsertResult.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkInsertResult.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/BulkInsertResult.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkInsertResult.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/BulkMergeOption.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkMergeOption.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/BulkMergeOption.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkMergeOption.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/BulkMergeOutputRow.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkMergeOutputRow.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/BulkMergeOutputRow.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkMergeOutputRow.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/BulkMergeResult.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkMergeResult.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/BulkMergeResult.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkMergeResult.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/BulkOperation.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkOperation.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/BulkOperation.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkOperation.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/BulkOperationAsync.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkOperationAsync.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/BulkOperationAsync.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkOperationAsync.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/BulkOptions.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/BulkOptions.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkOptions.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/BulkQueryResult.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkQueryResult.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/BulkQueryResult.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkQueryResult.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/BulkSyncOptions.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkSyncOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/BulkSyncOptions.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkSyncOptions.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/BulkSyncResult.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkSyncResult.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/BulkSyncResult.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkSyncResult.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/BulkUpdateOptions.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkUpdateOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/BulkUpdateOptions.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/BulkUpdateOptions.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/DatabaseFacadeExtensions.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/DatabaseFacadeExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/DatabaseFacadeExtensions.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/DatabaseFacadeExtensions.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/DatabaseFacadeExtensionsAsync.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/DatabaseFacadeExtensionsAsync.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/DatabaseFacadeExtensionsAsync.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/DatabaseFacadeExtensionsAsync.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/DbContextExtensions.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/DbContextExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/DbContextExtensions.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/DbContextExtensions.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/DbContextExtensionsAsync.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/DbContextExtensionsAsync.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/DbContextExtensionsAsync.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/DbContextExtensionsAsync.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/DbTransactionContext.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/DbTransactionContext.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/DbTransactionContext.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/DbTransactionContext.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/EfExtensionsCommand.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/EfExtensionsCommand.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/EfExtensionsCommand.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/EfExtensionsCommand.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/EfExtensionsCommandInterceptor.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/EfExtensionsCommandInterceptor.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/EfExtensionsCommandInterceptor.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/EfExtensionsCommandInterceptor.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/EntityDataReader.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/EntityDataReader.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/EntityDataReader.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/EntityDataReader.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/FetchOptions.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/FetchOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/FetchOptions.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/FetchOptions.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/FetchResult.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/FetchResult.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/FetchResult.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/FetchResult.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/QueryToFileOptions.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/QueryToFileOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/QueryToFileOptions.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/QueryToFileOptions.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/QueryToFileResult.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/QueryToFileResult.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/QueryToFileResult.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/QueryToFileResult.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/SqlMergeAction.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/SqlMergeAction.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/SqlMergeAction.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/SqlMergeAction.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/SqlQuery.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/SqlQuery.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/SqlQuery.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/SqlQuery.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Data/TableMapping.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Data/TableMapping.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Data/TableMapping.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Data/TableMapping.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Enums/ConnectionBehavior.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Enums/ConnectionBehavior.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Enums/ConnectionBehavior.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Enums/ConnectionBehavior.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Enums/EfExtensionsCommandType.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Enums/EfExtensionsCommandType.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Enums/EfExtensionsCommandType.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Enums/EfExtensionsCommandType.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Extensions/CommonExtensions.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Extensions/CommonExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Extensions/CommonExtensions.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Extensions/CommonExtensions.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Extensions/DbDataReaderExtensions.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Extensions/DbDataReaderExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Extensions/DbDataReaderExtensions.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Extensions/DbDataReaderExtensions.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Extensions/IPropertyExtensions.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Extensions/IPropertyExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Extensions/IPropertyExtensions.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Extensions/IPropertyExtensions.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Extensions/LinqExtensions.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Extensions/LinqExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Extensions/LinqExtensions.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Extensions/LinqExtensions.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Extensions/ObjectExtensions.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Extensions/ObjectExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Extensions/ObjectExtensions.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Extensions/ObjectExtensions.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Extensions/SqlStatementExtensions.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Extensions/SqlStatementExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Extensions/SqlStatementExtensions.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Extensions/SqlStatementExtensions.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/GlobalSuppressions.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/GlobalSuppressions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/GlobalSuppressions.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/GlobalSuppressions.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/N.EntityFramework.Extensions.PostgreSql.csproj b/N.EntityFrameworkCore.Extensions.PostgreSql/N.EntityFrameworkCore.Extensions.PostgreSql.csproj
similarity index 73%
rename from N.EntityFramework.Extensions.PostgreSql/N.EntityFramework.Extensions.PostgreSql.csproj
rename to N.EntityFrameworkCore.Extensions.PostgreSql/N.EntityFrameworkCore.Extensions.PostgreSql.csproj
index b1d810e..fe44301 100644
--- a/N.EntityFramework.Extensions.PostgreSql/N.EntityFramework.Extensions.PostgreSql.csproj
+++ b/N.EntityFrameworkCore.Extensions.PostgreSql/N.EntityFrameworkCore.Extensions.PostgreSql.csproj
@@ -3,13 +3,13 @@
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
     <Version>10.0.5.1</Version>
-    <PackageId>N.EntityFramework.Extensions.PostgreSql</PackageId>
+    <PackageId>N.EntityFrameworkCore.Extensions.PostgreSql</PackageId>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageProjectUrl>https://github.com/NorthernLight1/N.EntityFramework.Extensions.PostgreSql/</PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/NorthernLight1/N.EntityFrameworkCore.Extensions.PostgreSql/</PackageProjectUrl>
     <Authors>Northern25</Authors>
     <Copyright>Copyright © 2026</Copyright>
     <Company />
-    <Description>N.EntityFramework.Extensions.PostgreSql extends your DbContext in EF Core with high-performance bulk operations for PostgreSql: BulkDelete, BulkInsert, BulkMerge, BulkSync, BulkUpdate, Fetch, DeleteFromQuery, InsertFromQuery, UpdateFromQuery.
+    <Description>N.EntityFrameworkCore.Extensions.PostgreSql extends your DbContext in EF Core with high-performance bulk operations for PostgreSql: BulkDelete, BulkInsert, BulkMerge, BulkSync, BulkUpdate, Fetch, DeleteFromQuery, InsertFromQuery, UpdateFromQuery.
 
 Inheritance models supported: Table-Per-Concrete, Table-Per-Hierarchy, Table-Per-Type</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -36,7 +36,7 @@ Inheritance models supported: Table-Per-Concrete, Table-Per-Hierarchy, Table-Per
   </ItemGroup>
 
   <ItemGroup>
-    <InternalsVisibleTo Include="N.EntityFramework.Extensions.PostgreSql.Test" />
+    <InternalsVisibleTo Include="N.EntityFrameworkCore.Extensions.PostgreSql.Test" />
   </ItemGroup>
   
 </Project>
diff --git a/N.EntityFramework.Extensions.PostgreSql/Sql/SqlBuilder.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Sql/SqlBuilder.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Sql/SqlBuilder.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Sql/SqlBuilder.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Sql/SqlClause.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Sql/SqlClause.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Sql/SqlClause.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Sql/SqlClause.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Sql/SqlExpression.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Sql/SqlExpression.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Sql/SqlExpression.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Sql/SqlExpression.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Sql/SqlExpressionType.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Sql/SqlExpressionType.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Sql/SqlExpressionType.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Sql/SqlExpressionType.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Sql/SqlKeyword.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Sql/SqlKeyword.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Sql/SqlKeyword.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Sql/SqlKeyword.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Sql/SqlPart.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Sql/SqlPart.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Sql/SqlPart.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Sql/SqlPart.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Sql/SqlStatement.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Sql/SqlStatement.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Sql/SqlStatement.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Sql/SqlStatement.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Util/CommonUtil.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Util/CommonUtil.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Util/CommonUtil.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Util/CommonUtil.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Util/RelationalProviderUtil.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Util/RelationalProviderUtil.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Util/RelationalProviderUtil.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Util/RelationalProviderUtil.cs
diff --git a/N.EntityFramework.Extensions.PostgreSql/Util/SqlUtil.cs b/N.EntityFrameworkCore.Extensions.PostgreSql/Util/SqlUtil.cs
similarity index 100%
rename from N.EntityFramework.Extensions.PostgreSql/Util/SqlUtil.cs
rename to N.EntityFrameworkCore.Extensions.PostgreSql/Util/SqlUtil.cs
diff --git a/N.EntityFramework.Extensions.SqlServer.runsettings b/N.EntityFrameworkCore.Extensions.SqlServer.runsettings
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer.runsettings
rename to N.EntityFrameworkCore.Extensions.SqlServer.runsettings
diff --git a/N.EntityFramework.Extensions.SqlServer/Common/Constants.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Common/Constants.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Common/Constants.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Common/Constants.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/BulkDeleteOptions.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkDeleteOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/BulkDeleteOptions.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkDeleteOptions.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/BulkFetchOptions.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkFetchOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/BulkFetchOptions.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkFetchOptions.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/BulkInsertOptions.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkInsertOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/BulkInsertOptions.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkInsertOptions.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/BulkInsertResult.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkInsertResult.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/BulkInsertResult.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkInsertResult.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/BulkMergeOption.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkMergeOption.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/BulkMergeOption.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkMergeOption.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/BulkMergeOutputRow.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkMergeOutputRow.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/BulkMergeOutputRow.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkMergeOutputRow.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/BulkMergeResult.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkMergeResult.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/BulkMergeResult.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkMergeResult.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/BulkOperation.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkOperation.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/BulkOperation.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkOperation.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/BulkOperationAsync.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkOperationAsync.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/BulkOperationAsync.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkOperationAsync.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/BulkOptions.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/BulkOptions.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkOptions.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/BulkQueryResult.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkQueryResult.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/BulkQueryResult.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkQueryResult.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/BulkSyncOptions.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkSyncOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/BulkSyncOptions.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkSyncOptions.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/BulkSyncResult.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkSyncResult.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/BulkSyncResult.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkSyncResult.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/BulkUpdateOptions.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkUpdateOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/BulkUpdateOptions.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/BulkUpdateOptions.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/DatabaseFacadeExtensions.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/DatabaseFacadeExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/DatabaseFacadeExtensions.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/DatabaseFacadeExtensions.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/DatabaseFacadeExtensionsAsync.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/DatabaseFacadeExtensionsAsync.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/DatabaseFacadeExtensionsAsync.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/DatabaseFacadeExtensionsAsync.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/DbContextExtensions.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/DbContextExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/DbContextExtensions.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/DbContextExtensions.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/DbContextExtensionsAsync.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/DbContextExtensionsAsync.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/DbContextExtensionsAsync.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/DbContextExtensionsAsync.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/DbTransactionContext.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/DbTransactionContext.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/DbTransactionContext.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/DbTransactionContext.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/EfExtensionsCommand.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/EfExtensionsCommand.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/EfExtensionsCommand.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/EfExtensionsCommand.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/EfExtensionsCommandInterceptor.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/EfExtensionsCommandInterceptor.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/EfExtensionsCommandInterceptor.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/EfExtensionsCommandInterceptor.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/EntityDataReader.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/EntityDataReader.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/EntityDataReader.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/EntityDataReader.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/FetchOptions.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/FetchOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/FetchOptions.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/FetchOptions.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/FetchResult.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/FetchResult.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/FetchResult.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/FetchResult.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/QueryToFileOptions.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/QueryToFileOptions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/QueryToFileOptions.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/QueryToFileOptions.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/QueryToFileResult.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/QueryToFileResult.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/QueryToFileResult.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/QueryToFileResult.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/SqlMergeAction.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/SqlMergeAction.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/SqlMergeAction.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/SqlMergeAction.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/SqlQuery.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/SqlQuery.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/SqlQuery.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/SqlQuery.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Data/TableMapping.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Data/TableMapping.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Data/TableMapping.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Data/TableMapping.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Enums/ConnectionBehavior.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Enums/ConnectionBehavior.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Enums/ConnectionBehavior.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Enums/ConnectionBehavior.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Enums/EfExtensionsCommandType.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Enums/EfExtensionsCommandType.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Enums/EfExtensionsCommandType.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Enums/EfExtensionsCommandType.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Extensions/CommonExtensions.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Extensions/CommonExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Extensions/CommonExtensions.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Extensions/CommonExtensions.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Extensions/DbDataReaderExtensions.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Extensions/DbDataReaderExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Extensions/DbDataReaderExtensions.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Extensions/DbDataReaderExtensions.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Extensions/IPropertyExtensions.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Extensions/IPropertyExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Extensions/IPropertyExtensions.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Extensions/IPropertyExtensions.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Extensions/LinqExtensions.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Extensions/LinqExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Extensions/LinqExtensions.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Extensions/LinqExtensions.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Extensions/ObjectExtensions.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Extensions/ObjectExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Extensions/ObjectExtensions.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Extensions/ObjectExtensions.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Extensions/SqlStatementExtensions.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Extensions/SqlStatementExtensions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Extensions/SqlStatementExtensions.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Extensions/SqlStatementExtensions.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/GlobalSuppressions.cs b/N.EntityFrameworkCore.Extensions.SqlServer/GlobalSuppressions.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/GlobalSuppressions.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/GlobalSuppressions.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/N.EntityFramework.Extensions.SqlServer.csproj b/N.EntityFrameworkCore.Extensions.SqlServer/N.EntityFrameworkCore.Extensions.SqlServer.csproj
similarity index 86%
rename from N.EntityFramework.Extensions.SqlServer/N.EntityFramework.Extensions.SqlServer.csproj
rename to N.EntityFrameworkCore.Extensions.SqlServer/N.EntityFrameworkCore.Extensions.SqlServer.csproj
index 1d81891..5476463 100644
--- a/N.EntityFramework.Extensions.SqlServer/N.EntityFramework.Extensions.SqlServer.csproj
+++ b/N.EntityFrameworkCore.Extensions.SqlServer/N.EntityFrameworkCore.Extensions.SqlServer.csproj
@@ -3,8 +3,8 @@
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
     <Version>10.0.5.1</Version>
-    <PackageId>N.EntityFramework.Extensions.SqlServer</PackageId>
-    <AssemblyName>N.EntityFramework.Extensions.SqlServer</AssemblyName>
+    <PackageId>N.EntityFrameworkCore.Extensions.SqlServer</PackageId>
+    <AssemblyName>N.EntityFrameworkCore.Extensions.SqlServer</AssemblyName>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageProjectUrl>https://github.com/NorthernLight1/N.EntityFrameworkCore.Extensions/</PackageProjectUrl>
     <Authors>Northern25</Authors>
@@ -35,7 +35,7 @@ Inheritance models supported: Table-Per-Concrete, Table-Per-Hierarchy, Table-Per
   </ItemGroup>
 
   <ItemGroup>
-    <InternalsVisibleTo Include="N.EntityFramework.Extensions.SqlServer.Test" />
+    <InternalsVisibleTo Include="N.EntityFrameworkCore.Extensions.SqlServer.Test" />
   </ItemGroup>
 
 
diff --git a/N.EntityFramework.Extensions.SqlServer/Sql/SqlBuilder.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Sql/SqlBuilder.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Sql/SqlBuilder.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Sql/SqlBuilder.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Sql/SqlClause.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Sql/SqlClause.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Sql/SqlClause.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Sql/SqlClause.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Sql/SqlExpression.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Sql/SqlExpression.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Sql/SqlExpression.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Sql/SqlExpression.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Sql/SqlExpressionType.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Sql/SqlExpressionType.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Sql/SqlExpressionType.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Sql/SqlExpressionType.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Sql/SqlKeyword.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Sql/SqlKeyword.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Sql/SqlKeyword.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Sql/SqlKeyword.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Sql/SqlPart.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Sql/SqlPart.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Sql/SqlPart.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Sql/SqlPart.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Sql/SqlStatement.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Sql/SqlStatement.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Sql/SqlStatement.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Sql/SqlStatement.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Util/CommonUtil.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Util/CommonUtil.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Util/CommonUtil.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Util/CommonUtil.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Util/RelationalProviderUtil.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Util/RelationalProviderUtil.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Util/RelationalProviderUtil.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Util/RelationalProviderUtil.cs
diff --git a/N.EntityFramework.Extensions.SqlServer/Util/SqlUtil.cs b/N.EntityFrameworkCore.Extensions.SqlServer/Util/SqlUtil.cs
similarity index 100%
rename from N.EntityFramework.Extensions.SqlServer/Util/SqlUtil.cs
rename to N.EntityFrameworkCore.Extensions.SqlServer/Util/SqlUtil.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Common/Config.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Common/Config.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Common/Config.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Common/Config.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Common/MySqlContainerManager.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Common/MySqlContainerManager.cs
similarity index 95%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Common/MySqlContainerManager.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Common/MySqlContainerManager.cs
index e83a04b..6466031 100644
--- a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Common/MySqlContainerManager.cs
+++ b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Common/MySqlContainerManager.cs
@@ -35,8 +35,7 @@ private static async Task StartContainerAsync()
     {
         try
         {
-            container = new MySqlBuilder()
-                .WithImage("mysql:8.4")
+            container = new MySqlBuilder("mysql:8.4")
                 .WithDatabase("NEntityFrameworkCoreExtensions")
                 .WithUsername("root")
                 .WithPassword("mysql")
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Common/TestDatabaseInitializer.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Common/TestDatabaseInitializer.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Common/TestDatabaseInitializer.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Common/TestDatabaseInitializer.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/Address.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/Address.cs
similarity index 76%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/Address.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/Address.cs
index 6396e16..aede9ed 100644
--- a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/Address.cs
+++ b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/Address.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
+#nullable enable
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace N.EntityFrameworkCore.Extensions.Test.Data;
 
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/Enums/ProductStatus.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/Enums/ProductStatus.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/Enums/ProductStatus.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/Enums/ProductStatus.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/Order.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/Order.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/Order.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/Order.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/OrderWithComplexType.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/OrderWithComplexType.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/OrderWithComplexType.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/OrderWithComplexType.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/Position.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/Position.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/Position.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/Position.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/Product.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/Product.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/Product.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/Product.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/ProductCategory.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/ProductCategory.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/ProductCategory.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/ProductCategory.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/ProductWithComplexKey.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/ProductWithComplexKey.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/ProductWithComplexKey.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/ProductWithComplexKey.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/ProductWithCustomSchema.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/ProductWithCustomSchema.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/ProductWithCustomSchema.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/ProductWithCustomSchema.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/ProductWithTrigger.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/ProductWithTrigger.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/ProductWithTrigger.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/ProductWithTrigger.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/TestDbContext.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/TestDbContext.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/TestDbContext.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/TestDbContext.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/TpcCustomer.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/TpcCustomer.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/TpcCustomer.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/TpcCustomer.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/TpcPerson.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/TpcPerson.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/TpcPerson.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/TpcPerson.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/TpcVendor.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/TpcVendor.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/TpcVendor.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/TpcVendor.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/TphCustomer.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/TphCustomer.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/TphCustomer.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/TphCustomer.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/TphPerson.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/TphPerson.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/TphPerson.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/TphPerson.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/TphVendor.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/TphVendor.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/TphVendor.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/TphVendor.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/TptCustomer.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/TptCustomer.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/TptCustomer.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/TptCustomer.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/TptPerson.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/TptPerson.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/TptPerson.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/TptPerson.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/TptVendor.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/TptVendor.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/TptVendor.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/Data/TptVendor.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DatabaseExtensions/DatabaseExtensionsBase.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DatabaseExtensions/DatabaseExtensionsBase.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DatabaseExtensions/DatabaseExtensionsBase.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DatabaseExtensions/DatabaseExtensionsBase.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DatabaseExtensions/SqlQueryToCsvFile.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DatabaseExtensions/SqlQueryToCsvFile.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DatabaseExtensions/SqlQueryToCsvFile.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DatabaseExtensions/SqlQueryToCsvFile.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DatabaseExtensions/SqlQueryToCsvFileAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DatabaseExtensions/SqlQueryToCsvFileAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DatabaseExtensions/SqlQueryToCsvFileAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DatabaseExtensions/SqlQueryToCsvFileAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DatabaseExtensions/SqlQuery_Count.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DatabaseExtensions/SqlQuery_Count.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DatabaseExtensions/SqlQuery_Count.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DatabaseExtensions/SqlQuery_Count.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DatabaseExtensions/SqlQuery_CountAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DatabaseExtensions/SqlQuery_CountAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DatabaseExtensions/SqlQuery_CountAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DatabaseExtensions/SqlQuery_CountAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DatabaseExtensions/TableExists.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DatabaseExtensions/TableExists.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DatabaseExtensions/TableExists.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DatabaseExtensions/TableExists.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DatabaseExtensions/TruncateTable.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DatabaseExtensions/TruncateTable.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DatabaseExtensions/TruncateTable.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DatabaseExtensions/TruncateTable.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DatabaseExtensions/TruncateTableAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DatabaseExtensions/TruncateTableAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DatabaseExtensions/TruncateTableAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DatabaseExtensions/TruncateTableAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkDelete.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkDelete.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkDelete.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkDelete.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkDeleteAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkDeleteAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkDeleteAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkDeleteAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkFetch.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkFetch.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkFetch.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkFetch.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkFetchAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkFetchAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkFetchAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkFetchAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkInsert.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkInsert.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkInsert.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkInsert.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkInsertAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkInsertAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkInsertAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkInsertAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkMerge.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkMerge.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkMerge.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkMerge.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkMergeAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkMergeAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkMergeAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkMergeAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkSaveChanges.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkSaveChanges.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkSaveChanges.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkSaveChanges.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkSaveChangesAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkSaveChangesAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkSaveChangesAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkSaveChangesAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkSync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkSync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkSync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkSync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkSyncAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkSyncAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkSyncAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkSyncAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkUpdate.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkUpdate.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkUpdate.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkUpdate.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkUpdateAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkUpdateAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/BulkUpdateAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/BulkUpdateAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/DbContextExtensionsBase.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/DbContextExtensionsBase.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/DbContextExtensionsBase.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/DbContextExtensionsBase.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/DeleteFromQuery.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/DeleteFromQuery.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/DeleteFromQuery.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/DeleteFromQuery.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/DeleteFromQueryAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/DeleteFromQueryAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/DeleteFromQueryAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/DeleteFromQueryAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/Fetch.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/Fetch.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/Fetch.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/Fetch.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/FetchAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/FetchAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/FetchAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/FetchAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/InsertFromQuery.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/InsertFromQuery.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/InsertFromQuery.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/InsertFromQuery.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/InsertFromQueryAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/InsertFromQueryAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/InsertFromQueryAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/InsertFromQueryAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/QueryToCsvFile.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/QueryToCsvFile.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/QueryToCsvFile.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/QueryToCsvFile.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/QueryToCsvFileAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/QueryToCsvFileAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/QueryToCsvFileAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/QueryToCsvFileAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/UpdateFromQuery.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/UpdateFromQuery.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/UpdateFromQuery.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/UpdateFromQuery.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/UpdateFromQueryAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/UpdateFromQueryAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbContextExtensions/UpdateFromQueryAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbContextExtensions/UpdateFromQueryAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbSetExtensions/Clear.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbSetExtensions/Clear.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbSetExtensions/Clear.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbSetExtensions/Clear.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbSetExtensions/ClearAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbSetExtensions/ClearAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbSetExtensions/ClearAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbSetExtensions/ClearAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbSetExtensions/Truncate.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbSetExtensions/Truncate.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbSetExtensions/Truncate.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbSetExtensions/Truncate.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbSetExtensions/TruncateAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbSetExtensions/TruncateAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/DbSetExtensions/TruncateAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/DbSetExtensions/TruncateAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/LinqExtensions/ToSqlPredicateTests.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/LinqExtensions/ToSqlPredicateTests.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/LinqExtensions/ToSqlPredicateTests.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/LinqExtensions/ToSqlPredicateTests.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/N.EntityFramework.Extensions.MySql.Test.csproj b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/N.EntityFrameworkCore.Extensions.MySql.Test.csproj
similarity index 87%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/N.EntityFramework.Extensions.MySql.Test.csproj
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/N.EntityFrameworkCore.Extensions.MySql.Test.csproj
index fcf453b..87da018 100644
--- a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/N.EntityFramework.Extensions.MySql.Test.csproj
+++ b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/N.EntityFrameworkCore.Extensions.MySql.Test.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
     <Version></Version>
-    <RunSettingsFilePath>$(MSBuildThisFileDirectory)..\..\N.EntityFramework.Extensions.MySql.runsettings</RunSettingsFilePath>
+    <RunSettingsFilePath>$(MSBuildThisFileDirectory)..\..\N.EntityFrameworkCore.Extensions.MySql.runsettings</RunSettingsFilePath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\N.EntityFramework.Extensions.MySql\N.EntityFramework.Extensions.MySql.csproj" />
+    <ProjectReference Include="..\..\N.EntityFrameworkCore.Extensions.MySql\N.EntityFrameworkCore.Extensions.MySql.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/appsettings.json b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/appsettings.json
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/appsettings.json
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.MySql.Test/appsettings.json
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Common/Config.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Common/Config.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Common/Config.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Common/Config.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Common/PostgreSqlContainerManager.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Common/PostgreSqlContainerManager.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Common/PostgreSqlContainerManager.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Common/PostgreSqlContainerManager.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Common/TestDatabaseInitializer.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Common/TestDatabaseInitializer.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Common/TestDatabaseInitializer.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Common/TestDatabaseInitializer.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/Address.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/Address.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.MySql.Test/Data/Address.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/Address.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/Enums/ProductStatus.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/Enums/ProductStatus.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/Enums/ProductStatus.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/Enums/ProductStatus.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/Order.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/Order.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/Order.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/Order.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/OrderWithComplexType.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/OrderWithComplexType.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/OrderWithComplexType.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/OrderWithComplexType.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/Position.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/Position.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/Position.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/Position.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/Product.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/Product.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/Product.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/Product.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/ProductCategory.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/ProductCategory.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/ProductCategory.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/ProductCategory.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/ProductWithComplexKey.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/ProductWithComplexKey.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/ProductWithComplexKey.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/ProductWithComplexKey.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/ProductWithCustomSchema.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/ProductWithCustomSchema.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/ProductWithCustomSchema.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/ProductWithCustomSchema.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/ProductWithTrigger.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/ProductWithTrigger.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/ProductWithTrigger.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/ProductWithTrigger.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/TestDbContext.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/TestDbContext.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/TestDbContext.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/TestDbContext.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/TpcCustomer.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/TpcCustomer.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/TpcCustomer.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/TpcCustomer.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/TpcPerson.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/TpcPerson.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/TpcPerson.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/TpcPerson.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/TpcVendor.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/TpcVendor.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/TpcVendor.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/TpcVendor.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/TphCustomer.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/TphCustomer.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/TphCustomer.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/TphCustomer.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/TphPerson.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/TphPerson.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/TphPerson.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/TphPerson.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/TphVendor.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/TphVendor.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/TphVendor.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/TphVendor.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/TptCustomer.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/TptCustomer.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/TptCustomer.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/TptCustomer.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/TptPerson.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/TptPerson.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/TptPerson.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/TptPerson.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/TptVendor.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/TptVendor.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/TptVendor.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Data/TptVendor.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DatabaseExtensions/DatabaseExtensionsBase.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DatabaseExtensions/DatabaseExtensionsBase.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DatabaseExtensions/DatabaseExtensionsBase.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DatabaseExtensions/DatabaseExtensionsBase.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DatabaseExtensions/SqlQueryToCsvFile.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DatabaseExtensions/SqlQueryToCsvFile.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DatabaseExtensions/SqlQueryToCsvFile.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DatabaseExtensions/SqlQueryToCsvFile.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DatabaseExtensions/SqlQueryToCsvFileAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DatabaseExtensions/SqlQueryToCsvFileAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DatabaseExtensions/SqlQueryToCsvFileAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DatabaseExtensions/SqlQueryToCsvFileAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DatabaseExtensions/SqlQuery_Count.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DatabaseExtensions/SqlQuery_Count.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DatabaseExtensions/SqlQuery_Count.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DatabaseExtensions/SqlQuery_Count.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DatabaseExtensions/SqlQuery_CountAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DatabaseExtensions/SqlQuery_CountAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DatabaseExtensions/SqlQuery_CountAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DatabaseExtensions/SqlQuery_CountAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DatabaseExtensions/TableExists.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DatabaseExtensions/TableExists.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DatabaseExtensions/TableExists.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DatabaseExtensions/TableExists.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DatabaseExtensions/TruncateTable.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DatabaseExtensions/TruncateTable.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DatabaseExtensions/TruncateTable.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DatabaseExtensions/TruncateTable.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DatabaseExtensions/TruncateTableAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DatabaseExtensions/TruncateTableAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DatabaseExtensions/TruncateTableAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DatabaseExtensions/TruncateTableAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkDelete.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkDelete.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkDelete.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkDelete.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkDeleteAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkDeleteAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkDeleteAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkDeleteAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkFetch.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkFetch.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkFetch.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkFetch.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkFetchAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkFetchAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkFetchAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkFetchAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkInsert.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkInsert.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkInsert.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkInsert.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkInsertAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkInsertAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkInsertAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkInsertAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkMerge.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkMerge.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkMerge.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkMerge.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkMergeAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkMergeAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkMergeAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkMergeAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkSaveChanges.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkSaveChanges.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkSaveChanges.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkSaveChanges.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkSaveChangesAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkSaveChangesAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkSaveChangesAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkSaveChangesAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkSync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkSync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkSync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkSync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkSyncAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkSyncAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkSyncAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkSyncAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkUpdate.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkUpdate.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkUpdate.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkUpdate.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkUpdateAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkUpdateAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/BulkUpdateAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/BulkUpdateAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/DbContextExtensionsBase.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/DbContextExtensionsBase.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/DbContextExtensionsBase.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/DbContextExtensionsBase.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/DeleteFromQuery.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/DeleteFromQuery.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/DeleteFromQuery.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/DeleteFromQuery.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/DeleteFromQueryAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/DeleteFromQueryAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/DeleteFromQueryAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/DeleteFromQueryAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/Fetch.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/Fetch.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/Fetch.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/Fetch.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/FetchAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/FetchAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/FetchAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/FetchAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/InsertFromQuery.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/InsertFromQuery.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/InsertFromQuery.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/InsertFromQuery.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/InsertFromQueryAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/InsertFromQueryAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/InsertFromQueryAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/InsertFromQueryAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/QueryToCsvFile.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/QueryToCsvFile.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/QueryToCsvFile.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/QueryToCsvFile.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/QueryToCsvFileAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/QueryToCsvFileAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/QueryToCsvFileAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/QueryToCsvFileAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/UpdateFromQuery.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/UpdateFromQuery.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/UpdateFromQuery.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/UpdateFromQuery.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/UpdateFromQueryAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/UpdateFromQueryAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbContextExtensions/UpdateFromQueryAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbContextExtensions/UpdateFromQueryAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbSetExtensions/Clear.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbSetExtensions/Clear.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbSetExtensions/Clear.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbSetExtensions/Clear.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbSetExtensions/ClearAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbSetExtensions/ClearAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbSetExtensions/ClearAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbSetExtensions/ClearAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbSetExtensions/Truncate.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbSetExtensions/Truncate.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbSetExtensions/Truncate.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbSetExtensions/Truncate.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbSetExtensions/TruncateAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbSetExtensions/TruncateAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/DbSetExtensions/TruncateAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/DbSetExtensions/TruncateAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/LinqExtensions/ToSqlPredicateTests.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/LinqExtensions/ToSqlPredicateTests.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/LinqExtensions/ToSqlPredicateTests.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/LinqExtensions/ToSqlPredicateTests.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Migrations/20250509021251_Initial.Designer.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Migrations/20250509021251_Initial.Designer.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Migrations/20250509021251_Initial.Designer.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Migrations/20250509021251_Initial.Designer.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Migrations/20250509021251_Initial.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Migrations/20250509021251_Initial.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Migrations/20250509021251_Initial.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Migrations/20250509021251_Initial.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Migrations/TestDbContextModelSnapshot.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Migrations/TestDbContextModelSnapshot.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Migrations/TestDbContextModelSnapshot.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/Migrations/TestDbContextModelSnapshot.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/N.EntityFramework.Extensions.PostgreSql.Test.csproj b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test.csproj
similarity index 89%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/N.EntityFramework.Extensions.PostgreSql.Test.csproj
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test.csproj
index f175b5e..5597a8b 100644
--- a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/N.EntityFramework.Extensions.PostgreSql.Test.csproj
+++ b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
     <Version></Version>
-    <RunSettingsFilePath>$(MSBuildThisFileDirectory)..\..\N.EntityFramework.Extensions.PostgreSql.runsettings</RunSettingsFilePath>
+    <RunSettingsFilePath>$(MSBuildThisFileDirectory)..\..\N.EntityFrameworkCore.Extensions.PostgreSql.runsettings</RunSettingsFilePath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\N.EntityFramework.Extensions.PostgreSql\N.EntityFramework.Extensions.PostgreSql.csproj" />
+    <ProjectReference Include="..\..\N.EntityFrameworkCore.Extensions.PostgreSql\N.EntityFrameworkCore.Extensions.PostgreSql.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/appsettings.json b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/appsettings.json
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/appsettings.json
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.PostgreSql.Test/appsettings.json
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Common/Config.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Common/Config.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Common/Config.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Common/Config.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Common/SqlServerContainerManager.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Common/SqlServerContainerManager.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Common/SqlServerContainerManager.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Common/SqlServerContainerManager.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Common/TestDatabaseInitializer.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Common/TestDatabaseInitializer.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Common/TestDatabaseInitializer.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Common/TestDatabaseInitializer.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/Address.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/Address.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.PostgreSql.Test/Data/Address.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/Address.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/Enums/ProductStatus.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/Enums/ProductStatus.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/Enums/ProductStatus.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/Enums/ProductStatus.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/Order.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/Order.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/Order.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/Order.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/OrderWithComplexType.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/OrderWithComplexType.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/OrderWithComplexType.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/OrderWithComplexType.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/Position.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/Position.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/Position.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/Position.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/Product.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/Product.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/Product.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/Product.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/ProductCategory.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/ProductCategory.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/ProductCategory.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/ProductCategory.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/ProductWithComplexKey.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/ProductWithComplexKey.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/ProductWithComplexKey.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/ProductWithComplexKey.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/ProductWithCustomSchema.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/ProductWithCustomSchema.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/ProductWithCustomSchema.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/ProductWithCustomSchema.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/ProductWithTrigger.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/ProductWithTrigger.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/ProductWithTrigger.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/ProductWithTrigger.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/TestDbContext.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/TestDbContext.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/TestDbContext.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/TestDbContext.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/TpcCustomer.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/TpcCustomer.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/TpcCustomer.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/TpcCustomer.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/TpcPerson.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/TpcPerson.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/TpcPerson.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/TpcPerson.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/TpcVendor.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/TpcVendor.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/TpcVendor.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/TpcVendor.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/TphCustomer.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/TphCustomer.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/TphCustomer.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/TphCustomer.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/TphPerson.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/TphPerson.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/TphPerson.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/TphPerson.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/TphVendor.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/TphVendor.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/TphVendor.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/TphVendor.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/TptCustomer.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/TptCustomer.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/TptCustomer.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/TptCustomer.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/TptPerson.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/TptPerson.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/TptPerson.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/TptPerson.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/TptVendor.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/TptVendor.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Data/TptVendor.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Data/TptVendor.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DatabaseExtensions/DatabaseExtensionsBase.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DatabaseExtensions/DatabaseExtensionsBase.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DatabaseExtensions/DatabaseExtensionsBase.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DatabaseExtensions/DatabaseExtensionsBase.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DatabaseExtensions/SqlQueryToCsvFile.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DatabaseExtensions/SqlQueryToCsvFile.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DatabaseExtensions/SqlQueryToCsvFile.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DatabaseExtensions/SqlQueryToCsvFile.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DatabaseExtensions/SqlQueryToCsvFileAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DatabaseExtensions/SqlQueryToCsvFileAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DatabaseExtensions/SqlQueryToCsvFileAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DatabaseExtensions/SqlQueryToCsvFileAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DatabaseExtensions/SqlQuery_Count.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DatabaseExtensions/SqlQuery_Count.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DatabaseExtensions/SqlQuery_Count.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DatabaseExtensions/SqlQuery_Count.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DatabaseExtensions/SqlQuery_CountAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DatabaseExtensions/SqlQuery_CountAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DatabaseExtensions/SqlQuery_CountAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DatabaseExtensions/SqlQuery_CountAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DatabaseExtensions/TableExists.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DatabaseExtensions/TableExists.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DatabaseExtensions/TableExists.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DatabaseExtensions/TableExists.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DatabaseExtensions/TruncateTable.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DatabaseExtensions/TruncateTable.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DatabaseExtensions/TruncateTable.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DatabaseExtensions/TruncateTable.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DatabaseExtensions/TruncateTableAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DatabaseExtensions/TruncateTableAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DatabaseExtensions/TruncateTableAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DatabaseExtensions/TruncateTableAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkDelete.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkDelete.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkDelete.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkDelete.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkDeleteAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkDeleteAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkDeleteAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkDeleteAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkFetch.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkFetch.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkFetch.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkFetch.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkFetchAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkFetchAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkFetchAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkFetchAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkInsert.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkInsert.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkInsert.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkInsert.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkInsertAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkInsertAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkInsertAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkInsertAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkMerge.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkMerge.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkMerge.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkMerge.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkMergeAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkMergeAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkMergeAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkMergeAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkSaveChanges.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkSaveChanges.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkSaveChanges.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkSaveChanges.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkSaveChangesAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkSaveChangesAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkSaveChangesAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkSaveChangesAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkSync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkSync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkSync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkSync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkSyncAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkSyncAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkSyncAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkSyncAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkUpdate.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkUpdate.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkUpdate.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkUpdate.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkUpdateAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkUpdateAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/BulkUpdateAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/BulkUpdateAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/DbContextExtensionsBase.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/DbContextExtensionsBase.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/DbContextExtensionsBase.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/DbContextExtensionsBase.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/DeleteFromQuery.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/DeleteFromQuery.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/DeleteFromQuery.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/DeleteFromQuery.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/DeleteFromQueryAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/DeleteFromQueryAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/DeleteFromQueryAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/DeleteFromQueryAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/Fetch.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/Fetch.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/Fetch.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/Fetch.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/FetchAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/FetchAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/FetchAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/FetchAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/InsertFromQuery.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/InsertFromQuery.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/InsertFromQuery.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/InsertFromQuery.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/InsertFromQueryAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/InsertFromQueryAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/InsertFromQueryAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/InsertFromQueryAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/QueryToCsvFile.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/QueryToCsvFile.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/QueryToCsvFile.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/QueryToCsvFile.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/QueryToCsvFileAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/QueryToCsvFileAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/QueryToCsvFileAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/QueryToCsvFileAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/UpdateFromQuery.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/UpdateFromQuery.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/UpdateFromQuery.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/UpdateFromQuery.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/UpdateFromQueryAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/UpdateFromQueryAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbContextExtensions/UpdateFromQueryAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbContextExtensions/UpdateFromQueryAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbSetExtensions/Clear.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbSetExtensions/Clear.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbSetExtensions/Clear.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbSetExtensions/Clear.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbSetExtensions/ClearAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbSetExtensions/ClearAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbSetExtensions/ClearAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbSetExtensions/ClearAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbSetExtensions/Truncate.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbSetExtensions/Truncate.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbSetExtensions/Truncate.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbSetExtensions/Truncate.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbSetExtensions/TruncateAsync.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbSetExtensions/TruncateAsync.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/DbSetExtensions/TruncateAsync.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/DbSetExtensions/TruncateAsync.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/LinqExtensions/ToSqlPredicateTests.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/LinqExtensions/ToSqlPredicateTests.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/LinqExtensions/ToSqlPredicateTests.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/LinqExtensions/ToSqlPredicateTests.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Migrations/20250509021251_Initial.Designer.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Migrations/20250509021251_Initial.Designer.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Migrations/20250509021251_Initial.Designer.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Migrations/20250509021251_Initial.Designer.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Migrations/20250509021251_Initial.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Migrations/20250509021251_Initial.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Migrations/20250509021251_Initial.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Migrations/20250509021251_Initial.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Migrations/TestDbContextModelSnapshot.cs b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Migrations/TestDbContextModelSnapshot.cs
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/Migrations/TestDbContextModelSnapshot.cs
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/Migrations/TestDbContextModelSnapshot.cs
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/N.EntityFramework.Extensions.SqlServer.Test.csproj b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test.csproj
similarity index 88%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/N.EntityFramework.Extensions.SqlServer.Test.csproj
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test.csproj
index 9690c96..f8139e1 100644
--- a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/N.EntityFramework.Extensions.SqlServer.Test.csproj
+++ b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
     <Version></Version>
-    <RunSettingsFilePath>$(MSBuildThisFileDirectory)..\..\N.EntityFramework.Extensions.SqlServer.runsettings</RunSettingsFilePath>
+    <RunSettingsFilePath>$(MSBuildThisFileDirectory)..\..\N.EntityFrameworkCore.Extensions.SqlServer.runsettings</RunSettingsFilePath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\N.EntityFramework.Extensions.SqlServer\N.EntityFramework.Extensions.SqlServer.csproj" />
+    <ProjectReference Include="..\..\N.EntityFrameworkCore.Extensions.SqlServer\N.EntityFrameworkCore.Extensions.SqlServer.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/appsettings.json b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/appsettings.json
similarity index 100%
rename from N.EntityFrameworkCore.Extensions.Test/N.EntityFramework.Extensions.SqlServer.Test/appsettings.json
rename to N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.SqlServer.Test/appsettings.json
diff --git a/N.EntityFrameworkCore.Extensions.sln b/N.EntityFrameworkCore.Extensions.sln
index 9e8d267..73b9c13 100644
--- a/N.EntityFrameworkCore.Extensions.sln
+++ b/N.EntityFrameworkCore.Extensions.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.11.34929.205
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "N.EntityFramework.Extensions.SqlServer", "N.EntityFramework.Extensions.SqlServer\N.EntityFramework.Extensions.SqlServer.csproj", "{EBFA8667-BB63-41C0-A5BA-E41CA2B553E8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "N.EntityFrameworkCore.Extensions.SqlServer", "N.EntityFrameworkCore.Extensions.SqlServer\N.EntityFrameworkCore.Extensions.SqlServer.csproj", "{EBFA8667-BB63-41C0-A5BA-E41CA2B553E8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "N.EntityFramework.Extensions.SqlServer.Test", "N.EntityFrameworkCore.Extensions.Test\N.EntityFramework.Extensions.SqlServer.Test\N.EntityFramework.Extensions.SqlServer.Test.csproj", "{A52CDEFF-F507-4EA2-B5B1-AE46A3AFCE95}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "N.EntityFrameworkCore.Extensions.SqlServer.Test", "N.EntityFrameworkCore.Extensions.Test\N.EntityFrameworkCore.Extensions.SqlServer.Test\N.EntityFrameworkCore.Extensions.SqlServer.Test.csproj", "{A52CDEFF-F507-4EA2-B5B1-AE46A3AFCE95}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "N.EntityFrameworkCore.Extensions.Test", "N.EntityFrameworkCore.Extensions.Test", "{CBD9B889-7168-4D7F-898F-3111EABC28DE}"
 EndProject
@@ -14,13 +14,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "N.EntityFramework.Extensions.PostgreSql", "N.EntityFramework.Extensions.PostgreSql\N.EntityFramework.Extensions.PostgreSql.csproj", "{992C6666-72D7-4E9A-905C-A8A0A37B0F28}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "N.EntityFrameworkCore.Extensions.PostgreSql", "N.EntityFrameworkCore.Extensions.PostgreSql\N.EntityFrameworkCore.Extensions.PostgreSql.csproj", "{992C6666-72D7-4E9A-905C-A8A0A37B0F28}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "N.EntityFramework.Extensions.PostgreSql.Test", "N.EntityFrameworkCore.Extensions.Test\N.EntityFramework.Extensions.PostgreSql.Test\N.EntityFramework.Extensions.PostgreSql.Test.csproj", "{6CE9CBC4-2626-4464-A92E-35E92D5284B4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "N.EntityFrameworkCore.Extensions.PostgreSql.Test", "N.EntityFrameworkCore.Extensions.Test\N.EntityFrameworkCore.Extensions.PostgreSql.Test\N.EntityFrameworkCore.Extensions.PostgreSql.Test.csproj", "{6CE9CBC4-2626-4464-A92E-35E92D5284B4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "N.EntityFramework.Extensions.MySql", "N.EntityFramework.Extensions.MySql\N.EntityFramework.Extensions.MySql.csproj", "{51DD9C47-4F1B-472E-AFE1-BE1E0D3A1009}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "N.EntityFrameworkCore.Extensions.MySql", "N.EntityFrameworkCore.Extensions.MySql\N.EntityFrameworkCore.Extensions.MySql.csproj", "{51DD9C47-4F1B-472E-AFE1-BE1E0D3A1009}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "N.EntityFramework.Extensions.MySql.Test", "N.EntityFrameworkCore.Extensions.Test\N.EntityFramework.Extensions.MySql.Test\N.EntityFramework.Extensions.MySql.Test.csproj", "{C02A68C1-39E3-45A5-B7C3-CB24374B4B43}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "N.EntityFrameworkCore.Extensions.MySql.Test", "N.EntityFrameworkCore.Extensions.Test\N.EntityFrameworkCore.Extensions.MySql.Test\N.EntityFrameworkCore.Extensions.MySql.Test.csproj", "{C02A68C1-39E3-45A5-B7C3-CB24374B4B43}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "N.EntityFrameworkCore.Extensions", "N.EntityFrameworkCore.Extensions\N.EntityFrameworkCore.Extensions.csproj", "{DD7629D4-2E9D-4192-B4A5-06F49B9D5B5E}"
 EndProject
diff --git a/N.EntityFrameworkCore.Extensions/N.EntityFrameworkCore.Extensions.csproj b/N.EntityFrameworkCore.Extensions/N.EntityFrameworkCore.Extensions.csproj
index d8395c2..013440c 100644
--- a/N.EntityFrameworkCore.Extensions/N.EntityFrameworkCore.Extensions.csproj
+++ b/N.EntityFrameworkCore.Extensions/N.EntityFrameworkCore.Extensions.csproj
@@ -9,7 +9,7 @@
     <Authors>Northern25</Authors>
     <Copyright>Copyright © 2026</Copyright>
     <Company />
-    <Description>Meta-package that includes both N.EntityFrameworkCore.Extensions (SQL Server) and N.EntityFramework.Extensions.PostgreSql (PostgreSql). Extends your DbContext in EF Core with high-performance bulk operations: BulkDelete, BulkInsert, BulkMerge, BulkSync, BulkUpdate, Fetch, DeleteFromQuery, InsertFromQuery, UpdateFromQuery.</Description>
+    <Description>Meta-package that includes both N.EntityFrameworkCore.Extensions (SQL Server) and N.EntityFrameworkCore.Extensions.PostgreSql (PostgreSql). Extends your DbContext in EF Core with high-performance bulk operations: BulkDelete, BulkInsert, BulkMerge, BulkSync, BulkUpdate, Fetch, DeleteFromQuery, InsertFromQuery, UpdateFromQuery.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <!-- No source files — this is a dependency aggregator only -->
@@ -25,8 +25,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\N.EntityFramework.Extensions.SqlServer\N.EntityFramework.Extensions.SqlServer.csproj" />
-    <ProjectReference Include="..\N.EntityFramework.Extensions.PostgreSql\N.EntityFramework.Extensions.PostgreSql.csproj" />
+    <ProjectReference Include="..\N.EntityFrameworkCore.Extensions.SqlServer\N.EntityFrameworkCore.Extensions.SqlServer.csproj" />
+    <ProjectReference Include="..\N.EntityFrameworkCore.Extensions.PostgreSql\N.EntityFrameworkCore.Extensions.PostgreSql.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/README.md b/README.md
index a58df93..c0d2039 100644
--- a/README.md
+++ b/README.md
@@ -68,10 +68,10 @@ dotnet add package N.EntityFrameworkCore.Extensions
 
 ### PostgreSql
 
-A separate package is available for PostgreSql on [NuGet](https://www.nuget.org/packages/N.EntityFramework.Extensions.PostgreSql).
+A separate package is available for PostgreSql on [NuGet](https://www.nuget.org/packages/N.EntityFrameworkCore.Extensions.PostgreSql).
 
 ```sh
-dotnet add package N.EntityFramework.Extensions.PostgreSql
+dotnet add package N.EntityFrameworkCore.Extensions.PostgreSql
 ```
 
 ---
@@ -106,7 +106,7 @@ This registers an EF Core `DbCommandInterceptor` used internally by bulk operati
 
 ### Test configuration
 
-The test project uses SQL Server through `N.EntityFrameworkCore.Extensions.Test\appsettings.json` (or `ConnectionStrings__SqlServerTestDatabase` in the environment). The PostgreSql test project uses `N.EntityFramework.Extensions.PostgreSql.Test\appsettings.json` (or `ConnectionStrings__PostgreSqlTestDatabase` in the environment).
+The test project uses SQL Server through `N.EntityFrameworkCore.Extensions.Test\appsettings.json` (or `ConnectionStrings__SqlServerTestDatabase` in the environment). The PostgreSql test project uses `N.EntityFrameworkCore.Extensions.PostgreSql.Test\appsettings.json` (or `ConnectionStrings__PostgreSqlTestDatabase` in the environment).
 
 ---