diff --git a/Octokit.Tests.Integration/Clients/Enterprise/EnterpriseLdapClientTests.cs b/Octokit.Tests.Integration/Clients/Enterprise/EnterpriseLdapClientTests.cs
index 1b8a99311a..9548a2b16e 100644
--- a/Octokit.Tests.Integration/Clients/Enterprise/EnterpriseLdapClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/Enterprise/EnterpriseLdapClientTests.cs
@@ -21,7 +21,7 @@ public EnterpriseLdapClientTests()
         _github = EnterpriseHelper.GetAuthenticatedClient();
 
         NewTeam newTeam = new NewTeam(Helper.MakeNameWithTimestamp("test-team")) { Description = "Test Team" };
-        _context = _github.CreateEnterpriseTeamContext(EnterpriseHelper.Organization, newTeam).Result;
+        _context = _github.CreateTeamContext(EnterpriseHelper.Organization, newTeam).Result;
     }
 
     [GitHubEnterpriseTest]
diff --git a/Octokit.Tests.Integration/Clients/UserAdministrationClientTests.cs b/Octokit.Tests.Integration/Clients/UserAdministrationClientTests.cs
index 0a68edd27a..34e4c52389 100644
--- a/Octokit.Tests.Integration/Clients/UserAdministrationClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/UserAdministrationClientTests.cs
@@ -67,7 +67,7 @@ public async Task CanRename()
         {
             string renamedUsername = Helper.MakeNameWithTimestamp("user-renamed");
             // Create a disposable user for the test
-            using (var context = _github.CreateEnterpriseUserContext(GenerateNewUserDetails()).Result)
+            using (var context = _github.CreateUserContext(GenerateNewUserDetails()).Result)
             {
                 var response = await _github.User.Administration.Rename(
                     context.UserLogin,
@@ -86,7 +86,7 @@ public async Task CanRename()
         public async Task CanAddAndDeleteImpersonationToken()
         {
             // Create a disposable user for the test
-            using (var context = _github.CreateEnterpriseUserContext(GenerateNewUserDetails()).Result)
+            using (var context = _github.CreateUserContext(GenerateNewUserDetails()).Result)
             {
                 // Create Impersonation token
                 var token = await _github.User.Administration.CreateImpersonationToken(
@@ -109,7 +109,7 @@ public async Task CanPromoteAndDemote()
             User checkUser = null;
 
             // Create a disposable user for the test
-            using (var context = _github.CreateEnterpriseUserContext(GenerateNewUserDetails()).Result)
+            using (var context = _github.CreateUserContext(GenerateNewUserDetails()).Result)
             {
                 // Ensure user is not site admin
                 checkUser = await _github.User.Get(context.UserLogin);
@@ -137,7 +137,7 @@ public async Task CanSuspendAndUnsuspend()
             User checkUser = null;
 
             // Create a disposable user for the test
-            using (var context = _github.CreateEnterpriseUserContext(GenerateNewUserDetails()).Result)
+            using (var context = _github.CreateUserContext(GenerateNewUserDetails()).Result)
             {
                 // Ensure user is not suspended
                 checkUser = await _github.User.Get(context.UserLogin);
@@ -163,7 +163,7 @@ public async Task CanSuspendAndUnsuspend()
         public async Task CanListAllPublicKeys()
         {
             // Create a disposable user for the test
-            using (var context = _github.CreateEnterpriseUserContext(GenerateNewUserDetails()).Result)
+            using (var context = _github.CreateUserContext(GenerateNewUserDetails()).Result)
             {
                 // Ensure user has a key
                 //var key = await _github.User.Keys.Create(new NewPublicKey("title", "key"));
@@ -183,7 +183,7 @@ public async Task CanListAllPublicKeys()
         public async Task CanDeletePublicKey()
         {
             // Create a disposable user for the test
-            using (var context = _github.CreateEnterpriseUserContext(GenerateNewUserDetails()).Result)
+            using (var context = _github.CreateUserContext(GenerateNewUserDetails()).Result)
             {
                 // Ensure user has a key
                 //var key = await _github.User.Keys.Create(new NewPublicKey("title", "key"));
diff --git a/Octokit.Tests.Integration/Helpers/GithubClientExtensions.cs b/Octokit.Tests.Integration/Helpers/GithubClientExtensions.cs
index 91dfc2a7e0..5c892c43b6 100644
--- a/Octokit.Tests.Integration/Helpers/GithubClientExtensions.cs
+++ b/Octokit.Tests.Integration/Helpers/GithubClientExtensions.cs
@@ -26,14 +26,14 @@ internal static async Task<RepositoryContext> CreateRepositoryContext(this IGitH
             return new RepositoryContext(repo);
         }
 
-        internal static async Task<TeamContext> CreateEnterpriseTeamContext(this IGitHubClient client, string organization, NewTeam newTeam)
+        internal static async Task<TeamContext> CreateTeamContext(this IGitHubClient client, string organization, NewTeam newTeam)
         {
             var team = await client.Organization.Team.Create(organization, newTeam);
 
             return new TeamContext(team);
         }
 
-        internal static async Task<EnterpriseUserContext> CreateEnterpriseUserContext(this IGitHubClient client, NewUser newUser)
+        internal static async Task<EnterpriseUserContext> CreateUserContext(this IGitHubClient client, NewUser newUser)
         {
             var user = await client.User.Administration.Create(newUser);