diff --git a/src/Atc.CodeGeneration.CSharp/Content/Generators/GenerateContentForEnum.cs b/src/Atc.CodeGeneration.CSharp/Content/Generators/GenerateContentForEnum.cs
index b309c5768..11e2e8a78 100644
--- a/src/Atc.CodeGeneration.CSharp/Content/Generators/GenerateContentForEnum.cs
+++ b/src/Atc.CodeGeneration.CSharp/Content/Generators/GenerateContentForEnum.cs
@@ -6,6 +6,7 @@ public class GenerateContentForEnum : IContentGenerator
 {
     private readonly ICodeDocumentationTagsGenerator codeDocumentationTagsGenerator;
     private readonly EnumParameters parameters;
+    private readonly char[] removeSeparatorsForName = { ' ', '-', '_', ':' };
 
     public GenerateContentForEnum(
         ICodeDocumentationTagsGenerator codeDocumentationTagsGenerator,
@@ -57,8 +58,10 @@ public string Generate()
                 }
                 else
                 {
+                    var name = parametersValue.Name.PascalCase(removeSeparatorsForName, true);
+
                     sbLine.AppendLine($"[EnumMember(Value = \"{parametersValue.Name}\")]");
-                    sbLine.Append(4, parametersValue.Name.PascalCase(removeSeparators: true));
+                    sbLine.Append(4, name);
                 }
             }
             else
diff --git a/src/Atc.Rest.ApiGenerator.Framework/Factories/Parameters/ServerClient/ContentGeneratorServerClientEnumParametersFactory.cs b/src/Atc.Rest.ApiGenerator.Framework/Factories/Parameters/ServerClient/ContentGeneratorServerClientEnumParametersFactory.cs
index 4bade77e7..f9b72e74a 100644
--- a/src/Atc.Rest.ApiGenerator.Framework/Factories/Parameters/ServerClient/ContentGeneratorServerClientEnumParametersFactory.cs
+++ b/src/Atc.Rest.ApiGenerator.Framework/Factories/Parameters/ServerClient/ContentGeneratorServerClientEnumParametersFactory.cs
@@ -43,7 +43,7 @@ public static EnumParameters Create(
             {
                 case 1:
                     result.Add(
-                        key: sa[0].Trim().Replace(":", "-", StringComparison.CurrentCulture),
+                        key: sa[0].Trim(),
                         value: null);
                     break;
                 case 2:
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/Monta.yaml b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/Monta.yaml
index d427426b7..57104e92e 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/Monta.yaml
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/Monta.yaml
@@ -15250,6 +15250,22 @@ components:
       - created
       - updated
       - deleted
+      - scanned
+      - monta:ocpp:OcppRequestResponse
+      - monta:ocpp:ChargePointConnected
+      - monta:ocpp:ChargePointDisconnected
+      - monta:ocpp:OcppProtocolError
+      - monta:ocpp:OcppRequestTimeout
+      x-enum-varnames:
+      - CREATED
+      - UPDATED
+      - DELETED
+      - SCANNED
+      - OCPP_REQUEST_RESPONSE
+      - CHARGE_POINT_CONNECTED
+      - CHARGE_POINT_DISCONNECTED
+      - OCPP_PROTOCOL_ERROR
+      - OCPP_REQUEST_TIMEOUT
     KwhPerHour:
       required:
       - time
diff --git a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/_EnumerationTypes/KafkaEventType.verified.cs b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/_EnumerationTypes/KafkaEventType.verified.cs
index e89e7e172..98c1f2f48 100644
--- a/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/_EnumerationTypes/KafkaEventType.verified.cs
+++ b/test/Atc.Rest.ApiGenerator.CLI.Tests/Scenarios/Monta/VerifyClient/WCEM/src/Monta.ApiClient.Generated/Contracts/_EnumerationTypes/KafkaEventType.verified.cs
@@ -21,4 +21,22 @@ public enum KafkaEventType
 
     [EnumMember(Value = "deleted")]
     Deleted,
+
+    [EnumMember(Value = "scanned")]
+    Scanned,
+
+    [EnumMember(Value = "monta:ocpp:OcppRequestResponse")]
+    MontaOcppOcppRequestResponse,
+
+    [EnumMember(Value = "monta:ocpp:ChargePointConnected")]
+    MontaOcppChargePointConnected,
+
+    [EnumMember(Value = "monta:ocpp:ChargePointDisconnected")]
+    MontaOcppChargePointDisconnected,
+
+    [EnumMember(Value = "monta:ocpp:OcppProtocolError")]
+    MontaOcppOcppProtocolError,
+
+    [EnumMember(Value = "monta:ocpp:OcppRequestTimeout")]
+    MontaOcppOcppRequestTimeout,
 }
\ No newline at end of file