diff --git a/samples/OpenIdConnect.AzureAdSample/Startup.cs b/samples/OpenIdConnect.AzureAdSample/Startup.cs
index 2fc8ac19b2..40727ff1a3 100644
--- a/samples/OpenIdConnect.AzureAdSample/Startup.cs
+++ b/samples/OpenIdConnect.AzureAdSample/Startup.cs
@@ -80,7 +80,7 @@ namespace OpenIdConnect.AzureAdSample
                 ClientId = clientId,
                 ClientSecret = clientSecret, // for code flow
                 Authority = authority,
-                ResponseType = OpenIdConnectResponseTypes.CodeIdToken,
+                ResponseType = OpenIdConnectResponseType.CodeIdToken,
                 // GetClaimsFromUserInfoEndpoint = true,
                 Events = new OpenIdConnectEvents()
                 {
diff --git a/samples/OpenIdConnectSample/Startup.cs b/samples/OpenIdConnectSample/Startup.cs
index e9836506a3..3a39919032 100644
--- a/samples/OpenIdConnectSample/Startup.cs
+++ b/samples/OpenIdConnectSample/Startup.cs
@@ -72,7 +72,7 @@ namespace OpenIdConnectSample
                 ClientId = Configuration["oidc:clientid"],
                 ClientSecret = Configuration["oidc:clientsecret"], // for code flow
                 Authority = Configuration["oidc:authority"],
-                ResponseType = OpenIdConnectResponseTypes.Code,
+                ResponseType = OpenIdConnectResponseType.Code,
                 GetClaimsFromUserInfoEndpoint = true
             });
 
diff --git a/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectHandler.cs b/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectHandler.cs
index a10122b7af..4189ee262c 100644
--- a/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectHandler.cs
+++ b/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectHandler.cs
@@ -286,8 +286,8 @@ namespace Microsoft.AspNetCore.Authentication.OpenIdConnect
             // Omitting the response_mode parameter when it already corresponds to the default
             // response_mode used for the specified response_type is recommended by the specifications.
             // See http://openid.net/specs/oauth-v2-multiple-response-types-1_0.html#ResponseModes
-            if (!string.Equals(Options.ResponseType, OpenIdConnectResponseTypes.Code, StringComparison.Ordinal) ||
-                !string.Equals(Options.ResponseMode, OpenIdConnectResponseModes.Query, StringComparison.Ordinal))
+            if (!string.Equals(Options.ResponseType, OpenIdConnectResponseType.Code, StringComparison.Ordinal) ||
+                !string.Equals(Options.ResponseMode, OpenIdConnectResponseMode.Query, StringComparison.Ordinal))
             {
                 message.ResponseMode = Options.ResponseMode;
             }
diff --git a/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectOptions.cs b/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectOptions.cs
index c9b614acde..b5f6c03daa 100644
--- a/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectOptions.cs
+++ b/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectOptions.cs
@@ -38,8 +38,8 @@ namespace Microsoft.AspNetCore.Builder
         /// <para>Caption: <see cref="OpenIdConnectDefaults.Caption"/>.</para>
         /// <para>ProtocolValidator: new <see cref="OpenIdConnectProtocolValidator"/>.</para>
         /// <para>RefreshOnIssuerKeyNotFound: true</para>
-        /// <para>ResponseType: <see cref="OpenIdConnectResponseTypes.CodeIdToken"/></para>
-        /// <para>Scope: <see cref="OpenIdConnectScopes.OpenIdProfile"/>.</para>
+        /// <para>ResponseType: <see cref="OpenIdConnectResponseType.CodeIdToken"/></para>
+        /// <para>Scope: <see cref="OpenIdConnectScope.OpenIdProfile"/>.</para>
         /// <para>TokenValidationParameters: new <see cref="TokenValidationParameters"/> with AuthenticationScheme = authenticationScheme.</para>
         /// <para>UseTokenLifetime: false.</para>
         /// </remarks>
@@ -144,12 +144,12 @@ namespace Microsoft.AspNetCore.Builder
         /// <summary>
         /// Gets or sets the 'response_mode'.
         /// </summary>
