diff --git a/src/OpenIddict.Client/OpenIddictClientOptions.cs b/src/OpenIddict.Client/OpenIddictClientOptions.cs
index 2d5685be..0e718f6e 100644
--- a/src/OpenIddict.Client/OpenIddictClientOptions.cs
+++ b/src/OpenIddict.Client/OpenIddictClientOptions.cs
@@ -138,7 +138,6 @@ public sealed class OpenIddictClientOptions
 
     /// <summary>
     /// Gets the OAuth 2.0 code challenge methods enabled for this application.
-    /// By default, only the S256 method is allowed (if the code flow is enabled).
     /// </summary>
     public HashSet<string> CodeChallengeMethods { get; } = new(StringComparer.Ordinal);
 
@@ -148,14 +147,14 @@ public sealed class OpenIddictClientOptions
     public HashSet<string> GrantTypes { get; } = new(StringComparer.Ordinal);
 
     /// <summary>
-    /// Gets the OAuth 2.0/OpenID Connect response types enabled for this application.
+    /// Gets the OAuth 2.0/OpenID Connect response modes enabled for this application.
     /// </summary>
     [EditorBrowsable(EditorBrowsableState.Advanced)]
-    public HashSet<string> ResponseTypes { get; } = new(StringComparer.Ordinal);
+    public HashSet<string> ResponseModes { get; } = new(StringComparer.Ordinal);
 
     /// <summary>
-    /// Gets the OAuth 2.0/OpenID Connect response modes enabled for this application.
+    /// Gets the OAuth 2.0/OpenID Connect response types enabled for this application.
     /// </summary>
     [EditorBrowsable(EditorBrowsableState.Advanced)]
-    public HashSet<string> ResponseModes { get; } = new(StringComparer.Ordinal);
+    public HashSet<string> ResponseTypes { get; } = new(StringComparer.Ordinal);
 }
diff --git a/src/OpenIddict.Client/OpenIddictClientRegistration.cs b/src/OpenIddict.Client/OpenIddictClientRegistration.cs
index 1fbe91cb..eece0a6a 100644
--- a/src/OpenIddict.Client/OpenIddictClientRegistration.cs
+++ b/src/OpenIddict.Client/OpenIddictClientRegistration.cs
@@ -84,24 +84,24 @@ public sealed class OpenIddictClientRegistration
     public HashSet<string> GrantTypes { get; } = new(StringComparer.Ordinal);
 
     /// <summary>
-    /// Gets the response type combinations allowed by the client instance.
-    /// If no value is explicitly set, all the types enabled in the client options can be used.
+    /// Gets the response modes allowed by the client instance.
+    /// If no value is explicitly set, all the modes enabled in the client options can be used.
     /// </summary>
     /// <remarks>
-    /// The final response type used in authorization requests is chosen by OpenIddict based on
+    /// The final response method used in authorization requests is chosen by OpenIddict based on
     /// the client options, the server configuration and the values registered in this property.
     /// </remarks>
-    public HashSet<string> ResponseTypes { get; } = new(StringComparer.Ordinal);
+    public HashSet<string> ResponseModes { get; } = new(StringComparer.Ordinal);
 
     /// <summary>
-    /// Gets the response modes allowed by the client instance.
-    /// If no value is explicitly set, all the modes enabled in the client options can be used.
+    /// Gets the response type combinations allowed by the client instance.
+    /// If no value is explicitly set, all the types enabled in the client options can be used.
     /// </summary>
     /// <remarks>
-    /// The final response method used in authorization requests is chosen by OpenIddict based on
+    /// The final response type used in authorization requests is chosen by OpenIddict based on
     /// the client options, the server configuration and the values registered in this property.
     /// </remarks>
-    public HashSet<string> ResponseModes { get; } = new(StringComparer.Ordinal);
+    public HashSet<string> ResponseTypes { get; } = new(StringComparer.Ordinal);
 
     /// <summary>
     /// Gets or sets the URI of the authorization server.