diff --git a/.editorconfig b/.editorconfig
index dedb789f..f4587b1e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -464,11 +464,13 @@ dotnet_diagnostic.MA0048.severity = error           # https://github.com/atc-net
 dotnet_diagnostic.CA1014.severity = none            # https://github.com/atc-net/atc-coding-rules/blob/main/documentation/CodeAnalyzersRules/MicrosoftCodeAnalysis/CA1014.md
 dotnet_diagnostic.CA1068.severity = error           # https://github.com/atc-net/atc-coding-rules/blob/main/documentation/CodeAnalyzersRules/MicrosoftCodeAnalysis/CA1068.md
 dotnet_diagnostic.CA1305.severity = error
+dotnet_diagnostic.CA1308.severity = suggestion      # Normalize strings to uppercase
 dotnet_diagnostic.CA1510.severity = suggestion      # Use ArgumentNullException throw helper
 dotnet_diagnostic.CA1511.severity = suggestion      # Use ArgumentException throw helper
 dotnet_diagnostic.CA1512.severity = suggestion      # Use ArgumentOutOfRangeException throw helper
 dotnet_diagnostic.CA1513.severity = suggestion      # Use ObjectDisposedException throw helper
 dotnet_diagnostic.CA1514.severity = error           # Avoid redundant length argument
+dotnet_diagnostic.CA1515.severity = suggestion      # Because an application's API isn't typically referenced from outside the assembly, types can be made internal (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1515)
 dotnet_diagnostic.CA1707.severity = error           # https://github.com/atc-net/atc-coding-rules/blob/main/documentation/CodeAnalyzersRules/MicrosoftCodeAnalysis/CA1707.md
 dotnet_diagnostic.CA1812.severity = none
 dotnet_diagnostic.CA1822.severity = suggestion
@@ -504,7 +506,16 @@ dotnet_diagnostic.CA2259.severity = error           # Ensure ThreadStatic is onl
 dotnet_diagnostic.CA2260.severity = error           # Implement generic math interfaces correctly
 dotnet_diagnostic.CA2261.severity = error           # Do not use ConfigureAwaitOptions.SuppressThrowing with Task<TResult>
 dotnet_diagnostic.IDE0005.severity = warning        # https://github.com/atc-net/atc-coding-rules/blob/main/documentation/CodeAnalyzersRules/MicrosoftCodeAnalysis/IDE0005.md
+dotnet_diagnostic.IDE0010.severity = suggestion     # Populate switch
+dotnet_diagnostic.IDE0028.severity = suggestion     # Collection initialization can be simplified
+dotnet_diagnostic.IDE0021.severity = suggestion     # Use expression body for constructor
+dotnet_diagnostic.IDE0055.severity = none           # Fix formatting
 dotnet_diagnostic.IDE0058.severity = none           # https://github.com/atc-net/atc-coding-rules/blob/main/documentation/CodeAnalyzersRules/MicrosoftCodeAnalysis/IDE0058.md
+dotnet_diagnostic.IDE0061.severity = suggestion     # Use expression body for local function
+dotnet_diagnostic.IDE0130.severity = suggestion     # Namespace does not match folder structure
+dotnet_diagnostic.IDE0290.severity = none			# Use primary constructor
+dotnet_diagnostic.IDE0301.severity = suggestion     # Use collection expression for empty
+dotnet_diagnostic.IDE0305.severity = suggestion     # Collection initialization can be simplified
 
 
 # Microsoft - Compiler Errors
@@ -541,6 +552,7 @@ dotnet_diagnostic.SA1649.severity = error           # https://github.com/atc-net
 # https://rules.sonarsource.com/csharp
 dotnet_diagnostic.S1135.severity = suggestion       # https://github.com/atc-net/atc-coding-rules/blob/main/documentation/CodeAnalyzersRules/SonarAnalyzerCSharp/S1135.md
 dotnet_diagnostic.S2629.severity = none            	# Don't use string interpolation in logging message templates.
+dotnet_diagnostic.S3358.severity = none           	# Extract this nested ternary operation into an independent statement.
 dotnet_diagnostic.S6602.severity = none           	# "Find" method should be used instead of the "FirstOrDefault"
 dotnet_diagnostic.S6603.severity = none            	# The collection-specific "TrueForAll" method should be used instead of the "All"
 dotnet_diagnostic.S6605.severity = none             # Collection-specific "Exists" method should be used instead of the "Any"
@@ -584,9 +596,19 @@ dotnet_diagnostic.CA1822.Severity = none
 dotnet_diagnostic.CA1859.Severity = none
 dotnet_diagnostic.CA1860.Severity = none
 dotnet_diagnostic.CA1861.Severity = none
+
 dotnet_diagnostic.S125.Severity = none
 dotnet_diagnostic.S1481.Severity = none
 dotnet_diagnostic.SA1512.Severity = none
 dotnet_diagnostic.SA1513.Severity = none
 
-dotnet_diagnostic.AsyncFixer02.Severity = none      # ToListAsync should be used instead of xxx
\ No newline at end of file
+dotnet_diagnostic.AsyncFixer02.Severity = none      # ToListAsync should be used instead of xxx
+
+dotnet_diagnostic.IDE0022.Severity = none           # Use expression body for method
+dotnet_diagnostic.IDE0045.Severity = none           # 'if' statement can be simplified
+dotnet_diagnostic.IDE0046.Severity = none           # 'if' statement can be simplified
+dotnet_diagnostic.IDE0052.Severity = none           # Private member
+dotnet_diagnostic.IDE0059.Severity = none           # Unnecessary assignment of a value
+dotnet_diagnostic.IDE0060.Severity = none           # Remove unused parameter
+dotnet_diagnostic.IDE0270.Severity = none           # Null check can be simplified
+dotnet_diagnostic.IDE0300.Severity = none           # Collection initialization can be simplified
\ No newline at end of file
diff --git a/Directory.Build.props b/Directory.Build.props
index 69ce70ff..c483a1a4 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -43,7 +43,7 @@
   <ItemGroup Label="Code Analyzers">
     <PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" />
     <PackageReference Include="Asyncify" Version="0.9.7" PrivateAssets="All" />
