diff --git a/test/E2ETests/Implementation/FacebookLoginScenarios.cs b/test/E2ETests/Implementation/FacebookLoginScenarios.cs
index 455699a996..50910534eb 100644
--- a/test/E2ETests/Implementation/FacebookLoginScenarios.cs
+++ b/test/E2ETests/Implementation/FacebookLoginScenarios.cs
@@ -88,12 +88,12 @@ namespace E2ETests
             Assert.Null(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.ExternalLogin"));
             _logger.LogInformation("Successfully signed in with user '{email}'", "AspnetvnextTest@test.com");
 
-            _logger.LogInformation("Verifying if the middleware notifications were fired");
+            _logger.LogInformation("Verifying if the middleware events were fired");
             //Check for a non existing item
             response = await _httpClient.GetAsync(string.Format("Admin/StoreManager/GetAlbumIdFromName?albumName={0}", "123"));
-            //This action requires admin permissions. If notifications are fired this permission is granted
+            //This action requires admin permissions. If events are fired this permission is granted
             Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
-            _logger.LogInformation("Middleware notifications were fired successfully");
+            _logger.LogInformation("Middleware events were fired successfully");
         }
     }
 }
\ No newline at end of file
diff --git a/test/E2ETests/Implementation/GoogleLoginScenarios.cs b/test/E2ETests/Implementation/GoogleLoginScenarios.cs
index 99d661f863..4b125d0191 100644
--- a/test/E2ETests/Implementation/GoogleLoginScenarios.cs
+++ b/test/E2ETests/Implementation/GoogleLoginScenarios.cs
@@ -89,13 +89,13 @@ namespace E2ETests
             Assert.Null(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.ExternalLogin"));
             _logger.LogInformation("Successfully signed in with user '{email}'", "AspnetvnextTest@gmail.com");
 
-            _logger.LogInformation("Verifying if the middleware notifications were fired");
+            _logger.LogInformation("Verifying if the middleware events were fired");
             //Check for a non existing item
             response = await _httpClient.GetAsync(string.Format("Admin/StoreManager/GetAlbumIdFromName?albumName={0}", "123"));
-            //This action requires admin permissions. If notifications are fired this permission is granted
+            //This action requires admin permissions. If events are fired this permission is granted
             _logger.LogVerbose(await response.Content.ReadAsStringAsync());
             Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
-            _logger.LogInformation("Middleware notifications were fired successfully");
+            _logger.LogInformation("Middleware events were fired successfully");
         }
     }
 }
\ No newline at end of file
diff --git a/test/E2ETests/Implementation/MicrosoftAccountAuthenticationScenarios.cs b/test/E2ETests/Implementation/MicrosoftAccountAuthenticationScenarios.cs
index 0b563e0264..fbb2b06f24 100644
--- a/test/E2ETests/Implementation/MicrosoftAccountAuthenticationScenarios.cs
+++ b/test/E2ETests/Implementation/MicrosoftAccountAuthenticationScenarios.cs
@@ -88,13 +88,13 @@ namespace E2ETests
             Assert.Null(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.ExternalLogin"));
             _logger.LogInformation("Successfully signed in with user '{email}'", "microsoft@test.com");
 
-            _logger.LogInformation("Verifying if the middleware notifications were fired");
+            _logger.LogInformation("Verifying if the middleware events were fired");
             //Check for a non existing item
             response = await _httpClient.GetAsync(string.Format("Admin/StoreManager/GetAlbumIdFromName?albumName={0}", "123"));
-            //This action requires admin permissions. If notifications are fired this permission is granted
+            //This action requires admin permissions. If events are fired this permission is granted
             _logger.LogInformation(await response.Content.ReadAsStringAsync());
             Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
-            _logger.LogInformation("Middleware notifications were fired successfully");
+            _logger.LogInformation("Middleware events were fired successfully");
         }
     }
 }
