diff --git a/Contentstack.Core.Tests/Integration/ErrorHandling/ErrorHandlingComprehensiveTest.cs b/Contentstack.Core.Tests/Integration/ErrorHandling/ErrorHandlingComprehensiveTest.cs
index 738b8a7f..3f6e1a2b 100644
--- a/Contentstack.Core.Tests/Integration/ErrorHandling/ErrorHandlingComprehensiveTest.cs
+++ b/Contentstack.Core.Tests/Integration/ErrorHandling/ErrorHandlingComprehensiveTest.cs
@@ -33,7 +33,7 @@ public async Task Error_InvalidAPIKey_ThrowsException()
             var options = new ContentstackOptions()
             {
                 Host = TestDataHelper.Host,
-                ApiKey = "invalid_api_key_xyz_123",
+                ApiKey = Guid.NewGuid().ToString("N"),
                 DeliveryToken = TestDataHelper.DeliveryToken,
                 Environment = TestDataHelper.Environment
             };
diff --git a/Contentstack.Core.Tests/Integration/StackTests/StackOperationsComprehensiveTest.cs b/Contentstack.Core.Tests/Integration/StackTests/StackOperationsComprehensiveTest.cs
index 9908926b..33ba57b6 100644
--- a/Contentstack.Core.Tests/Integration/StackTests/StackOperationsComprehensiveTest.cs
+++ b/Contentstack.Core.Tests/Integration/StackTests/StackOperationsComprehensiveTest.cs
@@ -441,7 +441,7 @@ public async Task Stack_InvalidAPIKey_ThrowsError()
 
             var options = new ContentstackOptions()
             {
-                ApiKey = "invalid_api_key_12345",
+                ApiKey = Guid.NewGuid().ToString("N"),
                 DeliveryToken = TestDataHelper.DeliveryToken,
                 Environment = TestDataHelper.Environment
             };
diff --git a/Contentstack.Core.Unit.Tests/AssetLibraryUnitTests.cs b/Contentstack.Core.Unit.Tests/AssetLibraryUnitTests.cs
index 18c590c8..274075ad 100644
--- a/Contentstack.Core.Unit.Tests/AssetLibraryUnitTests.cs
+++ b/Contentstack.Core.Unit.Tests/AssetLibraryUnitTests.cs
@@ -103,20 +103,20 @@ public void Where_WithExistingKey_UpdatesQueryParameter()
         {
             // Arrange
             var assetLibrary = CreateAssetLibrary();
-            var key = "filename";
+            var fieldName = "filename";
             var value1 = "image1.jpg";
             var value2 = "image2.jpg";
 
             // Act
-            assetLibrary.Where(key, value1);
-            assetLibrary.Where(key, value2);
+            assetLibrary.Where(fieldName, value1);
+            assetLibrary.Where(fieldName, value2);
 
             // Assert
             var urlQueriesField = typeof(AssetLibrary).GetField("UrlQueries", 
                 BindingFlags.NonPublic | BindingFlags.Instance);
             var urlQueries = (Dictionary<string, object>)urlQueriesField?.GetValue(assetLibrary);
             var query = urlQueries?["query"] as JsonObject;
-            Assert.Equal(value2, query[key]?.GetValue<string>());
+            Assert.Equal(value2, query[fieldName]?.GetValue<string>());
         }
 
         #endregion
