diff --git a/Directory.Packages.props b/Directory.Packages.props
index 9a48fc65..90590c2d 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -35,7 +35,7 @@
-
+
diff --git a/access-token-management/samples/Web/Controllers/HomeController.cs b/access-token-management/samples/Web/Controllers/HomeController.cs
index f689713b..4e987d5f 100644
--- a/access-token-management/samples/Web/Controllers/HomeController.cs
+++ b/access-token-management/samples/Web/Controllers/HomeController.cs
@@ -7,7 +7,7 @@
using System.Net.Http;
using System.Text.Json;
using System.Threading.Tasks;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
using Duende.AccessTokenManagement.OpenIdConnect;
namespace Web.Controllers;
diff --git a/access-token-management/samples/WebJarJwt/ClientAssertionService.cs b/access-token-management/samples/WebJarJwt/ClientAssertionService.cs
index 73421649..84eccb79 100644
--- a/access-token-management/samples/WebJarJwt/ClientAssertionService.cs
+++ b/access-token-management/samples/WebJarJwt/ClientAssertionService.cs
@@ -6,8 +6,8 @@
using System.Threading.Tasks;
using Duende.AccessTokenManagement;
using Duende.AccessTokenManagement.OpenIdConnect;
-using IdentityModel;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
using Microsoft.IdentityModel.JsonWebTokens;
using Microsoft.IdentityModel.Protocols.OpenIdConnect;
using Microsoft.IdentityModel.Tokens;
diff --git a/access-token-management/samples/WebJarJwt/Controllers/HomeController.cs b/access-token-management/samples/WebJarJwt/Controllers/HomeController.cs
index 395d8ddf..b8e3ac4a 100644
--- a/access-token-management/samples/WebJarJwt/Controllers/HomeController.cs
+++ b/access-token-management/samples/WebJarJwt/Controllers/HomeController.cs
@@ -7,7 +7,7 @@
using System.Text.Json;
using System.Threading.Tasks;
using Duende.AccessTokenManagement.OpenIdConnect;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
using Microsoft.AspNetCore.Authentication;
namespace WebJarJwt.Controllers;
diff --git a/access-token-management/samples/Worker/ClientAssertionService.cs b/access-token-management/samples/Worker/ClientAssertionService.cs
index a4b699be..3bda3fa2 100644
--- a/access-token-management/samples/Worker/ClientAssertionService.cs
+++ b/access-token-management/samples/Worker/ClientAssertionService.cs
@@ -5,8 +5,8 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Duende.AccessTokenManagement;
-using IdentityModel;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
using Microsoft.Extensions.Options;
using Microsoft.IdentityModel.JsonWebTokens;
using Microsoft.IdentityModel.Tokens;
diff --git a/access-token-management/samples/Worker/WorkerManual.cs b/access-token-management/samples/Worker/WorkerManual.cs
index 8c1c9f9c..0b2ccecf 100644
--- a/access-token-management/samples/Worker/WorkerManual.cs
+++ b/access-token-management/samples/Worker/WorkerManual.cs
@@ -8,7 +8,7 @@
using System.Threading;
using System.Threading.Tasks;
using Duende.AccessTokenManagement;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
namespace WorkerService;
diff --git a/access-token-management/samples/Worker/WorkerManualJwt.cs b/access-token-management/samples/Worker/WorkerManualJwt.cs
index e79832d1..5db9eecb 100644
--- a/access-token-management/samples/Worker/WorkerManualJwt.cs
+++ b/access-token-management/samples/Worker/WorkerManualJwt.cs
@@ -8,7 +8,7 @@
using System.Threading;
using System.Threading.Tasks;
using Duende.AccessTokenManagement;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
namespace WorkerService;
diff --git a/access-token-management/samples/WorkerDI/ClientAssertionService.cs b/access-token-management/samples/WorkerDI/ClientAssertionService.cs
index 64b5e9d4..47522d3b 100644
--- a/access-token-management/samples/WorkerDI/ClientAssertionService.cs
+++ b/access-token-management/samples/WorkerDI/ClientAssertionService.cs
@@ -5,8 +5,8 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Duende.AccessTokenManagement;
-using IdentityModel;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
using Microsoft.Extensions.Options;
using Microsoft.IdentityModel.JsonWebTokens;
using Microsoft.IdentityModel.Tokens;
diff --git a/access-token-management/samples/WorkerDI/ClientCredentialsClientConfigureOptions.cs b/access-token-management/samples/WorkerDI/ClientCredentialsClientConfigureOptions.cs
index 99fed412..54c864d9 100644
--- a/access-token-management/samples/WorkerDI/ClientCredentialsClientConfigureOptions.cs
+++ b/access-token-management/samples/WorkerDI/ClientCredentialsClientConfigureOptions.cs
@@ -2,7 +2,7 @@
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
using Duende.AccessTokenManagement;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
using Microsoft.Extensions.Options;
namespace WorkerService;
diff --git a/access-token-management/samples/WorkerDI/Program.cs b/access-token-management/samples/WorkerDI/Program.cs
index 0e9be6b6..81ba6c2e 100644
--- a/access-token-management/samples/WorkerDI/Program.cs
+++ b/access-token-management/samples/WorkerDI/Program.cs
@@ -6,7 +6,7 @@
using Serilog;
using System;
using Duende.AccessTokenManagement;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
using Microsoft.Extensions.Options;
using Serilog.Sinks.SystemConsole.Themes;
diff --git a/access-token-management/samples/WorkerDI/WorkerManual.cs b/access-token-management/samples/WorkerDI/WorkerManual.cs
index 8c1c9f9c..0b2ccecf 100644
--- a/access-token-management/samples/WorkerDI/WorkerManual.cs
+++ b/access-token-management/samples/WorkerDI/WorkerManual.cs
@@ -8,7 +8,7 @@
using System.Threading;
using System.Threading.Tasks;
using Duende.AccessTokenManagement;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
namespace WorkerService;
diff --git a/access-token-management/samples/WorkerDI/WorkerManualJwt.cs b/access-token-management/samples/WorkerDI/WorkerManualJwt.cs
index e79832d1..5db9eecb 100644
--- a/access-token-management/samples/WorkerDI/WorkerManualJwt.cs
+++ b/access-token-management/samples/WorkerDI/WorkerManualJwt.cs
@@ -8,7 +8,7 @@
using System.Threading;
using System.Threading.Tasks;
using Duende.AccessTokenManagement;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
namespace WorkerService;
diff --git a/access-token-management/src/AccessTokenManagement.OpenIdConnect/ConfigureOpenIdConnectOptions.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/ConfigureOpenIdConnectOptions.cs
index 34dd293e..b2acd1d8 100644
--- a/access-token-management/src/AccessTokenManagement.OpenIdConnect/ConfigureOpenIdConnectOptions.cs
+++ b/access-token-management/src/AccessTokenManagement.OpenIdConnect/ConfigureOpenIdConnectOptions.cs
@@ -1,7 +1,7 @@
// Copyright (c) Duende Software. All rights reserved.
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
-using IdentityModel;
+using Duende.IdentityModel;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.OpenIdConnect;
using Microsoft.AspNetCore.Http;
diff --git a/access-token-management/src/AccessTokenManagement.OpenIdConnect/OpenIdConnectConfigurationService.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/OpenIdConnectConfigurationService.cs
index 0a450694..b5c6bbf2 100644
--- a/access-token-management/src/AccessTokenManagement.OpenIdConnect/OpenIdConnectConfigurationService.cs
+++ b/access-token-management/src/AccessTokenManagement.OpenIdConnect/OpenIdConnectConfigurationService.cs
@@ -1,7 +1,7 @@
// Copyright (c) Duende Software. All rights reserved.
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
-using IdentityModel;
+using Duende.IdentityModel;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.OpenIdConnect;
using Microsoft.Extensions.Options;
diff --git a/access-token-management/src/AccessTokenManagement.OpenIdConnect/UserAccessTokenManagementService.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/UserAccessTokenManagementService.cs
index c2a671e7..ec6500aa 100644
--- a/access-token-management/src/AccessTokenManagement.OpenIdConnect/UserAccessTokenManagementService.cs
+++ b/access-token-management/src/AccessTokenManagement.OpenIdConnect/UserAccessTokenManagementService.cs
@@ -2,7 +2,7 @@
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
using System.Security.Claims;
-using IdentityModel;
+using Duende.IdentityModel;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
diff --git a/access-token-management/src/AccessTokenManagement.OpenIdConnect/UserTokenEndpointService.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/UserTokenEndpointService.cs
index 6f47e62c..2f239c08 100644
--- a/access-token-management/src/AccessTokenManagement.OpenIdConnect/UserTokenEndpointService.cs
+++ b/access-token-management/src/AccessTokenManagement.OpenIdConnect/UserTokenEndpointService.cs
@@ -1,8 +1,8 @@
// Copyright (c) Duende Software. All rights reserved.
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
-using IdentityModel.Client;
-using IdentityModel;
+using Duende.IdentityModel.Client;
+using Duende.IdentityModel;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
diff --git a/access-token-management/src/AccessTokenManagement.OpenIdConnect/UserTokenManagementOptions.cs b/access-token-management/src/AccessTokenManagement.OpenIdConnect/UserTokenManagementOptions.cs
index cd13aebf..64926f7f 100644
--- a/access-token-management/src/AccessTokenManagement.OpenIdConnect/UserTokenManagementOptions.cs
+++ b/access-token-management/src/AccessTokenManagement.OpenIdConnect/UserTokenManagementOptions.cs
@@ -1,7 +1,7 @@
// Copyright (c) Duende Software. All rights reserved.
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
namespace Duende.AccessTokenManagement.OpenIdConnect;
diff --git a/access-token-management/src/AccessTokenManagement/AccessTokenHandler.cs b/access-token-management/src/AccessTokenManagement/AccessTokenHandler.cs
index d9bd1b26..9ef4239a 100644
--- a/access-token-management/src/AccessTokenManagement/AccessTokenHandler.cs
+++ b/access-token-management/src/AccessTokenManagement/AccessTokenHandler.cs
@@ -1,9 +1,9 @@
// Copyright (c) Duende Software. All rights reserved.
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
using Microsoft.Extensions.Logging;
-using static IdentityModel.OidcConstants;
+using static Duende.IdentityModel.OidcConstants;
namespace Duende.AccessTokenManagement;
diff --git a/access-token-management/src/AccessTokenManagement/AccessTokenManagement.csproj b/access-token-management/src/AccessTokenManagement/AccessTokenManagement.csproj
index c8269977..815b7bf1 100644
--- a/access-token-management/src/AccessTokenManagement/AccessTokenManagement.csproj
+++ b/access-token-management/src/AccessTokenManagement/AccessTokenManagement.csproj
@@ -8,7 +8,7 @@
false
-
+
diff --git a/access-token-management/src/AccessTokenManagement/ClientCredentialsClient.cs b/access-token-management/src/AccessTokenManagement/ClientCredentialsClient.cs
index fed2ec88..78216880 100644
--- a/access-token-management/src/AccessTokenManagement/ClientCredentialsClient.cs
+++ b/access-token-management/src/AccessTokenManagement/ClientCredentialsClient.cs
@@ -1,7 +1,7 @@
// Copyright (c) Duende Software. All rights reserved.
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
namespace Duende.AccessTokenManagement;
diff --git a/access-token-management/src/AccessTokenManagement/ClientCredentialsTokenEndpointService.cs b/access-token-management/src/AccessTokenManagement/ClientCredentialsTokenEndpointService.cs
index 53e378cb..49d63a9e 100644
--- a/access-token-management/src/AccessTokenManagement/ClientCredentialsTokenEndpointService.cs
+++ b/access-token-management/src/AccessTokenManagement/ClientCredentialsTokenEndpointService.cs
@@ -1,8 +1,8 @@
// Copyright (c) Duende Software. All rights reserved.
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
-using IdentityModel;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
diff --git a/access-token-management/src/AccessTokenManagement/DPoPExtensions.cs b/access-token-management/src/AccessTokenManagement/DPoPExtensions.cs
index b0e80683..40f1cde9 100644
--- a/access-token-management/src/AccessTokenManagement/DPoPExtensions.cs
+++ b/access-token-management/src/AccessTokenManagement/DPoPExtensions.cs
@@ -1,7 +1,7 @@
// Copyright (c) Duende Software. All rights reserved.
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
-using IdentityModel;
+using Duende.IdentityModel;
namespace Duende.AccessTokenManagement;
diff --git a/access-token-management/src/AccessTokenManagement/DefaultClientAssertionService.cs b/access-token-management/src/AccessTokenManagement/DefaultClientAssertionService.cs
index 845928c5..a62a792f 100644
--- a/access-token-management/src/AccessTokenManagement/DefaultClientAssertionService.cs
+++ b/access-token-management/src/AccessTokenManagement/DefaultClientAssertionService.cs
@@ -1,7 +1,7 @@
// Copyright (c) Duende Software. All rights reserved.
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
namespace Duende.AccessTokenManagement;
diff --git a/access-token-management/src/AccessTokenManagement/DefaultDPoPProofService.cs b/access-token-management/src/AccessTokenManagement/DefaultDPoPProofService.cs
index 942fa122..0c58012c 100644
--- a/access-token-management/src/AccessTokenManagement/DefaultDPoPProofService.cs
+++ b/access-token-management/src/AccessTokenManagement/DefaultDPoPProofService.cs
@@ -1,7 +1,7 @@
// Copyright (c) Duende Software. All rights reserved.
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
-using IdentityModel;
+using Duende.IdentityModel;
using Microsoft.IdentityModel.Tokens;
using System.Text;
using System.Security.Cryptography;
diff --git a/access-token-management/src/AccessTokenManagement/Interfaces/IClientAssertionService.cs b/access-token-management/src/AccessTokenManagement/Interfaces/IClientAssertionService.cs
index 3fcfe7e4..4fc0c094 100644
--- a/access-token-management/src/AccessTokenManagement/Interfaces/IClientAssertionService.cs
+++ b/access-token-management/src/AccessTokenManagement/Interfaces/IClientAssertionService.cs
@@ -1,7 +1,7 @@
// Copyright (c) Duende Software. All rights reserved.
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
namespace Duende.AccessTokenManagement;
diff --git a/access-token-management/src/AccessTokenManagement/TokenRequestParameters.cs b/access-token-management/src/AccessTokenManagement/TokenRequestParameters.cs
index 50e4b30c..e3c55c23 100644
--- a/access-token-management/src/AccessTokenManagement/TokenRequestParameters.cs
+++ b/access-token-management/src/AccessTokenManagement/TokenRequestParameters.cs
@@ -1,7 +1,7 @@
// Copyright (c) Duende Software. All rights reserved.
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
namespace Duende.AccessTokenManagement;
diff --git a/access-token-management/test/AccessTokenManagement.Tests/ClientTokenManagementApiTests.cs b/access-token-management/test/AccessTokenManagement.Tests/ClientTokenManagementApiTests.cs
index 81a0e22c..be19894e 100644
--- a/access-token-management/test/AccessTokenManagement.Tests/ClientTokenManagementApiTests.cs
+++ b/access-token-management/test/AccessTokenManagement.Tests/ClientTokenManagementApiTests.cs
@@ -2,7 +2,7 @@
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
using Duende.IdentityServer.Configuration;
-using IdentityModel;
+using Duende.IdentityModel;
using Microsoft.AspNetCore.Authentication;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
diff --git a/access-token-management/test/AccessTokenManagement.Tests/ClientTokenManagementTests.cs b/access-token-management/test/AccessTokenManagement.Tests/ClientTokenManagementTests.cs
index 56a0ac99..bba55fb6 100644
--- a/access-token-management/test/AccessTokenManagement.Tests/ClientTokenManagementTests.cs
+++ b/access-token-management/test/AccessTokenManagement.Tests/ClientTokenManagementTests.cs
@@ -3,8 +3,8 @@
using System.Net;
using System.Text.Json;
-using IdentityModel;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
using Microsoft.Extensions.Caching.Distributed;
using Microsoft.Extensions.DependencyInjection;
using RichardSzalay.MockHttp;
@@ -131,7 +131,7 @@ public async Task Token_request_and_response_should_have_expected_values(ClientC
mockHttp.Expect("/connect/token")
.WithFormData(expectedRequestFormData)
.WithHeaders("Authorization",
- "Basic " + BasicAuthenticationOAuthHeaderValue.EncodeCredential("client_id", "client_secret"))
+ "Basic " + Duende.IdentityModel.Client.BasicAuthenticationOAuthHeaderValue.EncodeCredential("client_id", "client_secret"))
.Respond("application/json", JsonSerializer.Serialize(response));
}
diff --git a/access-token-management/test/AccessTokenManagement.Tests/Framework/AppHost.cs b/access-token-management/test/AccessTokenManagement.Tests/Framework/AppHost.cs
index ee1bee0b..ba30251e 100644
--- a/access-token-management/test/AccessTokenManagement.Tests/Framework/AppHost.cs
+++ b/access-token-management/test/AccessTokenManagement.Tests/Framework/AppHost.cs
@@ -7,7 +7,7 @@
using Microsoft.Extensions.DependencyInjection;
using System.Net;
using System.Web;
-using IdentityModel;
+using Duende.IdentityModel;
using Duende.AccessTokenManagement.OpenIdConnect;
using RichardSzalay.MockHttp;
diff --git a/access-token-management/test/AccessTokenManagement.Tests/Framework/IntegrationTestBase.cs b/access-token-management/test/AccessTokenManagement.Tests/Framework/IntegrationTestBase.cs
index 082c112e..8edda45f 100644
--- a/access-token-management/test/AccessTokenManagement.Tests/Framework/IntegrationTestBase.cs
+++ b/access-token-management/test/AccessTokenManagement.Tests/Framework/IntegrationTestBase.cs
@@ -3,7 +3,7 @@
using Duende.AccessTokenManagement.OpenIdConnect;
using Duende.IdentityServer.Models;
-using IdentityModel;
+using Duende.IdentityModel;
using System.Security.Claims;
namespace Duende.AccessTokenManagement.Tests;
diff --git a/access-token-management/test/AccessTokenManagement.Tests/Framework/TestClientAssertionService.cs b/access-token-management/test/AccessTokenManagement.Tests/Framework/TestClientAssertionService.cs
index 51a79cfa..a4bac7f3 100644
--- a/access-token-management/test/AccessTokenManagement.Tests/Framework/TestClientAssertionService.cs
+++ b/access-token-management/test/AccessTokenManagement.Tests/Framework/TestClientAssertionService.cs
@@ -1,7 +1,7 @@
// Copyright (c) Duende Software. All rights reserved.
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
namespace Duende.AccessTokenManagement.Tests;
diff --git a/access-token-management/test/AccessTokenManagement.Tests/UserTokenManagementWithDPoPTests.cs b/access-token-management/test/AccessTokenManagement.Tests/UserTokenManagementWithDPoPTests.cs
index b62adf43..73f76d17 100644
--- a/access-token-management/test/AccessTokenManagement.Tests/UserTokenManagementWithDPoPTests.cs
+++ b/access-token-management/test/AccessTokenManagement.Tests/UserTokenManagementWithDPoPTests.cs
@@ -5,7 +5,7 @@
using System.Net.Http.Json;
using System.Text.Json;
using Duende.AccessTokenManagement.OpenIdConnect;
-using IdentityModel;
+using Duende.IdentityModel;
using Microsoft.IdentityModel.Tokens;
using RichardSzalay.MockHttp;