diff --git a/src/Core/Platform/Mail/HandlebarsMailService.cs b/src/Core/Platform/Mail/HandlebarsMailService.cs
index 0d3b7bb31c..e456fc6921 100644
--- a/src/Core/Platform/Mail/HandlebarsMailService.cs
+++ b/src/Core/Platform/Mail/HandlebarsMailService.cs
@@ -208,7 +208,7 @@ public class HandlebarsMailService : IMailService
         await _mailDeliveryService.SendEmailAsync(message);
     }
 
-    public async Task SendSendEmailOtpEmailv2Async(string email, string token, string subject)
+    public async Task SendSendEmailOtpEmailAsync(string email, string token, string subject)
     {
         var message = CreateDefaultMessage(subject, email);
         var requestDateTime = DateTime.UtcNow;
diff --git a/src/Core/Platform/Mail/IMailService.cs b/src/Core/Platform/Mail/IMailService.cs
index ae80befa5b..e07e4bad29 100644
--- a/src/Core/Platform/Mail/IMailService.cs
+++ b/src/Core/Platform/Mail/IMailService.cs
@@ -52,14 +52,14 @@ public interface IMailService
     Task SendChangeEmailEmailAsync(string newEmailAddress, string token);
     Task SendTwoFactorEmailAsync(string email, string accountEmail, string token, string deviceIp, string deviceType, TwoFactorEmailPurpose purpose);
     /// <summary>
-    /// <see cref="DefaultOtpTokenProviderOptions"/> has a default expiry of 5 minutes so we set the expiry to that value int he view model.
+    /// <see cref="DefaultOtpTokenProviderOptions"/> has a default expiry of 5 minutes so we set the expiry to that value in the view model.
     /// Sends OTP code token to the specified email address.
     /// </summary>
     /// <param name="email">Email address to send the OTP to</param>
     /// <param name="token">Otp code token</param>
-    /// <param name="subject">subject line of the email</param>
+    /// <param name="subject">Subject line of the email</param>
     /// <returns>Task</returns>
-    Task SendSendEmailOtpEmailv2Async(string email, string token, string subject);
+    Task SendSendEmailOtpEmailAsync(string email, string token, string subject);
     Task SendFailedTwoFactorAttemptEmailAsync(string email, TwoFactorProviderType type, DateTime utcNow, string ip);
     Task SendNoMasterPasswordHintEmailAsync(string email);
     Task SendMasterPasswordHintEmailAsync(string email, string hint);
diff --git a/src/Core/Platform/Mail/NoopMailService.cs b/src/Core/Platform/Mail/NoopMailService.cs
index d9250313bb..0064058afb 100644
--- a/src/Core/Platform/Mail/NoopMailService.cs
+++ b/src/Core/Platform/Mail/NoopMailService.cs
@@ -94,7 +94,7 @@ public class NoopMailService : IMailService
         return Task.FromResult(0);
     }
 
-    public Task SendSendEmailOtpEmailv2Async(string email, string token, string subject)
+    public Task SendSendEmailOtpEmailAsync(string email, string token, string subject)
     {
         return Task.FromResult(0);
     }
