diff --git a/src/Microsoft.AspNetCore.Authorization/AuthorizationHandler.cs b/src/Microsoft.AspNetCore.Authorization/AuthorizationHandler.cs
index 2bd90aad42..f6877f114e 100644
--- a/src/Microsoft.AspNetCore.Authorization/AuthorizationHandler.cs
+++ b/src/Microsoft.AspNetCore.Authorization/AuthorizationHandler.cs
@@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Authorization
     public abstract class AuthorizationHandler<TRequirement> : IAuthorizationHandler
         where TRequirement : IAuthorizationRequirement
     {
-        public void Handle(AuthorizationContext context)
+        public void Handle(AuthorizationHandlerContext context)
         {
             foreach (var req in context.Requirements.OfType<TRequirement>())
             {
@@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Authorization
             }
         }
 
-        public virtual async Task HandleAsync(AuthorizationContext context)
+        public virtual async Task HandleAsync(AuthorizationHandlerContext context)
         {
             foreach (var req in context.Requirements.OfType<TRequirement>())
             {
@@ -25,9 +25,9 @@ namespace Microsoft.AspNetCore.Authorization
             }
         }
 
-        protected abstract void Handle(AuthorizationContext context, TRequirement requirement);
+        protected abstract void Handle(AuthorizationHandlerContext context, TRequirement requirement);
 
-        protected virtual Task HandleAsync(AuthorizationContext context, TRequirement requirement)
+        protected virtual Task HandleAsync(AuthorizationHandlerContext context, TRequirement requirement)
         {
             Handle(context, requirement);
             return Task.FromResult(0);
@@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Authorization
     public abstract class AuthorizationHandler<TRequirement, TResource> : IAuthorizationHandler
         where TRequirement : IAuthorizationRequirement
     {
-        public virtual async Task HandleAsync(AuthorizationContext context)
+        public virtual async Task HandleAsync(AuthorizationHandlerContext context)
         {
             if (context.Resource is TResource)
             {
@@ -48,13 +48,13 @@ namespace Microsoft.AspNetCore.Authorization
             }
         }
 
-        protected virtual Task HandleAsync(AuthorizationContext context, TRequirement requirement, TResource resource)
+        protected virtual Task HandleAsync(AuthorizationHandlerContext context, TRequirement requirement, TResource resource)
         {
             Handle(context, requirement, resource);
             return Task.FromResult(0);
         }
 
-        public virtual void Handle(AuthorizationContext context)
+        public virtual void Handle(AuthorizationHandlerContext context)
         {
             if (context.Resource is TResource)
             {
@@ -65,6 +65,6 @@ namespace Microsoft.AspNetCore.Authorization
             }
         }
 
-        protected abstract void Handle(AuthorizationContext context, TRequirement requirement, TResource resource);
+        protected abstract void Handle(AuthorizationHandlerContext context, TRequirement requirement, TResource resource);
     }
 }
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Authorization/AuthorizationContext.cs b/src/Microsoft.AspNetCore.Authorization/AuthorizationHandlerContext.cs
similarity index 95%
rename from src/Microsoft.AspNetCore.Authorization/AuthorizationContext.cs
rename to src/Microsoft.AspNetCore.Authorization/AuthorizationHandlerContext.cs
index 455adb0dda..2349feb319 100644
--- a/src/Microsoft.AspNetCore.Authorization/AuthorizationContext.cs
+++ b/src/Microsoft.AspNetCore.Authorization/AuthorizationHandlerContext.cs
@@ -11,13 +11,13 @@ namespace Microsoft.AspNetCore.Authorization
     /// <summary>
     /// Contains authorization information used by <see cref="IAuthorizationHandler"/>.
     /// </summary>
-    public class AuthorizationContext
+    public class AuthorizationHandlerContext
     {
         private HashSet<IAuthorizationRequirement> _pendingRequirements;
         private bool _failCalled;
         private bool _succeedCalled;
 
-        public AuthorizationContext(
+        public AuthorizationHandlerContext(
             IEnumerable<IAuthorizationRequirement> requirements,
             ClaimsPrincipal user,
             object resource)
diff --git a/src/Microsoft.AspNetCore.Authorization/AuthorizationPolicyBuilder.cs b/src/Microsoft.AspNetCore.Authorization/AuthorizationPolicyBuilder.cs
index 965ffe02ef..653727f5ee 100644
--- a/src/Microsoft.AspNetCore.Authorization/AuthorizationPolicyBuilder.cs
+++ b/src/Microsoft.AspNetCore.Authorization/AuthorizationPolicyBuilder.cs
@@ -129,7 +129,7 @@ namespace Microsoft.AspNetCore.Authorization
         /// </summary>
         /// <param name="assert">Function that must return true</param>
         /// <returns></returns>
-        public AuthorizationPolicyBuilder RequireAssertion(Func<AuthorizationContext, bool> assert)
+        public AuthorizationPolicyBuilder RequireAssertion(Func<AuthorizationHandlerContext, bool> assert)
         {
             if (assert == null)
             {
@@ -145,7 +145,7 @@ namespace Microsoft.AspNetCore.Authorization
         /// </summary>
         /// <param name="assert">Function that must return true</param>
         /// <returns></returns>
-        public AuthorizationPolicyBuilder RequireAssertion(Func<AuthorizationContext, Task<bool>> assert)
+        public AuthorizationPolicyBuilder RequireAssertion(Func<AuthorizationHandlerContext, Task<bool>> assert)
         {
             if (assert == null)
             {
diff --git a/src/Microsoft.AspNetCore.Authorization/DefaultAuthorizationService.cs b/src/Microsoft.AspNetCore.Authorization/DefaultAuthorizationService.cs
index 39d35d0ddf..d90cf18031 100644
--- a/src/Microsoft.AspNetCore.Authorization/DefaultAuthorizationService.cs
+++ b/src/Microsoft.AspNetCore.Authorization/DefaultAuthorizationService.cs
@@ -44,7 +44,7 @@ namespace Microsoft.AspNetCore.Authorization
                 throw new ArgumentNullException(nameof(requirements));
             }
 
-            var authContext = new AuthorizationContext(requirements, user, resource);
+            var authContext = new AuthorizationHandlerContext(requirements, user, resource);
             foreach (var handler in _handlers)
             {
                 await handler.HandleAsync(authContext);
diff --git a/src/Microsoft.AspNetCore.Authorization/IAuthorizationHandler.cs b/src/Microsoft.AspNetCore.Authorization/IAuthorizationHandler.cs
index fc8ba6e7ff..cf7896a30e 100644
--- a/src/Microsoft.AspNetCore.Authorization/IAuthorizationHandler.cs
+++ b/src/Microsoft.AspNetCore.Authorization/IAuthorizationHandler.cs
@@ -7,6 +7,6 @@ namespace Microsoft.AspNetCore.Authorization
 {
     public interface IAuthorizationHandler
     {
-        Task HandleAsync(AuthorizationContext context);
+        Task HandleAsync(AuthorizationHandlerContext context);
     }
 }
diff --git a/src/Microsoft.AspNetCore.Authorization/Infrastructure/AssertionRequirement.cs b/src/Microsoft.AspNetCore.Authorization/Infrastructure/AssertionRequirement.cs
index 0cc1751a49..2ddf065266 100644
--- a/src/Microsoft.AspNetCore.Authorization/Infrastructure/AssertionRequirement.cs
+++ b/src/Microsoft.AspNetCore.Authorization/Infrastructure/AssertionRequirement.cs
@@ -11,9 +11,9 @@ namespace Microsoft.AspNetCore.Authorization.Infrastructure
         /// <summary>
         /// Function that is called to handle this requirement
         /// </summary>
-        public Func<AuthorizationContext, Task<bool>> Handler { get; }
+        public Func<AuthorizationHandlerContext, Task<bool>> Handler { get; }
 
-        public AssertionRequirement(Func<AuthorizationContext, bool> assert)
+        public AssertionRequirement(Func<AuthorizationHandlerContext, bool> assert)
         {
             if (assert == null)
             {
@@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Authorization.Infrastructure
             Handler = context => Task.FromResult(assert(context));
         }
 
-        public AssertionRequirement(Func<AuthorizationContext, Task<bool>> assert)
+        public AssertionRequirement(Func<AuthorizationHandlerContext, Task<bool>> assert)
         {
             if (assert == null)
             {
@@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Authorization.Infrastructure
             Handler = assert;
         }
 
-        public async Task HandleAsync(AuthorizationContext context)
+        public async Task HandleAsync(AuthorizationHandlerContext context)
         {
             if (await Handler(context))
             {
diff --git a/src/Microsoft.AspNetCore.Authorization/Infrastructure/ClaimsAuthorizationRequirement.cs b/src/Microsoft.AspNetCore.Authorization/Infrastructure/ClaimsAuthorizationRequirement.cs
index bff54954d9..644b33086d 100644
--- a/src/Microsoft.AspNetCore.Authorization/Infrastructure/ClaimsAuthorizationRequirement.cs
+++ b/src/Microsoft.AspNetCore.Authorization/Infrastructure/ClaimsAuthorizationRequirement.cs
@@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Authorization.Infrastructure
         public string ClaimType { get; }
         public IEnumerable<string> AllowedValues { get; }
 
-        protected override void Handle(AuthorizationContext context, ClaimsAuthorizationRequirement requirement)
+        protected override void Handle(AuthorizationHandlerContext context, ClaimsAuthorizationRequirement requirement)
         {
             if (context.User != null)
             {
diff --git a/src/Microsoft.AspNetCore.Authorization/Infrastructure/DenyAnonymousAuthorizationRequirement.cs b/src/Microsoft.AspNetCore.Authorization/Infrastructure/DenyAnonymousAuthorizationRequirement.cs
index 44ab475de0..57ad22dff6 100644
--- a/src/Microsoft.AspNetCore.Authorization/Infrastructure/DenyAnonymousAuthorizationRequirement.cs
+++ b/src/Microsoft.AspNetCore.Authorization/Infrastructure/DenyAnonymousAuthorizationRequirement.cs
@@ -7,7 +7,7 @@ namespace Microsoft.AspNetCore.Authorization.Infrastructure
 {
     public class DenyAnonymousAuthorizationRequirement : AuthorizationHandler<DenyAnonymousAuthorizationRequirement>, IAuthorizationRequirement
     {
-        protected override void Handle(AuthorizationContext context, DenyAnonymousAuthorizationRequirement requirement)
+        protected override void Handle(AuthorizationHandlerContext context, DenyAnonymousAuthorizationRequirement requirement)
         {
             var user = context.User;
             var userIsAnonymous =
diff --git a/src/Microsoft.AspNetCore.Authorization/Infrastructure/NameAuthorizationRequirement.cs b/src/Microsoft.AspNetCore.Authorization/Infrastructure/NameAuthorizationRequirement.cs
index a4f2455a69..b0c4e6b101 100644
--- a/src/Microsoft.AspNetCore.Authorization/Infrastructure/NameAuthorizationRequirement.cs
+++ b/src/Microsoft.AspNetCore.Authorization/Infrastructure/NameAuthorizationRequirement.cs
@@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Authorization.Infrastructure
 
         public string RequiredName { get; }
 
-        protected override void Handle(AuthorizationContext context, NameAuthorizationRequirement requirement)
+        protected override void Handle(AuthorizationHandlerContext context, NameAuthorizationRequirement requirement)
         {
             if (context.User != null)
             {
diff --git a/src/Microsoft.AspNetCore.Authorization/Infrastructure/PassThroughAuthorizationHandler.cs b/src/Microsoft.AspNetCore.Authorization/Infrastructure/PassThroughAuthorizationHandler.cs
index 480e2de0cb..d718591ec1 100644
--- a/src/Microsoft.AspNetCore.Authorization/Infrastructure/PassThroughAuthorizationHandler.cs
+++ b/src/Microsoft.AspNetCore.Authorization/Infrastructure/PassThroughAuthorizationHandler.cs
@@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Authorization.Infrastructure
 {
     public class PassThroughAuthorizationHandler : IAuthorizationHandler
     {
-        public async Task HandleAsync(AuthorizationContext context)
+        public async Task HandleAsync(AuthorizationHandlerContext context)
         {
             foreach (var handler in context.Requirements.OfType<IAuthorizationHandler>())
             {
diff --git a/src/Microsoft.AspNetCore.Authorization/Infrastructure/RolesAuthorizationRequirement.cs b/src/Microsoft.AspNetCore.Authorization/Infrastructure/RolesAuthorizationRequirement.cs
index 217e3ea0c1..a57a0e4c8e 100644
--- a/src/Microsoft.AspNetCore.Authorization/Infrastructure/RolesAuthorizationRequirement.cs
+++ b/src/Microsoft.AspNetCore.Authorization/Infrastructure/RolesAuthorizationRequirement.cs
@@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Authorization.Infrastructure
 
         public IEnumerable<string> AllowedRoles { get; }
 
-        protected override void Handle(AuthorizationContext context, RolesAuthorizationRequirement requirement)
+        protected override void Handle(AuthorizationHandlerContext context, RolesAuthorizationRequirement requirement)
         {
             if (context.User != null)
             {
diff --git a/test/Microsoft.AspNetCore.Authorization.Test/DefaultAuthorizationServiceTests.cs b/test/Microsoft.AspNetCore.Authorization.Test/DefaultAuthorizationServiceTests.cs
index 7f11916940..42948c936f 100644
--- a/test/Microsoft.AspNetCore.Authorization.Test/DefaultAuthorizationServiceTests.cs
+++ b/test/Microsoft.AspNetCore.Authorization.Test/DefaultAuthorizationServiceTests.cs
@@ -580,7 +580,7 @@ namespace Microsoft.AspNetCore.Authorization.Test
         public class CustomRequirement : IAuthorizationRequirement { }
         public class CustomHandler : AuthorizationHandler<CustomRequirement>
         {
-            protected override void Handle(AuthorizationContext context, CustomRequirement requirement)
+            protected override void Handle(AuthorizationHandlerContext context, CustomRequirement requirement)
             {
                 context.Succeed(requirement);
             }
@@ -636,7 +636,7 @@ namespace Microsoft.AspNetCore.Authorization.Test
 
             public bool Succeed { get; set; }
 
-            protected override void Handle(AuthorizationContext context, PassThroughRequirement requirement)
+            protected override void Handle(AuthorizationHandlerContext context, PassThroughRequirement requirement)
             {
                 if (Succeed) {
                     context.Succeed(requirement);
@@ -766,7 +766,7 @@ namespace Microsoft.AspNetCore.Authorization.Test
 
             private IEnumerable<OperationAuthorizationRequirement> _allowed;
 
-            protected override void Handle(AuthorizationContext context, OperationAuthorizationRequirement requirement, ExpenseReport resource)
+            protected override void Handle(AuthorizationHandlerContext context, OperationAuthorizationRequirement requirement, ExpenseReport resource)
             {
                 if (_allowed.Contains(requirement))
                 {
@@ -777,7 +777,7 @@ namespace Microsoft.AspNetCore.Authorization.Test
 
         public class SuperUserHandler : AuthorizationHandler<OperationAuthorizationRequirement>
         {
-            protected override void Handle(AuthorizationContext context, OperationAuthorizationRequirement requirement)
+            protected override void Handle(AuthorizationHandlerContext context, OperationAuthorizationRequirement requirement)
             {
                 if (context.User.HasClaim("SuperUser", "yes"))
                 {
@@ -812,7 +812,7 @@ namespace Microsoft.AspNetCore.Authorization.Test
 
         public class NotCalledHandler : AuthorizationHandler<OperationAuthorizationRequirement, string>
         {
-            protected override void Handle(AuthorizationContext context, OperationAuthorizationRequirement requirement, string resource)
+            protected override void Handle(AuthorizationHandlerContext context, OperationAuthorizationRequirement requirement, string resource)
             {
                 throw new NotImplementedException();
             }
@@ -820,7 +820,7 @@ namespace Microsoft.AspNetCore.Authorization.Test
 
         public class EvenHandler : AuthorizationHandler<OperationAuthorizationRequirement, int>
         {
-            protected override void Handle(AuthorizationContext context, OperationAuthorizationRequirement requirement, int id)
+            protected override void Handle(AuthorizationHandlerContext context, OperationAuthorizationRequirement requirement, int id)
             {
                 if (id % 2 == 0)
                 {