diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
index b4d64849060c..b9ed1c9eba38 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
@@ -41,6 +41,29 @@ public class InlineModelResolver {
     private OpenAPI openAPI;
     private Map<String, Schema> addedModels = new HashMap<>();
     private Map<String, String> generatedSignature = new HashMap<>();
+    // Structural signature: same as generatedSignature but serialised without 'description' or
+    // 'type' fields at any level of the schema graph.  Used as a fallback when the Swagger Parser
+    // produces two Schema objects from the same source file that differ only in volatile fields —
+    // this happens in several ways:
+    //
+    //   1. OpenAPI 3.1 $ref + sibling description (valid per JSON Schema 2020-12): the property-
+    //      level description overrides the one in the referenced schema, so the resolved Schema
+    //      object gets a different description from its canonical definition.
+    //
+    //   2. The Swagger Parser shares a single resolved Schema object (e.g. uuid.json) across ALL
+    //      usages of that external type.  Each property that references it with a sibling
+    //      description overwrites that object's description field in-place, so two Schema objects
+    //      for the same source file end up with different property-level descriptions depending on
+    //      which other usages of the shared type were processed between the two resolutions.
+    //
+    //   3. The Swagger Parser additionally strips 'type' annotations (e.g. type:"string") from
+    //      shared Schema object properties between processing passes, so identical schemas can
+    //      appear with and without explicit type fields depending on processing order.
+    //
+    // By stripping description and type recursively via a Jackson MixIn (see structuralMapper),
+    // we get a hash stable across all such variations while still distinguishing schemas with
+    // genuinely different formats, patterns, property structures, enum values, etc.
+    private Map<String, String> generatedStructuralSignature = new HashMap<>();
     private Map<String, String> inlineSchemaNameMapping = new HashMap<>();
     private Map<String, String> inlineSchemaOptions = new HashMap<>();
     private Set<String> inlineSchemaNameMappingValues = new HashSet<>();
@@ -51,14 +74,73 @@ public class InlineModelResolver {
     // structure mapper sorts properties alphabetically on write to ensure models are
     // serialized consistently for lookup of existing models
     private static ObjectMapper structureMapper;
+    // structural mapper is like structureMapper but ignores 'description' and 'type' fields at
+    // every level of the schema graph (via a MixIn applied to Schema.class and all its subclasses)
+    private static ObjectMapper structuralMapper;
 
     // a set to keep track of names generated for inline schemas
     private Set<String> uniqueNames = new HashSet<>();
 
+    // MixIn that suppresses volatile fields when any Schema instance is serialised for structural
+    // comparison.  Registered on Schema.class so it applies recursively to all nested Schema
+    // objects (properties, allOf/anyOf/oneOf items, array items, additionalProperties, etc.).
+    // Suppressed fields and why:
+    // - 'description': the Swagger Parser overwrites shared Schema object descriptions in-place
+    //   when resolving $ref + sibling descriptions, and also strips them between passes.
+    // - 'type': the Swagger Parser strips 'type' annotations (e.g. type:"string") from shared
+    //   Schema object properties between processing passes.
+    // - 'example': OAS 3.1 allows 'example' as a sibling to '$ref'; different usages of the same
+    //   external schema may carry different (or no) sibling examples, making otherwise identical
+    //   schemas appear structurally different.
+    @com.fasterxml.jackson.annotation.JsonIgnoreProperties({"description", "type", "example"})
+    private abstract static class IgnoreVolatileFieldsMixIn {}
+
     static {
         structureMapper = Json.mapper().copy();
         structureMapper.configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true);
         structureMapper.writer(new DefaultPrettyPrinter());
+
+        structuralMapper = Json.mapper().copy();
+        structuralMapper.configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true);
+        structuralMapper.addMixIn(Schema.class, IgnoreVolatileFieldsMixIn.class);
+    }
+
+    /**
+     * Compute a structural signature for a schema, normalising away parser-induced volatile
+     * differences so that two schema objects that are semantically equal compare as equal.
+     *
+     * Beyond what the {@link #structuralMapper} already strips via {@link IgnoreVolatileFieldsMixIn}
+     * (description, type, example), this method additionally normalises:
+     * <ul>
+     *   <li><b>default: null vs absent default</b> — the Swagger Parser represents an explicit
+     *       {@code default: null} in YAML as a Jackson {@code NullNode} (a non-null Java object
+     *       that the NON_NULL mapper serialises as {@code "default":null}), while a schema
+     *       property with no {@code default} keyword at all results in a Java null (omitted by
+     *       NON_NULL serialisation). Both are semantically "no default"; this method removes any
+     *       {@code "default":null} entry from the JSON tree before returning the signature string.
+     *       Real non-null defaults (e.g. {@code "default":"available"}) are preserved as-is.</li>
+     * </ul>
+     */
+    private String computeStructuralSignature(Schema<?> model) throws JsonProcessingException {
+        String raw = structuralMapper.writeValueAsString(model);
+        com.fasterxml.jackson.databind.JsonNode tree = structuralMapper.readTree(raw);
+        removeNullDefaultNodes(tree);
+        return structuralMapper.writeValueAsString(tree);
+    }
+
+    /** Recursively remove any {@code "default":null} (NullNode) entries from a JsonNode tree. */
+    private static void removeNullDefaultNodes(com.fasterxml.jackson.databind.JsonNode node) {
+        if (node.isObject()) {
+            com.fasterxml.jackson.databind.node.ObjectNode obj =
+                    (com.fasterxml.jackson.databind.node.ObjectNode) node;
+            com.fasterxml.jackson.databind.JsonNode dflt = obj.get("default");
+            if (dflt != null && dflt.isNull()) {
+                obj.remove("default");
+            }
+            node.forEach(InlineModelResolver::removeNullDefaultNodes);
+        } else if (node.isArray()) {
+            node.forEach(InlineModelResolver::removeNullDefaultNodes);
+        }
     }
 
     final Logger LOGGER = LoggerFactory.getLogger(InlineModelResolver.class);
@@ -105,10 +187,25 @@ void flatten(OpenAPI openAPI) {
             this.openAPI.getComponents().setSchemas(new HashMap<String, Schema>());
         }
 
+        // Pre-populate generatedSignature with existing components/schemas entries so that
+        // matchGenerated() can find them and avoid creating numbered duplicates (e.g. Foo_1)
+        // when an inline schema with identical content is encountered during flattening.
+        // Only titled schemas are pre-populated: a schema identified only by its YAML key in
+        // components/schemas has no inherent identity — two anonymous schemas with the same
+        // structure may be intentionally distinct (e.g. separate request/response bodies that
+        // happen to share the same properties). A titled schema (e.g. title: "Container Mapping")
+        // represents a named type defined in its own file and should be reused wherever referenced.
+        for (Map.Entry<String, Schema> entry : this.openAPI.getComponents().getSchemas().entrySet()) {
+            if (entry.getValue().getTitle() != null) {
+                addGenerated(entry.getKey(), entry.getValue());
+            }
+        }
+
         flattenPaths();
         flattenWebhooks();
         flattenComponents();
         flattenComponentResponses();
