diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Errors/ErrorMapper.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Errors/ErrorMapper.cs
index 45df8b22f1..c66d366de5 100644
--- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Errors/ErrorMapper.cs
+++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Errors/ErrorMapper.cs
@@ -7,7 +7,7 @@ public static class ErrorMapper
 {
 
     /// <summary>
-    /// Maps the Error<T> to a Bit.Exception class.
+    /// Maps the ErrorT to a Bit.Exception class.
     /// </summary>
     /// <param name="error"></param>
     /// <typeparam name="T"></typeparam>
@@ -20,18 +20,18 @@ public static class ErrorMapper
         };
 
     /// <summary>
-    /// This maps the Error<T> object to the Bit.Exception class.
+    /// This maps the ErrorT object to the Bit.Exception class.
     ///
     /// This should be replaced by an IActionResult mapper when possible.
     /// </summary>
     /// <param name="errors"></param>
     /// <typeparam name="T"></typeparam>
     /// <returns></returns>
-    public static Exception MapToBitException<T>(IEnumerable<Error<T>> errors) =>
+    public static Exception MapToBitException<T>(ICollection<Error<T>> errors) =>
         errors switch
         {
-            not null when errors.Count() == 1 => MapToBitException(errors.First()),
-            not null when errors.Count() > 1 => new BadRequestException(string.Join(' ', errors.Select(e => e.Message))),
+            not null when errors.Count == 1 => MapToBitException(errors.First()),
+            not null when errors.Count > 1 => new BadRequestException(string.Join(' ', errors.Select(e => e.Message))),
             _ => new BadRequestException()
         };
 }
diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUsersCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUsersCommand.cs
index ca3cce8f7d..76c19edfb6 100644
--- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUsersCommand.cs
+++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUsersCommand.cs
@@ -115,7 +115,7 @@ public class InviteOrganizationUsersCommand(IEventService eventService,
 
         var validatedRequest = validationResult as Valid<InviteUserOrganizationValidationRequest>;
 
-        var organizationUserCollection = invitesToSend
+        var organizationUserToInviteEntities = invitesToSend
             .Select(MapToDataModel(request.PerformedAt))
             .ToArray();
 
@@ -123,7 +123,7 @@ public class InviteOrganizationUsersCommand(IEventService eventService,
 
         try
         {
-            await organizationUserRepository.CreateManyAsync(organizationUserCollection);
+            await organizationUserRepository.CreateManyAsync(organizationUserToInviteEntities);
 
             await AdjustPasswordManagerSeatsAsync(validatedRequest, organization);
 
@@ -131,7 +131,7 @@ public class InviteOrganizationUsersCommand(IEventService eventService,
 
             await SendAdditionalEmailsAsync(validatedRequest, organization);
 
-            await SendInvitesAsync(organizationUserCollection, organization);
+            await SendInvitesAsync(organizationUserToInviteEntities, organization);
 
             await PublishReferenceEventAsync(validatedRequest, organization);
         }
@@ -139,7 +139,7 @@ public class InviteOrganizationUsersCommand(IEventService eventService,
         {
             logger.LogError(ex, FailedToInviteUsers);
 
-            await organizationUserRepository.DeleteManyAsync(organizationUserCollection.Select(x => x.OrganizationUser.Id));
+            await organizationUserRepository.DeleteManyAsync(organizationUserToInviteEntities.Select(x => x.OrganizationUser.Id));
 
             await RevertSecretsManagerChangesAsync(validatedRequest, organization);
 
@@ -148,7 +148,7 @@ public class InviteOrganizationUsersCommand(IEventService eventService,
             return new Failure<IEnumerable<OrganizationUser>>(FailedToInviteUsers);
         }
 
-        return new Success<IEnumerable<OrganizationUser>>(organizationUserCollection.Select(x => x.OrganizationUser));
+        return new Success<IEnumerable<OrganizationUser>>(organizationUserToInviteEntities.Select(x => x.OrganizationUser));
     }
 
     private async Task RevertPasswordManagerChangesAsync(Valid<InviteUserOrganizationValidationRequest> validatedResult, Organization organization)
@@ -209,6 +209,8 @@ public class InviteOrganizationUsersCommand(IEventService eventService,
 
         try
         {
+            // TODO include provider org emails
+
             var ownerEmails = (await organizationUserRepository
                     .GetManyByMinimumRoleAsync(validatedResult.Value.InviteOrganization.OrganizationId, OrganizationUserType.Owner))
                 .Select(x => x.Email)