diff --git a/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationExtensions.cs b/src/Microsoft.AspNet.Authentication.Cookies/CookieAppBuilderExtensions.cs
similarity index 80%
rename from src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationExtensions.cs
rename to src/Microsoft.AspNet.Authentication.Cookies/CookieAppBuilderExtensions.cs
index 08f4cc71a6..5a00ca2341 100644
--- a/src/Microsoft.AspNet.Authentication.Cookies/CookieAuthenticationExtensions.cs
+++ b/src/Microsoft.AspNet.Authentication.Cookies/CookieAppBuilderExtensions.cs
@@ -3,7 +3,6 @@
 
 using System;
 using Microsoft.AspNet.Authentication.Cookies;
-using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.OptionsModel;
 
 namespace Microsoft.AspNet.Builder
@@ -11,13 +10,8 @@ namespace Microsoft.AspNet.Builder
     /// <summary>
     /// Extension methods provided by the cookies authentication middleware
     /// </summary>
-    public static class CookieAuthenticationExtensions
+    public static class CookieAppBuilderExtensions
     {
-        public static IServiceCollection ConfigureCookieAuthentication([NotNull] this IServiceCollection services, [NotNull] Action<CookieAuthenticationOptions> configure)
-        {
-            return services.Configure(configure);
-        }
-
         /// <summary>
         /// Adds a cookie-based authentication middleware to your web application pipeline.
         /// </summary>
diff --git a/src/Microsoft.AspNet.Authentication.Cookies/CookieServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Authentication.Cookies/CookieServiceCollectionExtensions.cs
new file mode 100644
index 0000000000..476dc948fa
--- /dev/null
+++ b/src/Microsoft.AspNet.Authentication.Cookies/CookieServiceCollectionExtensions.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNet.Authentication.Cookies;
+using Microsoft.Framework.DependencyInjection;
+
+namespace Microsoft.Framework.DependencyInjection
+{
+    /// <summary>
+    /// Extension methods provided by the cookies authentication middleware
+    /// </summary>
+    public static class CookieServiceCollectionExtensions
+    {
+        public static IServiceCollection ConfigureCookieAuthentication([NotNull] this IServiceCollection services, [NotNull] Action<CookieAuthenticationOptions> configure)
+        {
+            return services.Configure(configure);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Authentication.Facebook/FacebookAuthenticationExtensions.cs b/src/Microsoft.AspNet.Authentication.Facebook/FacebookAppBuilderExtensions.cs
similarity index 77%
rename from src/Microsoft.AspNet.Authentication.Facebook/FacebookAuthenticationExtensions.cs
rename to src/Microsoft.AspNet.Authentication.Facebook/FacebookAppBuilderExtensions.cs
index 3664bb592b..c91855790c 100644
--- a/src/Microsoft.AspNet.Authentication.Facebook/FacebookAuthenticationExtensions.cs
+++ b/src/Microsoft.AspNet.Authentication.Facebook/FacebookAppBuilderExtensions.cs
@@ -1,23 +1,17 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Authentication.Facebook;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
 using System;
+using Microsoft.AspNet.Authentication.Facebook;
+using Microsoft.Framework.OptionsModel;
 
 namespace Microsoft.AspNet.Builder
 {
     /// <summary>
     /// Extension methods for using <see cref="FacebookAuthenticationMiddleware"/>.
     /// </summary>
-    public static class FacebookAuthenticationExtensions
+    public static class FacebookAppBuilderExtensions
     {
-        public static IServiceCollection ConfigureFacebookAuthentication([NotNull] this IServiceCollection services, [NotNull] Action<FacebookAuthenticationOptions> configure)
-        {
-            return services.Configure(configure);
-        }
-
         /// <summary>
         /// Authenticate users using Facebook.
         /// </summary>
diff --git a/src/Microsoft.AspNet.Authentication.Facebook/FacebookServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Authentication.Facebook/FacebookServiceCollectionExtensions.cs
new file mode 100644
index 0000000000..8d044dd40a
--- /dev/null
+++ b/src/Microsoft.AspNet.Authentication.Facebook/FacebookServiceCollectionExtensions.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.AspNet.Authentication.Facebook;
+using Microsoft.Framework.OptionsModel;
+using System;
+
+namespace Microsoft.Framework.DependencyInjection
+{
+    /// <summary>
+    /// Extension methods for using <see cref="FacebookAuthenticationMiddleware"/>.
+    /// </summary>
+    public static class FacebookServiceCollectionExtensions
+    {
+        public static IServiceCollection ConfigureFacebookAuthentication([NotNull] this IServiceCollection services, [NotNull] Action<FacebookAuthenticationOptions> configure)
+        {
+            return services.Configure(configure);
+        }
+    }
+}
diff --git a/src/Microsoft.AspNet.Authentication.Google/GoogleAuthenticationExtensions.cs b/src/Microsoft.AspNet.Authentication.Google/GoogleAppBuilderExtensions.cs
similarity index 79%
rename from src/Microsoft.AspNet.Authentication.Google/GoogleAuthenticationExtensions.cs
rename to src/Microsoft.AspNet.Authentication.Google/GoogleAppBuilderExtensions.cs
index fd46b062a9..8613d4368f 100644
--- a/src/Microsoft.AspNet.Authentication.Google/GoogleAuthenticationExtensions.cs
+++ b/src/Microsoft.AspNet.Authentication.Google/GoogleAppBuilderExtensions.cs
@@ -1,23 +1,17 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Authentication.Google;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
 using System;
+using Microsoft.AspNet.Authentication.Google;
+using Microsoft.Framework.OptionsModel;
 
 namespace Microsoft.AspNet.Builder
 {
     /// <summary>
     /// Extension methods for using <see cref="GoogleAuthenticationMiddleware"/>.
     /// </summary>
-    public static class GoogleAuthenticationExtensions
+    public static class GoogleAppBuilderExtensions
     {
-        public static IServiceCollection ConfigureGoogleAuthentication([NotNull] this IServiceCollection services, [NotNull] Action<GoogleAuthenticationOptions> configure)
-        {
-            return services.Configure(configure);
-        }
-
         /// <summary>
         /// Authenticate users using Google OAuth 2.0.
         /// </summary>
diff --git a/src/Microsoft.AspNet.Authentication.Google/GoogleServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Authentication.Google/GoogleServiceCollectionExtensions.cs
new file mode 100644
index 0000000000..a5a8b4b508
--- /dev/null
+++ b/src/Microsoft.AspNet.Authentication.Google/GoogleServiceCollectionExtensions.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNet.Authentication.Google;
+
+namespace Microsoft.Framework.DependencyInjection
+{
+    /// <summary>
+    /// Extension methods for using <see cref="GoogleAuthenticationMiddleware"/>.
+    /// </summary>
+    public static class GoogleServiceCollectionExtensions
+    {
+        public static IServiceCollection ConfigureGoogleAuthentication([NotNull] this IServiceCollection services, [NotNull] Action<GoogleAuthenticationOptions> configure)
+        {
+            return services.Configure(configure);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountAuthenticationExtensions.cs b/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountAppBuilderExtensions.cs
similarity index 77%
rename from src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountAuthenticationExtensions.cs
rename to src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountAppBuilderExtensions.cs
index 397a1b32b5..e068b5f5a1 100644
--- a/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountAuthenticationExtensions.cs
+++ b/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountAppBuilderExtensions.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Authentication.MicrosoftAccount;
-using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.OptionsModel;
 using System;
 
@@ -13,11 +12,6 @@ namespace Microsoft.AspNet.Builder
     /// </summary>
     public static class MicrosoftAccountAuthenticationExtensions
     {
-        public static IServiceCollection ConfigureMicrosoftAccountAuthentication([NotNull] this IServiceCollection services, [NotNull] Action<MicrosoftAccountAuthenticationOptions> configure)
-        {
-            return services.Configure(configure);
-        }
-
         public static IApplicationBuilder UseMicrosoftAccountAuthentication([NotNull] this IApplicationBuilder app, Action<MicrosoftAccountAuthenticationOptions> configureOptions = null, string optionsName = "")
         {
             return app.UseMiddleware<MicrosoftAccountAuthenticationMiddleware>(
diff --git a/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountServiceCollectionExtensions.cs
new file mode 100644
index 0000000000..b3e1e11103
--- /dev/null
+++ b/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountServiceCollectionExtensions.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNet.Authentication.MicrosoftAccount;
+
+namespace Microsoft.Framework.DependencyInjection
+{
+    /// <summary>
+    /// Extension methods for using <see cref="MicrosoftAccountAuthenticationMiddleware"/>
+    /// </summary>
+    public static class MicrosoftAccountServiceCollectionExtensions
+    {
+        public static IServiceCollection ConfigureMicrosoftAccountAuthentication([NotNull] this IServiceCollection services, [NotNull] Action<MicrosoftAccountAuthenticationOptions> configure)
+        {
+            return services.Configure(configure);
+        }
+    }
+}
diff --git a/src/Microsoft.AspNet.Authentication.OAuthBearer/OAuthBearerAuthenticationExtensions.cs b/src/Microsoft.AspNet.Authentication.OAuthBearer/OAuthBearerAppBuilderExtensions.cs
similarity index 83%
rename from src/Microsoft.AspNet.Authentication.OAuthBearer/OAuthBearerAuthenticationExtensions.cs
rename to src/Microsoft.AspNet.Authentication.OAuthBearer/OAuthBearerAppBuilderExtensions.cs
index b1a6293341..88151eb160 100644
--- a/src/Microsoft.AspNet.Authentication.OAuthBearer/OAuthBearerAuthenticationExtensions.cs
+++ b/src/Microsoft.AspNet.Authentication.OAuthBearer/OAuthBearerAppBuilderExtensions.cs
@@ -3,7 +3,6 @@
 
 using System;
 using Microsoft.AspNet.Authentication.OAuthBearer;
-using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.OptionsModel;
 
 namespace Microsoft.AspNet.Builder
@@ -11,13 +10,8 @@ namespace Microsoft.AspNet.Builder
     /// <summary>
     /// Extension methods to add OAuth Bearer authentication capabilities to an HTTP application pipeline
     /// </summary>
-    public static class OAuthBearerAuthenticationExtensions
+    public static class OAuthBearerAppBuilderExtensions
     {
-        public static IServiceCollection ConfigureOAuthBearerAuthentication([NotNull] this IServiceCollection services, [NotNull] Action<OAuthBearerAuthenticationOptions> configure)
-        {
-            return services.ConfigureOptions(configure);
-        }
-
         /// <summary>
         /// Adds Bearer token processing to an HTTP application pipeline. This middleware understands appropriately
         /// formatted and secured tokens which appear in the request header. If the Options.AuthenticationMode is Active, the
diff --git a/src/Microsoft.AspNet.Authentication.OAuthBearer/OAuthBearerServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Authentication.OAuthBearer/OAuthBearerServiceCollectionExtensions.cs
new file mode 100644
index 0000000000..5a878dcbb1
--- /dev/null
+++ b/src/Microsoft.AspNet.Authentication.OAuthBearer/OAuthBearerServiceCollectionExtensions.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNet.Authentication.OAuthBearer;
+
+namespace Microsoft.Framework.DependencyInjection
+{
+    /// <summary>
+    /// Extension methods to add OAuth Bearer authentication capabilities to an HTTP application pipeline
+    /// </summary>
+    public static class OAuthBearerServiceCollectionExtensions
+    {
+        public static IServiceCollection ConfigureOAuthBearerAuthentication([NotNull] this IServiceCollection services, [NotNull] Action<OAuthBearerAuthenticationOptions> configure)
+        {
+            return services.ConfigureOptions(configure);
+        }
+    }
+}
diff --git a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectServiceCollectionExtensions.cs
new file mode 100644
index 0000000000..390568fd3b
--- /dev/null
+++ b/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectServiceCollectionExtensions.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNet.Authentication.OpenIdConnect;
+
+namespace Microsoft.Framework.DependencyInjection
+{
+    /// <summary>
+    /// Extension methods to configure OpenIdConnect authentication options
+    /// </summary>
+    public static class OpenIdConnectServiceCollectionExtensions
+    {
+        public static IServiceCollection ConfigureOpenIdConnect(this IServiceCollection services, Action<OpenIdConnectAuthenticationOptions> configure)
+        {
+            return services.ConfigureOptions(configure);
+        }
+    }
+}
diff --git a/src/Microsoft.AspNet.Authentication.Twitter/TwitterAuthenticationExtensions.cs b/src/Microsoft.AspNet.Authentication.Twitter/TwitterAppBuilderExtensions.cs
similarity index 70%
rename from src/Microsoft.AspNet.Authentication.Twitter/TwitterAuthenticationExtensions.cs
rename to src/Microsoft.AspNet.Authentication.Twitter/TwitterAppBuilderExtensions.cs
index bff1897923..ce27cdadf2 100644
--- a/src/Microsoft.AspNet.Authentication.Twitter/TwitterAuthenticationExtensions.cs
+++ b/src/Microsoft.AspNet.Authentication.Twitter/TwitterAppBuilderExtensions.cs
@@ -1,24 +1,17 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Authentication;
-using Microsoft.AspNet.Authentication.Twitter;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
 using System;
+using Microsoft.AspNet.Authentication.Twitter;
+using Microsoft.Framework.OptionsModel;
 
 namespace Microsoft.AspNet.Builder
 {
     /// <summary>
     /// Extension methods for using <see cref="TwitterAuthenticationMiddleware"/>
     /// </summary>
-    public static class TwitterAuthenticationExtensions
+    public static class TwitterAppBuilderExtensions
     {
-        public static IServiceCollection ConfigureTwitterAuthentication([NotNull] this IServiceCollection services, [NotNull] Action<TwitterAuthenticationOptions> configure)
-        {
-            return services.Configure(configure);
-        }
-
         public static IApplicationBuilder UseTwitterAuthentication([NotNull] this IApplicationBuilder app, Action<TwitterAuthenticationOptions> configureOptions = null, string optionsName = "")
         {
             return app.UseMiddleware<TwitterAuthenticationMiddleware>(
diff --git a/src/Microsoft.AspNet.Authentication.Twitter/TwitterServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Authentication.Twitter/TwitterServiceCollectionExtensions.cs
new file mode 100644
index 0000000000..7c25c17377
--- /dev/null
+++ b/src/Microsoft.AspNet.Authentication.Twitter/TwitterServiceCollectionExtensions.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNet.Authentication.Twitter;
+
+namespace Microsoft.Framework.DependencyInjection
+{
+    /// <summary>
+    /// Extension methods for using <see cref="TwitterAuthenticationMiddleware"/>
+    /// </summary>
+    public static class TwitterAuthenticationExtensions
+    {
+        public static IServiceCollection ConfigureTwitterAuthentication([NotNull] this IServiceCollection services, [NotNull] Action<TwitterAuthenticationOptions> configure)
+        {
+            return services.Configure(configure);
+        }
+    }
+}
diff --git a/test/Microsoft.AspNet.Authentication.Test/Twitter/TwitterMiddlewareTests.cs b/test/Microsoft.AspNet.Authentication.Test/Twitter/TwitterMiddlewareTests.cs
index 6b54b6cd94..fd281086fc 100644
--- a/test/Microsoft.AspNet.Authentication.Test/Twitter/TwitterMiddlewareTests.cs
+++ b/test/Microsoft.AspNet.Authentication.Test/Twitter/TwitterMiddlewareTests.cs
@@ -8,14 +8,9 @@ using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.DataProtection;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Authentication.Cookies;
-using Microsoft.AspNet.Authentication.Twitter;
 using Microsoft.AspNet.TestHost;
 using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
-using Newtonsoft.Json;
 using Shouldly;
 using Xunit;