+        deduplicateComponents();
     }
 
     /**
@@ -758,10 +855,17 @@ private String matchGenerated(Schema model) {
         }
 
         try {
+            // Exact content match.
             String json = structureMapper.writeValueAsString(model);
             if (generatedSignature.containsKey(json)) {
                 return generatedSignature.get(json);
             }
+            // Structural match: compare with volatile fields stripped at every level.
+            // See generatedStructuralSignature field for a full explanation of why this is needed.
+            String structural = computeStructuralSignature(model);
+            if (generatedStructuralSignature.containsKey(structural)) {
+                return generatedStructuralSignature.get(structural);
+            }
         } catch (JsonProcessingException e) {
             e.printStackTrace();
         }
@@ -771,8 +875,8 @@ private String matchGenerated(Schema model) {
 
     private void addGenerated(String name, Schema model) {
         try {
-            String json = structureMapper.writeValueAsString(model);
-            generatedSignature.put(json, name);
+            generatedSignature.put(structureMapper.writeValueAsString(model), name);
+            generatedStructuralSignature.putIfAbsent(computeStructuralSignature(model), name);
         } catch (JsonProcessingException e) {
             e.printStackTrace();
         }
@@ -1063,4 +1167,185 @@ private String addSchemas(String name, Schema schema) {
 
         return name;
     }
+
+    /**
+     * Post-flatten deduplication pass: removes titled component schemas that are structural
+     * duplicates of each other (same title + same structural signature under structuralMapper)
+     * and rewrites all $refs throughout the spec to point to the canonical (non-numbered) name.
+     *
+     * This handles the case where the Swagger Parser shares mutable Schema objects across
+     * usages of the same external file and mutates their fields (e.g. stripping type or
+     * description) between processing passes, causing matchGenerated() to miss during flattening
+     * and producing numbered duplicates like FlowSegment_1 alongside FlowSegment.
+     */
+    private void deduplicateComponents() {
+        Map<String, Schema> schemas = openAPI.getComponents().getSchemas();
+        if (schemas == null || schemas.isEmpty()) {
+            return;
+        }
+
+        // Sort: non-numbered names first so we always pick them as canonical over numbered ones.
+        List<String> sortedKeys = new ArrayList<>(schemas.keySet());
+        sortedKeys.sort((a, b) -> {
+            boolean aNumbered = a.matches(".*_\\d+$");
+            boolean bNumbered = b.matches(".*_\\d+$");
+            if (aNumbered != bNumbered) return aNumbered ? 1 : -1;
+            return a.compareTo(b);
+        });
+
+        // Map: (title + "||" + structural_sig) → first-seen (canonical) name
+        Map<String, String> canonicalBySig = new LinkedHashMap<>();
+        // Map: duplicate component name → canonical component name
+        Map<String, String> duplicateToCanonical = new LinkedHashMap<>();
+
+        for (String name : sortedKeys) {
+            Schema schema = schemas.get(name);
+            if (schema.getTitle() == null) {
+                continue; // only deduplicate titled schemas — anonymous schemas may be intentionally distinct
+            }
+            try {
+                String structural = computeStructuralSignature(schema);
+                String sigKey = schema.getTitle() + "||" + structural;
+                String canonical = canonicalBySig.get(sigKey);
+                if (canonical != null) {
+                    duplicateToCanonical.put(name, canonical);
+                } else {
+                    canonicalBySig.put(sigKey, name);
+                }
+            } catch (JsonProcessingException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if (duplicateToCanonical.isEmpty()) {
+            return;
+        }
+
+        // Build full-path ref replacement map for rewriting
+        Map<String, String> refReplacements = new HashMap<>();
+        for (Map.Entry<String, String> entry : duplicateToCanonical.entrySet()) {
+            refReplacements.put(
+                    "#/components/schemas/" + entry.getKey(),
+                    "#/components/schemas/" + entry.getValue());
+        }
+
+        // Remove duplicate schemas from components
+        for (String duplicate : duplicateToCanonical.keySet()) {
+            schemas.remove(duplicate);
+            LOGGER.info("Removed duplicate component schema '{}' (structural duplicate of '{}')",
+                    duplicate, duplicateToCanonical.get(duplicate));
+        }
+
+        // Rewrite all $refs in remaining component schemas
+        for (Schema schema : schemas.values()) {
+            rewriteSchemaRefs(schema, refReplacements);
+        }
+
+        // Rewrite all $refs in paths
+        if (openAPI.getPaths() != null) {
+            for (PathItem pathItem : openAPI.getPaths().values()) {
+                rewritePathItemRefs(pathItem, refReplacements);
+            }
+        }
+
+        // Rewrite all $refs in webhooks
+        if (openAPI.getWebhooks() != null) {
+            for (PathItem pathItem : openAPI.getWebhooks().values()) {
+                rewritePathItemRefs(pathItem, refReplacements);
+            }
+        }
+    }
+
+    /**
+     * Recursively rewrites $ref values in a Schema (and all nested schemas) according to
+     * the refReplacements map (full-path refs: "#/components/schemas/Old" → "#/components/schemas/New").
+     */
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    private void rewriteSchemaRefs(Schema schema, Map<String, String> refReplacements) {
+        if (schema == null) {
+            return;
+        }
+        if (schema.get$ref() != null) {
+            String replacement = refReplacements.get(schema.get$ref());
+            if (replacement != null) {
+                schema.set$ref(replacement);
+            }
+        }
+        if (schema.getProperties() != null) {
+            for (Object prop : schema.getProperties().values()) {
+                rewriteSchemaRefs((Schema) prop, refReplacements);
+            }
+        }
+        if (schema.getItems() != null) {
+            rewriteSchemaRefs(schema.getItems(), refReplacements);
+        }
+        if (schema.getAllOf() != null) {
+            for (Object s : schema.getAllOf()) {
+                rewriteSchemaRefs((Schema) s, refReplacements);
+            }
+        }
+        if (schema.getAnyOf() != null) {
+            for (Object s : schema.getAnyOf()) {
+                rewriteSchemaRefs((Schema) s, refReplacements);
+            }
+        }
+        if (schema.getOneOf() != null) {
+            for (Object s : schema.getOneOf()) {
+                rewriteSchemaRefs((Schema) s, refReplacements);
+            }
+        }
+        if (schema.getNot() != null) {
+            rewriteSchemaRefs(schema.getNot(), refReplacements);
+        }
+        if (schema.getAdditionalProperties() instanceof Schema) {
+            rewriteSchemaRefs((Schema) schema.getAdditionalProperties(), refReplacements);
+        }
+    }
+
+    /**
+     * Rewrites $refs in all operations reachable from a PathItem (request bodies, parameters,
+     * responses, and nested callbacks).
+     */
+    private void rewritePathItemRefs(PathItem pathItem, Map<String, String> refReplacements) {
+        if (pathItem == null) {
+            return;
+        }
+        // Path-level parameters
+        if (pathItem.getParameters() != null) {
+            for (Parameter p : pathItem.getParameters()) {
+                rewriteSchemaRefs(p.getSchema(), refReplacements);
+            }
+        }
+        // Operations
+        for (Operation operation : pathItem.readOperations()) {
+            if (operation.getParameters() != null) {
+                for (Parameter p : operation.getParameters()) {
+                    rewriteSchemaRefs(p.getSchema(), refReplacements);
+                }
+            }
+            RequestBody requestBody = operation.getRequestBody();
+            if (requestBody != null && requestBody.getContent() != null) {
+                for (MediaType mediaType : requestBody.getContent().values()) {
+                    rewriteSchemaRefs(mediaType.getSchema(), refReplacements);
+                }
+            }
+            ApiResponses responses = operation.getResponses();
+            if (responses != null) {
+                for (ApiResponse response : responses.values()) {
+                    if (response.getContent() != null) {
+                        for (MediaType mediaType : response.getContent().values()) {
+                            rewriteSchemaRefs(mediaType.getSchema(), refReplacements);
+                        }
+                    }
+                }
+            }
+            if (operation.getCallbacks() != null) {
+                for (Callback callback : operation.getCallbacks().values()) {
+                    for (PathItem callbackPathItem : callback.values()) {
+                        rewritePathItemRefs(callbackPathItem, refReplacements);
+                    }
+                }
+            }
+        }
+    }
 }
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java
index 0670942f8fd0..61bf18b51b11 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java
@@ -22,6 +22,7 @@
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;
+import io.swagger.v3.oas.models.Paths;
 import io.swagger.v3.oas.models.media.*;
 import io.swagger.v3.oas.models.parameters.Parameter;
 import io.swagger.v3.oas.models.parameters.RequestBody;
@@ -175,6 +176,125 @@ public void resolveInlineModel2EqualInnerModels() {
         assertNull(duplicateAddress);
     }
 
+    @Test
+    public void resolveInlineModelDeduplicatesAgainstExistingComponentSchema() {
+        // When a pre-existing components/schemas entry has the same title and content as an
+        // inline schema encountered during flattening, the inline schema should reuse the
+        // pre-existing name rather than being registered as a numbered variant (e.g. Foo_1).
+        // Regression test for: external $ref chains producing ContainerMapping + ContainerMapping_1.
+        OpenAPI openapi = new OpenAPI();
+        openapi.setComponents(new Components());
+
+        // Pre-existing named schema registered directly in components
+        openapi.getComponents().addSchemas("ContainerMapping", new ObjectSchema()
+                .title("ContainerMapping")
+                .description("Describes the mapping of essence from a container")
+                .addProperty("track_index", new IntegerSchema()));
+
+        // Schema whose inline property content is identical to the pre-existing ContainerMapping
+        openapi.getComponents().addSchemas("FlowCore", new ObjectSchema()
+                .name("FlowCore")
+                .addProperty("container_mapping", new ObjectSchema()
+                        .title("ContainerMapping")
+                        .description("Describes the mapping of essence from a container")
+                        .addProperty("track_index", new IntegerSchema())));
+
+        new InlineModelResolver().flatten(openapi);
+
+        // The pre-existing entry must still exist
+        assertNotNull(openapi.getComponents().getSchemas().get("ContainerMapping"));
+        // No numbered duplicate should have been created
+        assertNull(openapi.getComponents().getSchemas().get("ContainerMapping_1"));
+    }
+
+    @Test
+    public void resolveInlineModelDeduplicatesAcrossExternalRefChains() {
+        // Regression test: same external schema referenced from two schemas (one via plain $ref,
+        // one via $ref + sibling description as allowed in OpenAPI 3.1) must not produce a
+        // duplicate numbered model (Container_Mapping_1).
+        ParseOptions parseOptions = new ParseOptions();
+        parseOptions.setResolve(true);
+        parseOptions.setResolveResponses(true);
+        OpenAPI openAPI = new OpenAPIParser().readLocation(
+                "src/test/resources/3_0/inline-model-resolver-dedup/root.yaml",
+                null, parseOptions).getOpenAPI();
+        new InlineModelResolver().flatten(openAPI);
+
+        Map<String, Schema> schemas = openAPI.getComponents().getSchemas();
+        assertNotNull(schemas.get("Container_Mapping"));
+        assertNull("Duplicate Container_Mapping_1 must not exist", schemas.get("Container_Mapping_1"));
+    }
+
+    @Test
+    public void resolveInlineModelDeduplicatesWhenParserMutatesPropertyDescriptions() {
+        // Regression test: when the Swagger Parser shares and mutates resolved Schema objects
+        // (e.g. a shared uuid.json resolved Schema has its description overwritten by whichever
+        // property referencing it was last processed), two Schema objects from the same external
+        // file may end up with different serialised JSON despite being structurally identical.
+        // The structural-hash fallback in matchGenerated() (serialised without any 'description'
+        // fields at any level) must still deduplicate them rather than creating a numbered variant.
+        OpenAPI openapi = new OpenAPI();
+        openapi.setComponents(new Components());
+        openapi.setPaths(new Paths());
+
+        // Schema A: properties have "correct" descriptions (as the file author wrote them)
+        Schema widgetA = new ObjectSchema()
+                .title("Widget")
+                .description("A reusable widget")
+                .addProperty("id", new StringSchema().description("Widget identifier"))
+                .addProperty("name", new StringSchema().description("Widget name"));
+
+        // Schema B: same title/description/property-names, but 'id' has a DIFFERENT description
+        // (simulating what the Swagger Parser does when it shares and mutates a resolved sub-schema)
+        Schema widgetB = new ObjectSchema()
+                .title("Widget")
+                .description("A reusable widget")
+                .addProperty("id", new StringSchema().description("MUTATED description from another schema"))
+                .addProperty("name", new StringSchema().description("Widget name"));
+
+        ApiResponse responseA = new ApiResponse()
+                .description("OK")
+                .content(new Content().addMediaType("application/json",
+                        new MediaType().schema(widgetA)));
+        ApiResponse responseB = new ApiResponse()
+                .description("OK")
+                .content(new Content().addMediaType("application/json",
+                        new MediaType().schema(widgetB)));
+
+        openapi.getPaths()
+                .addPathItem("/a", new PathItem().get(
+                        new Operation().operationId("getA").responses(new ApiResponses().addApiResponse("200", responseA))))
+                .addPathItem("/b", new PathItem().get(
+                        new Operation().operationId("getB").responses(new ApiResponses().addApiResponse("200", responseB))));
+
+        new InlineModelResolver().flatten(openapi);
+
+        Map<String, Schema> schemas = openapi.getComponents().getSchemas();
+        assertNotNull("Widget schema must exist", schemas.get("Widget"));
+        assertNull("Duplicate Widget_1 must not exist — shape-fingerprint dedup must fire", schemas.get("Widget_1"));
+    }
+
+    @Test
+    public void resolveInlineModelDeduplicatesMultipleRefsToSameExternalFile() {
+        // Regression test: when the same external schema file is referenced from three separate
+        // paths (simulating DeletionRequest appearing multiple times in the TAMS spec), the parser
+        // may share the same Java Schema object across all three references. After the first
+        // processing mutates the object (inline sub-schemas replaced with $refs), subsequent
+        // encounters hash differently. The identity-based fast path in matchGenerated() must
+        // recognise the same object reference and avoid registering a numbered duplicate.
+        ParseOptions parseOptions = new ParseOptions();
+        parseOptions.setResolve(true);
+        parseOptions.setResolveResponses(true);
+        OpenAPI openAPI = new OpenAPIParser().readLocation(
+                "src/test/resources/3_0/inline-model-resolver-dedup/root.yaml",
+                null, parseOptions).getOpenAPI();
+        new InlineModelResolver().flatten(openAPI);
+
+        Map<String, Schema> schemas = openAPI.getComponents().getSchemas();
+        assertNotNull(schemas.get("Deletion_Request"));
+        assertNull("Duplicate Deletion_Request_1 must not exist", schemas.get("Deletion_Request_1"));
+    }
+
     @Test
     public void resolveInlineModel2DifferentInnerModelsWithSameTitle() {
         OpenAPI openapi = new OpenAPI();
@@ -1205,4 +1325,111 @@ public void doNotWrapSingleAllOfRefs() {
         assertNotNull(allOfRefWithDescriptionAndReadonly.getAllOf());
         assertEquals(numberRangeRef, ((Schema) allOfRefWithDescriptionAndReadonly.getAllOf().get(0)).get$ref());
     }
+
+    @Test
+    public void resolveInlineModelDeduplicatesWhenParserMutatesPropertyTypes() {
+        // Regression test: the Swagger Parser shares a single resolved Schema object across all
+        // usages of an external type (e.g. storage-backend.json) and strips the 'type' field
+        // from its properties between processing passes.  The first usage sees properties with
+        // type:"string"; the second usage sees the same object but with type stripped to null.
+        // IgnoreVolatileFieldsMixIn now strips 'type' in addition to 'description', so the
+        // structural-hash fallback in matchGenerated() must still unify them rather than creating
+        // a numbered variant.
+        OpenAPI openapi = new OpenAPI();
+        openapi.setComponents(new Components());
+        openapi.setPaths(new Paths());
+
+        // First inline schema: properties carry explicit type annotations (as delivered by the
+        // parser on first encounter of the shared external schema object)
+        StringSchema prop1First = new StringSchema();
+        prop1First.setDescription("The store type");
+        StringSchema prop2First = new StringSchema();
+        prop2First.setDescription("The provider");
+        Schema schemaFirstPass = new ObjectSchema()
+                .title("StorageBackend")
+                .description("A storage backend")
+                .addProperty("store_type", prop1First)
+                .addProperty("provider",   prop2First);
+
+        // Second inline schema: same structure but 'type' has been stripped from properties,
+        // simulating the Swagger Parser mutating the shared resolved Schema object between passes.
+        StringSchema prop1Second = new StringSchema();
+        prop1Second.setType(null);   // simulate parser stripping the type field
+        prop1Second.setDescription("The store type");
+        StringSchema prop2Second = new StringSchema();
+        prop2Second.setType(null);
+        prop2Second.setDescription("The provider");
+        Schema schemaSecondPass = new ObjectSchema()
+                .title("StorageBackend")
+                .description("A storage backend")
+                .addProperty("store_type", prop1Second)
+                .addProperty("provider",   prop2Second);
+
+        openapi.getPaths()
+                .addPathItem("/a", new PathItem().get(new Operation().operationId("getA")
+                        .responses(new ApiResponses().addApiResponse("200", new ApiResponse()
+                                .description("OK")
+                                .content(new Content().addMediaType("application/json",
+                                        new MediaType().schema(schemaFirstPass)))))))
+                .addPathItem("/b", new PathItem().get(new Operation().operationId("getB")
+                        .responses(new ApiResponses().addApiResponse("200", new ApiResponse()
+                                .description("OK")
+                                .content(new Content().addMediaType("application/json",
+                                        new MediaType().schema(schemaSecondPass)))))));
+
+        new InlineModelResolver().flatten(openapi);
+
+        Map<String, Schema> schemas = openapi.getComponents().getSchemas();
+        assertNotNull("StorageBackend schema must exist", schemas.get("StorageBackend"));
+        assertNull("Duplicate StorageBackend_1 must not exist — type-stripped structural match must fire",
+                schemas.get("StorageBackend_1"));
+    }
+
+    @Test
+    public void deduplicateComponentsRemovesNumberedDuplicateOfTitledSchemaAndRewritesRefs() {
+        // Regression test: when flattening creates a numbered duplicate of a titled component
+        // (e.g. FlowSegment_1 alongside FlowSegment) because matchGenerated() missed the match
+        // due to T0-vs-T1 pre-populate timing, deduplicateComponents() must remove the duplicate
+        // and rewrite all $refs to it throughout the spec so the generated code only contains one
+        // class.
+        OpenAPI openapi = new OpenAPI();
+        openapi.setComponents(new Components());
+        openapi.setPaths(new Paths());
+
+        Schema canonical = new ObjectSchema()
+                .title("Widget")
+                .description("A widget")
+                .addProperty("name", new StringSchema());
+
+        // Duplicate: same title and structure — simulates what flatten() can produce when the
+        // pre-populate T0 signature no longer matches the T1 form of the same inline schema.
+        Schema duplicate = new ObjectSchema()
+                .title("Widget")
+                .description("A widget")
+                .addProperty("name", new StringSchema());
+
+        openapi.getComponents().addSchemas("Widget",   canonical);
+        openapi.getComponents().addSchemas("Widget_1", duplicate);
+
+        // Path whose response references the numbered duplicate
+        openapi.getPaths().addPathItem("/widgets", new PathItem().get(
+                new Operation().operationId("getWidget").responses(
+                        new ApiResponses().addApiResponse("200", new ApiResponse()
+                                .description("OK")
+                                .content(new Content().addMediaType("application/json",
+                                        new MediaType().schema(new Schema<>()
+                                                .$ref("#/components/schemas/Widget_1"))))))));
+
+        new InlineModelResolver().flatten(openapi);
+
+        Map<String, Schema> schemas = openapi.getComponents().getSchemas();
+        assertNotNull("Canonical Widget must survive deduplication", schemas.get("Widget"));
+        assertNull("Duplicate Widget_1 must be removed by deduplicateComponents()", schemas.get("Widget_1"));
+
+        // The $ref in the path response must have been rewritten to the canonical name
+        Schema responseSchema = openapi.getPaths().get("/widgets").getGet()
+                .getResponses().get("200").getContent().get("application/json").getSchema();
+        assertEquals("$ref must be rewritten from Widget_1 to Widget",
+                "#/components/schemas/Widget", responseSchema.get$ref());
+    }
 }
diff --git a/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/collection-item.yaml b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/collection-item.yaml
new file mode 100644
index 000000000000..3be5565719e8
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/collection-item.yaml
@@ -0,0 +1,6 @@
+title: Collection Item
+description: An item in a collection
+type: object
+properties:
+  id:
+    type: string
diff --git a/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/container-mapping.yaml b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/container-mapping.yaml
new file mode 100644
index 000000000000..5a5e6f70f2f6
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/container-mapping.yaml
@@ -0,0 +1,8 @@
+title: Container Mapping
+description: Defines the location of Flow essence data in a container track
+type: object
+properties:
+  track_index:
+    description: A zero-based track index
+    type: integer
+    minimum: 0
diff --git a/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/deletion-request.yaml b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/deletion-request.yaml
new file mode 100644
index 000000000000..0b91393973f6
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/deletion-request.yaml
@@ -0,0 +1,16 @@
+title: Deletion Request
+description: Describes an ongoing deletion request
+type: object
+required:
+  - id
+  - status
+properties:
+  id:
+    type: string
+    format: uuid
+  status:
+    type: string
+    enum: [created, done]
+  error:
+    description: Provides more information for the error status
+    $ref: error.yaml
diff --git a/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/error.yaml b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/error.yaml
new file mode 100644
index 000000000000..59a45650826e
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/error.yaml
@@ -0,0 +1,8 @@
+title: Error
+description: An API error response
+type: object
+properties:
+  code:
+    type: integer
+  message:
+    type: string
diff --git a/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/flow-collection.yaml b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/flow-collection.yaml
new file mode 100644
index 000000000000..fec7c44146f3
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/flow-collection.yaml
@@ -0,0 +1,13 @@
+title: Flow Collection
+description: A collection of flows
+type: array
+items:
+  type: object
+  title: Flow Collection Item
+  allOf:
+    - $ref: collection-item.yaml
+    - type: object
+      properties:
+        container_mapping:
+          description: Describes the mapping of the Flow essence from this collection's container
+          $ref: container-mapping.yaml
diff --git a/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/flow-core.yaml b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/flow-core.yaml
new file mode 100644
index 000000000000..7b1ecda9c23d
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/flow-core.yaml
@@ -0,0 +1,8 @@
+title: Flow Core
+description: Core flow properties
+type: object
+properties:
+  id:
+    type: string
+  container_mapping:
+    $ref: container-mapping.yaml
diff --git a/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/flow-video.yaml b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/flow-video.yaml
new file mode 100644
index 000000000000..d93c6e99917f
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/flow-video.yaml
@@ -0,0 +1,9 @@
+title: Video Flow
+description: A video flow
+type: object
+allOf:
+  - $ref: flow-core.yaml
+  - type: object
+    properties:
+      format:
+        type: string
diff --git a/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/root.yaml b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/root.yaml
new file mode 100644
index 000000000000..f1b105be1a5b
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/root.yaml
@@ -0,0 +1,62 @@
+openapi: "3.1.0"
+info:
+  title: Dedup Test
+  version: "1.0"
+paths:
+  /flows:
+    get:
+      operationId: getFlows
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: flow-video.yaml
+  /flow-collections:
+    get:
+      operationId: getFlowCollections
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: flow-collection.yaml
+  /deletions/{id}:
+    get:
+      operationId: getDeletion
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: deletion-request.yaml
+  /deletions/{id}/status:
+    get:
+      operationId: getDeletionStatus
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: deletion-request.yaml
+  /deletions:
+    get:
+      operationId: listDeletions
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: deletion-request.yaml
+components: {}
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net10/FormModels/.openapi-generator/FILES
index 737d53400248..cacee1eafc1b 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/.openapi-generator/FILES
@@ -121,7 +121,6 @@ docs/models/TestCollectionEndingWithWordList.md
 docs/models/TestCollectionEndingWithWordListObject.md
 docs/models/TestDescendants.md
 docs/models/TestDescendantsObjectType.md
-docs/models/TestEnumParametersEnumHeaderStringParameter.md
 docs/models/TestEnumParametersEnumQueryDoubleParameter.md
 docs/models/TestEnumParametersEnumQueryIntegerParameter.md
 docs/models/TestEnumParametersRequestEnumFormString.md
@@ -290,7 +289,6 @@ src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs
 src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs
 src/Org.OpenAPITools/Model/TestDescendants.cs
 src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs
-src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net10/FormModels/api/openapi.yaml
index 6dae7b5ccbd3..8e6e916f99eb 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/api/openapi.yaml
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/api/openapi.yaml
@@ -772,7 +772,7 @@ paths:
         name: enum_header_string
         required: false
         schema:
-          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
+          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
         style: simple
       - description: Query parameter enum test (string array)
         explode: true
@@ -790,7 +790,7 @@ paths:
         name: enum_query_string
         required: false
         schema:
-          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
+          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
         style: form
       - description: Query parameter enum test (double)
         explode: true
@@ -2819,13 +2819,6 @@ components:
         enum_form_string:
           $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
       type: object
-    testEnumParameters_enum_header_string_parameter:
-      default: -efg
-      enum:
-      - _abc
-      - -efg
-      - (xyz)
-      type: string
     testEnumParameters_enum_query_integer_parameter:
       enum:
       - 1
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/apis/FakeApi.md
index 0febc3875e97..abf12b49fbf0 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/apis/FakeApi.md
@@ -483,7 +483,7 @@ void (empty response body)
 
 <a id="testenumparameters"></a>
 # **TestEnumParameters**
-> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersEnumHeaderStringParameter enumHeaderString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersEnumHeaderStringParameter enumQueryString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumQueryStringArray = null)
+> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersRequestEnumFormString enumHeaderString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersRequestEnumFormString enumQueryString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumQueryStringArray = null)
 
 To test enum parameters
 
