diff --git a/src/OpenIddict.Abstractions/Primitives/OpenIddictConfiguration.cs b/src/OpenIddict.Abstractions/Primitives/OpenIddictConfiguration.cs
index 3b357df8e..11cbc21c1 100644
--- a/src/OpenIddict.Abstractions/Primitives/OpenIddictConfiguration.cs
+++ b/src/OpenIddict.Abstractions/Primitives/OpenIddictConfiguration.cs
@@ -72,9 +72,9 @@ public sealed class OpenIddictConfiguration
     public JsonWebKeySet? JsonWebKeySet { get; set; }
 
     /// <summary>
-    /// Gets or sets the URI of the JSON Web Key Set endpoint.
+    /// Gets or sets the URI of the JSON Web Key Set.
     /// </summary>
-    public Uri? JwksUri { get; set; }
+    public Uri? JsonWebKeySetUri { get; set; }
 
     /// <summary>
     /// Gets or sets the URI of the mTLS-enabled device authorization endpoint.
diff --git a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Discovery.cs b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Discovery.cs
index c7aab55aa..5f6d23eaf 100644
--- a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Discovery.cs
+++ b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.Discovery.cs
@@ -426,7 +426,7 @@ public ValueTask HandleAsync(HandleConfigurationResponseContext context)
                 {
                     context.Configuration.AuthorizationEndpoint =
                         new Uri("https://www.sandbox.paypal.com/signin/authorize", UriKind.Absolute);
-                    context.Configuration.JwksUri =
+                    context.Configuration.JsonWebKeySetUri =
                         new Uri("https://api-m.sandbox.paypal.com/v1/oauth2/certs", UriKind.Absolute);
                     context.Configuration.RevocationEndpoint =
                         new Uri("https://api-m.sandbox.paypal.com/v1/oauth2/revoke", UriKind.Absolute);
diff --git a/src/OpenIddict.Client/OpenIddictClientHandlers.Discovery.cs b/src/OpenIddict.Client/OpenIddictClientHandlers.Discovery.cs
index adf9cb70f..2bb8f9c8f 100644
--- a/src/OpenIddict.Client/OpenIddictClientHandlers.Discovery.cs
+++ b/src/OpenIddict.Client/OpenIddictClientHandlers.Discovery.cs
@@ -345,7 +345,7 @@ public ValueTask HandleAsync(HandleConfigurationResponseContext context)
                     return default;
                 }
 
-                context.Configuration.JwksUri = uri;
+                context.Configuration.JsonWebKeySetUri = uri;
 
                 return default;
             }
diff --git a/src/OpenIddict.Client/OpenIddictClientRetriever.cs b/src/OpenIddict.Client/OpenIddictClientRetriever.cs
index 16d68715c..84c3f9ce7 100644
--- a/src/OpenIddict.Client/OpenIddictClientRetriever.cs
+++ b/src/OpenIddict.Client/OpenIddictClientRetriever.cs
@@ -54,12 +54,12 @@ async Task<OpenIddictConfiguration> IConfigurationRetriever<OpenIddictConfigurat
         var configuration = await _service.GetConfigurationAsync(_registration, uri, cancel) ??
             throw new InvalidOperationException(SR.GetResourceString(SR.ID0145));
 
-        if (configuration.JwksUri is null)
+        if (configuration.JsonWebKeySetUri is null)
         {
             throw new InvalidOperationException(SR.GetResourceString(SR.ID0146));
         }
 
-        configuration.JsonWebKeySet = await _service.GetSecurityKeysAsync(_registration, configuration.JwksUri, cancel) ??
+        configuration.JsonWebKeySet = await _service.GetSecurityKeysAsync(_registration, configuration.JsonWebKeySetUri, cancel) ??
             throw new InvalidOperationException(SR.GetResourceString(SR.ID0147));
 
         // Copy the signing keys found in the JSON Web Key Set to the SigningKeys collection.
diff --git a/src/OpenIddict.Validation/OpenIddictValidationHandlers.Discovery.cs b/src/OpenIddict.Validation/OpenIddictValidationHandlers.Discovery.cs
index 3c0930b56..9bbe99292 100644
--- a/src/OpenIddict.Validation/OpenIddictValidationHandlers.Discovery.cs
+++ b/src/OpenIddict.Validation/OpenIddictValidationHandlers.Discovery.cs
@@ -257,7 +257,7 @@ public ValueTask HandleAsync(HandleConfigurationResponseContext context)
                     return default;
                 }
 
-                context.Configuration.JwksUri = uri;
+                context.Configuration.JsonWebKeySetUri = uri;
 
                 return default;
             }
diff --git a/src/OpenIddict.Validation/OpenIddictValidationRetriever.cs b/src/OpenIddict.Validation/OpenIddictValidationRetriever.cs
index d2bfff47e..de98dcdd8 100644
--- a/src/OpenIddict.Validation/OpenIddictValidationRetriever.cs
+++ b/src/OpenIddict.Validation/OpenIddictValidationRetriever.cs
@@ -48,12 +48,12 @@ async Task<OpenIddictConfiguration> IConfigurationRetriever<OpenIddictConfigurat
         var configuration = await _service.GetConfigurationAsync(uri, cancel) ??
             throw new InvalidOperationException(SR.GetResourceString(SR.ID0145));
 
-        if (configuration.JwksUri is null)
+        if (configuration.JsonWebKeySetUri is null)
         {
             throw new InvalidOperationException(SR.GetResourceString(SR.ID0146));
         }
 
-        configuration.JsonWebKeySet = await _service.GetSecurityKeysAsync(configuration.JwksUri, cancel) ??
+        configuration.JsonWebKeySet = await _service.GetSecurityKeysAsync(configuration.JsonWebKeySetUri, cancel) ??
             throw new InvalidOperationException(SR.GetResourceString(SR.ID0147));
 
         // Copy the signing keys found in the JSON Web Key Set to the SigningKeys collection.