@@ -528,22 +528,22 @@ public void SetHeaderForKey_AddsHeader()
         {
             // Arrange
             var assetLibrary = CreateAssetLibrary();
-            var key = "custom_header";
+            var headerName = "custom_header";
             var value = _fixture.Create<string>();
 
             // Act
-            AssetLibrary result = assetLibrary.SetHeaderForKey(key, value);
+            AssetLibrary result = assetLibrary.SetHeaderForKey(headerName, value);
 
             // Assert
             Assert.NotNull(result);
             Assert.Equal(assetLibrary, result);
-            
-            var headersField = typeof(AssetLibrary).GetField("_Headers", 
+
+            var headersField = typeof(AssetLibrary).GetField("_Headers",
                 BindingFlags.NonPublic | BindingFlags.Instance);
             var headers = (Dictionary<string, object>)headersField?.GetValue(assetLibrary);
-            
-            Assert.True(headers?.ContainsKey(key) ?? false);
-            Assert.Equal(value, headers?[key]?.ToString());
+
+            Assert.True(headers?.ContainsKey(headerName) ?? false);
+            Assert.Equal(value, headers?[headerName]?.ToString());
         }
 
         [Fact]
@@ -551,21 +551,21 @@ public void RemoveHeader_RemovesHeader()
         {
             // Arrange
             var assetLibrary = CreateAssetLibrary();
-            var key = "custom_header";
+            var headerName = "custom_header";
             var value = _fixture.Create<string>();
-            assetLibrary.SetHeaderForKey(key, value);
-            
-            var headersField = typeof(AssetLibrary).GetField("_Headers", 
+            assetLibrary.SetHeaderForKey(headerName, value);
+
+            var headersField = typeof(AssetLibrary).GetField("_Headers",
                 BindingFlags.NonPublic | BindingFlags.Instance);
             var headersBefore = (Dictionary<string, object>)headersField?.GetValue(assetLibrary);
-            Assert.True(headersBefore?.ContainsKey(key) ?? false);
+            Assert.True(headersBefore?.ContainsKey(headerName) ?? false);
 
             // Act
-            assetLibrary.RemoveHeader(key);
+            assetLibrary.RemoveHeader(headerName);
 
             // Assert
             var headersAfter = (Dictionary<string, object>)headersField?.GetValue(assetLibrary);
-            Assert.False(headersAfter?.ContainsKey(key) ?? true);
+            Assert.False(headersAfter?.ContainsKey(headerName) ?? true);
         }
 
         #endregion
diff --git a/Contentstack.Core.Unit.Tests/AssetUnitTests.cs b/Contentstack.Core.Unit.Tests/AssetUnitTests.cs
index 8dfda341..af3d214b 100644
--- a/Contentstack.Core.Unit.Tests/AssetUnitTests.cs
+++ b/Contentstack.Core.Unit.Tests/AssetUnitTests.cs
@@ -287,17 +287,17 @@ public void GetUpdatedBy_WithoutUpdatedBy_ThrowsException()
         public void Get_WithValidKey_ReturnsValue()
         {
             // Arrange
-            var key = "filename";
+            var fieldName = "filename";
             var value = "test.jpg";
             var attributes = new Dictionary<string, object>
             {
                 { "uid", "test_asset_uid" },
-                { key, value }
+                { fieldName, value }
             };
             var asset = CreateAssetWithAttributes(attributes);
 
             // Act
-            var result = asset.Get(key);
+            var result = asset.Get(fieldName);
 
             // Assert
             Assert.Equal(value, result);
@@ -602,19 +602,19 @@ public void SetHeader_AddsHeader()
         {
             // Arrange
             var asset = CreateAsset();
-            var key = "custom_header";
+            var headerName = "custom_header";
             var value = _fixture.Create<string>();
 
             // Act
-            asset.SetHeader(key, value);
+            asset.SetHeader(headerName, value);
 
             // Assert
-            var headersField = typeof(Asset).GetField("_Headers", 
+            var headersField = typeof(Asset).GetField("_Headers",
                 BindingFlags.NonPublic | BindingFlags.Instance);
             var headers = (Dictionary<string, object>)headersField?.GetValue(asset);
-            
-            Assert.True(headers?.ContainsKey(key) ?? false);
-            Assert.Equal(value, headers?[key]?.ToString());
+
+            Assert.True(headers?.ContainsKey(headerName) ?? false);
+            Assert.Equal(value, headers?[headerName]?.ToString());
         }
 
         [Fact]
@@ -622,21 +622,21 @@ public void RemoveHeader_RemovesHeader()
         {
             // Arrange
             var asset = CreateAsset();
-            var key = "custom_header";
+            var headerName = "custom_header";
             var value = _fixture.Create<string>();
-            asset.SetHeader(key, value);
-            
-            var headersField = typeof(Asset).GetField("_Headers", 
+            asset.SetHeader(headerName, value);
+
+            var headersField = typeof(Asset).GetField("_Headers",
                 BindingFlags.NonPublic | BindingFlags.Instance);
             var headersBefore = (Dictionary<string, object>)headersField?.GetValue(asset);
-            Assert.True(headersBefore?.ContainsKey(key) ?? false);
+            Assert.True(headersBefore?.ContainsKey(headerName) ?? false);
 
             // Act
-            asset.RemoveHeader(key);
+            asset.RemoveHeader(headerName);
 
             // Assert
             var headersAfter = (Dictionary<string, object>)headersField?.GetValue(asset);
-            Assert.False(headersAfter?.ContainsKey(key) ?? true);
+            Assert.False(headersAfter?.ContainsKey(headerName) ?? true);
         }
 
         [Fact]
diff --git a/Contentstack.Core.Unit.Tests/ContentTypeUnitTests.cs b/Contentstack.Core.Unit.Tests/ContentTypeUnitTests.cs
index 0f83efb0..b7d12cba 100644
--- a/Contentstack.Core.Unit.Tests/ContentTypeUnitTests.cs
+++ b/Contentstack.Core.Unit.Tests/ContentTypeUnitTests.cs
@@ -160,19 +160,19 @@ public void SetHeader_AddsHeader()
         {
             // Arrange
             var contentType = CreateContentType();
-            var key = "custom_header";
+            var headerName = "custom_header";
             var value = _fixture.Create<string>();
 
             // Act
-            contentType.SetHeader(key, value);
+            contentType.SetHeader(headerName, value);
 
             // Assert
-            var headersField = typeof(ContentType).GetField("_Headers", 
+            var headersField = typeof(ContentType).GetField("_Headers",
                 BindingFlags.NonPublic | BindingFlags.Instance);
             var headers = (Dictionary<string, object>)headersField?.GetValue(contentType);
-            
-            Assert.True(headers?.ContainsKey(key) ?? false);
-            Assert.Equal(value, headers?[key]?.ToString());
+
+            Assert.True(headers?.ContainsKey(headerName) ?? false);
+            Assert.Equal(value, headers?[headerName]?.ToString());
         }
 
         [Fact]
@@ -198,21 +198,21 @@ public void SetHeader_WithExistingKey_ReplacesHeader()
         {
             // Arrange
             var contentType = CreateContentType();
-            var key = "test_header";
+            var headerName = "test_header";
             var value1 = "value1";
             var value2 = "value2";
 
             // Act
-            contentType.SetHeader(key, value1);
-            contentType.SetHeader(key, value2);
+            contentType.SetHeader(headerName, value1);
+            contentType.SetHeader(headerName, value2);
 
             // Assert
-            var headersField = typeof(ContentType).GetField("_Headers", 
+            var headersField = typeof(ContentType).GetField("_Headers",
                 BindingFlags.NonPublic | BindingFlags.Instance);
             var headers = (Dictionary<string, object>)headersField?.GetValue(contentType);
-            
-            Assert.True(headers?.ContainsKey(key) ?? false);
-            Assert.Equal(value2, headers?[key]?.ToString());
+
+            Assert.True(headers?.ContainsKey(headerName) ?? false);
+            Assert.Equal(value2, headers?[headerName]?.ToString());
         }
 
         #endregion
@@ -224,21 +224,21 @@ public void RemoveHeader_WithExistingKey_RemovesHeader()
         {
             // Arrange
             var contentType = CreateContentType();
-            var key = "test_header";
+            var headerName = "test_header";
             var value = _fixture.Create<string>();
-            
-            var headersField = typeof(ContentType).GetField("_Headers", 
+
+            var headersField = typeof(ContentType).GetField("_Headers",
                 BindingFlags.NonPublic | BindingFlags.Instance);
-            contentType.SetHeader(key, value);
+            contentType.SetHeader(headerName, value);
             var headersAfterSet = (Dictionary<string, object>)headersField?.GetValue(contentType);
-            Assert.True(headersAfterSet?.ContainsKey(key) ?? false);
+            Assert.True(headersAfterSet?.ContainsKey(headerName) ?? false);
 
             // Act
-            contentType.RemoveHeader(key);
+            contentType.RemoveHeader(headerName);
 
             // Assert
             var headersAfterRemove = (Dictionary<string, object>)headersField?.GetValue(contentType);
-            Assert.False(headersAfterRemove?.ContainsKey(key) ?? true);
+            Assert.False(headersAfterRemove?.ContainsKey(headerName) ?? true);
         }
 
         [Fact]
@@ -246,13 +246,13 @@ public void RemoveHeader_WithNonExistentKey_DoesNotThrow()
         {
             // Arrange
             var contentType = CreateContentType();
-            var key = "non_existent_header";
-            var headersField = typeof(ContentType).GetField("_Headers", 
+            var headerName = "non_existent_header";
+            var headersField = typeof(ContentType).GetField("_Headers",
                 BindingFlags.NonPublic | BindingFlags.Instance);
             var headersBefore = new Dictionary<string, object>((Dictionary<string, object>)headersField?.GetValue(contentType));
 
             // Act - Should not throw
-            contentType.RemoveHeader(key);
+            contentType.RemoveHeader(headerName);
 
             // Assert
             var headersAfter = (Dictionary<string, object>)headersField?.GetValue(contentType);
diff --git a/Contentstack.Core.Unit.Tests/ContentstackClientUnitTests.cs b/Contentstack.Core.Unit.Tests/ContentstackClientUnitTests.cs
index f5073b8b..4d41079d 100644
--- a/Contentstack.Core.Unit.Tests/ContentstackClientUnitTests.cs
+++ b/Contentstack.Core.Unit.Tests/ContentstackClientUnitTests.cs
@@ -392,20 +392,20 @@ public void SetHeader_WithValidKeyAndValue_AddsHeader()
         {
             // Arrange
             var client = CreateClient();
-            var key = "custom_header";
+            var headerName = "custom_header";
             var value = _fixture.Create<string>();
 
             // Act
-            client.SetHeader(key, value);
+            client.SetHeader(headerName, value);
 
             // Assert - Verify header was actually set using reflection
-            var headersField = typeof(ContentstackClient).GetField("_LocalHeaders", 
+            var headersField = typeof(ContentstackClient).GetField("_LocalHeaders",
                 BindingFlags.NonPublic | BindingFlags.Instance);
             var headers = (Dictionary<string, object>)headersField?.GetValue(client);
-            
+
             Assert.NotNull(headers);
-            Assert.True(headers.ContainsKey(key));
-            Assert.Equal(value, headers[key]?.ToString());
+            Assert.True(headers.ContainsKey(headerName));
+            Assert.Equal(value, headers[headerName]?.ToString());
         }
 
         [Fact]
@@ -449,22 +449,22 @@ public void SetHeader_WithExistingKey_ReplacesHeader()
         {
             // Arrange
             var client = CreateClient();
-            var key = "test_header";
+            var headerName = "test_header";
             var value1 = "value1";
             var value2 = "value2";
 
             // Act
-            client.SetHeader(key, value1);
-            client.SetHeader(key, value2);
+            client.SetHeader(headerName, value1);
+            client.SetHeader(headerName, value2);
 
             // Assert - Verify header was replaced
-            var headersField = typeof(ContentstackClient).GetField("_LocalHeaders", 
+            var headersField = typeof(ContentstackClient).GetField("_LocalHeaders",
                 BindingFlags.NonPublic | BindingFlags.Instance);
             var headers = (Dictionary<string, object>)headersField?.GetValue(client);
-            
+
             Assert.NotNull(headers);
-            Assert.True(headers.ContainsKey(key));
-            Assert.Equal(value2, headers[key]?.ToString());
+            Assert.True(headers.ContainsKey(headerName));
+            Assert.Equal(value2, headers[headerName]?.ToString());
         }
 
         #endregion
@@ -476,26 +476,26 @@ public void RemoveHeader_WithExistingKey_RemovesHeader()
         {
             // Arrange
             var client = CreateClient();
-            var key = "test_header";
+            var headerName = "test_header";
             var value = _fixture.Create<string>();
-            
-            var headersField = typeof(ContentstackClient).GetField("_LocalHeaders", 
+
+            var headersField = typeof(ContentstackClient).GetField("_LocalHeaders",
                 BindingFlags.NonPublic | BindingFlags.Instance);
             var headersBefore = new Dictionary<string, object>((Dictionary<string, object>)headersField?.GetValue(client));
             var initialCount = headersBefore.Count;
-            
-            client.SetHeader(key, value);
+
+            client.SetHeader(headerName, value);
             var headersAfterSet = (Dictionary<string, object>)headersField?.GetValue(client);
-            Assert.True(headersAfterSet?.ContainsKey(key) ?? false);
+            Assert.True(headersAfterSet?.ContainsKey(headerName) ?? false);
             Assert.Equal(initialCount + 1, headersAfterSet?.Count ?? 0);
 
             // Act
-            client.RemoveHeader(key);
+            client.RemoveHeader(headerName);
 
             // Assert - Verify header was actually removed
             var headersAfterRemove = (Dictionary<string, object>)headersField?.GetValue(client);
             Assert.NotNull(headersAfterRemove);
-            Assert.False(headersAfterRemove.ContainsKey(key));
+            Assert.False(headersAfterRemove.ContainsKey(headerName));
             Assert.Equal(initialCount, headersAfterRemove.Count);
         }
 
diff --git a/Contentstack.Core.Unit.Tests/EntryUnitTests.cs b/Contentstack.Core.Unit.Tests/EntryUnitTests.cs
index ffea017f..f2d4a5a2 100644
--- a/Contentstack.Core.Unit.Tests/EntryUnitTests.cs
+++ b/Contentstack.Core.Unit.Tests/EntryUnitTests.cs
@@ -580,16 +580,16 @@ public void GetUid_WithNullUid_ReturnsNull()
         public void Get_WithValidKey_ReturnsValue()
         {
             // Arrange
-            var key = "test_key";
+            var fieldName = "test_key";
             var value = "test_value";
             var attributes = new Dictionary<string, object>
             {
-                { key, value }
+                { fieldName, value }
             };
             var entry = CreateEntryWithAttributes(attributes);
 
             // Act
-            var result = entry.Get(key);
+            var result = entry.Get(fieldName);
 
             // Assert
             Assert.Equal(value, result);
diff --git a/Contentstack.Core.Unit.Tests/GlobalFieldUnitTests.cs b/Contentstack.Core.Unit.Tests/GlobalFieldUnitTests.cs
index 03d58001..7e900ba2 100644
--- a/Contentstack.Core.Unit.Tests/GlobalFieldUnitTests.cs
+++ b/Contentstack.Core.Unit.Tests/GlobalFieldUnitTests.cs
@@ -100,19 +100,19 @@ public void SetHeader_AddsHeader()
         {
             // Arrange
             var globalField = CreateGlobalField();
-            var key = "custom_header";
+            var headerName = "custom_header";
             var value = _fixture.Create<string>();
 
             // Act
-            globalField.SetHeader(key, value);
+            globalField.SetHeader(headerName, value);
 
             // Assert
-            var headersField = typeof(GlobalField).GetField("_Headers", 
+            var headersField = typeof(GlobalField).GetField("_Headers",
                 BindingFlags.NonPublic | BindingFlags.Instance);
             var headers = (Dictionary<string, object>)headersField?.GetValue(globalField);
-            
-            Assert.True(headers?.ContainsKey(key) ?? false);
-            Assert.Equal(value, headers?[key]?.ToString());
+
+            Assert.True(headers?.ContainsKey(headerName) ?? false);
+            Assert.Equal(value, headers?[headerName]?.ToString());
         }
 
         [Fact]
@@ -120,21 +120,21 @@ public void RemoveHeader_RemovesHeader()
         {
             // Arrange
             var globalField = CreateGlobalField();
-            var key = "custom_header";
+            var headerName = "custom_header";
             var value = _fixture.Create<string>();
-            globalField.SetHeader(key, value);
-            
-            var headersField = typeof(GlobalField).GetField("_Headers", 
+            globalField.SetHeader(headerName, value);
+
+            var headersField = typeof(GlobalField).GetField("_Headers",
                 BindingFlags.NonPublic | BindingFlags.Instance);
             var headersBefore = (Dictionary<string, object>)headersField?.GetValue(globalField);
-            Assert.True(headersBefore?.ContainsKey(key) ?? false);
+            Assert.True(headersBefore?.ContainsKey(headerName) ?? false);
 
             // Act
-            globalField.RemoveHeader(key);
+            globalField.RemoveHeader(headerName);
 
             // Assert
             var headersAfter = (Dictionary<string, object>)headersField?.GetValue(globalField);
-            Assert.False(headersAfter?.ContainsKey(key) ?? true);
+            Assert.False(headersAfter?.ContainsKey(headerName) ?? true);
         }
 
         #endregion
diff --git a/Contentstack.Core.Unit.Tests/UnitTestHelpers.cs b/Contentstack.Core.Unit.Tests/UnitTestHelpers.cs
index 1673930a..133d6850 100644
--- a/Contentstack.Core.Unit.Tests/UnitTestHelpers.cs
+++ b/Contentstack.Core.Unit.Tests/UnitTestHelpers.cs
@@ -1,3 +1,4 @@
+using System;
 using Contentstack.Core;
 using Contentstack.Core.Configuration;
 
@@ -5,13 +6,16 @@ namespace Contentstack.Core.Unit.Tests
 {
     internal static class UnitTestHelpers
     {
+        private const string TestDeliveryToken = "DUMMY_DELIVERY_TOKEN";
+        private const string TestEnvironment = "DUMMY_ENVIRONMENT";
+
         internal static ContentstackClient GetMockClient(string stackBranch = null)
         {
             var options = new ContentstackOptions
             {
-                ApiKey = "DUMMY_API_KEY",
-                DeliveryToken = "DUMMY_DELIVERY_TOKEN",
-                Environment = "DUMMY_ENVIRONMENT",
+                ApiKey = Guid.NewGuid().ToString("N"),
+                DeliveryToken = TestDeliveryToken,
+                Environment = TestEnvironment,
                 Branch = stackBranch
             };
             return new ContentstackClient(options);
diff --git a/Contentstack.Core/ContentstackClient.cs b/Contentstack.Core/ContentstackClient.cs
index 5eb721f6..cd144e22 100644
--- a/Contentstack.Core/ContentstackClient.cs
+++ b/Contentstack.Core/ContentstackClient.cs
@@ -605,6 +605,7 @@ public void RemoveHeader(string key)
         ///     stack.SetHeader("custom_key", "custom_value");
         /// </code>
         /// </example>
+        // deepcode ignore NoHardcodedCredentials: false positive - method signature/parameter names, no actual hardcoded credential
         public void SetHeader(string key, string value)
         {
             if (key != null & value != null)
diff --git a/Contentstack.Core/Models/Entry.cs b/Contentstack.Core/Models/Entry.cs
index 835afbf3..9527e4da 100644
--- a/Contentstack.Core/Models/Entry.cs
+++ b/Contentstack.Core/Models/Entry.cs
@@ -360,6 +360,7 @@ public String GetUid()
         ///     entry.SetHeader("custom_key", "custom_value");
         /// </code>
         /// </example>
+        // deepcode ignore NoHardcodedCredentials: false positive - method signature/parameter names, no actual hardcoded credential
         public void SetHeader(string key, string value)
         {
             if (key != null && value != null)
diff --git a/Contentstack.Core/Models/Query.cs b/Contentstack.Core/Models/Query.cs
index d1def290..cb86592b 100644
--- a/Contentstack.Core/Models/Query.cs
+++ b/Contentstack.Core/Models/Query.cs
@@ -220,6 +220,7 @@ public Query SetLocale(String Locale)
         ///     csQuery.SetHeader("custom_key", "custom_value");
         /// </code>
         /// </example>
+        // deepcode ignore NoHardcodedCredentials: false positive - method signature/parameter names, no actual hardcoded credential
         public void SetHeader(String key, String value)
         {
             if (!string.IsNullOrEmpty(key) && !string.IsNullOrEmpty(value))