@@ -496,11 +496,11 @@ To test enum parameters
 |------|------|-------------|-------|
 | **enumFormString** | **TestEnumParametersRequestEnumFormString** |  | [optional]  |
 | **enumFormStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [optional]  |
-| **enumHeaderString** | **TestEnumParametersEnumHeaderStringParameter** | Header parameter enum test (string) | [optional]  |
+| **enumHeaderString** | **TestEnumParametersRequestEnumFormString** | Header parameter enum test (string) | [optional]  |
 | **enumHeaderStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Header parameter enum test (string array) | [optional]  |
 | **enumQueryDouble** | **TestEnumParametersEnumQueryDoubleParameter** | Query parameter enum test (double) | [optional]  |
 | **enumQueryInteger** | **TestEnumParametersEnumQueryIntegerParameter** | Query parameter enum test (double) | [optional]  |
-| **enumQueryString** | **TestEnumParametersEnumHeaderStringParameter** | Query parameter enum test (string) | [optional]  |
+| **enumQueryString** | **TestEnumParametersRequestEnumFormString** | Query parameter enum test (string) | [optional]  |
 | **enumQueryStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
index 6638ec4068d1..53ad97cbc3c1 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -373,7 +373,7 @@ public interface IFakeApi : IApi
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -391,7 +391,7 @@ public interface IFakeApi : IApi
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -4450,7 +4450,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEnumParameters(ref Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void FormatTestEnumParameters(ref Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
 
         /// <summary>
         /// Validates the request parameters
@@ -4483,7 +4483,7 @@ private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnu
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
         {
             bool suppressDefaultLog = false;
             AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray);
@@ -4504,7 +4504,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4520,7 +4520,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
         {
             bool suppressDefaultLogLocalVar = false;
             OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray);
@@ -4543,7 +4543,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
 
         /// <summary>
         /// To test enum parameters To test enum parameters
@@ -4558,7 +4558,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
@@ -4584,7 +4584,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsy
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
index be99808e8e53..df3b3537a120 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
@@ -204,8 +204,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET
                 return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString);
             if (obj is TestDescendantsObjectType testDescendantsObjectType)
                 return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType);
-            if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter)
-                return TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter);
             if (obj is TestEnumParametersEnumQueryDoubleParameter testEnumParametersEnumQueryDoubleParameter)
                 return TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter).ToString();
             if (obj is TestEnumParametersEnumQueryIntegerParameter testEnumParametersEnumQueryIntegerParameter)
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
index 0d45a7a32e20..2619a2bb97b0 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
@@ -176,8 +176,6 @@ public HostConfiguration(IServiceCollection services)
             _jsonOptions.Converters.Add(new TestDescendantsJsonConverter());
             _jsonOptions.Converters.Add(new TestDescendantsObjectTypeJsonConverter());
             _jsonOptions.Converters.Add(new TestDescendantsObjectTypeNullableJsonConverter());
-            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterJsonConverter());
-            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryIntegerParameterJsonConverter());
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES
index 4d9b3d8248d3..905ec3b8592d 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES
@@ -121,7 +121,6 @@ docs/models/TestCollectionEndingWithWordList.md
 docs/models/TestCollectionEndingWithWordListObject.md
 docs/models/TestDescendants.md
 docs/models/TestDescendantsObjectType.md
-docs/models/TestEnumParametersEnumHeaderStringParameter.md
 docs/models/TestEnumParametersEnumQueryDoubleParameter.md
 docs/models/TestEnumParametersEnumQueryIntegerParameter.md
 docs/models/TestEnumParametersRequestEnumFormString.md
@@ -288,7 +287,6 @@ src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs
 src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs
 src/Org.OpenAPITools/Model/TestDescendants.cs
 src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs
-src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml
index 6dae7b5ccbd3..8e6e916f99eb 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml
@@ -772,7 +772,7 @@ paths:
         name: enum_header_string
         required: false
         schema:
-          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
+          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
         style: simple
       - description: Query parameter enum test (string array)
         explode: true
@@ -790,7 +790,7 @@ paths:
         name: enum_query_string
         required: false
         schema:
-          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
+          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
         style: form
       - description: Query parameter enum test (double)
         explode: true
@@ -2819,13 +2819,6 @@ components:
         enum_form_string:
           $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
       type: object
-    testEnumParameters_enum_header_string_parameter:
-      default: -efg
-      enum:
-      - _abc
-      - -efg
-      - (xyz)
-      type: string
     testEnumParameters_enum_query_integer_parameter:
       enum:
       - 1
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/FakeApi.md
index 408b1fc495ae..1a41e359c74e 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/FakeApi.md
@@ -483,7 +483,7 @@ void (empty response body)
 
 <a id="testenumparameters"></a>
 # **TestEnumParameters**
-> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersEnumHeaderStringParameter enumHeaderString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersEnumHeaderStringParameter enumQueryString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumQueryStringArray = null)
+> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersRequestEnumFormString enumHeaderString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersRequestEnumFormString enumQueryString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumQueryStringArray = null)
 
 To test enum parameters
 
@@ -496,11 +496,11 @@ To test enum parameters
 |------|------|-------------|-------|
 | **enumFormString** | **TestEnumParametersRequestEnumFormString** |  | [optional]  |
 | **enumFormStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [optional]  |
-| **enumHeaderString** | **TestEnumParametersEnumHeaderStringParameter** | Header parameter enum test (string) | [optional]  |
+| **enumHeaderString** | **TestEnumParametersRequestEnumFormString** | Header parameter enum test (string) | [optional]  |
 | **enumHeaderStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Header parameter enum test (string array) | [optional]  |
 | **enumQueryDouble** | **TestEnumParametersEnumQueryDoubleParameter** | Query parameter enum test (double) | [optional]  |
 | **enumQueryInteger** | **TestEnumParametersEnumQueryIntegerParameter** | Query parameter enum test (double) | [optional]  |
-| **enumQueryString** | **TestEnumParametersEnumHeaderStringParameter** | Query parameter enum test (string) | [optional]  |
+| **enumQueryString** | **TestEnumParametersRequestEnumFormString** | Query parameter enum test (string) | [optional]  |
 | **enumQueryStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
index e978aa8b5292..3f5b3258a5b3 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -373,7 +373,7 @@ public interface IFakeApi : IApi
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -391,7 +391,7 @@ public interface IFakeApi : IApi
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -4441,7 +4441,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEnumParameters(ref Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void FormatTestEnumParameters(ref Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
 
         /// <summary>
         /// Validates the request parameters
@@ -4474,7 +4474,7 @@ private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnu
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
         {
             bool suppressDefaultLog = false;
             AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray);
@@ -4495,7 +4495,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4511,7 +4511,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
         {
             bool suppressDefaultLogLocalVar = false;
             OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray);
@@ -4534,7 +4534,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
 
         /// <summary>
         /// To test enum parameters To test enum parameters
@@ -4549,7 +4549,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
@@ -4575,7 +4575,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsy
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
index 965dcceeeeb5..69cca784e095 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
@@ -205,8 +205,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET
                 return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString);
             if (obj is TestDescendantsObjectType testDescendantsObjectType)
                 return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType);
-            if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter)
-                return TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter);
             if (obj is TestEnumParametersEnumQueryDoubleParameter testEnumParametersEnumQueryDoubleParameter)
                 return TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter).ToString();
             if (obj is TestEnumParametersEnumQueryIntegerParameter testEnumParametersEnumQueryIntegerParameter)
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
index b5191f41e54e..03f33980ecc4 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
@@ -174,8 +174,6 @@ public HostConfiguration(IServiceCollection services)
             _jsonOptions.Converters.Add(new TestDescendantsJsonConverter());
             _jsonOptions.Converters.Add(new TestDescendantsObjectTypeJsonConverter());
             _jsonOptions.Converters.Add(new TestDescendantsObjectTypeNullableJsonConverter());
-            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterJsonConverter());
-            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryIntegerParameterJsonConverter());
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES
index 4d9b3d8248d3..905ec3b8592d 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES
@@ -121,7 +121,6 @@ docs/models/TestCollectionEndingWithWordList.md
 docs/models/TestCollectionEndingWithWordListObject.md
 docs/models/TestDescendants.md
 docs/models/TestDescendantsObjectType.md
-docs/models/TestEnumParametersEnumHeaderStringParameter.md
 docs/models/TestEnumParametersEnumQueryDoubleParameter.md
 docs/models/TestEnumParametersEnumQueryIntegerParameter.md
 docs/models/TestEnumParametersRequestEnumFormString.md
@@ -288,7 +287,6 @@ src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs
 src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs
 src/Org.OpenAPITools/Model/TestDescendants.cs
 src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs
-src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml
index 6dae7b5ccbd3..8e6e916f99eb 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml
@@ -772,7 +772,7 @@ paths:
         name: enum_header_string
         required: false
         schema:
-          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
+          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
         style: simple
       - description: Query parameter enum test (string array)
         explode: true
@@ -790,7 +790,7 @@ paths:
         name: enum_query_string
         required: false
         schema:
-          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
+          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
         style: form
       - description: Query parameter enum test (double)
         explode: true
@@ -2819,13 +2819,6 @@ components:
         enum_form_string:
           $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
       type: object
-    testEnumParameters_enum_header_string_parameter:
-      default: -efg
-      enum:
-      - _abc
-      - -efg
-      - (xyz)
-      type: string
     testEnumParameters_enum_query_integer_parameter:
       enum:
       - 1
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/FakeApi.md
index 408b1fc495ae..1a41e359c74e 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/FakeApi.md
@@ -483,7 +483,7 @@ void (empty response body)
 
 <a id="testenumparameters"></a>
 # **TestEnumParameters**
-> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersEnumHeaderStringParameter enumHeaderString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersEnumHeaderStringParameter enumQueryString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumQueryStringArray = null)
+> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersRequestEnumFormString enumHeaderString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersRequestEnumFormString enumQueryString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumQueryStringArray = null)
 
 To test enum parameters
 
@@ -496,11 +496,11 @@ To test enum parameters
 |------|------|-------------|-------|
 | **enumFormString** | **TestEnumParametersRequestEnumFormString** |  | [optional]  |
 | **enumFormStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [optional]  |
-| **enumHeaderString** | **TestEnumParametersEnumHeaderStringParameter** | Header parameter enum test (string) | [optional]  |
+| **enumHeaderString** | **TestEnumParametersRequestEnumFormString** | Header parameter enum test (string) | [optional]  |
 | **enumHeaderStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Header parameter enum test (string array) | [optional]  |
 | **enumQueryDouble** | **TestEnumParametersEnumQueryDoubleParameter** | Query parameter enum test (double) | [optional]  |
 | **enumQueryInteger** | **TestEnumParametersEnumQueryIntegerParameter** | Query parameter enum test (double) | [optional]  |
-| **enumQueryString** | **TestEnumParametersEnumHeaderStringParameter** | Query parameter enum test (string) | [optional]  |
+| **enumQueryString** | **TestEnumParametersRequestEnumFormString** | Query parameter enum test (string) | [optional]  |
 | **enumQueryStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
index e978aa8b5292..3f5b3258a5b3 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -373,7 +373,7 @@ public interface IFakeApi : IApi
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -391,7 +391,7 @@ public interface IFakeApi : IApi
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -4441,7 +4441,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEnumParameters(ref Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void FormatTestEnumParameters(ref Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
 
         /// <summary>
         /// Validates the request parameters
@@ -4474,7 +4474,7 @@ private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnu
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
         {
             bool suppressDefaultLog = false;
             AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray);
@@ -4495,7 +4495,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4511,7 +4511,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
         {
             bool suppressDefaultLogLocalVar = false;
             OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray);
@@ -4534,7 +4534,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
 
         /// <summary>
         /// To test enum parameters To test enum parameters
@@ -4549,7 +4549,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
@@ -4575,7 +4575,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsy
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
index 965dcceeeeb5..69cca784e095 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
@@ -205,8 +205,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET
                 return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString);
             if (obj is TestDescendantsObjectType testDescendantsObjectType)
                 return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType);
-            if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter)
-                return TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter);
             if (obj is TestEnumParametersEnumQueryDoubleParameter testEnumParametersEnumQueryDoubleParameter)
                 return TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter).ToString();
             if (obj is TestEnumParametersEnumQueryIntegerParameter testEnumParametersEnumQueryIntegerParameter)
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
index b5191f41e54e..03f33980ecc4 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
@@ -174,8 +174,6 @@ public HostConfiguration(IServiceCollection services)
             _jsonOptions.Converters.Add(new TestDescendantsJsonConverter());
             _jsonOptions.Converters.Add(new TestDescendantsObjectTypeJsonConverter());
             _jsonOptions.Converters.Add(new TestDescendantsObjectTypeNullableJsonConverter());
-            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterJsonConverter());
-            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryIntegerParameterJsonConverter());
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES
index 737d53400248..cacee1eafc1b 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES
@@ -121,7 +121,6 @@ docs/models/TestCollectionEndingWithWordList.md
 docs/models/TestCollectionEndingWithWordListObject.md
 docs/models/TestDescendants.md
 docs/models/TestDescendantsObjectType.md
-docs/models/TestEnumParametersEnumHeaderStringParameter.md
 docs/models/TestEnumParametersEnumQueryDoubleParameter.md
 docs/models/TestEnumParametersEnumQueryIntegerParameter.md
 docs/models/TestEnumParametersRequestEnumFormString.md
@@ -290,7 +289,6 @@ src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs
 src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs
 src/Org.OpenAPITools/Model/TestDescendants.cs
 src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs
-src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml
index 6dae7b5ccbd3..8e6e916f99eb 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml
@@ -772,7 +772,7 @@ paths:
         name: enum_header_string
         required: false
         schema:
-          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
+          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
         style: simple
       - description: Query parameter enum test (string array)
         explode: true
@@ -790,7 +790,7 @@ paths:
         name: enum_query_string
         required: false
         schema:
-          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
+          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
         style: form
       - description: Query parameter enum test (double)
         explode: true
@@ -2819,13 +2819,6 @@ components:
         enum_form_string:
           $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
       type: object
-    testEnumParameters_enum_header_string_parameter:
-      default: -efg
-      enum:
-      - _abc
-      - -efg
-      - (xyz)
-      type: string
     testEnumParameters_enum_query_integer_parameter:
       enum:
       - 1
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/FakeApi.md
index 0febc3875e97..abf12b49fbf0 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/FakeApi.md
@@ -483,7 +483,7 @@ void (empty response body)
 
 <a id="testenumparameters"></a>
 # **TestEnumParameters**
-> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersEnumHeaderStringParameter enumHeaderString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersEnumHeaderStringParameter enumQueryString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumQueryStringArray = null)
+> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersRequestEnumFormString enumHeaderString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersRequestEnumFormString enumQueryString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumQueryStringArray = null)
 
 To test enum parameters
 
@@ -496,11 +496,11 @@ To test enum parameters
 |------|------|-------------|-------|
 | **enumFormString** | **TestEnumParametersRequestEnumFormString** |  | [optional]  |
 | **enumFormStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [optional]  |
-| **enumHeaderString** | **TestEnumParametersEnumHeaderStringParameter** | Header parameter enum test (string) | [optional]  |
+| **enumHeaderString** | **TestEnumParametersRequestEnumFormString** | Header parameter enum test (string) | [optional]  |
 | **enumHeaderStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Header parameter enum test (string array) | [optional]  |
 | **enumQueryDouble** | **TestEnumParametersEnumQueryDoubleParameter** | Query parameter enum test (double) | [optional]  |
 | **enumQueryInteger** | **TestEnumParametersEnumQueryIntegerParameter** | Query parameter enum test (double) | [optional]  |
-| **enumQueryString** | **TestEnumParametersEnumHeaderStringParameter** | Query parameter enum test (string) | [optional]  |
+| **enumQueryString** | **TestEnumParametersRequestEnumFormString** | Query parameter enum test (string) | [optional]  |
 | **enumQueryStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
index 6638ec4068d1..53ad97cbc3c1 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -373,7 +373,7 @@ public interface IFakeApi : IApi
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -391,7 +391,7 @@ public interface IFakeApi : IApi
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -4450,7 +4450,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEnumParameters(ref Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void FormatTestEnumParameters(ref Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
 
         /// <summary>
         /// Validates the request parameters
@@ -4483,7 +4483,7 @@ private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnu
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
         {
             bool suppressDefaultLog = false;
             AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray);
@@ -4504,7 +4504,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4520,7 +4520,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
         {
             bool suppressDefaultLogLocalVar = false;
             OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray);
@@ -4543,7 +4543,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
 
         /// <summary>
         /// To test enum parameters To test enum parameters
@@ -4558,7 +4558,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
@@ -4584,7 +4584,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsy
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
index be99808e8e53..df3b3537a120 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
@@ -204,8 +204,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET
                 return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString);
             if (obj is TestDescendantsObjectType testDescendantsObjectType)
                 return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType);
-            if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter)
-                return TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter);
             if (obj is TestEnumParametersEnumQueryDoubleParameter testEnumParametersEnumQueryDoubleParameter)
                 return TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter).ToString();
             if (obj is TestEnumParametersEnumQueryIntegerParameter testEnumParametersEnumQueryIntegerParameter)
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
index 0d45a7a32e20..2619a2bb97b0 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
@@ -176,8 +176,6 @@ public HostConfiguration(IServiceCollection services)
             _jsonOptions.Converters.Add(new TestDescendantsJsonConverter());
             _jsonOptions.Converters.Add(new TestDescendantsObjectTypeJsonConverter());
             _jsonOptions.Converters.Add(new TestDescendantsObjectTypeNullableJsonConverter());
-            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterJsonConverter());
-            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryIntegerParameterJsonConverter());
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES
index 737d53400248..cacee1eafc1b 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES
@@ -121,7 +121,6 @@ docs/models/TestCollectionEndingWithWordList.md
 docs/models/TestCollectionEndingWithWordListObject.md
 docs/models/TestDescendants.md
 docs/models/TestDescendantsObjectType.md
-docs/models/TestEnumParametersEnumHeaderStringParameter.md
 docs/models/TestEnumParametersEnumQueryDoubleParameter.md
 docs/models/TestEnumParametersEnumQueryIntegerParameter.md
 docs/models/TestEnumParametersRequestEnumFormString.md
@@ -290,7 +289,6 @@ src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs
 src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs
 src/Org.OpenAPITools/Model/TestDescendants.cs
 src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs
-src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs
 src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml
index 6dae7b5ccbd3..8e6e916f99eb 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml
@@ -772,7 +772,7 @@ paths:
         name: enum_header_string
         required: false
         schema:
-          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
+          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
         style: simple
       - description: Query parameter enum test (string array)
         explode: true
@@ -790,7 +790,7 @@ paths:
         name: enum_query_string
         required: false
         schema:
-          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
+          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
         style: form
       - description: Query parameter enum test (double)
         explode: true
@@ -2819,13 +2819,6 @@ components:
         enum_form_string:
           $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
       type: object
-    testEnumParameters_enum_header_string_parameter:
-      default: -efg
-      enum:
-      - _abc
-      - -efg
-      - (xyz)
-      type: string
     testEnumParameters_enum_query_integer_parameter:
       enum:
       - 1
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/apis/FakeApi.md
index 0febc3875e97..abf12b49fbf0 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/apis/FakeApi.md
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/apis/FakeApi.md
@@ -483,7 +483,7 @@ void (empty response body)
 
 <a id="testenumparameters"></a>
 # **TestEnumParameters**
-> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersEnumHeaderStringParameter enumHeaderString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersEnumHeaderStringParameter enumQueryString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumQueryStringArray = null)
+> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumFormStringArray = null, TestEnumParametersRequestEnumFormString enumHeaderString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersRequestEnumFormString enumQueryString = null, List<TestEnumParametersRequestEnumFormStringArrayInner> enumQueryStringArray = null)
 
 To test enum parameters
 
@@ -496,11 +496,11 @@ To test enum parameters
 |------|------|-------------|-------|
 | **enumFormString** | **TestEnumParametersRequestEnumFormString** |  | [optional]  |
 | **enumFormStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [optional]  |
-| **enumHeaderString** | **TestEnumParametersEnumHeaderStringParameter** | Header parameter enum test (string) | [optional]  |
+| **enumHeaderString** | **TestEnumParametersRequestEnumFormString** | Header parameter enum test (string) | [optional]  |
 | **enumHeaderStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Header parameter enum test (string array) | [optional]  |
 | **enumQueryDouble** | **TestEnumParametersEnumQueryDoubleParameter** | Query parameter enum test (double) | [optional]  |
 | **enumQueryInteger** | **TestEnumParametersEnumQueryIntegerParameter** | Query parameter enum test (double) | [optional]  |
-| **enumQueryString** | **TestEnumParametersEnumHeaderStringParameter** | Query parameter enum test (string) | [optional]  |
+| **enumQueryString** | **TestEnumParametersRequestEnumFormString** | Query parameter enum test (string) | [optional]  |
 | **enumQueryStringArray** | [**List&lt;TestEnumParametersRequestEnumFormStringArrayInner&gt;**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | [optional]  |
 
 ### Return type
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
index 6638ec4068d1..53ad97cbc3c1 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -373,7 +373,7 @@ public interface IFakeApi : IApi
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// To test enum parameters
@@ -391,7 +391,7 @@ public interface IFakeApi : IApi
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
+        Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Fake endpoint to test group parameters (optional)
@@ -4450,7 +4450,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht
             partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode);
         }
 
-        partial void FormatTestEnumParameters(ref Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void FormatTestEnumParameters(ref Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, ref Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, ref Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, ref Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, ref Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
 
         /// <summary>
         /// Validates the request parameters
@@ -4483,7 +4483,7 @@ private void ValidateTestEnumParameters(Option<List<TestEnumParametersRequestEnu
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
         {
             bool suppressDefaultLog = false;
             AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray);
@@ -4504,7 +4504,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
 
         /// <summary>
         /// Logs exceptions that occur while retrieving the server response
@@ -4520,7 +4520,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
+        private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray)
         {
             bool suppressDefaultLogLocalVar = false;
             OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray);
@@ -4543,7 +4543,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL
         /// <param name="enumQueryInteger"></param>
         /// <param name="enumQueryString"></param>
         /// <param name="enumQueryStringArray"></param>
-        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
+        partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option<TestEnumParametersRequestEnumFormString> enumFormString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray, Option<TestEnumParametersRequestEnumFormString> enumHeaderString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger, Option<TestEnumParametersRequestEnumFormString> enumQueryString, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray);
 
         /// <summary>
         /// To test enum parameters To test enum parameters
@@ -4558,7 +4558,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
         {
             try
             {
@@ -4584,7 +4584,7 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersOrDefaultAsy
         /// <param name="enumQueryStringArray">Query parameter enum test (string array) (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns><see cref="Task"/>&lt;<see cref="ITestEnumParametersApiResponse"/>&gt;</returns>
-        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersEnumHeaderStringParameter> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersEnumHeaderStringParameter> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
+        public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option<TestEnumParametersRequestEnumFormString> enumFormString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumFormStringArray = default, Option<TestEnumParametersRequestEnumFormString> enumHeaderString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumHeaderStringArray = default, Option<TestEnumParametersEnumQueryDoubleParameter> enumQueryDouble = default, Option<TestEnumParametersEnumQueryIntegerParameter> enumQueryInteger = default, Option<TestEnumParametersRequestEnumFormString> enumQueryString = default, Option<List<TestEnumParametersRequestEnumFormStringArrayInner>> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default)
         {
             UriBuilder uriBuilderLocalVar = new UriBuilder();
 
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
index be99808e8e53..df3b3537a120 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs
@@ -204,8 +204,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET
                 return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString);
             if (obj is TestDescendantsObjectType testDescendantsObjectType)
                 return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType);
-            if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter)
-                return TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter);
             if (obj is TestEnumParametersEnumQueryDoubleParameter testEnumParametersEnumQueryDoubleParameter)
                 return TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter).ToString();
             if (obj is TestEnumParametersEnumQueryIntegerParameter testEnumParametersEnumQueryIntegerParameter)
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
index 0d45a7a32e20..2619a2bb97b0 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs
@@ -176,8 +176,6 @@ public HostConfiguration(IServiceCollection services)
             _jsonOptions.Converters.Add(new TestDescendantsJsonConverter());
             _jsonOptions.Converters.Add(new TestDescendantsObjectTypeJsonConverter());
             _jsonOptions.Converters.Add(new TestDescendantsObjectTypeNullableJsonConverter());
-            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterJsonConverter());
-            _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter());
             _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryIntegerParameterJsonConverter());
diff --git a/samples/openapi3/client/petstore/python-aiohttp/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-aiohttp/.openapi-generator/FILES
index 1eb565d74f11..c74579383333 100644
--- a/samples/openapi3/client/petstore/python-aiohttp/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/python-aiohttp/.openapi-generator/FILES
@@ -120,7 +120,6 @@ docs/Tiger.md
 docs/Type.md
 docs/UnnamedDictWithAdditionalModelListProperties.md
 docs/UnnamedDictWithAdditionalStringListProperties.md
-docs/UploadFileWithAdditionalPropertiesRequestObject.md
 docs/User.md
 docs/UserApi.md
 docs/UuidWithPattern.md
@@ -251,7 +250,6 @@ petstore_api/models/tiger.py
 petstore_api/models/type.py
 petstore_api/models/unnamed_dict_with_additional_model_list_properties.py
 petstore_api/models/unnamed_dict_with_additional_string_list_properties.py
-petstore_api/models/upload_file_with_additional_properties_request_object.py
 petstore_api/models/user.py
 petstore_api/models/uuid_with_pattern.py
 petstore_api/models/with_nested_one_of.py
diff --git a/samples/openapi3/client/petstore/python-aiohttp/README.md b/samples/openapi3/client/petstore/python-aiohttp/README.md
index 083f77de9690..bf68ad1bff6a 100644
--- a/samples/openapi3/client/petstore/python-aiohttp/README.md
+++ b/samples/openapi3/client/petstore/python-aiohttp/README.md
@@ -261,7 +261,6 @@ Class | Method | HTTP request | Description
  - [Type](docs/Type.md)
  - [UnnamedDictWithAdditionalModelListProperties](docs/UnnamedDictWithAdditionalModelListProperties.md)
  - [UnnamedDictWithAdditionalStringListProperties](docs/UnnamedDictWithAdditionalStringListProperties.md)
- - [UploadFileWithAdditionalPropertiesRequestObject](docs/UploadFileWithAdditionalPropertiesRequestObject.md)
  - [User](docs/User.md)
  - [UuidWithPattern](docs/UuidWithPattern.md)
  - [WithNestedOneOf](docs/WithNestedOneOf.md)
