diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ClientUtils.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ClientUtils.mustache
index 47d4b4c26f2..2055518bde2 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ClientUtils.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ClientUtils.mustache
@@ -132,7 +132,7 @@ using System.Runtime.CompilerServices;
             {{#isEnum}}
             if (obj is {{classname}} {{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}})
                 {{! below has #isNumeric as a work around but should probably have ^isString instead https://github.com/OpenAPITools/openapi-generator/issues/15038}}
-                return {{classname}}Converter.{{#isInnerEnum}}{{classname}}.{{/isInnerEnum}}{{{datatypeWithEnum}}}ToJsonValue({{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}){{#isNumeric}}.ToString(){{/isNumeric}};
+                return {{classname}}ValueConverter.{{#isInnerEnum}}{{classname}}.{{/isInnerEnum}}{{{datatypeWithEnum}}}ToJsonValue({{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}){{#isNumeric}}.ToString(){{/isNumeric}};
             {{/isEnum}}
             {{^isEnum}}
             {{#vars}}
@@ -158,7 +158,7 @@ using System.Runtime.CompilerServices;
             {{/models}}
             if (obj is ICollection collection)
             {
-                List<string{{nrt?}}> entries = new List<string{{nrt?}}>();
+                List<string{{nrt?}}> entries = new{{^net70OrLater}} List<string{{nrt?}}>{{/net70OrLater}}();
                 foreach (var entry in collection)
                     entries.Add(ParameterToString(entry));
                 return string.Join(",", entries);
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HostConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HostConfiguration.mustache
index 1e410a57b23..921149b17e6 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HostConfiguration.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HostConfiguration.mustache
@@ -39,8 +39,8 @@ namespace {{packageName}}.{{clientPackage}}
             {{#models}}
             {{#model}}
             {{#isEnum}}
-            _jsonOptions.Converters.Add(new {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}Converter());
-            _jsonOptions.Converters.Add(new {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}NullableConverter());
+            _jsonOptions.Converters.Add(new {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}JsonConverter());
+            _jsonOptions.Converters.Add(new {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}NullableJsonConverter());
             {{/isEnum}}
             {{^isEnum}}
             _jsonOptions.Converters.Add(new {{classname}}JsonConverter());
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache
index 52d960074c6..7eb0aa1c3bb 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache
@@ -225,7 +225,7 @@
                             {{^isInnerEnum}}
                             {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}RawValue == null
                                 ? null
-                                : {{{datatypeWithEnum}}}Converter.FromStringOrDefault({{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}RawValue);
+                                : {{{datatypeWithEnum}}}ValueConverter.FromStringOrDefault({{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}RawValue);
                             {{/isInnerEnum}}
                             {{#isInnerEnum}}
                             {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}RawValue == null
@@ -439,7 +439,7 @@
                 writer.WriteNull("{{baseName}}");
             else
             {
-                var {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}RawValue = {{{datatypeWithEnum}}}Converter.ToJsonValue({{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}}{{#isNullable}}.Value{{/isNullable}});
+                var {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}RawValue = {{{datatypeWithEnum}}}ValueConverter.ToJsonValue({{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}}{{#isNullable}}.Value{{/isNullable}});
                 {{#allowableValues}}
                 {{#enumVars}}
                 {{#-first}}
@@ -459,7 +459,7 @@
 
             {{/isNullable}}
             {{^isNullable}}
-            var {{#lambda.camelcase_param}}{{nameInCamelCase}}{{/lambda.camelcase_param}}RawValue = {{{datatypeWithEnum}}}Converter.ToJsonValue({{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}}{{#isNullable}}.Value{{/isNullable}});
+            var {{#lambda.camelcase_param}}{{nameInCamelCase}}{{/lambda.camelcase_param}}RawValue = {{{datatypeWithEnum}}}ValueConverter.ToJsonValue({{#lambda.camelcase_param}}{{classname}}{{/lambda.camelcase_param}}.{{name}}{{#isNullable}}.Value{{/isNullable}});
             {{#allowableValues}}
             {{#enumVars}}
             {{#-first}}
diff --git a/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache b/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache
index a35929db200..008501605bf 100644
--- a/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache
@@ -44,10 +44,9 @@
     {{#useGenericHost}}
 
     /// <summary>
-    /// A Json converter for type <see cref="{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}"/>
+    /// Converts <see cref="{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}"/> to and from the JSON value
     /// </summary>
-    /// <exception cref="NotImplementedException"></exception>
-    public class {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}Converter : JsonConverter<{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}>
+    public static class {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter
     {
         /// <summary>
         /// Parses a given value to <see cref="{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}"/>
@@ -105,7 +104,14 @@
             throw new NotImplementedException($"Value could not be handled: '{value}'");
             {{/isString}}
         }
+    }
 
+    /// <summary>
+    /// A Json converter for type <see cref="{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}JsonConverter : JsonConverter<{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}>
+    {
         /// <summary>
         /// Returns a {{datatypeWithEnum}} from the Json object
         /// </summary>
@@ -119,7 +125,7 @@
 
             {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = rawValue == null
                 ? null
-                : {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}Converter.FromStringOrDefault(rawValue);
+                : {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
@@ -142,7 +148,7 @@
     /// <summary>
     /// A Json converter for type <see cref="{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}"/>
     /// </summary>
-    public class {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}NullableConverter : JsonConverter<{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}?>
+    public class {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}NullableJsonConverter : JsonConverter<{{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}?>
     {
         /// <summary>
         /// Returns a {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} from the Json object
@@ -157,7 +163,7 @@
 
             {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}? result = rawValue == null
                 ? null
-                : {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}Converter.FromStringOrDefault(rawValue);
+                : {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}ValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs
index d76afebed11..b1d03210ec3 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ClientUtils.cs
@@ -140,7 +140,7 @@ namespace Org.OpenAPITools.Client
             if (obj is EnumArrays.JustSymbolEnum enumArraysJustSymbolEnum)
                 return EnumArrays.JustSymbolEnumToJsonValue(enumArraysJustSymbolEnum);
             if (obj is EnumClass enumClass)
-                return EnumClassConverter.ToJsonValue(enumClass);
+                return EnumClassValueConverter.ToJsonValue(enumClass);
             if (obj is EnumTest.EnumIntegerEnum enumTestEnumIntegerEnum)
                 return EnumTest.EnumIntegerEnumToJsonValue(enumTestEnumIntegerEnum).ToString();
             if (obj is EnumTest.EnumIntegerOnlyEnum enumTestEnumIntegerOnlyEnum)
@@ -156,24 +156,24 @@ namespace Org.OpenAPITools.Client
             if (obj is Order.StatusEnum orderStatusEnum)
                 return Order.StatusEnumToJsonValue(orderStatusEnum);
             if (obj is OuterEnum outerEnum)
-                return OuterEnumConverter.ToJsonValue(outerEnum);
+                return OuterEnumValueConverter.ToJsonValue(outerEnum);
             if (obj is OuterEnumDefaultValue outerEnumDefaultValue)
-                return OuterEnumDefaultValueConverter.ToJsonValue(outerEnumDefaultValue);
+                return OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue);
             if (obj is OuterEnumInteger outerEnumInteger)
-                return OuterEnumIntegerConverter.ToJsonValue(outerEnumInteger).ToString();
+                return OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString();
             if (obj is OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue)
-                return OuterEnumIntegerDefaultValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString();
+                return OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString();
             if (obj is Pet.StatusEnum petStatusEnum)
                 return Pet.StatusEnumToJsonValue(petStatusEnum);
             if (obj is Zebra.TypeEnum zebraTypeEnum)
                 return Zebra.TypeEnumToJsonValue(zebraTypeEnum);
             if (obj is ZeroBasedEnum zeroBasedEnum)
-                return ZeroBasedEnumConverter.ToJsonValue(zeroBasedEnum);
+                return ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum);
             if (obj is ZeroBasedEnumClass.ZeroBasedEnumEnum zeroBasedEnumClassZeroBasedEnumEnum)
                 return ZeroBasedEnumClass.ZeroBasedEnumEnumToJsonValue(zeroBasedEnumClassZeroBasedEnumEnum);
             if (obj is ICollection collection)
             {
-                List<string?> entries = new List<string?>();
+                List<string?> entries = new();
                 foreach (var entry in collection)
                     entries.Add(ParameterToString(entry));
                 return string.Join(",", entries);
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs
index 1226c8fe703..dfacddeb524 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs
@@ -67,8 +67,8 @@ namespace Org.OpenAPITools.Client
             _jsonOptions.Converters.Add(new DogJsonConverter());
             _jsonOptions.Converters.Add(new DrawingJsonConverter());
             _jsonOptions.Converters.Add(new EnumArraysJsonConverter());
-            _jsonOptions.Converters.Add(new EnumClassConverter());
-            _jsonOptions.Converters.Add(new EnumClassNullableConverter());
+            _jsonOptions.Converters.Add(new EnumClassJsonConverter());
+            _jsonOptions.Converters.Add(new EnumClassNullableJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestJsonConverter());
             _jsonOptions.Converters.Add(new EquilateralTriangleJsonConverter());
             _jsonOptions.Converters.Add(new FileJsonConverter());
@@ -99,14 +99,14 @@ namespace Org.OpenAPITools.Client
             _jsonOptions.Converters.Add(new OneOfStringJsonConverter());
             _jsonOptions.Converters.Add(new OrderJsonConverter());
             _jsonOptions.Converters.Add(new OuterCompositeJsonConverter());
-            _jsonOptions.Converters.Add(new OuterEnumConverter());
-            _jsonOptions.Converters.Add(new OuterEnumNullableConverter());
-            _jsonOptions.Converters.Add(new OuterEnumDefaultValueConverter());
-            _jsonOptions.Converters.Add(new OuterEnumDefaultValueNullableConverter());
-            _jsonOptions.Converters.Add(new OuterEnumIntegerConverter());
-            _jsonOptions.Converters.Add(new OuterEnumIntegerNullableConverter());
-            _jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueConverter());
-            _jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueNullableConverter());
+            _jsonOptions.Converters.Add(new OuterEnumJsonConverter());
+            _jsonOptions.Converters.Add(new OuterEnumNullableJsonConverter());
+            _jsonOptions.Converters.Add(new OuterEnumDefaultValueJsonConverter());
+            _jsonOptions.Converters.Add(new OuterEnumDefaultValueNullableJsonConverter());
+            _jsonOptions.Converters.Add(new OuterEnumIntegerJsonConverter());
+            _jsonOptions.Converters.Add(new OuterEnumIntegerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueJsonConverter());
+            _jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueNullableJsonConverter());
             _jsonOptions.Converters.Add(new ParentPetJsonConverter());
             _jsonOptions.Converters.Add(new PetJsonConverter());
             _jsonOptions.Converters.Add(new PigJsonConverter());
@@ -129,8 +129,8 @@ namespace Org.OpenAPITools.Client
             _jsonOptions.Converters.Add(new UserJsonConverter());
             _jsonOptions.Converters.Add(new WhaleJsonConverter());
             _jsonOptions.Converters.Add(new ZebraJsonConverter());
-            _jsonOptions.Converters.Add(new ZeroBasedEnumConverter());
-            _jsonOptions.Converters.Add(new ZeroBasedEnumNullableConverter());
+            _jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter());
+            _jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter());
             _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter());
             _services.AddSingleton(new JsonSerializerOptionsProvider(_jsonOptions));
             _services.AddSingleton<IApiFactory, ApiFactory>();
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumClass.cs
index f07389bdb3d..522a5579dd5 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumClass.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumClass.cs
@@ -47,10 +47,9 @@ namespace Org.OpenAPITools.Model
     }
 
     /// <summary>
-    /// A Json converter for type <see cref="EnumClass"/>
+    /// Converts <see cref="EnumClass"/> to and from the JSON value
     /// </summary>
-    /// <exception cref="NotImplementedException"></exception>
-    public class EnumClassConverter : JsonConverter<EnumClass>
+    public static class EnumClassValueConverter
     {
         /// <summary>
         /// Parses a given value to <see cref="EnumClass"/>
@@ -109,7 +108,14 @@ namespace Org.OpenAPITools.Model
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
+    }
 
+    /// <summary>
+    /// A Json converter for type <see cref="EnumClass"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class EnumClassJsonConverter : JsonConverter<EnumClass>
+    {
         /// <summary>
         /// Returns a  from the Json object
         /// </summary>
@@ -123,7 +129,7 @@ namespace Org.OpenAPITools.Model
 
             EnumClass? result = rawValue == null
                 ? null
-                : EnumClassConverter.FromStringOrDefault(rawValue);
+                : EnumClassValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
@@ -146,7 +152,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// A Json converter for type <see cref="EnumClass"/>
     /// </summary>
-    public class EnumClassNullableConverter : JsonConverter<EnumClass?>
+    public class EnumClassNullableJsonConverter : JsonConverter<EnumClass?>
     {
         /// <summary>
         /// Returns a EnumClass from the Json object
@@ -161,7 +167,7 @@ namespace Org.OpenAPITools.Model
 
             EnumClass? result = rawValue == null
                 ? null
-                : EnumClassConverter.FromStringOrDefault(rawValue);
+                : EnumClassValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs
index 22ec9b11e45..a1e71040b7c 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumTest.cs
@@ -571,25 +571,25 @@ namespace Org.OpenAPITools.Model
                             string? outerEnumDefaultValueRawValue = utf8JsonReader.GetString();
                             outerEnumDefaultValue = outerEnumDefaultValueRawValue == null
                                 ? null
-                                : OuterEnumDefaultValueConverter.FromStringOrDefault(outerEnumDefaultValueRawValue);
+                                : OuterEnumDefaultValueValueConverter.FromStringOrDefault(outerEnumDefaultValueRawValue);
                             break;
                         case "outerEnumInteger":
                             string? outerEnumIntegerRawValue = utf8JsonReader.GetString();
                             outerEnumInteger = outerEnumIntegerRawValue == null
                                 ? null
-                                : OuterEnumIntegerConverter.FromStringOrDefault(outerEnumIntegerRawValue);
+                                : OuterEnumIntegerValueConverter.FromStringOrDefault(outerEnumIntegerRawValue);
                             break;
                         case "outerEnumIntegerDefaultValue":
                             string? outerEnumIntegerDefaultValueRawValue = utf8JsonReader.GetString();
                             outerEnumIntegerDefaultValue = outerEnumIntegerDefaultValueRawValue == null
                                 ? null
-                                : OuterEnumIntegerDefaultValueConverter.FromStringOrDefault(outerEnumIntegerDefaultValueRawValue);
+                                : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(outerEnumIntegerDefaultValueRawValue);
                             break;
                         case "outerEnum":
                             string? outerEnumRawValue = utf8JsonReader.GetString();
                             outerEnum = outerEnumRawValue == null
                                 ? null
-                                : OuterEnumConverter.FromStringOrDefault(outerEnumRawValue);
+                                : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue);
                             break;
                         default:
                             break;
@@ -664,23 +664,23 @@ namespace Org.OpenAPITools.Model
             else
                 writer.WriteNull("enum_string_required");
 
-            var outerEnumDefaultValueRawValue = OuterEnumDefaultValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue);
+            var outerEnumDefaultValueRawValue = OuterEnumDefaultValueValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue);
 
             if (outerEnumDefaultValueRawValue != null)
                 writer.WriteString("outerEnumDefaultValue", outerEnumDefaultValueRawValue);
             else
                 writer.WriteNull("outerEnumDefaultValue");
 
-            var outerEnumIntegerRawValue = OuterEnumIntegerConverter.ToJsonValue(enumTest.OuterEnumInteger);
+            var outerEnumIntegerRawValue = OuterEnumIntegerValueConverter.ToJsonValue(enumTest.OuterEnumInteger);
             writer.WriteNumber("outerEnumInteger", outerEnumIntegerRawValue);
-            var outerEnumIntegerDefaultValueRawValue = OuterEnumIntegerDefaultValueConverter.ToJsonValue(enumTest.OuterEnumIntegerDefaultValue);
+            var outerEnumIntegerDefaultValueRawValue = OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(enumTest.OuterEnumIntegerDefaultValue);
             writer.WriteNumber("outerEnumIntegerDefaultValue", outerEnumIntegerDefaultValueRawValue);
 
             if (enumTest.OuterEnum == null)
                 writer.WriteNull("outerEnum");
             else
             {
-                var outerEnumRawValue = OuterEnumConverter.ToJsonValue(enumTest.OuterEnum.Value);
+                var outerEnumRawValue = OuterEnumValueConverter.ToJsonValue(enumTest.OuterEnum.Value);
                 if (outerEnumRawValue != null)
                     writer.WriteString("outerEnum", outerEnumRawValue);
                 else
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnum.cs
index 7d6e10dae6f..f5efc0e9a9f 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnum.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnum.cs
@@ -47,10 +47,9 @@ namespace Org.OpenAPITools.Model
     }
 
     /// <summary>
-    /// A Json converter for type <see cref="OuterEnum"/>
+    /// Converts <see cref="OuterEnum"/> to and from the JSON value
     /// </summary>
-    /// <exception cref="NotImplementedException"></exception>
-    public class OuterEnumConverter : JsonConverter<OuterEnum>
+    public static class OuterEnumValueConverter
     {
         /// <summary>
         /// Parses a given value to <see cref="OuterEnum"/>
@@ -109,7 +108,14 @@ namespace Org.OpenAPITools.Model
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
+    }
 
+    /// <summary>
+    /// A Json converter for type <see cref="OuterEnum"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class OuterEnumJsonConverter : JsonConverter<OuterEnum>
+    {
         /// <summary>
         /// Returns a  from the Json object
         /// </summary>
@@ -123,7 +129,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnum? result = rawValue == null
                 ? null
-                : OuterEnumConverter.FromStringOrDefault(rawValue);
+                : OuterEnumValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
@@ -146,7 +152,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// A Json converter for type <see cref="OuterEnum"/>
     /// </summary>
-    public class OuterEnumNullableConverter : JsonConverter<OuterEnum?>
+    public class OuterEnumNullableJsonConverter : JsonConverter<OuterEnum?>
     {
         /// <summary>
         /// Returns a OuterEnum from the Json object
@@ -161,7 +167,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnum? result = rawValue == null
                 ? null
-                : OuterEnumConverter.FromStringOrDefault(rawValue);
+                : OuterEnumValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
index 2e286d09411..bc268323f56 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
@@ -47,10 +47,9 @@ namespace Org.OpenAPITools.Model
     }
 
     /// <summary>
-    /// A Json converter for type <see cref="OuterEnumDefaultValue"/>
+    /// Converts <see cref="OuterEnumDefaultValue"/> to and from the JSON value
     /// </summary>
-    /// <exception cref="NotImplementedException"></exception>
-    public class OuterEnumDefaultValueConverter : JsonConverter<OuterEnumDefaultValue>
+    public static class OuterEnumDefaultValueValueConverter
     {
         /// <summary>
         /// Parses a given value to <see cref="OuterEnumDefaultValue"/>
@@ -109,7 +108,14 @@ namespace Org.OpenAPITools.Model
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
+    }
 
+    /// <summary>
+    /// A Json converter for type <see cref="OuterEnumDefaultValue"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class OuterEnumDefaultValueJsonConverter : JsonConverter<OuterEnumDefaultValue>
+    {
         /// <summary>
         /// Returns a  from the Json object
         /// </summary>
@@ -123,7 +129,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnumDefaultValue? result = rawValue == null
                 ? null
-                : OuterEnumDefaultValueConverter.FromStringOrDefault(rawValue);
+                : OuterEnumDefaultValueValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
@@ -146,7 +152,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// A Json converter for type <see cref="OuterEnumDefaultValue"/>
     /// </summary>
-    public class OuterEnumDefaultValueNullableConverter : JsonConverter<OuterEnumDefaultValue?>
+    public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter<OuterEnumDefaultValue?>
     {
         /// <summary>
         /// Returns a OuterEnumDefaultValue from the Json object
@@ -161,7 +167,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnumDefaultValue? result = rawValue == null
                 ? null
-                : OuterEnumDefaultValueConverter.FromStringOrDefault(rawValue);
+                : OuterEnumDefaultValueValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
index 8168cde3e82..33330bfdd59 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
@@ -47,10 +47,9 @@ namespace Org.OpenAPITools.Model
     }
 
     /// <summary>
-    /// A Json converter for type <see cref="OuterEnumInteger"/>
+    /// Converts <see cref="OuterEnumInteger"/> to and from the JSON value
     /// </summary>
-    /// <exception cref="NotImplementedException"></exception>
-    public class OuterEnumIntegerConverter : JsonConverter<OuterEnumInteger>
+    public static class OuterEnumIntegerValueConverter
     {
         /// <summary>
         /// Parses a given value to <see cref="OuterEnumInteger"/>
@@ -100,7 +99,14 @@ namespace Org.OpenAPITools.Model
         {
             return (int) value;
         }
+    }
 
+    /// <summary>
+    /// A Json converter for type <see cref="OuterEnumInteger"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class OuterEnumIntegerJsonConverter : JsonConverter<OuterEnumInteger>
+    {
         /// <summary>
         /// Returns a  from the Json object
         /// </summary>
@@ -114,7 +120,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnumInteger? result = rawValue == null
                 ? null
-                : OuterEnumIntegerConverter.FromStringOrDefault(rawValue);
+                : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
@@ -137,7 +143,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// A Json converter for type <see cref="OuterEnumInteger"/>
     /// </summary>
-    public class OuterEnumIntegerNullableConverter : JsonConverter<OuterEnumInteger?>
+    public class OuterEnumIntegerNullableJsonConverter : JsonConverter<OuterEnumInteger?>
     {
         /// <summary>
         /// Returns a OuterEnumInteger from the Json object
@@ -152,7 +158,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnumInteger? result = rawValue == null
                 ? null
-                : OuterEnumIntegerConverter.FromStringOrDefault(rawValue);
+                : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
index 07b23280e1a..ba800f1cdf0 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
@@ -47,10 +47,9 @@ namespace Org.OpenAPITools.Model
     }
 
     /// <summary>
-    /// A Json converter for type <see cref="OuterEnumIntegerDefaultValue"/>
+    /// Converts <see cref="OuterEnumIntegerDefaultValue"/> to and from the JSON value
     /// </summary>
-    /// <exception cref="NotImplementedException"></exception>
-    public class OuterEnumIntegerDefaultValueConverter : JsonConverter<OuterEnumIntegerDefaultValue>
+    public static class OuterEnumIntegerDefaultValueValueConverter
     {
         /// <summary>
         /// Parses a given value to <see cref="OuterEnumIntegerDefaultValue"/>
@@ -100,7 +99,14 @@ namespace Org.OpenAPITools.Model
         {
             return (int) value;
         }
+    }
 
+    /// <summary>
+    /// A Json converter for type <see cref="OuterEnumIntegerDefaultValue"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter<OuterEnumIntegerDefaultValue>
+    {
         /// <summary>
         /// Returns a  from the Json object
         /// </summary>
@@ -114,7 +120,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnumIntegerDefaultValue? result = rawValue == null
                 ? null
-                : OuterEnumIntegerDefaultValueConverter.FromStringOrDefault(rawValue);
+                : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
@@ -137,7 +143,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// A Json converter for type <see cref="OuterEnumIntegerDefaultValue"/>
     /// </summary>
-    public class OuterEnumIntegerDefaultValueNullableConverter : JsonConverter<OuterEnumIntegerDefaultValue?>
+    public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter<OuterEnumIntegerDefaultValue?>
     {
         /// <summary>
         /// Returns a OuterEnumIntegerDefaultValue from the Json object
@@ -152,7 +158,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnumIntegerDefaultValue? result = rawValue == null
                 ? null
-                : OuterEnumIntegerDefaultValueConverter.FromStringOrDefault(rawValue);
+                : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs
index 723324ed099..94eb882e1ff 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs
@@ -42,10 +42,9 @@ namespace Org.OpenAPITools.Model
     }
 
     /// <summary>
-    /// A Json converter for type <see cref="ZeroBasedEnum"/>
+    /// Converts <see cref="ZeroBasedEnum"/> to and from the JSON value
     /// </summary>
-    /// <exception cref="NotImplementedException"></exception>
-    public class ZeroBasedEnumConverter : JsonConverter<ZeroBasedEnum>
+    public static class ZeroBasedEnumValueConverter
     {
         /// <summary>
         /// Parses a given value to <see cref="ZeroBasedEnum"/>
@@ -95,7 +94,14 @@ namespace Org.OpenAPITools.Model
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
+    }
 
+    /// <summary>
+    /// A Json converter for type <see cref="ZeroBasedEnum"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class ZeroBasedEnumJsonConverter : JsonConverter<ZeroBasedEnum>
+    {
         /// <summary>
         /// Returns a  from the Json object
         /// </summary>
@@ -109,7 +115,7 @@ namespace Org.OpenAPITools.Model
 
             ZeroBasedEnum? result = rawValue == null
                 ? null
-                : ZeroBasedEnumConverter.FromStringOrDefault(rawValue);
+                : ZeroBasedEnumValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
@@ -132,7 +138,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// A Json converter for type <see cref="ZeroBasedEnum"/>
     /// </summary>
-    public class ZeroBasedEnumNullableConverter : JsonConverter<ZeroBasedEnum?>
+    public class ZeroBasedEnumNullableJsonConverter : JsonConverter<ZeroBasedEnum?>
     {
         /// <summary>
         /// Returns a ZeroBasedEnum from the Json object
@@ -147,7 +153,7 @@ namespace Org.OpenAPITools.Model
 
             ZeroBasedEnum? result = rawValue == null
                 ? null
-                : ZeroBasedEnumConverter.FromStringOrDefault(rawValue);
+                : ZeroBasedEnumValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs
index b09cb7f69ec..4e4e5299218 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ClientUtils.cs
@@ -138,7 +138,7 @@ namespace Org.OpenAPITools.Client
             if (obj is EnumArrays.JustSymbolEnum enumArraysJustSymbolEnum)
                 return EnumArrays.JustSymbolEnumToJsonValue(enumArraysJustSymbolEnum);
             if (obj is EnumClass enumClass)
-                return EnumClassConverter.ToJsonValue(enumClass);
+                return EnumClassValueConverter.ToJsonValue(enumClass);
             if (obj is EnumTest.EnumIntegerEnum enumTestEnumIntegerEnum)
                 return EnumTest.EnumIntegerEnumToJsonValue(enumTestEnumIntegerEnum).ToString();
             if (obj is EnumTest.EnumIntegerOnlyEnum enumTestEnumIntegerOnlyEnum)
@@ -154,24 +154,24 @@ namespace Org.OpenAPITools.Client
             if (obj is Order.StatusEnum orderStatusEnum)
                 return Order.StatusEnumToJsonValue(orderStatusEnum);
             if (obj is OuterEnum outerEnum)
-                return OuterEnumConverter.ToJsonValue(outerEnum);
+                return OuterEnumValueConverter.ToJsonValue(outerEnum);
             if (obj is OuterEnumDefaultValue outerEnumDefaultValue)
-                return OuterEnumDefaultValueConverter.ToJsonValue(outerEnumDefaultValue);
+                return OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue);
             if (obj is OuterEnumInteger outerEnumInteger)
-                return OuterEnumIntegerConverter.ToJsonValue(outerEnumInteger).ToString();
+                return OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString();
             if (obj is OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue)
-                return OuterEnumIntegerDefaultValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString();
+                return OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString();
             if (obj is Pet.StatusEnum petStatusEnum)
                 return Pet.StatusEnumToJsonValue(petStatusEnum);
             if (obj is Zebra.TypeEnum zebraTypeEnum)
                 return Zebra.TypeEnumToJsonValue(zebraTypeEnum);
             if (obj is ZeroBasedEnum zeroBasedEnum)
-                return ZeroBasedEnumConverter.ToJsonValue(zeroBasedEnum);
+                return ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum);
             if (obj is ZeroBasedEnumClass.ZeroBasedEnumEnum zeroBasedEnumClassZeroBasedEnumEnum)
                 return ZeroBasedEnumClass.ZeroBasedEnumEnumToJsonValue(zeroBasedEnumClassZeroBasedEnumEnum);
             if (obj is ICollection collection)
             {
-                List<string> entries = new List<string>();
+                List<string> entries = new();
                 foreach (var entry in collection)
                     entries.Add(ParameterToString(entry));
                 return string.Join(",", entries);
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs
index b0c50613552..b80c081a3d0 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs
@@ -65,8 +65,8 @@ namespace Org.OpenAPITools.Client
             _jsonOptions.Converters.Add(new DogJsonConverter());
             _jsonOptions.Converters.Add(new DrawingJsonConverter());
             _jsonOptions.Converters.Add(new EnumArraysJsonConverter());
-            _jsonOptions.Converters.Add(new EnumClassConverter());
-            _jsonOptions.Converters.Add(new EnumClassNullableConverter());
+            _jsonOptions.Converters.Add(new EnumClassJsonConverter());
+            _jsonOptions.Converters.Add(new EnumClassNullableJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestJsonConverter());
             _jsonOptions.Converters.Add(new EquilateralTriangleJsonConverter());
             _jsonOptions.Converters.Add(new FileJsonConverter());
@@ -97,14 +97,14 @@ namespace Org.OpenAPITools.Client
             _jsonOptions.Converters.Add(new OneOfStringJsonConverter());
             _jsonOptions.Converters.Add(new OrderJsonConverter());
             _jsonOptions.Converters.Add(new OuterCompositeJsonConverter());
-            _jsonOptions.Converters.Add(new OuterEnumConverter());
-            _jsonOptions.Converters.Add(new OuterEnumNullableConverter());
-            _jsonOptions.Converters.Add(new OuterEnumDefaultValueConverter());
-            _jsonOptions.Converters.Add(new OuterEnumDefaultValueNullableConverter());
-            _jsonOptions.Converters.Add(new OuterEnumIntegerConverter());
-            _jsonOptions.Converters.Add(new OuterEnumIntegerNullableConverter());
-            _jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueConverter());
-            _jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueNullableConverter());
+            _jsonOptions.Converters.Add(new OuterEnumJsonConverter());
+            _jsonOptions.Converters.Add(new OuterEnumNullableJsonConverter());
+            _jsonOptions.Converters.Add(new OuterEnumDefaultValueJsonConverter());
+            _jsonOptions.Converters.Add(new OuterEnumDefaultValueNullableJsonConverter());
+            _jsonOptions.Converters.Add(new OuterEnumIntegerJsonConverter());
+            _jsonOptions.Converters.Add(new OuterEnumIntegerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueJsonConverter());
+            _jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueNullableJsonConverter());
             _jsonOptions.Converters.Add(new ParentPetJsonConverter());
             _jsonOptions.Converters.Add(new PetJsonConverter());
             _jsonOptions.Converters.Add(new PigJsonConverter());
@@ -127,8 +127,8 @@ namespace Org.OpenAPITools.Client
             _jsonOptions.Converters.Add(new UserJsonConverter());
             _jsonOptions.Converters.Add(new WhaleJsonConverter());
             _jsonOptions.Converters.Add(new ZebraJsonConverter());
-            _jsonOptions.Converters.Add(new ZeroBasedEnumConverter());
-            _jsonOptions.Converters.Add(new ZeroBasedEnumNullableConverter());
+            _jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter());
+            _jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter());
             _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter());
             _services.AddSingleton(new JsonSerializerOptionsProvider(_jsonOptions));
             _services.AddSingleton<IApiFactory, ApiFactory>();
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumClass.cs
index 50f5c29330c..1a6d4730213 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumClass.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumClass.cs
@@ -45,10 +45,9 @@ namespace Org.OpenAPITools.Model
     }
 
     /// <summary>
-    /// A Json converter for type <see cref="EnumClass"/>
+    /// Converts <see cref="EnumClass"/> to and from the JSON value
     /// </summary>
-    /// <exception cref="NotImplementedException"></exception>
-    public class EnumClassConverter : JsonConverter<EnumClass>
+    public static class EnumClassValueConverter
     {
         /// <summary>
         /// Parses a given value to <see cref="EnumClass"/>
@@ -107,7 +106,14 @@ namespace Org.OpenAPITools.Model
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
+    }
 
+    /// <summary>
+    /// A Json converter for type <see cref="EnumClass"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class EnumClassJsonConverter : JsonConverter<EnumClass>
+    {
         /// <summary>
         /// Returns a  from the Json object
         /// </summary>
@@ -121,7 +127,7 @@ namespace Org.OpenAPITools.Model
 
             EnumClass? result = rawValue == null
                 ? null
-                : EnumClassConverter.FromStringOrDefault(rawValue);
+                : EnumClassValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
@@ -144,7 +150,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// A Json converter for type <see cref="EnumClass"/>
     /// </summary>
-    public class EnumClassNullableConverter : JsonConverter<EnumClass?>
+    public class EnumClassNullableJsonConverter : JsonConverter<EnumClass?>
     {
         /// <summary>
         /// Returns a EnumClass from the Json object
@@ -159,7 +165,7 @@ namespace Org.OpenAPITools.Model
 
             EnumClass? result = rawValue == null
                 ? null
-                : EnumClassConverter.FromStringOrDefault(rawValue);
+                : EnumClassValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs
index 17b9b5e0c14..540115e3d72 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumTest.cs
@@ -569,25 +569,25 @@ namespace Org.OpenAPITools.Model
                             string outerEnumDefaultValueRawValue = utf8JsonReader.GetString();
                             outerEnumDefaultValue = outerEnumDefaultValueRawValue == null
                                 ? null
-                                : OuterEnumDefaultValueConverter.FromStringOrDefault(outerEnumDefaultValueRawValue);
+                                : OuterEnumDefaultValueValueConverter.FromStringOrDefault(outerEnumDefaultValueRawValue);
                             break;
                         case "outerEnumInteger":
                             string outerEnumIntegerRawValue = utf8JsonReader.GetString();
                             outerEnumInteger = outerEnumIntegerRawValue == null
                                 ? null
-                                : OuterEnumIntegerConverter.FromStringOrDefault(outerEnumIntegerRawValue);
+                                : OuterEnumIntegerValueConverter.FromStringOrDefault(outerEnumIntegerRawValue);
                             break;
                         case "outerEnumIntegerDefaultValue":
                             string outerEnumIntegerDefaultValueRawValue = utf8JsonReader.GetString();
                             outerEnumIntegerDefaultValue = outerEnumIntegerDefaultValueRawValue == null
                                 ? null
-                                : OuterEnumIntegerDefaultValueConverter.FromStringOrDefault(outerEnumIntegerDefaultValueRawValue);
+                                : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(outerEnumIntegerDefaultValueRawValue);
                             break;
                         case "outerEnum":
                             string outerEnumRawValue = utf8JsonReader.GetString();
                             outerEnum = outerEnumRawValue == null
                                 ? null
-                                : OuterEnumConverter.FromStringOrDefault(outerEnumRawValue);
+                                : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue);
                             break;
                         default:
                             break;
@@ -662,23 +662,23 @@ namespace Org.OpenAPITools.Model
             else
                 writer.WriteNull("enum_string_required");
 
-            var outerEnumDefaultValueRawValue = OuterEnumDefaultValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue);
+            var outerEnumDefaultValueRawValue = OuterEnumDefaultValueValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue);
 
             if (outerEnumDefaultValueRawValue != null)
                 writer.WriteString("outerEnumDefaultValue", outerEnumDefaultValueRawValue);
             else
                 writer.WriteNull("outerEnumDefaultValue");
 
-            var outerEnumIntegerRawValue = OuterEnumIntegerConverter.ToJsonValue(enumTest.OuterEnumInteger);
+            var outerEnumIntegerRawValue = OuterEnumIntegerValueConverter.ToJsonValue(enumTest.OuterEnumInteger);
             writer.WriteNumber("outerEnumInteger", outerEnumIntegerRawValue);
-            var outerEnumIntegerDefaultValueRawValue = OuterEnumIntegerDefaultValueConverter.ToJsonValue(enumTest.OuterEnumIntegerDefaultValue);
+            var outerEnumIntegerDefaultValueRawValue = OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(enumTest.OuterEnumIntegerDefaultValue);
             writer.WriteNumber("outerEnumIntegerDefaultValue", outerEnumIntegerDefaultValueRawValue);
 
             if (enumTest.OuterEnum == null)
                 writer.WriteNull("outerEnum");
             else
             {
-                var outerEnumRawValue = OuterEnumConverter.ToJsonValue(enumTest.OuterEnum.Value);
+                var outerEnumRawValue = OuterEnumValueConverter.ToJsonValue(enumTest.OuterEnum.Value);
                 if (outerEnumRawValue != null)
                     writer.WriteString("outerEnum", outerEnumRawValue);
                 else
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnum.cs
index c733cf74912..087b2078df5 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnum.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnum.cs
@@ -45,10 +45,9 @@ namespace Org.OpenAPITools.Model
     }
 
     /// <summary>
-    /// A Json converter for type <see cref="OuterEnum"/>
+    /// Converts <see cref="OuterEnum"/> to and from the JSON value
     /// </summary>
-    /// <exception cref="NotImplementedException"></exception>
-    public class OuterEnumConverter : JsonConverter<OuterEnum>
+    public static class OuterEnumValueConverter
     {
         /// <summary>
         /// Parses a given value to <see cref="OuterEnum"/>
@@ -107,7 +106,14 @@ namespace Org.OpenAPITools.Model
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
+    }
 
+    /// <summary>
+    /// A Json converter for type <see cref="OuterEnum"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class OuterEnumJsonConverter : JsonConverter<OuterEnum>
+    {
         /// <summary>
         /// Returns a  from the Json object
         /// </summary>
@@ -121,7 +127,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnum? result = rawValue == null
                 ? null
-                : OuterEnumConverter.FromStringOrDefault(rawValue);
+                : OuterEnumValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
@@ -144,7 +150,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// A Json converter for type <see cref="OuterEnum"/>
     /// </summary>
-    public class OuterEnumNullableConverter : JsonConverter<OuterEnum?>
+    public class OuterEnumNullableJsonConverter : JsonConverter<OuterEnum?>
     {
         /// <summary>
         /// Returns a OuterEnum from the Json object
@@ -159,7 +165,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnum? result = rawValue == null
                 ? null
-                : OuterEnumConverter.FromStringOrDefault(rawValue);
+                : OuterEnumValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
index b5a7bdc6666..262e946c71d 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
@@ -45,10 +45,9 @@ namespace Org.OpenAPITools.Model
     }
 
     /// <summary>
-    /// A Json converter for type <see cref="OuterEnumDefaultValue"/>
+    /// Converts <see cref="OuterEnumDefaultValue"/> to and from the JSON value
     /// </summary>
-    /// <exception cref="NotImplementedException"></exception>
-    public class OuterEnumDefaultValueConverter : JsonConverter<OuterEnumDefaultValue>
+    public static class OuterEnumDefaultValueValueConverter
     {
         /// <summary>
         /// Parses a given value to <see cref="OuterEnumDefaultValue"/>
@@ -107,7 +106,14 @@ namespace Org.OpenAPITools.Model
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
+    }
 
+    /// <summary>
+    /// A Json converter for type <see cref="OuterEnumDefaultValue"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class OuterEnumDefaultValueJsonConverter : JsonConverter<OuterEnumDefaultValue>
+    {
         /// <summary>
         /// Returns a  from the Json object
         /// </summary>
@@ -121,7 +127,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnumDefaultValue? result = rawValue == null
                 ? null
-                : OuterEnumDefaultValueConverter.FromStringOrDefault(rawValue);
+                : OuterEnumDefaultValueValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
@@ -144,7 +150,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// A Json converter for type <see cref="OuterEnumDefaultValue"/>
     /// </summary>
-    public class OuterEnumDefaultValueNullableConverter : JsonConverter<OuterEnumDefaultValue?>
+    public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter<OuterEnumDefaultValue?>
     {
         /// <summary>
         /// Returns a OuterEnumDefaultValue from the Json object
@@ -159,7 +165,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnumDefaultValue? result = rawValue == null
                 ? null
-                : OuterEnumDefaultValueConverter.FromStringOrDefault(rawValue);
+                : OuterEnumDefaultValueValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
index ec056b1540c..9802a655e29 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
@@ -45,10 +45,9 @@ namespace Org.OpenAPITools.Model
     }
 
     /// <summary>
-    /// A Json converter for type <see cref="OuterEnumInteger"/>
+    /// Converts <see cref="OuterEnumInteger"/> to and from the JSON value
     /// </summary>
-    /// <exception cref="NotImplementedException"></exception>
-    public class OuterEnumIntegerConverter : JsonConverter<OuterEnumInteger>
+    public static class OuterEnumIntegerValueConverter
     {
         /// <summary>
         /// Parses a given value to <see cref="OuterEnumInteger"/>
@@ -98,7 +97,14 @@ namespace Org.OpenAPITools.Model
         {
             return (int) value;
         }
+    }
 
+    /// <summary>
+    /// A Json converter for type <see cref="OuterEnumInteger"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class OuterEnumIntegerJsonConverter : JsonConverter<OuterEnumInteger>
+    {
         /// <summary>
         /// Returns a  from the Json object
         /// </summary>
@@ -112,7 +118,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnumInteger? result = rawValue == null
                 ? null
-                : OuterEnumIntegerConverter.FromStringOrDefault(rawValue);
+                : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
@@ -135,7 +141,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// A Json converter for type <see cref="OuterEnumInteger"/>
     /// </summary>
-    public class OuterEnumIntegerNullableConverter : JsonConverter<OuterEnumInteger?>
+    public class OuterEnumIntegerNullableJsonConverter : JsonConverter<OuterEnumInteger?>
     {
         /// <summary>
         /// Returns a OuterEnumInteger from the Json object
@@ -150,7 +156,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnumInteger? result = rawValue == null
                 ? null
-                : OuterEnumIntegerConverter.FromStringOrDefault(rawValue);
+                : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
index 1d65e53c50d..dbdab20752e 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
@@ -45,10 +45,9 @@ namespace Org.OpenAPITools.Model
     }
 
     /// <summary>
-    /// A Json converter for type <see cref="OuterEnumIntegerDefaultValue"/>
+    /// Converts <see cref="OuterEnumIntegerDefaultValue"/> to and from the JSON value
     /// </summary>
-    /// <exception cref="NotImplementedException"></exception>
-    public class OuterEnumIntegerDefaultValueConverter : JsonConverter<OuterEnumIntegerDefaultValue>
+    public static class OuterEnumIntegerDefaultValueValueConverter
     {
         /// <summary>
         /// Parses a given value to <see cref="OuterEnumIntegerDefaultValue"/>
@@ -98,7 +97,14 @@ namespace Org.OpenAPITools.Model
         {
             return (int) value;
         }
+    }
 
+    /// <summary>
+    /// A Json converter for type <see cref="OuterEnumIntegerDefaultValue"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter<OuterEnumIntegerDefaultValue>
+    {
         /// <summary>
         /// Returns a  from the Json object
         /// </summary>
@@ -112,7 +118,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnumIntegerDefaultValue? result = rawValue == null
                 ? null
-                : OuterEnumIntegerDefaultValueConverter.FromStringOrDefault(rawValue);
+                : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
@@ -135,7 +141,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// A Json converter for type <see cref="OuterEnumIntegerDefaultValue"/>
     /// </summary>
-    public class OuterEnumIntegerDefaultValueNullableConverter : JsonConverter<OuterEnumIntegerDefaultValue?>
+    public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter<OuterEnumIntegerDefaultValue?>
     {
         /// <summary>
         /// Returns a OuterEnumIntegerDefaultValue from the Json object
@@ -150,7 +156,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnumIntegerDefaultValue? result = rawValue == null
                 ? null
-                : OuterEnumIntegerDefaultValueConverter.FromStringOrDefault(rawValue);
+                : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs
index b1da861265b..969ca3f3fcb 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs
@@ -40,10 +40,9 @@ namespace Org.OpenAPITools.Model
     }
 
     /// <summary>
-    /// A Json converter for type <see cref="ZeroBasedEnum"/>
+    /// Converts <see cref="ZeroBasedEnum"/> to and from the JSON value
     /// </summary>
-    /// <exception cref="NotImplementedException"></exception>
-    public class ZeroBasedEnumConverter : JsonConverter<ZeroBasedEnum>
+    public static class ZeroBasedEnumValueConverter
     {
         /// <summary>
         /// Parses a given value to <see cref="ZeroBasedEnum"/>
@@ -93,7 +92,14 @@ namespace Org.OpenAPITools.Model
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
+    }
 
+    /// <summary>
+    /// A Json converter for type <see cref="ZeroBasedEnum"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class ZeroBasedEnumJsonConverter : JsonConverter<ZeroBasedEnum>
+    {
         /// <summary>
         /// Returns a  from the Json object
         /// </summary>
@@ -107,7 +113,7 @@ namespace Org.OpenAPITools.Model
 
             ZeroBasedEnum? result = rawValue == null
                 ? null
-                : ZeroBasedEnumConverter.FromStringOrDefault(rawValue);
+                : ZeroBasedEnumValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
@@ -130,7 +136,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// A Json converter for type <see cref="ZeroBasedEnum"/>
     /// </summary>
-    public class ZeroBasedEnumNullableConverter : JsonConverter<ZeroBasedEnum?>
+    public class ZeroBasedEnumNullableJsonConverter : JsonConverter<ZeroBasedEnum?>
     {
         /// <summary>
         /// Returns a ZeroBasedEnum from the Json object
@@ -145,7 +151,7 @@ namespace Org.OpenAPITools.Model
 
             ZeroBasedEnum? result = rawValue == null
                 ? null
-                : ZeroBasedEnumConverter.FromStringOrDefault(rawValue);
+                : ZeroBasedEnumValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ClientUtils.cs
index 083d9d9ea80..3daae4eb0bc 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ClientUtils.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ClientUtils.cs
@@ -135,7 +135,7 @@ namespace Org.OpenAPITools.Client
                     : "false";
             if (obj is ICollection collection)
             {
-                List<string?> entries = new List<string?>();
+                List<string?> entries = new();
                 foreach (var entry in collection)
                     entries.Add(ParameterToString(entry));
                 return string.Join(",", entries);
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ClientUtils.cs
index 8908d5c5d96..9cd19d4cc3a 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ClientUtils.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ClientUtils.cs
@@ -135,7 +135,7 @@ namespace Org.OpenAPITools.Client
                     : "false";
             if (obj is ICollection collection)
             {
-                List<string?> entries = new List<string?>();
+                List<string?> entries = new();
                 foreach (var entry in collection)
                     entries.Add(ParameterToString(entry));
                 return string.Join(",", entries);
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs
index 8908d5c5d96..9cd19d4cc3a 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ClientUtils.cs
@@ -135,7 +135,7 @@ namespace Org.OpenAPITools.Client
                     : "false";
             if (obj is ICollection collection)
             {
-                List<string?> entries = new List<string?>();
+                List<string?> entries = new();
                 foreach (var entry in collection)
                     entries.Add(ParameterToString(entry));
                 return string.Join(",", entries);
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs
index 5e1beb8d054..c77116c3c68 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ClientUtils.cs
@@ -138,7 +138,7 @@ namespace Org.OpenAPITools.Client
             if (obj is EnumArrays.JustSymbolEnum enumArraysJustSymbolEnum)
                 return EnumArrays.JustSymbolEnumToJsonValue(enumArraysJustSymbolEnum);
             if (obj is EnumClass enumClass)
-                return EnumClassConverter.ToJsonValue(enumClass);
+                return EnumClassValueConverter.ToJsonValue(enumClass);
             if (obj is EnumTest.EnumIntegerEnum enumTestEnumIntegerEnum)
                 return EnumTest.EnumIntegerEnumToJsonValue(enumTestEnumIntegerEnum).ToString();
             if (obj is EnumTest.EnumIntegerOnlyEnum enumTestEnumIntegerOnlyEnum)
@@ -154,19 +154,19 @@ namespace Org.OpenAPITools.Client
             if (obj is Order.StatusEnum orderStatusEnum)
                 return Order.StatusEnumToJsonValue(orderStatusEnum);
             if (obj is OuterEnum outerEnum)
-                return OuterEnumConverter.ToJsonValue(outerEnum);
+                return OuterEnumValueConverter.ToJsonValue(outerEnum);
             if (obj is OuterEnumDefaultValue outerEnumDefaultValue)
-                return OuterEnumDefaultValueConverter.ToJsonValue(outerEnumDefaultValue);
+                return OuterEnumDefaultValueValueConverter.ToJsonValue(outerEnumDefaultValue);
             if (obj is OuterEnumInteger outerEnumInteger)
-                return OuterEnumIntegerConverter.ToJsonValue(outerEnumInteger).ToString();
+                return OuterEnumIntegerValueConverter.ToJsonValue(outerEnumInteger).ToString();
             if (obj is OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue)
-                return OuterEnumIntegerDefaultValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString();
+                return OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(outerEnumIntegerDefaultValue).ToString();
             if (obj is Pet.StatusEnum petStatusEnum)
                 return Pet.StatusEnumToJsonValue(petStatusEnum);
             if (obj is Zebra.TypeEnum zebraTypeEnum)
                 return Zebra.TypeEnumToJsonValue(zebraTypeEnum);
             if (obj is ZeroBasedEnum zeroBasedEnum)
-                return ZeroBasedEnumConverter.ToJsonValue(zeroBasedEnum);
+                return ZeroBasedEnumValueConverter.ToJsonValue(zeroBasedEnum);
             if (obj is ZeroBasedEnumClass.ZeroBasedEnumEnum zeroBasedEnumClassZeroBasedEnumEnum)
                 return ZeroBasedEnumClass.ZeroBasedEnumEnumToJsonValue(zeroBasedEnumClassZeroBasedEnumEnum);
             if (obj is ICollection collection)
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs
index b0c50613552..b80c081a3d0 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs
@@ -65,8 +65,8 @@ namespace Org.OpenAPITools.Client
             _jsonOptions.Converters.Add(new DogJsonConverter());
             _jsonOptions.Converters.Add(new DrawingJsonConverter());
             _jsonOptions.Converters.Add(new EnumArraysJsonConverter());
-            _jsonOptions.Converters.Add(new EnumClassConverter());
-            _jsonOptions.Converters.Add(new EnumClassNullableConverter());
+            _jsonOptions.Converters.Add(new EnumClassJsonConverter());
+            _jsonOptions.Converters.Add(new EnumClassNullableJsonConverter());
             _jsonOptions.Converters.Add(new EnumTestJsonConverter());
             _jsonOptions.Converters.Add(new EquilateralTriangleJsonConverter());
             _jsonOptions.Converters.Add(new FileJsonConverter());
@@ -97,14 +97,14 @@ namespace Org.OpenAPITools.Client
             _jsonOptions.Converters.Add(new OneOfStringJsonConverter());
             _jsonOptions.Converters.Add(new OrderJsonConverter());
             _jsonOptions.Converters.Add(new OuterCompositeJsonConverter());
-            _jsonOptions.Converters.Add(new OuterEnumConverter());
-            _jsonOptions.Converters.Add(new OuterEnumNullableConverter());
-            _jsonOptions.Converters.Add(new OuterEnumDefaultValueConverter());
-            _jsonOptions.Converters.Add(new OuterEnumDefaultValueNullableConverter());
-            _jsonOptions.Converters.Add(new OuterEnumIntegerConverter());
-            _jsonOptions.Converters.Add(new OuterEnumIntegerNullableConverter());
-            _jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueConverter());
-            _jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueNullableConverter());
+            _jsonOptions.Converters.Add(new OuterEnumJsonConverter());
+            _jsonOptions.Converters.Add(new OuterEnumNullableJsonConverter());
+            _jsonOptions.Converters.Add(new OuterEnumDefaultValueJsonConverter());
+            _jsonOptions.Converters.Add(new OuterEnumDefaultValueNullableJsonConverter());
+            _jsonOptions.Converters.Add(new OuterEnumIntegerJsonConverter());
+            _jsonOptions.Converters.Add(new OuterEnumIntegerNullableJsonConverter());
+            _jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueJsonConverter());
+            _jsonOptions.Converters.Add(new OuterEnumIntegerDefaultValueNullableJsonConverter());
             _jsonOptions.Converters.Add(new ParentPetJsonConverter());
             _jsonOptions.Converters.Add(new PetJsonConverter());
             _jsonOptions.Converters.Add(new PigJsonConverter());
@@ -127,8 +127,8 @@ namespace Org.OpenAPITools.Client
             _jsonOptions.Converters.Add(new UserJsonConverter());
             _jsonOptions.Converters.Add(new WhaleJsonConverter());
             _jsonOptions.Converters.Add(new ZebraJsonConverter());
-            _jsonOptions.Converters.Add(new ZeroBasedEnumConverter());
-            _jsonOptions.Converters.Add(new ZeroBasedEnumNullableConverter());
+            _jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter());
+            _jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter());
             _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter());
             _services.AddSingleton(new JsonSerializerOptionsProvider(_jsonOptions));
             _services.AddSingleton<IApiFactory, ApiFactory>();
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumClass.cs
index 50f5c29330c..1a6d4730213 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumClass.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumClass.cs
@@ -45,10 +45,9 @@ namespace Org.OpenAPITools.Model
     }
 
     /// <summary>
-    /// A Json converter for type <see cref="EnumClass"/>
+    /// Converts <see cref="EnumClass"/> to and from the JSON value
     /// </summary>
-    /// <exception cref="NotImplementedException"></exception>
-    public class EnumClassConverter : JsonConverter<EnumClass>
+    public static class EnumClassValueConverter
     {
         /// <summary>
         /// Parses a given value to <see cref="EnumClass"/>
@@ -107,7 +106,14 @@ namespace Org.OpenAPITools.Model
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
+    }
 
+    /// <summary>
+    /// A Json converter for type <see cref="EnumClass"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class EnumClassJsonConverter : JsonConverter<EnumClass>
+    {
         /// <summary>
         /// Returns a  from the Json object
         /// </summary>
@@ -121,7 +127,7 @@ namespace Org.OpenAPITools.Model
 
             EnumClass? result = rawValue == null
                 ? null
-                : EnumClassConverter.FromStringOrDefault(rawValue);
+                : EnumClassValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
@@ -144,7 +150,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// A Json converter for type <see cref="EnumClass"/>
     /// </summary>
-    public class EnumClassNullableConverter : JsonConverter<EnumClass?>
+    public class EnumClassNullableJsonConverter : JsonConverter<EnumClass?>
     {
         /// <summary>
         /// Returns a EnumClass from the Json object
@@ -159,7 +165,7 @@ namespace Org.OpenAPITools.Model
 
             EnumClass? result = rawValue == null
                 ? null
-                : EnumClassConverter.FromStringOrDefault(rawValue);
+                : EnumClassValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs
index 17b9b5e0c14..540115e3d72 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumTest.cs
@@ -569,25 +569,25 @@ namespace Org.OpenAPITools.Model
                             string outerEnumDefaultValueRawValue = utf8JsonReader.GetString();
                             outerEnumDefaultValue = outerEnumDefaultValueRawValue == null
                                 ? null
-                                : OuterEnumDefaultValueConverter.FromStringOrDefault(outerEnumDefaultValueRawValue);
+                                : OuterEnumDefaultValueValueConverter.FromStringOrDefault(outerEnumDefaultValueRawValue);
                             break;
                         case "outerEnumInteger":
                             string outerEnumIntegerRawValue = utf8JsonReader.GetString();
                             outerEnumInteger = outerEnumIntegerRawValue == null
                                 ? null
-                                : OuterEnumIntegerConverter.FromStringOrDefault(outerEnumIntegerRawValue);
+                                : OuterEnumIntegerValueConverter.FromStringOrDefault(outerEnumIntegerRawValue);
                             break;
                         case "outerEnumIntegerDefaultValue":
                             string outerEnumIntegerDefaultValueRawValue = utf8JsonReader.GetString();
                             outerEnumIntegerDefaultValue = outerEnumIntegerDefaultValueRawValue == null
                                 ? null
-                                : OuterEnumIntegerDefaultValueConverter.FromStringOrDefault(outerEnumIntegerDefaultValueRawValue);
+                                : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(outerEnumIntegerDefaultValueRawValue);
                             break;
                         case "outerEnum":
                             string outerEnumRawValue = utf8JsonReader.GetString();
                             outerEnum = outerEnumRawValue == null
                                 ? null
-                                : OuterEnumConverter.FromStringOrDefault(outerEnumRawValue);
+                                : OuterEnumValueConverter.FromStringOrDefault(outerEnumRawValue);
                             break;
                         default:
                             break;
@@ -662,23 +662,23 @@ namespace Org.OpenAPITools.Model
             else
                 writer.WriteNull("enum_string_required");
 
-            var outerEnumDefaultValueRawValue = OuterEnumDefaultValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue);
+            var outerEnumDefaultValueRawValue = OuterEnumDefaultValueValueConverter.ToJsonValue(enumTest.OuterEnumDefaultValue);
 
             if (outerEnumDefaultValueRawValue != null)
                 writer.WriteString("outerEnumDefaultValue", outerEnumDefaultValueRawValue);
             else
                 writer.WriteNull("outerEnumDefaultValue");
 
-            var outerEnumIntegerRawValue = OuterEnumIntegerConverter.ToJsonValue(enumTest.OuterEnumInteger);
+            var outerEnumIntegerRawValue = OuterEnumIntegerValueConverter.ToJsonValue(enumTest.OuterEnumInteger);
             writer.WriteNumber("outerEnumInteger", outerEnumIntegerRawValue);
-            var outerEnumIntegerDefaultValueRawValue = OuterEnumIntegerDefaultValueConverter.ToJsonValue(enumTest.OuterEnumIntegerDefaultValue);
+            var outerEnumIntegerDefaultValueRawValue = OuterEnumIntegerDefaultValueValueConverter.ToJsonValue(enumTest.OuterEnumIntegerDefaultValue);
             writer.WriteNumber("outerEnumIntegerDefaultValue", outerEnumIntegerDefaultValueRawValue);
 
             if (enumTest.OuterEnum == null)
                 writer.WriteNull("outerEnum");
             else
             {
-                var outerEnumRawValue = OuterEnumConverter.ToJsonValue(enumTest.OuterEnum.Value);
+                var outerEnumRawValue = OuterEnumValueConverter.ToJsonValue(enumTest.OuterEnum.Value);
                 if (outerEnumRawValue != null)
                     writer.WriteString("outerEnum", outerEnumRawValue);
                 else
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnum.cs
index c733cf74912..087b2078df5 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnum.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnum.cs
@@ -45,10 +45,9 @@ namespace Org.OpenAPITools.Model
     }
 
     /// <summary>
-    /// A Json converter for type <see cref="OuterEnum"/>
+    /// Converts <see cref="OuterEnum"/> to and from the JSON value
     /// </summary>
-    /// <exception cref="NotImplementedException"></exception>
-    public class OuterEnumConverter : JsonConverter<OuterEnum>
+    public static class OuterEnumValueConverter
     {
         /// <summary>
         /// Parses a given value to <see cref="OuterEnum"/>
@@ -107,7 +106,14 @@ namespace Org.OpenAPITools.Model
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
+    }
 
+    /// <summary>
+    /// A Json converter for type <see cref="OuterEnum"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class OuterEnumJsonConverter : JsonConverter<OuterEnum>
+    {
         /// <summary>
         /// Returns a  from the Json object
         /// </summary>
@@ -121,7 +127,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnum? result = rawValue == null
                 ? null
-                : OuterEnumConverter.FromStringOrDefault(rawValue);
+                : OuterEnumValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
@@ -144,7 +150,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// A Json converter for type <see cref="OuterEnum"/>
     /// </summary>
-    public class OuterEnumNullableConverter : JsonConverter<OuterEnum?>
+    public class OuterEnumNullableJsonConverter : JsonConverter<OuterEnum?>
     {
         /// <summary>
         /// Returns a OuterEnum from the Json object
@@ -159,7 +165,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnum? result = rawValue == null
                 ? null
-                : OuterEnumConverter.FromStringOrDefault(rawValue);
+                : OuterEnumValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
index b5a7bdc6666..262e946c71d 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
@@ -45,10 +45,9 @@ namespace Org.OpenAPITools.Model
     }
 
     /// <summary>
-    /// A Json converter for type <see cref="OuterEnumDefaultValue"/>
+    /// Converts <see cref="OuterEnumDefaultValue"/> to and from the JSON value
     /// </summary>
-    /// <exception cref="NotImplementedException"></exception>
-    public class OuterEnumDefaultValueConverter : JsonConverter<OuterEnumDefaultValue>
+    public static class OuterEnumDefaultValueValueConverter
     {
         /// <summary>
         /// Parses a given value to <see cref="OuterEnumDefaultValue"/>
@@ -107,7 +106,14 @@ namespace Org.OpenAPITools.Model
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
+    }
 
+    /// <summary>
+    /// A Json converter for type <see cref="OuterEnumDefaultValue"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class OuterEnumDefaultValueJsonConverter : JsonConverter<OuterEnumDefaultValue>
+    {
         /// <summary>
         /// Returns a  from the Json object
         /// </summary>
@@ -121,7 +127,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnumDefaultValue? result = rawValue == null
                 ? null
-                : OuterEnumDefaultValueConverter.FromStringOrDefault(rawValue);
+                : OuterEnumDefaultValueValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
@@ -144,7 +150,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// A Json converter for type <see cref="OuterEnumDefaultValue"/>
     /// </summary>
-    public class OuterEnumDefaultValueNullableConverter : JsonConverter<OuterEnumDefaultValue?>
+    public class OuterEnumDefaultValueNullableJsonConverter : JsonConverter<OuterEnumDefaultValue?>
     {
         /// <summary>
         /// Returns a OuterEnumDefaultValue from the Json object
@@ -159,7 +165,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnumDefaultValue? result = rawValue == null
                 ? null
-                : OuterEnumDefaultValueConverter.FromStringOrDefault(rawValue);
+                : OuterEnumDefaultValueValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
index ec056b1540c..9802a655e29 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumInteger.cs
@@ -45,10 +45,9 @@ namespace Org.OpenAPITools.Model
     }
 
     /// <summary>
-    /// A Json converter for type <see cref="OuterEnumInteger"/>
+    /// Converts <see cref="OuterEnumInteger"/> to and from the JSON value
     /// </summary>
-    /// <exception cref="NotImplementedException"></exception>
-    public class OuterEnumIntegerConverter : JsonConverter<OuterEnumInteger>
+    public static class OuterEnumIntegerValueConverter
     {
         /// <summary>
         /// Parses a given value to <see cref="OuterEnumInteger"/>
@@ -98,7 +97,14 @@ namespace Org.OpenAPITools.Model
         {
             return (int) value;
         }
+    }
 
+    /// <summary>
+    /// A Json converter for type <see cref="OuterEnumInteger"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class OuterEnumIntegerJsonConverter : JsonConverter<OuterEnumInteger>
+    {
         /// <summary>
         /// Returns a  from the Json object
         /// </summary>
@@ -112,7 +118,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnumInteger? result = rawValue == null
                 ? null
-                : OuterEnumIntegerConverter.FromStringOrDefault(rawValue);
+                : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
@@ -135,7 +141,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// A Json converter for type <see cref="OuterEnumInteger"/>
     /// </summary>
-    public class OuterEnumIntegerNullableConverter : JsonConverter<OuterEnumInteger?>
+    public class OuterEnumIntegerNullableJsonConverter : JsonConverter<OuterEnumInteger?>
     {
         /// <summary>
         /// Returns a OuterEnumInteger from the Json object
@@ -150,7 +156,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnumInteger? result = rawValue == null
                 ? null
-                : OuterEnumIntegerConverter.FromStringOrDefault(rawValue);
+                : OuterEnumIntegerValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
index 1d65e53c50d..dbdab20752e 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
@@ -45,10 +45,9 @@ namespace Org.OpenAPITools.Model
     }
 
     /// <summary>
-    /// A Json converter for type <see cref="OuterEnumIntegerDefaultValue"/>
+    /// Converts <see cref="OuterEnumIntegerDefaultValue"/> to and from the JSON value
     /// </summary>
-    /// <exception cref="NotImplementedException"></exception>
-    public class OuterEnumIntegerDefaultValueConverter : JsonConverter<OuterEnumIntegerDefaultValue>
+    public static class OuterEnumIntegerDefaultValueValueConverter
     {
         /// <summary>
         /// Parses a given value to <see cref="OuterEnumIntegerDefaultValue"/>
@@ -98,7 +97,14 @@ namespace Org.OpenAPITools.Model
         {
             return (int) value;
         }
+    }
 
+    /// <summary>
+    /// A Json converter for type <see cref="OuterEnumIntegerDefaultValue"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class OuterEnumIntegerDefaultValueJsonConverter : JsonConverter<OuterEnumIntegerDefaultValue>
+    {
         /// <summary>
         /// Returns a  from the Json object
         /// </summary>
@@ -112,7 +118,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnumIntegerDefaultValue? result = rawValue == null
                 ? null
-                : OuterEnumIntegerDefaultValueConverter.FromStringOrDefault(rawValue);
+                : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
@@ -135,7 +141,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// A Json converter for type <see cref="OuterEnumIntegerDefaultValue"/>
     /// </summary>
-    public class OuterEnumIntegerDefaultValueNullableConverter : JsonConverter<OuterEnumIntegerDefaultValue?>
+    public class OuterEnumIntegerDefaultValueNullableJsonConverter : JsonConverter<OuterEnumIntegerDefaultValue?>
     {
         /// <summary>
         /// Returns a OuterEnumIntegerDefaultValue from the Json object
@@ -150,7 +156,7 @@ namespace Org.OpenAPITools.Model
 
             OuterEnumIntegerDefaultValue? result = rawValue == null
                 ? null
-                : OuterEnumIntegerDefaultValueConverter.FromStringOrDefault(rawValue);
+                : OuterEnumIntegerDefaultValueValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs
index b1da861265b..969ca3f3fcb 100644
--- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/ZeroBasedEnum.cs
@@ -40,10 +40,9 @@ namespace Org.OpenAPITools.Model
     }
 
     /// <summary>
-    /// A Json converter for type <see cref="ZeroBasedEnum"/>
+    /// Converts <see cref="ZeroBasedEnum"/> to and from the JSON value
     /// </summary>
-    /// <exception cref="NotImplementedException"></exception>
-    public class ZeroBasedEnumConverter : JsonConverter<ZeroBasedEnum>
+    public static class ZeroBasedEnumValueConverter
     {
         /// <summary>
         /// Parses a given value to <see cref="ZeroBasedEnum"/>
@@ -93,7 +92,14 @@ namespace Org.OpenAPITools.Model
 
             throw new NotImplementedException($"Value could not be handled: '{value}'");
         }
+    }
 
+    /// <summary>
+    /// A Json converter for type <see cref="ZeroBasedEnum"/>
+    /// </summary>
+    /// <exception cref="NotImplementedException"></exception>
+    public class ZeroBasedEnumJsonConverter : JsonConverter<ZeroBasedEnum>
+    {
         /// <summary>
         /// Returns a  from the Json object
         /// </summary>
@@ -107,7 +113,7 @@ namespace Org.OpenAPITools.Model
 
             ZeroBasedEnum? result = rawValue == null
                 ? null
-                : ZeroBasedEnumConverter.FromStringOrDefault(rawValue);
+                : ZeroBasedEnumValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;
@@ -130,7 +136,7 @@ namespace Org.OpenAPITools.Model
     /// <summary>
     /// A Json converter for type <see cref="ZeroBasedEnum"/>
     /// </summary>
-    public class ZeroBasedEnumNullableConverter : JsonConverter<ZeroBasedEnum?>
+    public class ZeroBasedEnumNullableJsonConverter : JsonConverter<ZeroBasedEnum?>
     {
         /// <summary>
         /// Returns a ZeroBasedEnum from the Json object
@@ -145,7 +151,7 @@ namespace Org.OpenAPITools.Model
 
             ZeroBasedEnum? result = rawValue == null
                 ? null
-                : ZeroBasedEnumConverter.FromStringOrDefault(rawValue);
+                : ZeroBasedEnumValueConverter.FromStringOrDefault(rawValue);
 
             if (result != null)
                 return result.Value;