-        public string ResponseMode { get; set; } = OpenIdConnectResponseModes.FormPost;
+        public string ResponseMode { get; set; } = OpenIdConnectResponseMode.FormPost;
 
         /// <summary>
         /// Gets or sets the 'response_type'.
         /// </summary>
-        public string ResponseType { get; set; } = OpenIdConnectResponseTypes.IdToken;
+        public string ResponseType { get; set; } = OpenIdConnectResponseType.IdToken;
 
         /// <summary>
         /// Gets the list of permissions to request.
diff --git a/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/ExpectedQueryValues.cs b/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/ExpectedQueryValues.cs
index 66fc2f4bab..98df02ee61 100644
--- a/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/ExpectedQueryValues.cs
+++ b/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/ExpectedQueryValues.cs
@@ -25,8 +25,8 @@ namespace Microsoft.AspNetCore.Authentication.Tests.OpenIdConnect
         public static ExpectedQueryValues Defaults(string authority)
         {
             var result = new ExpectedQueryValues(authority);
-            result.Scope = OpenIdConnectScopes.OpenIdProfile;
-            result.ResponseType = OpenIdConnectResponseTypes.CodeIdToken;
+            result.Scope = OpenIdConnectScope.OpenIdProfile;
+            result.ResponseType = OpenIdConnectResponseType.CodeIdToken;
             return result;
         }
 
@@ -111,11 +111,11 @@ namespace Microsoft.AspNetCore.Authentication.Tests.OpenIdConnect
 
         public string RedirectUri { get; set; } = Guid.NewGuid().ToString();
 
-        public OpenIdConnectRequestType RequestType { get; set; } = OpenIdConnectRequestType.AuthenticationRequest;
+        public OpenIdConnectRequestType RequestType { get; set; } = OpenIdConnectRequestType.Authentication;
 
         public string Resource { get; set; } = Guid.NewGuid().ToString();
 
-        public string ResponseMode { get; set; } = OpenIdConnectResponseModes.FormPost;
+        public string ResponseMode { get; set; } = OpenIdConnectResponseMode.FormPost;
 
         public string ResponseType { get; set; } = Guid.NewGuid().ToString();
 
@@ -127,11 +127,11 @@ namespace Microsoft.AspNetCore.Authentication.Tests.OpenIdConnect
         {
             get
             {
-                if (RequestType == OpenIdConnectRequestType.TokenRequest)
+                if (RequestType == OpenIdConnectRequestType.Token)
                 {
                     return Configuration?.EndSessionEndpoint ?? Authority + @"/oauth2/token";
                 }
-                else if (RequestType == OpenIdConnectRequestType.LogoutRequest)
+                else if (RequestType == OpenIdConnectRequestType.Logout)
                 {
                     return Configuration?.TokenEndpoint ?? Authority + @"/oauth2/logout";
                 }
diff --git a/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/OpenIdConnectMiddlewareTests.cs b/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/OpenIdConnectMiddlewareTests.cs
index 20de135712..41154820b9 100644
--- a/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/OpenIdConnectMiddlewareTests.cs
+++ b/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/OpenIdConnectMiddlewareTests.cs
@@ -113,7 +113,7 @@ namespace Microsoft.AspNetCore.Authentication.Tests.OpenIdConnect
 
             var queryValues = new ExpectedQueryValues(DefaultAuthority, configuration)
             {
-                RequestType = OpenIdConnectRequestType.AuthenticationRequest
+                RequestType = OpenIdConnectRequestType.Authentication
             };
             var server = CreateServer(GetProtocolMessageOptions());
             var transaction = await SendAsync(server, DefaultHost + Challenge);
@@ -135,7 +135,7 @@ namespace Microsoft.AspNetCore.Authentication.Tests.OpenIdConnect
 
             var queryValues = new ExpectedQueryValues(DefaultAuthority, configuration)
             {
-                RequestType = OpenIdConnectRequestType.LogoutRequest
+                RequestType = OpenIdConnectRequestType.Logout
             };
             var server = CreateServer(GetProtocolMessageOptions());
             var transaction = await SendAsync(server, DefaultHost + Signout);