diff --git a/src/Identity/IdentityServer/RequestValidators/SendAccess/SendEmailOtpRequestValidator.cs b/src/Identity/IdentityServer/RequestValidators/SendAccess/SendEmailOtpRequestValidator.cs
index 67f10551ca..1a1352fe85 100644
--- a/src/Identity/IdentityServer/RequestValidators/SendAccess/SendEmailOtpRequestValidator.cs
+++ b/src/Identity/IdentityServer/RequestValidators/SendAccess/SendEmailOtpRequestValidator.cs
@@ -60,8 +60,8 @@ public class SendEmailOtpRequestValidator(
             {
                 return BuildErrorResult(SendAccessConstants.EmailOtpValidatorResults.OtpGenerationFailed);
             }
- 
-            await mailService.SendSendEmailOtpEmailv2Async(
+
+            await mailService.SendSendEmailOtpEmailAsync(
                 email,
                 token,
                 string.Format(SendAccessConstants.OtpEmail.Subject, token));
diff --git a/test/Billing.Test/Services/SubscriptionUpdatedHandlerTests.cs b/test/Billing.Test/Services/SubscriptionUpdatedHandlerTests.cs
index 2259d846b7..0e1ce8e1f0 100644
--- a/test/Billing.Test/Services/SubscriptionUpdatedHandlerTests.cs
+++ b/test/Billing.Test/Services/SubscriptionUpdatedHandlerTests.cs
@@ -712,15 +712,15 @@ public class SubscriptionUpdatedHandlerTests
                 Data =
                 [
                     new SubscriptionItem
-                {
-                    CurrentPeriodEnd = DateTime.UtcNow.AddDays(10),
-                    Plan = new Plan { Id = "2023-enterprise-org-seat-annually" }
-                },
-                new SubscriptionItem
-                {
-                    CurrentPeriodEnd = DateTime.UtcNow.AddDays(10),
-                    Plan = new Plan { Id = "secrets-manager-enterprise-seat-annually" }
-                }
+                    {
+                        CurrentPeriodEnd = DateTime.UtcNow.AddDays(10),
+                        Plan = new Plan { Id = "2023-enterprise-org-seat-annually" }
+                    },
+                    new SubscriptionItem
+                    {
+                        CurrentPeriodEnd = DateTime.UtcNow.AddDays(10),
+                        Plan = new Plan { Id = "secrets-manager-enterprise-seat-annually" }
+                    }
                 ]
             },
             Customer = new Customer
@@ -760,7 +760,7 @@ public class SubscriptionUpdatedHandlerTests
                         Data =
                         [
                             new SubscriptionItem { Plan = new Stripe.Plan { Id = "secrets-manager-teams-seat-annually" } },
-                    ]
+                        ]
                     }
                 })
             }
diff --git a/test/Identity.Test/IdentityServer/SendAccess/SendEmailOtpRequestValidatorTests.cs b/test/Identity.Test/IdentityServer/SendAccess/SendEmailOtpRequestValidatorTests.cs
index d61213e421..f8e26a2bc0 100644
--- a/test/Identity.Test/IdentityServer/SendAccess/SendEmailOtpRequestValidatorTests.cs
+++ b/test/Identity.Test/IdentityServer/SendAccess/SendEmailOtpRequestValidatorTests.cs
@@ -44,7 +44,7 @@ public class SendEmailOtpRequestValidatorTests
 
         await sutProvider.GetDependency<IMailService>()
             .DidNotReceive()
-            .SendSendEmailOtpEmailv2Async(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>());
+            .SendSendEmailOtpEmailAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>());
     }
 
     [Theory, BitAutoData]
@@ -77,7 +77,7 @@ public class SendEmailOtpRequestValidatorTests
 
         await sutProvider.GetDependency<IMailService>()
             .DidNotReceive()
-            .SendSendEmailOtpEmailv2Async(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>());
+            .SendSendEmailOtpEmailAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>());
     }
 
     [Theory, BitAutoData]
@@ -126,7 +126,7 @@ public class SendEmailOtpRequestValidatorTests
         // Verify email sending
         await sutProvider.GetDependency<IMailService>()
             .Received(1)
-            .SendSendEmailOtpEmailv2Async(email, generatedToken, Arg.Any<string>());
+            .SendSendEmailOtpEmailAsync(email, generatedToken, Arg.Any<string>());
     }
 
     [Theory, BitAutoData]
@@ -160,7 +160,7 @@ public class SendEmailOtpRequestValidatorTests
         // Verify no email was sent
         await sutProvider.GetDependency<IMailService>()
             .DidNotReceive()
-            .SendSendEmailOtpEmailv2Async(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>());
+            .SendSendEmailOtpEmailAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>());
     }
 
     [Theory, BitAutoData]
@@ -212,7 +212,7 @@ public class SendEmailOtpRequestValidatorTests
         // Verify no email was sent (validation only)
         await sutProvider.GetDependency<IMailService>()
             .DidNotReceive()
-            .SendSendEmailOtpEmailv2Async(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>());
+            .SendSendEmailOtpEmailAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>());
     }
 
     [Theory, BitAutoData]