diff --git a/src/shared/Core/Trace2Message.cs b/src/shared/Core/Trace2Message.cs
index fa76b2ebd3..75d8e2ed1d 100644
--- a/src/shared/Core/Trace2Message.cs
+++ b/src/shared/Core/Trace2Message.cs
@@ -6,16 +6,26 @@
 
 namespace GitCredentialManager;
 
-public class JsonSnakeCaseEnumConverter : JsonStringEnumConverter
+public class Trace2EventEnumConverter : JsonStringEnumConverter<Trace2Event>
 {
-    public JsonSnakeCaseEnumConverter()
+    public Trace2EventEnumConverter()
+        : base(JsonNamingPolicy.SnakeCaseLower, false) { }
+}
+
+public class Trace2ProcessClassEnumConverter : JsonStringEnumConverter<Trace2ProcessClass>
+{
+    public Trace2ProcessClassEnumConverter()
         : base(JsonNamingPolicy.SnakeCaseLower, false) { }
 }
 
 [JsonSourceGenerationOptions(
     PropertyNamingPolicy = JsonKnownNamingPolicy.SnakeCaseLower,
     PropertyNameCaseInsensitive = true,
-    Converters = new[] { typeof(JsonSnakeCaseEnumConverter) }
+    Converters = new[]
+    {
+        typeof(Trace2EventEnumConverter),
+        typeof(Trace2ProcessClassEnumConverter)
+    }
 )]
 [JsonSerializable(typeof(VersionMessage))]
 [JsonSerializable(typeof(StartMessage))]