diff --git a/samples/openapi3/client/petstore/python-aiohttp/docs/FakeApi.md b/samples/openapi3/client/petstore/python-aiohttp/docs/FakeApi.md
index 8f79394afc28..a8b76b34b894 100644
--- a/samples/openapi3/client/petstore/python-aiohttp/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/python-aiohttp/docs/FakeApi.md
@@ -2478,7 +2478,7 @@ uploads a file and additional properties using multipart/form-data
 ```python
 import petstore_api
 from petstore_api.models.model_api_response import ModelApiResponse
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
+from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
 from petstore_api.rest import ApiException
 from pprint import pprint
 
@@ -2494,7 +2494,7 @@ async with petstore_api.ApiClient(configuration) as api_client:
     # Create an instance of the API class
     api_instance = petstore_api.FakeApi(api_client)
     file = None # bytes | file to upload
-    object = petstore_api.UploadFileWithAdditionalPropertiesRequestObject() # UploadFileWithAdditionalPropertiesRequestObject |  (optional)
+    object = petstore_api.TestObjectForMultipartRequestsRequestMarker() # TestObjectForMultipartRequestsRequestMarker |  (optional)
     count = 56 # int | Integer count (optional)
 
     try:
@@ -2514,7 +2514,7 @@ async with petstore_api.ApiClient(configuration) as api_client:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **file** | **bytes**| file to upload | 
- **object** | [**UploadFileWithAdditionalPropertiesRequestObject**](UploadFileWithAdditionalPropertiesRequestObject.md)|  | [optional] 
+ **object** | [**TestObjectForMultipartRequestsRequestMarker**](TestObjectForMultipartRequestsRequestMarker.md)|  | [optional] 
  **count** | **int**| Integer count | [optional] 
 
 ### Return type
diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/__init__.py
index c7f461775f59..6a76c22cac03 100644
--- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/__init__.py
+++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/__init__.py
@@ -146,7 +146,6 @@
     "Type",
     "UnnamedDictWithAdditionalModelListProperties",
     "UnnamedDictWithAdditionalStringListProperties",
-    "UploadFileWithAdditionalPropertiesRequestObject",
     "User",
     "UuidWithPattern",
     "WithNestedOneOf",
@@ -285,7 +284,6 @@
 from petstore_api.models.type import Type as Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User as User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern as UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf
diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/fake_api.py
index 9e895f7806ee..0d435906bfba 100644
--- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/fake_api.py
+++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/fake_api.py
@@ -32,7 +32,6 @@
 from petstore_api.models.tag import Tag
 from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest
 from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 
 from petstore_api.api_client import ApiClient, RequestSerialized
@@ -9820,7 +9819,7 @@ def _test_string_map_reference_serialize(
     async def upload_file_with_additional_properties(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
+        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9842,7 +9841,7 @@ async def upload_file_with_additional_properties(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: UploadFileWithAdditionalPropertiesRequestObject
+        :type object: TestObjectForMultipartRequestsRequestMarker
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
@@ -9895,7 +9894,7 @@ async def upload_file_with_additional_properties(
     async def upload_file_with_additional_properties_with_http_info(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
+        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9917,7 +9916,7 @@ async def upload_file_with_additional_properties_with_http_info(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: UploadFileWithAdditionalPropertiesRequestObject
+        :type object: TestObjectForMultipartRequestsRequestMarker
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
@@ -9970,7 +9969,7 @@ async def upload_file_with_additional_properties_with_http_info(
     async def upload_file_with_additional_properties_without_preload_content(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
+        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9992,7 +9991,7 @@ async def upload_file_with_additional_properties_without_preload_content(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: UploadFileWithAdditionalPropertiesRequestObject
+        :type object: TestObjectForMultipartRequestsRequestMarker
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/__init__.py
index 308e6dfc3ebb..e498be0e1492 100644
--- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/__init__.py
+++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/__init__.py
@@ -123,7 +123,6 @@
 from petstore_api.models.type import Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf
diff --git a/samples/openapi3/client/petstore/python-httpx/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-httpx/.openapi-generator/FILES
index 1eb565d74f11..c74579383333 100644
--- a/samples/openapi3/client/petstore/python-httpx/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/python-httpx/.openapi-generator/FILES
@@ -120,7 +120,6 @@ docs/Tiger.md
 docs/Type.md
 docs/UnnamedDictWithAdditionalModelListProperties.md
 docs/UnnamedDictWithAdditionalStringListProperties.md
-docs/UploadFileWithAdditionalPropertiesRequestObject.md
 docs/User.md
 docs/UserApi.md
 docs/UuidWithPattern.md
@@ -251,7 +250,6 @@ petstore_api/models/tiger.py
 petstore_api/models/type.py
 petstore_api/models/unnamed_dict_with_additional_model_list_properties.py
 petstore_api/models/unnamed_dict_with_additional_string_list_properties.py
-petstore_api/models/upload_file_with_additional_properties_request_object.py
 petstore_api/models/user.py
 petstore_api/models/uuid_with_pattern.py
 petstore_api/models/with_nested_one_of.py
diff --git a/samples/openapi3/client/petstore/python-httpx/README.md b/samples/openapi3/client/petstore/python-httpx/README.md
index 083f77de9690..bf68ad1bff6a 100644
--- a/samples/openapi3/client/petstore/python-httpx/README.md
+++ b/samples/openapi3/client/petstore/python-httpx/README.md
@@ -261,7 +261,6 @@ Class | Method | HTTP request | Description
  - [Type](docs/Type.md)
  - [UnnamedDictWithAdditionalModelListProperties](docs/UnnamedDictWithAdditionalModelListProperties.md)
  - [UnnamedDictWithAdditionalStringListProperties](docs/UnnamedDictWithAdditionalStringListProperties.md)
- - [UploadFileWithAdditionalPropertiesRequestObject](docs/UploadFileWithAdditionalPropertiesRequestObject.md)
  - [User](docs/User.md)
  - [UuidWithPattern](docs/UuidWithPattern.md)
  - [WithNestedOneOf](docs/WithNestedOneOf.md)
diff --git a/samples/openapi3/client/petstore/python-httpx/docs/FakeApi.md b/samples/openapi3/client/petstore/python-httpx/docs/FakeApi.md
index 8f79394afc28..a8b76b34b894 100644
--- a/samples/openapi3/client/petstore/python-httpx/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/python-httpx/docs/FakeApi.md
@@ -2478,7 +2478,7 @@ uploads a file and additional properties using multipart/form-data
 ```python
 import petstore_api
 from petstore_api.models.model_api_response import ModelApiResponse
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
+from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
 from petstore_api.rest import ApiException
 from pprint import pprint
 
@@ -2494,7 +2494,7 @@ async with petstore_api.ApiClient(configuration) as api_client:
     # Create an instance of the API class
     api_instance = petstore_api.FakeApi(api_client)
     file = None # bytes | file to upload
-    object = petstore_api.UploadFileWithAdditionalPropertiesRequestObject() # UploadFileWithAdditionalPropertiesRequestObject |  (optional)
+    object = petstore_api.TestObjectForMultipartRequestsRequestMarker() # TestObjectForMultipartRequestsRequestMarker |  (optional)
     count = 56 # int | Integer count (optional)
 
     try:
@@ -2514,7 +2514,7 @@ async with petstore_api.ApiClient(configuration) as api_client:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **file** | **bytes**| file to upload | 
- **object** | [**UploadFileWithAdditionalPropertiesRequestObject**](UploadFileWithAdditionalPropertiesRequestObject.md)|  | [optional] 
+ **object** | [**TestObjectForMultipartRequestsRequestMarker**](TestObjectForMultipartRequestsRequestMarker.md)|  | [optional] 
  **count** | **int**| Integer count | [optional] 
 
 ### Return type
diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/__init__.py
index c7f461775f59..6a76c22cac03 100644
--- a/samples/openapi3/client/petstore/python-httpx/petstore_api/__init__.py
+++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/__init__.py
@@ -146,7 +146,6 @@
     "Type",
     "UnnamedDictWithAdditionalModelListProperties",
     "UnnamedDictWithAdditionalStringListProperties",
-    "UploadFileWithAdditionalPropertiesRequestObject",
     "User",
     "UuidWithPattern",
     "WithNestedOneOf",
@@ -285,7 +284,6 @@
 from petstore_api.models.type import Type as Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User as User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern as UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf
diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/api/fake_api.py
index 9e895f7806ee..0d435906bfba 100644
--- a/samples/openapi3/client/petstore/python-httpx/petstore_api/api/fake_api.py
+++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/api/fake_api.py
@@ -32,7 +32,6 @@
 from petstore_api.models.tag import Tag
 from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest
 from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 
 from petstore_api.api_client import ApiClient, RequestSerialized
