diff --git a/Octokit.Tests.Integration/Clients/Enterprise/EnterpriseLdapClientTests.cs b/Octokit.Tests.Integration/Clients/Enterprise/EnterpriseLdapClientTests.cs
index 5fbac3728e..1b8a99311a 100644
--- a/Octokit.Tests.Integration/Clients/Enterprise/EnterpriseLdapClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/Enterprise/EnterpriseLdapClientTests.cs
@@ -13,7 +13,7 @@ public class EnterpriseLdapClientTests : IDisposable
     readonly string _testUser = "test-user";
     readonly string _distinguishedNameUser = "uid=test-user,ou=users,dc=company,dc=com";
 
-    readonly EnterpriseTeamContext _context;
+    readonly TeamContext _context;
     readonly string _distinguishedNameTeam = "cn=test-team,ou=groups,dc=company,dc=com";
 
     public EnterpriseLdapClientTests()
diff --git a/Octokit.Tests.Integration/Helpers/GithubClientExtensions.cs b/Octokit.Tests.Integration/Helpers/GithubClientExtensions.cs
index 8f982e43c4..91dfc2a7e0 100644
--- a/Octokit.Tests.Integration/Helpers/GithubClientExtensions.cs
+++ b/Octokit.Tests.Integration/Helpers/GithubClientExtensions.cs
@@ -26,11 +26,11 @@ internal static async Task<RepositoryContext> CreateRepositoryContext(this IGitH
             return new RepositoryContext(repo);
         }
 
-        internal static async Task<EnterpriseTeamContext> CreateEnterpriseTeamContext(this IGitHubClient client, string organization, NewTeam newTeam)
+        internal static async Task<TeamContext> CreateEnterpriseTeamContext(this IGitHubClient client, string organization, NewTeam newTeam)
         {
             var team = await client.Organization.Team.Create(organization, newTeam);
 
-            return new EnterpriseTeamContext(team);
+            return new TeamContext(team);
         }
 
         internal static async Task<EnterpriseUserContext> CreateEnterpriseUserContext(this IGitHubClient client, NewUser newUser)
diff --git a/Octokit.Tests.Integration/Helpers/ObservableGithubClientExtensions.cs b/Octokit.Tests.Integration/Helpers/ObservableGithubClientExtensions.cs
index f455608a95..4a864c3d38 100644
--- a/Octokit.Tests.Integration/Helpers/ObservableGithubClientExtensions.cs
+++ b/Octokit.Tests.Integration/Helpers/ObservableGithubClientExtensions.cs
@@ -28,11 +28,11 @@ internal static async Task<RepositoryContext> CreateRepositoryContext(this IObse
             return new RepositoryContext(repo);
         }
 
-        internal static async Task<EnterpriseTeamContext> CreateEnterpriseTeamContext(this IObservableGitHubClient client, string organization, NewTeam newTeam)
+        internal static async Task<TeamContext> CreateEnterpriseTeamContext(this IObservableGitHubClient client, string organization, NewTeam newTeam)
         {
             var team = await client.Organization.Team.Create(organization, newTeam);
 
-            return new EnterpriseTeamContext(team);
+            return new TeamContext(team);
         }
 
         internal static async Task<EnterpriseUserContext> CreateEnterpriseUserContext(this IObservableGitHubClient client, NewUser newUser)
diff --git a/Octokit.Tests.Integration/Helpers/EnterpriseTeamContext.cs b/Octokit.Tests.Integration/Helpers/TeamContext.cs
similarity index 82%
rename from Octokit.Tests.Integration/Helpers/EnterpriseTeamContext.cs
rename to Octokit.Tests.Integration/Helpers/TeamContext.cs
index 3b910a2af3..967aebb2f6 100644
--- a/Octokit.Tests.Integration/Helpers/EnterpriseTeamContext.cs
+++ b/Octokit.Tests.Integration/Helpers/TeamContext.cs
@@ -6,9 +6,9 @@
 
 namespace Octokit.Tests.Integration.Helpers
 {
-    internal sealed class EnterpriseTeamContext : IDisposable
+    internal sealed class TeamContext : IDisposable
     {
-        internal EnterpriseTeamContext(Team team)
+        internal TeamContext(Team team)
         {
             Team = team;
             TeamId = team.Id;
diff --git a/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj b/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj
index be61279eb1..afe0511eb7 100644
--- a/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj
+++ b/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj
@@ -127,7 +127,7 @@
     <Compile Include="Helpers\PersonalAccessTokenTestAttribute.cs" />
     <Compile Include="Helpers\PaidAccountTestAttribute.cs" />
     <Compile Include="Helpers\ReferenceExtensionsTests.cs" />
-    <Compile Include="Helpers\EnterpriseTeamContext.cs" />
+    <Compile Include="Helpers\TeamContext.cs" />
     <Compile Include="Helpers\RepositoryContext.cs" />
     <Compile Include="Helpers\RepositorySetupHelper.cs" />
     <Compile Include="HttpClientAdapterTests.cs" />
diff --git a/Octokit.Tests.Integration/Reactive/Enterprise/ObservableEnterpriseLdapClientTests.cs b/Octokit.Tests.Integration/Reactive/Enterprise/ObservableEnterpriseLdapClientTests.cs
index 948a52a65a..01441e963b 100644
--- a/Octokit.Tests.Integration/Reactive/Enterprise/ObservableEnterpriseLdapClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/Enterprise/ObservableEnterpriseLdapClientTests.cs
@@ -15,7 +15,7 @@ public class ObservableEnterpriseLdapClientTests : IDisposable
         readonly string _testUser = "test-user";
         readonly string _distinguishedNameUser = "uid=test-user,ou=users,dc=company,dc=com";
 
-        readonly EnterpriseTeamContext _context;
+        readonly TeamContext _context;
         readonly string _distinguishedNameTeam = "cn=test-team,ou=groups,dc=company,dc=com";
 
         public ObservableEnterpriseLdapClientTests()