diff --git a/APIMatic.Core.Test/APIMatic.Core.Test.csproj b/APIMatic.Core.Test/APIMatic.Core.Test.csproj
index 8a7392de..0e44e077 100644
--- a/APIMatic.Core.Test/APIMatic.Core.Test.csproj
+++ b/APIMatic.Core.Test/APIMatic.Core.Test.csproj
@@ -12,7 +12,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="SonarAnalyzer.CSharp" Version="8.51.0.59060">
+        <PackageReference Include="SonarAnalyzer.CSharp" Version="9.0.0.0000" >
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/APIMatic.Core.Test/Http/HttpClientWrapperSSLTest.cs b/APIMatic.Core.Test/Http/HttpClientWrapperSSLTest.cs
index 33917251..aa77af44 100644
--- a/APIMatic.Core.Test/Http/HttpClientWrapperSSLTest.cs
+++ b/APIMatic.Core.Test/Http/HttpClientWrapperSSLTest.cs
@@ -65,7 +65,7 @@ public async Task TestHttpClientSkipSSLCertificateVerification_OKResponse()
             // Act
             var actual = await client.ExecuteAsync(request);
 
-            Assert.AreEqual(actual.StatusCode, (int)HttpStatusCode.OK);
+            Assert.AreEqual((int)HttpStatusCode.OK, actual.StatusCode);
         }
     }
 }
diff --git a/APIMatic.Core.Test/MockTypes/Convertors/UnixDateTimeConverter.cs b/APIMatic.Core.Test/MockTypes/Convertors/UnixDateTimeConverter.cs
index 555e68fa..0762ef4a 100644
--- a/APIMatic.Core.Test/MockTypes/Convertors/UnixDateTimeConverter.cs
+++ b/APIMatic.Core.Test/MockTypes/Convertors/UnixDateTimeConverter.cs
@@ -5,5 +5,7 @@ namespace APIMatic.Core.Test.MockTypes.Convertors
     /// <summary>
     /// Extends from DateTimeConverterBase, uses unix DateTime format.
     /// </summary>
+    #pragma warning disable S2094
     public class UnixDateTimeConverter : CoreUnixDateTimeConverter { }
+    #pragma warning restore S2094
 }
diff --git a/APIMatic.Core/APIMatic.Core.csproj b/APIMatic.Core/APIMatic.Core.csproj
index bb813c55..84fa062c 100644
--- a/APIMatic.Core/APIMatic.Core.csproj
+++ b/APIMatic.Core/APIMatic.Core.csproj
@@ -39,7 +39,7 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="SonarAnalyzer.CSharp" Version="8.55.0.65544">
+        <PackageReference Include="SonarAnalyzer.CSharp" Version="9.0.0.0000" >
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/APIMatic.Core/Request/Parameters/Parameter.cs b/APIMatic.Core/Request/Parameters/Parameter.cs
index 863b6a0c..cde72911 100644
--- a/APIMatic.Core/Request/Parameters/Parameter.cs
+++ b/APIMatic.Core/Request/Parameters/Parameter.cs
@@ -22,7 +22,7 @@ public abstract class Parameter
         
         private string GetName() => key == "" ? typeName : key;
 
-        private string IdentifierKey => string.IsNullOrEmpty(key) ? $"_{nameof(Parameter)}_{Guid.NewGuid()}" : key;
+        private string IdentifierKey => string.IsNullOrEmpty(key) ? $"_{typeName}_{Guid.NewGuid()}" : $"_{typeName}_{key}";
 
         public Parameter Setup(string key, object value)
         {
diff --git a/APIMatic.Core/Utilities/CoreHelper.cs b/APIMatic.Core/Utilities/CoreHelper.cs
index 0ba74290..eb567a6e 100644
--- a/APIMatic.Core/Utilities/CoreHelper.cs
+++ b/APIMatic.Core/Utilities/CoreHelper.cs
@@ -262,7 +262,7 @@ internal static bool TryGetInnerValueForContainer(object value, out dynamic inne
             var valueType = value?.GetType();
             if (valueType?.Namespace?.EndsWith(".Containers") == true)
             {
-                innerValue = valueType.GetFields()[0].GetValue(value);
+                innerValue = valueType?.GetFields()[0].GetValue(value);
                 return true;
             }
             innerValue = null;