diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index b30769f2..e9f480f2 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;CS0649;CS8632;EF1001;NU1608;NU1109</NoWarn>
-    <Version>13.1.2</Version>
+    <Version>14.0.0</Version>
     <LangVersion>preview</LangVersion>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>EntityFramework, Verify</PackageTags>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 6868e077..5b1873da 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -4,11 +4,11 @@
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="EfClassicLocalDb" Version="20.3.0" />
-    <PackageVersion Include="EfLocalDb" Version="20.3.0" />
+    <PackageVersion Include="EfClassicLocalDb" Version="21.0.0" />
+    <PackageVersion Include="EfLocalDb" Version="21.0.0" />
     <PackageVersion Include="EntityFramework" Version="6.5.1" />
     <PackageVersion Include="MarkdownSnippets.MsBuild" Version="28.0.0-beta.7" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0-rc.2.25502.107" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.0" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0" />
@@ -18,12 +18,12 @@
     <PackageVersion Include="Microsoft.SqlServer.TransactSql.ScriptDom" Version="170.128.0" />
     <PackageVersion Include="NUnit" Version="4.4.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="5.2.0" />
-    <PackageVersion Include="Polyfill" Version="8.9.1" />
+    <PackageVersion Include="Polyfill" Version="9.0.1" />
     <PackageVersion Include="ProjectDefaults" Version="1.0.162" />
     <PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
-    <PackageVersion Include="Verify" Version="31.5.3" />
+    <PackageVersion Include="Verify" Version="31.6.0" />
     <PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
-    <PackageVersion Include="Verify.NUnit" Version="31.5.3" />
+    <PackageVersion Include="Verify.NUnit" Version="31.6.0" />
     <PackageVersion Include="Verify.SqlServer" Version="11.2.0" />
     <PackageVersion Include="Microsoft.Sbom.Targets" Version="4.1.3" />
   </ItemGroup>
