diff --git a/src/Core/KeyManagement/Entities/UserSignatureKeyPair.cs b/src/Core/KeyManagement/Entities/UserSignatureKeyPair.cs
index fbc4a288f8..fcac83a1bc 100644
--- a/src/Core/KeyManagement/Entities/UserSignatureKeyPair.cs
+++ b/src/Core/KeyManagement/Entities/UserSignatureKeyPair.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Entities;
-using Bit.Core.Enums;
+using Bit.Core.KeyManagement.Enums;
 using Bit.Core.Utilities;
 
 #nullable enable
diff --git a/src/Core/Enums/SignatureAlgorithm.cs b/src/Core/KeyManagement/Enums/SignatureAlgorithm.cs
similarity index 80%
rename from src/Core/Enums/SignatureAlgorithm.cs
rename to src/Core/KeyManagement/Enums/SignatureAlgorithm.cs
index 51360e5a0c..9216c3f489 100644
--- a/src/Core/Enums/SignatureAlgorithm.cs
+++ b/src/Core/KeyManagement/Enums/SignatureAlgorithm.cs
@@ -1,4 +1,4 @@
-namespace Bit.Core.Enums;
+namespace Bit.Core.KeyManagement.Enums;
 
 // <summary>
 // Represents the algorithm / digital signature scheme used for a signature key pair.
diff --git a/src/Core/KeyManagement/Models/Data/SignatureKeyPairData.cs b/src/Core/KeyManagement/Models/Data/SignatureKeyPairData.cs
index af66468b1f..7e64dc76e3 100644
--- a/src/Core/KeyManagement/Models/Data/SignatureKeyPairData.cs
+++ b/src/Core/KeyManagement/Models/Data/SignatureKeyPairData.cs
@@ -1,7 +1,7 @@
 #nullable enable
 
 using System.Text.Json.Serialization;
-using Bit.Core.Enums;
+using Bit.Core.KeyManagement.Enums;
 
 namespace Bit.Core.KeyManagement.Models.Data;
 
diff --git a/src/Infrastructure.Dapper/KeyManagement/Repositories/UserSignatureKeyPairRepository.cs b/src/Infrastructure.Dapper/KeyManagement/Repositories/UserSignatureKeyPairRepository.cs
index e00c740e93..5e7353f526 100644
--- a/src/Infrastructure.Dapper/KeyManagement/Repositories/UserSignatureKeyPairRepository.cs
+++ b/src/Infrastructure.Dapper/KeyManagement/Repositories/UserSignatureKeyPairRepository.cs
@@ -5,6 +5,7 @@ using Bit.Core.KeyManagement.Models.Data;
 using Bit.Core.KeyManagement.Repositories;
 using Bit.Core.KeyManagement.UserKey;
 using Bit.Core.Settings;
+using Bit.Core.Utilities;
 using Bit.Infrastructure.Dapper.Repositories;
 using Dapper;
 using Microsoft.Data.SqlClient;
@@ -45,8 +46,8 @@ public class UserSignatureKeyPairRepository : Repository<UserSignatureKeyPair, G
                 "[dbo].[UserSignatureKeyPair_SetForRotation]",
                 new
                 {
-                    Id = CoreHelpers.GenerateComb();
-            UserId = userId,
+                    Id = CoreHelpers.GenerateComb(),
+                    UserId = userId,
                     SignatureAlgorithm = (byte)signingKeys.SignatureAlgorithm,
                     SigningKey = signingKeys.WrappedSigningKey,
                     signingKeys.VerifyingKey,
@@ -55,25 +56,25 @@ public class UserSignatureKeyPairRepository : Repository<UserSignatureKeyPair, G
                 },
                 commandType: CommandType.StoredProcedure,
                 transaction: transaction);
-    };
-}
+        };
+    }
 
-public UpdateEncryptedDataForKeyRotation UpdateForKeyRotation(Guid grantorId, SignatureKeyPairData signingKeys)
-{
-    return async (SqlConnection connection, SqlTransaction transaction) =>
+    public UpdateEncryptedDataForKeyRotation UpdateForKeyRotation(Guid grantorId, SignatureKeyPairData signingKeys)
     {
-        await connection.QueryAsync(
-            "[dbo].[UserSignatureKeyPair_UpdateForRotation]",
-            new
-            {
-                UserId = grantorId,
-                SignatureAlgorithm = (byte)signingKeys.SignatureAlgorithm,
-                SigningKey = signingKeys.WrappedSigningKey,
-                signingKeys.VerifyingKey,
-                RevisionDate = DateTime.UtcNow
-            },
-            commandType: CommandType.StoredProcedure,
-            transaction: transaction);
-    };
-}
+        return async (SqlConnection connection, SqlTransaction transaction) =>
+        {
+            await connection.QueryAsync(
+                "[dbo].[UserSignatureKeyPair_UpdateForRotation]",
+                new
+                {
+                    UserId = grantorId,
+                    SignatureAlgorithm = (byte)signingKeys.SignatureAlgorithm,
+                    SigningKey = signingKeys.WrappedSigningKey,
+                    signingKeys.VerifyingKey,
+                    RevisionDate = DateTime.UtcNow
+                },
+                commandType: CommandType.StoredProcedure,
+                transaction: transaction);
+        };
+    }
 }
diff --git a/src/Infrastructure.EntityFramework/KeyManagement/Repositories/UserSigningKeysRepository.cs b/src/Infrastructure.EntityFramework/KeyManagement/Repositories/UserSigningKeysRepository.cs
index 418c98786f..25634aa41a 100644
--- a/src/Infrastructure.EntityFramework/KeyManagement/Repositories/UserSigningKeysRepository.cs
+++ b/src/Infrastructure.EntityFramework/KeyManagement/Repositories/UserSigningKeysRepository.cs
@@ -3,6 +3,7 @@ using AutoMapper;
 using Bit.Core.KeyManagement.Models.Data;
 using Bit.Core.KeyManagement.Repositories;
 using Bit.Core.KeyManagement.UserKey;
+using Bit.Core.Utilities;
 using Bit.Infrastructure.EntityFramework.Repositories;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;