diff --git a/src/OpenIddict.Abstractions/OpenIddictExceptions.cs b/src/OpenIddict.Abstractions/OpenIddictExceptions.cs
index 6497770e..82731b5f 100644
--- a/src/OpenIddict.Abstractions/OpenIddictExceptions.cs
+++ b/src/OpenIddict.Abstractions/OpenIddictExceptions.cs
@@ -34,48 +34,48 @@ public static class OpenIddictExceptions
     }
 
     /// <summary>
-    /// Represents a generic OpenIddict exception.
+    /// Represents an OpenIddict protocol exception.
     /// </summary>
-    public class GenericException : Exception
+    public class ProtocolException : Exception
     {
         /// <summary>
-        /// Creates a new <see cref="GenericException"/>.
+        /// Creates a new <see cref="ProtocolException"/>.
         /// </summary>
         /// <param name="message">The exception message.</param>
-        public GenericException(string? message)
+        public ProtocolException(string? message)
             : this(message, null)
         {
         }
 
         /// <summary>
-        /// Creates a new <see cref="GenericException"/>.
+        /// Creates a new <see cref="ProtocolException"/>.
         /// </summary>
         /// <param name="message">The exception message.</param>
         /// <param name="error">The error type.</param>
-        public GenericException(string? message, string? error)
+        public ProtocolException(string? message, string? error)
             : this(message, error, description: null)
         {
         }
 
         /// <summary>
-        /// Creates a new <see cref="GenericException"/>.
+        /// Creates a new <see cref="ProtocolException"/>.
         /// </summary>
         /// <param name="message">The exception message.</param>
         /// <param name="error">The error type.</param>
         /// <param name="description">The error description.</param>
-        public GenericException(string? message, string? error, string? description)
+        public ProtocolException(string? message, string? error, string? description)
             : this(message, error, description, uri: null)
         {
         }
 
         /// <summary>
-        /// Creates a new <see cref="GenericException"/>.
+        /// Creates a new <see cref="ProtocolException"/>.
         /// </summary>
         /// <param name="message">The exception message.</param>
         /// <param name="error">The error type.</param>
         /// <param name="description">The error description.</param>
         /// <param name="uri">The error URI.</param>
-        public GenericException(string? message, string? error, string? description, string? uri)
+        public ProtocolException(string? message, string? error, string? description, string? uri)
             : base(message)
         {
             Error = error;
diff --git a/src/OpenIddict.Client/OpenIddictClientService.cs b/src/OpenIddict.Client/OpenIddictClientService.cs
index fac61c57..8798c12a 100644
--- a/src/OpenIddict.Client/OpenIddictClientService.cs
+++ b/src/OpenIddict.Client/OpenIddictClientService.cs
@@ -86,7 +86,7 @@ public class OpenIddictClientService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0148(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -108,7 +108,7 @@ public class OpenIddictClientService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0149(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -132,7 +132,7 @@ public class OpenIddictClientService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0150(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -159,7 +159,7 @@ public class OpenIddictClientService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0151(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -245,7 +245,7 @@ public class OpenIddictClientService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0152(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -267,7 +267,7 @@ public class OpenIddictClientService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0153(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -291,7 +291,7 @@ public class OpenIddictClientService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0154(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -318,7 +318,7 @@ public class OpenIddictClientService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0155(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -391,7 +391,7 @@ public class OpenIddictClientService
 
             if (context.IsRejected)
             {
-                throw new OpenIddictExceptions.GenericException(
+                throw new OpenIddictExceptions.ProtocolException(
                     SR.FormatID0319(context.Error, context.ErrorDescription, context.ErrorUri),
                     context.Error, context.ErrorDescription, context.ErrorUri);
             }
@@ -483,7 +483,7 @@ public class OpenIddictClientService
 
             if (context.IsRejected)
             {
-                throw new OpenIddictExceptions.GenericException(
+                throw new OpenIddictExceptions.ProtocolException(
                     SR.FormatID0319(context.Error, context.ErrorDescription, context.ErrorUri),
                     context.Error, context.ErrorDescription, context.ErrorUri);
             }
@@ -568,7 +568,7 @@ public class OpenIddictClientService
 
             if (context.IsRejected)
             {
-                throw new OpenIddictExceptions.GenericException(
+                throw new OpenIddictExceptions.ProtocolException(
                     SR.FormatID0319(context.Error, context.ErrorDescription, context.ErrorUri),
                     context.Error, context.ErrorDescription, context.ErrorUri);
             }
@@ -668,7 +668,7 @@ public class OpenIddictClientService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0320(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -691,7 +691,7 @@ public class OpenIddictClientService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0321(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -716,7 +716,7 @@ public class OpenIddictClientService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0322(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -744,7 +744,7 @@ public class OpenIddictClientService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0323(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -839,7 +839,7 @@ public class OpenIddictClientService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0324(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -862,7 +862,7 @@ public class OpenIddictClientService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0325(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -887,7 +887,7 @@ public class OpenIddictClientService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0326(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -916,7 +916,7 @@ public class OpenIddictClientService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0327(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
diff --git a/src/OpenIddict.Validation/OpenIddictValidationService.cs b/src/OpenIddict.Validation/OpenIddictValidationService.cs
index 498f37a1..441cd941 100644
--- a/src/OpenIddict.Validation/OpenIddictValidationService.cs
+++ b/src/OpenIddict.Validation/OpenIddictValidationService.cs
@@ -76,7 +76,7 @@ public class OpenIddictValidationService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0148(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -96,7 +96,7 @@ public class OpenIddictValidationService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0149(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -118,7 +118,7 @@ public class OpenIddictValidationService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0150(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -143,7 +143,7 @@ public class OpenIddictValidationService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0151(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -220,7 +220,7 @@ public class OpenIddictValidationService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0152(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -240,7 +240,7 @@ public class OpenIddictValidationService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0153(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -262,7 +262,7 @@ public class OpenIddictValidationService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0154(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -286,7 +286,7 @@ public class OpenIddictValidationService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0155(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -382,7 +382,7 @@ public class OpenIddictValidationService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0158(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -402,7 +402,7 @@ public class OpenIddictValidationService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0159(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -424,7 +424,7 @@ public class OpenIddictValidationService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0160(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -450,7 +450,7 @@ public class OpenIddictValidationService
 
                 if (context.IsRejected)
                 {
-                    throw new OpenIddictExceptions.GenericException(
+                    throw new OpenIddictExceptions.ProtocolException(
                         SR.FormatID0161(context.Error, context.ErrorDescription, context.ErrorUri),
                         context.Error, context.ErrorDescription, context.ErrorUri);
                 }
@@ -513,7 +513,7 @@ public class OpenIddictValidationService
 
             if (context.IsRejected)
             {
-                throw new OpenIddictExceptions.GenericException(
+                throw new OpenIddictExceptions.ProtocolException(
                     SR.FormatID0163(context.Error, context.ErrorDescription, context.ErrorUri),
                     context.Error, context.ErrorDescription, context.ErrorUri);
             }