diff --git a/src/Verify.EntityFramework.Tests/CoreTests.MultiRecording.verified.txt b/src/Verify.EntityFramework.Tests/CoreTests.MultiRecording.verified.txt
index 551be7d0..36ff5486 100644
--- a/src/Verify.EntityFramework.Tests/CoreTests.MultiRecording.verified.txt
+++ b/src/Verify.EntityFramework.Tests/CoreTests.MultiRecording.verified.txt
@@ -19,1201 +19,1201 @@ values                (@p0, @p1)
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 0
+        @s (String?): 0
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 1
+        @s (String?): 1
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 2
+        @s (String?): 2
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 3
+        @s (String?): 3
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 4
+        @s (String?): 4
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 5
+        @s (String?): 5
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 6
+        @s (String?): 6
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 7
+        @s (String?): 7
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 8
+        @s (String?): 8
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 9
+        @s (String?): 9
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 10
+        @s (String?): 10
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 11
+        @s (String?): 11
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 12
+        @s (String?): 12
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 13
+        @s (String?): 13
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 14
+        @s (String?): 14
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 15
+        @s (String?): 15
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 16
+        @s (String?): 16
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 17
+        @s (String?): 17
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 18
+        @s (String?): 18
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 19
+        @s (String?): 19
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 20
+        @s (String?): 20
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 21
+        @s (String?): 21
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 22
+        @s (String?): 22
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 23
+        @s (String?): 23
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 24
+        @s (String?): 24
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 25
+        @s (String?): 25
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 26
+        @s (String?): 26
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 27
+        @s (String?): 27
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 28
+        @s (String?): 28
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 29
+        @s (String?): 29
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 30
+        @s (String?): 30
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 31
+        @s (String?): 31
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 32
+        @s (String?): 32
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 33
+        @s (String?): 33
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 34
+        @s (String?): 34
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 35
+        @s (String?): 35
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 36
+        @s (String?): 36
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 37
+        @s (String?): 37
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 38
+        @s (String?): 38
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 39
+        @s (String?): 39
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 40
+        @s (String?): 40
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 41
+        @s (String?): 41
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 42
+        @s (String?): 42
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 43
+        @s (String?): 43
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 44
+        @s (String?): 44
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 45
+        @s (String?): 45
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 46
+        @s (String?): 46
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 47
+        @s (String?): 47
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 48
+        @s (String?): 48
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 49
+        @s (String?): 49
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 50
+        @s (String?): 50
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 51
+        @s (String?): 51
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 52
+        @s (String?): 52
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 53
+        @s (String?): 53
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 54
+        @s (String?): 54
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 55
+        @s (String?): 55
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 56
+        @s (String?): 56
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 57
+        @s (String?): 57
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 58
+        @s (String?): 58
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 59
+        @s (String?): 59
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 60
+        @s (String?): 60
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 61
+        @s (String?): 61
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 62
+        @s (String?): 62
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 63
+        @s (String?): 63
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 64
+        @s (String?): 64
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 65
+        @s (String?): 65
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 66
+        @s (String?): 66
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 67
+        @s (String?): 67
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 68
+        @s (String?): 68
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 69
+        @s (String?): 69
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 70
+        @s (String?): 70
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 71
+        @s (String?): 71
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 72
+        @s (String?): 72
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 73
+        @s (String?): 73
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 74
+        @s (String?): 74
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 75
+        @s (String?): 75
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 76
+        @s (String?): 76
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 77
+        @s (String?): 77
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 78
+        @s (String?): 78
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 79
+        @s (String?): 79
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 80
+        @s (String?): 80
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 81
+        @s (String?): 81
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 82
+        @s (String?): 82
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 83
+        @s (String?): 83
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 84
+        @s (String?): 84
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 85
+        @s (String?): 85
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 86
+        @s (String?): 86
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 87
+        @s (String?): 87
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 88
+        @s (String?): 88
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 89
+        @s (String?): 89
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 90
+        @s (String?): 90
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 91
+        @s (String?): 91
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 92
+        @s (String?): 92
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 93
+        @s (String?): 93
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 94
+        @s (String?): 94
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 95
+        @s (String?): 95
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 96
+        @s (String?): 96
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 97
+        @s (String?): 97
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 98
+        @s (String?): 98
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
       HasTransaction: false,
       Parameters: {
-        @__s_0 (String?): 99
+        @s (String?): 99
       },
       Text:
 select c.Id,
        c.Name
 from   Companies as c
-where  c.Name = @__s_0
+where  c.Name = @s
     },
     {
       Type: ReaderExecutedAsync,
diff --git a/src/Verify.EntityFramework/MissingOrder/MissingOrderByVisitor.cs b/src/Verify.EntityFramework/MissingOrder/MissingOrderByVisitor.cs
index 4ab0d25b..80d3dce5 100644
--- a/src/Verify.EntityFramework/MissingOrder/MissingOrderByVisitor.cs
+++ b/src/Verify.EntityFramework/MissingOrder/MissingOrderByVisitor.cs
@@ -86,9 +86,6 @@ SelectExpression must have at least one ordering.
                 return base.Visit(expression);
             }
 
-            case NonQueryExpression nonQueryExpression:
-                return nonQueryExpression;
-
             default:
                 return base.Visit(expression);
         }
diff --git a/src/Verify.EntityFramework/Verify.EntityFramework.csproj b/src/Verify.EntityFramework/Verify.EntityFramework.csproj
index 55349d00..b4f9c7c6 100644
--- a/src/Verify.EntityFramework/Verify.EntityFramework.csproj
+++ b/src/Verify.EntityFramework/Verify.EntityFramework.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net10.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
diff --git a/src/Verify.EntityFrameworkClassic/Verify.EntityFrameworkClassic.csproj b/src/Verify.EntityFrameworkClassic/Verify.EntityFrameworkClassic.csproj
index 7b011390..0853efbe 100644
--- a/src/Verify.EntityFrameworkClassic/Verify.EntityFrameworkClassic.csproj
+++ b/src/Verify.EntityFrameworkClassic/Verify.EntityFrameworkClassic.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0;net9.0;net10.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="EntityFramework" />