\ No newline at end of file
diff --git a/test/E2ETests/Implementation/OpenIdConnectLoginScenarios.cs b/test/E2ETests/Implementation/OpenIdConnectLoginScenarios.cs
index 2da5348390..c37f6a7151 100644
--- a/test/E2ETests/Implementation/OpenIdConnectLoginScenarios.cs
+++ b/test/E2ETests/Implementation/OpenIdConnectLoginScenarios.cs
@@ -77,12 +77,12 @@ namespace E2ETests
             Assert.Null(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.ExternalLogin"));
             _logger.LogInformation("Successfully signed in with user '{email}'", "User3@aspnettest.onmicrosoft.com");
 
-            _logger.LogInformation("Verifying if the middleware notifications were fired");
+            _logger.LogInformation("Verifying if the middleware events were fired");
             //Check for a non existing item
             response = await _httpClient.GetAsync(string.Format("Admin/StoreManager/GetAlbumIdFromName?albumName={0}", "123"));
-            //This action requires admin permissions. If notifications are fired this permission is granted
+            //This action requires admin permissions. If events are fired this permission is granted
             Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
-            _logger.LogInformation("Middleware notifications were fired successfully");
+            _logger.LogInformation("Middleware events were fired successfully");
 
             _logger.LogInformation("Verifying the OpenIdConnect logout flow..");
             response = await _httpClient.GetAsync(string.Empty);
diff --git a/test/E2ETests/Implementation/TwitterLoginScenarios.cs b/test/E2ETests/Implementation/TwitterLoginScenarios.cs
index 7aac3553be..701cf92238 100644
--- a/test/E2ETests/Implementation/TwitterLoginScenarios.cs
+++ b/test/E2ETests/Implementation/TwitterLoginScenarios.cs
@@ -88,12 +88,12 @@ namespace E2ETests
             Assert.Null(_httpClientHandler.CookieContainer.GetCookies(new Uri(_deploymentResult.ApplicationBaseUri)).GetCookieWithName(".AspNet.Microsoft.AspNet.Identity.ExternalLogin"));
             _logger.LogInformation("Successfully signed in with user '{email}'", "twitter@test.com");
 
-            _logger.LogInformation("Verifying if the middleware notifications were fired");
+            _logger.LogInformation("Verifying if the middleware events were fired");
             //Check for a non existing item
             response = await _httpClient.GetAsync(string.Format("Admin/StoreManager/GetAlbumIdFromName?albumName={0}", "123"));
-            //This action requires admin permissions. If notifications are fired this permission is granted
+            //This action requires admin permissions. If events are fired this permission is granted
             Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
-            _logger.LogInformation("Middleware notifications were fired successfully");
+            _logger.LogInformation("Middleware events were fired successfully");
         }
     }
 }
