diff --git a/samples/SocialSample/Startup.cs b/samples/SocialSample/Startup.cs
index 7e43f83f24..3ebe511560 100644
--- a/samples/SocialSample/Startup.cs
+++ b/samples/SocialSample/Startup.cs
@@ -43,7 +43,7 @@ namespace CookieSample
             app.UseOAuthAuthentication(new OAuthOptions
             {
                 AuthenticationScheme = "Google-AccessToken",
-                Caption = "Google-AccessToken",
+                DisplayName = "Google-AccessToken",
                 ClientId = "560027070069-37ldt4kfuohhu3m495hk2j4pjp92d382.apps.googleusercontent.com",
                 ClientSecret = "n2Q-GEw9RQjzcRbU3qhfTj8f",
                 CallbackPath = new PathString("/signin-google-token"),
@@ -86,7 +86,7 @@ namespace CookieSample
             app.UseOAuthAuthentication(new OAuthOptions
             {
                 AuthenticationScheme = "Microsoft-AccessToken",
-                Caption = "MicrosoftAccount-AccessToken - Requires project changes",
+                DisplayName = "MicrosoftAccount-AccessToken - Requires project changes",
                 ClientId = "00000000480FF62E",
                 ClientSecret = "bLw2JIvf8Y1TaToipPEqxTVlOeJwCUsr",
                 CallbackPath = new PathString("/signin-microsoft-token"),
@@ -97,7 +97,7 @@ namespace CookieSample
 
             app.UseMicrosoftAccountAuthentication(options =>
             {
-                options.Caption = "MicrosoftAccount - Requires project changes";
+                options.DisplayName = "MicrosoftAccount - Requires project changes";
                 options.ClientId = "00000000480FF62E";
                 options.ClientSecret = "bLw2JIvf8Y1TaToipPEqxTVlOeJwCUsr";
                 options.Scope.Add("wl.emails");
@@ -107,7 +107,7 @@ namespace CookieSample
             app.UseOAuthAuthentication(new OAuthOptions
             {
                 AuthenticationScheme = "GitHub-AccessToken",
-                Caption = "Github-AccessToken",
+                DisplayName = "Github-AccessToken",
                 ClientId = "8c0c5a572abe8fe89588",
                 ClientSecret = "e1d95eaf03461d27acd6f49d4fc7bf19d6ac8cda",
                 CallbackPath = new PathString("/signin-github-token"),
@@ -118,7 +118,7 @@ namespace CookieSample
             app.UseOAuthAuthentication(new OAuthOptions
             {
                 AuthenticationScheme = "GitHub",
-                Caption = "Github",
+                DisplayName = "Github",
                 ClientId = "49e302895d8b09ea5656",
                 ClientSecret = "98f1bf028608901e9df91d64ee61536fe562064b",
                 CallbackPath = new PathString("/signin-github"),
@@ -196,7 +196,7 @@ namespace CookieSample
                     await context.Response.WriteAsync("Choose an authentication scheme: <br>");
                     foreach (var type in context.Authentication.GetAuthenticationSchemes())
                     {
-                        await context.Response.WriteAsync("<a href=\"?authscheme=" + type.AuthenticationScheme + "\">" + (type.Caption ?? "(suppressed)") + "</a><br>");
+                        await context.Response.WriteAsync("<a href=\"?authscheme=" + type.AuthenticationScheme + "\">" + (type.DisplayName ?? "(suppressed)") + "</a><br>");
                     }
                     await context.Response.WriteAsync("</body></html>");
                 });
diff --git a/src/Microsoft.AspNet.Authentication.Facebook/FacebookOptions.cs b/src/Microsoft.AspNet.Authentication.Facebook/FacebookOptions.cs
index 12bde4675e..aa829cb377 100644
--- a/src/Microsoft.AspNet.Authentication.Facebook/FacebookOptions.cs
+++ b/src/Microsoft.AspNet.Authentication.Facebook/FacebookOptions.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNet.Authentication.Facebook
         public FacebookOptions()
         {
             AuthenticationScheme = FacebookDefaults.AuthenticationScheme;
-            Caption = AuthenticationScheme;
+            DisplayName = AuthenticationScheme;
             CallbackPath = new PathString("/signin-facebook");
             SendAppSecretProof = true;
             AuthorizationEndpoint = FacebookDefaults.AuthorizationEndpoint;
diff --git a/src/Microsoft.AspNet.Authentication.Google/GoogleOptions.cs b/src/Microsoft.AspNet.Authentication.Google/GoogleOptions.cs
index 48f0c736b3..ca736f34e5 100644
--- a/src/Microsoft.AspNet.Authentication.Google/GoogleOptions.cs
+++ b/src/Microsoft.AspNet.Authentication.Google/GoogleOptions.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNet.Authentication.Google
         public GoogleOptions()
         {
             AuthenticationScheme = GoogleDefaults.AuthenticationScheme;
-            Caption = AuthenticationScheme;
+            DisplayName = AuthenticationScheme;
             CallbackPath = new PathString("/signin-google");
             AuthorizationEndpoint = GoogleDefaults.AuthorizationEndpoint;
             TokenEndpoint = GoogleDefaults.TokenEndpoint;
diff --git a/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountOptions.cs b/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountOptions.cs
index d817cd3ee8..8c89ef20d5 100644
--- a/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountOptions.cs
+++ b/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountOptions.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNet.Authentication.MicrosoftAccount
         public MicrosoftAccountOptions()
         {
             AuthenticationScheme = MicrosoftAccountDefaults.AuthenticationScheme;
-            Caption = AuthenticationScheme;
+            DisplayName = AuthenticationScheme;
             CallbackPath = new PathString("/signin-microsoft");
             AuthorizationEndpoint = MicrosoftAccountDefaults.AuthorizationEndpoint;
             TokenEndpoint = MicrosoftAccountDefaults.TokenEndpoint;
diff --git a/src/Microsoft.AspNet.Authentication.OAuth/OAuthOptions.cs b/src/Microsoft.AspNet.Authentication.OAuth/OAuthOptions.cs
index c87026dc7d..db29438cc0 100644
--- a/src/Microsoft.AspNet.Authentication.OAuth/OAuthOptions.cs
+++ b/src/Microsoft.AspNet.Authentication.OAuth/OAuthOptions.cs
@@ -44,10 +44,10 @@ namespace Microsoft.AspNet.Authentication.OAuth
         /// <summary>
         /// Get or sets the text that the user can display on a sign in user interface.
         /// </summary>
-        public string Caption
+        public string DisplayName
         {
-            get { return Description.Caption; }
-            set { Description.Caption = value; }
+            get { return Description.DisplayName; }
+            set { Description.DisplayName = value; }
         }
 
         /// <summary>
diff --git a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectOptions.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectOptions.cs
index 4aa83c6809..85e1273d97 100644
--- a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectOptions.cs
+++ b/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectOptions.cs
@@ -49,7 +49,7 @@ namespace Microsoft.AspNet.Authentication.OpenIdConnect
         public OpenIdConnectOptions(string authenticationScheme)
         {
             AuthenticationScheme = authenticationScheme;
-            Caption = OpenIdConnectDefaults.Caption;
+            DisplayName = OpenIdConnectDefaults.Caption;
         }
 
         /// <summary>
@@ -81,10 +81,10 @@ namespace Microsoft.AspNet.Authentication.OpenIdConnect
         /// <summary>
         /// Get or sets the text that the user can display on a sign in user interface.
         /// </summary>
-        public string Caption
+        public string DisplayName
         {
-            get { return Description.Caption; }
-            set { Description.Caption = value; }
+            get { return Description.DisplayName; }
+            set { Description.DisplayName = value; }
         }
 
         /// <summary>
diff --git a/src/Microsoft.AspNet.Authentication.Twitter/TwitterOptions.cs b/src/Microsoft.AspNet.Authentication.Twitter/TwitterOptions.cs
index ebc26fe2a9..f057de36a8 100644
--- a/src/Microsoft.AspNet.Authentication.Twitter/TwitterOptions.cs
+++ b/src/Microsoft.AspNet.Authentication.Twitter/TwitterOptions.cs
@@ -18,7 +18,7 @@ namespace Microsoft.AspNet.Authentication.Twitter
         public TwitterOptions()
         {
             AuthenticationScheme = TwitterDefaults.AuthenticationScheme;
-            Caption = AuthenticationScheme;
+            DisplayName = AuthenticationScheme;
             CallbackPath = new PathString("/signin-twitter");
             BackchannelTimeout = TimeSpan.FromSeconds(60);
         }
@@ -53,10 +53,10 @@ namespace Microsoft.AspNet.Authentication.Twitter
         /// <summary>
         /// Get or sets the text that the user can display on a sign in user interface.
         /// </summary>
-        public string Caption
+        public string DisplayName
         {
-            get { return Description.Caption; }
-            set { Description.Caption = value; }
+            get { return Description.DisplayName; }
+            set { Description.DisplayName = value; }
         }
 
         /// <summary>