-    <PackageReference Include="Meziantou.Analyzer" Version="2.0.163" PrivateAssets="All" />
+    <PackageReference Include="Meziantou.Analyzer" Version="2.0.179" PrivateAssets="All" />
     <PackageReference Include="SecurityCodeScan.VS2019" Version="5.6.7" PrivateAssets="All" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="All" />
     <PackageReference Include="SonarAnalyzer.CSharp" Version="9.32.0.97167" PrivateAssets="All" />
diff --git a/src/Atc.CodeGeneration.CSharp/Atc.CodeGeneration.CSharp.csproj b/src/Atc.CodeGeneration.CSharp/Atc.CodeGeneration.CSharp.csproj
index 6d6e5502..7a5a2cda 100644
--- a/src/Atc.CodeGeneration.CSharp/Atc.CodeGeneration.CSharp.csproj
+++ b/src/Atc.CodeGeneration.CSharp/Atc.CodeGeneration.CSharp.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.513" />
-    <PackageReference Include="Atc.CodeDocumentation" Version="2.0.513" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
+    <PackageReference Include="Atc" Version="2.0.525" />
+    <PackageReference Include="Atc.CodeDocumentation" Version="2.0.525" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/src/Atc.Rest.ApiGenerator.CLI/Atc.Rest.ApiGenerator.CLI.csproj b/src/Atc.Rest.ApiGenerator.CLI/Atc.Rest.ApiGenerator.CLI.csproj
index 25b8e051..052874b1 100644
--- a/src/Atc.Rest.ApiGenerator.CLI/Atc.Rest.ApiGenerator.CLI.csproj
+++ b/src/Atc.Rest.ApiGenerator.CLI/Atc.Rest.ApiGenerator.CLI.csproj
@@ -13,9 +13,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.513" />
-    <PackageReference Include="Atc.Console.Spectre" Version="2.0.513" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Atc" Version="2.0.525" />
+    <PackageReference Include="Atc.Console.Spectre" Version="2.0.525" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Atc.Rest.ApiGenerator.CLI/Commands/Attributes/AspNetOutputTypeAttribute.cs b/src/Atc.Rest.ApiGenerator.CLI/Commands/Attributes/AspNetOutputTypeAttribute.cs
index 75424b1d..0ea5469b 100644
--- a/src/Atc.Rest.ApiGenerator.CLI/Commands/Attributes/AspNetOutputTypeAttribute.cs
+++ b/src/Atc.Rest.ApiGenerator.CLI/Commands/Attributes/AspNetOutputTypeAttribute.cs
@@ -22,7 +22,7 @@ public override string Description
     {
         get
         {
-            var values = Enum.GetNames(typeof(AspNetOutputType))
+            var values = Enum.GetNames<AspNetOutputType>()
                 .Select(enumValue => enumValue.Equals(Default.ToString(), StringComparison.Ordinal)
                     ? $"{enumValue} (default)"
                     : enumValue)
diff --git a/src/Atc.Rest.ApiGenerator.CLI/Commands/Attributes/SwaggerThemeModeAttribute.cs b/src/Atc.Rest.ApiGenerator.CLI/Commands/Attributes/SwaggerThemeModeAttribute.cs
index 79820c94..e74bcf27 100644
--- a/src/Atc.Rest.ApiGenerator.CLI/Commands/Attributes/SwaggerThemeModeAttribute.cs
+++ b/src/Atc.Rest.ApiGenerator.CLI/Commands/Attributes/SwaggerThemeModeAttribute.cs
@@ -22,7 +22,7 @@ public override string Description
     {
         get
         {
-            var values = Enum.GetNames(typeof(SwaggerThemeMode))
+            var values = Enum.GetNames<SwaggerThemeMode>()
                 .Select(enumValue => enumValue.Equals(Default.ToString(), StringComparison.Ordinal)
                     ? $"{enumValue} (default)"
                     : enumValue)
diff --git a/src/Atc.Rest.ApiGenerator.Client.CSharp/Atc.Rest.ApiGenerator.Client.CSharp.csproj b/src/Atc.Rest.ApiGenerator.Client.CSharp/Atc.Rest.ApiGenerator.Client.CSharp.csproj
index ca49b24c..5f57560b 100644
--- a/src/Atc.Rest.ApiGenerator.Client.CSharp/Atc.Rest.ApiGenerator.Client.CSharp.csproj
+++ b/src/Atc.Rest.ApiGenerator.Client.CSharp/Atc.Rest.ApiGenerator.Client.CSharp.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
-    <PackageReference Include="Microsoft.OpenApi" Version="1.6.17" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
+    <PackageReference Include="Microsoft.OpenApi" Version="1.6.22" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Atc.Rest.ApiGenerator.Client.CSharp/ProjectGenerator/ClientCSharpApiGenerator.cs b/src/Atc.Rest.ApiGenerator.Client.CSharp/ProjectGenerator/ClientCSharpApiGenerator.cs
index 0e3a7c2b..3b7a3ac2 100644
--- a/src/Atc.Rest.ApiGenerator.Client.CSharp/ProjectGenerator/ClientCSharpApiGenerator.cs
+++ b/src/Atc.Rest.ApiGenerator.Client.CSharp/ProjectGenerator/ClientCSharpApiGenerator.cs
@@ -87,7 +87,7 @@ public async Task ScaffoldProjectFile()
                 ],
                 [
                     new("DocumentationFile", Attributes: null, @$"bin\Debug\net8.0\{projectName}.xml"),
-                    new("NoWarn", Attributes: null, "1573;1591;1701;1702;1712;8618;"),
+                    new("NoWarn", Attributes: null, "$(NoWarn);1573;1591;1701;1702;1712;8618;"),
                 ],
             ],
             [
diff --git a/src/Atc.Rest.ApiGenerator.CodingRules/Atc.Rest.ApiGenerator.CodingRules.csproj b/src/Atc.Rest.ApiGenerator.CodingRules/Atc.Rest.ApiGenerator.CodingRules.csproj
index 5c3b13ee..89537e25 100644
--- a/src/Atc.Rest.ApiGenerator.CodingRules/Atc.Rest.ApiGenerator.CodingRules.csproj
+++ b/src/Atc.Rest.ApiGenerator.CodingRules/Atc.Rest.ApiGenerator.CodingRules.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.513" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Atc" Version="2.0.525" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Atc.Rest.ApiGenerator.Contracts/Atc.Rest.ApiGenerator.Contracts.csproj b/src/Atc.Rest.ApiGenerator.Contracts/Atc.Rest.ApiGenerator.Contracts.csproj
index 5c9ab278..92a0a1a3 100644
--- a/src/Atc.Rest.ApiGenerator.Contracts/Atc.Rest.ApiGenerator.Contracts.csproj
+++ b/src/Atc.Rest.ApiGenerator.Contracts/Atc.Rest.ApiGenerator.Contracts.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.513" />
-    <PackageReference Include="Atc.CodeDocumentation" Version="2.0.513" />
+    <PackageReference Include="Atc" Version="2.0.525" />
+    <PackageReference Include="Atc.CodeDocumentation" Version="2.0.525" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Atc.Rest.ApiGenerator.Framework.Minimal/Atc.Rest.ApiGenerator.Framework.Minimal.csproj b/src/Atc.Rest.ApiGenerator.Framework.Minimal/Atc.Rest.ApiGenerator.Framework.Minimal.csproj
index 02a09f91..0c72b448 100644
--- a/src/Atc.Rest.ApiGenerator.Framework.Minimal/Atc.Rest.ApiGenerator.Framework.Minimal.csproj
+++ b/src/Atc.Rest.ApiGenerator.Framework.Minimal/Atc.Rest.ApiGenerator.Framework.Minimal.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.513" />
+    <PackageReference Include="Atc" Version="2.0.525" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Atc.Rest.ApiGenerator.Framework.Minimal/Factories/ContentGeneratorServerResultParametersFactory.cs b/src/Atc.Rest.ApiGenerator.Framework.Minimal/Factories/ContentGeneratorServerResultParametersFactory.cs
index f9afad91..1c079f52 100644
--- a/src/Atc.Rest.ApiGenerator.Framework.Minimal/Factories/ContentGeneratorServerResultParametersFactory.cs
+++ b/src/Atc.Rest.ApiGenerator.Framework.Minimal/Factories/ContentGeneratorServerResultParametersFactory.cs
@@ -35,7 +35,10 @@ public static ContentGeneratorServerResultParameters Create(
         var okResponseModel = responseModels.Find(x => x.StatusCode == HttpStatusCode.OK) ??
                               responseModels.Find(x => x.StatusCode == HttpStatusCode.Created);
 
-        if (ShouldAppendImplicitOperatorContent(httpStatusCodes, okResponseModel?.DataType, openApiOperation.Responses.IsSchemaUsingBinaryFormatForOkResponse()))
+        if (ShouldAppendImplicitOperatorContent(
+                httpStatusCodes,
+                okResponseModel?.DataType,
+                openApiOperation.Responses.IsSchemaUsingBinaryFormatForOkResponse()))
         {
             var collectionDataType = okResponseModel?.CollectionDataType;
             var dataType = okResponseModel?.DataType;
@@ -76,8 +79,8 @@ private static bool ShouldAppendImplicitOperatorContent(
             httpStatusCode = HttpStatusCode.Created;
         }
 
-        if (string.IsNullOrEmpty(modelName) &&
-            httpStatusCode == HttpStatusCode.Created)
+        if (httpStatusCode == HttpStatusCode.Created &&
+            string.IsNullOrEmpty(modelName))
         {
             return false;
         }
diff --git a/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerApiGenerator.cs b/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerApiGenerator.cs
index 3b8529f7..67533c4d 100644
--- a/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerApiGenerator.cs
+++ b/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerApiGenerator.cs
@@ -81,7 +81,7 @@ public async Task ScaffoldProjectFile()
                 ],
                 [
                     new("DocumentationFile", Attributes: null, @$"bin\Debug\net8.0\{projectName}.xml"),
-                    new("NoWarn", Attributes: null, "1573;1591;1701;1702;1712;8618;"),
+                    new("NoWarn", Attributes: null, "$(NoWarn);1573;1591;1701;1702;1712;8618;"),
                 ],
             ],
             [
diff --git a/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerDomainGenerator.cs b/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerDomainGenerator.cs
index cf081dff..9b80ba59 100644
--- a/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerDomainGenerator.cs
+++ b/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerDomainGenerator.cs
@@ -70,7 +70,7 @@ public async Task ScaffoldProjectFile()
                 ],
                 [
                     new("DocumentationFile", Attributes: null, @$"bin\Debug\net8.0\{projectName}.xml"),
-                    new("NoWarn", Attributes: null, "1573;1591;1701;1702;1712;8618;"),
+                    new("NoWarn", Attributes: null, "$(NoWarn);1573;1591;1701;1702;1712;8618;"),
                 ],
             ],
             [
diff --git a/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerHostGenerator.cs b/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerHostGenerator.cs
index eebca68b..40881b7e 100644
--- a/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerHostGenerator.cs
+++ b/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerHostGenerator.cs
@@ -72,7 +72,7 @@ public async Task ScaffoldProjectFile()
                 ],
                 [
                     new("DocumentationFile", Attributes: null, @$"bin\Debug\net8.0\{projectName}.xml"),
-                    new("NoWarn", Attributes: null, "1573;1591;1701;1702;1712;8618;"),
+                    new("NoWarn", Attributes: null, "$(NoWarn);1573;1591;1701;1702;1712;8618;"),
                 ],
             ],
             [
diff --git a/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerHostTestGenerator.cs b/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerHostTestGenerator.cs
index e671832c..c0b8c662 100644
--- a/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerHostTestGenerator.cs
+++ b/src/Atc.Rest.ApiGenerator.Framework.Minimal/ProjectGenerator/ServerHostTestGenerator.cs
@@ -76,7 +76,7 @@ public async Task ScaffoldProjectFile()
                 ],
                 [
                     new("DocumentationFile", Attributes: null, @$"bin\Debug\net8.0\{projectName}.xml"),
-                    new("NoWarn", Attributes: null, "1573;1591;1701;1702;1712;8618;"),
+                    new("NoWarn", Attributes: null, "$(NoWarn);1573;1591;1701;1702;1712;8618;"),
                 ],
             ],
             [
diff --git a/src/Atc.Rest.ApiGenerator.Framework.Mvc/Atc.Rest.ApiGenerator.Framework.Mvc.csproj b/src/Atc.Rest.ApiGenerator.Framework.Mvc/Atc.Rest.ApiGenerator.Framework.Mvc.csproj
index 0b024461..350284fc 100644
--- a/src/Atc.Rest.ApiGenerator.Framework.Mvc/Atc.Rest.ApiGenerator.Framework.Mvc.csproj
+++ b/src/Atc.Rest.ApiGenerator.Framework.Mvc/Atc.Rest.ApiGenerator.Framework.Mvc.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.513" />
-    <PackageReference Include="Atc.Rest" Version="2.0.513" />
+    <PackageReference Include="Atc" Version="2.0.525" />
+    <PackageReference Include="Atc.Rest" Version="2.0.525" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Atc.Rest.ApiGenerator.Framework.Mvc/ContentGenerators/ContentGeneratorServerParameter.cs b/src/Atc.Rest.ApiGenerator.Framework.Mvc/ContentGenerators/ContentGeneratorServerParameter.cs
index 33887d46..0a46387b 100644
--- a/src/Atc.Rest.ApiGenerator.Framework.Mvc/ContentGenerators/ContentGeneratorServerParameter.cs
+++ b/src/Atc.Rest.ApiGenerator.Framework.Mvc/ContentGenerators/ContentGeneratorServerParameter.cs
@@ -65,10 +65,21 @@ private static void AppendPropertyAttributes(
     {
         switch (item.ParameterLocationType)
         {
-            case ParameterLocationType.Query:
-            case ParameterLocationType.Header:
             case ParameterLocationType.Route:
+            case ParameterLocationType.Header:
             case ParameterLocationType.Cookie:
+                if (string.IsNullOrEmpty(item.Name))
+                {
+                    sb.AppendLine(4, $"[From{item.ParameterLocationType}]");
+                }
+                else
+                {
+                    sb.AppendLine(4, $"[From{item.ParameterLocationType}(Name = \"{item.Name}\")]");
+                }
+
+                break;
+
+            case ParameterLocationType.Query:
                 if (string.IsNullOrEmpty(item.Name) ||
                     item.Name.Equals(item.ParameterName, StringComparison.OrdinalIgnoreCase))
                 {
diff --git a/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerApiGenerator.cs b/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerApiGenerator.cs
index 668733ad..121cd8f6 100644
--- a/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerApiGenerator.cs
+++ b/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerApiGenerator.cs
@@ -81,7 +81,7 @@ public async Task ScaffoldProjectFile()
                 ],
                 [
                     new("DocumentationFile", Attributes: null, @$"bin\Debug\net8.0\{projectName}.xml"),
-                    new("NoWarn", Attributes: null, "1573;1591;1701;1702;1712;8618;"),
+                    new("NoWarn", Attributes: null, "$(NoWarn);1573;1591;1701;1702;1712;8618;"),
                 ],
             ],
             [
diff --git a/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerDomainGenerator.cs b/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerDomainGenerator.cs
index 9c90ffc5..af8bc15c 100644
--- a/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerDomainGenerator.cs
+++ b/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerDomainGenerator.cs
@@ -55,7 +55,7 @@ public async Task ScaffoldProjectFile()
                 ],
                 [
                     new("DocumentationFile", Attributes: null, @$"bin\Debug\net8.0\{projectName}.xml"),
-                    new("NoWarn", Attributes: null, "1573;1591;1701;1702;1712;8618;"),
+                    new("NoWarn", Attributes: null, "$(NoWarn);1573;1591;1701;1702;1712;8618;"),
                 ],
             ],
             [
diff --git a/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerHostGenerator.cs b/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerHostGenerator.cs
index db5895de..85c0b6fc 100644
--- a/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerHostGenerator.cs
+++ b/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerHostGenerator.cs
@@ -69,7 +69,7 @@ public async Task ScaffoldProjectFile()
                 ],
                 [
                     new("DocumentationFile", Attributes: null, @$"bin\Debug\net8.0\{projectName}.xml"),
-                    new("NoWarn", Attributes: null, "1573;1591;1701;1702;1712;8618;"),
+                    new("NoWarn", Attributes: null, "$(NoWarn);1573;1591;1701;1702;1712;8618;"),
                 ],
             ],
             [
diff --git a/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerHostTestGenerator.cs b/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerHostTestGenerator.cs
index 42277e71..0afe1125 100644
--- a/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerHostTestGenerator.cs
+++ b/src/Atc.Rest.ApiGenerator.Framework.Mvc/ProjectGenerator/ServerHostTestGenerator.cs
@@ -83,7 +83,7 @@ public async Task ScaffoldProjectFile()
                 ],
                 [
                     new("DocumentationFile", Attributes: null, @$"bin\Debug\net8.0\{projectName}.xml"),
-                    new("NoWarn", Attributes: null, "1573;1591;1701;1702;1712;8618;"),
+                    new("NoWarn", Attributes: null, "$(NoWarn);1573;1591;1701;1702;1712;8618;"),
                 ],
             ],
             [
diff --git a/src/Atc.Rest.ApiGenerator.Framework/Atc.Rest.ApiGenerator.Framework.csproj b/src/Atc.Rest.ApiGenerator.Framework/Atc.Rest.ApiGenerator.Framework.csproj
index f4cf9e9d..41a3cb32 100644
--- a/src/Atc.Rest.ApiGenerator.Framework/Atc.Rest.ApiGenerator.Framework.csproj
+++ b/src/Atc.Rest.ApiGenerator.Framework/Atc.Rest.ApiGenerator.Framework.csproj
@@ -26,10 +26,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.513" />
-    <PackageReference Include="Atc.DotNet" Version="2.0.513" />
-    <PackageReference Include="Atc.OpenApi" Version="2.0.513" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Atc" Version="2.0.525" />
+    <PackageReference Include="Atc.DotNet" Version="2.0.525" />
+    <PackageReference Include="Atc.OpenApi" Version="2.0.525" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Atc.Rest.ApiGenerator.Framework/Providers/NugetPackageReferenceProvider.cs b/src/Atc.Rest.ApiGenerator.Framework/Providers/NugetPackageReferenceProvider.cs
index f6714ef8..64e0837e 100644
--- a/src/Atc.Rest.ApiGenerator.Framework/Providers/NugetPackageReferenceProvider.cs
+++ b/src/Atc.Rest.ApiGenerator.Framework/Providers/NugetPackageReferenceProvider.cs
@@ -8,14 +8,14 @@ public class NugetPackageReferenceProvider(
     private Dictionary<string, string> PackageDefaultVersions { get; } = new(StringComparer.Ordinal)
     {
         { "Asp.Versioning.Http", "8.1.0" },
-        { "Atc", "2.0.472" },
+        { "Atc", "2.0.525" },
         { "Atc.Azure.Options", "3.0.31" },
-        { "Atc.Rest", "2.0.472" },
+        { "Atc.Rest", "2.0.525" },
         { "Atc.Rest.Client", "1.0.36" },
-        { "Atc.Rest.Extended", "2.0.472" },
-        { "Atc.Rest.FluentAssertions", "2.0.472" },
-        { "Atc.Rest.MinimalApi", "1.0.81" },
-        { "Atc.XUnit", "2.0.472" },
+        { "Atc.Rest.Extended", "2.0.525" },
+        { "Atc.Rest.FluentAssertions", "2.0.525" },
+        { "Atc.Rest.MinimalApi", "1.0.87" },
+        { "Atc.XUnit", "2.0.525" },
         { "AutoFixture", "4.18.1" },
         { "AutoFixture.AutoNSubstitute", "4.18.1" },
         { "AutoFixture.Xunit2", "4.18.1" },
@@ -28,7 +28,7 @@ public class NugetPackageReferenceProvider(
         { "Microsoft.NETCore.Platforms", "7.0.4" },
         { "Microsoft.NET.Test.Sdk", "17.10.0" },
         { "NSubstitute", "5.1.0" },
-        { "Swashbuckle.AspNetCore", "6.7.0" },
+        { "Swashbuckle.AspNetCore", "7.0.0" },
         { "xunit", "2.8.1" },
         { "xunit.runner.visualstudio", "2.8.1" },
     };
@@ -84,6 +84,7 @@ public async Task<Version> GetAtcApiGeneratorVersion()
         {
             new("Asp.Versioning.Http", PackageDefaultVersions["Asp.Versioning.Http"]),
             new("Atc", atcVersion),
+            new("Atc.Rest.Extended", atcVersion),
             new("Atc.Rest.MinimalApi", PackageDefaultVersions["Atc.Rest.MinimalApi"]),
             new("Microsoft.NETCore.Platforms", PackageDefaultVersions["Microsoft.NETCore.Platforms"]),
             new("Swashbuckle.AspNetCore", PackageDefaultVersions["Swashbuckle.AspNetCore"]),
diff --git a/src/Atc.Rest.ApiGenerator.Nuget/Atc.Rest.ApiGenerator.Nuget.csproj b/src/Atc.Rest.ApiGenerator.Nuget/Atc.Rest.ApiGenerator.Nuget.csproj
index 5c3b13ee..89537e25 100644
--- a/src/Atc.Rest.ApiGenerator.Nuget/Atc.Rest.ApiGenerator.Nuget.csproj
+++ b/src/Atc.Rest.ApiGenerator.Nuget/Atc.Rest.ApiGenerator.Nuget.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.513" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Atc" Version="2.0.525" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Atc.Rest.ApiGenerator.OpenApi/Atc.Rest.ApiGenerator.OpenApi.csproj b/src/Atc.Rest.ApiGenerator.OpenApi/Atc.Rest.ApiGenerator.OpenApi.csproj
index 4d7957bd..bf2f7e86 100644
--- a/src/Atc.Rest.ApiGenerator.OpenApi/Atc.Rest.ApiGenerator.OpenApi.csproj
+++ b/src/Atc.Rest.ApiGenerator.OpenApi/Atc.Rest.ApiGenerator.OpenApi.csproj
@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.513" />
-    <PackageReference Include="Atc.CodeDocumentation" Version="2.0.513" />
-    <PackageReference Include="Atc.OpenApi" Version="2.0.513" />
-    <PackageReference Include="Microsoft.OpenApi" Version="1.6.17" />
-    <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.17" />
+    <PackageReference Include="Atc" Version="2.0.525" />
+    <PackageReference Include="Atc.CodeDocumentation" Version="2.0.525" />
+    <PackageReference Include="Atc.OpenApi" Version="2.0.525" />
+    <PackageReference Include="Microsoft.OpenApi" Version="1.6.22" />
+    <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.22" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Atc.Rest.ApiGenerator/Atc.Rest.ApiGenerator.csproj b/src/Atc.Rest.ApiGenerator/Atc.Rest.ApiGenerator.csproj
index 3ab91a44..87c2f45e 100644
--- a/src/Atc.Rest.ApiGenerator/Atc.Rest.ApiGenerator.csproj
+++ b/src/Atc.Rest.ApiGenerator/Atc.Rest.ApiGenerator.csproj
@@ -8,15 +8,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.513" />
-    <PackageReference Include="Atc.CodeAnalysis.CSharp" Version="2.0.513" />
-    <PackageReference Include="Atc.Console.Spectre" Version="2.0.513" />
-    <PackageReference Include="Atc.DotNet" Version="2.0.513" />
-    <PackageReference Include="Atc.OpenApi" Version="2.0.513" />
+    <PackageReference Include="Atc" Version="2.0.525" />
+    <PackageReference Include="Atc.CodeAnalysis.CSharp" Version="2.0.525" />
+    <PackageReference Include="Atc.Console.Spectre" Version="2.0.525" />
+    <PackageReference Include="Atc.DotNet" Version="2.0.525" />
+    <PackageReference Include="Atc.OpenApi" Version="2.0.525" />
     <PackageReference Include="Atc.Rest.Client" Version="1.0.79" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.17" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
+    <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.22" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 96a2d6a7..19967457 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -54,7 +54,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.141" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.146" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/test/Atc.CodeGeneration.CSharp.Tests/Atc.CodeGeneration.CSharp.Tests.csproj b/test/Atc.CodeGeneration.CSharp.Tests/Atc.CodeGeneration.CSharp.Tests.csproj
index b6edc78e..1a746cfc 100644
--- a/test/Atc.CodeGeneration.CSharp.Tests/Atc.CodeGeneration.CSharp.Tests.csproj
+++ b/test/Atc.CodeGeneration.CSharp.Tests/Atc.CodeGeneration.CSharp.Tests.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
@@ -23,8 +23,4 @@
     <ProjectReference Include="..\..\src\Atc.Rest.ApiGenerator.Framework\Atc.Rest.ApiGenerator.Framework.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Atc.Test" Version="1.0.93" />
-  </ItemGroup>
-
 </Project>
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Atc.Rest.ApiGenerator.CLI.Tests.csproj b/test/Atc.Rest.ApiGenerator.CLI.Tests/Atc.Rest.ApiGenerator.CLI.Tests.csproj
index 54bb5e62..379240bb 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Atc.Rest.ApiGenerator.CLI.Tests.csproj
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Atc.Rest.ApiGenerator.CLI.Tests.csproj
@@ -57,15 +57,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc.DotNet" Version="2.0.513" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
-    <PackageReference Include="Atc.CodeDocumentation" Version="2.0.513" />
-    <PackageReference Include="Atc.XUnit" Version="2.0.513" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="Atc.DotNet" Version="2.0.525" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
+    <PackageReference Include="Atc.CodeDocumentation" Version="2.0.525" />
+    <PackageReference Include="Atc.XUnit" Version="2.0.525" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="Verify" Version="17.10.2" />
     <PackageReference Include="Verify.Xunit" Version="17.10.2" />
-    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -80,8 +80,4 @@
     <ProjectReference Include="..\..\src\Atc.Rest.ApiGenerator.CLI\Atc.Rest.ApiGenerator.CLI.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Atc.Test" Version="1.0.93" />
-  </ItemGroup>
-
 </Project>
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/SetAccountNameParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/SetAccountNameParameters.verified.cs
index eb389f6c..8080c7e7 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/SetAccountNameParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/SetAccountNameParameters.verified.cs
@@ -17,7 +17,7 @@ public class SetAccountNameParameters
     /// <summary>
     /// The accountId.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "accountId")]
     [Required]
     public Guid AccountId { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/UpdateAccountNameParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/UpdateAccountNameParameters.verified.cs
index 4bd8c666..c09141f2 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/UpdateAccountNameParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/UpdateAccountNameParameters.verified.cs
@@ -17,14 +17,14 @@ public class UpdateAccountNameParameters
     /// <summary>
     /// The accountId.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "accountId")]
     [Required]
     public Guid AccountId { get; set; }
 
     /// <summary>
     /// The account name.
     /// </summary>
-    [FromHeader]
+    [FromHeader(Name = "name")]
     public string? Name { get; set; }
 
     /// <inheritdoc />
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Addresses/Parameters/GetAddressesByPostalCodesParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Addresses/Parameters/GetAddressesByPostalCodesParameters.verified.cs
index c9050589..1b80fb8a 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Addresses/Parameters/GetAddressesByPostalCodesParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Addresses/Parameters/GetAddressesByPostalCodesParameters.verified.cs
@@ -17,7 +17,7 @@ public class GetAddressesByPostalCodesParameters
     /// <summary>
     /// The postalCode to limit addresses on.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "postalCode")]
     [Required]
     public string PostalCode { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs
index 288fd081..1557d320 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class GetEventArgByIdParameters
     /// <summary>
     /// The id of the eventArgs.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public string Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Files/Parameters/GetFileByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Files/Parameters/GetFileByIdParameters.verified.cs
index 06da7568..6251d846 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Files/Parameters/GetFileByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Files/Parameters/GetFileByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class GetFileByIdParameters
     /// <summary>
     /// The file id.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public string Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Items/Parameters/UpdateItemParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Items/Parameters/UpdateItemParameters.verified.cs
index f94f8402..395fb35a 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Items/Parameters/UpdateItemParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Items/Parameters/UpdateItemParameters.verified.cs
@@ -17,7 +17,7 @@ public class UpdateItemParameters
     /// <summary>
     /// The id of the order.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public Guid Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs
index 30f290a5..f51b67a6 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class GetOrderByIdParameters
     /// <summary>
     /// The id of the order.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public Guid Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/PatchOrdersIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/PatchOrdersIdParameters.verified.cs
index 45ae4034..e77514d1 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/PatchOrdersIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/PatchOrdersIdParameters.verified.cs
@@ -17,28 +17,28 @@ public class PatchOrdersIdParameters
     /// <summary>
     /// The id of the order.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public Guid Id { get; set; }
 
     /// <summary>
     /// The myTestHeader special key.
     /// </summary>
-    [FromHeader]
+    [FromHeader(Name = "myTestHeader")]
     [Required]
     public string MyTestHeader { get; set; }
 
     /// <summary>
     /// The myTestHeaderBool special key.
     /// </summary>
-    [FromHeader]
+    [FromHeader(Name = "myTestHeaderBool")]
     [Required]
     public bool MyTestHeaderBool { get; set; }
 
     /// <summary>
     /// The myTestHeaderInt special key.
     /// </summary>
-    [FromHeader]
+    [FromHeader(Name = "myTestHeaderInt")]
     [Required]
     public int MyTestHeaderInt { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs
index 4f35a027..2a7f312c 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class DeleteUserByIdParameters
     /// <summary>
     /// Id of the user.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public Guid Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs
index 59864df2..faebab53 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class GetUserByIdParameters
     /// <summary>
     /// Id of the user.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public Guid Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateMyTestGenderParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateMyTestGenderParameters.verified.cs
index 94dbddc8..4ef21d6b 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateMyTestGenderParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateMyTestGenderParameters.verified.cs
@@ -17,7 +17,7 @@ public class UpdateMyTestGenderParameters
     /// <summary>
     /// Id of the user.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public Guid Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs
index 5645b468..eaac1c24 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WOPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class UpdateUserByIdParameters
     /// <summary>
     /// Id of the user.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public Guid Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/SetAccountNameParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/SetAccountNameParameters.verified.cs
index eb389f6c..8080c7e7 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/SetAccountNameParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/SetAccountNameParameters.verified.cs
@@ -17,7 +17,7 @@ public class SetAccountNameParameters
     /// <summary>
     /// The accountId.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "accountId")]
     [Required]
     public Guid AccountId { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/UpdateAccountNameParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/UpdateAccountNameParameters.verified.cs
index 4bd8c666..c09141f2 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/UpdateAccountNameParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Accounts/Parameters/UpdateAccountNameParameters.verified.cs
@@ -17,14 +17,14 @@ public class UpdateAccountNameParameters
     /// <summary>
     /// The accountId.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "accountId")]
     [Required]
     public Guid AccountId { get; set; }
 
     /// <summary>
     /// The account name.
     /// </summary>
-    [FromHeader]
+    [FromHeader(Name = "name")]
     public string? Name { get; set; }
 
     /// <inheritdoc />
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Addresses/Parameters/GetAddressesByPostalCodesParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Addresses/Parameters/GetAddressesByPostalCodesParameters.verified.cs
index c9050589..1b80fb8a 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Addresses/Parameters/GetAddressesByPostalCodesParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Addresses/Parameters/GetAddressesByPostalCodesParameters.verified.cs
@@ -17,7 +17,7 @@ public class GetAddressesByPostalCodesParameters
     /// <summary>
     /// The postalCode to limit addresses on.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "postalCode")]
     [Required]
     public string PostalCode { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs
index 288fd081..1557d320 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class GetEventArgByIdParameters
     /// <summary>
     /// The id of the eventArgs.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public string Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Files/Parameters/GetFileByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Files/Parameters/GetFileByIdParameters.verified.cs
index 06da7568..6251d846 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Files/Parameters/GetFileByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Files/Parameters/GetFileByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class GetFileByIdParameters
     /// <summary>
     /// The file id.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public string Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Items/Parameters/UpdateItemParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Items/Parameters/UpdateItemParameters.verified.cs
index f94f8402..395fb35a 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Items/Parameters/UpdateItemParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Items/Parameters/UpdateItemParameters.verified.cs
@@ -17,7 +17,7 @@ public class UpdateItemParameters
     /// <summary>
     /// The id of the order.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public Guid Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs
index 30f290a5..f51b67a6 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class GetOrderByIdParameters
     /// <summary>
     /// The id of the order.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public Guid Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/PatchOrdersIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/PatchOrdersIdParameters.verified.cs
index 45ae4034..e77514d1 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/PatchOrdersIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Orders/Parameters/PatchOrdersIdParameters.verified.cs
@@ -17,28 +17,28 @@ public class PatchOrdersIdParameters
     /// <summary>
     /// The id of the order.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public Guid Id { get; set; }
 
     /// <summary>
     /// The myTestHeader special key.
     /// </summary>
-    [FromHeader]
+    [FromHeader(Name = "myTestHeader")]
     [Required]
     public string MyTestHeader { get; set; }
 
     /// <summary>
     /// The myTestHeaderBool special key.
     /// </summary>
-    [FromHeader]
+    [FromHeader(Name = "myTestHeaderBool")]
     [Required]
     public bool MyTestHeaderBool { get; set; }
 
     /// <summary>
     /// The myTestHeaderInt special key.
     /// </summary>
-    [FromHeader]
+    [FromHeader(Name = "myTestHeaderInt")]
     [Required]
     public int MyTestHeaderInt { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs
index 4f35a027..2a7f312c 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class DeleteUserByIdParameters
     /// <summary>
     /// Id of the user.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public Guid Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs
index 59864df2..faebab53 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class GetUserByIdParameters
     /// <summary>
     /// Id of the user.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public Guid Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateMyTestGenderParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateMyTestGenderParameters.verified.cs
index 94dbddc8..4ef21d6b 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateMyTestGenderParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateMyTestGenderParameters.verified.cs
@@ -17,7 +17,7 @@ public class UpdateMyTestGenderParameters
     /// <summary>
     /// Id of the user.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public Guid Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs
index 5645b468..eaac1c24 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/DemoSample/VerifyServerAll/Mvc_WPD/src/DemoSample.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class UpdateUserByIdParameters
     /// <summary>
     /// Id of the user.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public Guid Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WOPD/src/ExNsWithTask.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WOPD/src/ExNsWithTask.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs
index b57486c3..807e8870 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WOPD/src/ExNsWithTask.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WOPD/src/ExNsWithTask.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class GetEventArgByIdParameters
     /// <summary>
     /// The id of the eventArgs.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public string Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WOPD/src/ExNsWithTask.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WOPD/src/ExNsWithTask.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs
index 92ef0d42..1cf768d4 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WOPD/src/ExNsWithTask.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WOPD/src/ExNsWithTask.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class GetOrderByIdParameters
     /// <summary>
     /// The id of the order.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public Guid Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WPD/src/ExNsWithTask.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WPD/src/ExNsWithTask.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs
index b57486c3..807e8870 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WPD/src/ExNsWithTask.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WPD/src/ExNsWithTask.Api.Generated/Contracts/EventArgs/Parameters/GetEventArgByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class GetEventArgByIdParameters
     /// <summary>
     /// The id of the eventArgs.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public string Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WPD/src/ExNsWithTask.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WPD/src/ExNsWithTask.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs
index 92ef0d42..1cf768d4 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WPD/src/ExNsWithTask.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExNsWithTask/VerifyServerAll/Mvc_WPD/src/ExNsWithTask.Api.Generated/Contracts/Orders/Parameters/GetOrderByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class GetOrderByIdParameters
     /// <summary>
     /// The id of the order.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public Guid Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs
index e0c314d9..ebe1989b 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class DeleteUserByIdParameters
     /// <summary>
     /// Id of the user.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public Guid Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs
index 3babec08..8303d656 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class GetUserByIdParameters
     /// <summary>
     /// Id of the user.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public Guid Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs
index 38574a80..a1f17dce 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WOPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class UpdateUserByIdParameters
     /// <summary>
     /// Id of the user.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public Guid Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs
index e0c314d9..ebe1989b 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/DeleteUserByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class DeleteUserByIdParameters
     /// <summary>
     /// Id of the user.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public Guid Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs
index 3babec08..8303d656 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/GetUserByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class GetUserByIdParameters
     /// <summary>
     /// Id of the user.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public Guid Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs
index 38574a80..a1f17dce 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/ExUsers/VerifyServerAll/Mvc_WPD/src/ExUsers.Api.Generated/Contracts/Users/Parameters/UpdateUserByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class UpdateUserByIdParameters
     /// <summary>
     /// Id of the user.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "id")]
     [Required]
     public Guid Id { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/PetStore/VerifyServerAll/Mvc_WOPD/src/PetStore.Api.Generated/Contracts/Pets/Parameters/ShowPetByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/PetStore/VerifyServerAll/Mvc_WOPD/src/PetStore.Api.Generated/Contracts/Pets/Parameters/ShowPetByIdParameters.verified.cs
index 31b620e9..9cc0e46c 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/PetStore/VerifyServerAll/Mvc_WOPD/src/PetStore.Api.Generated/Contracts/Pets/Parameters/ShowPetByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/PetStore/VerifyServerAll/Mvc_WOPD/src/PetStore.Api.Generated/Contracts/Pets/Parameters/ShowPetByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class ShowPetByIdParameters
     /// <summary>
     /// The id of the pet to retrieve.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "petId")]
     [Required]
     public string PetId { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/PetStore/VerifyServerAll/Mvc_WPD/src/PetStore.Api.Generated/Contracts/Pets/Parameters/ShowPetByIdParameters.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/PetStore/VerifyServerAll/Mvc_WPD/src/PetStore.Api.Generated/Contracts/Pets/Parameters/ShowPetByIdParameters.verified.cs
index 31b620e9..9cc0e46c 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/PetStore/VerifyServerAll/Mvc_WPD/src/PetStore.Api.Generated/Contracts/Pets/Parameters/ShowPetByIdParameters.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/PetStore/VerifyServerAll/Mvc_WPD/src/PetStore.Api.Generated/Contracts/Pets/Parameters/ShowPetByIdParameters.verified.cs
@@ -17,7 +17,7 @@ public class ShowPetByIdParameters
     /// <summary>
     /// The id of the pet to retrieve.
     /// </summary>
-    [FromRoute]
+    [FromRoute(Name = "petId")]
     [Required]
     public string PetId { get; set; }
 
diff --git a/test/Atc.Rest.ApiGenerator.Contracts.Tests/Atc.Rest.ApiGenerator.Contracts.Tests.csproj b/test/Atc.Rest.ApiGenerator.Contracts.Tests/Atc.Rest.ApiGenerator.Contracts.Tests.csproj
index 8eac385a..f95fd3dc 100644
--- a/test/Atc.Rest.ApiGenerator.Contracts.Tests/Atc.Rest.ApiGenerator.Contracts.Tests.csproj
+++ b/test/Atc.Rest.ApiGenerator.Contracts.Tests/Atc.Rest.ApiGenerator.Contracts.Tests.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
@@ -22,8 +22,4 @@
     <ProjectReference Include="..\..\src\Atc.Rest.ApiGenerator.Contracts\Atc.Rest.ApiGenerator.Contracts.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Atc.Test" Version="1.0.93" />
-  </ItemGroup>
-
 </Project>
diff --git a/test/Atc.Rest.ApiGenerator.Framework.Mvc.Tests/Atc.Rest.ApiGenerator.Framework.Mvc.Tests.csproj b/test/Atc.Rest.ApiGenerator.Framework.Mvc.Tests/Atc.Rest.ApiGenerator.Framework.Mvc.Tests.csproj
index 99425f73..ae98b168 100644
--- a/test/Atc.Rest.ApiGenerator.Framework.Mvc.Tests/Atc.Rest.ApiGenerator.Framework.Mvc.Tests.csproj
+++ b/test/Atc.Rest.ApiGenerator.Framework.Mvc.Tests/Atc.Rest.ApiGenerator.Framework.Mvc.Tests.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
@@ -19,8 +19,4 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Atc.Test" Version="1.0.93" />
-  </ItemGroup>
-
 </Project>
diff --git a/test/Atc.Rest.ApiGenerator.Framework.Tests/Atc.Rest.ApiGenerator.Framework.Tests.csproj b/test/Atc.Rest.ApiGenerator.Framework.Tests/Atc.Rest.ApiGenerator.Framework.Tests.csproj
index 9086dbb8..c25a64a9 100644
--- a/test/Atc.Rest.ApiGenerator.Framework.Tests/Atc.Rest.ApiGenerator.Framework.Tests.csproj
+++ b/test/Atc.Rest.ApiGenerator.Framework.Tests/Atc.Rest.ApiGenerator.Framework.Tests.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
@@ -18,8 +18,4 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Atc.Test" Version="1.0.93" />
-  </ItemGroup>
-
 </Project>
diff --git a/test/Atc.Rest.ApiGenerator.Nuget.Tests/Atc.Rest.ApiGenerator.Nuget.Tests.csproj b/test/Atc.Rest.ApiGenerator.Nuget.Tests/Atc.Rest.ApiGenerator.Nuget.Tests.csproj
index 1ee96885..50c1928a 100644
--- a/test/Atc.Rest.ApiGenerator.Nuget.Tests/Atc.Rest.ApiGenerator.Nuget.Tests.csproj
+++ b/test/Atc.Rest.ApiGenerator.Nuget.Tests/Atc.Rest.ApiGenerator.Nuget.Tests.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc.XUnit" Version="2.0.513" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="Atc.XUnit" Version="2.0.525" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
@@ -23,8 +23,4 @@
     <ProjectReference Include="..\..\src\Atc.Rest.ApiGenerator.Nuget\Atc.Rest.ApiGenerator.Nuget.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Atc.Test" Version="1.0.93" />
-  </ItemGroup>
-
 </Project>
diff --git a/test/Atc.Rest.ApiGenerator.OpenApi.Tests/Atc.Rest.ApiGenerator.OpenApi.Tests.csproj b/test/Atc.Rest.ApiGenerator.OpenApi.Tests/Atc.Rest.ApiGenerator.OpenApi.Tests.csproj
index 9a6b4236..9c420da6 100644
--- a/test/Atc.Rest.ApiGenerator.OpenApi.Tests/Atc.Rest.ApiGenerator.OpenApi.Tests.csproj
+++ b/test/Atc.Rest.ApiGenerator.OpenApi.Tests/Atc.Rest.ApiGenerator.OpenApi.Tests.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
@@ -22,8 +22,4 @@
     <ProjectReference Include="..\..\src\Atc.Rest.ApiGenerator.OpenApi\Atc.Rest.ApiGenerator.OpenApi.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Atc.Test" Version="1.0.93" />
-  </ItemGroup>
-
 </Project>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 020fd5c2..31909604 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc.Test" Version="1.0.89" />
+    <PackageReference Include="Atc.Test" Version="1.1.4" />
     <PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" PrivateAssets="All" />
   </ItemGroup>