\ No newline at end of file
diff --git a/test/E2ETests/compiler/shared/Mocks/Facebook/FacebookNotifications.cs b/test/E2ETests/compiler/shared/Mocks/Facebook/FacebookEvents.cs
similarity index 92%
rename from test/E2ETests/compiler/shared/Mocks/Facebook/FacebookNotifications.cs
rename to test/E2ETests/compiler/shared/Mocks/Facebook/FacebookEvents.cs
index 0b22f263eb..866b06c655 100644
--- a/test/E2ETests/compiler/shared/Mocks/Facebook/FacebookNotifications.cs
+++ b/test/E2ETests/compiler/shared/Mocks/Facebook/FacebookEvents.cs
@@ -10,10 +10,7 @@ using MusicStore.Mocks.Common;
 
 namespace MusicStore.Mocks.Facebook
 {
-    /// <summary>
-    /// Summary description for FacebookNotifications
-    /// </summary>
-    internal class FacebookNotifications
+    internal class FacebookEvents
     {
         internal static async Task OnAuthenticated(OAuthAuthenticatedContext context)
         {
@@ -38,7 +35,7 @@ namespace MusicStore.Mocks.Facebook
         {
             if (context.Principal != null && context.SignInScheme == new IdentityCookieOptions().ExternalCookieAuthenticationScheme)
             {
-                //This way we will know all notifications were fired.
+                //This way we will know all events were fired.
                 var identity = context.Principal.Identities.First();
                 var manageStoreClaim = identity?.Claims.Where(c => c.Type == "ManageStore" && c.Value == "false").FirstOrDefault();
                 if (manageStoreClaim != null)
diff --git a/test/E2ETests/compiler/shared/Mocks/Google/GoogleNotifications.cs b/test/E2ETests/compiler/shared/Mocks/Google/GoogleEvents.cs
similarity index 92%
rename from test/E2ETests/compiler/shared/Mocks/Google/GoogleNotifications.cs
rename to test/E2ETests/compiler/shared/Mocks/Google/GoogleEvents.cs
index 406c59b78b..c7ab89a6bc 100644
--- a/test/E2ETests/compiler/shared/Mocks/Google/GoogleNotifications.cs
+++ b/test/E2ETests/compiler/shared/Mocks/Google/GoogleEvents.cs
@@ -10,10 +10,7 @@ using MusicStore.Mocks.Common;
 
 namespace MusicStore.Mocks.Google
 {
-    /// <summary>
-    /// Summary description for GoogleNotifications
-    /// </summary>
-    internal class GoogleNotifications
+    internal class GoogleEvents
     {
         internal static async Task OnAuthenticated(OAuthAuthenticatedContext context)
         {
@@ -37,7 +34,7 @@ namespace MusicStore.Mocks.Google
         {
             if (context.Principal != null && context.SignInScheme == new IdentityCookieOptions().ExternalCookieAuthenticationScheme)
             {
-                //This way we will know all notifications were fired.
+                //This way we will know all events were fired.
                 var identity = context.Principal.Identities.First();
                 var manageStoreClaim = identity?.Claims.Where(c => c.Type == "ManageStore" && c.Value == "false").FirstOrDefault();
                 if (manageStoreClaim != null)
diff --git a/test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountNotifications.cs b/test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountEvents.cs
similarity index 92%
rename from test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountNotifications.cs
rename to test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountEvents.cs
index 249e4e304b..9b1568138a 100644
--- a/test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountNotifications.cs
+++ b/test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountEvents.cs
@@ -10,10 +10,7 @@ using MusicStore.Mocks.Common;
 
 namespace MusicStore.Mocks.MicrosoftAccount
 {
-    /// <summary>
-    /// Summary description for MicrosoftAccountNotifications
-    /// </summary>
-    internal class MicrosoftAccountNotifications
+    internal class MicrosoftAccountEvents
     {
         internal static async Task OnAuthenticated(OAuthAuthenticatedContext context)
         {
@@ -38,7 +35,7 @@ namespace MusicStore.Mocks.MicrosoftAccount
         {
             if (context.Principal != null && context.SignInScheme == new IdentityCookieOptions().ExternalCookieAuthenticationScheme)
             {
-                //This way we will know all notifications were fired.
+                //This way we will know all events were fired.
                 var identity = context.Principal.Identities.First();
                 var manageStoreClaim = identity?.Claims.Where(c => c.Type == "ManageStore" && c.Value == "false").FirstOrDefault();
                 if (manageStoreClaim != null)
diff --git a/test/E2ETests/compiler/shared/Mocks/OpenIdConnect/OpenIdConnectNotifications.cs b/test/E2ETests/compiler/shared/Mocks/OpenIdConnect/OpenIdConnectEvents.cs
similarity index 67%
rename from test/E2ETests/compiler/shared/Mocks/OpenIdConnect/OpenIdConnectNotifications.cs
rename to test/E2ETests/compiler/shared/Mocks/OpenIdConnect/OpenIdConnectEvents.cs
index 73702ac8b0..c167e8ed64 100644
--- a/test/E2ETests/compiler/shared/Mocks/OpenIdConnect/OpenIdConnectNotifications.cs
+++ b/test/E2ETests/compiler/shared/Mocks/OpenIdConnect/OpenIdConnectEvents.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Authentication;
 using Microsoft.AspNet.Authentication.OpenIdConnect;
 using Microsoft.AspNet.Http;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
@@ -10,45 +9,45 @@ using MusicStore.Mocks.Common;
 
 namespace MusicStore.Mocks.OpenIdConnect
 {
-    internal class OpenIdConnectNotifications
+    internal class OpenIdConnectEvents
     {
-        private static List<string> notificationsFired = new List<string>();
+        private static List<string> eventsFired = new List<string>();
 
-        internal static Task MessageReceived(MessageReceivedNotification<OpenIdConnectMessage, OpenIdConnectAuthenticationOptions> context)
+        internal static Task MessageReceived(MessageReceivedContext context)
         {
             Helpers.ThrowIfConditionFailed(() => context.ProtocolMessage != null, "ProtocolMessage is null.");
-            notificationsFired.Add(nameof(MessageReceived));
+            eventsFired.Add(nameof(MessageReceived));
             return Task.FromResult(0);
         }
 
-        internal static Task SecurityTokenReceived(SecurityTokenReceivedNotification<OpenIdConnectMessage, OpenIdConnectAuthenticationOptions> context)
+        internal static Task SecurityTokenReceived(SecurityTokenReceivedContext context)
         {
-            notificationsFired.Add(nameof(SecurityTokenReceived));
+            eventsFired.Add(nameof(SecurityTokenReceived));
             return Task.FromResult(0);
         }
 
-        internal static Task SecurityTokenValidated(SecurityTokenValidatedNotification<OpenIdConnectMessage, OpenIdConnectAuthenticationOptions> context)
+        internal static Task SecurityTokenValidated(SecurityTokenValidatedContext context)
         {
             Helpers.ThrowIfConditionFailed(() => context.AuthenticationTicket != null, "context.AuthenticationTicket is null.");
             Helpers.ThrowIfConditionFailed(() => context.AuthenticationTicket.Principal != null, "context.AuthenticationTicket.Principal is null.");
             Helpers.ThrowIfConditionFailed(() => context.AuthenticationTicket.Principal.Identity != null, "context.AuthenticationTicket.Principal.Identity is null.");
             Helpers.ThrowIfConditionFailed(() => !string.IsNullOrWhiteSpace(context.AuthenticationTicket.Principal.Identity.Name), "context.AuthenticationTicket.Principal.Identity.Name is null.");
-            notificationsFired.Add(nameof(SecurityTokenValidated));
+            eventsFired.Add(nameof(SecurityTokenValidated));
             return Task.FromResult(0);
         }
 
-        internal static Task AuthorizationCodeReceived(AuthorizationCodeReceivedNotification context)
+        internal static Task AuthorizationCodeReceived(AuthorizationCodeReceivedContext context)
         {
             Helpers.ThrowIfConditionFailed(() => context.Code == "AAABAAAAvPM1KaPlrEqdFSBzjqfTGGBtrTYVn589oKw4lLgJ6Svz0AhPVOJr0J2-Uu_KffGlqIbYlRAyxmt-vZ7VlSVdrWvOkNhK9OaAMaSD7LDoPbBTVMEkB0MdAgBTV34l2el-s8ZI02_9PvgQaORZs7n8eGaGbcoKAoxiDn2OcKuJVplXYgrGUwU4VpRaqe6RaNzuseM7qBFbLIv4Wps8CndE6W8ccmuu6EvGC6-H4uF9EZL7gU4nEcTcvkE4Qyt8do6VhTVfM1ygRNQgmV1BCig5t_5xfhL6-xWQdy15Uzn_Df8VSsyDXe8s9cxyKlqc_AIyLFy_NEiMQFUqjZWKd_rR3A8ugug15SEEGuo1kF3jMc7dVMdE6OF9UBd-Ax5ILWT7V4clnRQb6-CXB538DlolREfE-PowXYruFBA-ARD6rwAVtuVfCSbS0Zr4ZqfNjt6x8yQdK-OkdQRZ1thiZcZlm1lyb2EquGZ8Deh2iWBoY1uNcyjzhG-L43EivxtHAp6Y8cErhbo41iacgqOycgyJWxiB5J0HHkxD0nQ2RVVuY8Ybc9sdgyfKkkK2wZ3idGaRCdZN8Q9VBhWRXPDMqHWG8t3aZRtvJ_Xd3WhjNPJC0GpepUGNNQtXiEoIECC363o1z6PZC5-E7U3l9xK06BZkcfTOnggUiSWNCrxUKS44dNqaozdYlO5E028UgAEhJ4eDtcP3PZty-0j4j5Mw0F2FmyAA",
                 "context.Code is invalid.");
-            notificationsFired.Add(nameof(AuthorizationCodeReceived));
+            eventsFired.Add(nameof(AuthorizationCodeReceived));
 
-            // Verify all notifications are fired.
-            if (notificationsFired.Contains(nameof(RedirectToIdentityProvider)) &&
-                notificationsFired.Contains(nameof(MessageReceived)) &&
-                notificationsFired.Contains(nameof(SecurityTokenReceived)) &&
-                notificationsFired.Contains(nameof(SecurityTokenValidated)) &&
-                notificationsFired.Contains(nameof(AuthorizationCodeReceived)))
+            // Verify all events are fired.
+            if (eventsFired.Contains(nameof(RedirectToIdentityProvider)) &&
+                eventsFired.Contains(nameof(MessageReceived)) &&
+                eventsFired.Contains(nameof(SecurityTokenReceived)) &&
+                eventsFired.Contains(nameof(SecurityTokenValidated)) &&
+                eventsFired.Contains(nameof(AuthorizationCodeReceived)))
             {
                 ((ClaimsIdentity)context.AuthenticationTicket.Principal.Identity).AddClaim(new Claim("ManageStore", "Allowed"));
             }
@@ -57,9 +56,9 @@ namespace MusicStore.Mocks.OpenIdConnect
         }
 
         internal static Task RedirectToIdentityProvider
-            (RedirectToIdentityProviderNotification<OpenIdConnectMessage, OpenIdConnectAuthenticationOptions> context)
+            (RedirectToIdentityProviderContext context)
         {
-            notificationsFired.Add(nameof(RedirectToIdentityProvider));
+            eventsFired.Add(nameof(RedirectToIdentityProvider));
 
             if (context.ProtocolMessage.RequestType == OpenIdConnectRequestType.LogoutRequest)
             {
diff --git a/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs b/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs
index a0bf934734..d74e427797 100644
--- a/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs
+++ b/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs
@@ -77,13 +77,13 @@ namespace MusicStore
                 options.ProtocolValidator.NonceLifetime = TimeSpan.FromDays(36500);
                 options.UseTokenLifetime = false;
 
-                options.Notifications = new OpenIdConnectAuthenticationNotifications
+                options.Events = new OpenIdConnectAuthenticationEvents
                 {
-                    MessageReceived = OpenIdConnectNotifications.MessageReceived,
-                    AuthorizationCodeReceived = OpenIdConnectNotifications.AuthorizationCodeReceived,
-                    RedirectToIdentityProvider = OpenIdConnectNotifications.RedirectToIdentityProvider,
-                    SecurityTokenReceived = OpenIdConnectNotifications.SecurityTokenReceived,
-                    SecurityTokenValidated = OpenIdConnectNotifications.SecurityTokenValidated
+                    OnMessageReceived = OpenIdConnectEvents.MessageReceived,
+                    OnAuthorizationCodeReceived = OpenIdConnectEvents.AuthorizationCodeReceived,
+                    OnRedirectToIdentityProvider = OpenIdConnectEvents.RedirectToIdentityProvider,
+                    OnSecurityTokenReceived = OpenIdConnectEvents.SecurityTokenReceived,
+                    OnSecurityTokenValidated = OpenIdConnectEvents.SecurityTokenValidated
                 };
             });
 
diff --git a/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs b/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs
index debbb90bb3..81dce18f5a 100644
--- a/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs
+++ b/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs
@@ -79,11 +79,11 @@ namespace MusicStore
             {
                 options.AppId = "[AppId]";
                 options.AppSecret = "[AppSecret]";
-                options.Notifications = new OAuthAuthenticationNotifications()
+                options.Events = new OAuthAuthenticationEvents()
                 {
-                    OnAuthenticated = FacebookNotifications.OnAuthenticated,
-                    OnReturnEndpoint = FacebookNotifications.OnReturnEndpoint,
-                    OnApplyRedirect = FacebookNotifications.OnApplyRedirect
+                    OnAuthenticated = FacebookEvents.OnAuthenticated,
+                    OnReturnEndpoint = FacebookEvents.OnReturnEndpoint,
+                    OnApplyRedirect = FacebookEvents.OnApplyRedirect
                 };
                 options.BackchannelHttpHandler = new FacebookMockBackChannelHttpHandler();
                 options.StateDataFormat = new CustomStateDataFormat();
@@ -97,11 +97,11 @@ namespace MusicStore
                 options.ClientId = "[ClientId]";
                 options.ClientSecret = "[ClientSecret]";
                 options.AccessType = "offline";
-                options.Notifications = new OAuthAuthenticationNotifications()
+                options.Events = new OAuthAuthenticationEvents()
                 {
-                    OnAuthenticated = GoogleNotifications.OnAuthenticated,
-                    OnReturnEndpoint = GoogleNotifications.OnReturnEndpoint,
-                    OnApplyRedirect = GoogleNotifications.OnApplyRedirect
+                    OnAuthenticated = GoogleEvents.OnAuthenticated,
+                    OnReturnEndpoint = GoogleEvents.OnReturnEndpoint,
+                    OnApplyRedirect = GoogleEvents.OnApplyRedirect
                 };
                 options.StateDataFormat = new CustomStateDataFormat();
                 options.BackchannelHttpHandler = new GoogleMockBackChannelHttpHandler();
@@ -111,11 +111,11 @@ namespace MusicStore
             {
                 options.ConsumerKey = "[ConsumerKey]";
                 options.ConsumerSecret = "[ConsumerSecret]";
-                options.Notifications = new TwitterAuthenticationNotifications()
+                options.Events = new TwitterAuthenticationEvents()
                 {
-                    OnAuthenticated = TwitterNotifications.OnAuthenticated,
-                    OnReturnEndpoint = TwitterNotifications.OnReturnEndpoint,
-                    OnApplyRedirect = TwitterNotifications.OnApplyRedirect
+                    OnAuthenticated = TwitterEvents.OnAuthenticated,
+                    OnReturnEndpoint = TwitterEvents.OnReturnEndpoint,
+                    OnApplyRedirect = TwitterEvents.OnApplyRedirect
                 };
                 options.StateDataFormat = new CustomTwitterStateDataFormat();
                 options.BackchannelHttpHandler = new TwitterMockBackChannelHttpHandler();
@@ -129,11 +129,11 @@ namespace MusicStore
                 options.Caption = "MicrosoftAccount - Requires project changes";
                 options.ClientId = "[ClientId]";
                 options.ClientSecret = "[ClientSecret]";
-                options.Notifications = new OAuthAuthenticationNotifications()
+                options.Events = new OAuthAuthenticationEvents()
                 {
-                    OnAuthenticated = MicrosoftAccountNotifications.OnAuthenticated,
-                    OnReturnEndpoint = MicrosoftAccountNotifications.OnReturnEndpoint,
-                    OnApplyRedirect = MicrosoftAccountNotifications.OnApplyRedirect
+                    OnAuthenticated = MicrosoftAccountEvents.OnAuthenticated,
+                    OnReturnEndpoint = MicrosoftAccountEvents.OnReturnEndpoint,
+                    OnApplyRedirect = MicrosoftAccountEvents.OnApplyRedirect
                 };
                 options.BackchannelHttpHandler = new MicrosoftAccountMockBackChannelHandler();
                 options.StateDataFormat = new CustomStateDataFormat();
diff --git a/test/E2ETests/compiler/shared/Mocks/Twitter/TwitterNotifications.cs b/test/E2ETests/compiler/shared/Mocks/Twitter/TwitterEvents.cs
similarity index 90%
rename from test/E2ETests/compiler/shared/Mocks/Twitter/TwitterNotifications.cs
rename to test/E2ETests/compiler/shared/Mocks/Twitter/TwitterEvents.cs
index 681b7c90ab..c1be612fa8 100644
--- a/test/E2ETests/compiler/shared/Mocks/Twitter/TwitterNotifications.cs
+++ b/test/E2ETests/compiler/shared/Mocks/Twitter/TwitterEvents.cs
@@ -8,10 +8,7 @@ using MusicStore.Mocks.Common;
 
 namespace MusicStore.Mocks.Twitter
 {
-    /// <summary>
-    /// Summary description for TwitterNotifications
-    /// </summary>
-    internal class TwitterNotifications
+    internal class TwitterEvents
     {
         internal static async Task OnAuthenticated(TwitterAuthenticatedContext context)
         {
@@ -31,7 +28,7 @@ namespace MusicStore.Mocks.Twitter
         {
             if (context.Principal != null && context.SignInScheme == new IdentityCookieOptions().ExternalCookieAuthenticationScheme)
             {
-                //This way we will know all notifications were fired.
+                //This way we will know all Events were fired.
                 var identity = context.Principal.Identities.First();
                 var manageStoreClaim = identity?.Claims.Where(c => c.Type == "ManageStore" && c.Value == "false").FirstOrDefault();
                 if (manageStoreClaim != null)