diff --git a/src/Api/Controllers/OrganizationsController.cs b/src/Api/Controllers/OrganizationsController.cs
index 491e1526d4..3ef36330a9 100644
--- a/src/Api/Controllers/OrganizationsController.cs
+++ b/src/Api/Controllers/OrganizationsController.cs
@@ -763,7 +763,7 @@ public class OrganizationsController : Controller
 
         return new OrganizationSsoResponseModel(organization, _globalSettings, ssoConfig);
     }
-    
+
     [HttpPut("{id}/collection-management")]
     public async Task<OrganizationResponseModel> PutCollectionManagement(Guid id, [FromBody] OrganizationCollectionManagementUpdateRequestModel model)
     {
diff --git a/test/Api.Test/Vault/AuthorizationHandlers/CollectionAuthorizationHandlerTests.cs b/test/Api.Test/Vault/AuthorizationHandlers/CollectionAuthorizationHandlerTests.cs
index 34fead7ac0..cebf1468d4 100644
--- a/test/Api.Test/Vault/AuthorizationHandlers/CollectionAuthorizationHandlerTests.cs
+++ b/test/Api.Test/Vault/AuthorizationHandlers/CollectionAuthorizationHandlerTests.cs
@@ -29,7 +29,7 @@ public class CollectionAuthorizationHandlerTests
         SutProvider<CollectionAuthorizationHandler> sutProvider,
         ICollection<Collection> collections,
         ICollection<CollectionDetails> collectionDetails,
-        CurrentContentOrganization organization)
+        CurrentContextOrganization organization)
     {
         var actingUserId = Guid.NewGuid();
         foreach (var collectionDetail in collectionDetails)
@@ -102,7 +102,7 @@ public class CollectionAuthorizationHandlerTests
     public async Task CanManageCollectionAccessAsync_MissingOrgMembership_Failure(
         SutProvider<CollectionAuthorizationHandler> sutProvider,
         ICollection<Collection> collections,
-        CurrentContentOrganization organization)
+        CurrentContextOrganization organization)
     {
         var actingUserId = Guid.NewGuid();
 
@@ -129,7 +129,7 @@ public class CollectionAuthorizationHandlerTests
         SutProvider<CollectionAuthorizationHandler> sutProvider,
         ICollection<Collection> collections,
         ICollection<CollectionDetails> collectionDetails,
-        CurrentContentOrganization organization)
+        CurrentContextOrganization organization)
     {
         var actingUserId = Guid.NewGuid();
 
diff --git a/test/Core.Test/Vault/AutoFixture/CollectionFixture.cs b/test/Core.Test/Vault/AutoFixture/CollectionFixture.cs
index 541f43b35d..e74cdac1c0 100644
--- a/test/Core.Test/Vault/AutoFixture/CollectionFixture.cs
+++ b/test/Core.Test/Vault/AutoFixture/CollectionFixture.cs
@@ -17,7 +17,7 @@ public class CollectionCustomization : ICustomization
     {
         var orgId = Guid.NewGuid();
 
-        fixture.Customize<CurrentContentOrganization>(composer => composer
+        fixture.Customize<CurrentContextOrganization>(composer => composer
             .With(o => o.Id, orgId));
 
         fixture.Customize<OrganizationUser>(composer => composer