@@ -9820,7 +9819,7 @@ def _test_string_map_reference_serialize(
     async def upload_file_with_additional_properties(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
+        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9842,7 +9841,7 @@ async def upload_file_with_additional_properties(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: UploadFileWithAdditionalPropertiesRequestObject
+        :type object: TestObjectForMultipartRequestsRequestMarker
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
@@ -9895,7 +9894,7 @@ async def upload_file_with_additional_properties(
     async def upload_file_with_additional_properties_with_http_info(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
+        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9917,7 +9916,7 @@ async def upload_file_with_additional_properties_with_http_info(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: UploadFileWithAdditionalPropertiesRequestObject
+        :type object: TestObjectForMultipartRequestsRequestMarker
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
@@ -9970,7 +9969,7 @@ async def upload_file_with_additional_properties_with_http_info(
     async def upload_file_with_additional_properties_without_preload_content(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
+        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9992,7 +9991,7 @@ async def upload_file_with_additional_properties_without_preload_content(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: UploadFileWithAdditionalPropertiesRequestObject
+        :type object: TestObjectForMultipartRequestsRequestMarker
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/__init__.py
index 308e6dfc3ebb..e498be0e1492 100644
--- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/__init__.py
+++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/__init__.py
@@ -123,7 +123,6 @@
 from petstore_api.models.type import Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf
diff --git a/samples/openapi3/client/petstore/python-lazyImports/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-lazyImports/.openapi-generator/FILES
index 1eb565d74f11..c74579383333 100644
--- a/samples/openapi3/client/petstore/python-lazyImports/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/python-lazyImports/.openapi-generator/FILES
@@ -120,7 +120,6 @@ docs/Tiger.md
 docs/Type.md
 docs/UnnamedDictWithAdditionalModelListProperties.md
 docs/UnnamedDictWithAdditionalStringListProperties.md
-docs/UploadFileWithAdditionalPropertiesRequestObject.md
 docs/User.md
 docs/UserApi.md
 docs/UuidWithPattern.md
@@ -251,7 +250,6 @@ petstore_api/models/tiger.py
 petstore_api/models/type.py
 petstore_api/models/unnamed_dict_with_additional_model_list_properties.py
 petstore_api/models/unnamed_dict_with_additional_string_list_properties.py
-petstore_api/models/upload_file_with_additional_properties_request_object.py
 petstore_api/models/user.py
 petstore_api/models/uuid_with_pattern.py
 petstore_api/models/with_nested_one_of.py
diff --git a/samples/openapi3/client/petstore/python-lazyImports/README.md b/samples/openapi3/client/petstore/python-lazyImports/README.md
index 566c23f9203e..da9b286087d3 100644
--- a/samples/openapi3/client/petstore/python-lazyImports/README.md
+++ b/samples/openapi3/client/petstore/python-lazyImports/README.md
@@ -261,7 +261,6 @@ Class | Method | HTTP request | Description
  - [Type](docs/Type.md)
  - [UnnamedDictWithAdditionalModelListProperties](docs/UnnamedDictWithAdditionalModelListProperties.md)
  - [UnnamedDictWithAdditionalStringListProperties](docs/UnnamedDictWithAdditionalStringListProperties.md)
- - [UploadFileWithAdditionalPropertiesRequestObject](docs/UploadFileWithAdditionalPropertiesRequestObject.md)
  - [User](docs/User.md)
  - [UuidWithPattern](docs/UuidWithPattern.md)
  - [WithNestedOneOf](docs/WithNestedOneOf.md)
diff --git a/samples/openapi3/client/petstore/python-lazyImports/docs/FakeApi.md b/samples/openapi3/client/petstore/python-lazyImports/docs/FakeApi.md
index 7ef2af8af2c3..af0f050135b9 100644
--- a/samples/openapi3/client/petstore/python-lazyImports/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/python-lazyImports/docs/FakeApi.md
@@ -2478,7 +2478,7 @@ uploads a file and additional properties using multipart/form-data
 ```python
 import petstore_api
 from petstore_api.models.model_api_response import ModelApiResponse
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
+from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
 from petstore_api.rest import ApiException
 from pprint import pprint
 
@@ -2494,7 +2494,7 @@ with petstore_api.ApiClient(configuration) as api_client:
     # Create an instance of the API class
     api_instance = petstore_api.FakeApi(api_client)
     file = None # bytes | file to upload
-    object = petstore_api.UploadFileWithAdditionalPropertiesRequestObject() # UploadFileWithAdditionalPropertiesRequestObject |  (optional)
+    object = petstore_api.TestObjectForMultipartRequestsRequestMarker() # TestObjectForMultipartRequestsRequestMarker |  (optional)
     count = 56 # int | Integer count (optional)
 
     try:
@@ -2514,7 +2514,7 @@ with petstore_api.ApiClient(configuration) as api_client:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **file** | **bytes**| file to upload | 
- **object** | [**UploadFileWithAdditionalPropertiesRequestObject**](UploadFileWithAdditionalPropertiesRequestObject.md)|  | [optional] 
+ **object** | [**TestObjectForMultipartRequestsRequestMarker**](TestObjectForMultipartRequestsRequestMarker.md)|  | [optional] 
  **count** | **int**| Integer count | [optional] 
 
 ### Return type
diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/__init__.py
index 64ad7b567d1a..2688f53428a9 100644
--- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/__init__.py
+++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/__init__.py
@@ -146,7 +146,6 @@
     "Type",
     "UnnamedDictWithAdditionalModelListProperties",
     "UnnamedDictWithAdditionalStringListProperties",
-    "UploadFileWithAdditionalPropertiesRequestObject",
     "User",
     "UuidWithPattern",
     "WithNestedOneOf",
@@ -286,7 +285,6 @@
     from petstore_api.models.type import Type as Type
     from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties
     from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties
-    from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject
     from petstore_api.models.user import User as User
     from petstore_api.models.uuid_with_pattern import UuidWithPattern as UuidWithPattern
     from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf
@@ -432,7 +430,6 @@
 from petstore_api.models.type import Type as Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User as User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern as UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf
diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/fake_api.py
index 2373d1680c58..e3f86661e566 100644
--- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/fake_api.py
+++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/fake_api.py
@@ -32,7 +32,6 @@
 from petstore_api.models.tag import Tag
 from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest
 from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 
 from petstore_api.api_client import ApiClient, RequestSerialized
@@ -9820,7 +9819,7 @@ def _test_string_map_reference_serialize(
     def upload_file_with_additional_properties(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
+        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9842,7 +9841,7 @@ def upload_file_with_additional_properties(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: UploadFileWithAdditionalPropertiesRequestObject
+        :type object: TestObjectForMultipartRequestsRequestMarker
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
@@ -9895,7 +9894,7 @@ def upload_file_with_additional_properties(
     def upload_file_with_additional_properties_with_http_info(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
+        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9917,7 +9916,7 @@ def upload_file_with_additional_properties_with_http_info(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: UploadFileWithAdditionalPropertiesRequestObject
+        :type object: TestObjectForMultipartRequestsRequestMarker
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
@@ -9970,7 +9969,7 @@ def upload_file_with_additional_properties_with_http_info(
     def upload_file_with_additional_properties_without_preload_content(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
+        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9992,7 +9991,7 @@ def upload_file_with_additional_properties_without_preload_content(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: UploadFileWithAdditionalPropertiesRequestObject
+        :type object: TestObjectForMultipartRequestsRequestMarker
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/__init__.py
index 9f052c816cb7..34c087697749 100644
--- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/__init__.py
+++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/__init__.py
@@ -124,7 +124,6 @@
     from petstore_api.models.type import Type
     from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties
     from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties
-    from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
     from petstore_api.models.user import User
     from petstore_api.models.uuid_with_pattern import UuidWithPattern
     from petstore_api.models.with_nested_one_of import WithNestedOneOf
@@ -246,7 +245,6 @@
 from petstore_api.models.type import Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/.openapi-generator/FILES
index 3bdfdd3eebd9..a67a13c7dcba 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/.openapi-generator/FILES
@@ -120,7 +120,6 @@ docs/Tiger.md
 docs/Type.md
 docs/UnnamedDictWithAdditionalModelListProperties.md
 docs/UnnamedDictWithAdditionalStringListProperties.md
-docs/UploadFileWithAdditionalPropertiesRequestObject.md
 docs/User.md
 docs/UserApi.md
 docs/UuidWithPattern.md
@@ -251,7 +250,6 @@ petstore_api/models/tiger.py
 petstore_api/models/type.py
 petstore_api/models/unnamed_dict_with_additional_model_list_properties.py
 petstore_api/models/unnamed_dict_with_additional_string_list_properties.py
-petstore_api/models/upload_file_with_additional_properties_request_object.py
 petstore_api/models/user.py
 petstore_api/models/uuid_with_pattern.py
 petstore_api/models/with_nested_one_of.py
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/README.md b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/README.md
index a6aa883a7132..99a8f2b5f1fd 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/README.md
+++ b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/README.md
@@ -262,7 +262,6 @@ Class | Method | HTTP request | Description
  - [Type](docs/Type.md)
  - [UnnamedDictWithAdditionalModelListProperties](docs/UnnamedDictWithAdditionalModelListProperties.md)
  - [UnnamedDictWithAdditionalStringListProperties](docs/UnnamedDictWithAdditionalStringListProperties.md)
- - [UploadFileWithAdditionalPropertiesRequestObject](docs/UploadFileWithAdditionalPropertiesRequestObject.md)
  - [User](docs/User.md)
  - [UuidWithPattern](docs/UuidWithPattern.md)
  - [WithNestedOneOf](docs/WithNestedOneOf.md)
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/docs/FakeApi.md b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/docs/FakeApi.md
index 6aa84ef041f1..39863affaa41 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/docs/FakeApi.md
@@ -2503,7 +2503,7 @@ import time
 import os
 import petstore_api
 from petstore_api.models.api_response import ApiResponse
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
+from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
 from petstore_api.rest import ApiException
 from pprint import pprint
 
@@ -2519,7 +2519,7 @@ async with petstore_api.ApiClient(configuration) as api_client:
     # Create an instance of the API class
     api_instance = petstore_api.FakeApi(api_client)
     file = None # bytearray | file to upload
-    object = petstore_api.UploadFileWithAdditionalPropertiesRequestObject() # UploadFileWithAdditionalPropertiesRequestObject |  (optional)
+    object = petstore_api.TestObjectForMultipartRequestsRequestMarker() # TestObjectForMultipartRequestsRequestMarker |  (optional)
     count = 56 # int | Integer count (optional)
 
     try:
@@ -2538,7 +2538,7 @@ async with petstore_api.ApiClient(configuration) as api_client:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **file** | **bytearray**| file to upload | 
- **object** | [**UploadFileWithAdditionalPropertiesRequestObject**](UploadFileWithAdditionalPropertiesRequestObject.md)|  | [optional] 
+ **object** | [**TestObjectForMultipartRequestsRequestMarker**](TestObjectForMultipartRequestsRequestMarker.md)|  | [optional] 
  **count** | **int**| Integer count | [optional] 
 
 ### Return type
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/__init__.py
index e89049d66426..a6156ac008c3 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/__init__.py
+++ b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/__init__.py
@@ -146,7 +146,6 @@
     "Type",
     "UnnamedDictWithAdditionalModelListProperties",
     "UnnamedDictWithAdditionalStringListProperties",
-    "UploadFileWithAdditionalPropertiesRequestObject",
     "User",
     "UuidWithPattern",
     "WithNestedOneOf",
@@ -285,7 +284,6 @@
 from petstore_api.models.type import Type as Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User as User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern as UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/api/fake_api.py
index 7ee53259a5b9..fea013dec496 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/api/fake_api.py
+++ b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/api/fake_api.py
@@ -38,7 +38,6 @@
 from petstore_api.models.tag import Tag
 from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest
 from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 
 from petstore_api.api_client import ApiClient
@@ -4666,7 +4665,7 @@ async def test_string_map_reference_with_http_info(self, request_body : Annotate
             _request_auth=_params.get('_request_auth'))
 
     @validate_arguments
-    async def upload_file_with_additional_properties(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse:  # noqa: E501
+    async def upload_file_with_additional_properties(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[TestObjectForMultipartRequestsRequestMarker] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse:  # noqa: E501
         """uploads a file and additional properties using multipart/form-data  # noqa: E501
 
           # noqa: E501
@@ -4674,7 +4673,7 @@ async def upload_file_with_additional_properties(self, file : Annotated[Union[St
         :param file: file to upload (required)
         :type file: bytearray
         :param object:
-        :type object: UploadFileWithAdditionalPropertiesRequestObject
+        :type object: TestObjectForMultipartRequestsRequestMarker
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request.
@@ -4693,7 +4692,7 @@ async def upload_file_with_additional_properties(self, file : Annotated[Union[St
         return await self.upload_file_with_additional_properties_with_http_info(file, object, count, **kwargs)  # noqa: E501
 
     @validate_arguments
-    async def upload_file_with_additional_properties_with_http_info(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse:  # noqa: E501
+    async def upload_file_with_additional_properties_with_http_info(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[TestObjectForMultipartRequestsRequestMarker] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse:  # noqa: E501
         """uploads a file and additional properties using multipart/form-data  # noqa: E501
 
           # noqa: E501
@@ -4701,7 +4700,7 @@ async def upload_file_with_additional_properties_with_http_info(self, file : Ann
         :param file: file to upload (required)
         :type file: bytearray
         :param object:
-        :type object: UploadFileWithAdditionalPropertiesRequestObject
+        :type object: TestObjectForMultipartRequestsRequestMarker
         :param count: Integer count
         :type count: int
         :param _preload_content: if False, the ApiResponse.data will
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/models/__init__.py
index 51cf981e4b26..2ddd11a01de7 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/models/__init__.py
+++ b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/models/__init__.py
@@ -124,7 +124,6 @@
 from petstore_api.models.type import Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-pydantic-v1/.openapi-generator/FILES
index 3bdfdd3eebd9..a67a13c7dcba 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/python-pydantic-v1/.openapi-generator/FILES
@@ -120,7 +120,6 @@ docs/Tiger.md
 docs/Type.md
 docs/UnnamedDictWithAdditionalModelListProperties.md
 docs/UnnamedDictWithAdditionalStringListProperties.md
-docs/UploadFileWithAdditionalPropertiesRequestObject.md
 docs/User.md
 docs/UserApi.md
 docs/UuidWithPattern.md
@@ -251,7 +250,6 @@ petstore_api/models/tiger.py
 petstore_api/models/type.py
 petstore_api/models/unnamed_dict_with_additional_model_list_properties.py
 petstore_api/models/unnamed_dict_with_additional_string_list_properties.py
-petstore_api/models/upload_file_with_additional_properties_request_object.py
 petstore_api/models/user.py
 petstore_api/models/uuid_with_pattern.py
 petstore_api/models/with_nested_one_of.py
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/README.md b/samples/openapi3/client/petstore/python-pydantic-v1/README.md
index f8239fe5f3cf..3f98b6bed33a 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1/README.md
+++ b/samples/openapi3/client/petstore/python-pydantic-v1/README.md
@@ -262,7 +262,6 @@ Class | Method | HTTP request | Description
  - [Type](docs/Type.md)
  - [UnnamedDictWithAdditionalModelListProperties](docs/UnnamedDictWithAdditionalModelListProperties.md)
  - [UnnamedDictWithAdditionalStringListProperties](docs/UnnamedDictWithAdditionalStringListProperties.md)
- - [UploadFileWithAdditionalPropertiesRequestObject](docs/UploadFileWithAdditionalPropertiesRequestObject.md)
  - [User](docs/User.md)
  - [UuidWithPattern](docs/UuidWithPattern.md)
  - [WithNestedOneOf](docs/WithNestedOneOf.md)
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/docs/FakeApi.md b/samples/openapi3/client/petstore/python-pydantic-v1/docs/FakeApi.md
index 6935c8587a23..9a2efcfe2d57 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/python-pydantic-v1/docs/FakeApi.md
@@ -2503,7 +2503,7 @@ import time
 import os
 import petstore_api
 from petstore_api.models.api_response import ApiResponse
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
+from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
 from petstore_api.rest import ApiException
 from pprint import pprint
 
@@ -2519,7 +2519,7 @@ with petstore_api.ApiClient(configuration) as api_client:
     # Create an instance of the API class
     api_instance = petstore_api.FakeApi(api_client)
     file = None # bytearray | file to upload
-    object = petstore_api.UploadFileWithAdditionalPropertiesRequestObject() # UploadFileWithAdditionalPropertiesRequestObject |  (optional)
+    object = petstore_api.TestObjectForMultipartRequestsRequestMarker() # TestObjectForMultipartRequestsRequestMarker |  (optional)
     count = 56 # int | Integer count (optional)
 
     try:
@@ -2538,7 +2538,7 @@ with petstore_api.ApiClient(configuration) as api_client:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **file** | **bytearray**| file to upload | 
- **object** | [**UploadFileWithAdditionalPropertiesRequestObject**](UploadFileWithAdditionalPropertiesRequestObject.md)|  | [optional] 
+ **object** | [**TestObjectForMultipartRequestsRequestMarker**](TestObjectForMultipartRequestsRequestMarker.md)|  | [optional] 
  **count** | **int**| Integer count | [optional] 
 
 ### Return type
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/__init__.py
index e89049d66426..a6156ac008c3 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/__init__.py
+++ b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/__init__.py
@@ -146,7 +146,6 @@
     "Type",
     "UnnamedDictWithAdditionalModelListProperties",
     "UnnamedDictWithAdditionalStringListProperties",
-    "UploadFileWithAdditionalPropertiesRequestObject",
     "User",
     "UuidWithPattern",
     "WithNestedOneOf",
@@ -285,7 +284,6 @@
 from petstore_api.models.type import Type as Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User as User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern as UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/api/fake_api.py
index 62ef06ed6b0e..e7796aa4c8d9 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/api/fake_api.py
+++ b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/api/fake_api.py
@@ -37,7 +37,6 @@
 from petstore_api.models.tag import Tag
 from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest
 from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 
 from petstore_api.api_client import ApiClient
@@ -5241,7 +5240,7 @@ def test_string_map_reference_with_http_info(self, request_body : Annotated[Dict
             _request_auth=_params.get('_request_auth'))
 
     @validate_arguments
-    def upload_file_with_additional_properties(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse:  # noqa: E501
+    def upload_file_with_additional_properties(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[TestObjectForMultipartRequestsRequestMarker] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse:  # noqa: E501
         """uploads a file and additional properties using multipart/form-data  # noqa: E501
 
           # noqa: E501
@@ -5254,7 +5253,7 @@ def upload_file_with_additional_properties(self, file : Annotated[Union[StrictBy
         :param file: file to upload (required)
         :type file: bytearray
         :param object:
-        :type object: UploadFileWithAdditionalPropertiesRequestObject
+        :type object: TestObjectForMultipartRequestsRequestMarker
         :param count: Integer count
         :type count: int
         :param async_req: Whether to execute the request asynchronously.
@@ -5275,7 +5274,7 @@ def upload_file_with_additional_properties(self, file : Annotated[Union[StrictBy
         return self.upload_file_with_additional_properties_with_http_info(file, object, count, **kwargs)  # noqa: E501
 
     @validate_arguments
-    def upload_file_with_additional_properties_with_http_info(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse:  # noqa: E501
+    def upload_file_with_additional_properties_with_http_info(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[TestObjectForMultipartRequestsRequestMarker] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse:  # noqa: E501
         """uploads a file and additional properties using multipart/form-data  # noqa: E501
 
           # noqa: E501
@@ -5288,7 +5287,7 @@ def upload_file_with_additional_properties_with_http_info(self, file : Annotated
         :param file: file to upload (required)
         :type file: bytearray
         :param object:
-        :type object: UploadFileWithAdditionalPropertiesRequestObject
+        :type object: TestObjectForMultipartRequestsRequestMarker
         :param count: Integer count
         :type count: int
         :param async_req: Whether to execute the request asynchronously.
diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/__init__.py
index 51cf981e4b26..2ddd11a01de7 100644
--- a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/__init__.py
+++ b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/__init__.py
@@ -124,7 +124,6 @@
 from petstore_api.models.type import Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf
diff --git a/samples/openapi3/client/petstore/python/.openapi-generator/FILES b/samples/openapi3/client/petstore/python/.openapi-generator/FILES
index 1eb565d74f11..c74579383333 100755
--- a/samples/openapi3/client/petstore/python/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/python/.openapi-generator/FILES
@@ -120,7 +120,6 @@ docs/Tiger.md
 docs/Type.md
 docs/UnnamedDictWithAdditionalModelListProperties.md
 docs/UnnamedDictWithAdditionalStringListProperties.md
-docs/UploadFileWithAdditionalPropertiesRequestObject.md
 docs/User.md
 docs/UserApi.md
 docs/UuidWithPattern.md
@@ -251,7 +250,6 @@ petstore_api/models/tiger.py
 petstore_api/models/type.py
 petstore_api/models/unnamed_dict_with_additional_model_list_properties.py
 petstore_api/models/unnamed_dict_with_additional_string_list_properties.py
-petstore_api/models/upload_file_with_additional_properties_request_object.py
 petstore_api/models/user.py
 petstore_api/models/uuid_with_pattern.py
 petstore_api/models/with_nested_one_of.py
diff --git a/samples/openapi3/client/petstore/python/README.md b/samples/openapi3/client/petstore/python/README.md
index 566c23f9203e..da9b286087d3 100755
--- a/samples/openapi3/client/petstore/python/README.md
+++ b/samples/openapi3/client/petstore/python/README.md
@@ -261,7 +261,6 @@ Class | Method | HTTP request | Description
  - [Type](docs/Type.md)
  - [UnnamedDictWithAdditionalModelListProperties](docs/UnnamedDictWithAdditionalModelListProperties.md)
  - [UnnamedDictWithAdditionalStringListProperties](docs/UnnamedDictWithAdditionalStringListProperties.md)
- - [UploadFileWithAdditionalPropertiesRequestObject](docs/UploadFileWithAdditionalPropertiesRequestObject.md)
  - [User](docs/User.md)
  - [UuidWithPattern](docs/UuidWithPattern.md)
  - [WithNestedOneOf](docs/WithNestedOneOf.md)
diff --git a/samples/openapi3/client/petstore/python/docs/FakeApi.md b/samples/openapi3/client/petstore/python/docs/FakeApi.md
index 7ef2af8af2c3..af0f050135b9 100644
--- a/samples/openapi3/client/petstore/python/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/python/docs/FakeApi.md
@@ -2478,7 +2478,7 @@ uploads a file and additional properties using multipart/form-data
 ```python
 import petstore_api
 from petstore_api.models.model_api_response import ModelApiResponse
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
+from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
 from petstore_api.rest import ApiException
 from pprint import pprint
 
@@ -2494,7 +2494,7 @@ with petstore_api.ApiClient(configuration) as api_client:
     # Create an instance of the API class
     api_instance = petstore_api.FakeApi(api_client)
     file = None # bytes | file to upload
-    object = petstore_api.UploadFileWithAdditionalPropertiesRequestObject() # UploadFileWithAdditionalPropertiesRequestObject |  (optional)
+    object = petstore_api.TestObjectForMultipartRequestsRequestMarker() # TestObjectForMultipartRequestsRequestMarker |  (optional)
     count = 56 # int | Integer count (optional)
 
     try:
@@ -2514,7 +2514,7 @@ with petstore_api.ApiClient(configuration) as api_client:
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **file** | **bytes**| file to upload | 
- **object** | [**UploadFileWithAdditionalPropertiesRequestObject**](UploadFileWithAdditionalPropertiesRequestObject.md)|  | [optional] 
+ **object** | [**TestObjectForMultipartRequestsRequestMarker**](TestObjectForMultipartRequestsRequestMarker.md)|  | [optional] 
  **count** | **int**| Integer count | [optional] 
 
 ### Return type
diff --git a/samples/openapi3/client/petstore/python/petstore_api/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/__init__.py
index c7f461775f59..6a76c22cac03 100755
--- a/samples/openapi3/client/petstore/python/petstore_api/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/__init__.py
@@ -146,7 +146,6 @@
     "Type",
     "UnnamedDictWithAdditionalModelListProperties",
     "UnnamedDictWithAdditionalStringListProperties",
-    "UploadFileWithAdditionalPropertiesRequestObject",
     "User",
     "UuidWithPattern",
     "WithNestedOneOf",
@@ -285,7 +284,6 @@
 from petstore_api.models.type import Type as Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User as User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern as UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf
diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py
index 2373d1680c58..e3f86661e566 100755
--- a/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py
@@ -32,7 +32,6 @@
 from petstore_api.models.tag import Tag
 from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest
 from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 
 from petstore_api.api_client import ApiClient, RequestSerialized
@@ -9820,7 +9819,7 @@ def _test_string_map_reference_serialize(
     def upload_file_with_additional_properties(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
+        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9842,7 +9841,7 @@ def upload_file_with_additional_properties(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: UploadFileWithAdditionalPropertiesRequestObject
+        :type object: TestObjectForMultipartRequestsRequestMarker
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
@@ -9895,7 +9894,7 @@ def upload_file_with_additional_properties(
     def upload_file_with_additional_properties_with_http_info(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
+        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9917,7 +9916,7 @@ def upload_file_with_additional_properties_with_http_info(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: UploadFileWithAdditionalPropertiesRequestObject
+        :type object: TestObjectForMultipartRequestsRequestMarker
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
@@ -9970,7 +9969,7 @@ def upload_file_with_additional_properties_with_http_info(
     def upload_file_with_additional_properties_without_preload_content(
         self,
         file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")],
-        object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None,
+        object: Optional[TestObjectForMultipartRequestsRequestMarker] = None,
         count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None,
         _request_timeout: Union[
             None,
@@ -9992,7 +9991,7 @@ def upload_file_with_additional_properties_without_preload_content(
         :param file: file to upload (required)
         :type file: bytes
         :param object:
-        :type object: UploadFileWithAdditionalPropertiesRequestObject
+        :type object: TestObjectForMultipartRequestsRequestMarker
         :param count: Integer count
         :type count: int
         :param _request_timeout: timeout setting for this request. If one
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/models/__init__.py
index 308e6dfc3ebb..e498be0e1492 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/__init__.py
@@ -123,7 +123,6 @@
 from petstore_api.models.type import Type
 from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties
 from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties
-from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject
 from petstore_api.models.user import User
 from petstore_api.models.uuid_with_pattern import UuidWithPattern
 from petstore_api.models.with_nested_one_of import WithNestedOneOf
diff --git a/samples/server/petstore/php-laravel/.openapi-generator/FILES b/samples/server/petstore/php-laravel/.openapi-generator/FILES
index 0766ce49b8a4..0c114f356abc 100644
--- a/samples/server/petstore/php-laravel/.openapi-generator/FILES
+++ b/samples/server/petstore/php-laravel/.openapi-generator/FILES
@@ -75,7 +75,6 @@ Model/ReadOnlyFirst.php
 Model/SingleRefType.php
 Model/SpecialModelName.php
 Model/Tag.php
-Model/TestEnumParametersEnumHeaderStringParameter.php
 Model/TestEnumParametersEnumQueryDoubleParameter.php
 Model/TestEnumParametersEnumQueryIntegerParameter.php
 Model/TestEnumParametersRequestEnumFormString.php
diff --git a/samples/server/petstore/php-laravel/Api/FakeApiInterface.php b/samples/server/petstore/php-laravel/Api/FakeApiInterface.php
index 0ba584fe917a..6b8205fe19d2 100644
--- a/samples/server/petstore/php-laravel/Api/FakeApiInterface.php
+++ b/samples/server/petstore/php-laravel/Api/FakeApiInterface.php
@@ -236,9 +236,9 @@ public function testEndpointParameters(
      *
      * To test enum parameters
      * @param null | \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormStringArrayInner[] $enumHeaderStringArray
-     * @param null | \OpenAPI\Server\Model\TestEnumParametersEnumHeaderStringParameter $enumHeaderString
+     * @param null | \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString $enumHeaderString
      * @param null | \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormStringArrayInner[] $enumQueryStringArray
-     * @param null | \OpenAPI\Server\Model\TestEnumParametersEnumHeaderStringParameter $enumQueryString
+     * @param null | \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString $enumQueryString
      * @param null | \OpenAPI\Server\Model\TestEnumParametersEnumQueryIntegerParameter $enumQueryInteger
      * @param null | \OpenAPI\Server\Model\TestEnumParametersEnumQueryDoubleParameter $enumQueryDouble
      * @param null | \OpenAPI\Server\Model\EnumClass[] $enumQueryModelArray
@@ -248,9 +248,9 @@ public function testEndpointParameters(
      */
     public function testEnumParameters(
             ?array $enumHeaderStringArray,
-            ?\OpenAPI\Server\Model\TestEnumParametersEnumHeaderStringParameter $enumHeaderString,
+            ?\OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString $enumHeaderString,
             ?array $enumQueryStringArray,
-            ?\OpenAPI\Server\Model\TestEnumParametersEnumHeaderStringParameter $enumQueryString,
+            ?\OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString $enumQueryString,
             ?\OpenAPI\Server\Model\TestEnumParametersEnumQueryIntegerParameter $enumQueryInteger,
             ?\OpenAPI\Server\Model\TestEnumParametersEnumQueryDoubleParameter $enumQueryDouble,
             ?array $enumQueryModelArray,
diff --git a/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php b/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php
index ae433d8b5ec6..6f2b2b1fe740 100644
--- a/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php
+++ b/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php
@@ -678,11 +678,11 @@ public function testEnumParameters(Request $request): JsonResponse
 
         $enumHeaderStringArray = $request->get('enumHeaderStringArray');
 
-        $enumHeaderString = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestEnumParametersEnumHeaderStringParameter::class);
+        $enumHeaderString = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString::class);
 
         $enumQueryStringArray = $request->get('enumQueryStringArray');
 
-        $enumQueryString = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestEnumParametersEnumHeaderStringParameter::class);
+        $enumQueryString = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString::class);
 
         $enumQueryInteger = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestEnumParametersEnumQueryIntegerParameter::class);
 
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES
index 6d35ed812fa6..e899e0a0ceff 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES
@@ -51,7 +51,6 @@ docs/ReadOnlyFirst.md
 docs/Return.md
 docs/Tag.md
 docs/TestEnumParametersEnumHeaderStringArrayParameterInner.md
-docs/TestEnumParametersEnumHeaderStringParameter.md
 docs/TestEnumParametersEnumQueryDoubleParameter.md
 docs/TestEnumParametersEnumQueryIntegerParameter.md
 docs/TestEnumParametersRequestEnumFormString.md
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/README.md b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/README.md
index f1151b3373f5..2c12c203f627 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/README.md
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/README.md
@@ -232,7 +232,6 @@ Method | HTTP request | Description
  - [Return](docs/Return.md)
  - [Tag](docs/Tag.md)
  - [TestEnumParametersEnumHeaderStringArrayParameterInner](docs/TestEnumParametersEnumHeaderStringArrayParameterInner.md)
- - [TestEnumParametersEnumHeaderStringParameter](docs/TestEnumParametersEnumHeaderStringParameter.md)
  - [TestEnumParametersEnumQueryDoubleParameter](docs/TestEnumParametersEnumQueryDoubleParameter.md)
  - [TestEnumParametersEnumQueryIntegerParameter](docs/TestEnumParametersEnumQueryIntegerParameter.md)
  - [TestEnumParametersRequestEnumFormString](docs/TestEnumParametersRequestEnumFormString.md)
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml
index 7c364c4a75f9..2d1be7d9a6b8 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml
@@ -599,7 +599,7 @@ paths:
         in: header
         name: enum_header_string
         schema:
-          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
+          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
       - description: Query parameter enum test (string array)
         explode: false
         in: query
@@ -613,7 +613,7 @@ paths:
         in: query
         name: enum_query_string
         schema:
-          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
+          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
       - description: Query parameter enum test (double)
         in: query
         name: enum_query_integer
@@ -1437,13 +1437,6 @@ components:
       - '>'
       - $
       type: string
-    testEnumParameters_enum_header_string_parameter:
-      default: -efg
-      enum:
-      - _abc
-      - -efg
-      - (xyz)
-      type: string
     testEnumParameters_enum_query_integer_parameter:
       enum:
       - 1
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs
index 9141802f5891..bc8a5faa3599 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs
@@ -182,13 +182,13 @@ enum Operation {
         enum_header_string_array: Option<Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
         /// Header parameter enum test (string)
         #[structopt(parse(try_from_str = parse_json))]
-        enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
         /// Query parameter enum test (string array)
         #[structopt(parse(try_from_str = parse_json), long)]
         enum_query_string_array: Option<Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
         /// Query parameter enum test (string)
         #[structopt(parse(try_from_str = parse_json))]
-        enum_query_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
         /// Query parameter enum test (double)
         #[structopt(parse(try_from_str = parse_json))]
         enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs
index e9c468b84b7b..31c2da85fe6f 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs
@@ -245,9 +245,9 @@ fn main() {
         Some("TestEnumParameters") => {
             let result = rt.block_on(client.test_enum_parameters(
                   Some(&Vec::new()),
-                  Some(models::TestEnumParametersEnumHeaderStringParameter::Abc),
+                  Some(models::TestEnumParametersRequestEnumFormString::Abc),
                   Some(&Vec::new()),
-                  Some(models::TestEnumParametersEnumHeaderStringParameter::Abc),
+                  Some(models::TestEnumParametersRequestEnumFormString::Abc),
                   Some(models::TestEnumParametersEnumQueryIntegerParameter::Variant1),
                   Some(models::TestEnumParametersEnumQueryDoubleParameter::Variant11),
                   Some(models::TestEnumParametersRequestEnumFormString::Abc)
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs
index d360e5cdfb01..a470efbe9af2 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs
@@ -244,9 +244,9 @@ impl<C> Api<C> for Server<C> where C: Has<XSpanIdString> + Send + Sync
     async fn test_enum_parameters(
         &self,
         enum_header_string_array: Option<&Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
         enum_query_string_array: Option<&Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_query_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
         enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
         enum_query_double: Option<models::TestEnumParametersEnumQueryDoubleParameter>,
         enum_form_string: Option<models::TestEnumParametersRequestEnumFormString>,
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs
index 40100279f987..ad61a853d0ee 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs
@@ -1329,9 +1329,9 @@ impl<S, C> Api<C> for Client<S, C> where
     async fn test_enum_parameters(
         &self,
         param_enum_header_string_array: Option<&Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        param_enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        param_enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
         param_enum_query_string_array: Option<&Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        param_enum_query_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        param_enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
         param_enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
         param_enum_query_double: Option<models::TestEnumParametersEnumQueryDoubleParameter>,
         param_enum_form_string: Option<models::TestEnumParametersRequestEnumFormString>,
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs
index 4791f388b517..37da22cfbd68 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs
@@ -361,9 +361,9 @@ pub trait Api<C: Send + Sync> {
     async fn test_enum_parameters(
         &self,
         enum_header_string_array: Option<&Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
         enum_query_string_array: Option<&Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_query_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
         enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
         enum_query_double: Option<models::TestEnumParametersEnumQueryDoubleParameter>,
         enum_form_string: Option<models::TestEnumParametersRequestEnumFormString>,
@@ -598,9 +598,9 @@ pub trait ApiNoContext<C: Send + Sync> {
     async fn test_enum_parameters(
         &self,
         enum_header_string_array: Option<&Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
         enum_query_string_array: Option<&Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_query_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
         enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
         enum_query_double: Option<models::TestEnumParametersEnumQueryDoubleParameter>,
         enum_form_string: Option<models::TestEnumParametersRequestEnumFormString>,
@@ -889,9 +889,9 @@ impl<T: Api<C> + Send + Sync, C: Clone + Send + Sync> ApiNoContext<C> for Contex
     async fn test_enum_parameters(
         &self,
         enum_header_string_array: Option<&Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
         enum_query_string_array: Option<&Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_query_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
         enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
         enum_query_double: Option<models::TestEnumParametersEnumQueryDoubleParameter>,
         enum_form_string: Option<models::TestEnumParametersRequestEnumFormString>,
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs
index 0e82f7a4a002..dde036648950 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs
@@ -8023,132 +8023,6 @@ impl TestEnumParametersEnumHeaderStringArrayParameterInner {
     }
 }
 
-/// Enumeration of values.
-/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
-/// which helps with FFI.
-#[allow(non_camel_case_types)]
-#[repr(C)]
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, Hash)]
-#[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))]
-pub enum TestEnumParametersEnumHeaderStringParameter {
-    #[serde(rename = "_abc")]
-    Abc,
-    #[serde(rename = "-efg")]
-    Efg,
-    #[serde(rename = "(xyz)")]
-    LeftParenthesisXyzRightParenthesis,
-}
-
-impl std::fmt::Display for TestEnumParametersEnumHeaderStringParameter {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match *self {
-            TestEnumParametersEnumHeaderStringParameter::Abc => write!(f, "_abc"),
-            TestEnumParametersEnumHeaderStringParameter::Efg => write!(f, "-efg"),
-            TestEnumParametersEnumHeaderStringParameter::LeftParenthesisXyzRightParenthesis => write!(f, "(xyz)"),
-        }
-    }
-}
-
-impl std::str::FromStr for TestEnumParametersEnumHeaderStringParameter {
-    type Err = String;
-
-    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
-        match s {
-            "_abc" => std::result::Result::Ok(TestEnumParametersEnumHeaderStringParameter::Abc),
-            "-efg" => std::result::Result::Ok(TestEnumParametersEnumHeaderStringParameter::Efg),
-            "(xyz)" => std::result::Result::Ok(TestEnumParametersEnumHeaderStringParameter::LeftParenthesisXyzRightParenthesis),
-            _ => std::result::Result::Err(format!("Value not valid: {s}")),
-        }
-    }
-}
-
-// Methods for converting between header::IntoHeaderValue<TestEnumParametersEnumHeaderStringParameter> and hyper::header::HeaderValue
-
-#[cfg(any(feature = "client", feature = "server"))]
-impl std::convert::TryFrom<header::IntoHeaderValue<TestEnumParametersEnumHeaderStringParameter>> for hyper::header::HeaderValue {
-    type Error = String;
-
-    fn try_from(hdr_value: header::IntoHeaderValue<TestEnumParametersEnumHeaderStringParameter>) -> std::result::Result<Self, Self::Error> {
-        let hdr_value = hdr_value.to_string();
-        match hyper::header::HeaderValue::from_str(&hdr_value) {
-             std::result::Result::Ok(value) => std::result::Result::Ok(value),
-             std::result::Result::Err(e) => std::result::Result::Err(
-                 format!("Invalid header value for TestEnumParametersEnumHeaderStringParameter - value: {hdr_value} is invalid {e}"))
-        }
-    }
-}
-
-#[cfg(any(feature = "client", feature = "server"))]
-impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<TestEnumParametersEnumHeaderStringParameter> {
-    type Error = String;
-
-    fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
-        match hdr_value.to_str() {
-             std::result::Result::Ok(value) => {
-                    match <TestEnumParametersEnumHeaderStringParameter as std::str::FromStr>::from_str(value) {
-                        std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)),
-                        std::result::Result::Err(err) => std::result::Result::Err(
-                            format!("Unable to convert header value '{value}' into TestEnumParametersEnumHeaderStringParameter - {err}"))
-                    }
-             },
-             std::result::Result::Err(e) => std::result::Result::Err(
-                 format!("Unable to convert header: {hdr_value:?} to string: {e}"))
-        }
-    }
-}
-
-#[cfg(any(feature = "client", feature = "server"))]
-impl std::convert::TryFrom<header::IntoHeaderValue<Vec<TestEnumParametersEnumHeaderStringParameter>>> for hyper::header::HeaderValue {
-    type Error = String;
-
-    fn try_from(hdr_values: header::IntoHeaderValue<Vec<TestEnumParametersEnumHeaderStringParameter>>) -> std::result::Result<Self, Self::Error> {
-        let hdr_values : Vec<String> = hdr_values.0.into_iter().map(|hdr_value| {
-            hdr_value.to_string()
-        }).collect();
-
-        match hyper::header::HeaderValue::from_str(&hdr_values.join(", ")) {
-           std::result::Result::Ok(hdr_value) => std::result::Result::Ok(hdr_value),
-           std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to convert {hdr_values:?} into a header - {e}"))
-        }
-    }
-}
-
-#[cfg(any(feature = "client", feature = "server"))]
-impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<Vec<TestEnumParametersEnumHeaderStringParameter>> {
-    type Error = String;
-
-    fn try_from(hdr_values: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
-        match hdr_values.to_str() {
-            std::result::Result::Ok(hdr_values) => {
-                let hdr_values : std::vec::Vec<TestEnumParametersEnumHeaderStringParameter> = hdr_values
-                .split(',')
-                .filter_map(|hdr_value| match hdr_value.trim() {
-                    "" => std::option::Option::None,
-                    hdr_value => std::option::Option::Some({
-                        match <TestEnumParametersEnumHeaderStringParameter as std::str::FromStr>::from_str(hdr_value) {
-                            std::result::Result::Ok(value) => std::result::Result::Ok(value),
-                            std::result::Result::Err(err) => std::result::Result::Err(
-                                format!("Unable to convert header value '{hdr_value}' into TestEnumParametersEnumHeaderStringParameter - {err}"))
-                        }
-                    })
-                }).collect::<std::result::Result<std::vec::Vec<_>, String>>()?;
-
-                std::result::Result::Ok(header::IntoHeaderValue(hdr_values))
-            },
-            std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to parse header: {hdr_values:?} as a string - {e}")),
-        }
-    }
-}
-
-impl TestEnumParametersEnumHeaderStringParameter {
-    /// Helper function to allow us to convert this model to an XML string.
-    /// Will panic if serialisation fails.
-    #[allow(dead_code)]
-    pub(crate) fn as_xml(&self) -> String {
-        serde_xml_rs::to_string(&self).expect("impossible to fail to serialize")
-    }
-}
-
 /// Enumeration of values.
 /// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
 /// which helps with FFI.
diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs
index 53ab4b0613c2..f1ba3a1c86f8 100644
--- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs
+++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs
@@ -987,7 +987,7 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
                 let param_enum_header_string = headers.get(HeaderName::from_static("enum_header_string"));
 
                 let param_enum_header_string = match param_enum_header_string {
-                    Some(v) => match header::IntoHeaderValue::<models::TestEnumParametersEnumHeaderStringParameter>::try_from((*v).clone()) {
+                    Some(v) => match header::IntoHeaderValue::<models::TestEnumParametersRequestEnumFormString>::try_from((*v).clone()) {
                         Ok(result) =>
                             Some(result.0),
                         Err(err) => {
@@ -1018,7 +1018,7 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
                 let param_enum_query_string = match param_enum_query_string {
                     Some(param_enum_query_string) => {
                         let param_enum_query_string =
-                            <models::TestEnumParametersEnumHeaderStringParameter as std::str::FromStr>::from_str
+                            <models::TestEnumParametersRequestEnumFormString as std::str::FromStr>::from_str
                                 (&param_enum_query_string);
                         match param_enum_query_string {
                             Ok(param_enum_query_string) => Some(param_enum_query_string),
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES
index 5332ab08344d..e70cf4b2482a 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES
@@ -51,7 +51,6 @@ docs/ReadOnlyFirst.md
 docs/Return.md
 docs/Tag.md
 docs/TestEnumParametersEnumHeaderStringArrayParameterInner.md
-docs/TestEnumParametersEnumHeaderStringParameter.md
 docs/TestEnumParametersEnumQueryDoubleParameter.md
 docs/TestEnumParametersEnumQueryIntegerParameter.md
 docs/TestEnumParametersRequestEnumFormString.md
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/README.md b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/README.md
index 1ddb6238e167..9ae33c2644a0 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/README.md
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/README.md
@@ -253,7 +253,6 @@ Method | HTTP request | Description
  - [Return](docs/Return.md)
  - [Tag](docs/Tag.md)
  - [TestEnumParametersEnumHeaderStringArrayParameterInner](docs/TestEnumParametersEnumHeaderStringArrayParameterInner.md)
- - [TestEnumParametersEnumHeaderStringParameter](docs/TestEnumParametersEnumHeaderStringParameter.md)
  - [TestEnumParametersEnumQueryDoubleParameter](docs/TestEnumParametersEnumQueryDoubleParameter.md)
  - [TestEnumParametersEnumQueryIntegerParameter](docs/TestEnumParametersEnumQueryIntegerParameter.md)
  - [TestEnumParametersRequestEnumFormString](docs/TestEnumParametersRequestEnumFormString.md)
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml
index 7c364c4a75f9..2d1be7d9a6b8 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml
@@ -599,7 +599,7 @@ paths:
         in: header
         name: enum_header_string
         schema:
-          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
+          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
       - description: Query parameter enum test (string array)
         explode: false
         in: query
@@ -613,7 +613,7 @@ paths:
         in: query
         name: enum_query_string
         schema:
-          $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter"
+          $ref: "#/components/schemas/testEnumParameters_request_enum_form_string"
       - description: Query parameter enum test (double)
         in: query
         name: enum_query_integer
@@ -1437,13 +1437,6 @@ components:
       - '>'
       - $
       type: string
-    testEnumParameters_enum_header_string_parameter:
-      default: -efg
-      enum:
-      - _abc
-      - -efg
-      - (xyz)
-      type: string
     testEnumParameters_enum_query_integer_parameter:
       enum:
       - 1
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs
index 9ebc7336a225..974d1f3d6587 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs
@@ -185,14 +185,14 @@ enum Operation {
         #[clap(value_parser = parse_json::<Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>, long)]
         enum_header_string_array: Option<Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
         /// Header parameter enum test (string)
-        #[clap(value_parser = parse_json::<models::TestEnumParametersEnumHeaderStringParameter>)]
-        enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        #[clap(value_parser = parse_json::<models::TestEnumParametersRequestEnumFormString>)]
+        enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
         /// Query parameter enum test (string array)
         #[clap(value_parser = parse_json::<Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>, long)]
         enum_query_string_array: Option<Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
         /// Query parameter enum test (string)
-        #[clap(value_parser = parse_json::<models::TestEnumParametersEnumHeaderStringParameter>)]
-        enum_query_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        #[clap(value_parser = parse_json::<models::TestEnumParametersRequestEnumFormString>)]
+        enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
         /// Query parameter enum test (double)
         #[clap(value_parser = parse_json::<models::TestEnumParametersEnumQueryIntegerParameter>)]
         enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs
index 41ce2cfaee50..e4a1cf520169 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs
@@ -254,9 +254,9 @@ fn main() {
         Some("TestEnumParameters") => {
             let result = rt.block_on(client.test_enum_parameters(
                   Some(&Vec::new()),
-                  Some(models::TestEnumParametersEnumHeaderStringParameter::Abc),
+                  Some(models::TestEnumParametersRequestEnumFormString::Abc),
                   Some(&Vec::new()),
-                  Some(models::TestEnumParametersEnumHeaderStringParameter::Abc),
+                  Some(models::TestEnumParametersRequestEnumFormString::Abc),
                   Some(models::TestEnumParametersEnumQueryIntegerParameter::Variant1),
                   Some(models::TestEnumParametersEnumQueryDoubleParameter::Variant11),
                   Some(models::TestEnumParametersRequestEnumFormString::Abc)
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs
index 98ed4ce9894a..5afa1ea86240 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs
@@ -289,9 +289,9 @@ impl<C> Api<C> for Server<C> where C: Has<XSpanIdString> + Send + Sync
     async fn test_enum_parameters<'a>(
         &self,
         enum_header_string_array: Option<&'a Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
         enum_query_string_array: Option<&'a Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_query_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
         enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
         enum_query_double: Option<models::TestEnumParametersEnumQueryDoubleParameter>,
         enum_form_string: Option<models::TestEnumParametersRequestEnumFormString>,
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs
index 10886d73eed7..8aa1102e56ff 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs
@@ -1426,9 +1426,9 @@ impl<S, C, B> Api<C> for Client<S, C> where
     async fn test_enum_parameters<'a>(
         &self,
         param_enum_header_string_array: Option<&'a Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        param_enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        param_enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
         param_enum_query_string_array: Option<&'a Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        param_enum_query_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        param_enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
         param_enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
         param_enum_query_double: Option<models::TestEnumParametersEnumQueryDoubleParameter>,
         param_enum_form_string: Option<models::TestEnumParametersRequestEnumFormString>,
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs
index 3c409b899326..e4fe8a3e78f9 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs
@@ -396,9 +396,9 @@ pub trait Api<C: Send + Sync> {
     async fn test_enum_parameters<'a>(
         &self,
         enum_header_string_array: Option<&'a Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
         enum_query_string_array: Option<&'a Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_query_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
         enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
         enum_query_double: Option<models::TestEnumParametersEnumQueryDoubleParameter>,
         enum_form_string: Option<models::TestEnumParametersRequestEnumFormString>,
@@ -636,9 +636,9 @@ pub trait ApiNoContext<C: Send + Sync> {
     async fn test_enum_parameters<'a>(
         &self,
         enum_header_string_array: Option<&'a Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
         enum_query_string_array: Option<&'a Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_query_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
         enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
         enum_query_double: Option<models::TestEnumParametersEnumQueryDoubleParameter>,
         enum_form_string: Option<models::TestEnumParametersRequestEnumFormString>,
@@ -923,9 +923,9 @@ impl<T: Api<C> + Send + Sync, C: Clone + Send + Sync> ApiNoContext<C> for Contex
     async fn test_enum_parameters<'a>(
         &self,
         enum_header_string_array: Option<&'a Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_header_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_header_string: Option<models::TestEnumParametersRequestEnumFormString>,
         enum_query_string_array: Option<&'a Vec<models::TestEnumParametersEnumHeaderStringArrayParameterInner>>,
-        enum_query_string: Option<models::TestEnumParametersEnumHeaderStringParameter>,
+        enum_query_string: Option<models::TestEnumParametersRequestEnumFormString>,
         enum_query_integer: Option<models::TestEnumParametersEnumQueryIntegerParameter>,
         enum_query_double: Option<models::TestEnumParametersEnumQueryDoubleParameter>,
         enum_form_string: Option<models::TestEnumParametersRequestEnumFormString>,
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs
index c724b2becd44..cb704dc645d2 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs
@@ -8840,133 +8840,6 @@ impl TestEnumParametersEnumHeaderStringArrayParameterInner {
     }
 }
 
-/// Enumeration of values.
-/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
-/// which helps with FFI.
-#[allow(non_camel_case_types)]
-#[repr(C)]
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, Hash)]
-#[cfg_attr(feature = "validate", derive(Validate))]
-#[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))]
-pub enum TestEnumParametersEnumHeaderStringParameter {
-    #[serde(rename = "_abc")]
-    Abc,
-    #[serde(rename = "-efg")]
-    Efg,
-    #[serde(rename = "(xyz)")]
-    LeftParenthesisXyzRightParenthesis,
-}
-
-impl std::fmt::Display for TestEnumParametersEnumHeaderStringParameter {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match *self {
-            TestEnumParametersEnumHeaderStringParameter::Abc => write!(f, "_abc"),
-            TestEnumParametersEnumHeaderStringParameter::Efg => write!(f, "-efg"),
-            TestEnumParametersEnumHeaderStringParameter::LeftParenthesisXyzRightParenthesis => write!(f, "(xyz)"),
-        }
-    }
-}
-
-impl std::str::FromStr for TestEnumParametersEnumHeaderStringParameter {
-    type Err = String;
-
-    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
-        match s {
-            "_abc" => std::result::Result::Ok(TestEnumParametersEnumHeaderStringParameter::Abc),
-            "-efg" => std::result::Result::Ok(TestEnumParametersEnumHeaderStringParameter::Efg),
-            "(xyz)" => std::result::Result::Ok(TestEnumParametersEnumHeaderStringParameter::LeftParenthesisXyzRightParenthesis),
-            _ => std::result::Result::Err(format!("Value not valid: {s}")),
-        }
-    }
-}
-
-// Methods for converting between header::IntoHeaderValue<TestEnumParametersEnumHeaderStringParameter> and hyper::header::HeaderValue
-
-#[cfg(any(feature = "client", feature = "server"))]
-impl std::convert::TryFrom<header::IntoHeaderValue<TestEnumParametersEnumHeaderStringParameter>> for hyper::header::HeaderValue {
-    type Error = String;
-
-    fn try_from(hdr_value: header::IntoHeaderValue<TestEnumParametersEnumHeaderStringParameter>) -> std::result::Result<Self, Self::Error> {
-        let hdr_value = hdr_value.to_string();
-        match hyper::header::HeaderValue::from_str(&hdr_value) {
-             std::result::Result::Ok(value) => std::result::Result::Ok(value),
-             std::result::Result::Err(e) => std::result::Result::Err(
-                 format!("Invalid header value for TestEnumParametersEnumHeaderStringParameter - value: {hdr_value} is invalid {e}"))
-        }
-    }
-}
-
-#[cfg(any(feature = "client", feature = "server"))]
-impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<TestEnumParametersEnumHeaderStringParameter> {
-    type Error = String;
-
-    fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
-        match hdr_value.to_str() {
-             std::result::Result::Ok(value) => {
-                    match <TestEnumParametersEnumHeaderStringParameter as std::str::FromStr>::from_str(value) {
-                        std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)),
-                        std::result::Result::Err(err) => std::result::Result::Err(
-                            format!("Unable to convert header value '{value}' into TestEnumParametersEnumHeaderStringParameter - {err}"))
-                    }
-             },
-             std::result::Result::Err(e) => std::result::Result::Err(
-                 format!("Unable to convert header: {hdr_value:?} to string: {e}"))
-        }
-    }
-}
-
-#[cfg(any(feature = "client", feature = "server"))]
-impl std::convert::TryFrom<header::IntoHeaderValue<Vec<TestEnumParametersEnumHeaderStringParameter>>> for hyper::header::HeaderValue {
-    type Error = String;
-
-    fn try_from(hdr_values: header::IntoHeaderValue<Vec<TestEnumParametersEnumHeaderStringParameter>>) -> std::result::Result<Self, Self::Error> {
-        let hdr_values : Vec<String> = hdr_values.0.into_iter().map(|hdr_value| {
-            hdr_value.to_string()
-        }).collect();
-
-        match hyper::header::HeaderValue::from_str(&hdr_values.join(", ")) {
-           std::result::Result::Ok(hdr_value) => std::result::Result::Ok(hdr_value),
-           std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to convert {hdr_values:?} into a header - {e}",))
-        }
-    }
-}
-
-#[cfg(any(feature = "client", feature = "server"))]
-impl std::convert::TryFrom<hyper::header::HeaderValue> for header::IntoHeaderValue<Vec<TestEnumParametersEnumHeaderStringParameter>> {
-    type Error = String;
-
-    fn try_from(hdr_values: hyper::header::HeaderValue) -> std::result::Result<Self, Self::Error> {
-        match hdr_values.to_str() {
-            std::result::Result::Ok(hdr_values) => {
-                let hdr_values : std::vec::Vec<TestEnumParametersEnumHeaderStringParameter> = hdr_values
-                .split(',')
-                .filter_map(|hdr_value| match hdr_value.trim() {
-                    "" => std::option::Option::None,
-                    hdr_value => std::option::Option::Some({
-                        match <TestEnumParametersEnumHeaderStringParameter as std::str::FromStr>::from_str(hdr_value) {
-                            std::result::Result::Ok(value) => std::result::Result::Ok(value),
-                            std::result::Result::Err(err) => std::result::Result::Err(
-                                format!("Unable to convert header value '{hdr_value}' into TestEnumParametersEnumHeaderStringParameter - {err}"))
-                        }
-                    })
-                }).collect::<std::result::Result<std::vec::Vec<_>, String>>()?;
-
-                std::result::Result::Ok(header::IntoHeaderValue(hdr_values))
-            },
-            std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to parse header: {hdr_values:?} as a string - {e}")),
-        }
-    }
-}
-
-impl TestEnumParametersEnumHeaderStringParameter {
-    /// Helper function to allow us to convert this model to an XML string.
-    /// Will panic if serialisation fails.
-    #[allow(dead_code)]
-    pub(crate) fn as_xml(&self) -> String {
-        serde_xml_rs::to_string(&self).expect("impossible to fail to serialize")
-    }
-}
-
 /// Enumeration of values.
 /// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]`
 /// which helps with FFI.
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs
index 40da357dd587..658f977e24d5 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs
@@ -1487,7 +1487,7 @@ where
                 let param_enum_header_string = headers.get(HeaderName::from_static("enum_header_string"));
 
                 let param_enum_header_string = match param_enum_header_string {
-                    Some(v) => match header::IntoHeaderValue::<models::TestEnumParametersEnumHeaderStringParameter>::try_from((*v).clone()) {
+                    Some(v) => match header::IntoHeaderValue::<models::TestEnumParametersRequestEnumFormString>::try_from((*v).clone()) {
                         Ok(result) =>
                             Some(result.0),
                         Err(err) => {
@@ -1518,7 +1518,7 @@ where
                 let param_enum_query_string = match param_enum_query_string {
                     Some(param_enum_query_string) => {
                         let param_enum_query_string =
-                            <models::TestEnumParametersEnumHeaderStringParameter as std::str::FromStr>::from_str
+                            <models::TestEnumParametersRequestEnumFormString as std::str::FromStr>::from_str
                                 (&param_enum_query_string);
                         match param_enum_query_string {
                             Ok(param_enum_query_string) => Some(param_enum_query_string),